feat(content): th' ol' Jolly Roger (#5375)

* feat(content): th' ol' Jolly Roger * Recordin' t' th' ship's log * style(autofix.ci): automated formatting --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
cataclysmbnteam · Sep 19, 2024 · e92c891 · e92c891
1 parent a61a09d
commit e92c891
Show file tree

Hide file tree

Showing 20 changed files with 152 additions and 15 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -2419,6 +2419,32 @@
     "pre_furniture": "f_flagpole_wood",
     "post_furniture": "f_us_flag_wood"
   },
+  {
+    "type": "construction",
+    "id": "constr_pirate_flag_metal",
+    "//": "Metal flagpole",
+    "group": "hoist_pirate_flag",
+    "category": "DECORATE",
+    "required_skills": [  ],
+    "time": "1 m",
+    "components": [ [ [ "pirate_flag", 1 ] ] ],
+    "pre_note": "Can be deconstructed without tools.",
+    "pre_furniture": "f_flagpole_metal",
+    "post_furniture": "f_pirate_flag_metal"
+  },
+  {
+    "type": "construction",
+    "id": "constr_pirate_flag_wood",
+    "//": "Wooden flagpole",
+    "group": "hoist_pirate_flag",
+    "category": "DECORATE",
+    "required_skills": [  ],
+    "time": "1 m",
+    "components": [ [ [ "pirate_flag", 1 ] ] ],
+    "pre_note": "Can be deconstructed without tools.",
+    "pre_furniture": "f_flagpole_wood",
+    "post_furniture": "f_pirate_flag_wood"
+  },
   {
     "type": "construction",
     "id": "constr_grass_white",

diff --git a/data/json/construction_group.json b/data/json/construction_group.json
@@ -1149,6 +1149,11 @@
     "id": "hoist_us_flag",
     "name": "Hoist American Flag"
   },
+  {
+    "type": "construction_group",
+    "id": "hoist_pirate_flag",
+    "name": "Hoist Jolly Roger"
+  },
   {
     "type": "construction_group",
     "id": "paint_grass_white",

diff --git a/data/json/external_tileset/External_Tileset_DP_Normal.json b/data/json/external_tileset/External_Tileset_DP_Normal.json
@@ -59,7 +59,9 @@
           { "id": "f_sign", "fg": 47 },
           { "id": "tr_can_alarm", "fg": 48 },
           { "id": "mon_mothman", "fg": 49 },
-          { "id": "f_target_downed", "fg": 50 }
+          { "id": "f_target_downed", "fg": 50 },
+          { "id": [ "pirate_flag", "overlay_wielded_pirate_flag" ], "fg": 51 },
+          { "id": "overlay_worn_pirate_flag", "fg": 52 }
         ],
         "sprite_width": 32,
         "sprite_height": 32

diff --git a/data/json/external_tileset/External_Tileset_DP_Normal.png b/data/json/external_tileset/External_Tileset_DP_Normal.png
diff --git a/data/json/external_tileset/External_Tileset_DP_Tall.json b/data/json/external_tileset/External_Tileset_DP_Tall.json
@@ -41,7 +41,10 @@
           { "id": "f_flagpole_wood", "fg": 21 },
           { "id": "f_us_flag_metal", "fg": 22 },
           { "id": "f_us_flag_wood", "fg": 23 },
-          { "id": "vp_mounted_american_flag", "fg": 24 }
+          { "id": "vp_mounted_american_flag", "fg": 24 },
+          { "id": "f_pirate_flag_metal", "fg": 25 },
+          { "id": "f_pirate_flag_wood", "fg": 26 },
+          { "id": "vp_mounted_pirate_flag", "fg": 27 }
         ],
         "sprite_width": 64,
         "sprite_height": 80,

diff --git a/data/json/external_tileset/External_Tileset_DP_Tall.png b/data/json/external_tileset/External_Tileset_DP_Tall.png
diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json
@@ -1101,5 +1101,53 @@
       ],
       "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" }
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_pirate_flag_metal",
+    "copy-from": "f_us_flag_metal",
+    "name": "flagpole with Jolly Roger",
+    "looks_like": "pirate_flag",
+    "description": "An old metal flagpole, now flying a black pirate flag.",
+    "symbol": "i",
+    "color": "dark_gray",
+    "deconstruct": { "furn_set": "f_flagpole_metal", "items": [ { "item": "pirate_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": "pirate_flag", "count": 1 }
+      ],
+      "ranged": { "reduction": [ 15, 30 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" }
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_pirate_flag_wood",
+    "copy-from": "f_us_flag_wood",
+    "name": "wooden flagpole with Jolly Roger",
+    "looks_like": "pirate_flag",
+    "description": "Someone's hoisted a black pirate flag from this makeshift flagpole.",
+    "symbol": "i",
+    "color": "light_red",
+    "deconstruct": { "furn_set": "f_flagpole_wood", "items": [ { "item": "pirate_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": "pirate_flag", "count": 1 }
+      ],
+      "ranged": { "reduction": [ 10, 20 ], "destroy_threshold": 100, "block_unaimed_chance": "25%" }
+    }
   }
 ]
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -1324,7 +1324,8 @@
       [ "haori", 2 ],
       [ "hakama", 4 ],
       [ "eclipse_glasses", 1 ],
-      [ "thermos", 20 ]
+      [ "thermos", 20 ],
+      [ "pirate_flag", 1 ]
     ]
   },
   {

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1102,7 +1102,8 @@
       [ "retort_copper", 10 ],
       { "group": "tinware", "prob": 50 },
       [ "crown_golden", 10 ],
-      [ "fluid_preserved_brain", 20 ]
+      [ "fluid_preserved_brain", 20 ],
+      [ "pirate_flag", 25 ]
     ]
   },
   {
@@ -1799,7 +1800,8 @@
       [ "barometer", 3 ],
       [ "badge_doctor", 5 ],
       [ "dnd_handbook", 2 ],
-      [ "bodypillow", 1 ]
+      [ "bodypillow", 1 ],
+      [ "pirate_flag", 5 ]
     ]
   },
   {

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -598,7 +598,8 @@
       [ "gold_medal", 1 ],
       [ "bionic_scanner", 5 ],
       { "group": "tinware", "prob": 10 },
-      [ "shield_riot", 5 ]
+      [ "shield_riot", 5 ],
+      [ "pirate_flag", 5 ]
     ]
   },
   {

diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json
@@ -339,7 +339,8 @@
       [ "hat_sombrero", 25 ],
       [ "apron_leather", 20 ],
       [ "bandolier_knife", 15 ],
-      [ "baldric_holster", 10 ]
+      [ "baldric_holster", 10 ],
+      [ "pirate_flag", 15 ]
     ]
   },
   {

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -1081,7 +1081,8 @@
       [ "fencing_foil", 20 ],
       [ "fencing_sabre", 20 ],
       [ "fencing_epee", 20 ],
-      [ "fencing_mask", 20 ]
+      [ "fencing_mask", 20 ],
+      [ "pirate_flag", 5 ]
     ]
   },
   {

diff --git a/data/json/items/armor/cloaks.json b/data/json/items/armor/cloaks.json
@@ -22,6 +22,29 @@
     "environmental_protection": 1,
     "flags": [ "OVERSIZE", "OUTER", "ALLOWS_NATURAL_ATTACKS" ]
   },
+  {
+    "id": "pirate_flag",
+    "copy-from": "american_flag",
+    "type": "ARMOR",
+    "name": { "str": "Jolly Roger" },
+    "description": "A black replica pirate flag.",
+    "looks_like": "plastic_sheet",
+    "color": "dark_gray",
+    "snippet_category": [
+      { "id": "pirate_flag_1", "text": "A black replica pirate flag, depicting a skull-and-crossbones." },
+      {
+        "id": "pirate_flag_2",
+        "text": "A black replica pirate flag, depicting a skull-and-crossbones over an hourglass."
+      },
+      { "id": "pirate_flag_3", "text": "A black replica pirate flag, depicting a skull over a cutlass." },
+      {
+        "id": "pirate_flag_4",
+        "text": "A black replica pirate flag, depicting a skeleton stabbing a heart with a spear."
+      },
+      { "id": "pirate_flag_5", "text": "A black replica pirate flag, depicting an arm holding a cutlass." },
+      { "id": "pirate_flag_6", "text": "A black replica pirate flag, depicting a skull." }
+    ]
+  },
   {
     "id": "cape_fp",
     "repairs_like": "sheet",

diff --git a/data/json/mapgen/bandit_cabin.json b/data/json/mapgen/bandit_cabin.json
@@ -10,7 +10,7 @@
         "..z......z....#####.....",
         "..........#####;_8#####.",
         "..z.......#__:#A_8#_@@#.",
-        ".....,,,,,#___##+##_@@#.",
+        "....I,,,,,#___##+##_@@#.",
         "....,,,,,,#@@_#___#___#.",
         "....,,,,,,#@@_+___+___#.",
         "z...,,,,S,#___#___#_:_#.",
@@ -57,6 +57,7 @@
         "F": "t_rock_floor",
         "G": "t_rock_floor",
         "H": "t_rock_floor",
+        "I": "t_grass",
         "S": "t_sidewalk",
         "[": "t_fence_v",
         "^": "t_tree",
@@ -83,6 +84,7 @@
         "F": "f_fridge",
         "G": "f_oven",
         "H": "f_armchair",
+        "I": [ [ "f_null", 9 ], "f_pirate_flag_wood" ],
         "c": "f_counter"
       },
       "toilets": { ";": {  } },

diff --git a/data/json/mapgen/bandit_camp.json b/data/json/mapgen/bandit_camp.json
@@ -42,7 +42,7 @@
         ",,1111111P///////////WWWWW/////......./P111111,,",
         ",,1111111P///WWWW//////////////.....r#/P111111,,",
         ",%1111111P///W2wW///zz/////////#rrrrr#/P111111%,",
-        ",,1111111P///Www////zz/////////#######/P111111,,",
+        ",,1111111P///Www////zz/I///////#######/P111111,,",
         ",%1111111P///WWWW//////////////////////P111111,,",
         ",,111111###////////////////////////////P111111,,",
         "$,111111###PPPPPPPPPPP##//////##PPPPPPP##11111/,",

diff --git a/data/json/mapgen/bandit_garage.json b/data/json/mapgen/bandit_garage.json
@@ -22,7 +22,7 @@
         "...,,,,,,,,,,,,,,,,,,,,,",
         "...,,,,,,,,,,,,,,,,,,,,r",
         "...##,,,,,,,,,,,,,,,,,,r",
-        "...##,,,,,,,,,,,,,,,,,,r",
+        "...##,I,,,,,,,,,,,,,,,,r",
         "...##,,,,,,,,,,,,,,,,,,r",
         "...##PPPP##,,,,,,,,,,,,r",
         ".........##PPPP##,,,,,,,",
@@ -46,8 +46,8 @@
         { "point": "trap", "id": "tr_landmine_buried", "x": [ 6, 14 ], "y": [ 20, 22 ], "repeat": [ 2, 4 ] },
         { "point": "trap", "id": "tr_landmine_buried", "x": [ 12, 21 ], "y": [ 21, 23 ], "repeat": [ 2, 4 ] }
       ],
-      "terrain": { ".": "t_grass", ",": "t_dirt", "#": "t_wall_log", "P": "t_palisade", "r": "t_dirt", "S": "t_sidewalk" },
-      "furniture": { "r": "f_rack" },
+      "terrain": { ".": "t_grass", ",": "t_dirt", "#": "t_wall_log", "I": "t_dirt", "P": "t_palisade", "r": "t_dirt", "S": "t_sidewalk" },
+      "furniture": { "I": [ [ "f_null", 9 ], "f_pirate_flag_wood" ], "r": "f_rack" },
       "place_npcs": [ { "class": "bandit", "x": 4, "y": 9 }, { "class": "bandit", "x": 22, "y": 13 } ]
     }
   },

diff --git a/data/json/mapgen/radio_tower.json b/data/json/mapgen/radio_tower.json
@@ -251,7 +251,7 @@
         "                        ",
         "                        ",
         "          aaaaaa        ",
-        "          a,,,,a        ",
+        "          a,,,Ia        ",
         "          a,RR,a        ",
         "          a,RR,a        ",
         "          a>,,,a        ",
@@ -273,7 +273,14 @@
         "                        "
       ],
       "palettes": [ "roof_palette" ],
-      "terrain": { "R": "t_radio_tower", "a": "t_railing", ",": "t_metal_floor_no_roof", ">": "t_ladder_down" },
+      "terrain": {
+        "I": "t_metal_floor_no_roof",
+        "R": "t_radio_tower",
+        "a": "t_railing",
+        ",": "t_metal_floor_no_roof",
+        ">": "t_ladder_down"
+      },
+      "furniture": { "I": [ [ "f_null", 19 ], "f_pirate_flag_wood" ] },
       "place_nested": [
         {
           "chunks": [

diff --git a/data/json/mapgen_palettes/bandit_camp.json b/data/json/mapgen_palettes/bandit_camp.json
@@ -6,6 +6,7 @@
       ",": [ [ "f_null", 200 ], [ "f_region_weed", 2 ], "f_boulder_small" ],
       "@": "f_bed",
       "2": "f_large_groundsheet",
+      "I": [ [ "f_null", 9 ], "f_pirate_flag_wood" ],
       "K": "f_wood_keg",
       "L": "f_locker",
       "S": "f_sink",
@@ -33,6 +34,7 @@
       "@": "t_rock_floor",
       "1": [ [ "t_region_groundcover_barren", 15 ], [ "t_region_groundcover", 4 ], "t_region_shrub" ],
       "2": "t_region_groundcover_barren",
+      "I": "t_region_groundcover_barren",
       "K": "t_rock_floor",
       "L": "t_rock_floor",
       "P": "t_palisade",

diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json
@@ -3335,5 +3335,15 @@
     },
     "flags": [ "FOLDABLE", "PROTRUSION", "OVER", "UNMOUNT_ON_DAMAGE" ],
     "breaks_into": [ { "item": "splinter", "count": [ 1, 5 ] }, { "item": "american_flag", "count": 1 } ]
+  },
+  {
+    "type": "vehicle_part",
+    "id": "mounted_pirate_flag",
+    "copy-from": "mounted_american_flag",
+    "name": { "str": "mounted Jolly Roger" },
+    "description": "A black pirate flag, fluttering in the breeze atop a vehicle.",
+    "color": "dark_gray",
+    "item": "pirate_flag",
+    "breaks_into": [ { "item": "splinter", "count": [ 1, 5 ] }, { "item": "pirate_flag", "count": 1 } ]
   }
 ]
diff --git a/doc/src/content/docs/en/mod/json/reference/graphics/external_tileset.md b/doc/src/content/docs/en/mod/json/reference/graphics/external_tileset.md
@@ -45,6 +45,7 @@ Links to relevant pull requests, for content covered below:
   [#5361](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5361)
 - Flagpoles: [#5363](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5363)
 - Vehicle-mounted Flags: [#5372](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5372)
+- Pirate Flag: [#5375](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5375)
 
 ## Undead People
 
@@ -88,6 +89,7 @@ Ultica are planned for the future.
 - Lepidopterid. New monster specific to BN.
 - Furniture version of utility light. Furniture specific to BN.
 - Knocked-down steel target. Furniture specific to BN.
+- Jolly Roger, item and worn sprite. Item specific to BN.
 
 ### External_Tileset_DP_Tall.png
 
@@ -103,6 +105,7 @@ Ultica are planned for the future.
 - Grid floodlights, furniture based off now-deconstructabble utility lights, furniture added to BN.
 - Metal and wooden flagpoles (including with flag raised), furniture added to BN.
 - American flag displayed as a vehiclepart, specific to BN.
+- Flagpole furniture and vehiclepart for Jolly Roger, content specific to BN.
 
 ### alternative_mutation_tileset.png