From 0b6fe11e389c4af1d92ba097af080c5607d51d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= Date: Mon, 28 Sep 2020 19:26:48 +0200 Subject: [PATCH] Update level --- assets/level6.gif | Bin 4891 -> 5045 bytes constants.h | 9 ++++----- game.h | 2 +- main_sdl.c | 3 +-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/assets/level6.gif b/assets/level6.gif index f347ac1c7b4a8cd7cd7b465c7317bc5050f20035..c0657b79865c1b8dc6dc9a0598d6c41594aab554 100644 GIT binary patch delta 3612 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 tDJD_IZY&c9+7WVW6E5)+K=H> 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