From 20e67749d1c9855fbec0fa05483d8dd09a35f387 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sat, 13 Feb 2021 12:50:56 +0100 Subject: [PATCH] Fix extra projectiles in I WANT DIE not being aimed. --- language.version | 4 ++-- zscript/swwm_handler.zsc | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index 82068dad4..162dd56d6 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r266 \cu(Fri 12 Feb 20:57:26 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r266 \cu(2021-02-12 20:57:26)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r267 \cu(Sat 13 Feb 12:50:56 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r267 \cu(2021-02-13 12:50:56)\c-"; diff --git a/zscript/swwm_handler.zsc b/zscript/swwm_handler.zsc index 3fbc531f1..b56e7e5f3 100644 --- a/zscript/swwm_handler.zsc +++ b/zscript/swwm_handler.zsc @@ -1777,7 +1777,9 @@ Class SWWMHandler : EventHandler e.Thing.speed *= 2; e.Thing.vel *= 2; Vector3 x, y, z; - [x, y, z] = swwm_CoordUtil.GetAxes(e.Thing.pitch,e.Thing.angle,e.Thing.roll); + double ang = e.Thing.target.target?e.Thing.AngleTo(e.Thing.target.target):e.Thing.angle; + double pt = e.Thing.target.target?SWWMUtility.PitchTo(e.Thing,e.Thing.target.target,.5):e.Thing.pitch; + [x, y, z] = swwm_CoordUtil.GetAxes(pt,ang,e.Thing.roll); int numpt = Random[ExtraMissiles](1,2); for ( int i=0; i