From a09d373add054e50265737f7238644cc6f9bd5fd Mon Sep 17 00:00:00 2001 From: Victoria Eastep <114838742+BarndoBoi@users.noreply.github.com> Date: Sat, 27 Apr 2024 02:07:43 -0400 Subject: [PATCH 01/11] Placeholder for adding surgical cart --- data/json/vehicleparts/cargo.json | 21 +++++++++++++++++++++ data/json/vehicles/carts.json | 7 +++++++ 2 files changed, 28 insertions(+) diff --git a/data/json/vehicleparts/cargo.json b/data/json/vehicleparts/cargo.json index f3467b490576d..f1c50a4e8df87 100644 --- a/data/json/vehicleparts/cargo.json +++ b/data/json/vehicleparts/cargo.json @@ -20,6 +20,27 @@ "breaks_into": "ig_vp_cloth", "variants": [ { "symbols": "o", "symbols_broken": "#" } ] }, + { + "type": "vehicle_part", + "id": "metal_tray", + "name": { "str": "metal tray" }, + "categories": [ "cargo" ], + "broken_color": "dark_gray", + "damage_modifier": 60, + "durability": 15, + "folded_volume": "1 L", + "size": "15 L", + "item": "bag_canvas", + "location": "center", + "requirements": { + "install": { "skills": [ [ "fabrication", 1 ] ], "time": "5 m", "using": [ [ "vehicle_nail_install", 1 ] ] }, + "removal": { "skills": [ [ "fabrication", 2 ] ], "time": "5 m", "using": [ [ "vehicle_nail_removal", 1 ] ] }, + "repair": { "skills": [ [ "fabrication", 2 ] ], "time": "5 m", "using": [ [ "adhesive", 2 ] ] } + }, + "flags": [ "CARGO", "BOARDABLE", "COVERED", "CARGO_PASSABLE" ], + "breaks_into": "ig_vp_cloth", + "variants": [ { "symbols": "o", "symbols_broken": "#" } ] + }, { "type": "vehicle_part", "abstract": "basketlg_abstract", diff --git a/data/json/vehicles/carts.json b/data/json/vehicles/carts.json index 9da164a2ff292..c405141973392 100644 --- a/data/json/vehicles/carts.json +++ b/data/json/vehicles/carts.json @@ -357,5 +357,12 @@ "name": "small hospital bed", "blueprint": [ [ "x" ] ], "parts": [ { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_10", "bed" ] } ] + }, + { + "id": "surgical_cart", + "type": "vehicle", + "name": "Surgical Cart", + "blueprint": [ "#" ], + "parts": [ { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_caster", "Add New Tray Vehicle Part Here" ] } ] } ] From 163b7b332fa7fed6e3a05c06b36c031d8cd540ce Mon Sep 17 00:00:00 2001 From: Victoria Eastep <114838742+BarndoBoi@users.noreply.github.com> Date: Mon, 29 Apr 2024 20:13:39 -0400 Subject: [PATCH 02/11] Fill out metal_tray and tested it --- data/json/vehicleparts/cargo.json | 17 ++++++++--------- data/json/vehicles/carts.json | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/data/json/vehicleparts/cargo.json b/data/json/vehicleparts/cargo.json index f1c50a4e8df87..526f2c7b4a4e3 100644 --- a/data/json/vehicleparts/cargo.json +++ b/data/json/vehicleparts/cargo.json @@ -27,19 +27,18 @@ "categories": [ "cargo" ], "broken_color": "dark_gray", "damage_modifier": 60, - "durability": 15, - "folded_volume": "1 L", + "durability": 75, "size": "15 L", - "item": "bag_canvas", + "item": "sheet_metal", "location": "center", "requirements": { - "install": { "skills": [ [ "fabrication", 1 ] ], "time": "5 m", "using": [ [ "vehicle_nail_install", 1 ] ] }, - "removal": { "skills": [ [ "fabrication", 2 ] ], "time": "5 m", "using": [ [ "vehicle_nail_removal", 1 ] ] }, - "repair": { "skills": [ [ "fabrication", 2 ] ], "time": "5 m", "using": [ [ "adhesive", 2 ] ] } + "install": { "skills": [ [ "fabrication", 1 ] ], "time": "5 m", "using": [ [ "vehicle_bolt_install", 1 ] ] }, + "removal": { "skills": [ [ "fabrication", 1 ] ], "time": "5 m", "using": [ [ "vehicle_wrench_1", 1 ] ] }, + "repair": { "skills": [ [ "fabrication", 2 ], [ "mechanics", 2 ] ], "time": "5 m", "using": [ [ "repair_welding_standard", 5 ] ] } }, - "flags": [ "CARGO", "BOARDABLE", "COVERED", "CARGO_PASSABLE" ], - "breaks_into": "ig_vp_cloth", - "variants": [ { "symbols": "o", "symbols_broken": "#" } ] + "flags": [ "CARGO", "BOARDABLE", "CARGO_PASSABLE", "FLAT_SURF" ], + "breaks_into": "ig_vp_sheet_metal", + "variants": [ { "symbols": "T", "symbols_broken": "#" } ] }, { "type": "vehicle_part", diff --git a/data/json/vehicles/carts.json b/data/json/vehicles/carts.json index c405141973392..fff4cb9f8daa4 100644 --- a/data/json/vehicles/carts.json +++ b/data/json/vehicles/carts.json @@ -363,6 +363,6 @@ "type": "vehicle", "name": "Surgical Cart", "blueprint": [ "#" ], - "parts": [ { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_caster", "Add New Tray Vehicle Part Here" ] } ] + "parts": [ { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_caster", "metal_tray" ] } ] } ] From 460bd4d31c2b50cefd2904c13d1863329a88d819 Mon Sep 17 00:00:00 2001 From: Victoria Eastep <114838742+BarndoBoi@users.noreply.github.com> Date: Wed, 1 May 2024 16:07:39 -0400 Subject: [PATCH 03/11] Add simpler installation requirement for metal tray --- data/json/requirements/vehicle.json | 7 +++++++ data/json/vehicleparts/cargo.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/data/json/requirements/vehicle.json b/data/json/requirements/vehicle.json index 651cf8146cfd1..73c3dfe052c75 100644 --- a/data/json/requirements/vehicle.json +++ b/data/json/requirements/vehicle.json @@ -31,6 +31,13 @@ "qualities": [ { "id": "WRENCH", "level": 2 }, { "id": "DRILL", "level": 2 } ], "components": [ [ [ "nuts_bolts", 20 ] ] ] }, + { + "id": "vehicle_bolt_install_simple", + "type": "requirement", + "//": "for simple installs that only require tightening bolts", + "qualities": [ { "id": "WRENCH", "level": 1 } ], + "components": [ [ [ "nuts_bolts", 4 ] ] ] + }, { "id": "vehicle_nail_removal", "type": "requirement", diff --git a/data/json/vehicleparts/cargo.json b/data/json/vehicleparts/cargo.json index 526f2c7b4a4e3..e086f9fe262eb 100644 --- a/data/json/vehicleparts/cargo.json +++ b/data/json/vehicleparts/cargo.json @@ -32,7 +32,7 @@ "item": "sheet_metal", "location": "center", "requirements": { - "install": { "skills": [ [ "fabrication", 1 ] ], "time": "5 m", "using": [ [ "vehicle_bolt_install", 1 ] ] }, + "install": { "skills": [ [ "fabrication", 1 ] ], "time": "5 m", "using": [ [ "vehicle_bolt_install_simple", 1 ] ] }, "removal": { "skills": [ [ "fabrication", 1 ] ], "time": "5 m", "using": [ [ "vehicle_wrench_1", 1 ] ] }, "repair": { "skills": [ [ "fabrication", 2 ], [ "mechanics", 2 ] ], "time": "5 m", "using": [ [ "repair_welding_standard", 5 ] ] } }, From 6a362148c31818abc573393954cdb998c1718ea1 Mon Sep 17 00:00:00 2001 From: Victoria Eastep <114838742+BarndoBoi@users.noreply.github.com> Date: Wed, 1 May 2024 21:34:19 -0400 Subject: [PATCH 04/11] Add loot spawns to cart The cart will sometimes spawn with medical supplies on it, as you would expect. --- data/json/vehicles/carts.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/vehicles/carts.json b/data/json/vehicles/carts.json index fff4cb9f8daa4..b921888ee4c30 100644 --- a/data/json/vehicles/carts.json +++ b/data/json/vehicles/carts.json @@ -363,6 +363,7 @@ "type": "vehicle", "name": "Surgical Cart", "blueprint": [ "#" ], - "parts": [ { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_caster", "metal_tray" ] } ] + "parts": [ { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_caster", "metal_tray" ] } ], + "items": [ { "x": 0, "y": 0, "chance": 40, "item_groups": [ "gear_medical" ] } ] } ] From 305fb252492499b2fd9fb062ee4ebea8aadfb19f Mon Sep 17 00:00:00 2001 From: Victoria Eastep <114838742+BarndoBoi@users.noreply.github.com> Date: Fri, 3 May 2024 20:57:02 -0400 Subject: [PATCH 05/11] Remove items from cart to prep to place them in maps instead. Renames surgical_cart to medical_cart --- data/json/vehicles/carts.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/json/vehicles/carts.json b/data/json/vehicles/carts.json index b921888ee4c30..7587eeb9df734 100644 --- a/data/json/vehicles/carts.json +++ b/data/json/vehicles/carts.json @@ -359,11 +359,10 @@ "parts": [ { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_10", "bed" ] } ] }, { - "id": "surgical_cart", + "id": "medical_cart", "type": "vehicle", "name": "Surgical Cart", "blueprint": [ "#" ], - "parts": [ { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_caster", "metal_tray" ] } ], - "items": [ { "x": 0, "y": 0, "chance": 40, "item_groups": [ "gear_medical" ] } ] + "parts": [ { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_caster", "metal_tray" ] } ] } ] From 3ded5c28f090643fa40e6c7c7c3ac3f21e79f1b7 Mon Sep 17 00:00:00 2001 From: Victoria Eastep <114838742+BarndoBoi@users.noreply.github.com> Date: Fri, 3 May 2024 22:27:23 -0400 Subject: [PATCH 06/11] Attempt to place cart (and fail), plus fix medical cart's name. I'll try again later UwU --- data/json/mapgen/office_doctor.json | 7 ++++--- data/json/mapgen_palettes/office_doctor.json | 4 +++- data/json/vehicles/carts.json | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/data/json/mapgen/office_doctor.json b/data/json/mapgen/office_doctor.json index e2a206cba12ea..34823e491fbdd 100644 --- a/data/json/mapgen/office_doctor.json +++ b/data/json/mapgen/office_doctor.json @@ -16,10 +16,10 @@ " w....bbbb....bbbb.w ", " #................y# ", " ##+##cc%##++####### ", - " #s.#d.h.y#..#Scc.y# ", + " #s.#d.h.y#..#Scc^y# ", " #&.#d.......!....I# ", " ##########..#.tt.I# ", - " #f.f#I.th#..#....I# ", + " #f.f#I^th#..#....I# ", " #f.f#I...+..####### ", " #f.f#IccS#..#HHllO# ", " ##+#######..#H...O# ", @@ -42,7 +42,8 @@ "c": { "item": "gear_medical", "chance": 60, "repeat": [ 2, 4 ] }, "e": { "item": "SUS_fridge_breakroom", "chance": 80 }, "t": { "item": "gear_medical", "chance": 60, "repeat": [ 2, 4 ] }, - "f": { "item": "office_paper", "chance": 70, "repeat": [ 1, 3 ] } + "f": { "item": "office_paper", "chance": 70, "repeat": [ 1, 3 ] }, + "^": { "item": "geat_medical", "chance": 60, "repeat": [ 1, 2 ] } }, "place_items": [ { "item": "record_patient", "x": 7, "y": 6, "chance": 50 } ], "place_loot": [ { "item": "anesthetic_kit", "x": 16, "y": [ 14, 17 ], "chance": 75, "ammo": 100 } ], diff --git a/data/json/mapgen_palettes/office_doctor.json b/data/json/mapgen_palettes/office_doctor.json index 591848cdd532e..846f1ccab7691 100644 --- a/data/json/mapgen_palettes/office_doctor.json +++ b/data/json/mapgen_palettes/office_doctor.json @@ -23,6 +23,7 @@ "O": "t_floor", "S": "t_floor", "T": "t_floor", + "^": "t_floor", "X": "t_door_metal_locked", "b": "t_floor", "c": "t_floor", @@ -70,6 +71,7 @@ "f": "f_filing_cabinet", "y": [ "f_indoor_plant_y", "f_indoor_plant" ] }, - "toilets": { "&": { } } + "toilets": { "&": { } }, + "vehicles": { "^": { "vehicle": "medical_cart", "chance": 100, "rotation": 0 } } } ] diff --git a/data/json/vehicles/carts.json b/data/json/vehicles/carts.json index 7587eeb9df734..e744891626dc6 100644 --- a/data/json/vehicles/carts.json +++ b/data/json/vehicles/carts.json @@ -361,7 +361,7 @@ { "id": "medical_cart", "type": "vehicle", - "name": "Surgical Cart", + "name": "Medical Cart", "blueprint": [ "#" ], "parts": [ { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "wheel_caster", "metal_tray" ] } ] } From f3ea1ad382524b310169282ef5353b90193373e6 Mon Sep 17 00:00:00 2001 From: Victoria Eastep <114838742+BarndoBoi@users.noreply.github.com> Date: Sat, 4 May 2024 16:05:38 -0400 Subject: [PATCH 07/11] Fix typo in item placement --- data/json/mapgen/office_doctor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mapgen/office_doctor.json b/data/json/mapgen/office_doctor.json index 34823e491fbdd..237a260b39672 100644 --- a/data/json/mapgen/office_doctor.json +++ b/data/json/mapgen/office_doctor.json @@ -43,7 +43,7 @@ "e": { "item": "SUS_fridge_breakroom", "chance": 80 }, "t": { "item": "gear_medical", "chance": 60, "repeat": [ 2, 4 ] }, "f": { "item": "office_paper", "chance": 70, "repeat": [ 1, 3 ] }, - "^": { "item": "geat_medical", "chance": 60, "repeat": [ 1, 2 ] } + "^": { "item": "gear_medical", "chance": 60, "repeat": [ 1, 2 ] } }, "place_items": [ { "item": "record_patient", "x": 7, "y": 6, "chance": 50 } ], "place_loot": [ { "item": "anesthetic_kit", "x": 16, "y": [ 14, 17 ], "chance": 75, "ammo": 100 } ], From 7fab8c35dfb532016dcc4751f06c0a0f8ea65933 Mon Sep 17 00:00:00 2001 From: Victoria Eastep <114838742+BarndoBoi@users.noreply.github.com> Date: Sat, 4 May 2024 16:21:01 -0400 Subject: [PATCH 08/11] Add medical carts to all office_doctor types --- data/json/mapgen/office_doctor.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/data/json/mapgen/office_doctor.json b/data/json/mapgen/office_doctor.json index 237a260b39672..8c21bfcdc593d 100644 --- a/data/json/mapgen/office_doctor.json +++ b/data/json/mapgen/office_doctor.json @@ -137,10 +137,10 @@ " #.y#..+........ht# ", " #B.#..#9999#..#### ", " #s.#..#%c%c#..#By# ", - " #..+..#....#..#.c# ", + " #^.+..#....#..#.c# ", " #cc#..#h...#..+.c# ", " ####..###+##..#### ", - " #$$#..co..h%..#By# ", + " #$$#..co^.h%..#By# ", " #..!......hc..#.c# ", " #$$#..%h...c..+.c# ", " ####..ccc.cc..#### ", @@ -154,6 +154,7 @@ " " ], "palettes": [ "office_doctor" ], + "items": { "^": { "item": "gear_medical", "chance": 60, "repeat": [ 1, 2 ] } }, "place_loot": [ { "group": "waitingroom", "x": 14, "y": 3, "chance": 70, "repeat": [ 1, 3 ] }, { "group": "waitingroom", "x": 19, "y": 3, "chance": 70, "repeat": [ 1, 3 ] }, @@ -249,14 +250,14 @@ " #&...+............+.I# ", " #r..S#............#.I# ", " #######!########!##### ", - " #S.ol#...#lo.S#.....f# ", + " #S^ol#...#lo^S#.....f# ", " #....!...!....#.hh..f# ", " 0...t#...#t...#.ddd..0 ", " #.W.B#...#B.W.#yrA..o# ", " #######!############## ", " #u!...........X....H# ", " ####+###+####5#....H# ", - " #c..#....c###OOO.H# ", + " #c..#...^c###OOO.H# ", " #S..'.?/..c######## ", " #S..#.....c#4 ", " ############ ", @@ -297,7 +298,8 @@ { "item": "drugs_rare", "chance": 60 }, { "item": "surgery", "chance": 60 } ], - "?": { "item": "autodoc_supplies", "chance": 100 } + "?": { "item": "autodoc_supplies", "chance": 100 }, + "^": { "item": "gear_medical", "chance": 60, "repeat": [ 1, 2 ] } }, "place_loot": [ { "group": "waitingroom", "x": 12, "y": 3, "chance": 70, "repeat": [ 1, 3 ] }, From a714f060f80b239a03bf2c0c2f6be899db812078 Mon Sep 17 00:00:00 2001 From: Victoria Eastep <114838742+BarndoBoi@users.noreply.github.com> Date: Sat, 4 May 2024 16:48:25 -0400 Subject: [PATCH 09/11] Add medical cart to veterinarian clinic --- data/json/mapgen/veterinarian.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/data/json/mapgen/veterinarian.json b/data/json/mapgen/veterinarian.json index 1d2eb98ec4398..72eeefe2b5ee5 100644 --- a/data/json/mapgen/veterinarian.json +++ b/data/json/mapgen/veterinarian.json @@ -17,7 +17,7 @@ "--|TccccccTy..#%.c|?R|--", "--|...........#c.d|s.|--", "--|.ccccccT...||+|||+|--", - "--|..........N|E.#...|--", + "--|..........N|E.#C..|--", "--||+|||+|||..|E...T.|--", "--|..|y....|..+....T.|--", "--|s.|.ddd.|++|||i||||--", @@ -40,6 +40,7 @@ ",": "t_pavement_y", "|": "t_wall_p", ".": "t_linoleum_gray", + "C": "t_linoleum_gray", "l": "t_thconc_floor", ":": "t_door_glass_c", ";": "t_door_locked", @@ -68,8 +69,12 @@ "s": "f_sink", "y": "f_indoor_plant" }, + "vehicles": { "C": { "vehicle": "medical_cart", "chance": 100 } }, "toilets": { "t": { } }, - "items": { "N": { "item": "missing_poster_animal", "chance": 50, "repeat": [ 1, 3 ] } }, + "items": { + "N": { "item": "missing_poster_animal", "chance": 50, "repeat": [ 1, 3 ] }, + "C": { "item": "gear_medical", "chance": 60, "repeat": [ 1, 2 ] } + }, "place_items": [ { "item": "trash", "x": 10, "y": 19, "chance": 50, "repeat": [ 1, 3 ] }, { "item": "vet_softdrug", "x": 17, "y": 10, "chance": 70, "repeat": [ 2, 5 ] }, From fa5bcf9881dd38f23b6fece74fd9779d45849535 Mon Sep 17 00:00:00 2001 From: Victoria Eastep <114838742+BarndoBoi@users.noreply.github.com> Date: Tue, 7 May 2024 17:56:07 -0400 Subject: [PATCH 10/11] Add medical cart to both nursing homes --- data/json/mapgen/nursing_home.json | 18 ++++++++++-------- .../mapgen_palettes/nursing_home_palette.json | 8 ++++++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/data/json/mapgen/nursing_home.json b/data/json/mapgen/nursing_home.json index 97841f80108fd..0c8892792e5d6 100644 --- a/data/json/mapgen/nursing_home.json +++ b/data/json/mapgen/nursing_home.json @@ -22,12 +22,12 @@ "|&6Wk.W..WWWW..WWWWWWWWW//WGGGGGGGGGGGGGGGGGGW//WWW..W+.n~=~=|spppppppppppppppppppppppppppppssgg", "|.kW6&W..WflW..WT3.3TGЯgss####################ssgЯW..WWWWWW|||sPPPPpppppppppppppppppppppppppssgg", "|DWWWWW..aooa..D.....G*gss!BBB!gggggg*ggg*BBB!ssg*W.......i|||ЯssssssssssssIppppppppppppppppIsgg", - "G.5TT5W..a..-..W5TT5.G*gssssssssssssssssssssssssg*Wi.......|||||||||||||**ssppppppppppppppppssgg", + "G.5TT5W..aV.-..W5TT5.G*gssssssssssssssssssssssssg*Wi.......|||||||||||||**ssppppppppppppppppssgg", "G.....D..aAaa..WWWWWDW*gssssssssssssssssssssssssg*WWWWWWW........L.....Xsssspppppppyypppppppssgg", "GT8.8TW.......iW&6Wk.W*gss!BBBgggggsssggggBBB!ssg*W&6WWWW..WWWW..WWWWWW|*gsspppppppyypppppppssgg", "|WWWWWW..CCCC..W.kW6&W*gssgggggggggBBBgg*gggggssg*W.kWWWW.wWflW..WT3.3TG#gsspppppppyypppppppssgg", "X.....L..CCCC..WDWWWWW*gss*gggg%%%%%%%%%%%ggggssg*WDWWWWW..aooa..D.....G#gssppppppppppppppppssgg", - "|WWWWWW..HttC..W.5TT5G*gssggggg%g*gJJJ#*g%ggggssg*G.5TT5W..-..a..W5TT5.G#gsspppppppyypppppppssgg", + "|WWWWWW..HttC..W.5TT5G*gssggggg%g*gJJJ#*g%ggggssg*G.5TT5W..-.Va..W5TT5.G#gsspppppppyypppppppssgg", "GT3.3TW..CttH..D.....G*gssggggB%#JJJJJJJ#%Bgggssg*G.....D..aAaa..WWWWWD|#gsspppppppyypppppppssgg", "G.....D..CCCC..WT8.8TG*gssg!ggB%JJJ*!*JJJ%Bgggssg*GT8.8TWi.......W&6Wk.|#gsspppppppyypppppppssgg", "G5TT5.W..CKKC..WWWWWWW*gssggggB%gJJJJJJJ*%Bgg*ssg*WWWWWWW..CCCC..W.kW6&|#gssppppppppppppppppssgg", @@ -39,9 +39,9 @@ "G.....D.......iW.kW6&W*gssssssssssssssssssssssssg*W.kW6&W..CCCC..WT3.3TG#gsspppppppyypppppppssgg", "GT8.8TW..WWWW..WDWWWWW*gssssssssssssssssssssssssg*WDWWWWW..CCCC..D.....G#gsspppppppyypppppppssgg", "|WWWWWW..WflW..W.5TT5G*gss!gggggggggggggggggg!ssg*G.5TT5W..COCt..W5TT5.G#gssppppppppppppppppssgg", - "GT3.3TW..ao.a..D.....G*gss#################qqqssg*G.....D..COCt..WWWWWD|#gsspppppppyypppppppssgg", + "GT3.3TW..aoVa..D.....G*gss#################qqqssg*G.....D..COCt..WWWWWD|#gsspppppppyypppppppssgg", "G.....D..a.o-..WT8.8TG*gss*gЯWWGGGGGGGGGGWWq^QssgЯGT8.8TW..COCt..W&6Wk.|#gsspppppppyypppppppssgg", - "G5TT5.W..aAaa..WWWWWWWWW//WWWWf....i.....lWWWW//WWWWWWWWW..CCCC..W.kW6&|#gsspppppppyypppppppIsgg", + "G5TT5.W..aAaa..WWWWWWWWW//WWWWf....i....VlWWWW//WWWWWWWWW..CCCC..W.kW6&|#gsspppppppyypppppppIsgg", "|WWWWDW........bbbi.ibbb.....A...o....o...A.....bbbi.ibbb..CttC..WDWWWW|#gssppppppppppppppppssgg", "|&6Wk.W..CttH................aa-aaaaaaaaaaa................CCHC..W.5TT5G#gsspppppppyypppppppssgg", "|.kW6&W..CHCC...............................................w....D.....G#gsspppppppyypppppppssgg", @@ -128,6 +128,7 @@ "F": { "item": "SUS_office_filing_cabinet", "chance": 90, "repeat": [ 1, 2 ] }, "k": { "item": "SUS_toilet", "chance": 100, "repeat": [ 0, 1 ] }, "d": { "item": "SUS_office_desk", "chance": 25 }, + "V": { "item": "gear_medical", "chance": 40, "repeat": [ 1, 2 ] }, "K": [ { "item": "novels", "chance": 70, "repeat": [ 0, 1 ] }, { "item": "literature", "chance": 70, "repeat": [ 1, 2 ] }, @@ -232,12 +233,12 @@ "|&6Wk.W..WWWW..WWWWWWWWW//WGGGGGGGGGGGGGGGGGGW//WWW..WWZZZZZv|spppppppppppppppppppppppppppppssgg", "|.kW6&W..WflW..WT3.3TGЯgss####################ssgЯW..WWWWWW|||sPPPPpppppppppppppppppppppppppssgg", "|DWWWWW..aooa..D.....G*gss!BBB!gggggg*ggg*BBB!ssg*W.......i|||ЯssssssssssssIppppppppppppppppIsgg", - "G.5TT5W..a..-..W5TT5.G*gssssssssssssssssssssssssg*Wi.......|||||||||||||**ssppppppppppppppppssgg", + "G.5TT5W..aV.-..W5TT5.G*gssssssssssssssssssssssssg*Wi.......|||||||||||||**ssppppppppppppppppssgg", "G.....D..aAaa..WWWWWDW*gssssssssssssssssssssssssg*WWWWWWW........L.....Xsssspppppppyypppppppssgg", "GT8.8TW.......iW&6Wk.W*gss!BBBgggggsssggggBBB!ssg*W&6WWWW..WWWW..WWWWWW|*gsspppppppyypppppppssgg", "|WWWWWW..CCCC..W.kW6&W*gssgggggggggBBBgg*gggggssg*W.kWWWW.wWflW..WT3.3TG#gsspppppppyypppppppssgg", "X.....L..CCCC..WDWWWWW*gss*gggg%%%%%%%%%%%ggggssg*WDWWWWW..aooa..D.....G#gssppppppppppppppppssgg", - "|WWWWWW..HttC..W.5TT5G*gssggggg%g*gJJJ#*g%ggggssg*G.5TT5W..-..a..W5TT5.G#gsspppppppyypppppppssgg", + "|WWWWWW..HttC..W.5TT5G*gssggggg%g*gJJJ#*g%ggggssg*G.5TT5W..-.Va..W5TT5.G#gsspppppppyypppppppssgg", "GT3.3TW..CttH..D.....G*gssggggB%#JJJJJJJ#%Bgggssg*G.....D..aAaa..WWWWWD|#gsspppppppyypppppppssgg", "G.....D..CCCC..WT8.8TG*gssg!ggB%JJJ*!*JJJ%Bgggssg*GT8.8TWi.......W&6Wk.|#gsspppppppyypppppppssgg", "G5TT5.W..CKKC..WWWWWWW*gssggggB%gJJJJJJJ*%Bgg*ssg*WWWWWWW..CCCC..W.kW6&|#gssppppppppppppppppssgg", @@ -249,9 +250,9 @@ "G.....D.......iW.kW6&W*gssssssssssssssssssssssssg*W.kW6&W..CCCC..WT3.3TG#gsspppppppyypppppppssgg", "GT8.8TW..WWWW..WDWWWWW*gssssssssssssssssssssssssg*WDWWWWW..CCCC..D.....G#gsspppppppyypppppppssgg", "|WWWWWW..WflW..W.5TT5G*gss!gggggggggggggggggg!ssg*G.5TT5W..COCt..W5TT5.G#gssppppppppppppppppssgg", - "GT3.3TW..ao.a..D.....G*gss#################qqqssg*G.....D..COCt..WWWWWD|#gsspppppppyypppppppssgg", + "GT3.3TW..aoVa..D.....G*gss#################qqqssg*G.....D..COCt..WWWWWD|#gsspppppppyypppppppssgg", "G.....D..a.o-..WT8.8TG*gss*gЯWWGGGGGGGGGGWWq^QssgЯGT8.8TW..COCt..W&6Wk.|#gsspppppppyypppppppssgg", - "G5TT5.W..aAaa..WWWWWWWWW//WWWWf....i.....lWWWW//WWWWWWWWW..CCCC..W.kW6&|#gsspppppppyypppppppIsgg", + "G5TT5.W..aAaa..WWWWWWWWW//WWWWf....i....VlWWWW//WWWWWWWWW..CCCC..W.kW6&|#gsspppppppyypppppppIsgg", "|WWWWDW........bbbi.ibbb.....A...o....o...A.....bbbi.ibbb..CttC..WDWWWW|#gssppppppppppppppppssgg", "|&6Wk.W..CttH................aa-aaaaaaaaaaa................CCHC..W.5TT5G#gsspppppppyypppppppssgg", "|.kW6&W..CHCC...............................................w....D.....G#gsspppppppyypppppppssgg", @@ -344,6 +345,7 @@ "F": { "item": "SUS_office_filing_cabinet", "chance": 90, "repeat": [ 1, 2 ] }, "k": { "item": "SUS_toilet", "chance": 100, "repeat": [ 0, 1 ] }, "d": { "item": "SUS_office_desk", "chance": 25 }, + "V": { "item": "gear_medical", "chance": 40, "repeat": [ 1, 2 ] }, "K": [ { "item": "novels", "chance": 70, "repeat": [ 0, 1 ] }, { "item": "literature", "chance": 70, "repeat": [ 1, 2 ] }, diff --git a/data/json/mapgen_palettes/nursing_home_palette.json b/data/json/mapgen_palettes/nursing_home_palette.json index aafe08b8f45d8..4d95b036ef36b 100644 --- a/data/json/mapgen_palettes/nursing_home_palette.json +++ b/data/json/mapgen_palettes/nursing_home_palette.json @@ -33,6 +33,7 @@ "s": "t_sidewalk", "t": "t_carpet_red", "v": "t_ladder_down", + "V": "t_floor", "W": "t_wall", "X": "t_door_metal_pickable", "y": "t_pavement_y", @@ -89,7 +90,8 @@ "vehicles": { "3": { "vehicle": "hospital_bed_small", "chance": 100, "rotation": 90 }, "8": { "vehicle": "hospital_bed_small", "chance": 100, "rotation": 270 }, - "w": { "vehicle": "wheelchair", "chance": 100, "rotation": 90 } + "w": { "vehicle": "wheelchair", "chance": 100, "rotation": 90 }, + "V": { "vehicle": "medical_cart", "chance": 100, "rotation": 0 } } }, { @@ -126,6 +128,7 @@ "s": "t_sidewalk", "t": "t_carpet_red", "v": "t_ladder_down", + "V": "t_floor", "W": "t_wall", "X": "t_door_metal_pickable", "y": "t_pavement_y", @@ -187,7 +190,8 @@ "vehicles": { "3": { "vehicle": "hospital_bed_small", "chance": 100, "rotation": 90 }, "8": { "vehicle": "hospital_bed_small", "chance": 100, "rotation": 270 }, - "w": { "vehicle": "wheelchair", "chance": 100, "rotation": 90 } + "w": { "vehicle": "wheelchair", "chance": 100, "rotation": 90 }, + "V": { "vehicle": "medical_cart", "chance": 100, "rotation": 0 } } }, { From 7f15ed22b9afec3633c64b0b79110d696f1edf05 Mon Sep 17 00:00:00 2001 From: Victoria Eastep <114838742+BarndoBoi@users.noreply.github.com> Date: Tue, 7 May 2024 19:46:54 -0400 Subject: [PATCH 11/11] Add medical cart to hospital --- data/json/mapgen/hospital.json | 29 +++++++++++++------------ data/json/mapgen_palettes/hospital.json | 4 +++- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/data/json/mapgen/hospital.json b/data/json/mapgen/hospital.json index d766a6494f82a..44e43b4080a50 100644 --- a/data/json/mapgen/hospital.json +++ b/data/json/mapgen/hospital.json @@ -96,44 +96,44 @@ "#...............#.........x.c.c.c.c.x..............b#``#....l#...#l....#", "#...............+........./.........x..............b#``#BB...+...+...BB#", "#+#+#+#+#+#.....+........./.........x..............b#``#BB...+...+...BB#", - "#.#.#.#.#.#.....#.........x.........x..............b#``#...cT#...#Tc...#", + "#.#.#.#.#.#.....#.........x...a.....x..............b#``#...cT#...#Tc...#", "#&#&#&#&#&#sssss#.D.....F.#rr###+####.DF.TbbbbTbbbbT#``#######///#######", - "####################//########r....d#################``#l.rrr#...#rrr.l#", + "####################//########r..a.d#################``#l.rrr#...#rrr.l#", "#...ll...x...ll...x....#SSSTf#r...cd#s.&#&.s#s.&#&.s#``#l....!...!....l#", - "#.TB..BT.x.TB..BT.x....#.....+.....L#...#...#...#...#``#l.rrr#...#rrr.l#", + "#.TB..BT.x.TB..BT.x....#.....+.....L#...#...#...#...#``#larrr#...#rrral#", "#r.B..B.rxr.B..B.rx....#########!#####+###+###+###+##;;#######...#######", - "#r......rxr......rx....................................................#", + "#r....a.rxr....a.rx....................................................#", "#xxx//xxxxxxx//xxxx....................................................;", "#......................................................................#", "#......................####################...#######;;#######...#######", "#......................x...........l#8....#...#rrr.l#``#l.rrr#...#rrr.l#", "#....................../.....A..BT.l#8....!...!....l#``#l....!...!....l#", - "#....................../.....?..B..r#88888#...#rrr.l#``#l.rrr#...#rrr.l#", - "#5.....................x...........r#######///#######``#######///#######", + "#....................../.....?..B..r#88888#...#rrral#``#larrr#...#rrral#", + "#5.....................x..........ar#######///#######``#######///#######", "##X#################///##############...cT#...#Tc...#``#...cT#...#Tc...#", - "#H.......H#.......l#...x...........l#BB...+...+...BB#``#BB...+...+...BB#", - "#H.......H#r.TBBT..#.../.....TBBT...#BB...+...+...BB#``#BB...+...+...BB#", + "#H.......H#a......l#...x...........l#BB...+...+...BB#``#BB...+...+...BB#", + "#H.......H#r.TBBT..#.../.....TBBT..a#BB...+...+...BB#``#BB...+...+...BB#", "#H.......H#r..BB...#.../......BB...r#....l#...#l....#``#....l#...#l....#", "#H.......H#........#...x...........r#######...#######``#######...#######", "###########xxx//xxx#...##############....l#...#l....#``#....l#...#l....#", - "#l........x............x...........R#BB...+...+...BB#``#BB...+...+...BB#", + "#l........x............x........a..R#BB...+...+...BB#``#BB...+...+...BB#", "#R.TB..A../............/.....6.....R#BB...+...+...BB#``#BB...+...+...BB#", "#R..B..?../............/.....*.....R#...cT#...#Tc...#``#...cT#...#Tc...#", - "#.........x............x.......22..R#######...#######``#######...#######", + "#a........x............x.......22..R#######...#######``#######...#######", "###########xxx//xxx#...##############...cT#...#Tc...#``#...cT#...#Tc...#", "#..KKKKK..#........#...x...........r#BB...+...+...BB#``#BB...+...+...BB#", "#N........#r..BB...#.../......BB...r#BB...+...+...BB#``#BB...+...+...BB#", - "#Y.......8#r.TBBT..#.../.....TBBT...#....l#...#l....#``#....l#...#l....#", - "#...TT...8#.......l#...x...........l#######...#######``#######...#######", + "#Y.......8#r.TBBT..#.../.....TBBT..a#....l#...#l....#``#....l#...#l....#", + "#...TT...8#a......l#...x...........l#######...#######``#######...#######", "#######!#############///#############....l#...#l....#``#....l#...#l....#", ";``````````````````;....bbb.bbb.bbb.#BB...+...+...BB#``#BB...+...+...BB#", ";``````````````````;...............b#BB...+...+...BB#``#BB...+...+...BB#", "######;;############...............b#...cT#...#Tc...#``#...cT#...#Tc...#", "#&..#....LLLLLLLLLL#...............b#######...#######``#######...#######", "#...+..............!................#...cT#...#Tc...#``#...cT#...#Tc...#", - "#..s#.....bbb.rrrr.#...............b#BB...+...+...BB#``#BB...+...+...BB#", + "#..s#.....bbb.rrrra#...............b#BB...+...+...BB#``#BB...+...+...BB#", "#####....###########...............b#BB...#...+...BB#``#BB...#...+...BB#", - "#kddd...C#d..ddd..d#...............b#....l#...#l....#``#....l#...#l....#", + "#kddd...C#d..ddd.ad#...............b#....l#...#l....#``#....l#...#l....#", "w..c....C#dc..c..cd#................#######///#######;;#######///#######", "#.......C#d.......d#.............................................#88888#", "w........+.........!.............................................!....8#", @@ -186,6 +186,7 @@ "2": { "item": "hospital_samples", "chance": 50 }, "k": { "item": "doctors_books", "chance": 60 }, "K": { "item": "hospital_oxygen", "chance": 85 }, + "a": { "item": "gear_medical", "chance": 65, "repeat": [ 2, 3 ] }, "H": [ { "item": "harddrugs", "chance": 60 }, { "item": "gear_medical", "chance": 60, "repeat": [ 1, 3 ] }, diff --git a/data/json/mapgen_palettes/hospital.json b/data/json/mapgen_palettes/hospital.json index 4a7705a3485dc..58e69ef17cc02 100644 --- a/data/json/mapgen_palettes/hospital.json +++ b/data/json/mapgen_palettes/hospital.json @@ -8,6 +8,7 @@ ":": "t_pavement_y", "&": "t_floor", ".": "t_floor", + "a": "t_floor", "b": "t_floor", "c": "t_floor", "d": "t_floor", @@ -76,7 +77,8 @@ "N": "f_oxygen_concentrator", "Y": "f_hd_compressor_unit" }, - "toilets": { "&": { } } + "toilets": { "&": { } }, + "vehicles": { "a": { "vehicle": "medical_cart", "chance": 100, "rotation": 0 } } }, { "type": "palette",