Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
EgorDinamit committed Oct 13, 2023
1 parent 293feef commit 6daedc2
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/effects/temporary.dm
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
/obj/effect/temp_visual/slash/Initialize()
. = ..()
animate(src, alpha = 255, time = (duration * 0.25))
animate(src, alpha = 0, time = (duration * 0.75))
animate(alpha = 0, time = (duration * 0.75))

// Used by water slash spell
/obj/effect/temp_visual/slash/water
Expand Down
13 changes: 10 additions & 3 deletions code/modules/spells/aimed/water_slash.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,18 @@
. = ..()
var/turf/start_turf = get_step(get_turf(user), get_dir(user, target))
var/turf/target_turf = get_ranged_target_turf_direct(start_turf, target, slash_distance)
var/list/attack_line = getline(start_turf, target_turf)
var/list/attack_line = list()
for(var/turf/T in getline(start_turf, target_turf))
if(T.density)
break
attack_line += T
target_turf = T

var/obj/effect/temp_visual/slash/water/S = new(start_turf)
S.transform.Turn(Get_Angle(start_turf, target_turf))
animate(S, pixel_x = (target_turf.x - start_turf.x) * world.icon_size, pixel_y = (target_turf.y - start_turf.y) * world.icon_size, transform = matrix()*3, time = 5)
var/matrix/M = matrix(S.transform)
M.Turn(Get_Angle(start_turf, target_turf))
S.transform = M
animate(S, pixel_x = (target_turf.x - start_turf.x) * world.icon_size, pixel_y = (target_turf.y - start_turf.y) * world.icon_size, transform = M*3, time = 5)
var/list/already_hit = list()
for(var/turf/T in attack_line)
for(var/turf/TT in view(1, T))
Expand Down

0 comments on commit 6daedc2

Please sign in to comment.