From 494c7ee9a11c5828a305472e340ed89c5aa044da Mon Sep 17 00:00:00 2001 From: Yonnimer <31339047+Yonnimer@users.noreply.github.com> Date: Wed, 17 Jun 2020 06:26:03 -0400 Subject: [PATCH] Nymph changes/fixes (#8921) * Increase nymph health to 36 (FUCK DECIMALS) * also increases max health * changes the health hud's icon path * fixes the hud always being low * changes it from gestalt to nymph_health * adds the diona_health dmi * more name changes to the dmi * changelog * changes the numbers for the health hud again * Increases nymph health to 54 * updates changelog * Changes nymph health back to 33.3 * Makes it so this shouldn't need to be changed each time nymph health changes. * removes a extra piece of code * STOP FUCKING STOP * Update changelog * updates the stat thing Co-authored-by: Matt Atlas * Renames larva_hud to nymph_hud, given nothing else uses this anymore * changes the dme thing * changes some more things Co-authored-by: Matt Atlas --- aurorastation.dme | 2 +- .../hud/{alien_larva.dm => nymph_hud.dm} | 8 ++-- .../living/carbon/alien/diona/diona_nymph.dm | 2 +- code/modules/mob/living/carbon/alien/life.dm | 4 +- html/changelogs/Yonnimer - nymph_hud.yml | 42 ++++++++++++++++++ icons/hud/diona_health.dmi | Bin 0 -> 1211 bytes 6 files changed, 50 insertions(+), 8 deletions(-) rename code/_onclick/hud/{alien_larva.dm => nymph_hud.dm} (90%) create mode 100644 html/changelogs/Yonnimer - nymph_hud.yml create mode 100644 icons/hud/diona_health.dmi diff --git a/aurorastation.dme b/aurorastation.dme index 24833d298c1..2cac56f6da3 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -111,7 +111,7 @@ #include "code\_onclick\hud\_defines.dm" #include "code\_onclick\hud\action.dm" #include "code\_onclick\hud\ai.dm" -#include "code\_onclick\hud\alien_larva.dm" +#include "code\_onclick\hud\nymph_hud.dm" #include "code\_onclick\hud\gun_mode.dm" #include "code\_onclick\hud\hud.dm" #include "code\_onclick\hud\human.dm" diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/nymph_hud.dm similarity index 90% rename from code/_onclick/hud/alien_larva.dm rename to code/_onclick/hud/nymph_hud.dm index cdfe3958099..57b6db3a798 100644 --- a/code/_onclick/hud/alien_larva.dm +++ b/code/_onclick/hud/nymph_hud.dm @@ -1,7 +1,7 @@ /mob/living/carbon/alien/instantiate_hud(var/datum/hud/HUD) - HUD.larva_hud() + HUD.nymph_hud() -/datum/hud/proc/larva_hud() +/datum/hud/proc/nymph_hud() src.adding = list() src.other = list() @@ -16,7 +16,7 @@ move_intent = using mymob.healths = new /obj/screen() - mymob.healths.icon = 'icons/mob/screen/alien.dmi' + mymob.healths.icon = 'icons/hud/diona_health.dmi' mymob.healths.icon_state = "health0" mymob.healths.name = "health" mymob.healths.screen_loc = ui_alien_health @@ -38,7 +38,7 @@ mymob.fire = new /obj/screen() mymob.fire.icon = 'icons/mob/screen/alien.dmi' - mymob.fire.icon_state = "fire0" + mymob.fire.icon_state = "blank" mymob.fire.name = "fire" mymob.fire.screen_loc = ui_fire diff --git a/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm b/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm index 34cfb80e9ba..a9e618f6ed4 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm @@ -367,4 +367,4 @@ /mob/living/carbon/alien/diona/adjustBruteLoss(var/amount) if (status_flags & GODMODE) return - health = min(health - amount, maxHealth) \ No newline at end of file + health = min(health - amount, maxHealth) diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm index f121c78ed10..4ca2c0d69bc 100644 --- a/code/modules/mob/living/carbon/alien/life.dm +++ b/code/modules/mob/living/carbon/alien/life.dm @@ -107,8 +107,8 @@ see_invisible = SEE_INVISIBLE_LIVING if (healths) - if (stat != 2) - switch(health - getHalLoss())//Halloss should be factored in here for displaying + if (stat != DEAD) + switch((health - getHalLoss()) / maxHealth * 100)//Halloss should be factored in here for displaying if(100 to INFINITY) healths.icon_state = "health0" if(80 to 100) diff --git a/html/changelogs/Yonnimer - nymph_hud.yml b/html/changelogs/Yonnimer - nymph_hud.yml new file mode 100644 index 00000000000..f71de58ce6c --- /dev/null +++ b/html/changelogs/Yonnimer - nymph_hud.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Yonnimer + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds a new health hud for nymphs." + - bugfix: "Fixes the nymph hud always being low." diff --git a/icons/hud/diona_health.dmi b/icons/hud/diona_health.dmi new file mode 100644 index 0000000000000000000000000000000000000000..91b2957a4f281360e1ff47a735304894a56a97e5 GIT binary patch literal 1211 zcmV;s1VsCZP)giI%Ne{KNoO-0{}kRX{ik^sG$G= z1E@(vK~!jg?U(I#q#z82F~%7j*2DeZZIke!0tycN+ey2p(|ssOAcPmCyiH>2(m?EM zK25XOl?wnAyPBfLY5GNsTonHv>5Ghie8VT2{v}2(CW=Dh+4+33oXfYHW5Fd2D`4(v@IErh~n)ZnJ>$A}3aKZY1+so;k@a?do z=K5NIJ~)xHxpvsg6>7cF{l*dCOsB(aMyi^00gm7b-S2!JMS$?Rq`ENZFV$YoTeR{q zp*Sct)P{a><6Rl_@}OLeEG2)_KN$pr_@R)`riSr-jJmW=-mCwsyi@--@f&^L&+qkp zFR$wRetu3-LOAIAULFR76v2gH(h0uig$U02zLyuCKxchlj;K(BLI1ZoxYz$~b_*q5pT9x>%LZ7#O^N<* zbP$#(*Z&~YS{p_r`u}+biT?Kv_6!pJ|6K-0{cmOYt*@d?|9_pqQU6<;XR!8VfaxY% zIPSqg|3A;5p#Q@b6!m}I!@a)e{|i-G)c-ZB>3i9Oy&2{DzsL literal 0 HcmV?d00001