feat(content): add flagpoles to decorate with flags, replace item-nex…

…t-to-pillar spawns in locations with them

data/json/construction.json

@@ -2380,6 +2380,45 @@
     "pre_terrain": "t_concrete",
     "post_terrain": "t_support_s"
   },
+  {
+    "type": "construction",
+    "id": "constr_flagpole",
+    "group": "build_flagpole",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 3 ] ],
+    "time": "30 m",
+    "qualities": [ [ { "id": "DIG", "level": 2 } ] ],
+    "components": [ [ [ "wood_beam", 1 ] ], [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ] ],
+    "pre_flags": "DIGGABLE",
+    "pre_special": "check_empty",
+    "post_furniture": "f_flagpole_wood"
+  },
+  {
+    "type": "construction",
+    "id": "constr_us_flag_metal",
+    "//": "Metal flagpole",
+    "group": "hoist_us_flag",
+    "category": "DECORATE",
+    "required_skills": [  ],
+    "time": "1 m",
+    "components": [ [ [ "american_flag", 1 ] ] ],
+    "pre_note": "Can be deconstructed without tools.",
+    "pre_furniture": "f_flagpole_metal",
+    "post_furniture": "f_us_flag_metal"
+  },
+  {
+    "type": "construction",
+    "id": "constr_us_flag_wood",
+    "//": "Wooden flagpole",
+    "group": "hoist_us_flag",
+    "category": "DECORATE",
+    "required_skills": [  ],
+    "time": "1 m",
+    "components": [ [ [ "american_flag", 1 ] ] ],
+    "pre_note": "Can be deconstructed without tools.",
+    "pre_furniture": "f_flagpole_wood",
+    "post_furniture": "f_us_flag_wood"
+  },
   {
     "type": "construction",
     "id": "constr_grass_white",

data/json/construction_group.json

@@ -1139,6 +1139,16 @@
     "id": "mine_upstair",
     "name": "Mine Upstair"
   },
+  {
+    "type": "construction_group",
+    "id": "build_flagpole",
+    "name": "Build Wooden Flagpole"
+  },
+  {
+    "type": "construction_group",
+    "id": "hoist_us_flag",
+    "name": "Hoist American Flag"
+  },
   {
     "type": "construction_group",
     "id": "paint_grass_white",

data/json/external_tileset/External_Tileset_DP_Tall.json

@@ -36,7 +36,11 @@
           { "id": "t_tree_coca_harvested_season_summer", "fg": 17, "bg": 14, "rotates": false },
           { "id": "t_tree_coca_harvested_season_winter", "fg": 17, "bg": 15, "rotates": false },
           { "id": [ "f_grid_floodlight_off", "f_grid_floodlight" ], "fg": 18 },
-          { "id": "f_grid_floodlight_on", "fg": 19 }
+          { "id": "f_grid_floodlight_on", "fg": 19 },
+          { "id": "f_flagpole_metal", "fg": 20 },
+          { "id": "f_flagpole_wood", "fg": 21 },
+          { "id": "f_us_flag_metal", "fg": 22 },
+          { "id": "f_us_flag_wood", "fg": 23 }
         ],
         "sprite_width": 64,
         "sprite_height": 80,

data/json/furniture_and_terrain/furniture-graves.json

@@ -90,7 +90,7 @@
     "type": "furniture",
     "id": "f_grave_monument",
     "name": "obelisk",
-    "description": "Monument to pride.",
+    "description": "A monument to the fallen, from a time when the dead weren't so restless.",
     "symbol": "$",
     "color": "black_white",
     "move_cost_mod": -1,

data/json/furniture_and_terrain/furniture-terrains.json

@@ -997,5 +997,109 @@
       "//": "Stone obstacles have double the expected reduction but lower destroy_threshold in return",
       "ranged": { "reduction": [ 32, 64 ], "destroy_threshold": 64, "block_unaimed_chance": "50%" }
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_flagpole_metal",
+    "name": "flagpole",
+    "looks_like": "f_dancing_pole",
+    "description": "An old metal flagpole, with no flag to fly.  Don't lick it if it's cold out.",
+    "symbol": "i",
+    "color": "light_gray",
+    "move_cost_mod": -1,
+    "coverage": 40,
+    "required_str": -1,
+    "flags": [ "BASHABLE", "TRANSPARENT" ],
+    "deconstruct": {
+      "items": [ { "item": "pipe", "count": 8 }, { "item": "sheet_metal", "count": 2 }, { "item": "rope_30", "count": 1 } ]
+    },
+    "bash": {
+      "str_min": 30,
+      "str_max": 100,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "pipe", "count": [ 1, 7 ] },
+        { "item": "scrap", "count": [ 3, 12 ] },
+        { "item": "rope_6", "count": [ 1, 3 ] }
+      ],
+      "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" }
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_us_flag_metal",
+    "copy-from": "f_flagpole_metal",
+    "name": "flagpole with American flag",
+    "looks_like": "american_flag",
+    "description": "An old metal flagpole flying an American flag.  A leftover from before the world ended, you could take it down if you need one for some reason.",
+    "symbol": "i",
+    "color": "light_red",
+    "extend": { "flags": [ "EASY_DECONSTRUCT" ] },
+    "deconstruct": { "furn_set": "f_flagpole_metal", "items": [ { "item": "american_flag", "count": 1 } ] },
+    "bash": {
+      "str_min": 30,
+      "str_max": 100,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "pipe", "count": [ 1, 7 ] },
+        { "item": "scrap", "count": [ 3, 12 ] },
+        { "item": "rope_6", "count": [ 1, 3 ] },
+        { "item": "american_flag", "count": 1 }
+      ],
+      "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" }
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_flagpole_wood",
+    "name": "wooden flagpole",
+    "description": "A makeshift flagpole constructed from a wooden beam and rope.",
+    "symbol": "i",
+    "color": "brown",
+    "looks_like": "f_utility_pole",
+    "move_cost_mod": -1,
+    "coverage": 40,
+    "required_str": -1,
+    "flags": [ "BASHABLE", "TRANSPARENT" ],
+    "deconstruct": { "items": [ { "item": "wood_beam", "count": 1 }, { "item": "rope_makeshift_30", "count": 1 } ] },
+    "bash": {
+      "str_min": 20,
+      "str_max": 100,
+      "sound": "crunch!",
+      "sound_fail": "whack!",
+      "items": [
+        { "item": "log", "count": [ 1, 2 ] },
+        { "item": "splinter", "count": [ 10, 20 ] },
+        { "item": "rope_makeshift_6", "count": [ 1, 3 ] }
+      ],
+      "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" }
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_us_flag_wood",
+    "copy-from": "f_flagpole_wood",
+    "name": "wooden flagpole with American flag",
+    "looks_like": "american_flag",
+    "description": "Someone's hoisted an old American flag from this makeshift flagpole.",
+    "symbol": "i",
+    "color": "light_red",
+    "extend": { "flags": [ "EASY_DECONSTRUCT" ] },
+    "deconstruct": { "furn_set": "f_flagpole_wood", "items": [ { "item": "american_flag", "count": 1 } ] },
+    "bash": {
+      "str_min": 20,
+      "str_max": 100,
+      "sound": "crunch!",
+      "sound_fail": "whack!",
+      "items": [
+        { "item": "log", "count": [ 1, 2 ] },
+        { "item": "splinter", "count": [ 10, 20 ] },
+        { "item": "rope_makeshift_6", "count": [ 1, 3 ] },
+        { "item": "american_flag", "count": 1 }
+      ],
+      "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" }
+    }
   }
 ]

data/json/mapgen/bank.json

@@ -45,7 +45,7 @@
         "6": "t_console",
         "A": "t_atm",
         "G": "t_door_glass_c",
-        "I": "t_column",
+        "I": "t_sidewalk",
         "M": "t_door_metal_locked",
         "R": "t_wall_metal",
         "S": "t_sidewalk",
@@ -58,14 +58,14 @@
         "'": "f_street_light",
         "C": "f_chair",
         "T": "f_table",
+        "I": [ "f_us_flag_metal", "f_flagpole_metal" ],
         "c": "f_counter",
         "l": "f_stool",
         "p": [ "f_indoor_plant", "f_null" ],
         "s": "f_sink",
         "t": "f_toilet"
       },
       "toilets": { "t": {  } },
-      "place_loot": [ { "item": "american_flag", "x": 20, "y": 0, "chance": 50 } ],
       "place_items": [
         { "item": "office", "x": [ 4, 9 ], "y": 8, "chance": 30 },
         { "item": "office", "x": [ 3, 5 ], "y": 12, "chance": 30 },
@@ -177,7 +177,7 @@
         "6": "t_console",
         "A": "t_atm",
         "G": "t_door_glass_c",
-        "i": "t_column",
+        "i": "t_sidewalk",
         "M": "t_door_metal_locked",
         "R": "t_wall_metal",
         "S": "t_sidewalk",
@@ -198,6 +198,7 @@
         "C": "f_chair",
         "T": "f_table",
         "c": "f_counter",
+        "i": [ "f_us_flag_metal", "f_flagpole_metal" ],
         "l": "f_stool",
         "p": [ "f_indoor_plant", "f_null" ],
         "s": "f_sink",
@@ -223,7 +224,6 @@
           "failures": [ { "action": "alarm" }, { "action": "damage" }, { "action": "secubots" } ]
         }
       },
-      "place_loot": [ { "item": "american_flag", "x": 21, "y": 0, "chance": 50 } ],
       "place_monster": [ { "monster": "mon_secubot", "x": [ 7, 18 ], "y": [ 7, 18 ], "chance": 30, "repeat": 4 } ]
     }
   },

data/json/mapgen/cs_public_space.json

@@ -7,7 +7,7 @@
     "object": {
       "rows": [
         "...,....'''''''',...,,.!",
-        "..,...,,'I''''I',..,...,",
+        "..,...,,'I''''M',..,...,",
         "..,...,.''''''''.....,..",
         "...,fsfsfs,'',sfsfsf,.,.",
         ".,.f,,,,,,,'',,,,,,,f...",
@@ -41,13 +41,22 @@
         "S": "t_water_sh",
         "b": "t_sidewalk",
         "D": "t_sidewalk",
-        "I": "t_column",
+        "I": "t_sidewalk",
+        "M": "t_sidewalk",
         "N": "t_sidewalk",
         "f": "t_dirtmound"
       },
-      "furniture": { "!": "f_street_light", "S": "f_statue", "b": "f_bench", "D": "f_dumpster", "N": "f_bulletin", "f": "f_bluebell" },
-      "items": { "D": { "item": "trash_dumpster", "chance": 80 }, "b": { "item": "oa_discarded_news", "chance": 5 } },
-      "place_loot": [ { "item": "american_flag", "x": 10, "y": 1, "chance": 25 } ]
+      "furniture": {
+        "!": "f_street_light",
+        "I": [ "f_us_flag_metal", [ "f_flagpole_metal", 3 ] ],
+        "S": "f_statue",
+        "b": "f_bench",
+        "D": "f_dumpster",
+        "M": "f_grave_monument",
+        "N": "f_bulletin",
+        "f": "f_bluebell"
+      },
+      "items": { "D": { "item": "trash_dumpster", "chance": 80 }, "b": { "item": "oa_discarded_news", "chance": 5 } }
     }
   }
 ]

data/json/mapgen/fema/FEMA.json

@@ -96,7 +96,6 @@
         ]
       },
       "palettes": [ "FEMA_camp" ],
-      "place_loot": [ { "item": "american_flag", "x": 40, "y": 15, "chance": 75 } ],
       "nested": {
         "1": { "chunks": [ [ "fema_lodging", 80 ], [ "fema_corpse_pit", 20 ] ] },
         "2": { "chunks": [ "fema_sanitary" ] },

data/json/mapgen/fema/FEMA_entrance_01.json

@@ -36,7 +36,6 @@
       "rotation": 2,
       "palettes": [ "FEMA_camp" ],
       "terrain": { "N": "t_dirt", "z": "t_dirt" },
-      "place_loot": [ { "item": "american_flag", "x": 9, "y": 21, "chance": 75 } ],
       "monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } }
     }
   }

data/json/mapgen/fema/FEMA_entrance_02.json

@@ -36,7 +36,6 @@
       "rotation": 2,
       "palettes": [ "FEMA_camp" ],
       "terrain": { "N": "t_dirt" },
-      "place_loot": [ { "item": "american_flag", "x": 9, "y": 0, "chance": 75 } ],
       "items": { "X": { "item": "mil_surplus", "chance": 60 } },
       "monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } }
     }

data/json/mapgen/fema/FEMA_entrance_03.json

@@ -36,7 +36,6 @@
       "rotation": 2,
       "palettes": [ "FEMA_camp" ],
       "terrain": { "z": "t_dirt" },
-      "place_loot": [ { "item": "american_flag", "x": 6, "y": 11, "chance": 75 } ],
       "items": { "X": { "item": "mil_surplus", "chance": 60 } },
       "monster": { "Z": { "monster": "mon_zombie_soldier" }, "z": { "monster": "mon_zombie_soldier" } }
     }

data/json/mapgen/fire_station.json

@@ -52,7 +52,6 @@
         { "item": "fireman_mask", "x": [ 18, 18 ], "y": [ 21, 21 ], "chance": 70 },
         { "item": "fireman_gear", "x": [ 20, 20 ], "y": [ 21, 21 ], "chance": 70 }
       ],
-      "place_loot": [ { "item": "american_flag", "x": 23, "y": 5, "chance": 75 } ],
       "place_monsters": [ { "monster": "GROUP_FIRE", "x": [ 2, 21 ], "y": [ 9, 21 ], "chance": 1 } ],
       "place_vehicles": [ { "vehicle": "fire_engine", "x": 10, "y": 12, "chance": 30, "rotation": 270 } ]
     }
@@ -183,7 +182,6 @@
         { "item": "bed", "x": 21, "y": 19, "chance": 70 },
         { "item": "bed", "x": 19, "y": 19, "chance": 70 }
       ],
-      "place_loot": [ { "item": "american_flag", "x": 20, "y": 4, "chance": 75 } ],
       "place_monsters": [ { "monster": "GROUP_FIRE", "x": 10, "y": 16, "chance": 1 } ],
       "place_vehicles": [
         { "vehicle": "fire_truck", "x": 5, "y": 5, "rotation": 270, "chance": 20 },

data/json/mapgen/house/house_garage3.json

@@ -12,7 +12,7 @@
         "..............```````.%.",
         "...[.......[..```````.%.",
         "..............```````.%.",
-        ".......[......```````.%.",
+        "..../..[......```````.%.",
         "..............```````.%.",
         "..[.......[...```````.%.",
         "..............```````.%.",
@@ -35,6 +35,7 @@
       "palettes": [ "standard_domestic_palette" ],
       "terrain": {
         "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
+        "/": "t_region_groundcover_urban",
         "[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
         "!": "t_region_groundcover_urban",
         "&": "t_column",
@@ -45,10 +46,9 @@
         "$": "t_screened_porch_wall",
         "]": "t_screen_door_c"
       },
-      "furniture": { "!": "f_region_flower" },
+      "furniture": { "/": [ [ "f_null", 8 ], "f_us_flag_metal", "f_flagpole_metal" ], "!": "f_region_flower" },
       "place_loot": [
-        { "group": "guns_pistol_common", "x": [ 15, 21 ], "y": [ 18, 21 ], "chance": 5, "ammo": 90, "magazine": 100 },
-        { "item": "american_flag", "x": [ 4, 4 ], "y": [ 5, 5 ], "chance": 2 }
+        { "group": "guns_pistol_common", "x": [ 15, 21 ], "y": [ 18, 21 ], "chance": 5, "ammo": 90, "magazine": 100 }
       ],
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ],
       "place_vehicles": [ { "vehicle": "suburban_home", "x": 17, "y": 6, "chance": 10, "rotation": 270 } ]

data/json/mapgen/house/house_quiverfull.json

@@ -19,7 +19,7 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        "....----p...........YYY.",
+        "....----p...../.....YYY.",
         ".####**####oo##########.",
         ".#sEL   H|S  Q| hffh 6#.",
         ".#E     H|t  B| hffh 6#.",
@@ -46,13 +46,14 @@
       ],
       "palettes": [ "standard_domestic_palette" ],
       "terrain": {
+        "/": "t_region_groundcover_urban",
         "Y": "t_region_groundcover_urban",
         "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
         "#": "t_rock_wall"
       },
+      "furniture": { "/": "f_us_flag_metal" },
       "place_loot": [
-        { "item": "american_flag", "x": [ 2, 2 ], "y": [ 5, 5 ], "chance": 100 },
-        { "group": "book_house_quiverfull_bible", "x": [ 2, 2 ], "y": [ 6, 6 ], "chance": 100 },
+        { "group": "book_house_quiverfull_bible", "x": [ 2, 2 ], "y": [ 5, 5 ], "chance": 100 },
         { "item": "quiver_large", "x": [ 2, 2 ], "y": [ 7, 7 ], "chance": 100 }
       ],
       "place_monsters": [

data/json/mapgen/industrial_center.json

@@ -183,8 +183,7 @@
         { "group": "tools_construction", "x": 75, "y": [ 90, 91 ], "chance": 60, "repeat": 4 },
         { "group": "tools_earthworking", "x": 75, "y": 92, "chance": 80, "repeat": 2 },
         { "group": "office_breakroom", "x": 73, "y": [ 78, 79 ], "chance": 40, "repeat": 3 },
-        { "item": "microwave", "x": 76, "y": 79, "chance": 80 },
-        { "item": "american_flag", "x": 90, "y": 91, "chance": 25 }
+        { "item": "microwave", "x": 76, "y": 79, "chance": 80 }
       ],
       "place_monsters": [
         { "monster": "GROUP_INDUSTRIAL_CENTER", "x": [ 3, 21 ], "y": [ 3, 23 ], "density": 1 },