From f842560d6110da0d3a455900e647db2fb24ebed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <drummyfish@disroot.org>
Date: Fri, 11 Sep 2020 21:22:57 +0200
Subject: [PATCH] Update map

---
 assets/level4.gif | Bin 4605 -> 4659 bytes
 constants.h       |   8 ++++----
 game.h            |  22 +++++++++++++++-------
 settings.h        |  20 +++++++++++++++-----
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/assets/level4.gif b/assets/level4.gif
index 5544a9f34e2ea37c59377913417f0c2f4068e718..ec26ad4018a9b0b1361e4b8e6dddd573fee4c285 100644
GIT binary patch
delta 2203
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
AlK=n!

delta 2148
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

diff --git a/constants.h b/constants.h
index 1fda361..5d9624b 100644
--- a/constants.h
+++ b/constants.h
@@ -477,10 +477,10 @@ 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),
-  /* shotgun  */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_BULLET,2,1200),
+  /* shotgun  */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_BULLET,2,1400),
   /* m. gun   */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_BULLET,1,700),
-  /* r. laun. */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_FIREBALL,1,900),
-  /* plasma   */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_PLASMA,1,550),
+  /* r. laun. */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_FIREBALL,1,850),
+  /* plasma   */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_PLASMA,1,600),
   /* solution */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_PLASMA,4,1050)
 };
 
@@ -488,7 +488,7 @@ SFG_PROGRAM_MEMORY uint8_t SFG_attackDamageTable[SFG_WEAPON_FIRE_TYPES_TOTAL] =
 {
   /* melee                 */ 7,
   /* bullet                */ 10,
-  /* explostion (fireball) */ 13,
+  /* explostion (fireball) */ 17,
   /* plasma                */ 17
 };
 
diff --git a/game.h b/game.h
index 7cb8d2f..9660a40 100755
--- a/game.h
+++ b/game.h
@@ -1707,6 +1707,17 @@ void SFG_playerChangeHealth(int8_t healthAdd)
     SFG_player.lastHurtFrame = SFG_game.frame;
 }
 
+void SFG_playerChangeHealthWithMiltiplier(int8_t healthAdd)
+{
+  if (healthAdd < 0)
+    healthAdd =
+      RCL_min(-1,
+      (((RCL_Unit) healthAdd) * SFG_PLAYER_DAMAGE_MULTIPLIER) /
+      RCL_UNITS_PER_SQUARE);
+
+  SFG_playerChangeHealth(healthAdd);
+}
+
 uint8_t SFG_distantSoundVolume(RCL_Unit x, RCL_Unit y, RCL_Unit z)
 {
   RCL_Unit distance = SFG_taxicabDistance(x,y,z,
@@ -1819,7 +1830,7 @@ void SFG_createExplosion(RCL_Unit x, RCL_Unit y, RCL_Unit z)
   uint8_t damage = SFG_getDamageValue(SFG_WEAPON_FIRE_TYPE_FIREBALL);
 
   if (SFG_pushPlayerAway(x,y,SFG_EXPLOSION_PUSH_AWAY_DISTANCE))
-    SFG_playerChangeHealth(-1 * damage);
+    SFG_playerChangeHealthWithMiltiplier(-1 * damage);
 
   for (uint16_t i = 0; i < SFG_currentLevel.monsterRecordCount; ++i)
   {
@@ -2067,7 +2078,7 @@ void SFG_monsterPerformAI(SFG_MonsterRecord *monster)
 
           state = SFG_MONSTER_STATE_ATTACKING;
 
-          SFG_playerChangeHealth(
+          SFG_playerChangeHealthWithMiltiplier(
             -1 * SFG_getDamageValue(SFG_WEAPON_FIRE_TYPE_MELEE)); 
               
           SFG_playGameSound(3,255);
@@ -2081,10 +2092,7 @@ void SFG_monsterPerformAI(SFG_MonsterRecord *monster)
           SFG_TileDefinition tile =
             SFG_getMapTile(SFG_currentLevel.levelPointer,mX,mY,&properties);
          
-          SFG_createExplosion(mX * RCL_UNITS_PER_SQUARE,
-            mY * RCL_UNITS_PER_SQUARE,
-            SFG_TILE_FLOOR_HEIGHT(tile) * SFG_WALL_HEIGHT_STEP +
-            SFG_WALL_HEIGHT_STEP);
+          SFG_createExplosion(pX,pY,pZ);
 
           monster->health = 0;
         }
@@ -2294,7 +2302,7 @@ void SFG_updateLevel()
             SFG_player.camera.height))
         {
           eliminate = 1;
-          SFG_playerChangeHealth(-1 * SFG_getDamageValue(attackType));
+          SFG_playerChangeHealthWithMiltiplier(-1 * SFG_getDamageValue(attackType));
         }
 
       /* check collision with the map (we don't use SFG_floorCollisionHeightAt
diff --git a/settings.h b/settings.h
index 8ee8a23..3ce4870 100644
--- a/settings.h
+++ b/settings.h
@@ -26,7 +26,9 @@
   integers and rounding errors can occur soon, so don't set this to extreme
   values (try to keep from 20 to 100).
 */
-#define SFG_FPS 60
+#ifndef SFG_FPS
+  #define SFG_FPS 60
+#endif
 
 /**
   On platforms with mouse this sets its horizontal sensitivity. 128 means 1
@@ -81,6 +83,14 @@
   #define SFG_RESOLUTION_SCALEDOWN 1
 #endif
 
+/**
+  Multiplier, in RCL_Units (1024 == 1.0), of the damager player takes. This can
+  be used to balance difficulty.
+*/
+#ifndef SFG_PLAYER_DAMAGE_MULTIPLIER
+  #define SFG_PLAYER_DAMAGE_MULTIPLIER 512
+#endif
+
 /**
   Hint as to whether run in fullscreen, if the platform allows it.
 */
@@ -301,14 +311,14 @@
   Developer cheat for having infinite ammo in all weapons.
 */
 #ifndef SFG_INFINITE_AMMO
-  #define SFG_INFINITE_AMMO 1
+  #define SFG_INFINITE_AMMO 0
 #endif
 
 /**
   Developer cheat for immortality.
 */
 #ifndef SFG_IMMORTAL
-  #define SFG_IMMORTAL 1
+  #define SFG_IMMORTAL 0
 #endif
 
 /**
@@ -330,14 +340,14 @@
   options is ignored, 1 means load level 1 etc.
 */
 #ifndef SFG_START_LEVEL
-  #define SFG_START_LEVEL 6
+  #define SFG_START_LEVEL 0
 #endif
 
 /**
   Reveals whole level map from start.
 */
 #ifndef SFG_REVEAL_MAP
-  #define SFG_REVEAL_MAP 1
+  #define SFG_REVEAL_MAP 0
 #endif
 
 /**