Aftershock: Fix the escape pod sequence (Once and for all?) (#72225)

* Mapgen Adjust Escapepod bay * New computers and interactions * Fix text spacing * More text fixing
CleverRaven · May 18, 2024 · 107d525 · 107d525
1 parent a68ab9a
commit 107d525
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 21 deletions.
diff --git a/data/mods/Aftershock/maps/crashing_ship.json b/data/mods/Aftershock/maps/crashing_ship.json
@@ -52,24 +52,24 @@
         "Mpppv.*.....*.....*.....*.....*....**....*.....*.....*.....*.....*...pPM",
         "MPPPpv...............................................................pPM",
         "MPPpMMMMMMMMMMMMMMMMMMMMMddddddddddddddddddddddMMMMMMMMMMMMDDMMMMMMMMMMM",
-        "MPPPv................*....*..................*.MM.....cx...............M",
-        "MPvYYYYYYYYYYYYYYYYYY..................pp......MM.MMM..x..........(YYY.M",
-        "M.....................................ppPp.....MM.MFDxx*x.......*..YYY.M",
-        "M....................................pppPpp....MM.MMM(x............YYY.M",
-        "M....................................pPPpp.....MM..xcx.................M",
-        "M.....................................ppp......MM.YYY.............(YYY.M",
-        "M..............................................MM.YYY..*........*..YYY.M",
-        "M..YYYYYYYYYYYYYYYYYY..........................MM.YYY(.............YYY.M",
-        "M..............................................MM.................pPPppM",
-        "M.*..................*....*..................*.MM.YYY.............(YYY.M",
-        "M..............................................MM.YYY..*........*..YYY.M",
-        "M..YYYYYYYYYYYYYYYYYY..........................MM.YYY(.............YYY.M",
-        "M................p.............................MM......................M",
-        "M...............ppp............................MM.YYY.............^MMM.M",
-        "M..............ppPpp...........................MM.YYY..*........*..dzM.M",
-        "M...............ppp............................MM.YYY(.............MMM.M",
-        "M................p.............................MM......................M",
-        "M..YYYYYYYYYYYYYYYYYY..........................MMMMMMMMMMMMMDDMMMMMMMMMM",
+        "MPPPv................*....*..................*.MMMMMMMcx..........MMMMMM",
+        "MPvYYYYYYYYYYYYYYYYYY..................pp......MM.MMMM(x.........(MYYY.M",
+        "M.....................................ppPp.....MM.MFDxx*x.......*.dYYY.M",
+        "M....................................pppPpp....MM.MMMMMxx........MMYYY.M",
+        "M....................................pPPpp.....MMMMMMMMxc........MMMMMMM",
+        "M.....................................ppp......MM.YYYM(x.x.......(MYYY.M",
+        "M..............................................MM.YYYd.*........*.dYYY.M",
+        "M..YYYYYYYYYYYYYYYYYY..........................MM.YYYMM..........MMYYY.M",
+        "M..............................................MMMMMMMM..........MMMMMMM",
+        "M.*..................*....*..................*.MM.YYYM(..........(MYYY.M",
+        "M..............................................MM.YYYd.*........*.dYYY.M",
+        "M..YYYYYYYYYYYYYYYYYY..........................MM.YYYMM..........MMYYY.M",
+        "M................p.............................MMMMMMMM..........MMMMMMM",
+        "M...............ppp............................MM.YYYM(..........^MMZM.M",
+        "M..............ppPpp...........................MM.YYYd.*........* ddzM.M",
+        "M...............ppp............................MM.YYYMM..........MMMMM.M",
+        "M................p.............................MMMMMMMM..........MMMMMMM",
+        "M..YYYYYYYYYYYYYYYYYY..........................MMMMMMMMMMMMDDMMMMMMMMMMM",
         "M..............................................MME....................EM",
         "M.*..................*....*......pp..........*.MME....................EM",
         "M...............................ppPp...........MM.*Y....Y......Y....Y*.M",
@@ -149,15 +149,14 @@
         "J": "t_chainfence",
         "j": "t_chaingate_l",
         "W": "t_reinforced_glass_shutter",
+        "Z": "t_afs_escapepod_g_shipboard",
         "P": "t_foamcrete_wall_seal",
         "p": "t_foamcrete_floor_seal",
         "z": "t_escape_pod_floor"
       },
       "place_zones": [ { "type": "ZONE_START_POINT", "faction": "your_followers", "x": 19, "y": 14 } ],
-      "set": [ { "point": "trap", "id": "tr_escape_pod", "x": 68, "y": 42 } ],
       "mapping": {
         "e": { "items": [ { "item": "afs_ballistic_armory", "chance": 20 } ] },
-        "z": { "traps": [ "tr_escape_pod", 1 ] },
         "L": {
           "items": [
             { "item": "gear_soldier_sidearm", "chance": 33 },
@@ -216,7 +215,7 @@
         { "text": "Escape Pods & Vehicle Bay", "x": 61, "y": 27 }
       ],
       "fields": { "F": { "field": "fd_fire", "intensity": 3, "age": 1 }, "x": { "field": "fd_blood", "intensity": 3 } },
-      "computers": { "^": { "name": "Escape Pod", "security": 0, "options": [ { "name": "Ready Escape Pod", "action": "unlock" } ] } }
+      "computers": { "^": { "name": "Escape Pod", "eocs": [ "EOC_ESPOD_CONTROL" ], "chat_topics": [ "ESPOD_CONTROL_START" ] } }
     }
   }
 ]
diff --git a/data/mods/Aftershock/maps/furniture_and_terrain/terrain_spaceship.json b/data/mods/Aftershock/maps/furniture_and_terrain/terrain_spaceship.json
@@ -65,6 +65,19 @@
       ]
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_afs_escapepod_g_shipboard",
+    "name": "escape pod guidance system",
+    "description": "The rudimentary descent guidance system and easy-use control console of an escape pod.  Can be activated to launch the pod.",
+    "roof": "t_metal_flat_roof",
+    "looks_like": "t_intercom",
+    "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "MINEABLE", "BLOCK_WIND" ],
+    "symbol": "o",
+    "color": "white",
+    "copy-from": "t_afs_space_ship_hull_wall",
+    "examine_action": { "type": "effect_on_condition", "effect_on_conditions": [ "EOC_ESCAPE_POD_CHAIR" ] }
+  },
   {
     "type": "terrain",
     "id": "t_escape_pod_floor",

diff --git a/data/mods/Aftershock/maps/ter_furn_transforms.json b/data/mods/Aftershock/maps/ter_furn_transforms.json
@@ -0,0 +1,7 @@
+{
+  "type": "ter_furn_transform",
+  "id": "afs_unlock_metal_doors",
+  "terrain": [
+    { "result": "t_door_metal_c", "valid_terrain": [ "t_door_metal_locked" ], "message": "The doors unlock." }
+  ]
+}
diff --git a/data/mods/Aftershock/npcs/computers/escape_pod_control.json b/data/mods/Aftershock/npcs/computers/escape_pod_control.json
@@ -0,0 +1,31 @@
+[
+  {
+    "id": "EOC_ESPOD_CONTROL",
+    "type": "effect_on_condition",
+    "effect": [ "open_dialogue" ]
+  },
+  {
+    "type": "talk_topic",
+    "id": [ "ESPOD_CONTROL_START" ],
+    "dynamic_line": "&Cyma Interface [version 2.85.1004]\n************************************************\n*  Copyright (c) Cyma Enterprise Systems 3013  *\n************************************************\n\nEscape Pod Control:",
+    "responses": [ { "text": "Ready escape pod.", "topic": "ESPOD_CONTROL_READY" }, { "text": "Shut down.", "topic": "TALK_DONE" } ]
+  },
+  {
+    "type": "talk_topic",
+    "id": [ "ESPOD_CONTROL_READY" ],
+    "dynamic_line": "&************************************************\n\nINTEGRITY CHK : ███████████████ 100% (COMPLETE)\nNAV TRANSFER :  ███████████████ 100% (COMPLETE)\nFUELING :       ███████████████ 100% (COMPLETE)\n\n************************************************\n*  Operation Succesfull                        *\n************************************************",
+    "responses": [
+      {
+        "text": "Continue.",
+        "effect": [ { "u_transform_radius": 3, "ter_furn_transform": "afs_unlock_metal_doors" } ],
+        "topic": "ESPOD_CONTROL_CONTINUE"
+      }
+    ]
+  },
+  {
+    "type": "talk_topic",
+    "id": [ "ESPOD_CONTROL_CONTINUE" ],
+    "dynamic_line": "&Escape pod launch procedure:\n\n    1) Ready escape pod.  (COMPLETE)\n    2) Secure Passangers/Cargo.\n    3) Launch from pod controls.",
+    "responses": [ { "text": "Shut down.", "topic": "TALK_DONE" } ]
+  }
+]