feat: shop system overhauled, gui conversation tree editor overhauled

2 files changed, 26 insertions, 13 deletions

diff --git a/data/objects/netrunner.yaml b/data/objects/netrunner.yaml
index fa4db20..7d75a51 100644
--- a/data/objects/netrunner.yaml
+++ b/data/objects/netrunner.yaml
@@ -5,7 +5,8 @@ name: Netrunner
 talk:
     nodes:
         start:
-            message: The Netrunner looks up. "You want in on the network? I can give you some pointers."
+            messages:
+                - The Netrunner looks up. "You want in on the network? I can give you some pointers."
             options:
                 - goto: what_is
                   text: '"What is hacking?"'
@@ -25,7 +26,8 @@ talk:
                   text: '"Tell me about the secure terminal."'
                 - text: '"Goodbye."'
         terminals:
-            message: '"There''s a basic terminal right here in this lab -- good for beginners. The station down east has an advanced one if you''ve got the chops. And if you''re really good, there''s a secure terminal deep in the compound. You''ll need the skills to match though."'
+            messages:
+                - '"There''s a basic terminal right here in this lab -- good for beginners. The station down east has an advanced one if you''ve got the chops. And if you''re really good, there''s a secure terminal deep in the compound. You''ll need the skills to match though."'
             options:
                 - goto: tips_basic
                   text: '"Any tips?"'
@@ -34,7 +36,8 @@ talk:
             action:
                 set_player_flags:
                     hacking_asked_advanced: true
-            message: '"Advanced terminal runs a cipher crack. Four symbols, no repeats. You get feedback after each guess -- locked means right spot, found means right symbol wrong spot. Process of elimination. Ten tries."'
+            messages:
+                - '"Advanced terminal runs a cipher crack. Four symbols, no repeats. You get feedback after each guess -- locked means right spot, found means right symbol wrong spot. Process of elimination. Ten tries."'
             options:
                 - goto: tips_secure
                   text: '"Tell me about the secure terminal."'
@@ -43,17 +46,20 @@ talk:
             action:
                 set_player_flags:
                     hacking_asked_basic: true
-            message: '"The basic terminal runs an old rogue AI hunt. Twenty nodes in a network. You''ve got probes to flush it out. Listen for the warnings -- corrupted data means it''s close, voids mean a trap, static means ICE. Shoot into adjacent nodes, don''t walk into danger."'
+            messages:
+                - '"The basic terminal runs an old rogue AI hunt. Twenty nodes in a network. You''ve got probes to flush it out. Listen for the warnings -- corrupted data means it''s close, voids mean a trap, static means ICE. Shoot into adjacent nodes, don''t walk into danger."'
             options:
                 - goto: tips_advanced
                   text: '"What about the advanced terminal?"'
                 - text: '"Thanks."'
         tips_secure:
-            message: '"Secure terminal? Signal Bluff. It''s a bluffing game -- you and the system each roll hidden dice and take turns making claims about the total. Ones are wild. Call the bluff or raise the stakes. Read the probabilities, play the odds, and don''t let it psych you out."'
+            messages:
+                - '"Secure terminal? Signal Bluff. It''s a bluffing game -- you and the system each roll hidden dice and take turns making claims about the total. Ones are wild. Call the bluff or raise the stakes. Read the probabilities, play the odds, and don''t let it psych you out."'
             options:
                 - text: '"Thanks."'
         what_is:
-            message: '"Hacking''s about jacking into terminals and running their gauntlets. Each terminal runs a different challenge -- puzzles, hunts, pattern games. Crack ''em and you get better at it. Simple as that."'
+            messages:
+                - '"Hacking''s about jacking into terminals and running their gauntlets. Each terminal runs a different challenge -- puzzles, hunts, pattern games. Crack ''em and you get better at it. Simple as that."'
             options:
                 - goto: terminals
                   text: '"Where can I find terminals?"'
diff --git a/data/objects/tool_shed.yaml b/data/objects/tool_shed.yaml
index 3490360..119d3e2 100644
--- a/data/objects/tool_shed.yaml
+++ b/data/objects/tool_shed.yaml
@@ -10,7 +10,8 @@ talk:
                 give_item: rake
                 set_player_flags:
                     tool_shed_rake: false
-            message: You retrieve the rake from the tool shed.
+            messages:
+                - You retrieve the rake from the tool shed.
             options:
                 - goto: start
                   text: Continue
@@ -19,7 +20,8 @@ talk:
                 give_item: spade
                 set_player_flags:
                     tool_shed_spade: false
-            message: You retrieve the spade from the tool shed.
+            messages:
+                - You retrieve the spade from the tool shed.
             options:
                 - goto: start
                   text: Continue
@@ -28,12 +30,14 @@ talk:
                 give_item: watering_can
                 set_player_flags:
                     tool_shed_watering_can: false
-            message: You retrieve the watering can from the tool shed.
+            messages:
+                - You retrieve the watering can from the tool shed.
             options:
                 - goto: start
                   text: Continue
         start:
-            message: The tool shed is open. What would you like to do?
+            messages:
+                - The tool shed is open. What would you like to do?
             options:
                 - condition:
                     has_item: rake
@@ -65,7 +69,8 @@ talk:
                 set_player_flags:
                     tool_shed_rake: true
                 take_item: rake
-            message: You store the rake in the tool shed.
+            messages:
+                - You store the rake in the tool shed.
             options:
                 - goto: start
                   text: Continue
@@ -74,7 +79,8 @@ talk:
                 set_player_flags:
                     tool_shed_spade: true
                 take_item: spade
-            message: You store the spade in the tool shed.
+            messages:
+                - You store the spade in the tool shed.
             options:
                 - goto: start
                   text: Continue
@@ -83,7 +89,8 @@ talk:
                 set_player_flags:
                     tool_shed_watering_can: true
                 take_item: watering_can
-            message: You store the watering can in the tool shed.
+            messages:
+                - You store the watering can in the tool shed.
             options:
                 - goto: start
                   text: Continue