From ec9e09adca7ca986a4fe76ec8264fd6a142b9d3f Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Tue, 3 Nov 2020 10:49:04 +0100 Subject: [PATCH] Add color-coded pickup flashes. Allow Keen rescue by pressing use. --- language.version | 2 +- sprites/BLPFB0.png | Bin 3299 -> 3320 bytes sprites/BLPFC0.png | Bin 3040 -> 3061 bytes sprites/BLPFD0.png | Bin 0 -> 3222 bytes sprites/BLPFE0.png | Bin 0 -> 3202 bytes sprites/BLPFF0.png | Bin 0 -> 3236 bytes sprites/BLPFG0.png | Bin 0 -> 3198 bytes sprites/BLPFH0.png | Bin 0 -> 1405 bytes zscript/swwm_common.zsc | 74 ++++++++++++++++++++++++++++++++++-- zscript/swwm_funstuff.zsc | 2 +- zscript/swwm_inventory.zsc | 6 +-- zscript/swwm_jackhammer.zsc | 2 +- zscript/swwm_keys.zsc | 14 +++++++ zscript/swwm_powerup.zsc | 16 ++++---- 14 files changed, 99 insertions(+), 17 deletions(-) create mode 100644 sprites/BLPFD0.png create mode 100644 sprites/BLPFE0.png create mode 100644 sprites/BLPFF0.png create mode 100644 sprites/BLPFG0.png create mode 100644 sprites/BLPFH0.png diff --git a/language.version b/language.version index 15bd493f0..df2a9833d 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r595 \cu(Tue 3 Nov 10:15:52 CET 2020)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r596 \cu(Tue 3 Nov 10:49:04 CET 2020)"; diff --git a/sprites/BLPFB0.png b/sprites/BLPFB0.png index 440de111d17e5e0a7cbafef9055e27c53fe3e354..8f732b18a75875ee8d538cc3c027b4e09f200e60 100644 GIT binary patch delta 30 jcmaDX`9pGoxiAA~fk$L90|U1(2s1Lwnj^8%bR7=>e{Kh$ delta 10 Rcmew%`B-v-`9_~LJOCTv1d0Fv diff --git a/sprites/BLPFC0.png b/sprites/BLPFC0.png index d41ca1c7c46d2a5a6fe32e2987b83f03d3dfac70..a7827968042c6579373a14eafa56cb3a243522e6 100644 GIT binary patch delta 30 jcmaDL{#AT}xiAA~fk$L90|U1(2s1Lwnj^8%bTu~sen|(C delta 10 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 literal 0 HcmV?d00001 diff --git a/sprites/BLPFE0.png b/sprites/BLPFE0.png new file mode 100644 index 0000000000000000000000000000000000000000..8ce24e41205f504b198716c4b21ba4f33ae05275 GIT binary patch literal 3202 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 IIVCg!0N%IxQUCw| literal 0 HcmV?d00001 diff --git a/sprites/BLPFG0.png b/sprites/BLPFG0.png new file mode 100644 index 0000000000000000000000000000000000000000..baeed5d9b75c05d35a3883f10f527d1e340c9a6e GIT binary patch literal 3198 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 literal 0 HcmV?d00001 diff --git a/sprites/BLPFH0.png b/sprites/BLPFH0.png new file mode 100644 index 0000000000000000000000000000000000000000..b84a2a873191d0a1a1812a59bcffe57b8b2a6671 GIT binary patch literal 1405 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4h9AWhJGeJCI$uuj`SkOBnAcs1rV+fPFlsl zz`#@z>2eGY`otJkbYI~7@b%x>L!k@@rp>DouwwAt``_bM9gEApEBs0x z986MGE)EVyri3SYNHuhHG&FQfdZLYL7nU$~OkVUri>bjz zfx*ZruWDJ+3BLR78(uSJUYgah#j}*x!Qi^|1ZNh9W1XC0lVTQDybUW|vE-H40=;=1%<9w#VgU z(dEULxbAxERmR!=W>7xnymq2Uz;C6f1{tPbf(B&^ifaA^?40AVf6ddiR~AQ^?%vz_ za<-TBrOO8eZZUH7G^h0xPAoqk&y?tWXTwvUzK~6SC4Igl|0ZuOzk{4WfJEE3 z9Rd#}^Pk;IvntftR_VTL>PhLNFT2l4?2f*=D^RF-ZbQuCDy5k>rb+i5J-;D*zC~xz zx;eY@ZYO;`qJHl6cCMg_Z#Wb=930NAIjp?@$fTRWhl5>htd82$K5T9M$h~r9|6HzB ztET*OD`EWfk53`pspWic?Odx#7KXB6Y*({SuAb<9{9R3a*X^U5u4wIO^J91%(~)t> z%G`4H&xVC&Gs-HyJU_EMdu4BSs=L?H5`PC{);WcTdm=Nl|4hB?e87j#VO3nU(e4cq zQE}z3=3Ua7(300+AT&+%{G0Rd=6f!>FA=U&n|L>NUVLfFUNeq{hC@BaE@z&eIp@SY zzukxb%{NutpEC8Wd-wP5GT+q>V%Cgvik0VVX#3X7yWc;{fAh*qPKC9_wLi}<^*uh7 znZZXQO(iX|@cWyE&B=aiF5cSS^Qm`BQTQ}Dopn>@%!=o#ElOxvdvRsYMytXLHo=P% z`4}9op7_)|Uv6FQw7DYXce|cfuF`jyabnS8Wkp*%qmR=vk4rFIjQX?Me1G(czjo#c z;#RK}jIA=~S{+(t7|6+-Gyi)1+`GRtB6V-&&9~wROH!J4&-$^`kJy)~rv%wr^RLU_ zeEnWkKmJ-7Z3b<21CcGPA$w!^^bVup%P?ej}V8dq=KC88Ys{P_Bcpv<+M z7FlbbSABDF*sorcH)G-i$(j3he!n3qx@l)%-Q%P`>n=qx3Nkk6@w_{gkf!T_-xrmpLst+e+CWrGdvF zW!gf^xvdX>C9iy6a_=L1?<5C?gV`G%^INR+`}O0dmeA|k SV3G$aS3O<*T-G@yGywqREs|aU literal 0 HcmV?d00001 diff --git a/zscript/swwm_common.zsc b/zscript/swwm_common.zsc index fa0bf0e46..63f893974 100644 --- a/zscript/swwm_common.zsc +++ b/zscript/swwm_common.zsc @@ -67,6 +67,19 @@ Class SWWMHangingKeen : Actor { Spawn("SWWMDroppedKeen",Vec3Offset(0,0,8)); } + override bool Used( Actor user ) + { + // test vertical range + Vector3 diff = level.Vec3Diff(user.Vec3Offset(0,0,user.Height/2),Vec3Offset(0,0,Height/2)); + double rang = user.player?PlayerPawn(user.player.mo).UseRange:(user.Height/2); + if ( abs(diff.z) > rang ) return false; + if ( Health > 0 ) + { + DamageMobj(user,user,Health,'Untie',DMG_FORCED|DMG_THRUSTLESS); + return true; + } + return false; + } Default { Tag "$FN_KEEN"; @@ -1098,6 +1111,7 @@ Class SWWMPickupFlash : Actor Default { RenderStyle "Add"; + Args 0,3,2,1; +NOGRAVITY; +NOBLOCKMAP; +DONTSPLASH; @@ -1106,10 +1120,15 @@ Class SWWMPickupFlash : Actor +NOINTERACTION; +FORCEXYBILLBOARD; } + override void PostBeginPlay() + { + Super.PostBeginPlay(); + frame = Args[0]; + } States { Spawn: - BLPF A 1 Bright NoDelay + BLPF # 1 Bright NoDelay { // offset up SetOrigin(Vec3Offset(0,0,16),false); @@ -1123,16 +1142,65 @@ Class SWWMPickupFlash : Actor Vector3 pvel = (FRandom[ExploS](-1,1),FRandom[ExploS](-1,1),FRandom[ExploS](-1,1)).unit()*FRandom[ExploS](.3,8); let s = Spawn("SWWMSmallSmoke",pos); s.vel = pvel; - s.SetShade(Color(3,2,1)*Random[ExploS](64,85)); + s.SetShade(Color(Args[1],Args[2],Args[3])*Random[ExploS](64,85)); s.A_SetRenderStyle(s.alpha,STYLE_AddShaded); s.scale *= 3.; s.alpha *= .5; } } - BLPF A 1 Bright A_FadeOut(.2); + BLPF # 1 Bright A_FadeOut(.2); Wait; } } +Class SWWMPinkPickupFlash : SWWMPickupFlash +{ + Default + { + Args 1,3,1,2; + } +} +Class SWWMCyanPickupFlash : SWWMPickupFlash +{ + Default + { + Args 2,1,2,3; + } +} +Class SWWMGreenPickupFlash : SWWMPickupFlash +{ + Default + { + Args 3,1,3,1; + } +} +Class SWWMBluePickupFlash : SWWMPickupFlash +{ + Default + { + Args 4,1,1,3; + } +} +Class SWWMPurplePickupFlash : SWWMPickupFlash +{ + Default + { + Args 5,2,1,3; + } +} +Class SWWMRedPickupFlash : SWWMPickupFlash +{ + Default + { + Args 6,3,1,1; + } +} +Class SWWMWhitePickupFlash : SWWMPickupFlash +{ + Default + { + Args 7,3,3,3; + } +} // Bullet trails from DT Class WaterHit diff --git a/zscript/swwm_funstuff.zsc b/zscript/swwm_funstuff.zsc index 82d22551a..d128ac002 100644 --- a/zscript/swwm_funstuff.zsc +++ b/zscript/swwm_funstuff.zsc @@ -24,7 +24,7 @@ Class SWWMCollectible : Inventory abstract Inventory.PickupSound "menu/buyinv"; Inventory.Amount 1; Inventory.MaxAmount 1; - Inventory.PickupFlash "SWWMPickupFlash"; + Inventory.PickupFlash "SWWMCyanPickupFlash"; SWWMCollectible.Availability AVAIL_All; +INVENTORY.UNTOSSABLE; +INVENTORY.UNDROPPABLE; diff --git a/zscript/swwm_inventory.zsc b/zscript/swwm_inventory.zsc index 149c79406..6a0dbbf41 100644 --- a/zscript/swwm_inventory.zsc +++ b/zscript/swwm_inventory.zsc @@ -247,7 +247,7 @@ Class SWWMSpareArmor : Inventory abstract +INVENTORY.AUTOACTIVATE; Inventory.MaxAmount 5; Inventory.InterHubAmount 5; - Inventory.PickupFlash "SWWMPickupFlash"; + Inventory.PickupFlash "SWWMGreenPickupFlash"; +FLOATBOB; FloatBobStrength 0.25; } @@ -390,7 +390,7 @@ Class SWWMHealth : Inventory abstract Inventory.MaxAmount 5; Inventory.InterHubAmount 5; Inventory.UseSound "misc/health_pkup"; - Inventory.PickupFlash "SWWMPickupFlash"; + Inventory.PickupFlash "SWWMBluePickupFlash"; +FLOATBOB; FloatBobStrength 0.25; } @@ -1467,7 +1467,7 @@ Class SWWMWeapon : Weapon abstract Weapon.YAdjust 0; Weapon.SlotPriority 1.; Inventory.RestrictedTo "Demolitionist"; - Inventory.PickupFlash "SWWMPickupFlash"; + Inventory.PickupFlash "SWWMRedPickupFlash"; +INVENTORY.IGNORESKILL; +WEAPON.NOALERT; +WEAPON.NODEATHINPUT; diff --git a/zscript/swwm_jackhammer.zsc b/zscript/swwm_jackhammer.zsc index 420211be0..1e9b93e8a 100644 --- a/zscript/swwm_jackhammer.zsc +++ b/zscript/swwm_jackhammer.zsc @@ -320,7 +320,7 @@ Class PusherProjectile : Actor } else toucher.A_StartSound("misc/w_pkup",CHAN_ITEM,CHANF_MAYBE_LOCAL); toucher.A_SelectWeapon("PusherWeapon"); - Spawn("SWWMPickupFlash",pos); + Spawn("SWWMRedPickupFlash",pos); Destroy(); } override bool Used( Actor user ) diff --git a/zscript/swwm_keys.zsc b/zscript/swwm_keys.zsc index f15dabfa1..75e2bd9b5 100644 --- a/zscript/swwm_keys.zsc +++ b/zscript/swwm_keys.zsc @@ -33,6 +33,7 @@ Class SWWMRedCard : SWWMKey Tag "$T_REDCARD"; Species "RedCard"; Inventory.PickupMessage "$T_REDCARD"; + Inventory.PickupFlash "SWWMRedPickupFlash"; Radius 10; Height 25; } @@ -50,6 +51,7 @@ Class SWWMYellowCard : SWWMKey Tag "$T_YELLOWCARD"; Species "YellowCard"; Inventory.PickupMessage "$T_YELLOWCARD"; + Inventory.PickupFlash "SWWMPickupFlash"; Radius 10; Height 25; } @@ -67,6 +69,7 @@ Class SWWMBlueCard : SWWMKey Tag "$T_BLUECARD"; Species "BlueCard"; Inventory.PickupMessage "$T_BLUECARD"; + Inventory.PickupFlash "SWWMBluePickupFlash"; Radius 10; Height 25; } @@ -84,6 +87,7 @@ Class SWWMSilverCardKDiZD : SWWMKey Tag "$T_SILVERCARD"; Species "BlueSkull"; Inventory.PickupMessage "$T_SILVERCARD"; + Inventory.PickupFlash "SWWMWhitePickupFlash"; Radius 10; Height 25; } @@ -101,6 +105,7 @@ Class SWWMGreenCardKDiZD : SWWMKey Tag "$T_GREENCARD"; Species "YellowSkull"; Inventory.PickupMessage "$T_GREENCARD"; + Inventory.PickupFlash "SWWMGreenPickupFlash"; Radius 10; Height 25; } @@ -118,6 +123,7 @@ Class SWWMOrangeCardKDiZD : SWWMKey Tag "$T_ORANGECARD"; Species "RedSkull"; Inventory.PickupMessage "$T_ORANGECARD"; + Inventory.PickupFlash "SWWMPickupFlash"; Radius 10; Height 25; } @@ -135,6 +141,7 @@ Class SWWMGreenCard : SWWMKey Tag "$T_GREENCARD"; Species "GreenCard"; Inventory.PickupMessage "$T_GREENCARD"; + Inventory.PickupFlash "SWWMGreenPickupFlash"; Radius 10; Height 25; } @@ -154,6 +161,7 @@ Class SWWMRedSkull : SWWMKey Tag "$T_REDSKULL"; Species "RedSkull"; Inventory.PickupMessage "$T_REDSKULL"; + Inventory.PickupFlash "SWWMRedPickupFlash"; Radius 10; Height 25; } @@ -171,6 +179,7 @@ Class SWWMBlueSkull : SWWMKey Tag "$T_BLUESKULL"; Species "BlueSkull"; Inventory.PickupMessage "$T_BLUESKULL"; + Inventory.PickupFlash "SWWMBluePickupFlash"; Radius 10; Height 25; } @@ -188,6 +197,7 @@ Class SWWMYellowSkull : SWWMKey Tag "$T_YELLOWSKULL"; Species "YellowSkull"; Inventory.PickupMessage "$T_YELLOWSKULL"; + Inventory.PickupFlash "SWWMPickupFlash"; Radius 10; Height 25; } @@ -206,6 +216,7 @@ Class SWWMKeyGreen : SWWMKey Tag "$T_KEYGREEN"; Species "KeyGreen"; Inventory.PickupMessage "$T_KEYGREEN"; + Inventory.PickupFlash "SWWMGreenPickupFlash"; Radius 10; Height 25; } @@ -223,6 +234,7 @@ Class SWWMKeyBlue : SWWMKey Tag "$T_KEYBLUE"; Species "KeyBlue"; Inventory.PickupMessage "$T_KEYBLUE"; + Inventory.PickupFlash "SWWMBluePickupFlash"; Radius 10; Height 25; } @@ -240,6 +252,7 @@ Class SWWMKeyYellow : SWWMKey Tag "$T_KEYYELLOW"; Species "KeyYellow"; Inventory.PickupMessage "$T_KEYYELLOW"; + Inventory.PickupFlash "SWWMPickupFlash"; Radius 10; Height 25; } @@ -257,6 +270,7 @@ Class SWWMKeyRed : SWWMKey Tag "$T_KEYRED"; Species "KeyRed"; Inventory.PickupMessage "$T_KEYRED"; + Inventory.PickupFlash "SWWMRedPickupFlash"; Radius 10; Height 25; } diff --git a/zscript/swwm_powerup.zsc b/zscript/swwm_powerup.zsc index 528f97bfd..601c96c6c 100644 --- a/zscript/swwm_powerup.zsc +++ b/zscript/swwm_powerup.zsc @@ -187,7 +187,7 @@ Class GrilledCheeseSandwich : Inventory Inventory.PickupMessage "$T_SANDWICH"; Inventory.MaxAmount 5; Inventory.InterHubAmount 5; - Inventory.PickupFlash "SWWMPickupFlash"; + Inventory.PickupFlash "SWWMPurplePickupFlash"; +INVENTORY.ALWAYSPICKUP; +INVENTORY.AUTOACTIVATE; +INVENTORY.INVBAR; @@ -348,7 +348,7 @@ Class GhostArtifact : Inventory Inventory.PickupMessage "$T_GHOSTARTI"; Inventory.MaxAmount 5; Inventory.InterHubAmount 5; - Inventory.PickupFlash "SWWMPickupFlash"; + Inventory.PickupFlash "SWWMPurplePickupFlash"; +INVENTORY.ALWAYSPICKUP; +INVENTORY.AUTOACTIVATE; +INVENTORY.INVBAR; @@ -516,7 +516,7 @@ Class GravitySuppressor : Inventory Inventory.PickupMessage "$T_GRAVITYS"; Inventory.MaxAmount 5; Inventory.InterHubAmount 5; - Inventory.PickupFlash "SWWMPickupFlash"; + Inventory.PickupFlash "SWWMPurplePickupFlash"; +INVENTORY.ALWAYSPICKUP; +INVENTORY.AUTOACTIVATE; +INVENTORY.INVBAR; @@ -745,7 +745,7 @@ Class FuckingInvinciball : Inventory Inventory.PickupMessage "$T_INVINCIBALL"; Inventory.MaxAmount 5; Inventory.InterHubAmount 5; - Inventory.PickupFlash "SWWMPickupFlash"; + Inventory.PickupFlash "SWWMPurplePickupFlash"; +INVENTORY.ALWAYSPICKUP; +INVENTORY.AUTOACTIVATE; +INVENTORY.INVBAR; @@ -1011,7 +1011,7 @@ Class Ragekit : Inventory Inventory.PickupMessage "$T_RAGEKIT"; Inventory.MaxAmount 5; Inventory.InterHubAmount 5; - Inventory.PickupFlash "SWWMPickupFlash"; + Inventory.PickupFlash "SWWMPurplePickupFlash"; +INVENTORY.ALWAYSPICKUP; +INVENTORY.AUTOACTIVATE; +INVENTORY.INVBAR; @@ -1053,7 +1053,7 @@ Class Omnisight : Inventory Inventory.MaxAmount 1; Inventory.InterHubAmount 0; Inventory.RestrictedTo "Demolitionist"; - Inventory.PickupFlash "SWWMPickupFlash"; + Inventory.PickupFlash "SWWMPurplePickupFlash"; +INVENTORY.ALWAYSPICKUP; +INVENTORY.AUTOACTIVATE; +COUNTITEM; @@ -1714,7 +1714,7 @@ Class SWWMLamp : Inventory Inventory.Amount 1; Inventory.MaxAmount 5; Inventory.InterHubAmount 5; - Inventory.PickupFlash "SWWMPickupFlash"; + Inventory.PickupFlash "SWWMPurplePickupFlash"; +INVENTORY.ALWAYSPICKUP; +INVENTORY.AUTOACTIVATE; +INVENTORY.INVBAR; @@ -1876,7 +1876,7 @@ Class EBarrier : Inventory Inventory.PickupMessage "$T_BARRIER"; Inventory.MaxAmount 5; Inventory.InterHubAmount 5; - Inventory.PickupFlash "SWWMPickupFlash"; + Inventory.PickupFlash "SWWMPurplePickupFlash"; +INVENTORY.ALWAYSPICKUP; +INVENTORY.AUTOACTIVATE; +INVENTORY.INVBAR;