shop fixes, 'toggle' completely removed, movement speed increased

1 files changed, 71 insertions, 21 deletions

diff --git a/data/mobs/guard.yaml b/data/mobs/guard.yaml
index 32617ce..04aacf5 100644
--- a/data/mobs/guard.yaml
+++ b/data/mobs/guard.yaml
@@ -1,26 +1,76 @@
-id: guard
-name: Guard
-description: "A stern-looking guard in weathered armor."
-behavior: guard_talk
-unique: true
-protected: true
+aggressive: false
 attack: 5
-strength: 5
+attack_bonus: 8
+attack_type: slash
+crush_defense: 10
 defense: 5
+description: A stern-looking guard in weathered armor.
 hp: 30
-speed: 5
-aggressive: false
+id: guard
+idle_descriptions:
+    - scans the area with a watchful eye
+    - adjusts the grip on his weapon
+    - nods curtly at passersby
+    - leans against the gate, arms folded
+name: Guard
+protected: true
+ranged_defense: 12
 respawn_ticks: 60
-attack_type: slash
-attack_bonus: 8
-strength_bonus: 6
-stab_defense: 12
-slash_defense: 15
-crush_defense: 10
 science_defense: -5
-ranged_defense: 12
-idle_descriptions:
-  - "scans the area with a watchful eye"
-  - "adjusts the grip on his weapon"
-  - "nods curtly at passersby"
-  - "leans against the gate, arms folded"
+slash_defense: 15
+speed: 5
+stab_defense: 12
+strength: 5
+strength_bonus: 6
+talk:
+    nodes:
+        about_gate:
+            action:
+                set_player_flags:
+                    talked_to_guard: true
+            message: '"Supplies. Weapons. Things you don''t need to worry about." He shifts his weight. "Tell you what — bring me some copper ore and I''ll stamp you a pass."'
+            options:
+                - end: true
+                  text: '"I''ll be back."'
+                - condition:
+                    has_item: copper_ore
+                  goto: trade_ore
+                  text: '"I have some right here."'
+                - end: true
+                  text: '"Goodbye."'
+        has_pass:
+            action:
+                set_flags:
+                    gate_open: true
+            message: '"Let me see that..." He examines your pass and nods. "Alright, I''ll open the gate for you."'
+            options:
+                - end: true
+                  text: '"Thanks."'
+        start:
+            message: '"Halt! This area is restricted." The guard eyes you suspiciously.'
+            options:
+                - goto: about_gate
+                  text: '"What''s behind that gate?"'
+                - condition:
+                    has_item: copper_ore
+                  goto: trade_ore
+                  text: '"I have copper ore."'
+                - condition:
+                    player_flag: got_pass
+                    value: true
+                  goto: has_pass
+                  text: '"I have a pass."'
+                - end: true
+                  text: '"Goodbye."'
+        trade_ore:
+            action:
+                give_item: pass_stub
+                set_player_flags:
+                    got_pass: true
+                    talked_to_guard: true
+                take_item: copper_ore
+            message: '"Good quality ore. This''ll do." He stamps a slip of paper and hands it to you. "That''s your pass. Don''t lose it."'
+            options:
+                - end: true
+                  text: '"Thanks."'
+unique: true