Add street lights to remaining shops, port change to make them no lon…

…ger opaque (#3594) * Add street lights to remaining shops * Updoots * Also port streetlight thing Co-Authored-By: Fris0uman <[email protected]> --------- Co-authored-by: Fris0uman <[email protected]>
cataclysmbnteam · Nov 9, 2023 · 1c15371 · 1c15371
1 parent 5f6f9f0
commit 1c15371
Show file tree

Hide file tree

Showing 35 changed files with 198 additions and 75 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json
@@ -260,7 +260,7 @@
     "move_cost_mod": -1,
     "coverage": 40,
     "required_str": -1,
-    "flags": [ "BASHABLE" ],
+    "flags": [ "BASHABLE", "TRANSPARENT" ],
     "examine_action": "transform",
     "transforms_into": "f_street_light_rewired_on",
     "prompt": "Switch on the street light.",

diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json
@@ -722,7 +722,7 @@
     "move_cost_mod": -1,
     "coverage": 40,
     "required_str": -1,
-    "flags": [ "BASHABLE" ],
+    "flags": [ "BASHABLE", "TRANSPARENT" ],
     "deconstruct": {
       "items": [
         { "item": "pipe", "count": 8 },
@@ -759,7 +759,7 @@
     "move_cost_mod": -1,
     "coverage": 40,
     "required_str": 32,
-    "flags": [ "BASHABLE" ],
+    "flags": [ "BASHABLE", "TRANSPARENT" ],
     "bash": {
       "str_min": 30,
       "str_max": 100,

diff --git a/data/json/mapgen/diner.json b/data/json/mapgen/diner.json
@@ -38,7 +38,7 @@
         ",": "t_pavement_y",
         "-": "t_wall_w",
         ".": "t_grass",
-        "'": "t_sidewalk",
+        "'": "t_pavement",
         "=": "t_sidewalk",
         "G": "t_linoleum_gray",
         "H": "t_linoleum_white",

diff --git a/data/json/mapgen/gunsmith.json b/data/json/mapgen/gunsmith.json
@@ -7,7 +7,7 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "__________________sss'__",
+        "__________________sss__'",
         "_,___,___,___,___,sss_%_",
         "_,___,___,___,___,sss_%_",
         "_,___,___,___,___,sss_%_",

diff --git a/data/json/mapgen/recycle_center.json b/data/json/mapgen/recycle_center.json
@@ -4,6 +4,7 @@
     "object": {
       "fill_ter": "t_thconc_floor",
       "furniture": {
+        "'": "f_street_light",
         "#": "f_table",
         "&": "f_trashcan",
         "P": "f_sign",
@@ -29,7 +30,7 @@
         { "chance": 50, "repeat": [ 180, 350 ], "item": "recycle_plastic", "x": [ 7, 8 ], "y": [ 11, 19 ] }
       ],
       "rows": [
-        ".........s..............",
+        ".........s.............'",
         ".........s..............",
         ".........s..............",
         ".........s..............",
@@ -58,6 +59,7 @@
         "&": "t_floor",
         "+": "t_door_metal_c",
         ".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
+        "'": "t_dirt",
         "D": "t_door_c",
         "_": "t_thconc_floor",
         "c": "t_floor",
@@ -140,6 +142,7 @@
     "object": {
       "fill_ter": "t_thconc_floor",
       "furniture": {
+        "'": "f_street_light",
         "#": "f_table",
         "&": "f_trashcan",
         "C": "f_chair",
@@ -169,7 +172,7 @@
       ],
       "place_vehicles": [ { "chance": 75, "fuel": 0, "rotation": 270, "status": -1, "vehicle": "forklift", "x": 16, "y": [ 7, 16 ] } ],
       "rows": [
-        ".....cccc...............",
+        ".....cccc..............'",
         ".....cccc...............",
         ".....cccc...............",
         "..---S++S--|||ww||D|w|..",
@@ -198,6 +201,7 @@
         "+": "t_chaingate_c",
         "-": "t_chainfence",
         ".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
+        "'": "t_dirt",
         "D": "t_door_metal_c",
         "P": "t_concrete",
         "S": "t_chainfence",
@@ -283,6 +287,7 @@
     "object": {
       "fill_ter": "t_thconc_floor",
       "furniture": {
+        "'": "f_street_light",
         "#": "f_counter",
         "&": "f_trashcan",
         "P": "f_sign",
@@ -309,7 +314,7 @@
       ],
       "place_loot": [ { "item": "television", "x": 4, "y": 14, "chance": 100 }, { "item": "stepladder", "x": 8, "y": 13, "chance": 100 } ],
       "rows": [
-        "__________ppppp_________",
+        "__________ppppp________'",
         "__________ppppp_________",
         "______4___ppppp_____7___",
         "_4________ppppp_________",
@@ -344,6 +349,7 @@
         "P": "t_concrete",
         "R": "t_recycler",
         "_": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
+        "'": "t_dirt",
         "p": "t_pavement",
         "s": "t_grass",
         "t": "t_thconc_floor",

diff --git a/data/json/mapgen/restaurant.json b/data/json/mapgen/restaurant.json
@@ -7,7 +7,7 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "____,____,____,____,____",
+        "____,____,____,____,___'",
         "____,____,____,____,____",
         "____,____,____,____,____",
         "____,____,____,____,____",
@@ -48,6 +48,7 @@
         "S": "t_linoleum_white",
         "W": "t_window",
         "_": "t_pavement",
+        "'": "t_pavement",
         "d": "t_pavement",
         "g": "t_linoleum_gray",
         "w": "t_linoleum_white",
@@ -57,6 +58,7 @@
         "|": "t_wall_r"
       },
       "furniture": {
+        "'": "f_street_light",
         "#": "f_counter",
         "&": "f_trashcan",
         "B": "f_bench",
@@ -170,7 +172,7 @@
     "object": {
       "fill_ter": "t_carpet_green",
       "rows": [
-        "ssssssssssssssssssssssss",
+        "sssssssssssssssssssssss`",
         "ssssssssssssssssssssssss",
         "ssss|-------------|sssss",
         "____|&wlfF|.......|sssss",
@@ -220,6 +222,7 @@
         "g": "t_wall_glass",
         "l": "t_linoleum_gray",
         "s": "t_sidewalk",
+        "`": "t_sidewalk",
         "w": "t_linoleum_white",
         "{": "t_linoleum_white",
         "4": "t_gutter_downspout",
@@ -228,6 +231,7 @@
         "|": "t_wall_y"
       },
       "furniture": {
+        "`": "f_street_light",
         "#": "f_counter",
         "2": "f_counter",
         "&": "f_trashcan",
@@ -342,7 +346,7 @@
     "object": {
       "fill_ter": "t_linoleum_white",
       "rows": [
-        "____,____,____,____,____",
+        "____,____,____,____,___'",
         "____,____,____,____,____",
         "____,____,____,____,____",
         "____,____,____,____,____",
@@ -385,6 +389,7 @@
         "c": "t_rdoor_b",
         "x": "t_linoleum_white",
         "_": "t_pavement",
+        "'": "t_pavement",
         "f": "t_linoleum_white",
         "t": "t_linoleum_white",
         "4": "t_gutter_downspout",
@@ -394,6 +399,7 @@
         "|": "t_wall_w"
       },
       "furniture": {
+        "'": "f_street_light",
         "#": "f_counter",
         "G": "f_oven",
         "x": "f_rack",
@@ -511,7 +517,7 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "____,____,____,____,____",
+        "____,____,____,____,___'",
         "____,____,____,____,____",
         "____,____,____,____,____",
         "____,____,____,____,____",
@@ -553,6 +559,7 @@
         "S": "t_linoleum_white",
         "W": "t_window",
         "_": "t_pavement",
+        "'": "t_pavement",
         "d": "t_pavement",
         "g": "t_linoleum_gray",
         "w": "t_linoleum_white",
@@ -563,6 +570,7 @@
         "|": "t_wall_p"
       },
       "furniture": {
+        "'": "f_street_light",
         "#": "f_counter",
         "&": "f_trashcan",
         "B": "f_bench",

diff --git a/data/json/mapgen/restaurant_fast.json b/data/json/mapgen/restaurant_fast.json
@@ -7,7 +7,7 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        ",_____ssssssssssss_____,",
+        ",_____ssssssssssss_____'",
         ",__,__#### ss ####__,__,",
         ",_,,,_#ssssssssss#__,__,",
         ",__,__#HTHssssHTH#__,__,",
@@ -45,6 +45,7 @@
         "%": "t_wall_glass",
         "+": "t_door_glass_c",
         ",": "t_pavement_y",
+        "'": "t_pavement_y",
         "-": "t_wall_w",
         ".": "t_floor",
         "5": "t_wall_glass",
@@ -66,6 +67,7 @@
         "|": "t_wall_w"
       },
       "furniture": {
+        "'": "f_street_light",
         "H": "f_chair",
         "O": "f_woodstove",
         "S": "f_sink",
@@ -168,7 +170,7 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "____,,,,,#ssssssssssssss",
+        "____,,,,,#sssssssssssss'",
         "_________#ss|555++++555|",
         "_________#ss5.HH.HH..hh|",
         "_________#ss5.TT.TT..Th|",
@@ -216,6 +218,7 @@
         "r": "t_linoleum_gray",
         "d": "t_sidewalk",
         "s": "t_sidewalk",
+        "'": "t_sidewalk",
         "D": "t_door_locked",
         "t": "t_door_c",
         "w": "t_linoleum_white",
@@ -224,6 +227,7 @@
         "|": "t_wall_w"
       },
       "furniture": {
+        "'": "f_street_light",
         "H": "f_chair",
         "F": "f_arcade_machine",
         "S": "f_sink",

diff --git a/data/json/mapgen/s_bookstore.json b/data/json/mapgen/s_bookstore.json
@@ -7,7 +7,7 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
+        "~~~~~~~~~~~~~~~~~~~~~~~'",
         "~~~~~~~~~~~~~~~~~~~~~~~~",
         "*|----OOO-::--OO--OO--|*",
         "*|s.l#.Thf..#ccccccccc|*",
@@ -45,9 +45,11 @@
         "|": "t_wall_w",
         "4": "t_gutter_downspout",
         "<": "t_ladder_up",
-        "~": "t_sidewalk"
+        "~": "t_sidewalk",
+        "'": "t_sidewalk"
       },
       "furniture": {
+        "'": "f_street_light",
         "#": "f_counter",
         "T": "f_table",
         "]": "f_rack",
@@ -226,7 +228,7 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
+        "~~~~~~~~~~~~~~~~~~~~~~~'",
         "~~~~~~~~~~~~~~~~~~~~~~~~",
         "~~~~~~~~~~~~~~~~~~~~~~~~",
         "**|========::-OO--OO-|**",
@@ -264,9 +266,11 @@
         "O": "t_window",
         "q": "t_grass",
         "|": "t_wall_w",
-        "~": "t_sidewalk"
+        "~": "t_sidewalk",
+        "'": "t_sidewalk"
       },
       "furniture": {
+        "'": "f_street_light",
         "#": "f_counter",
         "T": "f_table",
         "[": "f_rack",
@@ -433,7 +437,7 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "~~~~~~~~~~~~~~~~~~~~~~~~",
+        "~~~~~~~~~~~~~~~~~~~~~~~'",
         "~~~qSq~~~~~~~~~~qqq~~~~~",
         "~~~~~~~~~~~~~~~~~~~~~~~~",
         "~~~~~~~~~~~~~~~~~~~~~~~~",
@@ -471,9 +475,11 @@
         "q": "t_dirt",
         "|": "t_wall_w",
         "4": "t_gutter_downspout",
-        "~": "t_sidewalk"
+        "~": "t_sidewalk",
+        "'": "t_sidewalk"
       },
       "furniture": {
+        "'": "f_street_light",
         "#": "f_counter",
         "S": "f_statue",
         "T": "f_table",

diff --git a/data/json/mapgen/s_candy.json b/data/json/mapgen/s_candy.json
@@ -7,7 +7,7 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        ".............dssd.......",
+        ".............dssd......'",
         "....fD..f.D..dssd....fD.",
         "........D.f..dssd..d....",
         "...uudud.....dssd.d7d...",
@@ -36,6 +36,7 @@
         "+": "t_door_c",
         "-": "t_wall_glass",
         ".": [ [ "t_grass", 5 ], [ "t_grass_long", 5 ], "t_dirt" ],
+        "'": "t_dirt",
         "7": "t_tree_apple_harvested",
         "D": "t_dirt",
         "R": "t_railing_v",
@@ -55,6 +56,7 @@
         "|": "t_wall_y"
       },
       "furniture": {
+        "'": "f_street_light",
         "#": "f_counter",
         "&": "f_trashcan",
         "B": "f_bench",
@@ -168,7 +170,7 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "............ss..........",
+        "............ss.........'",
         "............ss..........",
         "...d....d...ss.u.u.u.u..",
         "..d7d..d4d..ss|||||||||.",
@@ -197,6 +199,7 @@
         "+": "t_door_glass_c",
         "-": "t_wall_glass",
         ".": [ [ "t_grass", 5 ], [ "t_grass_long", 5 ], "t_dirt" ],
+        "'": "t_dirt",
         "4": "t_tree_pine",
         "7": "t_tree_birch_harvested",
         "D": "t_dirt",
@@ -218,6 +221,7 @@
         "|": "t_brick_wall"
       },
       "furniture": {
+        "'": "f_street_light",
         "#": "f_counter",
         "&": "f_trashcan",
         "C": "f_chair",