mob combat stats overhauled and standardized

1 files changed, 31 insertions, 22 deletions

diff --git a/data/mobs/examples/security_turret.yaml b/data/mobs/examples/security_turret.yaml
index 9929106..05fce67 100644
--- a/data/mobs/examples/security_turret.yaml
+++ b/data/mobs/examples/security_turret.yaml
@@ -1,32 +1,10 @@
 name: security turret
 description: "A ceiling-mounted auto-turret with twin barrels and a red targeting laser. It tracks you with mechanical precision."
-attack: 1
-strength: 1
-defense: 16
-hp: 44
-ranged: 34
-speed: 5
-aggressive: true
-respawn_ticks: 40
-attack_type: ranged
-attack_bonus: 0
-strength_bonus: 0
-stab_defense: 30
-slash_defense: 20
-crush_defense: 40
-science_defense: -20
-ranged_defense: 15
-weakness: solar
 idle_descriptions:
   - "pans the room with a targeting laser"
   - "emits a rhythmic clicking sound"
   - "calibrates its targeting sensors"
   - "beeps a warning tone"
-combat_descriptions:
-  - "fires twin bolts at %s"
-  - "unleashes a burst of rounds at %s"
-  - "locks onto %s and opens fire"
-size: small
 drops:
   remains: scrap
   loot:
@@ -39,3 +17,34 @@ drops:
     - item_id: credits
       weight: 10
       quantity: 250
+combat:
+  kind: combat
+  stats:
+    hp: 44
+    attack: 1
+    strength: 1
+    defense: 16
+    ranged: 34
+    attack_type: ranged
+    speed: 5
+    aggressive: true
+    respawn_ticks: 40
+    bonuses:
+      attack_bonus: 0
+      strength_bonus: 0
+      science_bonus: 0
+      science_percent_bonus: 0
+      ranged_bonus: 0
+      ranged_strength_bonus: 0
+    defenses:
+      stab_defense: 30
+      slash_defense: 20
+      crush_defense: 40
+      science_defense: -20
+      ranged_defense: 15
+      weakness: solar
+  size: small
+  combat_descriptions:
+    - "fires twin bolts at %s"
+    - "unleashes a burst of rounds at %s"
+    - "locks onto %s and opens fire"