diff --git a/language.version b/language.version index 0a4723329..6d59d35a6 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r562 \cu(Sun 9 Oct 21:05:46 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r562 \cu(2022-10-09 21:05:46)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r564 \cu(Mon 10 Oct 10:05:13 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r564 \cu(2022-10-10 10:05:13)\c-"; diff --git a/zscript/weapons/swwm_cbt.zsc b/zscript/weapons/swwm_cbt.zsc index df0bf4f50..09076eb39 100644 --- a/zscript/weapons/swwm_cbt.zsc +++ b/zscript/weapons/swwm_cbt.zsc @@ -260,20 +260,16 @@ Class Wallbuster : SWWMWeapon // the shooting if ( !st ) st = new("SpreadgunTracer"); st.ignoreme = self; - // attempt to uniformize expected damage while reducing traces (mainly for performance) - int expecteddmg = 180; - int numshot = max(21-howmany,5); - int individualdmg = int(ceil(expecteddmg/double(numshot))); - for ( int j=0; j1)); + ProcessTraceHit(st,origin,dir,10,7000,bc:5+howmany/6,(howmany>1)); } for ( int i=0; i<(16-howmany/2); i++ ) { diff --git a/zscript/weapons/swwm_shot.zsc b/zscript/weapons/swwm_shot.zsc index 1874327b0..ec1dfff63 100644 --- a/zscript/weapons/swwm_shot.zsc +++ b/zscript/weapons/swwm_shot.zsc @@ -329,7 +329,7 @@ Class Spreadgun : SWWMWeapon st.shootthroughlist.Clear(); st.waterhitlist.Clear(); st.Trace(origin,level.PointInSector(origin.xy),dir,8000.,TRACE_HitSky); - ProcessTraceHit(st,origin,dir,9,7000,bc:5); + ProcessTraceHit(st,origin,dir,10,7000,bc:5); } for ( int i=0; i<16; i++ ) {