Merge pull request #76111 from harakka/hub01_flags

Add indoor flagpole and use it for Hub01 American flags
CleverRaven · Sep 2, 2024 · 9c0bc47 · 9c0bc47
2 parents 714337d + a11dba2
commit 9c0bc47
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-decorative.json b/data/json/furniture_and_terrain/furniture-decorative.json
@@ -334,5 +334,25 @@
       "sound_vol": 16,
       "items": [ { "item": "glass_shard", "count": [ 25, 50 ] }, { "item": "splinter", "count": [ 5, 15 ] } ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_indoor_flagpole",
+    "name": "indoor flagpole",
+    "description": "A 2.5-meter tall flagpole on a weighted stand.  You could hoist up a flag here.",
+    "symbol": "F",
+    "color": "light_gray",
+    "move_cost_mod": 2,
+    "coverage": 20,
+    "required_str": 1,
+    "flags": [ "TRANSPARENT", "PLACE_ITEM" ],
+    "max_volume": "2 L",
+    "bash": {
+      "str_min": 10,
+      "str_max": 30,
+      "sound": "crunch!",
+      "sound_fail": "whack!",
+      "items": [ { "item": "material_aluminium_ingot", "count": [ 4, 8 ] }, { "item": "scrap", "count": [ 2, 6 ] } ]
+    }
   }
 ]
diff --git a/data/json/mapgen/robofachq_static.json b/data/json/mapgen/robofachq_static.json
@@ -380,7 +380,7 @@
         "M": "t_ramp_up_high",
         "m": "t_ramp_up_low"
       },
-      "furniture": { "6": "f_console", ":": "f_server", "f": "f_filing_cabinet" },
+      "furniture": { "6": "f_console", ":": "f_server", "f": "f_filing_cabinet", "A": "f_indoor_flagpole" },
       "item": { "A": { "item": "american_flag" } },
       "items": { "f": { "item": "file_room", "chance": 100, "repeat": [ 10, 30 ] } },
       "monster": { "T": { "monster": "mon_robofac_laserturret_mk1" } },
@@ -459,7 +459,15 @@
         "R": "t_railing",
         "W": "t_water_dispenser"
       },
-      "furniture": { "6": "f_console", ":": "f_server", "K": "f_counter", "H": "f_armchair", "L": "f_locker", "f": "f_filing_cabinet" },
+      "furniture": {
+        "6": "f_console",
+        ":": "f_server",
+        "K": "f_counter",
+        "H": "f_armchair",
+        "L": "f_locker",
+        "f": "f_filing_cabinet",
+        "A": "f_indoor_flagpole"
+      },
       "item": { "A": { "item": "american_flag" } },
       "items": {
         "F": { "item": "fridge", "chance": 80 },