fix: combat formulas and mob attack types (mobs switch attack styles if safespotting)

1 files changed, 52 insertions, 48 deletions

diff --git a/data/mobs/examples/veteran_merc.yaml b/data/mobs/examples/veteran_merc.yaml
index 71e3826..0e187c1 100644
--- a/data/mobs/examples/veteran_merc.yaml
+++ b/data/mobs/examples/veteran_merc.yaml
@@ -1,51 +1,55 @@
-name: veteran merc
-description: "A battle-hardened soldier with a high-powered rifle and tactical armor covered in campaign patches. Their cybernetic eye locks onto you instantly."
-idle_descriptions:
-  - "checks their rifle's ammunition counter"
-  - "adjusts their tactical vest"
-  - "scans the area through their scope"
-  - "spits and mutters a war story"
-drops:
-  remains: bones
-  loot:
-    - item_id: credits
-      weight: 55
-      quantity: 1200
-    - item_id: chaosjunk
-      weight: 15
-      quantity: 2
-    - item_id: deathjunk
-      weight: 15
-      quantity: 2
-    - table: herb_table_mid
-      weight: 15
 combat:
-  kind: combat
-  stats:
-    hp: 93
-    attack: 1
-    strength: 1
-    defense: 40
-    ranged: 79
-    attack_type: ranged
-    speed: 5
     aggressive: true
+    attack_types:
+        - stab
+        - ranged
+    combat_descriptions:
+        - fires a high-caliber round at %s
+        - puts %s in their crosshairs and squeezes the trigger
+        - unleashes suppressive fire at %s
+    kind: combat
     respawn_ticks: 65
-    bonuses:
-      attack_bonus: 0
-      strength_bonus: 0
-      science_bonus: 0
-      science_percent_bonus: 0
-      ranged_bonus: 0
-      ranged_strength_bonus: 0
-    defenses:
-      stab_defense: 40
-      slash_defense: 40
-      crush_defense: 35
-      science_defense: 20
-      ranged_defense: 55
-  size: medium
-  combat_descriptions:
-    - "fires a high-caliber round at %s"
-    - "puts %s in their crosshairs and squeezes the trigger"
-    - "unleashes suppressive fire at %s"
+    size: medium
+    stats:
+        attack: 55
+        bonuses:
+            attack_bonus: 0
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 0
+        defense: 40
+        defenses:
+            crush_defense: 35
+            ranged_defense: 55
+            science_defense: 20
+            slash_defense: 40
+            stab_defense: 40
+        hp: 93
+        max_melee_hit: 8
+        max_ranged_hit: 9
+        ranged: 79
+        speed: 5
+        strength: 55
+description: A battle-hardened soldier with a high-powered rifle and tactical armor covered in campaign patches. Their cybernetic eye locks onto you instantly.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 1200
+          weight: 55
+        - item_id: chaosjunk
+          quantity: 2
+          weight: 15
+        - item_id: deathjunk
+          quantity: 2
+          weight: 15
+        - table: herb_table_mid
+          weight: 15
+    remains: bones
+idle_descriptions:
+    - checks their rifle's ammunition counter
+    - adjusts their tactical vest
+    - scans the area through their scope
+    - spits and mutters a war story
+name: veteran merc