diff --git a/achievements.lst b/achievements.lst index 5910f6f20..b71fe216c 100644 --- a/achievements.lst +++ b/achievements.lst @@ -105,7 +105,7 @@ shock,30,yes,any slayer,40,yes,any slemg,100,yes,any sneeze,20,yes,any -step,60,yes,any +step,30,yes,any stomp,50,yes,any sunny,15,yes,any tele,0,no,any diff --git a/language.version b/language.version index 6fb91f579..94a1a245e 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r575 \cu(Tue 13 Jul 17:04:42 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r575 \cu(2021-07-13 17:04:42)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r576 \cu(Tue 20 Jul 12:08:22 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r576 \cu(2021-07-20 12:08:22)\c-"; diff --git a/zscript/swwm_blod.zsc b/zscript/swwm_blod.zsc index 8a5d8ca60..8230657f9 100644 --- a/zscript/swwm_blod.zsc +++ b/zscript/swwm_blod.zsc @@ -96,7 +96,7 @@ Class mkBloodSpray : Actor SetOrigin(level.Vec3Offset(target.pos,setofs),false); int sz = max(1,args[0]/2); double ang, pt; - int cnt = sz-Random[Blood](0,2); + int cnt = sz-Random[Blood](0,4); for ( int i=0; i 0 ) A_FadeOut(); A_FadeOut(.03); A_SetScale(scale.x*1.02); + vel *= .98; if ( tics > 0 ) tics--; while ( !tics ) { @@ -419,13 +420,13 @@ Class mkFlyingGib : Actor double ang = FRandom[Gibs](0,360); double pt = FRandom[Gibs](-60,20); Vector3 dir = (cos(pt)*cos(ang),cos(pt)*sin(ang),sin(-pt)); - vel += dir*FRandom[Gibs](5.,20.); + vel += dir*FRandom[Gibs](5.,15.); if ( master ) { vel += master.vel*1.5; CopyBloodColor(master); } - rollvel = FRandom[Gibs](10,50)*RandomPick[Gibs](-1,1); + rollvel = FRandom[Gibs](10,50)*RandomPick[Gibs](-1,1)*clamp(vel.length()/10.,.25,4.); scale *= FRandom[Gibs](.5,1.5); if ( master && master.bloodcolor ) shadecol = Color(master.bloodcolor.r/2,master.bloodcolor.g/2,master.bloodcolor.b/2); else shadecol = Color(80,0,0); @@ -458,7 +459,7 @@ Class mkFlyingGib : Actor vel.xy *= .98; return; } - if ( bleeding && !Random[Blood](0,3) ) + if ( bleeding && !Random[Blood](0,2) ) { let s = Spawn("mkBloodSmoke",pos); s.SetShade(shadecol); @@ -473,12 +474,14 @@ Class mkFlyingGib : Actor action void A_Bleed() { + invoker.rollvel = FRandom[Gibs](10,50)*RandomPick[Gibs](-1,1)*clamp(vel.length()/10.,.25,4.); + if ( invoker.lastbleed > level.maptime ) return; + invoker.lastbleed = level.maptime+5; double ang; double pt; Vector3 dir; - if ( invoker.lastbleed > level.maptime ) return; - invoker.lastbleed = level.maptime+5; - for ( int i=0; i<4; i++ ) + int numpt = Random[Blood](2,4); + for ( int i=0; i