Full Auto 10/22 (#74371)

* Adds gun, recipes * GG acceptance * Update item_demographics.json * Fix Cataclysm capitalization (Thanks Ferret!) * Adjust skills needed
CleverRaven · Jun 9, 2024 · 2f2d329 · 2f2d329
1 parent d5c7011
commit 2f2d329
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 4 deletions.
diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
@@ -207,6 +207,23 @@
     ],
     "melee_damage": { "bash": 12 }
   },
+  {
+    "id": "ruger_1022_auto",
+    "copy-from": "ruger_1022",
+    "type": "GUN",
+    "name": "full-auto varmint rifle",
+    "description": "A handy and lightweight rifle, modified to fire semi and full auto.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "ruger_1022_auto",
+        "name": { "str": "full-auto Ruger 10/22 rifle" },
+        "description": "A Ruger 10/22 modified post-Cataclysm to selective fire.  While the .22 round isn't very powerful, full auto makes it a lot more effective, and still easily controllable in full auto."
+      }
+    ],
+    "price_postapoc": "10 USD",
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ]
+  },
   {
     "id": "ruger_lcr_22",
     "looks_like": "sw_619",
@@ -552,5 +569,22 @@
       { "magazine_well": "250 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ruger1022mag", "ruger1022bigmag" ] }
     ],
     "melee_damage": { "bash": 12 }
+  },
+  {
+    "id": "ruger_charger_auto",
+    "copy-from": "ruger_charger",
+    "type": "GUN",
+    "name": "full-auto varmint pistol",
+    "description": "A lightweight varmint pistol, modified to fire both semi, and full auto.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "ruger_charger_auto",
+        "name": { "str": "full-auto Ruger 22 Charger" },
+        "description": "A Ruger 22 Charger modified post-Cataclysm to selective fire.  While the .22 round isn't very powerful, full auto makes it a lot more effective, and still easily controllable in full auto even with the lack of a stock."
+      }
+    ],
+    "price_postapoc": "10 USD",
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ]
   }
 ]
diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json
@@ -1389,5 +1389,61 @@
       [ [ "gasket_plastic", 1 ] ],
       [ [ "plastic_chunk", 2 ] ]
     ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "result": "ruger_1022_auto",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_RANGED",
+    "skill_used": "gun",
+    "skills_required": [ [ "traps", 2 ], [ "fabrication", 3 ] ],
+    "difficulty": 2,
+    "time": "2 h",
+    "book_learn": [ [ "textbook_anarch", 2 ] ],
+    "qualities": [
+      { "id": "SAW_M_FINE", "level": 1 },
+      { "id": "SAW_M", "level": 2 },
+      { "id": "DRILL", "level": 3 },
+      { "id": "HAMMER", "level": 2 },
+      { "id": "FILE", "level": 2 },
+      { "id": "SCREW", "level": 1 }
+    ],
+    "proficiencies": [ { "proficiency": "prof_metalworking" } ],
+    "tools": [ [ [ "bench_vise", -1 ] ] ],
+    "components": [
+      [ [ "ruger_1022", 1 ] ],
+      [ [ "qt_wire", 1 ], [ "piano_wire", 1 ] ],
+      [ [ "sheet_metal_small", 2 ] ],
+      [ [ "superglue", 1 ] ]
+    ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "result": "ruger_charger_auto",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_RANGED",
+    "skill_used": "gun",
+    "skills_required": [ [ "traps", 2 ], [ "fabrication", 3 ] ],
+    "difficulty": 2,
+    "time": "2 h",
+    "book_learn": [ [ "textbook_anarch", 2 ] ],
+    "qualities": [
+      { "id": "SAW_M_FINE", "level": 1 },
+      { "id": "SAW_M", "level": 2 },
+      { "id": "DRILL", "level": 3 },
+      { "id": "HAMMER", "level": 2 },
+      { "id": "FILE", "level": 2 },
+      { "id": "SCREW", "level": 1 }
+    ],
+    "proficiencies": [ { "proficiency": "prof_metalworking" } ],
+    "tools": [ [ [ "bench_vise", -1 ] ] ],
+    "components": [
+      [ [ "ruger_charger", 1 ] ],
+      [ [ "qt_wire", 1 ], [ "piano_wire", 1 ] ],
+      [ [ "sheet_metal_small", 2 ] ],
+      [ [ "superglue", 1 ] ]
+    ]
   }
 ]
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -181,7 +181,7 @@
     "replace": "pistol_smg"
   },
   {
-    "id": [ "american_180", "ruger_1022" ],
+    "id": [ "american_180", "ruger_1022", "ruger_1022_auto", "ruger_charger_auto" ],
     "type": "MIGRATION",
     "replace": "pistol_tiny_rifle"
   },

diff --git a/data/mods/Generic_Guns/recipes/recipe_obsolete.json b/data/mods/Generic_Guns/recipes/recipe_obsolete.json
@@ -1198,5 +1198,15 @@
     "type": "recipe",
     "result": "bp_458wm",
     "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "ruger_1022_auto",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "ruger_charger_auto",
+    "obsolete": true
   }
 ]
diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json
@@ -699,7 +699,9 @@
             "j22": 10,
             "walther_p22": 10,
             "cp33": 10,
-            "ruger_charger": 10
+            "ruger_charger": 10,
+            "ruger_charger_auto": 10,
+            "ruger_1022_auto": 10
           }
         },
         {
@@ -1028,6 +1030,8 @@
             "rm103a_pistol": 1,
             "rm228": 1,
             "ruger_57": 1,
+            "ruger_charger": 1,
+            "ruger_charger_auto": 1,
             "rugerlcp": 1,
             "ruger_lcr_22": 1,
             "ruger_lcr_38": 1,
@@ -1059,8 +1063,7 @@
             "walther_ppq_9mm": 1,
             "winchester_1887": 1,
             "witness_10": 1,
-            "xd_10": 1,
-            "ruger_charger": 1
+            "xd_10": 1
           }
         },
         {
@@ -1190,6 +1193,7 @@
             "rm614_lmg": 1,
             "rm88_battle_rifle": 1,
             "ruger_1022": 1,
+            "ruger_1022_auto": 1,
             "ruger_arr": 1,
             "ruger_m77": 1,
             "ruger_mini": 1,