mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-28 12:30:46 +00:00
- skill stuff for Exhumed.
Just for fun. ;)
This commit is contained in:
parent
ce87e18f90
commit
d31fe01b6d
13 changed files with 15 additions and 13 deletions
|
@ -515,6 +515,8 @@ void FuncWasp(int eax, int edx, int nRun);
|
||||||
|
|
||||||
enum { kMessageMask = 0x7F0000 };
|
enum { kMessageMask = 0x7F0000 };
|
||||||
inline int GrabTimeSlot(int nVal) { return -1; }
|
inline int GrabTimeSlot(int nVal) { return -1; }
|
||||||
|
inline int dmgAdjust(int dmg, int fact = 2) { return dmg; }
|
||||||
|
inline bool easy() { return false; }
|
||||||
|
|
||||||
END_PS_NS
|
END_PS_NS
|
||||||
|
|
||||||
|
|
|
@ -434,7 +434,7 @@ void FuncAnubis(int a, int nDamage, int nRun)
|
||||||
if (ap->nHealth <= 0)
|
if (ap->nHealth <= 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ap->nHealth -= nDamage;
|
ap->nHealth -= dmgAdjust(nDamage);
|
||||||
|
|
||||||
if (ap->nHealth > 0)
|
if (ap->nHealth > 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -357,7 +357,7 @@ void FuncFish(int a, int nDamage, int nRun)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
FishList[nFish].nHealth -= nDamage;
|
FishList[nFish].nHealth -= dmgAdjust(nDamage);
|
||||||
if (FishList[nFish].nHealth <= 0)
|
if (FishList[nFish].nHealth <= 0)
|
||||||
{
|
{
|
||||||
FishList[nFish].nHealth = 0;
|
FishList[nFish].nHealth = 0;
|
||||||
|
|
|
@ -247,7 +247,7 @@ void FuncLava(int a, int nDamage, int nRun)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
LavaList[nLava].nHealth -= nDamage;
|
LavaList[nLava].nHealth -= dmgAdjust(nDamage, 3);
|
||||||
|
|
||||||
if (LavaList[nLava].nHealth <= 0)
|
if (LavaList[nLava].nHealth <= 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -175,7 +175,7 @@ void FuncLion(int a, int nDamage, int nRun)
|
||||||
{
|
{
|
||||||
if (nDamage && LionList[nLion].nHealth > 0)
|
if (nDamage && LionList[nLion].nHealth > 0)
|
||||||
{
|
{
|
||||||
LionList[nLion].nHealth -= nDamage;
|
LionList[nLion].nHealth -= dmgAdjust(nDamage);
|
||||||
if (LionList[nLion].nHealth <= 0)
|
if (LionList[nLion].nHealth <= 0)
|
||||||
{
|
{
|
||||||
// R.I.P.
|
// R.I.P.
|
||||||
|
@ -296,7 +296,7 @@ void FuncLion(int a, int nDamage, int nRun)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nAction)
|
if (nAction && !easy())
|
||||||
{
|
{
|
||||||
LionList[nLion].nCount--;
|
LionList[nLion].nCount--;
|
||||||
if (LionList[nLion].nCount <= 0)
|
if (LionList[nLion].nCount <= 0)
|
||||||
|
|
|
@ -498,7 +498,7 @@ void FuncMummy(int a, int nDamage, int nRun)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
MummyList[nMummy].nHealth -= nDamage;
|
MummyList[nMummy].nHealth -= dmgAdjust(nDamage);
|
||||||
|
|
||||||
if (MummyList[nMummy].nHealth <= 0)
|
if (MummyList[nMummy].nHealth <= 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1500,7 +1500,7 @@ void FuncQueen(int a, int nDamage, int nRun)
|
||||||
{
|
{
|
||||||
if (QueenList[nQueen].nHealth > 0)
|
if (QueenList[nQueen].nHealth > 0)
|
||||||
{
|
{
|
||||||
QueenList[nQueen].nHealth -= nDamage;
|
QueenList[nQueen].nHealth -= dmgAdjust(nDamage);
|
||||||
|
|
||||||
if (QueenList[nQueen].nHealth <= 0)
|
if (QueenList[nQueen].nHealth <= 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -179,7 +179,7 @@ void FuncRex(int a, int nDamage, int nRun)
|
||||||
|
|
||||||
if (RexList[nRex].nAction == 5 && RexList[nRex].nHealth > 0)
|
if (RexList[nRex].nAction == 5 && RexList[nRex].nHealth > 0)
|
||||||
{
|
{
|
||||||
RexList[nRex].nHealth -= nDamage;
|
RexList[nRex].nHealth -= dmgAdjust(nDamage);
|
||||||
|
|
||||||
if (RexList[nRex].nHealth <= 0)
|
if (RexList[nRex].nHealth <= 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -189,7 +189,7 @@ void FuncRoach(int a, int nDamage, int nRun)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RoachList[nRoach].nHealth -= nDamage;
|
RoachList[nRoach].nHealth -= dmgAdjust(nDamage);
|
||||||
if (RoachList[nRoach].nHealth <= 0)
|
if (RoachList[nRoach].nHealth <= 0)
|
||||||
{
|
{
|
||||||
sprite[nSprite].xvel = 0;
|
sprite[nSprite].xvel = 0;
|
||||||
|
|
|
@ -191,7 +191,7 @@ void FuncScorp(int a, int nDamage, int nRun)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
scorpion[nScorp].nHealth -= nDamage;
|
scorpion[nScorp].nHealth -= dmgAdjust(nDamage);
|
||||||
|
|
||||||
if (scorpion[nScorp].nHealth <= 0)
|
if (scorpion[nScorp].nHealth <= 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -269,7 +269,7 @@ void FuncSet(int a, int nDamage, int nRun)
|
||||||
{
|
{
|
||||||
if (nAction != 1)
|
if (nAction != 1)
|
||||||
{
|
{
|
||||||
SetList[nSet].nHealth -= nDamage;
|
SetList[nSet].nHealth -= dmgAdjust(nDamage);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (SetList[nSet].nHealth <= 0)
|
if (SetList[nSet].nHealth <= 0)
|
||||||
|
|
|
@ -420,7 +420,7 @@ void FuncSpider(int a, int nDamage, int nRun)
|
||||||
|
|
||||||
short nTarget = a & 0xFFFF;
|
short nTarget = a & 0xFFFF;
|
||||||
|
|
||||||
spp->nHealth -= nDamage;
|
spp->nHealth -= dmgAdjust(nDamage);
|
||||||
if (spp->nHealth > 0)
|
if (spp->nHealth > 0)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -212,7 +212,7 @@ void FuncWasp(int a, int nDamage, int nRun)
|
||||||
|
|
||||||
if (WaspList[nWasp].nHealth > 0)
|
if (WaspList[nWasp].nHealth > 0)
|
||||||
{
|
{
|
||||||
WaspList[nWasp].nHealth -= nDamage;
|
WaspList[nWasp].nHealth -= dmgAdjust(nDamage, 3);
|
||||||
|
|
||||||
if (WaspList[nWasp].nHealth > 0)
|
if (WaspList[nWasp].nHealth > 0)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue