Merge pull request #6 from CleverRaven/master

Merge pull request CleverRaven#35986 from ZhilkinSerg/sa-2019-12-10
fengjixuchui · Dec 10, 2019 · 94f41b6 · 94f41b6
2 parents 9951821 + 99a13f3
commit 94f41b6
Show file tree

Hide file tree

Showing 265 changed files with 2,017 additions and 1,741 deletions.
diff --git a/data/json/field_type.json b/data/json/field_type.json
@@ -10,6 +10,7 @@
     "type": "field_type",
     "legacy_enum_id": 1,
     "intensity_levels": [ { "name": "blood splatter", "color": "red" }, { "name": "blood stain" }, { "name": "puddle of blood" } ],
+    "description_affix": "covered_in",
     "underwater_age_speedup": "25 minutes",
     "decay_amount_factor": 2,
     "is_splattering": true,
@@ -23,6 +24,7 @@
     "type": "field_type",
     "legacy_enum_id": 2,
     "intensity_levels": [ { "name": "bile splatter", "color": "pink" }, { "name": "bile stain" }, { "name": "puddle of bile" } ],
+    "description_affix": "covered_in",
     "underwater_age_speedup": "25 minutes",
     "decay_amount_factor": 2,
     "is_splattering": true,
@@ -40,6 +42,7 @@
       { "name": "bloody meat chunks", "color": "light_red" },
       { "name": "heap of gore", "color": "red" }
     ],
+    "description_affix": "covered_in",
     "underwater_age_speedup": "25 minutes",
     "decay_amount_factor": 2,
     "is_splattering": true,
@@ -57,6 +60,7 @@
       { "name": "shattered branches and leaves" },
       { "name": "broken vegetation tangle", "color": "green" }
     ],
+    "description_affix": "covered_in",
     "underwater_age_speedup": "25 minutes",
     "decay_amount_factor": 2,
     "is_splattering": true,
@@ -70,6 +74,7 @@
     "type": "field_type",
     "legacy_enum_id": 5,
     "intensity_levels": [ { "name": "cowebs", "sym": "}" }, { "name": "webs" }, { "name": "thick webs", "transparent": false } ],
+    "description_affix": "covered_in",
     "immunity_data": { "traits": [ "WEB_WALKER" ] },
     "priority": 2,
     "phase": "solid",
@@ -85,6 +90,7 @@
       { "name": "slime stain" },
       { "name": "puddle of slime", "color": "green" }
     ],
+    "description_affix": "covered_in",
     "decay_amount_factor": 2,
     "apply_slime_factor": 10,
     "is_splattering": true,
@@ -102,6 +108,7 @@
       { "name": "acid streak" },
       { "name": "pool of acid", "color": "green" }
     ],
+    "description_affix": "covered_in",
     "immunity_data": { "traits": [ "ACIDPROOF" ] },
     "underwater_age_speedup": "2 minutes",
     "has_acid": true,
@@ -168,6 +175,7 @@
         ]
       }
     ],
+    "description_affix": "covered_in",
     "is_splattering": true,
     "priority": 2,
     "half_life": "2 minutes",
@@ -183,6 +191,7 @@
       { "name": "sludge trail", "color": "dark_gray" },
       { "name": "thick sludge trail" }
     ],
+    "description_affix": "covered_in",
     "is_splattering": true,
     "priority": 2,
     "half_life": "6 hours",
@@ -206,6 +215,7 @@
       { "name": "fire", "color": "light_red", "light_emitted": 60, "translucency": 0.4 },
       { "name": "raging fire", "color": "red", "light_emitted": 160, "translucency": 0.1 }
     ],
+    "description_affix": "on",
     "decay_amount_factor": 3,
     "has_fire": true,
     "priority": 4,
@@ -219,6 +229,7 @@
     "type": "field_type",
     "legacy_enum_id": 11,
     "intensity_levels": [ { "name": "legacy rubble", "sym": "#", "color": "dark_gray" } ],
+    "description_affix": "covered_in",
     "half_life": "1 turns",
     "phase": "solid",
     "display_items": false,
@@ -437,6 +448,7 @@
     "type": "field_type",
     "legacy_enum_id": 16,
     "intensity_levels": [ { "name": "gas vent" }, { "//": "repeat last entry" }, { "//": "repeat last entry" } ],
+    "description_affix": "under",
     "wandering_field": "fd_toxic_gas",
     "gas_absorption_factor": 15,
     "dirty_transparency_cache": true,
@@ -477,6 +489,7 @@
     "type": "field_type",
     "legacy_enum_id": 17,
     "intensity_levels": [ { "name": "fire vent", "light_emitted": 20 }, { "//": "repeat last entry" }, { "//": "repeat last entry" } ],
+    "description_affix": "under",
     "has_fire": true,
     "phase": "gas",
     "display_items": false,
@@ -487,6 +500,7 @@
     "type": "field_type",
     "legacy_enum_id": 18,
     "intensity_levels": [ { "name": "fire", "sym": "5", "color": "red", "dangerous": true, "light_emitted": 20 } ],
+    "description_affix": "on",
     "has_fire": true,
     "priority": 4,
     "phase": "gas",
@@ -502,6 +516,7 @@
       { "name": "electric crackle", "color": "cyan", "light_emitted": 4 },
       { "name": "electric cloud", "color": "blue", "light_emitted": 20 }
     ],
+    "description_affix": "illuminated_by",
     "has_elec": true,
     "priority": 4,
     "half_life": "2 turns",
@@ -533,6 +548,7 @@
         "monster_spawn_group": "GROUP_NETHER_FATIGUE_FIELD"
       }
     ],
+    "description_affix": "under",
     "priority": 8,
     "display_items": false,
     "display_field": true
@@ -551,6 +567,7 @@
     "type": "field_type",
     "legacy_enum_id": 22,
     "intensity_levels": [ { "name": "shock vent", "sym": "&" }, { "//": "repeat last entry" }, { "//": "repeat last entry" } ],
+    "description_affix": "under",
     "has_elec": true,
     "priority": -1,
     "phase": "plasma",
@@ -562,6 +579,7 @@
     "type": "field_type",
     "legacy_enum_id": 23,
     "intensity_levels": [ { "name": "acid vent", "sym": "&" }, { "//": "repeat last entry" }, { "//": "repeat last entry" } ],
+    "description_affix": "under",
     "has_acid": true,
     "priority": -1,
     "phase": "liquid",
@@ -593,6 +611,7 @@
       { "name": "beam of light", "color": "light_blue" },
       { "name": "intense beam of light", "color": "white" }
     ],
+    "description_affix": "illuminated_by",
     "priority": 4,
     "half_life": "1 turns",
     "dirty_transparency_cache": true,
@@ -605,6 +624,7 @@
     "type": "field_type",
     "legacy_enum_id": 26,
     "intensity_levels": [ { "name": "spotlight", "sym": "&", "light_emitted": 80 } ],
+    "description_affix": "illuminated_by",
     "priority": 1,
     "half_life": "1 turns",
     "display_field": true
@@ -614,6 +634,7 @@
     "type": "field_type",
     "legacy_enum_id": 27,
     "intensity_levels": [ { "name": "dazzling", "color": "light_red_yellow", "sym": "#", "light_emitted": 5 } ],
+    "description_affix": "illuminated_by",
     "priority": 4,
     "half_life": "1 turns",
     "phase": "plasma",
@@ -629,6 +650,7 @@
       { "name": "plant sap stain" },
       { "name": "puddle of resin" }
     ],
+    "description_affix": "covered_in",
     "underwater_age_speedup": "25 minutes",
     "decay_amount_factor": 2,
     "is_splattering": true,
@@ -642,6 +664,7 @@
     "type": "field_type",
     "legacy_enum_id": 29,
     "intensity_levels": [ { "name": "bug blood splatter", "color": "green" }, { "name": "bug blood stain" }, { "name": "puddle of bug blood" } ],
+    "description_affix": "covered_in",
     "underwater_age_speedup": "25 minutes",
     "decay_amount_factor": 2,
     "is_splattering": true,
@@ -659,6 +682,7 @@
       { "name": "hemolymph stain" },
       { "name": "puddle of hemolymph" }
     ],
+    "description_affix": "covered_in",
     "underwater_age_speedup": "25 minutes",
     "decay_amount_factor": 2,
     "is_splattering": true,
@@ -676,6 +700,7 @@
       { "name": "shattered bug leg", "color": "green" },
       { "name": "torn insect organs", "color": "yellow" }
     ],
+    "description_affix": "covered_in",
     "underwater_age_speedup": "25 minutes",
     "decay_amount_factor": 2,
     "is_splattering": true,
@@ -693,6 +718,7 @@
       { "name": "icky mess" },
       { "name": "heap of squishy gore", "color": "dark_gray" }
     ],
+    "description_affix": "covered_in",
     "underwater_age_speedup": "25 minutes",
     "decay_amount_factor": 2,
     "is_splattering": true,
@@ -1222,6 +1248,7 @@
     "type": "field_type",
     "legacy_enum_id": 50,
     "intensity_levels": [ { "name": "smoke vent", "dangerous": true }, { "//": "repeat last entry" }, { "//": "repeat last entry" } ],
+    "description_affix": "under",
     "wandering_field": "fd_smoke",
     "gas_absorption_factor": 15,
     "dirty_transparency_cache": true,

diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json
@@ -854,19 +854,10 @@
     "move_cost_mod": -1,
     "coverage": 70,
     "required_str": -1,
-    "flags": [ "NOITEM", "SEALED", "ALLOW_FIELD_EFFECT", "TRANSPARENT", "FLAMMABLE", "CONTAINER", "LIQUIDCONT" ],
+    "flags": [ "NOITEM", "SEALED", "ALLOW_FIELD_EFFECT", "TRANSPARENT", "FLAMMABLE", "CONTAINER", "LIQUIDCONT", "EASY_DECONSTRUCT" ],
     "examine_action": "keg",
     "keg_capacity": 45,
-    "deconstruct": {
-      "items": [
-        { "item": "2x4", "count": 18 },
-        { "item": "nail", "charges": [ 7, 14 ] },
-        { "item": "water_faucet", "count": 1 },
-        { "item": "sheet_metal_small", "count": [ 12, 20 ] },
-        { "item": "scrap", "count": [ 5, 10 ] },
-        { "item": "foot_crank", "count": 1 }
-      ]
-    },
+    "deconstruct": { "items": [ { "item": "churn", "count": 1 } ] },
     "bash": {
       "str_min": 12,
       "str_max": 50,

diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json
@@ -15,6 +15,7 @@
       { "item": "sw_22", "prob": 15, "charges-min": 0, "charges-max": 10 },
       { "item": "sw_610", "prob": 20, "charges-min": 0, "charges-max": 6 },
       { "item": "sw_619", "prob": 25, "charges-min": 0, "charges-max": 7 },
+      { "item": "model_10_revolver", "prob": 20, "charges-min": 0, "charges-max": 6 },
       { "item": "taurus_spectrum", "prob": 15, "charges-min": 0, "charges-max": 6 },
       { "item": "p226_357sig", "prob": 20, "charges-min": 0, "charges-max": 15 },
       { "item": "p320_357sig", "prob": 10, "charges-min": 0, "charges-max": 14 },
@@ -42,8 +43,9 @@
     "id": "guns_pistol_rare",
     "//": "Less common pistols including those only used by police/paramilitary forces.",
     "items": [
+      { "item": "bond_410", "prob": 20, "charges-min": 0, "charges-max": 2 },
       { "item": "deagle_44", "prob": 35, "charges-min": 0, "charges-max": 8 },
-      { "item": "m1911a1_38super", "prob": 25, "charges-min": 0, "charges-max": 10 },
+      { "item": "m1911a1_38super", "prob": 25, "charges-min": 0, "charges-max": 9 },
       { "item": "fn57", "prob": 80, "charges-min": 0, "charges-max": 20 },
       { "item": "l_enforcer_45", "prob": 25, "charges-min": 0, "charges-max": 6 },
       { "item": "l_lookout_9mm", "prob": 20, "charges-min": 0, "charges-max": 7 },
@@ -81,13 +83,15 @@
     "id": "guns_pistol_obscure",
     "//": "Imported or otherwise very obscure pistols.",
     "items": [
+      { "item": "af2011a1_38super", "prob": 1, "charges-min": 0, "charges-max": 16 },
       { "item": "bfr", "prob": 100, "charges-min": 0, "charges-max": 5 },
       { "item": "cop_38", "prob": 100, "charges-min": 0, "charges-max": 4 },
       { "item": "lemat_revolver", "prob": 150, "charges-min": 0, "charges-max": 9 },
       { "item": "makarov", "prob": 100, "charges-min": 0, "charges-max": 8 },
       { "item": "moss_brownie", "prob": 100, "charges-min": 0, "charges-max": 4 },
       { "item": "pistol_flintlock", "prob": 150 },
       { "item": "raging_bull", "prob": 100, "charges-min": 0, "charges-max": 5 },
+      { "item": "raging_judge", "prob": 20, "charges-min": 0, "charges-max": 5 },
       { "item": "l_bak_223", "prob": 80, "charges-min": 0, "charges-max": 5 },
       { "item": "rm99_pistol", "prob": 150, "charges-min": 0, "charges-max": 5 },
       { "item": "tokarev", "prob": 100, "charges-min": 0, "charges-max": 8 },
@@ -193,6 +197,7 @@
     "//": "Less common rifles including those only used by police/paramilitary forces.",
     "items": [
       { "item": "acr", "prob": 25, "charges-min": 0, "charges-max": 30 },
+      { "item": "colt_lightning", "prob": 15, "charges-min": 0, "charges-max": 10 },
       { "item": "fn_fal", "prob": 40, "charges-min": 0, "charges-max": 20 },
       { "item": "hk_g3", "prob": 40, "charges-min": 0, "charges-max": 20 },
       { "item": "hk_g36", "prob": 30, "charges-min": 0, "charges-max": 30 },
@@ -299,6 +304,7 @@
       { "item": "browning_a5", "prob": 14, "charges-min": 0, "charges-max": 5 },
       { "item": "remington_1100", "prob": 17, "charges-min": 0, "charges-max": 10 },
       { "item": "mossberg_930", "prob": 15, "charges-min": 0, "charges-max": 6 },
+      { "item": "shotgun_410", "prob": 30, "charges-min": 0, "charges-max": 1 },
       { "item": "shotgun_d", "prob": 30, "charges-min": 0, "charges-max": 2 },
       { "item": "shotgun_s", "prob": 30 }
     ]
@@ -559,6 +565,7 @@
       { "item": "mossberg_500", "prob": 5, "charges-min": 0, "charges-max": 8 },
       { "item": "remington_870", "prob": 5, "charges-min": 0, "charges-max": 6 },
       { "item": "ruger_1022", "prob": 15, "charges-min": 0, "charges-max": 10 },
+      { "item": "shotgun_410", "prob": 10, "charges-min": 0, "charges-max": 1 },
       { "item": "shotgun_s", "prob": 10 },
       { "item": "shotgun_d", "prob": 10, "charges-min": 0, "charges-max": 2 },
       { "item": "sten", "prob": 20, "charges-min": 0, "charges-max": 32 },

diff --git a/data/json/itemgroups/magazines.json b/data/json/itemgroups/magazines.json
@@ -104,6 +104,7 @@
     "items": [
       [ "38_speedloader", 8 ],
       [ "38_speedloader5", 6 ],
+      [ "38_speedloader6", 7 ],
       [ "40_speedloader6", 10 ],
       [ "glock17_17", 14 ],
       [ "glock17_22", 6 ],
@@ -342,6 +343,7 @@
     "items": [
       [ "762x39_clip", 10 ],
       [ "762R_clip", 10 ],
+      [ "af2011a1mag", 1 ],
       [ "ak74mag", 10 ],
       [ "makarovmag", 10 ],
       [ "ppshmag", 10 ],

diff --git a/data/json/items/archery.json b/data/json/items/archery.json
@@ -375,7 +375,7 @@
     "description": "A high-power bow with shaped cams and extra cables for high velocity shots that can be used effectively by fairly strong archers.  Currently set to a medium weight.",
     "price": 55000,
     "material": [ "steel", "plastic" ],
-    "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT" ],
+    "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON" ],
     "skill": "archery",
     "min_strength": 6,
     "ammo": "arrow",

diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json
@@ -221,8 +221,8 @@
     "copy-from": "rifle_manual",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "pipe rifle: .308",
-    "name_plural": "pipe rifles: .308",
+    "name": "handmade heavy carbine",
+    "name_plural": "handmade heavy carbines",
     "//": "It's amongst the smallest of the .308 firearms, and a scrap weapon as well. This means a short handmade barrel, and considerable loss of energy.",
     "description": "A homemade lever-action magazine-fed smoothbore rifle.  While still a primitive pipe and 2x4 design, some minor improvements have been made, such as being able to accept G3 compatible magazines, and chambering the more powerful .308 rounds.",
     "weight": "2311 g",

diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json
@@ -66,6 +66,28 @@
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
     "flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ]
   },
+  {
+    "id": "model_10_revolver",
+    "copy-from": "pistol_revolver",
+    "looks_like": "sw_619",
+    "type": "GUN",
+    "name": "S&W Model 10",
+    "name_plural": "S&W Model 10",
+    "description": "A six-shot revolver, produced since 1899 and known as the most popular handgun of the 20th century.  It has a swing-out cylinder for ease of reloading.",
+    "weight": "907 g",
+    "volume": "500 ml",
+    "price": 42400,
+    "to_hit": -2,
+    "bashing": 9,
+    "material": [ "steel", "wood" ],
+    "color": "dark_gray",
+    "ammo": "38",
+    "dispersion": 480,
+    "durability": 8,
+    "blackpowder_tolerance": 56,
+    "clip_size": 6,
+    "magazines": [ [ "38", [ "38_speedloader6" ] ] ]
+  },
   {
     "id": "rifle_38",
     "copy-from": "gun_base",