Prepper_1 NPC background expansion and locked LMOE computer (CleverRa…

…ven#60737) * add prepper lmoe computer and draft dialog * prepper computer implementation 1 * expand computer dialog * more prepper computer dialog * lint JSON * small dialog fixes * expand prepper_1 dialog about LMOE computer * lint JSON and fix typos * expand LMOE9 snippets * LMOE10 snippets * typo fix * expand dialog; lint JSON * more dialog touchups * allow player to explore later dialogs * make prepper LMOE globally unique * monica email tweaks * minor dialog tweaks * option for finding shelter then computer * lint JSON * fix quest offered again after completion * NPC actually attacks you
casswedson · Oct 13, 2022 · 8c69f56 · 8c69f56
1 parent 903f783
commit 8c69f56
Show file tree

Hide file tree

Showing 6 changed files with 620 additions and 10 deletions.
diff --git a/data/json/mapgen/lmoe.json b/data/json/mapgen/lmoe.json
@@ -226,7 +226,7 @@
         "    S      S            ",
         "                  S     "
       ],
-      "place_signs": [ { "signage": "Private property!  Keep out!", "x": 12, "y": 16 } ],
+      "place_signs": [ { "signage": "PRIVATE PROPERTY!\nNO SOLICITING!\n\nATTEMPT TO ENTER\nAND YOU WILL BE SHOT!", "x": 12, "y": 16 } ],
       "terrain": { "X": "t_door_metal_locked" },
       "palettes": [ "bunker_ext" ]
     }
@@ -249,7 +249,7 @@
         "##|u___h|U_UU_U|A,,,_|##",
         "##|u___D|=*==*=|_,,,}|##",
         "##|A____:______+_,,,}|##",
-        "##|||||||_1,,1_|S__hD|##",
+        "##|||||||_1,,1_|S__h2|##",
         "##|VVVVV=_e,,P_|||||||##",
         "##|_____*__,,____|s_K|##",
         "##|vvvvv=_E,,f___+__t|##",

diff --git a/data/json/mapgen/nested/lmoe_nested.json b/data/json/mapgen/nested/lmoe_nested.json
@@ -66,5 +66,23 @@
       ],
       "palettes": [ "bunker", "empty_bunker_items" ]
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "//": "This is for the computer in the prepper_1 NPC's locked LMOE. It provides an explanation for the locked LMOE and background flavor on the prepper in case the player hasn't met them yet.",
+    "nested_mapgen_id": "prepper_1_computer",
+    "object": {
+      "mapgensize": [ 1, 1 ],
+      "place_computers": [
+        {
+          "x": 0,
+          "y": 0,
+          "name": "Personal Computer: User",
+          "eocs": [ "EOC_PREPPER_1_COMPUTER" ],
+          "chat_topics": [ "COMP_PREPPER_1_MAIN" ]
+        }
+      ]
+    }
   }
 ]
diff --git a/data/json/mapgen_palettes/lmoe.json b/data/json/mapgen_palettes/lmoe.json
@@ -28,6 +28,7 @@
       "C": "f_cupboard",
       "d": "f_dresser",
       "D": "f_desk",
+      "2": "f_desk",
       "e": "f_ergometer_mechanical",
       "E": "f_exercise",
       "F": "f_fridge",
@@ -118,7 +119,8 @@
       "^": { "item": "shelter", "chance": 30 },
       "{": [ { "item": "lmoe_guns", "chance": 90 }, { "item": "ammo", "chance": 30, "repeat": [ 2, 8 ] } ],
       "}": [ { "item": "novels", "chance": 90, "repeat": [ 3, 8 ] }, { "item": "religious_books", "chance": 25 } ]
-    }
+    },
+    "nested": { "2": { "chunks": [ "prepper_1_computer" ] } }
   },
   {
     "type": "palette",