mob combat stats overhauled and standardized

1 files changed, 30 insertions, 21 deletions

diff --git a/data/mobs/examples/psionic_entity.yaml b/data/mobs/examples/psionic_entity.yaml
index 1c518bf..1f270e6 100644
--- a/data/mobs/examples/psionic_entity.yaml
+++ b/data/mobs/examples/psionic_entity.yaml
@@ -1,31 +1,10 @@
 name: psionic entity
 description: "A barely visible distortion in the air, only detectable by the pressure it exerts on your mind. When it focuses, you see a shimmering outline of something vast and ancient."
-attack: 1
-strength: 1
-defense: 42
-hp: 128
-science: 97
-speed: 4
-aggressive: true
-respawn_ticks: 100
-attack_type: science
-attack_bonus: 0
-strength_bonus: 0
-stab_defense: 50
-slash_defense: 50
-crush_defense: 45
-science_defense: 70
-ranged_defense: -20
 idle_descriptions:
   - "probes the edges of your consciousness"
   - "flickers between visible and invisible states"
   - "emits a subsonic pulse you feel in your teeth"
   - "momentarily shows you visions of another dimension"
-combat_descriptions:
-  - "assaults %s's mind with psionic force"
-  - "tears at %s's perception of reality"
-  - "unleashes a devastating mental blast at %s"
-size: large
 drops:
   remains: ectoplasm
   loot:
@@ -44,3 +23,33 @@ drops:
       weight: 5
     - table: herb_table_high
       weight: 5
+combat:
+  kind: combat
+  stats:
+    hp: 128
+    attack: 1
+    strength: 1
+    defense: 42
+    science: 97
+    attack_type: science
+    speed: 4
+    aggressive: true
+    respawn_ticks: 100
+    bonuses:
+      attack_bonus: 0
+      strength_bonus: 0
+      science_bonus: 0
+      science_percent_bonus: 0
+      ranged_bonus: 0
+      ranged_strength_bonus: 0
+    defenses:
+      stab_defense: 50
+      slash_defense: 50
+      crush_defense: 45
+      science_defense: 70
+      ranged_defense: -20
+  size: large
+  combat_descriptions:
+    - "assaults %s's mind with psionic force"
+    - "tears at %s's perception of reality"
+    - "unleashes a devastating mental blast at %s"