OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

"last kill/item/secret" bonuses only trigger once per map.

Browse source
This commit is contained in:
Mari the Deer 2020-03-14 19:57:11 +01:00
commit 0b3cc1b0f4
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
zscript/swwm_common.zsc
View file

@ -1392,6 +1392,7 @@ Class SWWMHandler : EventHandler
int lastkill[MAXPLAYERS];
int multilevel[MAXPLAYERS];
int lastitemcount[MAXPLAYERS];
bool allkills, allitems, allsecrets;
transient CVar mutevoice;
transient ui CVar useshaders;
@ -1725,9 +1726,10 @@ Class SWWMHandler : EventHandler
if ( players[i].itemcount > lastitemcount[i] )
{
int score = 25*(players[i].itemcount-lastitemcount[i]);
if ( level.total_items == level.found_items )
if ( (level.total_items == level.found_items) && !allitems )
{
Console.Printf(StringTable.Localize("$SWWM_LASTITEM"),players[i].GetUserName(),2000);
allitems = true;
Console.Printf(StringTable.Localize("$SWWM_LASTITEM"),players[i].GetUserName(),2500);
score += 2475;
}
SWWMCredits.Give(players[i],score);
@ -1914,8 +1916,9 @@ Class SWWMHandler : EventHandler
SWWMCredits.Give(e.DamageSource.player,score);
if ( e.DamageSource.player == players[consoleplayer] )
SWWMScoreObj.Spawn(score,e.Thing.Vec3Offset(0,0,e.Thing.Height/2));
if ( level.killed_monsters+1 == level.total_monsters )
if ( (level.killed_monsters+1 == level.total_monsters) && !allkills )
{
allkills = true;
SWWMCredits.Give(e.DamageSource.player,5000);
Console.Printf(StringTable.Localize("$SWWM_LASTMONSTER"),e.DamageSource.player.GetUserName(),5000);
}

4
zscript/swwm_player.zsc
View file

@ -1082,8 +1082,10 @@ Class Demolitionist : PlayerPawn
if ( !player ) return false;
int score = 500;
// last secret (this is called before counting it up, so have to subtract)
if ( level.found_secrets == level.total_secrets-1 )
let hnd = SWWMHandler(EventHandler.Find("SWWMHandler"));
if ( (level.found_secrets == level.total_secrets-1) && (!hnd || !hnd.allsecrets) )
{
if ( hnd ) hnd.allsecrets = true;
score = 5000;
Console.Printf(StringTable.Localize("$SWWM_LASTSECRET"),player.GetUserName(),score);
}