[Aftershock] Add Salvor Camp Vehicle Merchant (#79287)

* Add UICA Garage Vendor.

* Fix Mapgen Issues, Increase spawn rate of items and spawn maximums. Shop keeper gives earthborn a better deal

* Reduce price on vehicle to something a little more "gamey"

100k made a lot more sense to me. But at the price it would never make any sense to buy it over just buying parts and scraping a vehicle together yourslef or just trying to find on in Salus.

Also there just aren't vehicles spawning on Salus. So I almost want the price to be more reachable for the player given the current state of the mod. So people can play with vehicles sooner. I will update this price once we have more vehicles spawning and we know what it's worth.

* Increase snark. NPC greeting is also only nice to Earthborn

* Add some spicy backstory

* Lint

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Remove the dreaded and highly illegal "space" character

* Name and Gender the NPC because I forget you can and should do that with globally unique npcs

* Adjust strings for test gods

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

data/mods/Aftershock/maps/mapgen/shuttlepad_salvors.json

@@ -12,20 +12,20 @@
         "   ℗℗ ℗℗℗         -            ℗℗℗ ℗℗℗          ",
         " |||####|||||   - - - - »»» ║║║║║####║║║℗ Χ     ",
         " |ΩΩÖÖÖÖ×Ω|<|   --- --- »»» ║©q««¬ffύ.ª║℗   ℗℗  ",
-        "‘$ΩΩéΩΩéΩΩ|‘|℗ ║║║║║║║-     ║©..,.h.,.l║ ℗℗℗Χ℗℗ ",
-        "‘$Ω$$$$$$Ω|‘|℗℗║~╡FoU║-℗  ¦¦-·...h..q.║║ ╡╡###╡℗",
-        "‘$ΩΩΩΩΩΩΩΩ|‘|ØÙ╡1╡...║║℗℗ ¦ë-·ì--ffύq©║╡╡╡ÂÃÂÂ╡╡",
-        " $ΩΩΩΩΩΩΩΩ|‘ω‘‘╡..qq.@# ℗ ¦1-·ìì--║║║║║╡∙Å∙∙Ñ∙Ã╡",
-        "‘$Ω$$$$$$Ω|‘‘‘‘╡kh,..y#℗ Χ¦···ýí4·ýïðð¦╡ÆÇ∙ÂÂ∙∙╡",
-        "‘$ΩΩéÚΩéΩΩ1‘‘‘Ù╡k±««.h#℗ ¦¦¦¦ñ··ò····ð¦╡∙È∙∙Ñ∙∙╡",
-        " |ÛÜÝÝÝÞÙΩ|‘‘Ø2╡╡╡╡╡1╡║¦¦¦óó-¦1¦¦¦$$$¦¦╡╡╡Ã∙∙∙Ã╡",
-        " ||=====|1|‘‘‘Ù╡p.j²..#ôõö·ó-y.o-ß‘‘‘àßÙá╡╡$$$╡╡",
-        " |ÛÜÝÝÝÞÙΩ|‘‘‘‘$..jj±J#·ý··ó║h.U-ß‘é‘‘‘‘‘‘‘‘é‘ ‘",
-        "‘$ΩΩéÚΩéΩΩ1‘‘‘‘$..,...#····÷║.,k║‘╡‘‘Ù╡‘‘â╡‘‘Ù╡‘",
-        "‘$Ω$$$$$$Ω|‘‘Ø‘$..qq║║║í·¦1¦║@h±║‘Ù Ψ℗℗‘℗℗‘‘‘2¼℗",
-        " $ΩΩΩΩΩΩΩΩ|‘‘‘Ù╡║║║║║--öò¦‘½║║║║║‘╡ »» ℗¾‘‘Ù½¼¼¼",
-        "‘$ΩΩΩΩΩΩΩΩ|‘‘ Ψ -- -- -‘ ‘      2   »» ℗½‘ω¦╡╡¦¦",
-        "‘$Ω$$$$$$Ω|‘‘‘‘‘‘- -  ‘ ‘╫╫╫╫╫╫╫╫╫  »» ¿‘‘ -ò·ø¦",
+        "‘-ΩΩéΩΩéΩΩ|‘|℗ ║║║║║║║-     ║©..,.h.,.l║ ℗℗℗Χ℗℗ ",
+        "‘-Ω$$$$$$Ω|‘|℗℗║~╡FoU║-℗  ¦¦-·...h..q.║║ ╡╡###╡℗",
+        "‘-ΩΩΩΩΩΩΩΩ|‘|ØÙ╡1╡...║║℗℗ ¦ë-·ì--ffύq©║╡╡╡ÂÃÂÂ╡╡",
+        " -ΩΩΩΩΩΩΩΩ|‘ω‘‘╡..qq.@# ℗ ¦1-·ìì--║║║║║╡∙Å∙∙Ñ∙Ã╡",
+        "‘-Ω$$$$$$Ω|‘‘‘‘╡kh,..y#℗ Χ¦···ýí4·ýïðð¦╡ÆÇ∙ÂÂ∙∙╡",
+        "‘-ΩΩΩΩΩΩΩΩ5‘‘‘Ù╡k±««.h#℗ ¦¦¦¦ñ··ò····ð¦╡∙È∙∙Ñ∙∙╡",
+        " |ΩΩΩΩΩΩΩΩ|‘‘Ø2╡╡╡╡╡1╡║¦¦¦óó-¦1¦¦¦$$$¦¦╡╡╡Ã∙∙∙Ã╡",
+        " ||=====|5|‘‘‘Ù╡p.j²..#ôõö·ó-y.o-ß‘‘‘àßÙá╡╡$$$╡╡",
+        " |ÜÜÝÝÝÞÙΩ|‘‘‘‘$..jj±J#·ý··ó║h.U-ß‘é‘‘‘‘‘‘‘‘é‘ ‘",
+        "‘$ΩΩéÚϋéΩΩ1‘‘‘‘$..,...#····÷║.,k║‘╡‘‘Ù╡‘‘â╡‘‘Ù╡‘",
+        "‘$Ω$$$$$$Ü|‘‘Ø‘$..qq║║║í·¦1¦║@h±║‘Ù Ψ℗℗‘℗℗‘‘‘2¼℗",
+        " $ΩΩΩΩΩΩΩÜ|‘‘‘Ù╡║║║║║--öò¦‘½║║║║║‘╡ »» ℗¾‘‘Ù½¼¼¼",
+        "‘$ΩΩΩΩΩΩΩÜ|‘‘ Ψ -- -- -‘ ‘      2   »» ℗½‘ω¦╡╡¦¦",
+        "‘$Ω$$$$$$Ü|‘‘‘‘‘‘- -  ‘ ‘╫╫╫╫╫╫╫╫╫  »» ¿‘‘ -ò·ø¦",
         "‘$ΩΩéΩΩéΩΩ|‘‘‘‘‘‘‘‘‘‘‘‘‘À╫‘ã‘ã‘ã‘╫℗ ℗℗¾‘‘‘ -4ýù¦",
         " |ΩΩÖÖÖÖ×Ω|‘ ℗¾℗‘‘‘‘‘‘‘ À╫ ‘‘‘ ‘ ╫℗℗ÀÀ‘‘‘‘ä¦ìì·#",
         " |||####|||    ℗   ℗¾‘‘‘ ╫╫╫╫‘╫╫╫╫½¾‘‘‘‘‘Ψ䦦··#",
@@ -59,7 +59,15 @@
         " ╫╫╫╫╫╫╫╫╫╫╫╫╫╫╫╫╫╫╫╫╫℗‘‘    ψ                  "
       ],
       "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing" ],
-      "npcs": { "ω": { "class": "uica_ground_soldier" }, "χ": { "class": "uica_ground_soldier" } },
+      "place_zones": [
+        { "type": "LOOT_ITEM_GROUP", "filter": "NC_UICA_VEHICLE_MERCHANT", "faction": "UICA", "x": 9, "y": [ 13, 16 ] },
+        { "type": "LOOT_ITEM_GROUP", "filter": "NC_UICA_VEHICLE_MERCHANT", "faction": "UICA", "x": 3, "y": 11 }
+      ],
+      "npcs": {
+        "ω": { "class": "uica_ground_soldier" },
+        "χ": { "class": "uica_ground_soldier" },
+        "ϋ": { "class": "uica_vehicle_merchant" }
+      },
       "monster": {
         "ψ": { "monster": "mon_uica_tankbot" },
         "Ψ": { "monster": "mon_uica_milbot_556" },
@@ -78,11 +86,13 @@
         "Υ": { "item": "afs_tools_robot_maintenance", "repeat": [ 5, 8 ], "chance": 60 },
         "Ϋ": { "item": "afs_machinery_maintenance_scrapgroup", "repeat": [ 10, 25 ], "chance": 60 }
       },
+      "place_vehicles": [ { "vehicle": "uica_lynx_ex", "x": 6, "y": 5, "chance": 100, "status": 0 } ],
       "terrain": {
         "1": "t_door_metal_c",
         "2": "t_ladder_up",
         "3": "t_radio_tower",
         "4": "t_strconc_floor",
+        "5": "t_door_metal_locked",
         "=": "t_wall_prefab_glass",
         " ": "t_region_groundcover_urban",
         "‘": "t_strconc_floor",
@@ -162,7 +172,9 @@
         "ω": "t_strconc_floor",
         "ψ": "t_region_groundcover_urban",
         "Ψ": "t_region_groundcover_urban",
-        "χ": "t_metal_floor"
+        "χ": "t_metal_floor",
+        "ϋ": "t_strconc_floor_heated",
+        "υ": "t_strconc_floor_heated"
       },
       "furniture": {
         "4": "f_console",
@@ -239,7 +251,8 @@
         "φ": "f_rack",
         "Ύ": "f_rack",
         "Υ": "f_rack",
-        "Ϋ": "f_rack"
+        "Ϋ": "f_rack",
+        "υ": "f_sealed_intermodal_crate"
       }
     }
   },
@@ -479,5 +492,22 @@
         "5": "f_small_satellite_dish"
       }
     }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "afs_shuttlepad_salvors_garage_open",
+    "method": "json",
+    "object": {
+      "set": [
+        { "point": "terrain", "id": "t_grate", "x": 1, "y": 3 },
+        { "point": "terrain", "id": "t_grate", "x": 1, "y": 4 },
+        { "point": "terrain", "id": "t_grate", "x": 1, "y": 5 },
+        { "point": "terrain", "id": "t_grate", "x": 1, "y": 6 },
+        { "point": "terrain", "id": "t_grate", "x": 1, "y": 7 },
+        { "point": "terrain", "id": "t_grate", "x": 1, "y": 8 },
+        { "point": "terrain", "id": "t_door_metal_c", "x": 10, "y": 8 },
+        { "point": "terrain", "id": "t_door_metal_c", "x": 9, "y": 10 }
+      ]
+    }
   }
 ]

data/mods/Aftershock/mutations/mutations.json

@@ -9,6 +9,15 @@
     "player_display": false,
     "threshold": true
   },
+  {
+    "type": "mutation",
+    "id": "BKGR_EARTH",
+    "name": { "str": "Earthling" },
+    "points": 0,
+    "description": "Your mannerisms and accent are a dead giveaway that you were raised on Earth.  Whatever your thoughts about the homeworld might be, the simple fact that you can call it home is likely to affect relationships with people liable to care about such things.",
+    "valid": false,
+    "purifiable": false
+  },
   {
     "type": "mutation",
     "id": "PROF_SYSTEM_SECURITY",