mob combat stats overhauled and standardized

1 files changed, 31 insertions, 22 deletions

diff --git a/data/mobs/examples/corrupted_scientist.yaml b/data/mobs/examples/corrupted_scientist.yaml
index 2083c03..aeda04d 100644
--- a/data/mobs/examples/corrupted_scientist.yaml
+++ b/data/mobs/examples/corrupted_scientist.yaml
@@ -1,32 +1,10 @@
 name: corrupted scientist
 description: "A researcher whose mind was consumed by their own experiments. Energy crackles around their fingertips and their lab coat is singed and tattered."
-attack: 1
-strength: 1
-defense: 18
-hp: 40
-science: 50
-speed: 5
-aggressive: true
-respawn_ticks: 45
-attack_type: science
-attack_bonus: 0
-strength_bonus: 0
-stab_defense: 25
-slash_defense: 25
-crush_defense: 20
-science_defense: 35
-ranged_defense: -5
-weakness: eco
 idle_descriptions:
   - "mutters incomprehensible formulas"
   - "energy arcs between their fingers"
   - "scribbles equations on the wall in soot"
   - "stares at their own hands in horror"
-combat_descriptions:
-  - "blasts %s with a burst of unstable energy"
-  - "unleashes a wave of chaotic force at %s"
-  - "channels raw power through their hands at %s"
-size: medium
 drops:
   remains: bones
   loot:
@@ -41,3 +19,34 @@ drops:
       quantity: 2
     - table: herb_table_mid
       weight: 15
+combat:
+  kind: combat
+  stats:
+    hp: 40
+    attack: 1
+    strength: 1
+    defense: 18
+    science: 50
+    attack_type: science
+    speed: 5
+    aggressive: true
+    respawn_ticks: 45
+    bonuses:
+      attack_bonus: 0
+      strength_bonus: 0
+      science_bonus: 0
+      science_percent_bonus: 0
+      ranged_bonus: 0
+      ranged_strength_bonus: 0
+    defenses:
+      stab_defense: 25
+      slash_defense: 25
+      crush_defense: 20
+      science_defense: 35
+      ranged_defense: -5
+      weakness: eco
+  size: medium
+  combat_descriptions:
+    - "blasts %s with a burst of unstable energy"
+    - "unleashes a wave of chaotic force at %s"
+    - "channels raw power through their hands at %s"