Skip to content

Commit

Permalink
Scrap Trader Inventory Expansion and QoL Update (CleverRaven#59805)
Browse files Browse the repository at this point in the history
* Update scrap_trader.json

* Post-purchase screen update

* Scrapper sells via shop instead of dialogue

* Specialty metals update

* Tuning

* Fixed pricing

* Scrap merchant gets his own outfit and class

* Carried

* Linting

* Pricing adjustments

* Uyen Tran and Doctor now merchants

* Linting

* Update scrap_trader.json

* Discourage players from buying possessions

* Cash register not for sale

* Linting

* Removes cash register custom price

* No spawning with cash register unless from mapgen

* Mapgen Update #1

* Update fortified_scrap_yard.json

* More defensive tools for scrapper

* Tow Truck Variant, Appliances, Furniture, Remodel

* Coat rack, mechanics skill, tools

* Utility shelf, zones reorganization

* Decrease scrap count

* Lint

* lint

* Coordinates updates, tire change, skills

* Swimmin

* Minor changes

* Wheels
  • Loading branch information
Merikona authored Oct 11, 2022
1 parent 61572ad commit 297840d
Show file tree
Hide file tree
Showing 7 changed files with 359 additions and 186 deletions.
143 changes: 109 additions & 34 deletions data/json/mapgen/fortified_scrap_yard/fortified_scrap_yard.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,28 @@
"object": {
"fill_ter": "t_region_soil",
"rows": [
"$$$$$$$$$ $$$$$$$$",
"$|||||||| |||||||$",
"$$$$$$$$$$ $$$$$$",
"$||||||||| |||||$",
"$| u |$",
"$| ------ uuu|$",
"$| -_a__- uu7u|$",
"$| -Ha__+ uu|$",
"$| -~a__- D uuu|$",
"$| -____- D uu |$",
"$| -____b u |$",
"$| -vv__- uuu|$",
"$| ---b-- u7u|$",
"$| uu|$",
"$| ------- uuu|$",
"$| -.avvL- uu7u|$",
"$| -Ha___+ uu|$",
"$| -~a__R- D uu|$",
"$| -_____b D uu|$",
"$| -Faa_C- uu |$",
"$| ----_A- u |$",
"$| -Z<-_Ib uuu|$",
"$| -T<+_(- u7u|$",
"$| -b--b-- uu|$",
"$| u u|$",
"$| o # |$",
"$| # # # |$",
"$| 9gw ## # wW #|$",
"$| #wh##{#wW& DWV#l |$",
"$| #Bww9 #Ww# #oww# |$",
"$| dwe##iwW B##wd#f |$",
"$| #Ww wwf { Vw# #|$",
"$| { ro# #ww# e# |$",
"$| ## # # ## # ## #|$",
"$| %%%%% #B # |$",
"$| %/))+ ## # wW #|$",
"$| %))Q% {#wW& DWV#l |$",
"$| %)^^b #Ww# #oww# 9|$",
"$| %%b%% #iwW B##wd#f |$",
"$| e wwf { Vw# #|$",
"$| {##ro# #ww# W9 we# |$",
"$|wd#### # ## # ## #|$",
"$||||||||||||||||||||||$",
"$$$$$$$$$$$$$$$$$$$$$$$$"
],
Expand All @@ -45,14 +45,31 @@
"a": "t_thconc_floor",
"v": "t_thconc_floor",
"H": "t_thconc_floor",
"(": "t_thconc_floor",
"b": "t_window_domestic",
"d": "t_wall_metal",
"g": "t_wall_metal",
"h": "t_wall_metal",
"u": "t_region_shrub",
"w": "t_wall_metal",
"$": "t_fence_barbed",
"|": "t_junk_palisade"
"|": "t_junk_palisade",
"%": "t_wall_wood",
")": "t_floor",
"^": "t_floor",
"Q": "t_floor",
"/": "t_floor",
"<": "t_linoleum_white",
"T": "t_linoleum_white",
"S": "t_thconc_floor",
"F": "t_thconc_floor",
"Z": "t_linoleum_white",
"C": "t_thconc_floor",
"L": "t_thconc_floor",
"R": "t_thconc_floor",
"I": "t_thconc_floor",
"A": "t_thconc_floor",
".": "t_thconc_floor"
},
"furniture": {
"#": "f_wreckage",
Expand All @@ -64,6 +81,7 @@
"a": "f_counter",
"d": "f_chair",
"H": "f_chair",
"Q": "f_chair",
"e": "f_bigmirror_b",
"f": "f_washer",
"g": "f_bigmirror_b",
Expand All @@ -74,28 +92,85 @@
"r": "f_rack",
"v": "f_vending_c",
"w": "f_wreckage",
"{": "f_vending_o"
"{": "f_vending_o",
"^": "f_desk",
"(": "f_makeshift_bed",
"T": "f_toilet",
"S": "f_sofa",
"F": "f_fridge",
"Z": "f_sink",
"C": "f_trashcan",
"L": "f_bulletin",
"R": "f_rack_coat",
"I": "f_tourist_table",
"A": "f_camp_chair",
".": "f_utility_shelf"
},
"place_items": [
{ "chance": 100, "item": "cash_register_random", "x": 5, "y": [ 4, 6 ] },
{ "chance": 25, "item": "vending_food", "x": 4, "y": 9 },
{ "chance": 25, "item": "trash", "x": 11, "y": 20 },
{ "chance": 100, "item": "cash_register_random", "x": 5, "y": 5 },
{ "chance": 25, "item": "vending_food", "x": 6, "y": 4 },
{ "chance": 25, "item": "vending_drink", "x": 7, "y": 4 },
{ "chance": 100, "item": "SUS_fridge_survivor", "x": 4, "y": 8 },
{ "chance": 100, "item": "SUS_bathroom_sink", "x": 4, "y": 10 },
{ "chance": 100, "item": "SUS_silverware", "x": 6, "y": 8 },
{ "chance": 100, "item": "coat_rack", "x": 8, "y": 6, "repeat": [ 1, 3 ] },
{ "chance": 10, "item": "used_1st_aid", "x": 6, "y": 8 },
{ "chance": 25, "item": "trash", "x": 11, "y": 21 },
{ "chance": 25, "item": "trash", "x": 2, "y": 19 },
{ "chance": 25, "item": "trash", "x": 19, "y": 17 },
{ "chance": 25, "item": "trash", "x": 20, "y": 17 },
{ "chance": 25, "item": "trash", "x": 15, "y": 13 },
{ "chance": 10, "item": "supplies_spares_vehicle", "x": 8, "y": 19 },
{ "chance": 10, "item": "supplies_spares_vehicle", "x": 3, "y": 16 },
{ "chance": 10, "item": "supplies_spares_vehicle", "x": 9, "y": 17 },
{ "chance": 10, "item": "supplies_spares_vehicle", "x": 16, "y": 15 },
{ "chance": 25, "item": "vending_drink", "x": 5, "y": 9 },
{ "chance": 15, "item": "vehicle_scrapped", "x": 18, "y": 20 },
{ "chance": 15, "item": "vehicle_scrapped", "x": 16, "y": 20 },
{ "chance": 15, "item": "vehicle_scrapped", "x": 17, "y": 20 },
{ "chance": 15, "item": "vehicle_scrapped", "x": 16, "y": 19 },
{ "chance": 15, "item": "vehicle_scrapped", "x": 4, "y": 19 },
{ "chance": 15, "item": "vehicle_scrapped", "x": 16, "y": 18 },
{ "chance": 15, "item": "vehicle_scrapped", "x": 22, "y": 16 },
{ "chance": 15, "item": "vehicle_scrapped", "x": 14, "y": 17 },
{ "chance": 15, "item": "vehicle_scrapped", "x": 21, "y": 16 },
{ "chance": 15, "item": "vehicle_scrapped", "x": 14, "y": 16 },
{ "chance": 15, "item": "vehicle_scrapped", "x": 9, "y": 15 },
{ "chance": 15, "item": "vehicle_scrapped", "x": 3, "y": 14 },
{ "chance": 10, "item": "tools_mechanic", "x": 5, "y": 5 }
{ "chance": 15, "item": "vehicle_scrapped", "x": 3, "y": 19 },
{ "chance": 10, "item": "tools_mechanic", "x": 6, "y": 8 }
],
"place_loot": [
{ "item": "blanket", "x": 3, "y": 14, "chance": 100 },
{ "item": "blanket", "x": 8, "y": 11, "chance": 100 },
{ "item": "sleeping_bag", "x": 3, "y": 14, "chance": 100 },
{ "item": "microwave", "x": 5, "y": 8, "chance": 100 },
{ "item": "coffee", "x": 6, "y": 8, "chance": 50 },
{ "item": "hd_tow_cable", "x": 6, "y": 8, "chance": 100 },
{ "item": "roadmap", "x": 6, "y": 8, "chance": 10 },
{ "item": "folding_poncho", "x": 6, "y": 8, "chance": 30 },
{ "item": "rope_6", "x": 6, "y": 8, "chance": 50 },
{ "item": "handflare", "x": 6, "y": 8, "chance": 100 },
{ "item": "sm_extinguisher", "x": 6, "y": 8, "chance": 50 },
{ "item": "towel", "x": 6, "y": 8, "chance": 30 },
{ "item": "wheel_wide", "x": 6, "y": 8, "chance": 100, "repeat": 3 },
{ "item": "jack", "x": 6, "y": 8, "chance": 100 },
{ "item": "wrench_large", "x": 6, "y": 8, "chance": 100 }
],
"mapping": { "/": { "traps": [ [ "tr_rollmat", 100 ] ] } },
"place_vehicles": [
{
"vehicle": "underlift_tow_truck_lack_wheels",
"x": 15,
"y": 9,
"chance": 100,
"fuel": 70,
"status": 0,
"rotation": 90
}
],
"place_zones": [
{ "type": "LOOT_ITEM_GROUP", "filter": "SCRAPPER_Shop", "faction": "wasteland_scavengers", "x": 4, "y": 4 },
{
"type": "LOOT_ITEM_GROUP",
"filter": "SCRAPPER_Shop_Specialty_Metals",
"faction": "wasteland_scavengers",
"x": 4,
"y": 4
},
{ "type": "LOOT_UNSORTED", "faction": "wasteland_scavengers", "x": [ 4, 4 ], "y": [ 6, 6 ] }
]
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"name_suffix": "refugee",
"class": "NC_REFUGEE_Uyen",
"attitude": 0,
"mission": 7,
"mission": 3,
"chat": "TALK_REFUGEE_Uyen_1",
"faction": "free_merchants",
"mission_offered": "MISSION_REFUGEE_Uyen_1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"class": "NC_DOCTOR",
"attitude": 0,
"//2": "Possibly should change to NPC_MISSION_SHOPKEEP and sell medical supplies.",
"mission": 7,
"mission": 3,
"chat": "TALK_SCIENCE_REP",
"faction": "old_guard",
"mission_offered": "MISSION_SCIENCE_REP_1"
Expand Down
Loading

0 comments on commit 297840d

Please sign in to comment.