diff --git a/assets/level6.gif b/assets/level6.gif index f347ac1..c0657b7 100644 Binary files a/assets/level6.gif and b/assets/level6.gif differ diff --git a/constants.h b/constants.h index 9918824..c593392 100644 --- a/constants.h +++ b/constants.h @@ -358,7 +358,6 @@ #define SFG_CEILING_MAX_HEIGHT\ (16 * RCL_UNITS_PER_SQUARE - RCL_UNITS_PER_SQUARE / 2 ) -#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 @@ -459,10 +458,10 @@ uint16_t SFG_monsterAttributeTable[SFG_MONSTERS_TOTAL] = { /* spider */ SFG_MONSTER_ATTRIBUTE(SFG_MONSTER_ATTACK_FIREBALL,40,61,2), - /* destr. */ SFG_MONSTER_ATTRIBUTE(SFG_MONSTER_ATTACK_FIREBALL_BULLET,165,170,3), + /* destr. */ SFG_MONSTER_ATTRIBUTE(SFG_MONSTER_ATTACK_FIREBALL_BULLET,90,170,3), /* warrior */ SFG_MONSTER_ATTRIBUTE(SFG_MONSTER_ATTACK_MELEE,255,40,1), - /* plasma */ SFG_MONSTER_ATTRIBUTE(SFG_MONSTER_ATTACK_PLASMA,55,92,1), - /* ender */ SFG_MONSTER_ATTRIBUTE(SFG_MONSTER_ATTACK_FIREBALL_PLASMA,75,255,3), + /* plasma */ SFG_MONSTER_ATTRIBUTE(SFG_MONSTER_ATTACK_PLASMA,56,92,1), + /* ender */ SFG_MONSTER_ATTRIBUTE(SFG_MONSTER_ATTACK_FIREBALL_PLASMA,128,255,3), /* turret */ SFG_MONSTER_ATTRIBUTE(SFG_MONSTER_ATTACK_BULLET,32,23,0), /* explod. */ SFG_MONSTER_ATTRIBUTE(SFG_MONSTER_ATTACK_EXPLODE,255,36,1) }; @@ -513,7 +512,7 @@ uint16_t SFG_monsterAttributeTable[SFG_MONSTERS_TOTAL] = SFG_PROGRAM_MEMORY uint8_t SFG_weaponAttributeTable[SFG_WEAPONS_TOTAL] = { /* knife */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_MELEE,1,650), // DPS: 6.2 - /* shotgun */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_BULLET,2,1400), // DPS: 11.4 + /* shotgun */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_BULLET,2,1250), // DPS: 12.8 /* m. gun */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_BULLET,1,700), // DPS: 11.4 /* r. laun. */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_FIREBALL,1,850), // DPS: 28.2 /* plasma */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_PLASMA,1,550), // DPS: 32.7 diff --git a/game.h b/game.h index 9aee511..7fe951e 100755 --- a/game.h +++ b/game.h @@ -1497,7 +1497,7 @@ void SFG_setAndInitLevel(uint8_t levelNumber) d->coords[0] = i; d->coords[1] = j; - d->state = SFG_DOOR_DEFAULT_STATE; + d->state = 0x00; SFG_currentLevel.doorRecordCount++; } diff --git a/main_sdl.c b/main_sdl.c index 2c147c1..9acfb8d 100644 --- a/main_sdl.c +++ b/main_sdl.c @@ -28,14 +28,13 @@ #define SFG_LOG(str) puts(str); // #define SFG_START_LEVEL 6 - #define SFG_IMMORTAL 1 +// #define SFG_IMMORTAL 1 #define SFG_UNLOCK_DOOR 1 // #define SFG_REVEAL_MAP 1 // #define SFG_INFINITE_AMMO 1 // #define SFG_SCREEN_RESOLUTION_X 80 // #define SFG_SCREEN_RESOLUTION_Y 64 - #define SFG_SIMPLE_MENU 1 /* SDL is easier to play thanks to nice controls, so make the player take full