From a3ea057994bf98f225c51ee5cd99d35d9a707464 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Thu, 11 Apr 2024 01:55:32 +0200
Subject: [PATCH] implement trips to metis prime station and serenity station

---
 src/chat.rs  |  6 ++++++
 src/defs.txt | 25 ++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/chat.rs b/src/chat.rs
index d959988..020f26f 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -347,6 +347,12 @@ pub fn handle_chat_scripts(
                         if script.param == "oscillation".to_string() {
                             *pos = Position(DVec3::new(147e6, 165e6, 336e6));
                         }
+                        else if script.param == "metisprime".to_string() {
+                            *pos = Position(DVec3::new(27643e3, -47e3, -124434e3));
+                        }
+                        else if script.param == "serenity".to_string() {
+                            *pos = Position(DVec3::new(-121095e3, 582e3, -190816e3));
+                        }
                         else {
                             error!("Invalid destination for cryotrip chat script: '{}'", script.param);
                         }
diff --git a/src/defs.txt b/src/defs.txt
index bb43f1b..0b90547 100644
--- a/src/defs.txt
+++ b/src/defs.txt
@@ -383,24 +383,31 @@ actor 100 -18000 2000 "orb_busstop"
         chat "busstopclippy"
             name "StarTrans Clippy™"
             msg 2 INIT question "You have reached the bus stop 'Serenity Station'"
-            msg 2 question wait "Ready for a trip?  Available stops: Oscillation Station, J-Prime Station"
+            msg 2 question wait "Ready for a trip?  Available stops: Oscillation Station, Metis Prime Station"
             msg 40 wait answer ""
                 sound none
             choice 2 answer how1 "Bus stop?! How does this work?"
                 msg 6 how1 how2 "StarTrans Cargo Service is the most convenient way to travel the vast distances of space."
                 msg 6 how2 how3 "Just activate your suit's built-in cryostasis. A StarTrans carrier will pick you up and you will wake up at your destination in the blink of an eye."
                 msg 40 how3 answer "Of course we will supply you with free oxygen and ensure your safety."
+            choice 2 answer vehicle "Can I take a spacecraft with me?"
+                msg 2 vehicle answer "Affirmative."
             choice 1 answer stopA1 "Take me to Oscillation Station, please."
                 msg 5 stopA1 stopA2 "StarTrans wishes you a pleasant journey."
                     script cryofadeout
                 msg 0 stopA2 EXIT ""
                     script cryotrip oscillation
                     sound none
-            choice 1 answer stopB1 "Take me to J-Prime Station, please."
+            choice 1 answer stopB1 "Take me to Metis Prime Station, please."
                 msg 5 stopB1 stopB2 "StarTrans wishes you a pleasant journey."
                     script cryofadeout
                 msg 0 stopB2 EXIT ""
-                    script cryotrip jprime
+                    script cryotrip metisprime
+            choice 1 answer stopC1 "Take me to Serenity Station, please."
+                msg 5 stopC1 stopC2 "StarTrans wishes you a pleasant journey."
+                    script cryofadeout
+                msg 0 stopC2 EXIT ""
+                    script cryotrip serenity
             choice 1 answer oxy "Can you please fill up my oxygen tank without taking me anywhere?"
                 msg 2 oxy EXIT "Acceptable."
                     script refilloxygen 1000
@@ -426,7 +433,7 @@ actor 100 -18000 2000 "orb_busstop"
         light "47FF00" 1000000
     actor 8 2 0 suit
         relativeto "busstopclippy"
-        name "Mayhem"
+        name "Rudy"
         wants maxrotation 0.2
         wants maxvelocity 0
         thrust 1.2 1 1 400 1.5
@@ -440,7 +447,7 @@ actor 100 -18000 2000 "orb_busstop"
             msg 0 cryo EXIT "Lifeform in cryostasis detected."
                 lvl info
 
-actor 147002e3 165e6 336e6 "orb_busstop"
+actor 147002e3 165001e3 336e6 "orb_busstop"
     relativeto jupiter
     id "busstop2"
     name "StarTrans Bus Station 'Oscillation Station'"
@@ -448,6 +455,14 @@ actor 147002e3 165e6 336e6 "orb_busstop"
     wants maxrotation 0
     wants maxvelocity 0
 
+actor 27643e3 -44e3 -124434e3 "orb_busstop"
+    relativeto jupiter
+    id "busstop3"
+    name "StarTrans Bus Station 'Metis Prime'"
+    scale 100
+    wants maxrotation 0
+    wants maxvelocity 0
+
 chat error
     name ERROR
     msg 0 INIT EXIT "Unspecified conversation ID"