Skip to content

Commit

Permalink
Update 22 - The Basic Rework Preview
Browse files Browse the repository at this point in the history
[Basic Changes and Fixes]
- Cleaned up some old code from the ammo_*.ltx files
- Added new checks to various "on-hit" effects to only apply/try to apply if a target is alive and is not the environment to hopefully help performance slightly
- Added new checks to avoid having companions suffering from various "on-hit" effects to avoid some unwanted early deaths to them
- Removed the lines that allowed "Very Bad" versions of ammo (if you somehow got them) to no longer have the effects of the "Bad"/variants
- 9x21 SP10 API had its Burn chance decreased from 50% to 20%
- 7.62x39 API had its Burn chance decreased from 60% to 30%
- .300 Blackout API had its Burn chance decreased from 50% to 20% (may buff to 30% in the future)
- 7.62x54 API had its Burn chance decreased from 90% to 25%
- 12ga. Dragon's Breath (or the coded "Melt" effect) had its Burn chance decreased from 100% to 75%
	o Keep in mind, that is 75% chance PER PELLET
	o NOTE - Incendiary Ammo, with Burn's new stacking effect (discussed below), needed to be turned down a bit to avoid getting too out of hand
- Removed the "Varma"/Varmageddon effect from 12x70 Buckshot as it made them too strong against mutants
- Cloudkill no longer stacks to a point where targets do near zero base damage (before damage calculations)
	o Cloudkill is now hardcapped to reduce enemy damage by up to 40%
	o Cloudkill's stacking 20% damage bonus still stacks indefinitely
- Fixed 12ga. Dragon's Breath, if found on an enemy, from downgrading to Flechette instead of AP Dart
- 9x21 ammo across the board has had its box size decreased from 18 to 15 to be more inline with other pistol ammo
- Added GAMMA's most recent "integrated suppressor" damage/AP buff into the calculations
- CQC bonus has been increased from 30% to 50% to match GAMMA's values

[System Changes]
- Ammo books are now more common to find:
	o Base chance to find at traders starting at Level 2 has been increased from 30% to 45%
		> Level 3 chance is now 90% (was 60%)
		> Level 4 chance is now 100% (was 90%)
		> Level 5 chance is still 100%
	o All ammo books now have a flat 35% chance to be found in stashes
		> Ammo books in stashes work on a knockout system - it will drop you a new book you haven't read or just received
		> If you have all books obtained AND read, it will start dropping you a random book
- Both RIP and Soulripper effects have changed (basically swapped around):
	o RIP now heals you for 25% of the damage you dealt with the ammo
	o Soulripper now heals you for 15% total HP per kill (headshots no longer mandatory)
	o Ammo that had the RIP effect now have Soulripper (.45 'RIP' Rounds), and the ammo that had the Soulripper effect now have RIP
	o This was just a personal change I wanted to make to balance old RIP rounds as they tended to be on easier to obtain calibers
	o Old Soulripper requiring a headshot, while making sense on a sniper, was also very meaningless compared to other ammo
- [NEW] Burn now has a stacking effect:
	o If a target dies with 20+ burn stacks, they will Ignite, spreading their stacks among surrounding targets
	o API ammo, if Ignite roll is successful, will grant 3 stacks of Burn on the target on hit
	o Dragon's Breath ("Melt"), if Ignite roll is successful, will grant 10 stacks of Burn on the target on hit
	o Napalm ammo will always grant 2 Burn stacks to anyone caught in its blast, and grant 10 Burn stacks for a direct hit (a total of +12 stacks to a struck target)
	o Burn damage is now based on how many stacks a target currently has on them
		> If a target has 15 stacks of burn, they will take 15 damage (most Stalkers can take 100 damage, mutants can have more than that)
	o Stacks will decay over time to avoid getting out of hand
		> Targets hit by API ammo will slowly lose their 3 stacks over 10 seconds from that initial hit
		> Targets hit by "Melt" ammo/direct-hit Napalm ammo will slowly lose their 10 stacks over 10 seconds from that initial hit
		> Targets hurt by the Napalm ammo's explosion will slowly lose their 2 stacks over 5 seconds from the initial hit
	- [NEW] Lightning ammo now has a stacking effect:
	o Any *Stalker* that is hit by a Lightning strike 3 times will become "Grounded" - they will be unable to move
	o Lightning strike counter will NOT go down over time
	o Although unlikely that a target could survive 3 strikes, it is an effect that will give it more utility outside of being good burst damage
	o Reminder: Lightning strikes only occur upon hitting a Stalker in the head, or if its armor strength above BR3
	o Reminder: Hitting a target will weaken its armor value, meaning it could no longer cause Lightning strikes if hit too often
- [NEW] Acid ammo now has a stacking effect:
	o If an enemy is hit by any Acid ammo 5 times before dying, they apply the "Armorbuster" debuff to anyone within a 5m radius of the target
	o Mutants lose 30% of their "armor" resistance and nullifies their innate damage resistance, and all ammo gain a +0.3 to their strength against mutants (a GAMMA thing)
	o Stalkers lose 30% more armor strength plus an additional -1 point of armor strength on each hit
	o This will make starting a fight with Acid ammo highly valuable against a group of targets close together
  • Loading branch information
ilrathCXV committed Feb 2, 2024
1 parent ddd6e51 commit 17cae5a
Show file tree
Hide file tree
Showing 18 changed files with 501 additions and 364 deletions.
3 changes: 0 additions & 3 deletions gamedata/configs/ammo/ammo_20x70_variants.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
;; 20x70 #3BK Buckshot ;;
;;;;;;;;;;;;;;;;;;;;;;;;;
[ammo_20x70_buck_bad]:ammo_base
handler = arti_handlers.buckshot_damage
name = ammo_20x70_buck_3bk
k_hit = 0.195
k_ap = 0.02
Expand All @@ -18,7 +17,6 @@ dg_chance = 0.35
;;;;;;;;;;;;;;;;;;;;;;;;;;;;

[ammo_20x70_devastator_bad]:ammo_base
handler = arti_handlers.slug
name = ammo_20x70_devastator_glass
k_hit = 1.15
k_ap = 0.03
Expand All @@ -36,7 +34,6 @@ dg_chance = 0.6
;;;;;;;;;;;;;;;;;;;;;;;;;;

[ammo_20x70_star_bad]:ammo_base
handler = arti_handlers.shock_damage
name = ammo_20x70_star_lightning
k_hit = 2.15
k_ap = 0.6
Expand Down
3 changes: 0 additions & 3 deletions gamedata/configs/ammo/ammo_23x75_variants.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
;; 23x75 Pure Chaos Buckshot ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[ammo_23x75_shrapnel_bad]:ammo_base
;handler = arti_handlers.buckshot_damage
handler = arti_handlers.chaos_damage
name = ammo_23x75_chaos
k_hit = 1.15
k_ap = 0.04
Expand All @@ -18,7 +16,6 @@ dg_chance = 0.85
;;;;;;;;;;;;;;;;;;;;;;;;;;;;

[ammo_23x75_barrikada_bad]:ammo_base
handler = arti_handlers.napalm_damage
name = ammo_23x75_mini_napalm
k_hit = 1.15
k_ap = 0.03
Expand Down
1 change: 0 additions & 1 deletion gamedata/configs/ammo/ammo_338_federal_variant.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
;; .338 Federal "Cloudkill" ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[ammo_338_federal_bad]:ammo_base
handler = bas_handler.corrosive_cloud
name = ammo_338_fed_cloudkill
k_hit = 1.05
k_ap = 0.65
Expand Down
4 changes: 0 additions & 4 deletions gamedata/configs/ammo/ammo_bas.ltx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[ammo_23x75_shrapnel]:ammo_base
handler = arti_handlers.buckshot_damage
name = ammo_new_23x75_shrapnel
k_hit = 1 ;1.50 - Grok
k_ap = 0.06 ;0.05 - Arti
Expand All @@ -8,7 +7,6 @@ flinch = 75
cost = 2000

[ammo_23x75_barrikada]:ammo_base
handler = arti_handlers.slug
name = ammo_new_23x75_barrikada
k_hit = 2.33 ;4.20 - Grok
k_ap = 0.54 ;0.195 - Arti
Expand All @@ -17,14 +15,12 @@ frag = 20
cost = 7000

[ammo_20x70_buck]:ammo_base
handler = arti_handlers.buckshot_damage
name = ammo_new_20x70_buck
k_hit = 1.00 ;0.3 - Grok
k_ap = 0.03 ;0.02 - Arti
cost = 450

[ammo_23_eco]:ammo_base ; poisoncloud slug
handler = bas_handler.corrosive_cloud
name = ammo_new_23_eco
k_hit = 1 ;1.00 - Grok
k_ap = 0.12 ;0.01 - Arti
Expand Down
2 changes: 1 addition & 1 deletion gamedata/configs/ammo/ammo_cxv_9x21_variants.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name = ammo_9x21_sp10_bad
k_hit = 1.25
k_ap = 0.50
special = fire
ignite = 50
ignite = 20
cost = 4150

dg_ammo = ammo_9x21_sp11
Expand Down
2 changes: 0 additions & 2 deletions gamedata/configs/ammo/ammo_momo_20x70slugs.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;

[ammo_20x70_devastator]:ammo_base
handler = arti_handlers.slug
name = ammo_20x70_devastator
k_hit = 2.33
k_ap = 0.29
Expand All @@ -16,7 +15,6 @@ flinch = 60
;;;;;;;;;;;;;;;;;;;;;

[ammo_20x70_star]:ammo_base
handler = arti_handlers.slug
name = ammo_20x70_star
k_hit = 1.95
k_ap = 0.5
Expand Down
20 changes: 1 addition & 19 deletions gamedata/configs/ammo/ammo_pistol.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,13 @@ frag = 30
cost = 1750

[ammo_11.43x23_hydro_bad]:ammo_11.43x23_hydro; RIP
handler = arti_handlers.rip
name = ammo_new_11.43x23_hydro
k_hit = 2.57 ;1.8 - Grok*+ (2.57 = 1.8/0.7)
k_ap = 0.10 ;0.069 - Arti
k_hp = 3
k_mp = 2.36
cost = 3000
special = rip
special = soulripper
special_2 = frag
frag = 15
dg_ammo = ammo_11.43x23_hydro
Expand All @@ -169,7 +168,6 @@ special = frag
frag = 45

[ammo_357_hp_mag_bad]:ammo_357_hp_mag; handload JFP
handler = arti_handlers.headshot
name = ammo_new_357_jfp
k_hit = 1.05 ;1.25 - Grok*+
k_ap = 0.23 ;0.199 - Arti
Expand Down Expand Up @@ -206,15 +204,13 @@ cost = 975
recoil = 1.05

[ammo_7.62x25_ps_bad]:ammo_7.62x25_ps; acid
handler = arti_handlers.acid_damage
i_handler = ballistic_handlers.particle
i_particle = artefact\\effects\\af_acidic_idle_color
name = ammo_new_7.62x25_cor
k_hit = 1 ;0.70 - Grok
k_ap = 0.19 ;0.149 - Arti
cost = 3750
special = acid
special_2 = toxic
dg_ammo = ammo_7.62x25_ps
dg_chance = 0.7

Expand Down Expand Up @@ -243,7 +239,6 @@ k_mp = 1.14
cost = 3000

[ammo_5.7x28_ss195_bad]:ammo_5.7x28_ss195 ; chaos
handler = arti_handlers.chaos_damage
name = ammo_new_5.7x28_chaos
k_hit = 0.8 ;0.49 - Grok
k_ap = 0.345 ;0.175 - Arti
Expand All @@ -253,16 +248,3 @@ dg_ammo = ammo_5.7x28_ss195
dg_chance = 0.85

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[ammo_9x18_fmj_verybad]:ammo_9x18_fmj_bad
[ammo_9x18_pmm_verybad]:ammo_9x18_pmm_bad
[ammo_9x18_ap_verybad]:ammo_9x18_ap_bad
[ammo_9x19_fmj_verybad]:ammo_9x19_fmj_bad
[ammo_9x19_pbp_verybad]:ammo_9x19_pbp_bad
[ammo_9x19_ap_verybad]:ammo_9x19_ap_bad
[ammo_5.7x28_ss190_verybad]:ammo_5.7x28_ss190_bad
[ammo_5.7x28_ss195_verybad]:ammo_5.7x28_ss195_bad
[ammo_7.62x25_p_verybad]:ammo_7.62x25_p_bad
[ammo_7.62x25_ps_verybad]:ammo_7.62x25_ps_bad
[ammo_11.43x23_fmj_verybad]:ammo_11.43x23_fmj_bad
[ammo_11.43x23_hydro_verybad]:ammo_11.43x23_hydro_bad
[ammo_357_hp_mag_verybad]:ammo_357_hp_mag_bad
18 changes: 2 additions & 16 deletions gamedata/configs/ammo/ammo_rifle.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ k_mp = 1.18
cost = 1850

[ammo_5.56x45_ss190_bad]:ammo_5.56x45_ss190 ; varmageddon
handler = arti_handlers.varmageddon
name = ammo_new_5.56x45_varma
k_hit = 1.05 ;1.45 - Grok+ | 1.1 - Grok++
k_ap = 0.19 ;0.125 - Arti
Expand Down Expand Up @@ -145,7 +144,7 @@ handler = arti_handlers.fire_damage
name = ammo_new_7.62x39_api
k_hit = 1.2 ;1.15 - Grok+ | 1.1 - Grok++
k_ap = 0.586 ;0.275 - Arti
ignite = 60
ignite = 30
cost = 7250
recoil = 1.05
special = fire
Expand All @@ -161,7 +160,6 @@ k_ap = 0.30 ;0.205 - Arti
cost = 1600

[ammo_9x39_pab9_bad]:ammo_9x39_pab9 ; SPP
handler = arti_handlers.ambush
name = ammo_new_9x39_spp
k_hit = 1.3 ;0.95 - Grok
k_ap = 0.348 ;0.245 - Arti
Expand All @@ -182,7 +180,6 @@ cost = 5200
recoil = 1.05

[ammo_9x39_ap_bad]:ammo_9x39_ap ; SP6
handler = arti_handlers.ambush
name = ammo_new_9x39_ap
k_hit = 1.2 ;0.85 - Grok+
k_ap = 0.521 ;0.275 - Arti
Expand All @@ -191,15 +188,4 @@ dg_ammo = ammo_9x39_ap
dg_chance = 0.8
special = ambush

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

[ammo_5.45x39_fmj_verybad]:ammo_5.45x39_fmj_bad
[ammo_5.45x39_ep_verybad]:ammo_5.45x39_ep_bad
[ammo_5.45x39_ap_verybad]:ammo_5.45x39_ap_bad
[ammo_5.56x45_fmj_verybad]:ammo_5.56x45_fmj_bad
[ammo_5.56x45_ss190_verybad]:ammo_5.56x45_ss190_bad
[ammo_5.56x45_ap_verybad]:ammo_5.56x45_ap_bad
[ammo_9x39_pab9_verybad]:ammo_9x39_pab9_bad
[ammo_9x39_ap_verybad]:ammo_9x39_ap_bad
[ammo_7.62x39_fmj_verybad]:ammo_7.62x39_fmj_bad
[ammo_7.62x39_ap_verybad]:ammo_7.62x39_ap_bad
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2 changes: 1 addition & 1 deletion gamedata/configs/ammo/ammo_rwap_blackout.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ k_hit = 1.00
k_ap = 0.60
cost = 8300
special = fire
ignite = 50
ignite = 20
dg_ammo = ammo_300blackout_ap
dg_chance = 0.4

Expand Down
3 changes: 1 addition & 2 deletions gamedata/configs/ammo/ammo_shon_western.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,10 @@ special = flinch
;;;;;;;;;;;;;;;;;;;;;;;

[ammo_45-70_Gov]:ammo_base
handler = arti_handlers.soulripper
name = ammo_45-70_Gov
k_hit = 1.0
k_ap = 0.65
k_hp = 3
k_mp = 1.7
cost = 18700
special = soulripper
special = rip
13 changes: 1 addition & 12 deletions gamedata/configs/ammo/ammo_shotgun.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

[ammo_12x70_buck]:ammo_base ; ordinary buckshot
handler = arti_handlers.buckshot_damage
name = ammo_new_12x70_buck
k_hit = 1.00 ;0.35 - Arti ;0.40 - Grok
k_ap = 0.03 ;0.025 - Arti
Expand All @@ -22,11 +21,9 @@ cost = 1250
recoil = 1.5
dg_ammo = ammo_12x70_buck
dg_chance = 0.4
special = varma


[ammo_12x76_zhekan]:ammo_base ; slug
handler = arti_handlers.slug
name = ammo_new_12x70_zhekan
k_hit = 6.25 ;2.5 - Arti ;2.5 - Grok
k_ap = 0.23 ;0.1 - Arti
Expand All @@ -36,7 +33,6 @@ special = flinch
flinch = 50

[ammo_12x76_zhekan_bad]:ammo_12x76_zhekan ; flechette
handler = arti_handlers.buckshot_damage
name = ammo_new_12x70_flechette
k_hit = 0.7 ;0.28 - Arti
k_ap = 0.15
Expand All @@ -49,7 +45,6 @@ dg_chance = 0.5


[ammo_12x76_dart]:ammo_base ; AP Dart
handler = arti_handlers.slug
name = ammo_new_12x70_dart
k_hit = 5 ;2 - Arti ;1.52 - Grok
k_ap = 0.42 ;0.175 - Arti
Expand All @@ -61,17 +56,11 @@ special = flinch
flinch = 85

[ammo_12x76_dart_bad] ; anomalous dragonsbreath
handler = arti_handlers.dragonsbreath
name = ammo_new_12x70_dragon
k_hit = 0.625 ;0.25 - Arti
k_ap = 0.1
ignite = 1
cost = 35000
dg_ammo = ammo_12x76_zhekan_bad
dg_ammo = ammo_12x76_dart
dg_chance = 0.90
special = fire_melt


[ammo_12x70_buck_verybad]:ammo_12x70_buck_bad
[ammo_12x76_zhekan_verybad]:ammo_12x76_zhekan_bad
[ammo_12x76_dart_verybad]:ammo_12x76_dart_bad
23 changes: 2 additions & 21 deletions gamedata/configs/ammo/ammo_sniper.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ k_mp = 1.18
cost = 2250

[ammo_7.62x54_7h1_bad]:ammo_7.62x54_7h1; competition
handler = arti_handlers.headshot
name = ammo_new_7.62x54_fp
k_hit = 1.05 ;1.067 - Grok+
k_ap = 0.2 ;0.249 - Arti
Expand Down Expand Up @@ -52,11 +51,10 @@ recoil = 1.05
cost = 9500

[ammo_7.62x54_ap_bad]:ammo_7.62x54_ap; BZ API
handler = arti_handlers.fire_damage
name = ammo_new_7.62x54_api
k_hit = 1.2 ;1.267 - Grok+
k_ap = 0.95 ;0.335 - Arti
ignite = 90
ignite = 25
special = fire
cost = 11000
recoil = 1.05
Expand All @@ -72,7 +70,6 @@ k_ap = 0.37 ;0.2 - Arti
cost = 2760

[ammo_pkm_100_bad]:ammo_pkm_100 ; splitshot
handler = arti_handlers.buckshot_damage
name = ammo_new_7.62x54_split
k_hit = 0.7 ;1.2 - Grok+
k_ap = 0.307 ;0.155 - Arti
Expand All @@ -91,7 +88,6 @@ k_ap = 0.34 ;0.225 - Arti
cost = 3000

[ammo_7.62x51_fmj_bad]:ammo_7.62x51_fmj; mk316?
handler = arti_handlers.fragment_sound
frag = 50
special = frag
;ilrathCXV - Additonal effects to separate it from regular FMJ
Expand Down Expand Up @@ -145,7 +141,6 @@ k_ap = 0.39 ;0.305 - Arti
cost = 7000

[ammo_7.92x33_ap_bad]:ammo_7.92x33_ap ; lightning
handler = arti_handlers.shock_damage
name = ammo_new_7.92x33_shock
k_hit = 0.4 ;0.53 - Grok+
k_ap = 0.78 ;0.399 - Arti
Expand Down Expand Up @@ -183,7 +178,6 @@ cost = 6900

[ammo_12.7x55_ap_bad]:ammo_12.7x55_ap; explosive
name = ammo_new_12.7x55_exp
impact_h = arti_handlers.explode_handler
k_hit = 0.5 ;0.35 - Grok+
k_ap = 0.58 ;0.049 - Arti
cost = 12000
Expand All @@ -200,26 +194,13 @@ k_ap = 1.40 ;0.335 - Arti
cost = 17000

[ammo_magnum_300_bad]:ammo_magnum_300; saboted DU
handler = arti_handlers.soulripper
name = ammo_new_338_ap
k_hit = 1.3 ;1.94 - Grok+
k_ap = 1.705 ;0.399 - Arti
cost = 21000
recoil = 2
special = soulripper
special = rip
dg_ammo = ammo_magnum_300
dg_chance = 0.8

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

[ammo_7.92x33_fmj_verybad]:ammo_7.92x33_fmj_bad
[ammo_7.92x33_ap_verybad]:ammo_7.92x33_ap_bad
[ammo_7.62x51_fmj_verybad]:ammo_7.62x51_fmj_bad
[ammo_7.62x51_ap_verybad]:ammo_7.62x51_ap_bad
[ammo_pkm_100_verybad]:ammo_pkm_100_bad
[ammo_7.62x54_7h1_verybad]:ammo_7.62x54_7h1_bad
[ammo_7.62x54_ap_verybad]:ammo_7.62x54_ap_bad
[ammo_7.62x54_7h14_verybad]:ammo_7.62x54_7h14_bad
[ammo_12.7x55_fmj_verybad]:ammo_12.7x55_fmj_bad
[ammo_12.7x55_ap_verybad]:ammo_12.7x55_ap_bad
[ammo_magnum_300_verybad]:ammo_magnum_300_bad
Loading

0 comments on commit 17cae5a

Please sign in to comment.