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

Makes shields hits only spawn one visual (which is actually aligned with the ship) #2681

Merged
merged 2 commits into from
Jul 12, 2024
Merged

Makes shields hits only spawn one visual (which is actually aligned with the ship) #2681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b77b483
Why would you put it on a turf anyway?
Bokkiewokkie Jun 8, 2024
e238169
Debugging
Bokkiewokkie Jun 20, 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
23 changes: 15 additions & 8 deletions nsv13/code/modules/overmap/shieldgen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,31 +338,38 @@

/obj/effect/temp_visual/overmap_shield_hit
name = "Shield hit"
icon = 'nsv13/icons/overmap/shieldhit.dmi';
icon = 'nsv13/icons/overmap/shieldhit.dmi'
icon_state = "shieldhit"
duration = 0.75 SECONDS
layer = ABOVE_MOB_LAYER+0.1
animate_movement = NO_STEPS // Override the inbuilt movement engine to avoid bouncing
appearance_flags = TILE_BOUND | PIXEL_SCALE
vis_flags = VIS_INHERIT_ID
var/obj/structure/overmap/overmap

/obj/effect/temp_visual/overmap_shield_hit/Initialize(mapload, obj/structure/overmap/OM)
. = ..()
//Scale up the shield hit icon to roughly fit the overmap ship that owns us.
if(!OM)
if(!OM || !istype(OM))
log_runtime("Shield hit effect was made with no ship!")
return INITIALIZE_HINT_QDEL
overmap = OM
var/matrix/desired = new()
var/icon/I = icon(overmap.icon)
var/icon/I = icon(OM.icon)
var/resize_x = I.Width()/96
var/resize_y = I.Height()/96
desired.Scale(resize_x,resize_y)
desired.Turn(overmap.angle)
transform = desired
overmap.vis_contents += src
//Don't even ask, this makes it fit on the ship sprite properly most of the time
if(I.Width() <= 48)
pixel_x = -24
pixel_y = -24
else
pixel_x += round(I.Width()/16, 1)
pixel_y += pixel_x*round(I.Height()/32, 1)
OM.overlays.Add(src) //Otherwise it won't animate with the ship nicely
overmap = OM

/obj/effect/temp_visual/overmap_shield_hit/Destroy()
overmap?.vis_contents -= src
overmap?.overlays.Remove(src)
overmap = null
return ..()

Expand Down
2 changes: 1 addition & 1 deletion nsv13/code/modules/overmap/weapons/damage.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Bullet reactions
if(shield_result)
var/damage_sound = pick('nsv13/sound/effects/ship/damage/shield_hit.ogg', 'nsv13/sound/effects/ship/damage/shield_hit2.ogg')
if(!impact_sound_cooldown)
new /obj/effect/temp_visual/overmap_shield_hit(get_turf(src), src)
new /obj/effect/temp_visual/overmap_shield_hit(src, src)
relay(damage_sound)
if(P.damage >= 15) //Flak begone
shake_everyone(5)
Expand Down
Loading