Two houses at the end of a lonely road (#54022)

Co-authored-by: Maleclypse <[email protected]> Co-authored-by: George Karfakis <[email protected]>
CleverRaven · Jan 14, 2022 · 7c60531 · 7c60531
1 parent 6ee8d46
commit 7c60531
Show file tree

Hide file tree

Showing 33 changed files with 3,320 additions and 9 deletions.
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -175,6 +175,11 @@
     "type": "json_flag",
     "info": "You could probably use this to get into a secure industrial facility."
   },
+  {
+    "id": "COOP_CARD",
+    "type": "json_flag",
+    "info": "Gives you access to the artisans workshop."
+  },
   {
     "id": "SKINNED",
     "type": "json_flag"

diff --git a/data/json/furniture_and_terrain/furniture-tools.json b/data/json/furniture_and_terrain/furniture-tools.json
@@ -119,6 +119,52 @@
       "items": [ { "item": "char_forge", "count": 1 } ]
     }
   },
+  {
+    "type": "furniture",
+    "id": "f_forge_artisan_0",
+    "name": "Cody's forge",
+    "looks_like": "f_fireplace",
+    "description": "Metalworking station typically used in combination with an anvil.  You can see pipes running into the walls.",
+    "symbol": "^",
+    "color": "light_red",
+    "move_cost_mod": -1,
+    "coverage": 40,
+    "required_str": -1,
+    "crafting_pseudo_item": "fake_forge",
+    "flags": [ "TRANSPARENT", "SEALED", "CONTAINER", "NOITEM", "EASY_DECONSTRUCT" ],
+    "deconstruct": { "items": [ { "item": "char_forge", "count": 1 } ] },
+    "examine_action": "reload_furniture",
+    "bash": {
+      "str_min": 4,
+      "str_max": 8,
+      "sound": "crunch!",
+      "sound_fail": "whump.",
+      "items": [ { "item": "char_forge", "count": 1 } ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_forge_artisan_1",
+    "name": "Cody's forge",
+    "looks_like": "f_fireplace",
+    "description": "Metalworking station typically used in combination with an anvil.  You can see pipes running into the walls.",
+    "symbol": "^",
+    "color": "light_red",
+    "move_cost_mod": -1,
+    "coverage": 40,
+    "required_str": -1,
+    "crafting_pseudo_item": "fake_forge",
+    "flags": [ "TRANSPARENT", "SEALED", "CONTAINER", "NOITEM", "EASY_DECONSTRUCT" ],
+    "deconstruct": { "items": [ { "item": "char_forge", "count": 1 } ] },
+    "examine_action": "reload_furniture",
+    "bash": {
+      "str_min": 4,
+      "str_max": 8,
+      "sound": "crunch!",
+      "sound_fail": "whump.",
+      "items": [ { "item": "char_forge", "count": 1 } ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_anvil",

diff --git a/data/json/furniture_and_terrain/terrain-mechanisms.json b/data/json/furniture_and_terrain/terrain-mechanisms.json
@@ -366,6 +366,33 @@
       "redundant_msg": "The door is already open."
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_card_artisans",
+    "name": "card reader",
+    "description": "This is a smartcard reader.  Text written on a post note above reads 'CO-OP MEMBERS ONLY'.",
+    "//": "for the isolated artisans faction",
+    "symbol": "6",
+    "color": "pink",
+    "move_cost": 0,
+    "flags": [ "NOITEM", "CONNECT_TO_WALL" ],
+    "examine_action": {
+      "type": "cardreader",
+      "flags": [ "COOP_CARD" ],
+      "terrain_changes": { "t_door_metal_locked": "t_door_metal_c" },
+      "query_msg": "Swipe your ID card?",
+      "success_msg": "You insert your ID card.\n<color_light_green>The nearby doors unlock.</color>",
+      "redundant_msg": "The nearby doors are already opened."
+    },
+    "bash": {
+      "str_min": 18,
+      "str_max": 180,
+      "sound": "crunch!",
+      "sound_fail": "whack!",
+      "ter_set": "t_card_reader_broken",
+      "items": [ { "item": "plastic_chunk", "count": [ 0, 2 ] }, { "item": "scrap", "prob": 50 } ]
+    }
+  },
   {
     "type": "terrain",
     "id": "t_card_science_maintenance_green",

diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json
@@ -45,6 +45,14 @@
     "subtype": "collection",
     "entries": [ { "item": "esapi_plate", "prob": 50 }, { "item": "esapi_plate", "prob": 50 } ]
   },
+  {
+    "id": "military_ballistic_vest_light_pristine",
+    "type": "item_group",
+    "//": "light ballistic vest plus plates",
+    "container-item": "ballistic_vest_light",
+    "subtype": "collection",
+    "entries": [ { "item": "esapi_plate" }, { "item": "esapi_plate" } ]
+  },
   {
     "id": "military_ballistic_vest_heavy",
     "type": "item_group",

diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -557,6 +557,20 @@
     "to_hit": -3,
     "flags": [ "MC_USED" ]
   },
+  {
+    "type": "TOOL",
+    "id": "usb_drive_nano",
+    "symbol": ",",
+    "color": "white",
+    "name": { "str": "secured USB drive" },
+    "description": "A USB thumb drive.  Useful for holding software.  This one seems like it could get ran over by a truck and be fine.",
+    "price": 10000,
+    "price_postapoc": 10,
+    "material": [ "steel", "plastic" ],
+    "weight": "55 g",
+    "volume": "5 ml",
+    "to_hit": -3
+  },
   {
     "type": "GENERIC",
     "id": "data_card",
@@ -3098,6 +3112,15 @@
     "weight": "100 kg",
     "copy-from": "broken_turret"
   },
+  {
+    "type": "GENERIC",
+    "id": "broken_turret_artisans",
+    "symbol": ",",
+    "color": "green",
+    "name": { "str": "broken custom plated turret" },
+    "weight": "75 kg",
+    "copy-from": "broken_turret"
+  },
   {
     "type": "GENERIC",
     "id": "broken_secubot",

diff --git a/data/json/items/gun/545x39.json b/data/json/items/gun/545x39.json
@@ -38,6 +38,47 @@
     ],
     "flags": [ "NEVER_JAMS" ],
     "weapon_category": [ "AUTOMATIC_RIFLES" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ak74mag", "rpk74mag" ] } ]
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ak74mag", "rpk74mag", "casket74mag" ] } ]
+  },
+  {
+    "id": "kord",
+    "copy-from": "rifle_auto",
+    "looks_like": "ar15",
+    "type": "GUN",
+    "name": { "str": "Kord 6P67" },
+    "//": "An exceptionally new AK style gun found illicitly as part of a quest.",
+    "description": "Special forces Russian rifle chambered in 5.45.  This version uses standard Picatinny rails, has modern lightweight furniture and a unique complex recoil balance system for high fire rate with minimal recoil.  It combines the reliability of the AK series with the high-velocity, lightweight 5.45x39mm cartridge and accepts standard AK-74M magazines.",
+    "weight": "3250 g",
+    "volume": "2418 ml",
+    "longest_side": "96 cm",
+    "price": 390000,
+    "price_postapoc": 4000,
+    "to_hit": -1,
+    "bashing": 11,
+    "material": [ "steel", "plastic" ],
+    "color": "brown",
+    "ammo": [ "545x39" ],
+    "dispersion": 120,
+    "durability": 8,
+    "min_cycle_recoil": 1260,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "burst", 2 ], [ "AUTO", "auto", 4 ] ],
+    "barrel_volume": "250 ml",
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "barrel", 1 ],
+      [ "bore", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock", 1 ],
+      [ "underbarrel", 1 ]
+    ],
+    "flags": [ "NEVER_JAMS" ],
+    "weapon_category": [ "AUTOMATIC_RIFLES" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ak74mag", "rpk74mag", "casket74mag" ] } ]
   }
 ]
diff --git a/data/json/items/gun/monster_gun.json b/data/json/items/gun/monster_gun.json
@@ -55,6 +55,29 @@
     "dispersion": 150,
     "durability": 8
   },
+  {
+    "id": "firework_cannon",
+    "type": "GUN",
+    "symbol": "%",
+    "color": "red",
+    "name": { "str": "fireworks cannon" },
+    "description": "An autoloading fireworks launcher.",
+    "material": [ "steel" ],
+    "flags": [ "PRIMITIVE_RANGED_WEAPON", "NEVER_JAMS", "NONCONDUCTIVE", "NO_REPAIR", "WATERPROOF_GUN", "NO_SALVAGE", "NO_UNLOAD" ],
+    "skill": "launcher",
+    "ammo_effects": [ "SMOKE", "FLASHBANG" ],
+    "ranged_damage": { "damage_type": "bash", "amount": 1 },
+    "weight": "540 g",
+    "volume": "750 ml",
+    "longest_side": "25 cm",
+    "bashing": 2,
+    "to_hit": 1,
+    "reload_noise_volume": 2,
+    "loudness": 50,
+    "range": 12,
+    "dispersion": 400,
+    "durability": 8
+  },
   {
     "id": "feral_human_thrown_rock",
     "type": "GUN",

diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json
@@ -67,6 +67,26 @@
     "min_skills": [ [ "mechanics", 2 ], [ "rifle", 3 ] ],
     "flags": [ "INSTALL_DIFFICULT", "CONSUMABLE" ]
   },
+  {
+    "id": "bars",
+    "type": "GUNMOD",
+    "name": { "str": "balanced recoil system" },
+    "description": "This is a complex set of parts designed to minimize recoil using a reciprocating counterweight.",
+    "weight": "60 g",
+    "volume": "250 ml",
+    "integral_volume": "0 ml",
+    "price": 24000,
+    "price_postapoc": 500,
+    "material": [ "steel" ],
+    "symbol": ":",
+    "color": "red",
+    "location": "mechanism",
+    "mod_targets": [ "kord" ],
+    "install_time": "15 m",
+    "handling_modifier": 15,
+    "min_skills": [ [ "mechanics", 2 ], [ "rifle", 3 ] ],
+    "flags": [ "INSTALL_DIFFICULT", "CONSUMABLE" ]
+  },
   {
     "id": "waterproof_gunmod",
     "type": "GUNMOD",

diff --git a/data/json/items/id_cards.json b/data/json/items/id_cards.json
@@ -48,6 +48,23 @@
     "category": "keys",
     "to_hit": -3
   },
+  {
+    "type": "GENERIC",
+    "id": "id_artisan_member",
+    "looks_like": "id_science",
+    "symbol": ",",
+    "color": "green",
+    "name": { "str": "co-op badge" },
+    "description": "A manually encoded badge giving you access to the artisans workshop.  It even has your name written on the back.",
+    "price": 120000,
+    "flags": [ "COOP_CARD" ],
+    "price_postapoc": 100,
+    "material": [ "plastic" ],
+    "weight": "6 g",
+    "volume": "5 ml",
+    "category": "keys",
+    "to_hit": -3
+  },
   {
     "type": "GENERIC",
     "id": "id_science_visitor_1",

diff --git a/data/json/items/magazine/545x39.json b/data/json/items/magazine/545x39.json
@@ -33,5 +33,23 @@
     "reload_time": 130,
     "flags": [ "MAG_BULKY" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "545x39": 45 } } ]
+  },
+  {
+    "id": "casket74mag",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "AK-74M 60-round magazine" },
+    "description": "A 60-round magazine compatible with the AK-74M rifle.",
+    "weight": "400 g",
+    "volume": "750 ml",
+    "price": 8500,
+    "price_postapoc": 250,
+    "material": [ "plastic" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "545x39" ],
+    "reload_time": 130,
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "545x39": 60 } } ]
   }
 ]