OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Additional voicelines (incomplete).

Browse source
This commit is contained in:
Mari the Deer 2022-03-29 22:35:06 +02:00
commit e9cb1005ac
43 changed files with 155 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
zscript/items/swwm_powerups.zsc
View file

@ -87,6 +87,8 @@ Class GrilledCheeseSandwich : Inventory
if ( pickup && !deathmatch ) return false;
if ( Owner.Health > 500 ) return false;
if ( pickup && ((Owner.player == players[consoleplayer]) || bBigPowerup) ) Owner.A_StartSound(UseSound,CHAN_ITEMEXTRA,CHANF_OVERLAP);
if ( (Owner.player == players[consoleplayer]) && (swwm_mutevoice < 2) )
SWWMHandler.AddOneliner("eat",2);
DoTheThing();
return true;
}

3
zscript/swwm_gesture_fx.zsc
View file

@ -579,7 +579,8 @@ Class HeadpatTracker : Actor
Demolitionist(patter).scriptedinvul = true;
target.bDORMANT = true;
if ( SWWMUtility.IdentifyingDog(target) ) SWWMUtility.MarkAchievement("mbf",user.player);
if ( SWWMHDoomHandler.IsCuteGirl(target) || SWWMHDoomHandler.IsStaticSexyTime(target) ) SWWMHandler.AddOneliner("pethdoom",2,40);
else if ( SWWMUtility.IdentifyingCaco(target) ) SWWMHandler.AddOneliner("petcaco",2,20);
else if ( SWWMHDoomHandler.IsCuteGirl(target) || SWWMHDoomHandler.IsStaticSexyTime(target) ) SWWMHandler.AddOneliner("pethdoom",2,40);
else if ( SWWMHDoomHandler.IsSexyTime(target) ) SWWMHandler.AddOneliner("pethdoomfinish",2,80);
return true;
}

15
zscript/swwm_player.zsc
View file

@ -2729,7 +2729,14 @@ Class Demolitionist : PlayerPawn
Console.Printf(StringTable.Localize("$SWWM_FINDKEY"),player.GetUserName(),item.GetTag(),score);
SWWMCredits.Give(player,score);
SWWMScoreObj.Spawn(100,player.mo.Vec3Offset(0,0,Height/2));
SWWMHandler.AddOneliner("keyget",2);
if ( !Random[DemoLines](0,5) &&
((item.GetClass() == 'RedSkull') || (item.GetClass() == 'YellowSkull')
|| (item.GetClass() == 'BlueSkull') || (item.GetClassName() == "PurpleSkull")) )
{
if ( !SWWMHandler.AddOneliner("skullget",2) )
SWWMHandler.AddOneliner("keyget",2);
}
else SWWMHandler.AddOneliner("keyget",2);
// share all keys in mp
for ( int i=0; i<MAXPLAYERS; i++ )
{
@ -2751,6 +2758,12 @@ Class Demolitionist : PlayerPawn
if ( (mystats.ownedcollectibles.Size() > 0) && (mystats.ownedcollectibles.Find(cls) < mystats.ownedcollectibles.Size()) ) return;
mystats.ownedcollectibles.Push(cls);
}
// yorick
if ( item is 'PuzzSkull' && mystats && !mystats.gotyorick )
{
mystats.gotyorick = true;
SWWMHandler.AddOneliner("skullget",2);
}
}
override bool UseInventory( Inventory item )
{

1
zscript/swwm_thinkers_player.zsc
View file

@ -136,6 +136,7 @@ Class SWWMStats : Thinker
// easter eggs
int silveregg;
bool oldcheat;
bool gotyorick;
bool GotWeapon( Class<Weapon> which )
{