OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Achievement system overhaul.

Browse source 
Continuin the menu rewrite.
This commit is contained in:
Mari the Deer 2021-09-20 19:22:42 +02:00
commit 8176b21b8c
53 changed files with 585 additions and 518 deletions
Download patch file Download diff file Expand all files Collapse all files

1
zscript/items/swwm_ammoitems.zsc
View file

@ -381,6 +381,7 @@ Class GoldShell : SWWMAmmo
//$Icon ammo
Tag "$T_GOLDSHELL";
SWWMAmmo.PickupTag "GOLDSHELL";
Inventory.PickupSound "misc/ammo_pkup_vip";
Stamina -1000000;
Inventory.Icon "graphics/HUD/Icons/A_ShellsGold.png";
Inventory.Amount 1;

2
zscript/items/swwm_armor.zsc
View file

@ -29,7 +29,7 @@ Class ArmorNuggetItem : SWWMSpareArmor
override void DoPickupSpecial( Actor toucher )
{
Super.DoPickupSpecial(toucher);
SWWMUtility.AchievementProgressInc('swwm_progress_candy',1,toucher.player);
SWWMUtility.AchievementProgressInc("candy",1,toucher.player);
}
Default

2
zscript/items/swwm_collectibles.zsc
View file

@ -86,7 +86,7 @@ Class SWWMCollectible : Inventory abstract
if ( !(i is 'SWWMCollectible') ) continue;
cnc++;
}
SWWMUtility.AchievementProgress('swwm_progress_allcoll',cnc,other.player);
SWWMUtility.AchievementProgress("allcoll",cnc,other.player);
// we're only attaching to the other players
if ( propagated ) return;
// give credit

4
zscript/items/swwm_health.zsc
View file

@ -74,7 +74,7 @@ Class HealthNuggetItem : SWWMHealth
override void DoPickupSpecial( Actor toucher )
{
Super.DoPickupSpecial(toucher);
SWWMUtility.AchievementProgressInc('swwm_progress_candy',1,toucher.player);
SWWMUtility.AchievementProgressInc("candy",1,toucher.player);
}
Default
{
@ -179,7 +179,7 @@ Class RefresherItem : SWWMHealth
}
override void AutoUseExtra( bool recursive )
{
SWWMUtility.AchievementProgressInc('swwm_progress_refresh',1,Owner.player);
SWWMUtility.AchievementProgressInc("refresh",1,Owner.player);
// regen effect doesn't stack if we autoactivated recursively
if ( recursive ) return;
let p = Powerup(Owner.FindInventory("RefresherRegen"));

26
zscript/items/swwm_powerups.zsc
View file

@ -38,7 +38,7 @@ Class GrilledCheeseSandwich : Inventory
}
void DoTheThing( bool extrasafe = false )
{
SWWMUtility.AchievementProgressInc('swwm_progress_gcsandwich',1,Owner.player);
SWWMUtility.AchievementProgressInc("gcsandwich",1,Owner.player);
SWWMHandler.DoFlash(Owner,Color(64,255,255,64),10);
Owner.A_QuakeEx(9,9,9,3,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.);
Owner.GiveBody(1000,1000);
@ -204,7 +204,7 @@ Class GrilledCheeseSandwich : Inventory
override void PostTeleport( Vector3 destpos, double destangle, int flags )
{
if ( !lastdropper ) return;
SWWMUtility.MarkAchievement('swwm_achievement_tele',lastdropper.player);
SWWMUtility.MarkAchievement("tele",lastdropper.player);
}
Default
@ -504,7 +504,7 @@ Class GhostArtifact : Inventory
Demolitionist(Owner).lastbump *= 1.04;
}
else Owner.GiveInventory("GhostPower",1);
SWWMUtility.AchievementProgressInc('swwm_progress_ghost',1,Owner.player);
SWWMUtility.AchievementProgressInc("ghost",1,Owner.player);
return true;
}
@ -658,7 +658,7 @@ Class GravitySuppressor : Inventory
Demolitionist(Owner).lastbump *= 1.04;
}
else Owner.GiveInventory("GravityPower",1);
SWWMUtility.AchievementProgressInc('swwm_progress_gravity',1,Owner.player);
SWWMUtility.AchievementProgressInc("gravity",1,Owner.player);
return true;
}
override void Travelled()
@ -908,7 +908,7 @@ Class FuckingInvinciball : Inventory
Demolitionist(Owner).lastbump *= 1.1;
}
else Owner.GiveInventory("InvinciballPower",1);
SWWMUtility.AchievementProgressInc('swwm_progress_sunny',1,Owner.player);
SWWMUtility.AchievementProgressInc("sunny",1,Owner.player);
return true;
}
override void Travelled()
@ -1183,7 +1183,7 @@ Class Ragekit : Inventory
if ( pickup && ((Owner.player == players[consoleplayer]) || bBigPowerup) ) Owner.A_StartSound(UseSound,CHAN_ITEMEXTRA);
if ( Owner.GiveBody(100,100) )
SWWMScoreObj.Spawn(100,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2),ST_Health);
SWWMUtility.AchievementProgressInc('swwm_progress_rage',1,Owner.player);
SWWMUtility.AchievementProgressInc("rage",1,Owner.player);
if ( !(Owner is 'Demolitionist') )
{
SWWMHandler.DoFlash(Owner,Color(64,255,0,0),30);
@ -1711,7 +1711,7 @@ Class CompanionLamp : Actor
m.lamp = self;
m.trail = m.pos;
moff.Push(m);
SWWMUtility.AchievementProgressInc('swwm_progress_moth',1,parent.player);
SWWMUtility.AchievementProgressInc("moth",1,parent.player);
}
override void PostBeginPlay()
{
@ -2184,7 +2184,7 @@ Class EBarrier : Inventory
Demolitionist(Owner).lastbump *= 0.95;
}
else Owner.GiveInventory("BarrierPower",1);
SWWMUtility.AchievementProgressInc('swwm_progress_barrier',1,Owner.player);
SWWMUtility.AchievementProgressInc("barrier",1,Owner.player);
return true;
}
override void Travelled()
@ -2851,14 +2851,14 @@ Class Mykradvo : Inventory
return true;
}
if ( (targets.Size() == 1) && targets[0] && !targets[0].bBOSS )
SWWMUtility.MarkAchievement('swwm_achievement_anone',Owner.player);
SWWMUtility.MarkAchievement("anone",Owner.player);
let p = Spawn("MykradvoBurst",spawnpos);
p.target = Owner;
MykradvoBurst(p).targets.Move(targets);
targets.Clear();
if ( Owner is 'Demolitionist' )
Demolitionist(Owner).lastbump *= 1.2;
SWWMUtility.AchievementProgressInc('swwm_progress_anom',1,Owner.player);
SWWMUtility.AchievementProgressInc("anom",1,Owner.player);
return true;
}
@ -3111,7 +3111,7 @@ Class SafetyTether : Inventory
SWWMHandler.DoFlash(Owner,Color(255,128,192,255),30);
if ( Owner.GiveBody(100,100) )
SWWMScoreObj.Spawn(100,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2),ST_Health);
SWWMUtility.AchievementProgressInc('swwm_progress_sneaky',1,Owner.player);
SWWMUtility.AchievementProgressInc("sneaky",1,Owner.player);
Amount--;
if ( Amount <= 0 ) DepleteOrDestroy();
}
@ -3316,7 +3316,7 @@ Class AngerySigil : Inventory
{
if ( pickup && !deathmatch ) return false;
if ( pickup && ((Owner.player == players[consoleplayer]) || bBigPowerup) ) Owner.A_StartSound(UseSound,CHAN_ITEMEXTRA,CHANF_OVERLAP);
SWWMUtility.AchievementProgressInc('swwm_progress_deva',1,Owner.player);
SWWMUtility.AchievementProgressInc("deva",1,Owner.player);
let r = AngeryPower(Owner.FindInventory("AngeryPower"));
if ( r )
{
@ -3593,7 +3593,7 @@ Class DivineSprite : Inventory
if ( p ) return false;
if ( pickup && ((Owner.player == players[consoleplayer]) || bBigPowerup) ) Owner.A_StartSound(UseSound,CHAN_ITEMEXTRA,CHANF_OVERLAP);
Owner.GiveInventory("DivineSpriteEffect",1);
SWWMUtility.AchievementProgressInc('swwm_progress_divine',1,Owner.player);
SWWMUtility.AchievementProgressInc("divine",1,Owner.player);
return true;
}
override void Travelled()