Merge branch 'master' into guralub

CleverRaven · Jan 5, 2021 · 85501ed · 85501ed
2 parents e04b1e9 + 4fc94be
commit 85501ed
Show file tree

Hide file tree

Showing 80 changed files with 1,114 additions and 545 deletions.
diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json
@@ -453,7 +453,7 @@
     "color": "dark_gray",
     "move_cost": 0,
     "coverage": 65,
-    "flags": [ "PLACE_ITEM" ],
+    "flags": [ "PLACE_ITEM", "NANOFAB_TABLE" ],
     "bash": {
       "str_min": 120,
       "str_max": 150,
@@ -481,6 +481,7 @@
     "name": "nanofabricator control panel",
     "symbol": "&",
     "description": "A small computer panel attached to a nanofabricator.  It has a single slot for reading templates.",
+    "allowed_template_ids": [ "standard_template_construct", "debug_template" ],
     "color": "red",
     "looks_like": "f_console",
     "move_cost": 0,

diff --git a/data/json/itemgroups/main.json b/data/json/itemgroups/main.json
@@ -78,6 +78,12 @@
       { "item": "v29", "prob": 10 }
     ]
   },
+  {
+    "type": "item_group",
+    "id": "debug_template_item",
+    "subtype": "distribution",
+    "entries": [ { "item": "standard_template_construct", "prob": 10 } ]
+  },
   {
     "type": "item_group",
     "id": "nanofab_recipes",

diff --git a/data/json/items/ammo/40x46mm.json b/data/json/items/ammo/40x46mm.json
@@ -58,7 +58,7 @@
     "id": "40x46mm_m651",
     "copy-from": "40x46mm_grenade",
     "type": "AMMO",
-    "name": { "str": "40x46mm M651 tear gas" },
+    "name": { "str": "40x46mm M651 tear gas", "str_pl": "40x46mm M651 tear gases" },
     "description": "A low velocity 40mm tear gas canister.  It is effective for riot control and driving infantry from entrenched positions, and is able to penetrate thin wood.",
     "weight": "290 g",
     "damage": { "damage_type": "bullet", "amount": 24 },
@@ -70,15 +70,15 @@
     "id": "40x46mm_buckshot_m118",
     "copy-from": "40x46mm_buckshot_m199",
     "type": "AMMO",
-    "name": { "str": "40x46mm-M118 buckshot, reloaded" },
+    "name": { "str": "40x46mm-M118 buckshot, reloaded", "str_pl": "40x46mm-M118 buckshots, reloaded" },
     "description": "An improvised 40x46mm buckshot load somewhat resembling M576, loaded into a M118 canister.  Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
     "casing": "40x46mm_m118_casing"
   },
   {
     "id": "40x46mm_buckshot_m199",
     "copy-from": "40x46mm_m576",
     "type": "AMMO",
-    "name": { "str": "40x46mm-M199 buckshot, reloaded" },
+    "name": { "str": "40x46mm-M199 buckshot, reloaded", "str_pl": "40x46mm-M199 buckshots, reloaded" },
     "description": "An improvised 40x46mm buckshot load somewhat resembling M576, loaded into a M199 canister.  Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -87,7 +87,7 @@
     "id": "40x46mm_slug_m118",
     "copy-from": "40x46mm_grenade",
     "type": "AMMO",
-    "name": { "str": "40x46mm-M118 slug, reloaded" },
+    "name": { "str": "40x46mm-M118 slug, reloaded", "str_pl": "40x46mm-M118 slugs, reloaded" },
     "description": "An improvised 40x46mm load resembling a shotgun slug, loaded into a M118 canister.  Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
     "weight": "120 g",
     "damage": { "damage_type": "bullet", "amount": 25, "armor_penetration": 3 },
@@ -98,15 +98,15 @@
     "id": "40x46mm_slug_m199",
     "copy-from": "40x46mm_slug_m118",
     "type": "AMMO",
-    "name": { "str": "40x46mm-M199 slug, reloaded" },
+    "name": { "str": "40x46mm-M199 slug, reloaded", "str_pl": "40x46mm-M199 slugs, reloaded" },
     "description": "An improvised 40x46mm load resembling a shotgun slug, loaded into a M199 canister.  Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
     "casing": "40x46mm_m199_casing"
   },
   {
     "id": "40x46mm_flechette_m118",
     "copy-from": "40x46mm_buckshot_m118",
     "type": "AMMO",
-    "name": { "str": "40x46mm-M118 flechette, reloaded" },
+    "name": { "str": "40x46mm-M118 flechette, reloaded", "str_pl": "40x46mm-M118 flechettes, reloaded" },
     "description": "An improvised 40x46mm flechette load containing 10 steel darts, loaded into a M118 canister.  Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
     "damage": { "damage_type": "bullet", "amount": 22, "armor_penetration": 6 },
     "delete": { "effects": [ "NOGIB" ] }
@@ -115,23 +115,23 @@
     "id": "40x46mm_flechette_m199",
     "copy-from": "40x46mm_flechette_m118",
     "type": "AMMO",
-    "name": { "str": "40x46mm-M199 flechette, reloaded" },
+    "name": { "str": "40x46mm-M199 flechette, reloaded", "str_pl": "40x46mm-M199 flechettes, reloaded" },
     "description": "An improvised 40x46mm flechette load containing 10 steel darts, loaded into a M199 canister.  Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
     "casing": "40x46mm_m199_casing"
   },
   {
     "id": "bp_40x46mm_buckshot_m118",
     "copy-from": "bp_40x46mm_buckshot_m199",
     "type": "AMMO",
-    "name": { "str": "40x46mm-M118 buckshot, black powder" },
+    "name": { "str": "40x46mm-M118 buckshot, black powder", "str_pl": "40x46mm-M118 buckshots, black powder" },
     "description": "An improvised 40x46mm buckshot load somewhat resembling M576, loaded into a M118 canister.  Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
     "casing": "40x46mm_m118_casing"
   },
   {
     "id": "bp_40x46mm_buckshot_m199",
     "copy-from": "40x46mm_m576",
     "type": "AMMO",
-    "name": { "str": "40x46mm-M199 buckshot, black powder" },
+    "name": { "str": "40x46mm-M199 buckshot, black powder", "str_pl": "40x46mm-M199 buckshots, black powder" },
     "description": "An improvised 40x46mm buckshot load somewhat resembling M576, loaded into a M199 canister.  Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
     "proportional": {
       "price": 0.3,
@@ -146,7 +146,7 @@
     "id": "bp_40x46mm_slug_m118",
     "copy-from": "40x46mm_grenade",
     "type": "AMMO",
-    "name": { "str": "40x46mm-M118 slug, black powder" },
+    "name": { "str": "40x46mm-M118 slug, black powder", "str_pl": "40x46mm-M118 slugs, black powder" },
     "description": "An improvised 40x46mm load resembling a shotgun slug, loaded into a M118 canister.  Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
     "damage": { "damage_type": "bullet", "amount": 21, "armor_penetration": 1 },
     "weight": "120 g",
@@ -159,15 +159,15 @@
     "id": "bp_40x46mm_slug_m199",
     "copy-from": "bp_40x46mm_slug_m118",
     "type": "AMMO",
-    "name": { "str": "40x46mm-M199 slug, black powder" },
+    "name": { "str": "40x46mm-M199 slug, black powder", "str_pl": "40x46mm-M199 slugs, black powder" },
     "description": "An improvised 40x46mm load resembling an oversized shotgun slug, loaded into a M199 canister.  Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
     "casing": "40x46mm_m199_casing"
   },
   {
     "id": "bp_40x46mm_flechette_m118",
     "copy-from": "bp_40x46mm_buckshot_m118",
     "type": "AMMO",
-    "name": { "str": "40x46mm-M118 flechette, black powder" },
+    "name": { "str": "40x46mm-M118 flechette, black powder", "str_pl": "40x46mm-M118 flechettes, black powder" },
     "description": "An improvised 40x46mm flechette load containing 10 steel darts, loaded into a M118 canister.  Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
     "damage": { "damage_type": "bullet", "amount": 19, "armor_penetration": 3 },
     "delete": { "effects": [ "NOGIB" ] }
@@ -176,7 +176,7 @@
     "id": "bp_40x46mm_flechette_m199",
     "copy-from": "bp_40x46mm_flechette_m118",
     "type": "AMMO",
-    "name": { "str": "40x46mm-M199 flechette, black powder" },
+    "name": { "str": "40x46mm-M199 flechette, black powder", "str_pl": "40x46mm-M199 flechettes, black powder" },
     "description": "An improvised 40x46mm flechette load containing 10 steel darts, loaded into a M199 canister.  Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
     "casing": "40x46mm_m199_casing"
   }

diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
@@ -374,7 +374,7 @@
   {
     "type": "ammunition_type",
     "id": "battery",
-    "name": "batteries",
+    "name": "kJ",
     "default": "battery"
   },
   {

diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -592,6 +592,20 @@
     "pocket_data": [ { "pocket_type": "SOFTWARE", "max_contains_volume": "1 L", "max_contains_weight": "1 kg" } ],
     "to_hit": -3
   },
+  {
+    "type": "GENERIC",
+    "id": "fema_data",
+    "symbol": ",",
+    "color": "white",
+    "name": { "str_sp": "FEMA data" },
+    "description": "Evacuation plans, disaster risk projections, personnel lists and last minute communications from just before the end, all scrubbed from FEMA servers and stored in an external hdd.",
+    "price": 10000,
+    "price_postapoc": 50,
+    "material": [ "plastic" ],
+    "weight": "30 g",
+    "volume": "250 ml",
+    "to_hit": -3
+  },
   {
     "type": "GENERIC",
     "id": "candlestick",
@@ -1605,11 +1619,22 @@
     "price_postapoc": 1000,
     "material": [ "steel", "plastic" ],
     "nanofab_template_group": "nanofab_recipes",
+    "template_requirements": "nanofabricator",
     "weight": "317 g",
     "volume": "250 ml",
     "to_hit": -1,
     "flags": [ "NANOFAB_TEMPLATE", "TRADER_AVOID" ]
   },
+  {
+    "type": "GENERIC",
+    "id": "debug_template",
+    "copy-from": "standard_template_construct",
+    "color": "yellow",
+    "name": { "str": "nanofabricator template" },
+    "description": "A state-of-the-art optical storage system, containing the instruction set to replicate itself.",
+    "nanofab_template_group": "debug_template_item",
+    "template_requirements": "copper_scrap_equivalent"
+  },
   {
     "type": "GENERIC",
     "id": "template_photonics",

diff --git a/data/json/items/migration.json b/data/json/items/migration.json
@@ -1298,5 +1298,20 @@
     "id": "jug_plastic_sealed",
     "type": "MIGRATION",
     "replace": "jug_plastic"
+  },
+  {
+    "id": "surv_carbine_223",
+    "type": "MIGRATION",
+    "replace": "ar15"
+  },
+  {
+    "id": "rifle_308",
+    "type": "MIGRATION",
+    "replace": "m1a"
+  },
+  {
+    "id": "rifle_3006",
+    "type": "MIGRATION",
+    "replace": "remington_700"
   }
 ]
diff --git a/data/json/items/tool/deployable.json b/data/json/items/tool/deployable.json
@@ -121,14 +121,14 @@
     "type": "TOOL",
     "name": { "str": "folding bicycle" },
     "description": "This is a bicycle folded into a relatively portable package.",
-    "weight": "9071 g",
-    "volume": "21500 ml",
-    "//": "needs huge realism balance, current values are wildly inaccurate",
+    "weight": "10160 g",
+    "volume": "76651 ml",
+    "//": "Data taken from given values/dimensions for the Brompton S1E folding bicycle",
     "price": 35000,
     "price_postapoc": 2000,
     "to_hit": -5,
     "bashing": 10,
-    "material": [ "aluminum" ],
+    "material": [ "steel" ],
     "symbol": "0",
     "color": "light_gray",
     "use_action": {