Fierelier/iv-pdhealth
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Broke af"

Browse Source 
This reverts commit 87cab524ee.
This commit is contained in:
Fierelier 2018-04-17 22:59:02 +02:00
parent 87cab524ee
commit 809672d61a
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
paydayHealth.cs
View File

@ -6,9 +6,9 @@ namespace pdHealth
{
public class pdHealth : Script
{
public pdHealth()
{
if (allDamageArmor == true) { this.Tick += new EventHandler(this.doAllDamageArmorTick); }
this.Tick += new EventHandler(this.doHealthTick);
//this.KeyDown += new GTA.KeyEventHandler(this.keyDownHandler);
}
@ -40,13 +40,23 @@ namespace pdHealth
if (pl.Armor < armorVal) { timeUntilRegen = armorRegenDelay; }
if (pl.Health < healthVal) { timeUntilRegen = armorRegenDelay; }
if (allDamageArmor == true) {
if (pl.Health < healthVal) {
int damageTaken = healthVal - pl.Health;
if (damageTaken < pl.Armor) {
pl.Health = pl.Health + damageTaken;
pl.Armor = pl.Armor - damageTaken;
} else {
pl.Health = pl.Health + (damageTaken - pl.Armor);
pl.Armor = 0;
}
}
}
if (timeUntilRegen > 0) {
timeUntilRegen = timeUntilRegen - tickTime;
if (timeUntilRegen < 0) { timeUntilRegen = 0; }
}
if (timeUntilRegen == 0) {
} else {
if (pl.Armor < armorRegen) {
pl.Armor = pl.Armor + armorRegenSpeed;
if (pl.Armor > armorRegen) { pl.Armor = armorRegen; }
@ -55,30 +65,10 @@ namespace pdHealth
armorVal = pl.Armor;
healthVal = pl.Health;
Game.DisplayText("Health: " +pl.Health.ToString()+ "\nArmor: " +pl.Armor.ToString(), 1000);
Game.DisplayText("Health:\n " +pl.Health.ToString(), 1000);
Wait(tickTime);
}
private void doAllDamageArmorTick(object sender, EventArgs e)
{
Ped pl = Player.Character;
if (pl.isAlive == false) { return; }
if (pl.Health < healthVal) {
int damageTaken = healthVal - pl.Health;
if (damageTaken < pl.Armor) {
pl.Health = pl.Health + damageTaken;
pl.Armor = pl.Armor - damageTaken;
} else {
pl.Health = pl.Health + (damageTaken - pl.Armor);
pl.Armor = 0;
}
}
armorVal = pl.Armor;
healthVal = pl.Health;
}
//Testing
private void keyDownHandler(object sender, GTA.KeyEventArgs e)
{