OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Moth plushy pushed to post-release update, replaced by generic cube.

Browse source 
Added lore entries for post-release collectibles.
Fix incorrect scaling of Demolitionist sprites in Doom 2 cast sequence.
This commit is contained in:
Mari the Deer 2021-01-29 17:21:19 +01:00
commit 37a05c0db2
32 changed files with 495 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

34
zscript/swwm_funstuff.zsc
View file

@ -298,36 +298,14 @@ Class FroggyChair : Actor
}
// The collectibles
Class MothPlushy : SWWMCollectible
Class GenericCube : SWWMCollectible
{
// TODO post-release :: 1/64 chance after 5th use, set countdown to 175 to activate contract
int usetimes;
int cdown;
bool mashiro; // contract with white lady is active
override void DoEffect()
{
Super.DoEffect();
if ( cdown > 0 )
{
if ( Owner && Owner.CheckLocalView() )
{
if ( cdown == 105 )
A_StartSound("mashiro/appear",CHAN_ITEMEXTRA,CHANF_OVERLAP|CHANF_UI,1.,0.);
else if ( cdown == 35 )
Console.MidPrint(newsmallfont,"$D_MASHIRO");
}
cdown--;
if ( cdown <= 0 ) mashiro = true;
}
}
Default
{
Tag "$T_MOTHPLUSH";
Inventory.PickupMessage "$T_MOTHPLUSH";
SWWMCollectible.GestureWeapon "MothPlushyGesture";
Stamina 4000;
Tag "$T_PERFECTLYGENERIC";
Inventory.PickupMessage "$T_PERFECTLYGENERIC";
SWWMCollectible.GestureWeapon "GenericCubeGesture";
Stamina 1000;
}
}
Class AkariProject : SWWMCollectible
@ -461,7 +439,7 @@ Class KirinPlush : SWWMCollectible
}
// TODO them gestures
Class MothPlushyGesture : SWWMItemGesture {}
Class GenericCubeGesture : SWWMItemGesture {}
Class AkariProjectGesture : SWWMItemGesture {}
Class LoveSignalsCDGesture : SWWMItemGesture {}
Class NutatcoBarGesture : SWWMItemGesture {}

4
zscript/swwm_powerup.zsc
View file

@ -1467,8 +1467,8 @@ Class CompanionLamp : Actor
Vector3 spawnpos = level.Vec3Offset(Vec3Offset(0,0,height/2),ofs);
if ( !level.IsPointInLevel(spawnpos) ) return;
// higher chance of white moths if carrying the Mashiro plush
int mchance = parent.FindInventory("MothPlushy")?3:9;
let m = LampMoth(Spawn(Random[Moth](0,mchance)?"LampMoth":"LampMoth2",spawnpos));
//int mchance = parent.FindInventory("MothPlushy")?3:9;
let m = LampMoth(Spawn(Random[Moth](0,9)?"LampMoth":"LampMoth2",spawnpos));
if ( !m.TestMobjLocation() )
{
m.Destroy();