-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Merging Experimental Hotfix 2 into main version o Recap: removes the extra jamming chance for using variant/"bad" ammo from the jamming script o Was done since we already have a function that will randomly rip your gun's base condition slightly when firing variant/"bad" ammo - Adjusted.44 Mag from Shon's "Wester Wonders" to be slightly stronger than .357 HP (https://discord.com/channels/912320241713958912/1055545995330592848) o Expansion bonus increased from 1.5 (50% extra damage on flesh hit/armor-penetrating hits) to 2.0 (100% extra damage on flesh hit/armor-penetrating hits) o Now has the "Varmageddon" effect (60% extra damage against mutants) o Crafting .44 Mag now costs 2 pistol casing stacks, 2 rifle powder stacks, and 3 pistol heads
- Loading branch information
Showing
3 changed files
with
62 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,54 +1,2 @@ | ||
![ammo_vanilla] | ||
ammo_9x18_fmj_bad = 5, recipe_ammo_pistol, casing_p,1,powder_1,2,bullet_pistol,2 | ||
ammo_9x18_pmm_bad = 5, recipe_ammo_ru1, casing_p,1,powder_1,4,bullet_pistol,2 | ||
ammo_9x18_ap_bad = 5, recipe_ammo_ru2, casing_p,1,powder_1,4,bullet_pistol_ap,2 | ||
|
||
ammo_9x19_fmj_bad = 5, recipe_ammo_pistol, casing_p,1,powder_1,2,bullet_pistol,2 | ||
ammo_9x19_pbp_bad = 5, recipe_ammo_pistol, casing_p,1,powder_1,5,bullet_pistol,2 | ||
ammo_9x19_ap_bad = 5, recipe_ammo_ru2, casing_p,1,powder_1,7,bullet_pistol_ap,2 | ||
|
||
ammo_11.43x23_fmj_bad = 5, recipe_ammo_pistol, casing_p,1,powder_1,4,bullet_pistol_ap,2 | ||
ammo_11.43x23_hydro_bad = 5, recipe_ammo_arty1, casing_p,4,powder_1,6,bullet_pistol,4,powder_blood,2 | ||
|
||
ammo_5.7x28_ss190_bad = 5, recipe_ammo_nato, casing_p,2,powder_1,7,bullet_pistol_ap,2 | ||
ammo_5.7x28_ss195_bad = 5, recipe_ammo_arty2, casing_p,1,powder_1,2,bullet_pistol,4,powder_gravi,5 | ||
|
||
ammo_7.62x25_p_bad = 5, recipe_ammo_0, casing_p,1,powder_1,2,bullet_pistol,4 | ||
ammo_7.62x25_ps_bad = 5, recipe_ammo_arty1, casing_p,1,powder_1,2,bullet_pistol,4,powder_blood,1 | ||
|
||
ammo_357_hp_mag_bad = 5, recipe_ammo_pistol, casing_p,6,powder_2,10,bullet_pistol,10 | ||
|
||
ammo_12x70_buck_bad = 5, recipe_ammo_shotgun, casing_s,1,powder_1,3,bullet_shotgun,2 | ||
ammo_12x76_zhekan_bad = 5, recipe_ammo_0, casing_s,2,powder_1,4,bullet_shotgun_ap,3 | ||
ammo_12x76_dart_bad = 5, recipe_ammo_fire, casing_s,4,powder_1,8,powder_fireball,2,powder_nightstar,2 | ||
|
||
ammo_5.45x39_fmj_bad = 5, recipe_ammo_ru1, casing_r5,1,powder_2,2,bullet_r5,2 | ||
ammo_5.45x39_ep_bad = 5, recipe_ammo_ru1, casing_r5,1,powder_2,3,bullet_r5,2 | ||
ammo_5.45x39_ap_bad = 5, recipe_ammo_ru2, casing_r5,1,powder_2,4,bullet_r5_ap,4 | ||
|
||
ammo_5.56x45_fmj_bad = 5, recipe_ammo_nato, casing_r5,1,powder_2,2,bullet_r5,2 | ||
ammo_5.56x45_ss190_bad = 5, recipe_ammo_shotgun, casing_r5,2,powder_2,4,bullet_r5,2 | ||
ammo_5.56x45_ap_bad = 5, recipe_ammo_nato, casing_r5,2,powder_2,4,bullet_r5_ap,2 | ||
|
||
ammo_7.62x39_fmj_bad = 5, recipe_ammo_ru1, casing_r5,1,powder_2,4,bullet_r5,2 | ||
ammo_7.62x39_ap_bad = 5, recipe_ammo_fire, casing_r5,1,powder_2,4,bullet_r5_ap,2,powder_fire,1 | ||
|
||
ammo_9x39_pab9_bad = 5, recipe_ammo_ru1, casing_r5,1,powder_2,3,bullet_r5,2 | ||
ammo_9x39_ap_bad = 5, recipe_ammo_ru2, casing_r5,2,powder_2,5,bullet_r5_ap,3 | ||
|
||
ammo_7.62x51_fmj_bad = 5, recipe_ammo_nato, casing_r7,1,powder_3,3,bullet_r7,2 | ||
ammo_7.62x51_ap_bad = 5, recipe_ammo_nato, casing_r7,3,powder_3,8,bullet_r7_ap,5 | ||
|
||
ammo_7.62x54_7h1_bad = 5, recipe_ammo_ru1, casing_r7,3,powder_3,7,bullet_r7,7 | ||
ammo_7.62x54_7h14_bad = 5, recipe_ammo_shotgun, casing_r7,2,powder_3,4,bullet_r7,3 | ||
ammo_7.62x54_ap_bad = 5, recipe_ammo_fire, casing_r7,3,powder_3,4,bullet_r7_ap,3,powder_fire,1 | ||
|
||
ammo_pkm_100_bad = 5, recipe_ammo_arty1, casing_r7,3,powder_3,6,bullet_r7,3,powder_blood,1 | ||
|
||
ammo_7.92x33_fmj_bad = 5, recipe_ammo_shotgun, casing_r7,1,powder_3,2,bullet_r7,2 | ||
ammo_7.92x33_ap_bad = 5, recipe_ammo_arty2, casing_r7,2,powder_3,4,bullet_r7_ap,2,powder_battery,1 | ||
|
||
ammo_magnum_300_bad = 5, recipe_ammo_arty2, casing_r7,5,powder_3,5,bullet_r7_ap,5,powder_gravi,1 | ||
|
||
ammo_12.7x55_fmj_bad = 5, recipe_ammo_ru2, casing_r7,1,powder_3,2,bullet_r7,2 | ||
ammo_12.7x55_ap_bad = 5, recipe_ammo_arty1, casing_r7,3,powder_3,7,bullet_r7,2,powder_nightstar,1 | ||
;left empty to help compatibility for WarDogs | ||
;info moved to ammo_zzzz_artigrok.ltx |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
![ammo_vanilla] | ||
ammo_9x18_fmj_bad = 5, recipe_ammo_pistol, casing_p,1,powder_1,2,bullet_pistol,2 | ||
ammo_9x18_pmm_bad = 5, recipe_ammo_ru1, casing_p,1,powder_1,4,bullet_pistol,2 | ||
ammo_9x18_ap_bad = 5, recipe_ammo_ru2, casing_p,1,powder_1,4,bullet_pistol_ap,2 | ||
|
||
ammo_9x19_fmj_bad = 5, recipe_ammo_pistol, casing_p,1,powder_1,2,bullet_pistol,2 | ||
ammo_9x19_pbp_bad = 5, recipe_ammo_pistol, casing_p,1,powder_1,5,bullet_pistol,2 | ||
ammo_9x19_ap_bad = 5, recipe_ammo_ru2, casing_p,1,powder_1,7,bullet_pistol_ap,2 | ||
|
||
ammo_11.43x23_fmj_bad = 5, recipe_ammo_pistol, casing_p,1,powder_1,4,bullet_pistol_ap,2 | ||
ammo_11.43x23_hydro_bad = 5, recipe_ammo_arty1, casing_p,4,powder_1,6,bullet_pistol,4,powder_blood,2 | ||
|
||
ammo_5.7x28_ss190_bad = 5, recipe_ammo_nato, casing_p,2,powder_1,7,bullet_pistol_ap,2 | ||
ammo_5.7x28_ss195_bad = 5, recipe_ammo_arty2, casing_p,1,powder_1,2,bullet_pistol,4,powder_gravi,5 | ||
|
||
ammo_7.62x25_p_bad = 5, recipe_ammo_0, casing_p,1,powder_1,2,bullet_pistol,4 | ||
ammo_7.62x25_ps_bad = 5, recipe_ammo_arty1, casing_p,1,powder_1,2,bullet_pistol,4,powder_blood,1 | ||
|
||
ammo_357_hp_mag_bad = 5, recipe_ammo_pistol, casing_p,6,powder_2,10,bullet_pistol,10 | ||
|
||
ammo_12x70_buck_bad = 5, recipe_ammo_shotgun, casing_s,1,powder_1,3,bullet_shotgun,2 | ||
ammo_12x76_zhekan_bad = 5, recipe_ammo_0, casing_s,2,powder_1,4,bullet_shotgun_ap,3 | ||
ammo_12x76_dart_bad = 5, recipe_ammo_fire, casing_s,4,powder_1,8,powder_fireball,2,powder_nightstar,2 | ||
|
||
ammo_5.45x39_fmj_bad = 5, recipe_ammo_ru1, casing_r5,1,powder_2,2,bullet_r5,2 | ||
ammo_5.45x39_ep_bad = 5, recipe_ammo_ru1, casing_r5,1,powder_2,3,bullet_r5,2 | ||
ammo_5.45x39_ap_bad = 5, recipe_ammo_ru2, casing_r5,1,powder_2,4,bullet_r5_ap,4 | ||
|
||
ammo_5.56x45_fmj_bad = 5, recipe_ammo_nato, casing_r5,1,powder_2,2,bullet_r5,2 | ||
ammo_5.56x45_ss190_bad = 5, recipe_ammo_shotgun, casing_r5,2,powder_2,4,bullet_r5,2 | ||
ammo_5.56x45_ap_bad = 5, recipe_ammo_nato, casing_r5,2,powder_2,4,bullet_r5_ap,2 | ||
|
||
ammo_7.62x39_fmj_bad = 5, recipe_ammo_ru1, casing_r5,1,powder_2,4,bullet_r5,2 | ||
ammo_7.62x39_ap_bad = 5, recipe_ammo_fire, casing_r5,1,powder_2,4,bullet_r5_ap,2,powder_fire,1 | ||
|
||
ammo_9x39_pab9_bad = 5, recipe_ammo_ru1, casing_r5,1,powder_2,3,bullet_r5,2 | ||
ammo_9x39_ap_bad = 5, recipe_ammo_ru2, casing_r5,2,powder_2,5,bullet_r5_ap,3 | ||
|
||
ammo_7.62x51_fmj_bad = 5, recipe_ammo_nato, casing_r7,1,powder_3,3,bullet_r7,2 | ||
ammo_7.62x51_ap_bad = 5, recipe_ammo_nato, casing_r7,3,powder_3,8,bullet_r7_ap,5 | ||
|
||
ammo_7.62x54_7h1_bad = 5, recipe_ammo_ru1, casing_r7,3,powder_3,7,bullet_r7,7 | ||
ammo_7.62x54_7h14_bad = 5, recipe_ammo_shotgun, casing_r7,2,powder_3,4,bullet_r7,3 | ||
ammo_7.62x54_ap_bad = 5, recipe_ammo_fire, casing_r7,3,powder_3,4,bullet_r7_ap,3,powder_fire,1 | ||
|
||
ammo_pkm_100_bad = 5, recipe_ammo_arty1, casing_r7,3,powder_3,6,bullet_r7,3,powder_blood,1 | ||
|
||
ammo_7.92x33_fmj_bad = 5, recipe_ammo_shotgun, casing_r7,1,powder_3,2,bullet_r7,2 | ||
ammo_7.92x33_ap_bad = 5, recipe_ammo_arty2, casing_r7,2,powder_3,4,bullet_r7_ap,2,powder_battery,1 | ||
|
||
ammo_magnum_300_bad = 5, recipe_ammo_arty2, casing_r7,5,powder_3,5,bullet_r7_ap,5,powder_gravi,1 | ||
|
||
ammo_12.7x55_fmj_bad = 5, recipe_ammo_ru2, casing_r7,1,powder_3,2,bullet_r7,2 | ||
ammo_12.7x55_ap_bad = 5, recipe_ammo_arty1, casing_r7,3,powder_3,7,bullet_r7,2,powder_nightstar,1 | ||
|
||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||
!ammo_44_mag | ||
ammo_44_mag = 5, recipe_ammo_0, casing_p,2,powder_2,2,bullet_pistol,3 |