Merge pull request #7 from CleverRaven/master

BackToRootsJune16
I-am-Erk · Jun 17, 2019 · 19ef0be · 19ef0be
2 parents b999b06 + 35c6114
commit 19ef0be
Show file tree

Hide file tree

Showing 71 changed files with 858 additions and 308 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,7 +33,7 @@ MESSAGE("   \\     \\____ / __ \\_ |  |   / __ \\_\\  \\___ |  |__ \\___  | \\__
 MESSAGE("    \\______  /\(____  / |__|  \(____  / \\___  >|____/ / ____|/____  >|__|_|  /    ")
 MESSAGE("           \\/      \\/             \\/      \\/        \\/          \\/       \\/     ")
 MESSAGE("                               --= Dark Days Ahead =--")
-MESSAGE("\n * http://en.cataclysmdda.com/\n")
+MESSAGE("\n * https://cataclysmdda.org/\n")
 
 MESSAGE(STATUS "${PROJECT} build environment -- \n")
 

diff --git a/COMPILING-CMAKE.md b/COMPILING-CMAKE.md
@@ -3,7 +3,6 @@
 **WARNING**: CMake build is **NOT** official and should be used for *dev purposes ONLY*.
 
 For official way to build CataclysmDDA See:
-  * The latest instructions on how to compile can be found on [our wiki](http://tools.cataclysmdda.com/wiki).
   * [COMPILING.md](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/COMPILING.md)
 
 

diff --git a/data/json/itemgroups/ammo.json b/data/json/itemgroups/ammo.json
@@ -26,7 +26,7 @@
     "id": "ammo_pistol_rare",
     "//": "Less common pistol ammo including that only used by police/paramilitary forces.",
     "items": [
-      [ "10mm", 15 ],
+      [ "10mm_fmj", 15 ],
       [ "38_super", 20 ],
       [ "44fmj", 15 ],
       [ "44magnum", 35 ],
@@ -65,7 +65,7 @@
     "id": "ammo_pistol_reloaded",
     "//": "Reloaded pistol ammo balanced according to rarity.",
     "items": [
-      [ "reloaded_10mm", 10 ],
+      [ "reloaded_10mm_fmj", 10 ],
       [ "reloaded_32_acp", 50 ],
       [ "reloaded_38_fmj", 30 ],
       [ "reloaded_38_special", 80 ],
@@ -221,7 +221,7 @@
     "type": "item_group",
     "id": "ammo_shotgun_common",
     "//": "Shotgun ammo commonly owned by citizens and found in many locations.",
-    "items": [ [ "shot_00", 100 ], [ "shot_bird", 70 ] ]
+    "items": [ [ "shot_00", 100 ], [ "shot_bird", 70 ], [ "shot_dragon", 10 ] ]
   },
   {
     "type": "item_group",
@@ -255,6 +255,7 @@
     "items": [
       [ "reloaded_shot_00", 200 ],
       [ "reloaded_shot_bird", 30 ],
+      [ "reloaded_shot_dragon", 20 ],
       [ "reloaded_shot_flechette", 5 ],
       [ "reloaded_shot_slug", 30 ],
       [ "shot_scrap", 80 ]

diff --git a/data/json/itemgroups/drugs.json b/data/json/itemgroups/drugs.json
@@ -76,5 +76,12 @@
       { "item": "smoxygen_tank", "prob": 20 },
       { "item": "tramadol", "prob": 20 }
     ]
+  },
+  {
+    "id": "jar_weed",
+    "type": "item_group",
+    "//": "For sale display appropriate packaging",
+    "subtype": "distribution",
+    "items": [ [ "jar_3l_glass", 100 ], { "item": "weed", "charges": [ 10, 420 ], "prob": 100, "container-item": "jar_3l_glass" } ]
   }
 ]
diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json
@@ -16,6 +16,7 @@
       { "item": "sw_610", "prob": 20, "charges-min": 0, "charges-max": 6 },
       { "item": "sw_619", "prob": 25, "charges-min": 0, "charges-max": 7 },
       { "item": "p226_357sig", "prob": 20, "charges-min": 0, "charges-max": 15 },
+      { "item": "p320_357sig", "prob": 10, "charges-min": 0, "charges-max": 14 },
       { "item": "kp32", "prob": 10, "charges-min": 0, "charges-max": 7 },
       { "item": "kp3at", "prob": 35, "charges-min": 0, "charges-max": 6 },
       { "item": "rugerlcp", "prob": 35, "charges-min": 0, "charges-max": 6 },
@@ -49,7 +50,7 @@
     "id": "guns_pistol_milspec",
     "//": "Military specification pistols only ever found at military sites.",
     "items": [
-      { "item": "glock_17", "prob": 100, "charges-min": 0, "charges-max": 17 },
+      { "item": "m17", "prob": 100, "charges-min": 0, "charges-max": 17 },
       { "item": "glock_18c", "prob": 70, "charges-min": 0, "charges-max": 17 },
       { "item": "l_mp_45", "prob": 70, "charges-min": 0, "charges-max": 12 },
       { "item": "l_mp_9mm", "prob": 100, "charges-min": 0, "charges-max": 21 },

diff --git a/data/json/itemgroups/magazines.json b/data/json/itemgroups/magazines.json
@@ -30,7 +30,8 @@
       [ "stanag30", 20 ],
       [ "stanag50", 5 ],
       [ "hk417mag_20rd", 30 ],
-      [ "hk417mag_10rd", 20 ]
+      [ "hk417mag_10rd", 20 ],
+      [ "p320mag_17rd_9x19mm", 60 ]
     ]
   },
   {
@@ -108,7 +109,8 @@
       [ "kp3atmag", 4 ],
       [ "rugerlcpmag", 10 ],
       [ "sw22mag", 10 ],
-      [ "p226mag_15rd_357sig", 25 ]
+      [ "p226mag_15rd_357sig", 25 ],
+      [ "p320mag_14rd_357sig", 10 ]
     ]
   },
   {

diff --git a/data/json/items/ammo/10mm.json b/data/json/items/ammo/10mm.json
@@ -0,0 +1,33 @@
+[
+  {
+    "id": "10mm_fmj",
+    "type": "AMMO",
+    "name": "10mm Auto FMJ",
+    "description": "A jacketed 10mm Auto round.  The 10mm Auto cartridge is a rather powerful handgun round and the progenitor to the more popular .40 S&W.",
+    "weight": 9,
+    "volume": 1,
+    "price": 2800,
+    "material": [ "brass", "powder" ],
+    "symbol": "=",
+    "color": "yellow",
+    "count": 40,
+    "stack_size": 40,
+    "ammo_type": "10mm",
+    "casing": "10mm_casing",
+    "range": 14,
+    "damage": 31,
+    "pierce": 4,
+    "dispersion": 50,
+    "recoil": 750,
+    "effects": [ "COOKOFF" ]
+  },
+  {
+    "id": "reloaded_10mm_fmj",
+    "copy-from": "10mm_fmj",
+    "type": "AMMO",
+    "name": "reloaded 10mm Auto FMJ",
+    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  }
+]
diff --git a/data/json/items/ammo/40.json b/data/json/items/ammo/40.json
@@ -1,14 +1,4 @@
 [
-  {
-    "id": "10mm",
-    "copy-from": "40sw",
-    "type": "AMMO",
-    "name": "10mm Auto",
-    "description": "10mm Auto ammunition with 180gr FMJ bullets.  The 10mm Auto round is one of the most powerful pistol cartridges available, although its usefulness is limited by high recoil.",
-    "price": 2900,
-    "count": 20,
-    "relative": { "damage": 4, "pierce": 4, "dispersion": -10, "recoil": 20 }
-  },
   {
     "id": "40fmj",
     "copy-from": "40sw",
@@ -39,15 +29,6 @@
     "recoil": 560,
     "effects": [ "COOKOFF" ]
   },
-  {
-    "id": "reloaded_10mm",
-    "copy-from": "10mm",
-    "type": "AMMO",
-    "name": "reloaded 10mm Auto",
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ] }
-  },
   {
     "id": "reloaded_40fmj",
     "copy-from": "40fmj",

diff --git a/data/json/items/ammo/shot.json b/data/json/items/ammo/shot.json
@@ -8,6 +8,15 @@
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
+  {
+    "id": "reloaded_shot_dragon",
+    "copy-from": "shot_dragon",
+    "type": "AMMO",
+    "name": "reloaded dragon's breath shell",
+    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_shot_00",
     "copy-from": "shot_00",
@@ -112,6 +121,16 @@
     "proportional": { "damage": 0.3, "recoil": 0.6, "loudness": 0.8 },
     "extend": { "effects": [ "NOGIB" ] }
   },
+  {
+    "id": "shot_dragon",
+    "copy-from": "shot_00",
+    "type": "AMMO",
+    "name": "dragon's breath shell",
+    "description": "A shotgun shell filled with magnesium pellets or shards, used mostly as a distress flare or pyrotechnics tool.  When the round is fired, high temperature sparks and flames shoot out of the barrel, igniting everything in their path.",
+    "price": 14000,
+    "proportional": { "damage": 0.2, "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2, "range": 0.5 },
+    "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
+  },
   {
     "id": "shot_flechette",
     "copy-from": "shot_00",

diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
@@ -119,6 +119,12 @@
     "name": ".40",
     "default": "40sw"
   },
+  {
+    "type": "ammunition_type",
+    "id": "10mm",
+    "name": "10mm Auto",
+    "default": "10mm_fmj"
+  },
   {
     "type": "ammunition_type",
     "id": "44",

diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json
@@ -465,7 +465,7 @@
     "name": "hamburger helper",
     "weight": 170,
     "color": "red",
-    "spoils_in": "10 hours",
+    "spoils_in": "1 day",
     "container": "box_small",
     "comestible_type": "FOOD",
     "symbol": "%",

diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json
@@ -91,6 +91,15 @@
     "weight": 3,
     "volume": "5ml"
   },
+  {
+    "id": "10mm_casing",
+    "copy-from": "casing",
+    "type": "GENERIC",
+    "name": "10mm Auto casing",
+    "description": "An empty casing from a 10mm Auto round.",
+    "weight": 3,
+    "volume": "5ml"
+  },
   {
     "id": "40mm_casing",
     "type": "GENERIC",

diff --git a/data/json/items/gun/357sig.json b/data/json/items/gun/357sig.json
@@ -27,5 +27,24 @@
     "description": "A full size .357 SIG Glock pistol.  It is extremely similar to the Glock 22, and could be converted to fire .40 S&W by switching the barrel.",
     "ammo": [ "357sig" ],
     "magazines": [ [ "357sig", [ "glock40mag", "glock40bigmag" ] ] ]
+  },
+  {
+    "id": "p320_357sig",
+    "copy-from": "pistol_base",
+    "type": "GUN",
+    "name": "SIG P320",
+    "description": "The P320 is a semi automatic, short recoil operated pistol.  This one is chambered for .357 SIG.",
+    "weight": 800,
+    "volume": 2,
+    "price": 69000,
+    "to_hit": -2,
+    "bashing": 8,
+    "material": [ "plastic", "steel" ],
+    "color": "dark_gray",
+    "ammo": "357sig",
+    "dispersion": 480,
+    "durability": 6,
+    "magazine_well": 1,
+    "magazines": [ [ "357sig", [ "p320mag_14rd_357sig" ] ] ]
   }
 ]
diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
@@ -181,7 +181,7 @@
     "material": [ "steel", "wood" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "40",
+    "ammo": [ "10mm", "40" ],
     "ranged_damage": 1,
     "dispersion": 320,
     "durability": 8,

diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json
@@ -536,5 +536,24 @@
     "bashing": 2,
     "ammo": "9mm",
     "magazines": [ [ "9mm", [ "kpf9mag" ] ] ]
+  },
+  {
+    "id": "m17",
+    "copy-from": "pistol_base",
+    "type": "GUN",
+    "name": "M17",
+    "description": "The M17 is a semi automatic, short recoil operated pistol derived from the SIG Sauer P320.",
+    "weight": 800,
+    "volume": 2,
+    "price": 69000,
+    "to_hit": -2,
+    "bashing": 8,
+    "material": [ "plastic", "steel" ],
+    "color": "dark_gray",
+    "ammo": "9mm",
+    "dispersion": 480,
+    "durability": 6,
+    "magazine_well": 1,
+    "magazines": [ [ "9mm", [ "p320mag_17rd_9x19mm" ] ] ]
   }
 ]
diff --git a/data/json/items/magazine/357sig.json b/data/json/items/magazine/357sig.json
@@ -14,5 +14,22 @@
     "capacity": 15,
     "reliability": 9,
     "flags": [ "MAG_COMPACT" ]
+  },
+  {
+    "id": "p320mag_14rd_357sig",
+    "type": "MAGAZINE",
+    "name": "P320 magazine .357 SIG",
+    "description": "A 14 round double stack box magazine for the SIG Sauer P320.",
+    "weight": 105,
+    "volume": 1,
+    "price": 2900,
+    "material": "plastic",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "357sig",
+    "capacity": 14,
+    "reliability": 7,
+    "reload_time": 140,
+    "flags": [ "MAG_COMPACT" ]
   }
 ]
diff --git a/data/json/items/magazine/9mm.json b/data/json/items/magazine/9mm.json
@@ -307,5 +307,22 @@
     "capacity": 7,
     "reliability": 9,
     "flags": [ "MAG_COMPACT" ]
+  },
+  {
+    "id": "p320mag_17rd_9x19mm",
+    "type": "MAGAZINE",
+    "name": "P320 magazine 9x19mm",
+    "description": "A 17 round double stack box magazine for the SIG Sauer P320.",
+    "weight": 105,
+    "volume": 1,
+    "price": 2900,
+    "material": "plastic",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "9mm",
+    "capacity": 17,
+    "reliability": 7,
+    "reload_time": 140,
+    "flags": [ "MAG_COMPACT" ]
   }
 ]
diff --git a/data/json/items/migration.json b/data/json/items/migration.json
@@ -571,5 +571,10 @@
     "id": "hd_battery",
     "type": "MIGRATION",
     "replace": "heavy_plus_battery_cell"
+  },
+  {
+    "id": "10mm",
+    "type": "MIGRATION",
+    "replace": "10mm_fmj"
   }
 ]