Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Acid Runner: Acid gen cap #7850

Draft
wants to merge 22 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@
melee_damage_upper = 10
var/melee_vehicle_damage = 10
var/claw_type = CLAW_TYPE_NORMAL
var/burn_damage_lower = 0
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved
var/burn_damage_upper = 0
var/plasma_stored = 10
var/plasma_max = 10
var/plasma_gain = 5
Expand Down
2 changes: 0 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/attack_alien.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@
attacking_xeno.track_slashes(attacking_xeno.caste_type) //Adds to slash stat.
var/damage = rand(attacking_xeno.melee_damage_lower, attacking_xeno.melee_damage_upper) + dam_bonus
var/acid_damage = 0
if(attacking_xeno.burn_damage_lower)
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved
acid_damage = rand(attacking_xeno.burn_damage_lower, attacking_xeno.burn_damage_upper)

//Frenzy auras stack in a way, then the raw value is multipled by two to get the additive modifier
if(attacking_xeno.frenzy_aura > 0)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/xeno_strain/acider
name = RUNNER_ACIDER
description = "At the cost of a little bit of your speed and all of your current abilities, you gain a considerable amount of health, some armor, and a new organ that fills with volatile acid over time. Your Tail Stab and slashes apply acid to living lifeforms that slowly burns them, and slashes against targets with acid stacks fill your acid glands. You also gain Corrosive Acid equivalent to that of a boiler that you can deploy more quickly than any other caste, at the cost of a chunk of your acid reserves with each use. Finally, after a twenty second windup, you can force your body to explode, covering everything near you with acid. The more acid you have stored, the more devastating the explosion will be, but during those twenty seconds before detonation you are slowed and give off several warning signals which give talls an opportunity to end you before you can detonate. If you successfully explode, you will reincarnate as a larva again!"
description = "At the cost of a little bit of your speed and all of your current abilities, you gain a considerable amount of health, some armor, and a new organ that fills with volatile acid over time up to a certain amount. Your Tail Stab and slashes apply acid to living lifeforms that slowly burns them, and slashes against targets with acid stacks fill your acid glands. You also gain Corrosive Acid equivalent to that of a boiler that you can deploy more quickly than any other caste, at the cost of a chunk of your acid reserves with each use. Finally, after a twenty second windup, you can force your body to explode, covering everything near you with acid. The more acid you have stored, the more devastating the explosion will be, but during those twenty seconds before detonation you are slowed and give off several warning signals which give talls an opportunity to end you before you can detonate. If you successfully explode, you will reincarnate as a larva again!"
flavor_description = "This one will be the last thing they hear. A martyr."
icon_state_prefix = "Acider"

Expand Down Expand Up @@ -32,11 +32,12 @@

var/max_acid = 1000
var/caboom_timer = 20
var/acid_slash_regen_lying = 8
var/acid_slash_regen_standing = 14
var/acid_slash_regen_lying = 10
var/acid_slash_regen_standing = 16
var/acid_passive_regen = 1
var/acid_gen_cap = 400 //Ammount of acid from wich passive acid generation stops

var/melt_acid_cost = 100
var/melt_acid_cost = 50

var/list/caboom_sound = list('sound/effects/runner_charging_1.ogg','sound/effects/runner_charging_2.ogg')
var/caboom_loop = 1
Expand All @@ -53,9 +54,10 @@
if(acid_amount < 0)
acid_amount = 0

/datum/behavior_delegate/runner_acider/append_to_stat()
/datum/behavior_delegate/runner_acider/append_to_stat() //The uniqe status pannel info for Acid Runner is handelt here.
. = list()
. += "Acid: [acid_amount]"
. += "Acid: [acid_amount]/[max_acid]"
. += "Acid generation cap: [acid_gen_cap]"
if(caboom_trigger)
. += "FOR THE HIVE!: in [caboom_left] seconds"

Expand Down Expand Up @@ -83,7 +85,8 @@
modify_acid(acid_slash_regen_standing)

/datum/behavior_delegate/runner_acider/on_life()
modify_acid(acid_passive_regen)
if(acid_amount <= acid_gen_cap)
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved
modify_acid(acid_passive_regen)
if(!bound_xeno)
return
if(bound_xeno.stat == DEAD)
Expand All @@ -106,8 +109,11 @@
var/image/holder = bound_xeno.hud_list[PLASMA_HUD]
holder.overlays.Cut()
var/percentage_acid = round((acid_amount / max_acid) * 100, 10)
var/percentage_acid_cap = round((acid_gen_cap /max_acid) * 100, 10)
if(percentage_acid)
holder.overlays += image('icons/mob/hud/hud.dmi', "xenoenergy[percentage_acid]")
if(acid_amount >= acid_gen_cap)
holder.overlays += image('icons/mob/hud/hud.dmi', "cap[percentage_acid_cap]")

/datum/behavior_delegate/runner_acider/handle_death(mob/M)
var/image/holder = bound_xeno.hud_list[PLASMA_HUD]
Expand Down
Binary file modified icons/mob/hud/hud.dmi
Binary file not shown.
Loading