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.

Sign up for GitHub

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

Jump to bottom

Tail updates call compile_overlays(). #4207

Merged
merged 1 commit into from
Jul 17, 2024
Merged

Tail updates call compile_overlays(). #4207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
158 changes: 0 additions & 158 deletions code/modules/mob/living/human/update_icons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,164 +373,6 @@ Please contact me on #coderbus IRC. ~Carn x
LAZYADD(condition_overlays, condition_overlay)
set_current_mob_overlay(HO_CONDITION_LAYER, condition_overlays, update_icons)

/* --------------------------------------- */
//vvvvvv UPDATE_INV PROCS vvvvvv
/mob/living/proc/update_tail_showing(var/update_icons=1)
return

/mob/living/human/update_tail_showing(var/update_icons=1)

var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(!istype(tail_organ))
set_current_mob_overlay(HO_TAIL_LAYER, null, FALSE)
set_current_mob_underlay(HU_TAIL_LAYER, null, update_icons)
return

var/tail_state = tail_organ.get_tail(tail_organ)
if(!tail_state)
set_current_mob_overlay(HO_TAIL_LAYER, null, FALSE)
set_current_mob_underlay(HU_TAIL_LAYER, null, update_icons)
return

var/obj/item/suit = get_equipped_item(slot_wear_suit_str)
if(suit && (suit.flags_inv & HIDETAIL))
set_current_mob_overlay(HO_TAIL_LAYER, null, FALSE)
set_current_mob_underlay(HU_TAIL_LAYER, null, update_icons)

var/icon/tail_s = get_tail_icon_for_organ(tail_organ)
var/tail_image = image(tail_s, icon_state = tail_state)
animate_tail_reset(0)
if(dir == NORTH)
set_current_mob_underlay(HU_TAIL_LAYER, null, FALSE)
set_current_mob_overlay(HO_TAIL_LAYER, tail_image, update_icons)
else
set_current_mob_overlay(HO_TAIL_LAYER, null, FALSE)
set_current_mob_underlay(HU_TAIL_LAYER, tail_image, update_icons)

/mob/living/human/proc/get_tail_icon_for_organ(var/obj/item/organ/external/tail/tail_organ)
if(!istype(tail_organ))
return

var/tail_state = tail_organ.get_tail()
if(tail_organ.limb_flags & ORGAN_FLAG_SKELETAL)
if(!tail_organ.bodytype?.skeletal_icon)
return
var/tail_cache_key = "[tail_state][tail_organ.bodytype.skeletal_icon]_skeletal"
if(!global.tail_icon_cache[tail_cache_key])
global.tail_icon_cache[tail_cache_key] = icon(tail_organ.bodytype.skeletal_icon, tail_state)
return global.tail_icon_cache[tail_cache_key]

var/tail_icon = tail_organ.get_tail_icon()
if(!tail_state || !tail_icon)
return // No tail data!

// These values may be null and are generally optional.
var/hair_colour = GET_HAIR_COLOUR(src)
var/skin_colour = get_skin_colour()
var/tail_hair = tail_organ.get_tail_hair()
var/tail_blend = tail_organ.get_tail_blend()
var/tail_hair_blend = tail_organ.get_tail_hair_blend()
var/tail_color = (tail_organ.bodytype.appearance_flags & HAS_SKIN_COLOR) ? skin_colour : null

var/icon_key = "[tail_state][tail_icon][tail_blend][tail_color][tail_hair][tail_hair_blend][hair_colour]"
var/icon/blended_tail_icon = global.tail_icon_cache[icon_key]
if(!blended_tail_icon)
//generate a new one
blended_tail_icon = icon(tail_icon, tail_state)
if(skin_colour && !isnull(tail_blend)) // 0 is a valid blend mode
blended_tail_icon.Blend(skin_colour, tail_blend)
// The following will not work with animated tails.
if(tail_hair)
var/tail_hair_state = "[tail_state]_[tail_hair]"
if(check_state_in_icon(tail_hair_state, tail_icon))
var/icon/hair_icon = icon(tail_icon, tail_hair_state)
if(hair_colour && !isnull(tail_hair_blend)) // 0 is a valid blend mode
hair_icon.Blend(hair_colour, tail_hair_blend)
blended_tail_icon.Blend(hair_icon, ICON_OVERLAY)
global.tail_icon_cache[icon_key] = blended_tail_icon
return blended_tail_icon

/mob/living/set_dir()
. = ..()
if(.)
var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(tail_organ?.get_tail())
update_tail_showing()

/mob/living/human/proc/set_tail_state(var/t_state)
var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(!tail_organ || (tail_organ.limb_flags & ORGAN_FLAG_SKELETAL))
return null
var/image/tail_overlay = get_current_tail_image()
if(tail_overlay && check_state_in_icon(tail_overlay.icon, t_state))
tail_overlay.icon_state = t_state
return tail_overlay

//Not really once, since BYOND can't do that.
//Update this if the ability to flick() images or make looping animation start at the first frame is ever added.
/mob/living/human/proc/get_current_tail_image()
return get_current_mob_overlay(HO_TAIL_LAYER) || get_current_mob_underlay(HU_TAIL_LAYER)

/mob/living/human/proc/animate_tail_once(var/update_icons=1)
var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(!tail_organ || (tail_organ.limb_flags & ORGAN_FLAG_SKELETAL))
return
var/t_state = "[tail_organ.get_tail()]_once"

var/image/tail_overlay = get_current_tail_image()
if(tail_overlay && tail_overlay.icon_state == t_state)
return //let the existing animation finish

tail_overlay = set_tail_state(t_state)
if(tail_overlay)
spawn(20)
//check that the animation hasn't changed in the meantime
var/current_tail = get_current_tail_image()
if(current_tail == tail_overlay && tail_overlay.icon_state == t_state)
animate_tail_stop()

if(update_icons)
queue_icon_update()

/mob/living/human/proc/animate_tail_start(var/update_icons=1)
var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(!tail_organ || (tail_organ.limb_flags & ORGAN_FLAG_SKELETAL))
return
var/tail_states = tail_organ.get_tail_states()
if(tail_states)
set_tail_state("[tail_organ.get_tail()]_slow[rand(1, tail_states)]")
if(update_icons)
queue_icon_update()

/mob/living/human/proc/animate_tail_fast(var/update_icons=1)
var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(!tail_organ || (tail_organ.limb_flags & ORGAN_FLAG_SKELETAL))
return
var/tail_states = tail_organ.get_tail_states()
if(tail_states)
set_tail_state("[tail_organ.get_tail()]_loop[rand(1, tail_states)]")
if(update_icons)
queue_icon_update()

/mob/living/human/proc/animate_tail_reset(var/update_icons=1)
var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(!tail_organ || (tail_organ.limb_flags & ORGAN_FLAG_SKELETAL))
return
var/tail_states = tail_organ.get_tail_states(src)
if(stat != DEAD && tail_states)
set_tail_state("[tail_organ.get_tail()]_idle[rand(1, tail_states)]")
else
set_tail_state("[tail_organ.get_tail()]_static")

if(update_icons)
queue_icon_update()

/mob/living/human/proc/animate_tail_stop(var/update_icons=1)
var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(!tail_organ || (tail_organ.limb_flags & ORGAN_FLAG_SKELETAL))
return
set_tail_state("[tail_organ.get_tail()]_static")

/mob/living/human/hud_reset(full_reset = FALSE)
if((. = ..()) && internals && internal)
internals.icon_state = "internal1"
157 changes: 157 additions & 0 deletions code/modules/mob/living/living_tail.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
/mob/living/proc/update_tail_showing(var/update_icons=1)

var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(!istype(tail_organ))
set_current_mob_overlay(HO_TAIL_LAYER, null, FALSE)
set_current_mob_underlay(HU_TAIL_LAYER, null, update_icons)
return

var/tail_state = tail_organ.get_tail(tail_organ)
if(!tail_state)
set_current_mob_overlay(HO_TAIL_LAYER, null, FALSE)
set_current_mob_underlay(HU_TAIL_LAYER, null, update_icons)
return

var/obj/item/suit = get_equipped_item(slot_wear_suit_str)
if(suit && (suit.flags_inv & HIDETAIL))
set_current_mob_overlay(HO_TAIL_LAYER, null, FALSE)
set_current_mob_underlay(HU_TAIL_LAYER, null, update_icons)

var/icon/tail_s = get_tail_icon_for_organ(tail_organ)
var/tail_image = image(tail_s, icon_state = tail_state)
animate_tail_reset(0)
if(dir == NORTH)
set_current_mob_underlay(HU_TAIL_LAYER, null, FALSE)
set_current_mob_overlay(HO_TAIL_LAYER, tail_image, update_icons)
else
set_current_mob_overlay(HO_TAIL_LAYER, null, FALSE)
set_current_mob_underlay(HU_TAIL_LAYER, tail_image, update_icons)

if(update_icons)
update_icon()
compile_overlays()

/mob/living/proc/get_tail_icon_for_organ(var/obj/item/organ/external/tail/tail_organ)
if(!istype(tail_organ))
return

var/tail_state = tail_organ.get_tail()
if(tail_organ.limb_flags & ORGAN_FLAG_SKELETAL)
if(!tail_organ.bodytype?.skeletal_icon)
return
var/tail_cache_key = "[tail_state][tail_organ.bodytype.skeletal_icon]_skeletal"
if(!global.tail_icon_cache[tail_cache_key])
global.tail_icon_cache[tail_cache_key] = icon(tail_organ.bodytype.skeletal_icon, tail_state)
return global.tail_icon_cache[tail_cache_key]

var/tail_icon = tail_organ.get_tail_icon()
if(!tail_state || !tail_icon)
return // No tail data!

// These values may be null and are generally optional.
var/hair_colour = GET_HAIR_COLOUR(src)
var/skin_colour = get_skin_colour()
var/tail_hair = tail_organ.get_tail_hair()
var/tail_blend = tail_organ.get_tail_blend()
var/tail_hair_blend = tail_organ.get_tail_hair_blend()
var/tail_color = (tail_organ.bodytype.appearance_flags & HAS_SKIN_COLOR) ? skin_colour : null

var/icon_key = "[tail_state][tail_icon][tail_blend][tail_color][tail_hair][tail_hair_blend][hair_colour]"
var/icon/blended_tail_icon = global.tail_icon_cache[icon_key]
if(!blended_tail_icon)
//generate a new one
blended_tail_icon = icon(tail_icon, tail_state)
if(skin_colour && !isnull(tail_blend)) // 0 is a valid blend mode
blended_tail_icon.Blend(skin_colour, tail_blend)
// The following will not work with animated tails.
if(tail_hair)
var/tail_hair_state = "[tail_state]_[tail_hair]"
if(check_state_in_icon(tail_hair_state, tail_icon))
var/icon/hair_icon = icon(tail_icon, tail_hair_state)
if(hair_colour && !isnull(tail_hair_blend)) // 0 is a valid blend mode
hair_icon.Blend(hair_colour, tail_hair_blend)
blended_tail_icon.Blend(hair_icon, ICON_OVERLAY)
global.tail_icon_cache[icon_key] = blended_tail_icon
return blended_tail_icon

/mob/living/set_dir()
var/lastdir = dir
. = ..()
if(. && ((lastdir == NORTH) != (dir == NORTH)))
var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(tail_organ?.get_tail())
update_tail_showing()

/mob/living/proc/set_tail_state(var/t_state)
var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(!tail_organ || (tail_organ.limb_flags & ORGAN_FLAG_SKELETAL))
return null
var/image/tail_overlay = get_current_tail_image()
if(tail_overlay && check_state_in_icon(tail_overlay.icon, t_state))
tail_overlay.icon_state = t_state
return tail_overlay

//Not really once, since BYOND can't do that.
//Update this if the ability to flick() images or make looping animation start at the first frame is ever added.
/mob/living/proc/get_current_tail_image()
return get_current_mob_overlay(HO_TAIL_LAYER) || get_current_mob_underlay(HU_TAIL_LAYER)

/mob/living/proc/animate_tail_once(var/update_icons=1)
var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(!tail_organ || (tail_organ.limb_flags & ORGAN_FLAG_SKELETAL))
return
var/t_state = "[tail_organ.get_tail()]_once"

var/image/tail_overlay = get_current_tail_image()
if(tail_overlay && tail_overlay.icon_state == t_state)
return //let the existing animation finish

tail_overlay = set_tail_state(t_state)
if(tail_overlay)
spawn(20)
//check that the animation hasn't changed in the meantime
var/current_tail = get_current_tail_image()
if(current_tail == tail_overlay && tail_overlay.icon_state == t_state)
animate_tail_stop()

if(update_icons)
queue_icon_update()

/mob/living/proc/animate_tail_start(var/update_icons=1)
var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(!tail_organ || (tail_organ.limb_flags & ORGAN_FLAG_SKELETAL))
return
var/tail_states = tail_organ.get_tail_states()
if(tail_states)
set_tail_state("[tail_organ.get_tail()]_slow[rand(1, tail_states)]")
if(update_icons)
queue_icon_update()

/mob/living/proc/animate_tail_fast(var/update_icons=1)
var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(!tail_organ || (tail_organ.limb_flags & ORGAN_FLAG_SKELETAL))
return
var/tail_states = tail_organ.get_tail_states()
if(tail_states)
set_tail_state("[tail_organ.get_tail()]_loop[rand(1, tail_states)]")
if(update_icons)
queue_icon_update()

/mob/living/proc/animate_tail_reset(var/update_icons=1)
var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(!tail_organ || (tail_organ.limb_flags & ORGAN_FLAG_SKELETAL))
return
var/tail_states = tail_organ.get_tail_states(src)
if(stat != DEAD && tail_states)
set_tail_state("[tail_organ.get_tail()]_idle[rand(1, tail_states)]")
else
set_tail_state("[tail_organ.get_tail()]_static")

if(update_icons)
queue_icon_update()

/mob/living/proc/animate_tail_stop(var/update_icons=1)
var/obj/item/organ/external/tail/tail_organ = get_organ(BP_TAIL, /obj/item/organ/external/tail)
if(!tail_organ || (tail_organ.limb_flags & ORGAN_FLAG_SKELETAL))
return
set_tail_state("[tail_organ.get_tail()]_static")
1 change: 1 addition & 0 deletions nebula.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2762,6 +2762,7 @@
#include "code\modules\mob\living\living_pulse.dm"
#include "code\modules\mob\living\living_resist.dm"
#include "code\modules\mob\living\living_status.dm"
#include "code\modules\mob\living\living_tail.dm"
#include "code\modules\mob\living\living_taste.dm"
#include "code\modules\mob\living\living_throw.dm"
#include "code\modules\mob\living\login.dm"
Expand Down
Loading