OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fixes for corner cases related to sell-only items.

Browse source
This commit is contained in:
Mari the Deer 2022-06-07 13:42:13 +02:00
commit eb2e023c58
8 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
zscript/items/swwm_armor.zsc
View file

@ -27,7 +27,7 @@ Class ArmorNuggetItem : SWWMSpareArmor
// sell excess
if ( !bUsed )
{
int sellprice = int(abs(Stamina)*.5);
int sellprice = abs(Stamina)/2;
SWWMScoreObj.Spawn(sellprice,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2));
SWWMCredits.Give(Owner.player,sellprice);
if ( Owner.player )

2
zscript/items/swwm_baseitem.zsc
View file

@ -15,7 +15,7 @@ Mixin Class SWWMAutoUseFix
// sell excess if there's a price
if ( !deathmatch && bALWAYSPICKUP && (Amount+item.Amount > MaxAmount) && (Stamina != 0) )
{
int sellprice = int(abs(Stamina)*.5);
int sellprice = abs(Stamina)/2;
SWWMScoreObj.Spawn(sellprice,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2));
SWWMCredits.Give(Owner.player,sellprice);
if ( Owner.player )

2
zscript/items/swwm_health.zsc
View file

@ -73,7 +73,7 @@ Class HealthNuggetItem : SWWMHealth
// sell excess
if ( !bUsed )
{
int sellprice = int(abs(Stamina)*.5);
int sellprice = abs(Stamina)/2;
SWWMScoreObj.Spawn(sellprice,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2));
SWWMCredits.Give(Owner.player,sellprice);
if ( Owner.player )

2
zscript/items/swwm_powerups.zsc
View file

@ -1896,7 +1896,7 @@ Class SWWMLamp : Inventory
if ( (Charge >= Default.Charge) && (Amount+item.Amount > MaxAmount) )
{
// sell excess
int sellprice = SWWMUtility.Round100(Stamina*.7);
int sellprice = SWWMUtility.Round100(abs(Stamina)*.7);
SWWMScoreObj.Spawn(sellprice,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2));
SWWMCredits.Give(Owner.player,sellprice);
if ( Owner.player )