Skip to content

Commit

Permalink
Special Shrapnel fixes, Flaming shrapnel AP nerf. (#8072)
Browse files Browse the repository at this point in the history
# About the pull request
special shrapnel now use the correct check, meaning that max shrapnel is
now properly reduced. Thanks to watermelon for noticing it and telling
me how to fix it

In practice this means that flaming/neuro/hornets are now capped at 16
total (From 32).

AP from incind shrapnel reduced from 50 to 20


# Explain why it's good for the game
Currently the incind shrapnel does 665 damage to a queen (before
counting phosphor smoke)

<details>
<summary>Current Shrapnel Against Queen (Combat Ready/Mature)</summary>


https://github.com/user-attachments/assets/4651c6e3-de65-4438-b32c-41b97315e526

</details>



This is enough damage to 1shot every single caste up to and including
non-hedge ravs (both base and berz), as base has 650 health while berz
has 590. Even having max rage, which brings you to 45(!!) armor, isn't
enough to save you, as flaming shrapnel has 50 ap.

<details>
<summary>Against a berz rav on the frontline</summary>


https://github.com/user-attachments/assets/0432dbd8-a897-4c51-9c19-aa268c91a035


</details>


Shrapnel mines probably shouldn't have the killing power of pre nerf OT
rockets?
# Testing Photographs and Procedure
<details>
<summary>New Damage test against drone</summary>
It does around 460 damage total.


https://github.com/user-attachments/assets/59ba7435-1569-41ac-8a76-1f3f3b3dc5e3




</details>


# Changelog
:cl:
balance: Flaming Shrapnel now has 20 AP (from 50)
fix: OT special shrapnel is now properly affected by the cap, meaning
that you can only have 16 shrapnel (from 32)
/:cl:

---------

Co-authored-by: Drathek <[email protected]>
  • Loading branch information
private-tristan and Drulikar authored Jan 18, 2025
1 parent 234c55b commit 728332b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion code/datums/ammo/shrapnel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
flags_ammo_behavior = AMMO_STOPPED_BY_COVER
shell_speed = AMMO_SPEED_TIER_1
damage = 30
penetration = ARMOR_PENETRATION_TIER_10 //molten metal pierces your armor
penetration = ARMOR_PENETRATION_TIER_4

/datum/ammo/bullet/shrapnel/incendiary/set_bullet_traits()
. = ..()
Expand Down
6 changes: 3 additions & 3 deletions code/modules/reagents/Chemistry-Holder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -631,11 +631,11 @@
// some upper limits
if(shards > max_ex_shards)
shards = max_ex_shards
if(istype(shard_type, /datum/ammo/bullet/shrapnel/incendiary) && shards > max_ex_shards / INCENDIARY_SHARDS_MAX_REDUCTION) // less max incendiary shards
if(ispath(shard_type, /datum/ammo/bullet/shrapnel/incendiary) && shards > max_ex_shards / INCENDIARY_SHARDS_MAX_REDUCTION) // less max incendiary shards
shards = max_ex_shards / INCENDIARY_SHARDS_MAX_REDUCTION
if(istype(shard_type, /datum/ammo/bullet/shrapnel/hornet_rounds) && shards > max_ex_shards / HORNET_SHARDS_MAX_REDUCTION)
else if(ispath(shard_type, /datum/ammo/bullet/shrapnel/hornet_rounds) && shards > max_ex_shards / HORNET_SHARDS_MAX_REDUCTION)
shards = max_ex_shards / HORNET_SHARDS_MAX_REDUCTION
if(istype(shard_type, /datum/ammo/bullet/shrapnel/neuro) && shards > max_ex_shards / NEURO_SHARDS_MAX_REDUCTION)
else if(ispath(shard_type, /datum/ammo/bullet/shrapnel/neuro) && shards > max_ex_shards / NEURO_SHARDS_MAX_REDUCTION)
shards = max_ex_shards / NEURO_SHARDS_MAX_REDUCTION
if(ex_power > max_ex_power)
ex_power = max_ex_power
Expand Down

0 comments on commit 728332b

Please sign in to comment.