OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Moth plushy added. All other planned collectibles discarded.

Browse source
This commit is contained in:
Mari the Deer 2021-09-17 18:57:22 +02:00
commit 8a657e4272
38 changed files with 116 additions and 1219 deletions
Download patch file Download diff file Expand all files Collapse all files

101
zscript/items/swwm_collectibles.zsc
View file

@ -191,7 +191,21 @@ Class SayaBean : SWWMCollectible
Class MothPlushy : SWWMCollectible
{
bool activated; // she knows where you are
bool present; // she's here (TBD 1.4)
bool present; // she's here (TBD 1.5)
int gigglecnt, uses;
override void DoEffect()
{
Super.DoEffect();
if ( gigglecnt > 0 )
{
gigglecnt--;
if ( gigglecnt == 30 )
A_StartSound("mashiro/appear",CHAN_VOICE,CHANF_UI|CHANF_NOSTOP|CHANF_OVERLAP,1.,0.);
if ( gigglecnt == 0 )
Console.MidPrint(smallfont,StringTable.Localize("$D_MASHIRO"),true);
}
}
Default
{
@ -199,56 +213,8 @@ Class MothPlushy : SWWMCollectible
Inventory.PickupMessage "$T_MOTHPLUSH";
SWWMCollectible.GestureWeapon "MothPlushyGesture";
Stamina 7000;
}
}
Class AA12Model : SWWMCollectible
{
Default
{
Tag "$T_AA12";
Inventory.PickupMessage "$T_AA12";
SWWMCollectible.GestureWeapon "AA12ModelGesture";
Stamina 10000;
}
}
Class CactusHege : SWWMCollectible
{
Default
{
Tag "$T_HEGE";
Inventory.PickupMessage "$T_HEGE";
SWWMCollectible.GestureWeapon "CactusHegeGesture";
Stamina 3000;
}
}
Class TastyHoagie : SWWMCollectible
{
Default
{
Tag "$T_HOAGIE";
Inventory.PickupMessage "$T_HOAGIE";
SWWMCollectible.GestureWeapon "TastyHoagieGesture";
Stamina 2000;
}
}
Class IbukiMilk : SWWMCollectible
{
Default
{
Tag "$T_IBUKIMILK";
Inventory.PickupMessage "$T_IBUKIMILK";
SWWMCollectible.GestureWeapon "IbukiMilkGesture";
Stamina 800;
}
}
Class BRCAlbum : SWWMCollectible
{
Default
{
Tag "$T_BRCALBUM";
Inventory.PickupMessage "$T_BRCALBUM";
SWWMCollectible.GestureWeapon "BRCAlbumGesture";
Stamina 4000;
Radius 12;
Height 32;
}
}
// Heretic
@ -265,28 +231,6 @@ Class DemoPlush : SWWMCollectible
Height 36;
}
}
Class Manarokou : SWWMCollectible
{
Default
{
Tag "$T_MANAROKOU";
Inventory.PickupMessage "$T_MANAROKOU";
SWWMCollectible.Availability AVAIL_Heretic;
SWWMCollectible.GestureWeapon "ManarokouGesture";
Stamina 9000;
}
}
Class LithiumNovel : SWWMCollectible
{
Default
{
Tag "$T_LITHIUM";
Inventory.PickupMessage "$T_LITHIUM";
SWWMCollectible.Availability AVAIL_Heretic;
SWWMCollectible.GestureWeapon "LithiumNovelGesture";
Stamina 2000;
}
}
// Hexen
Class KirinCummies : SWWMCollectible
{
@ -340,14 +284,3 @@ Class KirinPlush : SWWMCollectible
Height 37;
}
}
Class Psykkonovexx : SWWMCollectible
{
Default
{
Tag "$T_PSYKKONOVEXX";
Inventory.PickupMessage "$T_PSYKKONOVEXX";
SWWMCollectible.Availability AVAIL_Hexen;
SWWMCollectible.GestureWeapon "PsykkonovexxGesture";
Stamina 15000;
}
}

40
zscript/items/swwm_collectibles_gesture.zsc
View file

@ -145,12 +145,37 @@ Class SayaBeanGesture : SWWMItemGesture
Stop;
}
}
Class MothPlushyGesture : SWWMItemGesture {}
Class AA12ModelGesture : SWWMItemGesture {}
Class CactusHegeGesture : SWWMItemGesture {}
Class TastyHoagieGesture : SWWMItemGesture {}
Class IbukiMilkGesture : SWWMItemGesture {}
Class BRCAlbumGesture : SWWMItemGesture {}
Class MothPlushyGesture : SWWMItemGesture
{
action void A_MothCheck()
{
let realmoth = MothPlushy(FindInventory("MothPlushy"));
if ( !realmoth || realmoth.activated ) return;
realmoth.uses = min(10,realmoth.uses+1);
if ( (realmoth.uses > 1) && !Random[Gesture](0,12-realmoth.uses) )
{
realmoth.activated = true;
realmoth.gigglecnt = 90;
}
}
States
{
Fire:
XZW1 A 3;
XZW1 B 3 A_StartSound("demolitionist/handsup",CHAN_WEAPON,CHANF_OVERLAP);
XZW1 CDEFGH 3;
XZW1 IJKLM 3;
XZW1 NO 4;
XZW1 P 4 A_MothCheck();
XZW1 QRSTUV 4;
XZW1 W 3;
XZW1 X 3 A_StartSound("demolitionist/handsdown",CHAN_WEAPON,CHANF_OVERLAP);
XZW1 YZ 3;
XZW2 ABCD 3;
XZW1 A -1 A_FinishGesture();
Stop;
}
}
Class DemoPlushGesture : SWWMItemGesture
{
States
@ -169,8 +194,6 @@ Class DemoPlushGesture : SWWMItemGesture
Stop;
}
}
Class ManarokouGesture : SWWMItemGesture {}
Class LithiumNovelGesture : SWWMItemGesture {}
Class KirinCummiesGesture : SWWMItemGesture
{
States
@ -323,4 +346,3 @@ Class KirinPlushGesture : SWWMItemGesture
Stop;
}
}
Class PsykkonovexxGesture : SWWMItemGesture {}