Combine 7.62x51 and .308 casings into one

data/json/itemgroups/Weapons_Mods_Ammo/ammo.json

@@ -764,7 +764,6 @@
       { "item": "270win_casing", "prob": 60 },
       { "item": "300_casing", "prob": 80 },
       { "item": "3006_casing", "prob": 80 },
-      { "item": "308_casing", "prob": 80 },
       { "item": "32_casing", "prob": 80 },
       { "item": "357mag_casing", "prob": 80 },
       { "item": "357sig_casing", "prob": 60 },
@@ -792,7 +791,7 @@
       { "item": "458wm_casing", "prob": 40 },
       { "item": "762_casing", "prob": 80 },
       { "item": "762_25_casing", "prob": 60 },
-      { "item": "762_51_casing", "prob": 80 },
+      { "item": "762_51_casing", "prob": 160 },
       { "item": "762R_casing", "prob": 60 },
       { "item": "9mm_casing", "prob": 100 },
       { "item": "9x18mm_casing", "prob": 80 },
@@ -840,10 +839,9 @@
       [ "57mm_casing", 10 ],
       [ "46mm_casing", 10 ],
       [ "762_casing", 85 ],
-      [ "762_51_casing", 50 ],
+      [ "762_51_casing", 100 ],
       [ "223_casing", 85 ],
       [ "3006_casing", 40 ],
-      [ "308_casing", 50 ],
       [ "50_casing", 30 ],
       [ "458wm_casing", 10 ],
       [ "300_casing", 60 ],

data/json/items/ammo/308.json

@@ -91,7 +91,6 @@
     "description": ".308 Winchester ammunition with a 168gr hollow point bullet.  The .308 cartridge is one of the most popular hunting cartridges in the world due to its accuracy and power.",
     "relative": { "damage": { "damage_type": "bullet", "amount": 2, "armor_penetration": -4 }, "dispersion": -10 },
     "proportional": { "recoil": 0.909 },
-    "casing": "308_casing",
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
   {

data/json/items/armor/jewelry.json

@@ -4444,7 +4444,6 @@
       { "type": "COMPONENT_ID", "condition": "50beowulf_casing", "name": { "str_sp": "Wolf's Voice" } },
       { "type": "COMPONENT_ID", "condition": "450_casing", "name": { "str_sp": "Cooper's Touch" } },
       { "type": "COMPONENT_ID", "condition": "30carbine_casing", "name": { "str_sp": "Paratrooper's" } },
-      { "type": "COMPONENT_ID", "condition": "308_casing", "name": { "str_sp": "Marksman's" } },
       { "type": "COMPONENT_ID", "condition": "123ln_casing", "name": { "str_sp": "Illegal Alien" } },
       { "type": "COMPONENT_ID", "condition": "diamond", "name": { "str": "%s diamond necklace" } },
       { "type": "COMPONENT_ID", "condition": "garnet", "name": { "str": "%s garnet necklace" } },

data/json/items/generic/casing.json

@@ -110,23 +110,13 @@
     "weight": "7 g",
     "volume": "10ml"
   },
-  {
-    "id": "308_casing",
-    "copy-from": "casing",
-    "looks_like": "223_casing",
-    "type": "GENERIC",
-    "name": { "str": ".308 casing" },
-    "description": "An empty casing from a .308 round.",
-    "weight": "6 g",
-    "volume": "9ml"
-  },
   {
     "id": "762_51_casing",
     "copy-from": "casing",
     "looks_like": "223_casing",
     "type": "GENERIC",
     "name": { "str": "7.62x51mm casing" },
-    "description": "An empty casing from a 7.62x51mm M80 round.",
+    "description": "An empty casing from a 7.62x51mm or .308 Winchester round.",
     "weight": "6 g",
     "volume": "9ml"
   },

data/json/mapgen/basement/basement_survival.json

@@ -12,7 +12,7 @@
   {
     "id": "basement_survival_last_stand_casing",
     "type": "item_group",
-    "items": [ { "item": "308_casing", "charges": 1 }, { "item": "ammolink308", "charges": 1 } ]
+    "items": [ { "item": "762_51_casing", "charges": 1 }, { "item": "ammolink308", "charges": 1 } ]
   },
   {
     "type": "mapgen",

data/json/mapgen/map_extras/mass_grave.json

@@ -2,7 +2,7 @@
   {
     "id": "mass_grave_casings",
     "type": "item_group",
-    "items": [ [ "223_casing", 60 ], [ "308_casing", 20 ], [ "shot_hull", 20 ] ]
+    "items": [ [ "223_casing", 60 ], [ "762_51_casing", 20 ], [ "shot_hull", 20 ] ]
   },
   {
     "type": "mapgen",

data/json/npcs/items_generic.json

@@ -338,7 +338,7 @@
       [ "223_casing", 1 ],
       [ "2lcanteen", 3 ],
       [ "3006_casing", 1 ],
-      [ "308_casing", 1 ],
+      [ "762_51_casing", 1 ],
       [ "38_casing", 1 ],
       [ "40_casing", 1 ],
       [ "44_casing", 1 ],

data/json/obsoletion_and_migration_0.I/migration_items.json

@@ -1403,5 +1403,10 @@
     "id": "moss_brownie",
     "type": "MIGRATION",
     "replace": "ruger_lcr_22"
+  },
+  {
+    "id": "308_casing",
+    "type": "MIGRATION",
+    "replace": "762_51_casing"
   }
 ]

data/json/recipes/ammo/components.json

@@ -148,7 +148,7 @@
     "book_learn": [ [ "manual_pistol", 5 ], [ "recipe_bullets", 3 ] ],
     "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "DRILL", "level": 2 } ],
     "tools": [ [ [ "press", -1 ] ], [ [ "cordless_drill", 2 ], [ "corded_powerdrill", 2 ] ] ],
-    "components": [ [ [ "762_51_casing", 1 ], [ "308_casing", 1 ], [ "3006_casing", 1 ] ] ]
+    "components": [ [ [ "762_51_casing", 1 ], [ "3006_casing", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -301,7 +301,7 @@
     "book_learn": [ [ "manual_pistol", 5 ], [ "recipe_bullets", 3 ] ],
     "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "DRILL", "level": 2 } ],
     "tools": [ [ [ "press", -1 ] ], [ [ "cordless_drill", 2 ], [ "corded_powerdrill", 2 ] ] ],
-    "components": [ [ [ "762_51_casing", 1 ], [ "308_casing", 1 ], [ "3006_casing", 1 ] ] ]
+    "components": [ [ [ "762_51_casing", 1 ], [ "3006_casing", 1 ] ] ]
   },
   {
     "type": "recipe",

data/json/recipes/ammo/rifle.json

@@ -435,37 +435,14 @@
     "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
     "charges": 1,
     "reversible": true,
-    "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 3 ], [ "ammo_308", 1 ] ],
+    "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 3 ], [ "ammo_762_51", 1 ] ],
     "//": "2700 mg gunpowder rounded to 28 100 mg 'pieces'.  168gr SB HPBT 2200, .308 win case, 0.474in s.depth, 2.014 c.len, 2.704g h4895 hodgdon.",
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [
       [ [ "gunpowder_magnum_pistol", 27 ], [ "gunpowder_rifle", 27 ], [ "gunpowder_large_rifle", 27 ] ],
       [ [ "copper", 1 ] ]
     ]
   },
-  {
-    "result": "reloaded_308",
-    "id_suffix": "from_762x51",
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_RIFLE",
-    "skill_used": "fabrication",
-    "difficulty": 3,
-    "skills_required": [ "gun", 1 ],
-    "time": "2 m",
-    "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
-    "charges": 1,
-    "reversible": true,
-    "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 3 ], [ "ammo_762_51", 1 ] ],
-    "//": "2600 mg gunpowder rounded to 26 100 mg 'pieces'.  168gr SB HPBT 2200, 7.62x51nato case, 0.474in s.depth, 2.014 c.len, 2.605g h4895 hodgdon.",
-    "proficiencies": [ { "proficiency": "prof_handloading" } ],
-    "components": [
-      [ [ "gunpowder_magnum_pistol", 26 ], [ "gunpowder_rifle", 26 ], [ "gunpowder_large_rifle", 26 ] ],
-      [ [ "copper", 1 ] ]
-    ]
-  },
   {
     "result": "bp_308",
     "type": "recipe",
@@ -480,25 +457,6 @@
     "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
     "charges": 1,
     "reversible": true,
-    "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 3 ], [ "ammo_308", 1 ] ],
-    "proficiencies": [ { "proficiency": "prof_handloading" } ],
-    "components": [ [ [ "chem_black_powder", 27 ] ], [ [ "copper", 1 ] ] ]
-  },
-  {
-    "result": "bp_308",
-    "id_suffix": "from_762x51",
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_RIFLE",
-    "skill_used": "fabrication",
-    "difficulty": 3,
-    "skills_required": [ "gun", 1 ],
-    "time": "2 m",
-    "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
-    "charges": 1,
-    "reversible": true,
     "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 3 ], [ "ammo_762_51", 1 ] ],
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [ [ [ "chem_black_powder", 26 ] ], [ [ "copper", 1 ] ] ]
@@ -1034,26 +992,6 @@
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [ [ [ "gunpowder_rifle", 28 ], [ "gunpowder_magnum_pistol", 28 ] ], [ [ "copper", 2 ] ] ]
   },
-  {
-    "result": "reloaded_762_51",
-    "id_suffix": "from_308",
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_RIFLE",
-    "skill_used": "fabrication",
-    "difficulty": 5,
-    "skills_required": [ "gun", 5 ],
-    "time": "2 m",
-    "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
-    "charges": 1,
-    "reversible": true,
-    "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 3 ], [ "ammo_308", 1 ] ],
-    "//": "2915 mg gunpowder rounded to 29 100 mg 'pieces'. .308 146gr Norma FMJ spitz 67651, seated 0.324in, .308 win case, 2915mg Hodgdon H4895.",
-    "proficiencies": [ { "proficiency": "prof_handloading" } ],
-    "components": [ [ [ "gunpowder_rifle", 29 ], [ "gunpowder_magnum_pistol", 29 ] ], [ [ "copper", 2 ] ] ]
-  },
   {
     "result": "reloaded_762_51_incendiary",
     "type": "recipe",
@@ -1077,30 +1015,6 @@
       [ [ "incendiary", 6 ] ]
     ]
   },
-  {
-    "result": "reloaded_762_51_incendiary",
-    "id_suffix": "from_308",
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_RIFLE",
-    "skill_used": "fabrication",
-    "difficulty": 6,
-    "skills_required": [ "gun", 5 ],
-    "time": "2 m",
-    "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_bullets", 5 ] ],
-    "charges": 1,
-    "reversible": true,
-    "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 3 ], [ "ammo_308", 1 ] ],
-    "//": "2915 mg gunpowder rounded to 29 100 mg 'pieces'. .308 146gr Norma FMJ spitz 67651, seated 0.324in, .308 win case, 2915mg Hodgdon H4895.",
-    "proficiencies": [ { "proficiency": "prof_handloading" } ],
-    "components": [
-      [ [ "gunpowder_magnum_pistol", 29 ], [ "gunpowder_rifle", 29 ], [ "gunpowder_large_rifle", 29 ] ],
-      [ [ "copper", 2 ] ],
-      [ [ "incendiary", 6 ] ]
-    ]
-  },
   {
     "result": "bp_762_51",
     "type": "recipe",
@@ -1120,26 +1034,6 @@
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [ [ [ "chem_black_powder", 28 ] ], [ [ "copper", 2 ] ] ]
   },
-  {
-    "result": "bp_762_51",
-    "id_suffix": "from_308",
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_RIFLE",
-    "skill_used": "fabrication",
-    "difficulty": 5,
-    "skills_required": [ "gun", 5 ],
-    "time": "2 m",
-    "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ],
-    "charges": 1,
-    "reversible": true,
-    "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 3 ], [ "ammo_308", 1 ] ],
-    "//": "2915 mg gunpowder rounded to 29 100 mg 'pieces'. .308 146gr Norma FMJ spitz 67651, seated 0.324in, .308 win case, 2915mg Hodgdon H4895.",
-    "proficiencies": [ { "proficiency": "prof_handloading" } ],
-    "components": [ [ [ "chem_black_powder", 29 ] ], [ [ "copper", 2 ] ] ]
-  },
   {
     "result": "bp_762_51_incendiary",
     "type": "recipe",
@@ -1159,26 +1053,6 @@
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [ [ [ "chem_black_powder", 28 ] ], [ [ "copper", 2 ] ], [ [ "incendiary", 6 ] ] ]
   },
-  {
-    "result": "bp_762_51_incendiary",
-    "id_suffix": "from_308",
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_RIFLE",
-    "skill_used": "fabrication",
-    "difficulty": 6,
-    "skills_required": [ "gun", 5 ],
-    "time": "2 m",
-    "batch_time_factors": [ 60, 5 ],
-    "book_learn": [ [ "recipe_bullets", 5 ] ],
-    "charges": 1,
-    "reversible": true,
-    "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 3 ], [ "ammo_308", 1 ] ],
-    "//": "2915 mg gunpowder rounded to 29 100 mg 'pieces'. .308 146gr Norma FMJ spitz 67651, seated 0.324in, .308 win case, 2915mg Hodgdon H4895.",
-    "proficiencies": [ { "proficiency": "prof_handloading" } ],
-    "components": [ [ [ "chem_black_powder", 29 ] ], [ [ "copper", 2 ] ], [ [ "incendiary", 6 ] ] ]
-  },
   {
     "result": "reloaded_762_54R",
     "type": "recipe",

data/json/requirements/ammo.json

@@ -22,12 +22,6 @@
     "//": "Components required for 303 ammo",
     "components": [ [ [ "303_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ] ]
   },
-  {
-    "id": "ammo_308",
-    "type": "requirement",
-    "//": "Components required for 308 ammo",
-    "components": [ [ [ "308_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ] ]
-  },
   {
     "id": "ammo_762_51",
     "type": "requirement",
@@ -173,7 +167,6 @@
     "//": "References needed for boltfaces and magazines using .308 or derivatives",
     "tools": [
       [
-        [ "308_casing", -1 ],
         [ "308", -1 ],
         [ "762_51", -1 ],
         [ "762_51_incendiary", -1 ],
@@ -351,7 +344,6 @@
         [ "270win_casing", 1 ],
         [ "3006_casing", 1 ],
         [ "303_casing", 1 ],
-        [ "308_casing", 1 ],
         [ "300blk_casing", 1 ],
         [ "30carbine_casing", 1 ],
         [ "300_casing", 1 ],

data/json/uncraft/ammo/308.json

@@ -9,7 +9,7 @@
     "qualities": [ { "id": "PULL", "level": 1 } ],
     "components": [
       [ [ "lead", 3 ] ],
-      [ [ "308_casing", 1 ] ],
+      [ [ "762_51_casing", 1 ] ],
       [ [ "lgrifle_primer", 1 ] ],
       [ [ "gunpowder_large_rifle", 28 ] ],
       [ [ "copper", 1 ] ]

data/mods/Generic_Guns/ammo/casings.json

@@ -22,7 +22,7 @@
   },
   {
     "id": "rifle_casing",
-    "copy-from": "308_casing",
+    "copy-from": "762_51_casing",
     "type": "GENERIC",
     "name": { "str": "rifle casing" },
     "description": "An empty casing from a rifle round."

data/mods/Generic_Guns/ammo/gg_casings_migration.json

@@ -54,7 +54,6 @@
       "77arisaka_casing",
       "300blk_casing",
       "3006_casing",
-      "308_casing",
       "4570_casing",
       "50beowulf_casing",
       "450_casing",

data/mods/Xedra_Evolved/mapgen/safehouse.json

@@ -108,7 +108,7 @@
   {
     "id": "basement_survival_last_stand_casing",
     "type": "item_group",
-    "items": [ { "item": "308_casing", "charges": 1 }, { "item": "ammolink308", "charges": 1 } ]
+    "items": [ { "item": "762_51_casing", "charges": 1 }, { "item": "ammolink308", "charges": 1 } ]
   },
   {
     "type": "mapgen",