diff --git a/language.version b/language.version index 9baa32a92..d8c9f45de 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \cwGZ\c- r373 (Sun 21 Jun 17:00:29 CEST 2020)"; +SWWM_MODVER="\chSWWM \cwGZ\c- r374 (Sun 21 Jun 21:40:38 CEST 2020)"; diff --git a/models/extra/MCBeam.png b/models/extra/MCBeam.png new file mode 100644 index 000000000..02c5dba75 Binary files /dev/null and b/models/extra/MCBeam.png differ diff --git a/models/extra/MCBeamS.png b/models/extra/MCBeamS.png new file mode 100644 index 000000000..326756e00 Binary files /dev/null and b/models/extra/MCBeamS.png differ diff --git a/models/extra/VortexArc.png b/models/extra/VortexArc.png new file mode 100644 index 000000000..10ce239e4 Binary files /dev/null and b/models/extra/VortexArc.png differ diff --git a/models/extra/VortexArcS.png b/models/extra/VortexArcS.png new file mode 100644 index 000000000..34522783e Binary files /dev/null and b/models/extra/VortexArcS.png differ diff --git a/sndinfo.txt b/sndinfo.txt index 4bf84d256..1c0ca0045 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -791,6 +791,22 @@ ynykron/fire sounds/ynykron/mc_fire.ogg ynykron/altfire sounds/ynykron/mc_altfire.ogg ynykron/magout sounds/ynykron/mc_magout.ogg ynykron/magin sounds/ynykron/mc_magin.ogg +ynykron/beam sounds/ynykron/mc_beam.ogg +ynykron/hit1 sounds/ynykron/mc_hit1.ogg +ynykron/hit2 sounds/ynykron/mc_hit2.ogg +ynykron/hit3 sounds/ynykron/mc_hit3.ogg +$random ynykron/hit { ynykron/hit1 ynykron/hit2 ynykron/hit3 } +ynykron/altbeam sounds/ynykron/mc_altbeam.ogg +ynykron/vortex sounds/ynykron/mc_vortex.ogg +ynykron/vortexarc1 sounds/ynykron/mc_vortexarc1.ogg +ynykron/vortexarc2 sounds/ynykron/mc_vortexarc2.ogg +ynykron/vortexarc3 sounds/ynykron/mc_vortexarc3.ogg +$random ynykron/vortexarc { ynykron/vortexarc1 ynykron/vortexarc2 ynykron/vortexarc3 } +ynykron/vortexflash1 sounds/ynykron/mc_vortexflash1.ogg +ynykron/vortexflash2 sounds/ynykron/mc_vortexflash2.ogg +ynykron/vortexflash3 sounds/ynykron/mc_vortexflash3.ogg +$random ynykron/vortexflash { ynykron/vortexflash1 ynykron/vortexflash2 ynykron/vortexflash3 } +ynykron/vortexend sounds/ynykron/mc_vortexend.ogg misc/secret sounds/menu/findsecret.ogg misc/keytry sounds/menu/failuse.ogg diff --git a/sounds/ynykron/mc_altbeam.ogg b/sounds/ynykron/mc_altbeam.ogg new file mode 100644 index 000000000..6583ca728 Binary files /dev/null and b/sounds/ynykron/mc_altbeam.ogg differ diff --git a/sounds/ynykron/mc_beam.ogg b/sounds/ynykron/mc_beam.ogg new file mode 100644 index 000000000..fc806289f Binary files /dev/null and b/sounds/ynykron/mc_beam.ogg differ diff --git a/sounds/ynykron/mc_hit1.ogg b/sounds/ynykron/mc_hit1.ogg new file mode 100644 index 000000000..24384f4ba Binary files /dev/null and b/sounds/ynykron/mc_hit1.ogg differ diff --git a/sounds/ynykron/mc_hit2.ogg b/sounds/ynykron/mc_hit2.ogg new file mode 100644 index 000000000..375893b0a Binary files /dev/null and b/sounds/ynykron/mc_hit2.ogg differ diff --git a/sounds/ynykron/mc_hit3.ogg b/sounds/ynykron/mc_hit3.ogg new file mode 100644 index 000000000..1be9ac4be Binary files /dev/null and b/sounds/ynykron/mc_hit3.ogg differ diff --git a/sounds/ynykron/mc_vortex.ogg b/sounds/ynykron/mc_vortex.ogg new file mode 100644 index 000000000..af86277ec Binary files /dev/null and b/sounds/ynykron/mc_vortex.ogg differ diff --git a/sounds/ynykron/mc_vortexarc1.ogg b/sounds/ynykron/mc_vortexarc1.ogg new file mode 100644 index 000000000..46ca7a395 Binary files /dev/null and b/sounds/ynykron/mc_vortexarc1.ogg differ diff --git a/sounds/ynykron/mc_vortexarc2.ogg b/sounds/ynykron/mc_vortexarc2.ogg new file mode 100644 index 000000000..340e937e7 Binary files /dev/null and b/sounds/ynykron/mc_vortexarc2.ogg differ diff --git a/sounds/ynykron/mc_vortexarc3.ogg b/sounds/ynykron/mc_vortexarc3.ogg new file mode 100644 index 000000000..19ae800d5 Binary files /dev/null and b/sounds/ynykron/mc_vortexarc3.ogg differ diff --git a/sounds/ynykron/mc_vortexend.ogg b/sounds/ynykron/mc_vortexend.ogg new file mode 100644 index 000000000..cb9a78255 Binary files /dev/null and b/sounds/ynykron/mc_vortexend.ogg differ diff --git a/sounds/ynykron/mc_vortexflash1.ogg b/sounds/ynykron/mc_vortexflash1.ogg new file mode 100644 index 000000000..98dbf5798 Binary files /dev/null and b/sounds/ynykron/mc_vortexflash1.ogg differ diff --git a/sounds/ynykron/mc_vortexflash2.ogg b/sounds/ynykron/mc_vortexflash2.ogg new file mode 100644 index 000000000..b61eaae10 Binary files /dev/null and b/sounds/ynykron/mc_vortexflash2.ogg differ diff --git a/sounds/ynykron/mc_vortexflash3.ogg b/sounds/ynykron/mc_vortexflash3.ogg new file mode 100644 index 000000000..29ebfa2c9 Binary files /dev/null and b/sounds/ynykron/mc_vortexflash3.ogg differ diff --git a/zscript/swwm_hud.zsc b/zscript/swwm_hud.zsc index 2c14d8c1b..a83394b26 100644 --- a/zscript/swwm_hud.zsc +++ b/zscript/swwm_hud.zsc @@ -695,8 +695,6 @@ Class SWWMStatusBar : BaseStatusBar { // damage falls down int initspd = (128-snum.seed); - //if ( initspd >= 0 && initspd < 32 ) initspd = 32; - //if ( initspd < 0 && initspd > -32 ) initspd = -32; int boostup = 64+snum.seed2; fo.x = (.05*initspd)*((snum.initialspan-(snum.lifespan-fractic))**.8); fo.y = -((snum.initialspan-(snum.lifespan-fractic))**1.5)+boostup*sin((90./snum.initialspan)*(level.maptime+fractic-snum.starttic)); @@ -705,8 +703,6 @@ Class SWWMStatusBar : BaseStatusBar { // health falls up (?) int initspd = (128-snum.seed); - //if ( initspd >= 0 && initspd < 32 ) initspd = 32; - //if ( initspd < 0 && initspd > -32 ) initspd = -32; int boostup = 16+snum.seed2/4; fo.x = (.15*initspd)*((snum.initialspan-(snum.lifespan-fractic))**.6); fo.y = ((snum.initialspan-(snum.lifespan-fractic))**1.2)-boostup*sin((90./snum.initialspan)*(level.maptime+fractic-snum.starttic));