mob combat stats overhauled and standardized

1 files changed, 30 insertions, 21 deletions

diff --git a/data/mobs/examples/veteran_merc.yaml b/data/mobs/examples/veteran_merc.yaml
index 88238b6..71e3826 100644
--- a/data/mobs/examples/veteran_merc.yaml
+++ b/data/mobs/examples/veteran_merc.yaml
@@ -1,31 +1,10 @@
 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."
-attack: 1
-strength: 1
-defense: 40
-hp: 93
-ranged: 79
-speed: 5
-aggressive: true
-respawn_ticks: 65
-attack_type: ranged
-attack_bonus: 0
-strength_bonus: 0
-stab_defense: 40
-slash_defense: 40
-crush_defense: 35
-science_defense: 20
-ranged_defense: 55
 idle_descriptions:
   - "checks their rifle's ammunition counter"
   - "adjusts their tactical vest"
   - "scans the area through their scope"
   - "spits and mutters a war story"
-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
 drops:
   remains: bones
   loot:
@@ -40,3 +19,33 @@ drops:
       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
+    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"