Skip to content

Commit 144fb4e

Browse files
Holli-GitHolli-Git
authored
Gun copyfrom fixes (#80323)
* .22 LR * 9mm + ksub handling fix * 10mm * 32 * 38/357 * 40 S&W * 44 * 45 * 45 colt * 50 BMG * 57 * 223 + 300minwag * 308 * 380/357sig * 3006 + 762 * 12 gauge * Undo some gunmods, fix to-hit, misc gun changes * Undo gunmod changes * Fix oopsies * Undo unneeded manual rifle abstracts * Be less sloppy before committing dude * Update 22.json * Fix recursive error * test sttuff * Update legacy_to_hit.json * Fix test + remove manual handgun abstract * lint * Update unload_naked_test.cpp * Fix a *really* dumb mistake * Misc guns * Fix mosin's bitchin' * Update legacy_to_hit.json * Add ammo back to tokarev * (Hopefully) fix error * lint * Update guns_dps.json * Update legacy_to_hit.json
1 parent 75f2d7f commit 144fb4e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+746
-2042
lines changed

‎data/json/items/classes/gun.json

+299
Original file line numberDiff line numberDiff line change
@@ -287,5 +287,304 @@
287287
"type": "GUN",
288288
"name": { "str": "base SMG", "//~": "NO_I18N" },
289289
"skill": "smg"
290+
},
291+
{
292+
"abstract": "gun_base_handgun_manual",
293+
"type": "GUN",
294+
"color": "light_gray",
295+
"symbol": "⨽",
296+
"weapon_category": [ "AUTOMATIC_PISTOLS" ],
297+
"melee_damage": { "bash": 7 },
298+
"to_hit": { "grip": "solid", "length": "hand", "surface": "line", "balance": "neutral" },
299+
"flags": [ "ALLOWS_BODY_BLOCK", "RELOAD_ONE", "NO_TURRET", "EASY_CLEAN", "RELOAD_EJECT" ],
300+
"blackpowder_tolerance": 56,
301+
"name": { "str": "base gun", "//~": "NO_I18N" },
302+
"skill": "pistol",
303+
"sight_dispersion": 60,
304+
"durability": 8,
305+
"handling": 10,
306+
"reload": 200,
307+
"reload_noise_volume": 10,
308+
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ]
309+
},
310+
{
311+
"abstract": "gun_base_handgun_semi",
312+
"type": "GUN",
313+
"color": "light_gray",
314+
"symbol": "⨽",
315+
"weapon_category": [ "AUTOMATIC_PISTOLS" ],
316+
"melee_damage": { "bash": 7 },
317+
"to_hit": { "grip": "solid", "length": "hand", "surface": "line", "balance": "neutral" },
318+
"flags": [ "ALLOWS_BODY_BLOCK" ],
319+
"name": { "str": "base gun", "//~": "NO_I18N" },
320+
"skill": "pistol",
321+
"sight_dispersion": 60,
322+
"durability": 8,
323+
"handling": 10,
324+
"reload": 150,
325+
"reload_noise_volume": 10,
326+
"faults": [
327+
"fault_gun_blackpowder",
328+
"fault_gun_dirt",
329+
"fault_gun_chamber_spent",
330+
"fault_fail_to_feed",
331+
"fault_stovepipe",
332+
"fault_double_feed"
333+
]
334+
},
335+
{
336+
"abstract": "gun_base_22_semi_pistol",
337+
"copy-from": "gun_base_handgun_semi",
338+
"type": "GUN",
339+
"price_postapoc": "6 USD",
340+
"name": { "str": "base gun", "//~": "NO_I18N" },
341+
"ammo": [ "22" ],
342+
"min_cycle_recoil": 140
343+
},
344+
{
345+
"abstract": "gun_base_9mm_semi_pistol",
346+
"copy-from": "gun_base_handgun_semi",
347+
"type": "GUN",
348+
"price_postapoc": "8 USD",
349+
"name": { "str": "base gun", "//~": "NO_I18N" },
350+
"ammo": [ "9mm" ],
351+
"min_cycle_recoil": 480
352+
},
353+
{
354+
"abstract": "gun_base_10mm_semi_pistol",
355+
"copy-from": "gun_base_handgun_semi",
356+
"type": "GUN",
357+
"price_postapoc": "7 USD",
358+
"name": { "str": "base gun", "//~": "NO_I18N" },
359+
"ammo": [ "10mm" ],
360+
"min_cycle_recoil": 720
361+
},
362+
{
363+
"abstract": "gun_base_32_semi_pistol",
364+
"copy-from": "gun_base_handgun_semi",
365+
"type": "GUN",
366+
"price_postapoc": "2 USD",
367+
"name": { "str": "base gun", "//~": "NO_I18N" },
368+
"ammo": [ "32" ],
369+
"min_cycle_recoil": 135
370+
},
371+
{
372+
"abstract": "gun_base_40_semi_pistol",
373+
"copy-from": "gun_base_handgun_semi",
374+
"type": "GUN",
375+
"price_postapoc": "8 USD",
376+
"name": { "str": "base gun", "//~": "NO_I18N" },
377+
"ammo": [ "40" ],
378+
"min_cycle_recoil": 420
379+
},
380+
{
381+
"abstract": "gun_base_45_semi_pistol",
382+
"copy-from": "gun_base_handgun_semi",
383+
"type": "GUN",
384+
"price_postapoc": "7 USD",
385+
"name": { "str": "base gun", "//~": "NO_I18N" },
386+
"ammo": [ "45" ],
387+
"min_cycle_recoil": 550
388+
},
389+
{
390+
"abstract": "gun_base_57_semi_pistol",
391+
"copy-from": "gun_base_handgun_semi",
392+
"type": "GUN",
393+
"price_postapoc": "7 USD",
394+
"name": { "str": "base gun", "//~": "NO_I18N" },
395+
"ammo": [ "57" ],
396+
"min_cycle_recoil": 330
397+
},
398+
{
399+
"abstract": "gun_base_380_semi_pistol",
400+
"copy-from": "gun_base_handgun_semi",
401+
"type": "GUN",
402+
"price_postapoc": "4 USD",
403+
"name": { "str": "base gun", "//~": "NO_I18N" },
404+
"ammo": [ "380" ],
405+
"min_cycle_recoil": 280
406+
},
407+
{
408+
"abstract": "gun_base_357sig_semi_pistol",
409+
"copy-from": "gun_base_handgun_semi",
410+
"type": "GUN",
411+
"price_postapoc": "4 USD",
412+
"name": { "str": "base gun", "//~": "NO_I18N" },
413+
"ammo": [ "357sig" ],
414+
"min_cycle_recoil": 540
415+
},
416+
{
417+
"abstract": "gun_base_rifle_manual",
418+
"type": "GUN",
419+
"color": "light_gray",
420+
"symbol": "⨽",
421+
"weapon_category": [ "AUTOMATIC_RIFLES" ],
422+
"melee_damage": { "bash": 13 },
423+
"to_hit": { "grip": "solid", "length": "short", "surface": "line", "balance": "neutral" },
424+
"name": { "str": "base gun", "//~": "NO_I18N" },
425+
"flags": [ "RELOAD_ONE", "NO_TURRET", "EASY_CLEAN" ],
426+
"skill": "rifle",
427+
"sight_dispersion": 40,
428+
"durability": 8,
429+
"handling": 20,
430+
"reload": 150,
431+
"reload_noise_volume": 10,
432+
"blackpowder_tolerance": 56,
433+
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ]
434+
},
435+
{
436+
"abstract": "gun_base_rifle_semi",
437+
"type": "GUN",
438+
"color": "light_gray",
439+
"symbol": "⨽",
440+
"weapon_category": [ "AUTOMATIC_RIFLES" ],
441+
"melee_damage": { "bash": 13 },
442+
"to_hit": { "grip": "solid", "length": "short", "surface": "line", "balance": "neutral" },
443+
"name": { "str": "base gun", "//~": "NO_I18N" },
444+
"skill": "rifle",
445+
"sight_dispersion": 40,
446+
"durability": 8,
447+
"handling": 20,
448+
"reload": 150,
449+
"reload_noise_volume": 10,
450+
"faults": [
451+
"fault_gun_blackpowder",
452+
"fault_gun_dirt",
453+
"fault_gun_chamber_spent",
454+
"fault_fail_to_feed",
455+
"fault_stovepipe",
456+
"fault_double_feed"
457+
]
458+
},
459+
{
460+
"abstract": "gun_base_22_semi_rifle",
461+
"copy-from": "gun_base_rifle_semi",
462+
"type": "GUN",
463+
"price_postapoc": "10 USD",
464+
"name": { "str": "base gun", "//~": "NO_I18N" },
465+
"ammo": [ "22" ],
466+
"min_cycle_recoil": 140
467+
},
468+
{
469+
"abstract": "gun_base_9mm_semi_rifle",
470+
"copy-from": "gun_base_rifle_semi",
471+
"type": "GUN",
472+
"price_postapoc": "11 USD",
473+
"name": { "str": "base gun", "//~": "NO_I18N" },
474+
"ammo": [ "9mm" ],
475+
"min_cycle_recoil": 480
476+
},
477+
{
478+
"abstract": "gun_base_45_semi_rifle",
479+
"copy-from": "gun_base_rifle_semi",
480+
"type": "GUN",
481+
"price_postapoc": "12 USD",
482+
"name": { "str": "base gun", "//~": "NO_I18N" },
483+
"ammo": [ "45" ],
484+
"min_cycle_recoil": 550
485+
},
486+
{
487+
"abstract": "gun_base_50bmg_semi_rifle",
488+
"copy-from": "gun_base_rifle_semi",
489+
"type": "GUN",
490+
"price_postapoc": "40 USD",
491+
"name": { "str": "base gun", "//~": "NO_I18N" },
492+
"ammo": [ "50" ],
493+
"reload": 400,
494+
"min_cycle_recoil": 23625
495+
},
496+
{
497+
"abstract": "gun_base_57_semi_rifle",
498+
"copy-from": "gun_base_rifle_semi",
499+
"type": "GUN",
500+
"price_postapoc": "10 USD",
501+
"name": { "str": "base gun", "//~": "NO_I18N" },
502+
"ammo": [ "57" ],
503+
"min_cycle_recoil": 330
504+
},
505+
{
506+
"abstract": "gun_base_223_semi_rifle",
507+
"copy-from": "gun_base_rifle_semi",
508+
"type": "GUN",
509+
"price_postapoc": "15 USD",
510+
"name": { "str": "base gun", "//~": "NO_I18N" },
511+
"ammo": [ "223" ],
512+
"min_cycle_recoil": 1350
513+
},
514+
{
515+
"abstract": "gun_base_308_semi_rifle",
516+
"copy-from": "gun_base_rifle_semi",
517+
"type": "GUN",
518+
"price_postapoc": "18 USD",
519+
"name": { "str": "base gun", "//~": "NO_I18N" },
520+
"ammo": [ "308" ],
521+
"min_cycle_recoil": 2700
522+
},
523+
{
524+
"abstract": "gun_base_762_semi_rifle",
525+
"copy-from": "gun_base_rifle_semi",
526+
"type": "GUN",
527+
"price_postapoc": "9 USD",
528+
"name": { "str": "base gun", "//~": "NO_I18N" },
529+
"ammo": [ "762" ],
530+
"min_cycle_recoil": 1830
531+
},
532+
{
533+
"abstract": "gun_base_3006_semi_rifle",
534+
"copy-from": "gun_base_rifle_semi",
535+
"type": "GUN",
536+
"price_postapoc": "12 USD",
537+
"name": { "str": "base gun", "//~": "NO_I18N" },
538+
"ammo": [ "3006" ],
539+
"min_cycle_recoil": 3420
540+
},
541+
{
542+
"abstract": "gun_base_shotgun_manual",
543+
"type": "GUN",
544+
"color": "light_gray",
545+
"symbol": "⨽",
546+
"weapon_category": [ "AUTOMATIC_RIFLES" ],
547+
"melee_damage": { "bash": 13 },
548+
"to_hit": { "grip": "solid", "length": "short", "surface": "line", "balance": "neutral" },
549+
"name": { "str": "base gun", "//~": "NO_I18N" },
550+
"ammo": [ "shot" ],
551+
"price_postapoc": "5 USD",
552+
"flags": [ "RELOAD_ONE", "NO_TURRET", "EASY_CLEAN" ],
553+
"skill": "shotgun",
554+
"sight_dispersion": 200,
555+
"durability": 8,
556+
"handling": 20,
557+
"reload": 150,
558+
"reload_noise_volume": 10,
559+
"blackpowder_tolerance": 56,
560+
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ]
561+
},
562+
{
563+
"abstract": "gun_base_shotgun_semi",
564+
"type": "GUN",
565+
"color": "light_gray",
566+
"symbol": "⨽",
567+
"weapon_category": [ "AUTOMATIC_RIFLES" ],
568+
"melee_damage": { "bash": 13 },
569+
"to_hit": { "grip": "solid", "length": "short", "surface": "line", "balance": "neutral" },
570+
"name": { "str": "base gun", "//~": "NO_I18N" },
571+
"ammo": [ "shot" ],
572+
"price_postapoc": "7 USD",
573+
"flags": [ "RELOAD_ONE", "EASY_CLEAN" ],
574+
"skill": "shotgun",
575+
"sight_dispersion": 40,
576+
"durability": 8,
577+
"handling": 20,
578+
"reload": 150,
579+
"reload_noise_volume": 10,
580+
"min_cycle_recoil": 2400,
581+
"faults": [
582+
"fault_gun_blackpowder",
583+
"fault_gun_dirt",
584+
"fault_gun_chamber_spent",
585+
"fault_fail_to_feed",
586+
"fault_stovepipe",
587+
"fault_double_feed"
588+
]
290589
}
291590
]

0 commit comments

Comments
 (0)