Skip to content

Commit

Permalink
Rebalances Yautja bracer power (#4154)
Browse files Browse the repository at this point in the history
# About the pull request
The bracer power supply has been rebalanced, reducing the cost of
creating crystals and health capsules due to scarcity of recharging, and
the fact thwei is no longer as powerful. The plasma caster has also had
its power costs reduced slightly.
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
Allows Yautja to operate a bit longer before they need to worry about
recharging.
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
balance: Reduces power cost for plasma caster use, and creation of thwei
crystals/health capsules.
/:cl:
  • Loading branch information
realforest2001 committed Oct 1, 2023
1 parent 8f5bce5 commit 3e50dd4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions code/modules/cm_preds/yaut_bracers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@
to_chat(caller, SPAN_WARNING("You recently activated the stabilising crystal. Be patient."))
return FALSE

if(!drain_power(caller, 1000))
if(!drain_power(caller, 400))
return FALSE

inject_timer = TRUE
Expand Down Expand Up @@ -877,7 +877,7 @@
to_chat(usr, SPAN_WARNING("Your bracer is still generating a new healing capsule!"))
return FALSE

if(!drain_power(caller, 800))
if(!drain_power(caller, 600))
return FALSE

healing_capsule_timer = TRUE
Expand Down
20 changes: 12 additions & 8 deletions code/modules/cm_preds/yaut_weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -955,12 +955,15 @@
if(!HAS_TRAIT(user, TRAIT_YAUTJA_TECH))
to_chat(user, SPAN_WARNING("You have no idea how this thing works!"))
return
if(charge_time < 7)
to_chat(user, SPAN_WARNING("The rifle does not have enough power remaining!"))
return

return ..()

/obj/item/weapon/gun/energy/yautja/plasmarifle/load_into_chamber()
ammo = GLOB.ammo_list[/datum/ammo/energy/yautja/rifle/bolt]
charge_time -= 10
charge_time -= 7
var/obj/projectile/projectile = create_bullet(ammo, initial(name))
projectile.set_light(1)
in_chamber = projectile
Expand All @@ -975,7 +978,8 @@

/obj/item/weapon/gun/energy/yautja/plasmarifle/delete_bullet(obj/projectile/projectile_to_fire, refund = 0)
qdel(projectile_to_fire)
if(refund) charge_time *= 2
if(refund)
charge_time += 7
return TRUE

#define FIRE_MODE_STANDARD "Standard"
Expand Down Expand Up @@ -1165,15 +1169,15 @@
switch(strength)
if("low power stun bolts")
strength = "high power stun bolts"
charge_cost = 100
set_fire_delay(FIRE_DELAY_TIER_6 * 3)
charge_cost = 50
set_fire_delay(FIRE_DELAY_TIER_1)
fire_sound = 'sound/weapons/pred_lasercannon.ogg'
to_chat(user, SPAN_NOTICE("[src] will now fire [strength]."))
ammo = GLOB.ammo_list[/datum/ammo/energy/yautja/caster/bolt/stun]
if("high power stun bolts")
strength = "plasma immobilizers"
charge_cost = 300
set_fire_delay(FIRE_DELAY_TIER_6 * 20)
charge_cost = 200
set_fire_delay(FIRE_DELAY_TIER_2 * 8)
fire_sound = 'sound/weapons/pulse.ogg'
to_chat(user, SPAN_NOTICE("[src] will now fire [strength]."))
ammo = GLOB.ammo_list[/datum/ammo/energy/yautja/caster/sphere/stun]
Expand All @@ -1188,8 +1192,8 @@
switch(strength)
if("plasma bolts")
strength = "plasma spheres"
charge_cost = 1200
set_fire_delay(FIRE_DELAY_TIER_6 * 20)
charge_cost = 1000
set_fire_delay(FIRE_DELAY_TIER_2 * 12)
fire_sound = 'sound/weapons/pulse.ogg'
to_chat(user, SPAN_NOTICE("[src] will now fire [strength]."))
ammo = GLOB.ammo_list[/datum/ammo/energy/yautja/caster/sphere]
Expand Down
3 changes: 0 additions & 3 deletions code/modules/projectiles/ammo_datums.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2464,9 +2464,6 @@
else
M.apply_effect(stun_time, WEAKEN)




/datum/ammo/energy/yautja/rifle/bolt
name = "plasma rifle bolt"
icon_state = "ion"
Expand Down

0 comments on commit 3e50dd4

Please sign in to comment.