mob combat stats overhauled and standardized

1 files changed, 30 insertions, 21 deletions

diff --git a/data/mobs/examples/ghoul.yaml b/data/mobs/examples/ghoul.yaml
index ae8fed6..070d6f1 100644
--- a/data/mobs/examples/ghoul.yaml
+++ b/data/mobs/examples/ghoul.yaml
@@ -1,31 +1,10 @@
 name: ghoul
 description: "A radiation-scarred crew member, barely recognizable as human. Its flesh glows faintly and its eyes are hollow sockets."
-attack: 22
-strength: 22
-defense: 20
-hp: 54
-speed: 4
-aggressive: true
-respawn_ticks: 35
-attack_type: crush
-attack_bonus: 15
-strength_bonus: 12
-stab_defense: 20
-slash_defense: 25
-crush_defense: 15
-science_defense: -5
-ranged_defense: 20
-weakness: hydro
 idle_descriptions:
   - "shambles aimlessly and moans"
   - "scratches at the walls leaving glowing marks"
   - "stares blankly into the darkness"
   - "emits a low, rattling groan"
-combat_descriptions:
-  - "claws at %s with irradiated hands"
-  - "lunges at %s with a gurgling shriek"
-  - "bites %s with decaying teeth"
-size: medium
 drops:
   remains: bones
   loot:
@@ -36,3 +15,33 @@ drops:
       weight: 25
     - table: herb_table_low
       weight: 15
+combat:
+  kind: combat
+  stats:
+    hp: 54
+    attack: 22
+    strength: 22
+    defense: 20
+    attack_type: crush
+    speed: 4
+    aggressive: true
+    respawn_ticks: 35
+    bonuses:
+      attack_bonus: 15
+      strength_bonus: 12
+      science_bonus: 0
+      science_percent_bonus: 0
+      ranged_bonus: 0
+      ranged_strength_bonus: 0
+    defenses:
+      stab_defense: 20
+      slash_defense: 25
+      crush_defense: 15
+      science_defense: -5
+      ranged_defense: 20
+      weakness: hydro
+  size: medium
+  combat_descriptions:
+    - "claws at %s with irradiated hands"
+    - "lunges at %s with a gurgling shriek"
+    - "bites %s with decaying teeth"