mob combat stats overhauled and standardized

1 files changed, 29 insertions, 20 deletions

diff --git a/data/mobs/examples/scrap_bot.yaml b/data/mobs/examples/scrap_bot.yaml
index a8b34d8..44d92aa 100644
--- a/data/mobs/examples/scrap_bot.yaml
+++ b/data/mobs/examples/scrap_bot.yaml
@@ -1,30 +1,10 @@
 name: scrap bot
 description: "A malfunctioning maintenance robot that has gone rogue. Its chassis is covered in dents and rust, and one optical sensor flickers erratically."
-attack: 15
-strength: 15
-defense: 14
-hp: 30
-speed: 5
-aggressive: true
-respawn_ticks: 30
-attack_type: crush
-attack_bonus: 10
-strength_bonus: 8
-stab_defense: 20
-slash_defense: 15
-crush_defense: 25
-science_defense: -5
-ranged_defense: 10
 idle_descriptions:
   - "beeps erratically and twitches"
   - "bumps into a wall and reverses"
   - "emits a burst of static"
   - "scans the floor with a flickering beam"
-combat_descriptions:
-  - "rams %s with its chassis"
-  - "swings a broken manipulator arm at %s"
-  - "discharges a spark at %s"
-size: medium
 drops:
   remains: scrap
   loot:
@@ -37,3 +17,32 @@ drops:
     - item_id: credits
       weight: 10
       quantity: 100
+combat:
+  kind: combat
+  stats:
+    hp: 30
+    attack: 15
+    strength: 15
+    defense: 14
+    attack_type: crush
+    speed: 5
+    aggressive: true
+    respawn_ticks: 30
+    bonuses:
+      attack_bonus: 10
+      strength_bonus: 8
+      science_bonus: 0
+      science_percent_bonus: 0
+      ranged_bonus: 0
+      ranged_strength_bonus: 0
+    defenses:
+      stab_defense: 20
+      slash_defense: 15
+      crush_defense: 25
+      science_defense: -5
+      ranged_defense: 10
+  size: medium
+  combat_descriptions:
+    - "rams %s with its chassis"
+    - "swings a broken manipulator arm at %s"
+    - "discharges a spark at %s"