mirror
/
anarch
mirror of https://gitlab.com/drummyfish/anarch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make cards work

This commit is contained in:
Miloslav Číž 2020-02-08 21:41:05 +01:00
parent b7ba33a77a
commit cdbd5165c3
3 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
constants.h
View File

@ -251,6 +251,7 @@
#define SFG_DOOR_DEFAULT_STATE 0x1f
#define SFG_DOOR_UP_DOWN_MASK 0x20
#define SFG_DOOR_LOCK(doorRecord) ((doorRecord) >> 6)
#define SFG_DOOR_VERTICAL_POSITION_MASK 0x1f
#define SFG_DOOR_HEIGHT_STEP (RCL_UNITS_PER_SQUARE / 0x1f)

10
levels.h
View File

@ -93,9 +93,15 @@ typedef struct
#define SFG_LEVEL_ELEMENT_ROCKETS 0x04
#define SFG_LEVEL_ELEMENT_PLASMA 0x05
#define SFG_LEVEL_ELEMENT_TREE 0x06
#define SFG_LEVEL_ELEMENT_CARD0 0x07
#define SFG_LEVEL_ELEMENT_CARD0 0x07 ///< Access card, unlocks doors with lock.
#define SFG_LEVEL_ELEMENT_CARD1 0x08
#define SFG_LEVEL_ELEMENT_CARD2 0x09
#define SFG_LEVEL_ELEMENT_LOCK0 0x0a /**< Special level element that must be
placed on a tile with door. This door is
then unlocked by taking the corresponding
access card. */
#define SFG_LEVEL_ELEMENT_LOCK1 0x0b
#define SFG_LEVEL_ELEMENT_LOCK2 0x0c
/*
Monsters have lower 4 bits zero and are only distinguished by the 4 upper
@ -286,7 +292,7 @@ SFG_PROGRAM_MEMORY SFG_Level SFG_level0 =
{SFG_LEVEL_ELEMENT_TREE, {16, 46}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
{SFG_LEVEL_ELEMENT_CARD0, {13, 20}}, {SFG_LEVEL_ELEMENT_CARD1, {14, 20}},
{SFG_LEVEL_ELEMENT_CARD2, {13, 21}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
{SFG_LEVEL_ELEMENT_NONE, {0, 0}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
{SFG_LEVEL_ELEMENT_LOCK1, {3, 21}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
{SFG_LEVEL_ELEMENT_NONE, {0, 0}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
{SFG_LEVEL_ELEMENT_NONE, {0, 0}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
{SFG_LEVEL_ELEMENT_NONE, {0, 0}}, {SFG_LEVEL_ELEMENT_NONE, {0, 0}},

50
main.c
View File

@ -141,7 +141,8 @@ typedef struct
aaaaa: current door height (how much they're open)
b: whether currently going up (0) or down (1)
cc: by which keys the door is unlocked
cc: by which card (key) the door is unlocked, 00
means no card (unlocked), 1 means card 0 etc.
*/
} SFG_DoorRecord;
@ -1053,7 +1054,10 @@ void SFG_setAndInitLevel(const SFG_Level *level)
}
if (SFG_currentLevel.doorRecordCount >= SFG_MAX_DOORS)
{
SFG_LOG("warning: too many doors!");
break;
}
}
if (SFG_currentLevel.doorRecordCount >= SFG_MAX_DOORS)
@ -1091,12 +1095,40 @@ void SFG_setAndInitLevel(const SFG_Level *level)
SFG_currentLevel.monsterRecordCount++;
}
else
else if ((e->type < SFG_LEVEL_ELEMENT_LOCK0) ||
(e->type > SFG_LEVEL_ELEMENT_LOCK2))
{
SFG_LOG("adding item");
SFG_currentLevel.itemRecords[SFG_currentLevel.itemRecordCount] = i;
SFG_currentLevel.itemRecordCount++;
}
else
{
SFG_LOG("adding door lock");
uint8_t properties;
SFG_getMapTile(level,e->coords[0],e->coords[1],&properties);
if ((properties & SFG_TILE_PROPERTY_MASK) == SFG_TILE_PROPERTY_DOOR)
{
// find the door record and lock the door:
for (uint16_t j = 0; j < SFG_currentLevel.doorRecordCount; ++j)
{
SFG_DoorRecord *d = &(SFG_currentLevel.doorRecords[j]);
if (d->coords[0] == e->coords[0] && d->coords[1] == e->coords[1])
{
d->state |= (e->type - SFG_LEVEL_ELEMENT_LOCK0 + 1) << 6;
break;
}
}
}
else
{
SFG_LOG("warning: lock not put on door tile!");
}
}
}
}
@ -2447,12 +2479,16 @@ void SFG_gameStep()
uint8_t upDownState = door->state & SFG_DOOR_UP_DOWN_MASK;
uint8_t lock = SFG_DOOR_LOCK(door->state);
uint8_t newUpDownState =
((door->coords[0] >= (SFG_player.squarePosition[0] - 1)) &&
(door->coords[0] <= (SFG_player.squarePosition[0] + 1)) &&
(door->coords[1] >= (SFG_player.squarePosition[1] - 1)) &&
(door->coords[1] <= (SFG_player.squarePosition[1] + 1))) ?
SFG_DOOR_UP_DOWN_MASK : 0x00;
(
((lock == 0) || (SFG_player.cards & (1 << (lock - 1)))) &&
(door->coords[0] >= (SFG_player.squarePosition[0] - 1)) &&
(door->coords[0] <= (SFG_player.squarePosition[0] + 1)) &&
(door->coords[1] >= (SFG_player.squarePosition[1] - 1)) &&
(door->coords[1] <= (SFG_player.squarePosition[1] + 1))
) ? SFG_DOOR_UP_DOWN_MASK : 0x00;
if (upDownState != newUpDownState)
SFG_playSoundSafe(1,255);