diff --git a/assets/level4.gif b/assets/level4.gif index 3eaf30b..5379c8f 100644 Binary files a/assets/level4.gif and b/assets/level4.gif differ diff --git a/constants.h b/constants.h index 7dc5378..124c674 100644 --- a/constants.h +++ b/constants.h @@ -425,6 +425,7 @@ #define SFG_MONSTER_ATTACK_FIREBALL_BULLET 3 #define SFG_MONSTER_ATTACK_PLASMA 4 #define SFG_MONSTER_ATTACK_EXPLODE 5 +#define SFG_MONSTER_ATTACK_FIREBALL_PLASMA 6 #define SFG_MONSTER_ATTRIBUTE(attackType,aggressivity0to255,health0to255,spriteSize0to3) \ ((uint16_t) ( \ @@ -461,7 +462,7 @@ uint16_t SFG_monsterAttributeTable[SFG_MONSTERS_TOTAL] = /* destr. */ SFG_MONSTER_ATTRIBUTE(SFG_MONSTER_ATTACK_FIREBALL_BULLET,165,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_BULLET,75,255,3), + /* ender */ SFG_MONSTER_ATTRIBUTE(SFG_MONSTER_ATTACK_FIREBALL_PLASMA,75,255,3), /* turret */ SFG_MONSTER_ATTRIBUTE(SFG_MONSTER_ATTACK_BULLET,32,23,0), /* explod. */ SFG_MONSTER_ATTRIBUTE(SFG_MONSTER_ATTACK_EXPLODE,255,36,1) }; diff --git a/game.h b/game.h index 8de5833..9b5878c 100755 --- a/game.h +++ b/game.h @@ -2174,6 +2174,12 @@ void SFG_monsterPerformAI(SFG_MonsterRecord *monster) SFG_PROJECTILE_BULLET; break; + case SFG_MONSTER_ATTACK_FIREBALL_PLASMA: + projectile = (SFG_random() < 128) ? + SFG_PROJECTILE_FIREBALL : + SFG_PROJECTILE_PLASMA; + break; + default: projectile = SFG_PROJECTILE_NONE; break; @@ -4341,7 +4347,7 @@ void SFG_drawWinOverlay() uint32_t time = blink ? timeTotal : SFG_currentLevel.completionTime10sOfS; x += SFG_drawNumber(time / 10,x,y,SFG_FONT_SIZE_SMALL,7) * - CHAR_SIZE; + CHAR_SIZE + SFG_FONT_SIZE_SMALL; char timeRest[5] = ".X s"; diff --git a/main_sdl.c b/main_sdl.c index 1d842cb..53da6b4 100644 --- a/main_sdl.c +++ b/main_sdl.c @@ -29,7 +29,7 @@ // #define SFG_START_LEVEL 6 // #define SFG_IMMORTAL 1 - #define SFG_UNLOCK_DOOR 1 +// #define SFG_UNLOCK_DOOR 1 // #define SFG_REVEAL_MAP 1 // #define SFG_INFINITE_AMMO 1