From 1cd691847ff5fc89dbfdd710741bcd4ffdf12731 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sun, 7 Jun 2020 23:41:56 +0200 Subject: [PATCH] Slight visual tweak to napalm smoke. --- language.version | 2 +- zscript/swwm_common.zsc | 2 +- zscript/swwm_shot.zsc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/language.version b/language.version index 67e59abd0..6240bc850 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\cxSWWM GZ\c- r323 (Sun 7 Jun 23:22:23 CEST 2020)"; +SWWM_MODVER="\cxSWWM GZ\c- r324 (Sun 7 Jun 23:41:56 CEST 2020)"; diff --git a/zscript/swwm_common.zsc b/zscript/swwm_common.zsc index 2b55dc73a..22329b03d 100644 --- a/zscript/swwm_common.zsc +++ b/zscript/swwm_common.zsc @@ -1215,7 +1215,7 @@ Class SWWMHalfSmoke : Actor States { Spawn: - XSMK ACEGIKMOQS 1; + XSMK ABCDEFGHIJKLMNOPQRST 1; Stop; } } diff --git a/zscript/swwm_shot.zsc b/zscript/swwm_shot.zsc index 8c8113ee1..9de0e5ce5 100644 --- a/zscript/swwm_shot.zsc +++ b/zscript/swwm_shot.zsc @@ -946,7 +946,7 @@ Class OnFire : Actor { let s = victim.Spawn("SWWMHalfSmoke",pos); s.scale *= max(1.,1.6*mult); - s.alpha *= min(amount+30,100)*0.02; + s.alpha *= min(amount+30,100)*.01; s.vel = victim.vel*0.5+(cos(ang)*cos(pt),sin(ang)*cos(pt),-sin(pt))*FRandom[FlameT](.2,.6)*s.scale.x; } } @@ -1077,7 +1077,7 @@ Class OnFireTrail : Actor let s = Spawn("SWWMHalfSmoke",pos); s.vel = (FRandom[FlameT](-.2,.2),FRandom[FlameT](-.2,.2),FRandom[FlameT](-.2,.2)); s.vel += vel*.3; - s.alpha *= alpha*4; + s.alpha *= alpha*3; s.scale *= .5+abs(scale.x)*(.5+GetAge()/6.); } }