mob combat stats overhauled and standardized

1 files changed, 29 insertions, 20 deletions

diff --git a/data/mobs/examples/feral_cyborg.yaml b/data/mobs/examples/feral_cyborg.yaml
index 8b30cc3..e5edf3d 100644
--- a/data/mobs/examples/feral_cyborg.yaml
+++ b/data/mobs/examples/feral_cyborg.yaml
@@ -1,30 +1,10 @@
 name: feral cyborg
 description: "A heavily augmented human whose implants have driven them to madness. Razor-sharp blades extend from their forearms and their optical implant glows red."
-attack: 34
-strength: 36
-defense: 32
-hp: 82
-speed: 4
-aggressive: true
-respawn_ticks: 50
-attack_type: slash
-attack_bonus: 30
-strength_bonus: 28
-stab_defense: 35
-slash_defense: 45
-crush_defense: 30
-science_defense: -10
-ranged_defense: 35
 idle_descriptions:
   - "paces back and forth, muttering"
   - "retracts and extends forearm blades"
   - "emits a distorted laugh"
   - "scratches at their own cybernetics"
-combat_descriptions:
-  - "slashes %s with forearm blades"
-  - "delivers a powered kick to %s"
-  - "grapples %s with augmented strength"
-size: medium
 drops:
   remains: bones
   loot:
@@ -36,3 +16,32 @@ drops:
       quantity: 3
     - table: herb_table_mid
       weight: 15
+combat:
+  kind: combat
+  stats:
+    hp: 82
+    attack: 34
+    strength: 36
+    defense: 32
+    attack_type: slash
+    speed: 4
+    aggressive: true
+    respawn_ticks: 50
+    bonuses:
+      attack_bonus: 30
+      strength_bonus: 28
+      science_bonus: 0
+      science_percent_bonus: 0
+      ranged_bonus: 0
+      ranged_strength_bonus: 0
+    defenses:
+      stab_defense: 35
+      slash_defense: 45
+      crush_defense: 30
+      science_defense: -10
+      ranged_defense: 35
+  size: medium
+  combat_descriptions:
+    - "slashes %s with forearm blades"
+    - "delivers a powered kick to %s"
+    - "grapples %s with augmented strength"