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

Adds Shockwaves to Explosions and Xeno Screeches #5938

Merged
merged 14 commits into from
Apr 21, 2024
Merged

Adds Shockwaves to Explosions and Xeno Screeches #5938

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1bbd25c
adds shockwaves to explosions via Tivi+Ivanmixo
GrrrKitten Mar 13, 2024
85d466c
Update code/datums/autocells/explosion.dm
GrrrKitten Mar 26, 2024
bfa8765
Update code/game/objects/effects/temporary_visuals.dm
GrrrKitten Mar 26, 2024
d5bd4f3
Update code/game/objects/effects/temporary_visuals.dm
GrrrKitten Mar 26, 2024
f7eb8e6
removes qdel in stoppable
GrrrKitten Mar 26, 2024
8dba9ad
whoopsies forgot to commit
GrrrKitten Mar 26, 2024
96d0884
adds shockwaves to xeno screeches (queen + predalien)
GrrrKitten Mar 26, 2024
c4355f1
tones down the shriekwaves
GrrrKitten Mar 26, 2024
d73b490
minor adjustment and typo fix
GrrrKitten Mar 27, 2024
23c093f
adds some randomness to shriekwaves for better visuals
GrrrKitten Mar 27, 2024
fa6f386
minor refactor, tweaks the VFX some and removes a shockwave each
GrrrKitten Apr 20, 2024
eade950
Update code/game/objects/effects/temporary_visuals.dm
GrrrKitten Apr 21, 2024
269879c
Update code/game/objects/effects/temporary_visuals.dm
GrrrKitten Apr 21, 2024
36bb181
Update code/modules/mob/living/carbon/xenomorph/update_icons.dm
GrrrKitten Apr 21, 2024
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
3 changes: 3 additions & 0 deletions code/__DEFINES/layers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@

//#define AREA_LAYER 1

#define DISPLACEMENT_PLATE_RENDER_LAYER 1
#define DISPLACEMENT_PLATE_RENDER_TARGET "*DISPLACEMENT_PLATE_RENDER_TARGET"

#define UNDER_TURF_LAYER 1.99

#define TURF_LAYER 2
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/qdel.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
#define QDESTROYING(X) (!X || X.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)

#define QDEL_IN(item, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), (time) > GC_FILTER_QUEUE ? WEAKREF(item) : item), time, TIMER_STOPPABLE)
#define QDEL_IN_STOPPABLE(item, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), (time) > GC_FILTER_QUEUE ? WEAKREF(item) : item), time, TIMER_STOPPABLE)
GrrrKitten marked this conversation as resolved.
Show resolved Hide resolved
#define QDEL_IN_CLIENT_TIME(item, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), item), time, TIMER_STOPPABLE | TIMER_CLIENT_TIME)
#define QDEL_NULL(item) qdel(item); item = null
#define QDEL_NULL_LIST(x) if(x) { for(var/y in x) { qdel(y) }}; if(x) {x.Cut(); x = null } // Second x check to handle items that LAZYREMOVE on qdel.
Expand Down
7 changes: 7 additions & 0 deletions code/_onclick/hud/rendering/plane_master.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,3 +189,10 @@
plane = ESCAPE_MENU_PLANE
appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR
render_relay_plane = RENDER_PLANE_MASTER

/atom/movable/screen/plane_master/displacement
name = "displacement plane"
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
plane = DISPLACEMENT_PLATE_RENDER_LAYER
render_target = DISPLACEMENT_PLATE_RENDER_TARGET
render_relay_plane = null
4 changes: 4 additions & 0 deletions code/_onclick/hud/rendering/render_plate.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@
plane = RENDER_PLANE_GAME
render_relay_plane = RENDER_PLANE_MASTER

/atom/movable/screen/plane_master/rendering_plate/game_world/Initialize(mapload, datum/hud/hud_owner)
. = ..()
add_filter("displacer", 1, displacement_map_filter(render_source = DISPLACEMENT_PLATE_RENDER_TARGET, size = 10))

///render plate for OOC stuff like ghosts, hud-screen effects, etc
/atom/movable/screen/plane_master/rendering_plate/non_game
name = "non-game rendering plate"
Expand Down
3 changes: 3 additions & 0 deletions code/datums/autocells/explosion.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,9 @@ as having entered the turf.
if(QDELETED(E))
return

if(power >= 150) //shockwave for anything over 150 power
new /obj/effect/temp_visual/shockwave(epicenter, power/60)
GrrrKitten marked this conversation as resolved.
Show resolved Hide resolved

E.power = power
E.power_falloff = falloff
E.falloff_shape = falloff_shape
Expand Down
17 changes: 17 additions & 0 deletions code/game/objects/effects/temporary_visuals.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,20 @@
splatter_type = "csplatter"
color = BLOOD_COLOR_SYNTHETIC

//------------------------------------------
//Shockwaves
//------------------------------------------

/obj/effect/temp_visual/shockwave
icon = 'icons/effects/light_overlays/shockwave.dmi'
icon_state = "shockwave"
plane = DISPLACEMENT_PLATE_RENDER_LAYER
pixel_x = -496
pixel_y = -496

/obj/effect/temp_visual/shockwave/Initialize(mapload, radius)
GrrrKitten marked this conversation as resolved.
Show resolved Hide resolved
. = ..()
deltimer(timerid)
GrrrKitten marked this conversation as resolved.
Show resolved Hide resolved
timerid = QDEL_IN_STOPPABLE(src, 0.5 * radius)
GrrrKitten marked this conversation as resolved.
Show resolved Hide resolved
transform = matrix().Scale(32 / 1024, 32 / 1024)
animate(src, time = 1/2 * radius, transform=matrix().Scale((32 / 1024) * radius * 1.5, (32 / 1024) * radius * 1.5))
Loading