fix: combat formulas and mob attack types (mobs switch attack styles if safespotting)

1 files changed, 51 insertions, 48 deletions

diff --git a/data/mobs/examples/war_drone.yaml b/data/mobs/examples/war_drone.yaml
index 7255a45..e0136a9 100644
--- a/data/mobs/examples/war_drone.yaml
+++ b/data/mobs/examples/war_drone.yaml
@@ -1,51 +1,54 @@
-name: war drone
-description: "An upgraded combat drone with reinforced plating and a heavier weapons array. Its targeting systems whir as it locks onto you."
-idle_descriptions:
-  - "hovers aggressively, weapons armed"
-  - "emits a low, threatening hum"
-  - "paints a targeting reticle on the wall"
-  - "cycles through weapon modes with a click"
-drops:
-  remains: circuit_board
-  loot:
-    - item_id: credits
-      weight: 60
-      quantity: 200
-    - item_id: scrap
-      weight: 20
-      quantity: 4
-    - item_id: credits
-      weight: 10
-      quantity: 500
-    - table: gem_table
-      weight: 10
 combat:
-  kind: combat
-  stats:
-    hp: 65
-    attack: 25
-    strength: 28
-    defense: 25
-    attack_type: slash
-    speed: 4
     aggressive: true
+    attack_types:
+        - slash
+    combat_descriptions:
+        - fires a plasma bolt at %s
+        - slashes at %s with a rotary blade
+        - launches a concussion grenade at %s
+    kind: combat
     respawn_ticks: 50
-    bonuses:
-      attack_bonus: 20
-      strength_bonus: 18
-      science_bonus: 0
-      science_percent_bonus: 0
-      ranged_bonus: 0
-      ranged_strength_bonus: 0
-    defenses:
-      stab_defense: 35
-      slash_defense: 30
-      crush_defense: 40
-      science_defense: -10
-      ranged_defense: 20
-      weakness: solar
-  size: medium
-  combat_descriptions:
-    - "fires a plasma bolt at %s"
-    - "slashes at %s with a rotary blade"
-    - "launches a concussion grenade at %s"
+    size: medium
+    stats:
+        attack: 25
+        bonuses:
+            attack_bonus: 20
+            ranged_bonus: 0
+            ranged_strength_bonus: 0
+            science_bonus: 0
+            science_percent_bonus: 0
+            strength_bonus: 18
+        defense: 25
+        defenses:
+            crush_defense: 40
+            ranged_defense: 20
+            science_defense: -10
+            slash_defense: 30
+            stab_defense: 35
+            weakness: solar
+            weakness_percent: 50
+        hp: 65
+        max_melee_hit: 5
+        speed: 4
+        strength: 28
+description: An upgraded combat drone with reinforced plating and a heavier weapons array. Its targeting systems whir as it locks onto you.
+drops:
+    loot:
+        - item_id: credits
+          quantity: 200
+          weight: 60
+        - item_id: scrap
+          quantity: 4
+          weight: 20
+        - item_id: credits
+          quantity: 500
+          weight: 10
+        - table: gem_table
+          weight: 10
+    remains: circuit_board
+idle_descriptions:
+    - hovers aggressively, weapons armed
+    - emits a low, threatening hum
+    - paints a targeting reticle on the wall
+    - cycles through weapon modes with a click
+name: war drone