cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-24 21:56:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tweaking health refresh on the ace modifier.

Browse Source
This commit is contained in:
MistakeNot4892
2022-08-16 19:35:34 +10:00
parent d5aa5353da
commit 615fc68639
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm
+15 -8
View File
@@ -91,11 +91,17 @@ var/global/list/last_drake_howl = list()
var/turf/user_turf = get_turf(user)
if(!istype(user_turf))
return
var/list/affected_levels = GetConnectedZlevels(user_turf.z)
var/list/close_listeners = hearers(world.view * 3, user_turf)
for(var/mob/M in player_list)
var/turf/T = get_turf(M)
if(!istype(T) || istype(T,/turf/space) || T.z != user_turf.z || (M in close_listeners) || M.ear_deaf > 0)
if(!istype(T) || istype(T,/turf/space) || M.ear_deaf > 0 || (M in close_listeners) || !(T.z in affected_levels))
continue
var/turf/reference_point = locate(T.x, T.y, user_turf.z)
if(reference_point)
var/direction = get_dir(reference_point, T)
if(direction)
to_chat(M, SPAN_NOTICE("You hear an eerie howl from somewhere to the [dir2text(direction)]"))
M << 'sound/effects/drakehowl_far.ogg'
/mob/living/simple_mob/animal/sif/grafadreka/get_available_emotes()
@@ -172,7 +178,7 @@ var/global/list/last_drake_howl = list()
var/tmp/eye_colour
var/next_spit = 0
var/spit_cooldown = 5 SECONDS
var/spit_cooldown = 8 SECONDS
var/next_alpha_check = 0
var/dominance = 0 // A score used to determine pack leader.
var/stored_sap = 0
@@ -225,6 +231,7 @@ var/global/list/last_drake_howl = list()
. = ..()
if(.)
next_spit = world.time + spit_cooldown
setMoveCooldown(1 SECOND)
spend_sap(2)
/mob/living/simple_mob/animal/sif/grafadreka/Life()
@@ -287,12 +294,12 @@ var/global/list/last_drake_howl = list()
. = ..()
if(istype(loc, /turf/space))
return
var/health_deficiency = (getMaxHealth() - health)
if(health_deficiency >= 40)
. += (health_deficiency / 25)
var/hungry = (max_nutrition - nutrition) / 5
if (hungry >= 70)
. += hungry/50
var/health_deficiency = 1-(health / maxHealth)
if(health_deficiency >= 0.4)
. += round(4 * health_deficiency, 0.1)
var/hungry = 1-(nutrition / max_nutrition)
if (hungry >= 0.3)
. += round(6 * hungry, 0.1)
/mob/living/simple_mob/animal/sif/grafadreka/update_icon()
code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm
+15
View File
@@ -424,5 +424,20 @@
bleeding_rate_percent = 0.7
attack_speed_percent = 0.8
/datum/modifier/ace/on_applied()
var/health_percent = holder.health / holder.maxHealth
. = ..()
holder.health = round(holder.getMaxHealth() * health_percent)
holder.updatehealth()
/datum/modifier/ace/expire(silent)
var/mob/living/old_holder = holder
if(old_holder)
var/health_percent = old_holder.health / old_holder.getMaxHealth()
. = ..()
if(old_holder)
old_holder.health = round(old_holder.getMaxHealth() * health_percent)
old_holder.updatehealth()
/decl/mob_organ_names/kururak
hit_zones = list("head", "chest", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "far left tail", "far right tail", "left middle tail", "right middle tail")