Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Misc: Added helper function Unit::SetFullPower * Also renamed Unit::getPowerType and Unit::setPowerType to follow style guidelines

Browse Source
This commit is contained in:
hondacrx
2018-01-03 13:57:16 -05:00
parent 8b43b08f6f
commit 9d3e87fd87
30 changed files with 106 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/EasternKingdoms/Karazhan/Curator.cs
+9 -9
View File
@@ -57,8 +57,8 @@ namespace Scripts.EasternKingdoms.Karazhan.Curator
{
_scheduler.Schedule(TimeSpan.FromSeconds(10), task =>
{
//Summon Astral Flare
Creature AstralFlare = DoSpawnCreature(17096, RandomHelper.Rand32() % 37, RandomHelper.Rand32() % 37, 0, 0, TempSummonType.TimedDespawnOOC, 5000);
//Summon Astral Flare
Creature AstralFlare = DoSpawnCreature(17096, RandomHelper.Rand32() % 37, RandomHelper.Rand32() % 37, 0, 0, TempSummonType.TimedDespawnOOC, 5000);
Unit target = SelectTarget(SelectAggroTarget.Random, 0);
if (AstralFlare && target)
@@ -67,23 +67,23 @@ namespace Scripts.EasternKingdoms.Karazhan.Curator
AstralFlare.GetAI().AttackStart(target);
}
//Reduce Mana by 10% of max health
int mana = me.GetMaxPower(PowerType.Mana);
//Reduce Mana by 10% of max health
int mana = me.GetMaxPower(PowerType.Mana);
if (mana != 0)
{
mana /= 10;
me.ModifyPower(PowerType.Mana, -mana);
//if this get's us below 10%, then we evocate (the 10th should be summoned now)
if (me.GetPower(PowerType.Mana) * 100 / me.GetMaxPower(PowerType.Mana) < 10)
//if this get's us below 10%, then we evocate (the 10th should be summoned now)
if (me.GetPower(PowerType.Mana) * 100 / me.GetMaxPower(PowerType.Mana) < 10)
{
Talk(TextIds.SayEvocate);
me.InterruptNonMeleeSpells(false);
DoCast(me, SpellIds.Evocation);
_scheduler.DelayAll(TimeSpan.FromSeconds(20));
//Evocating = true;
//no AddTimer cooldown, this will make first flare appear instantly after evocate end, like expected
return;
//Evocating = true;
//no AddTimer cooldown, this will make first flare appear instantly after evocate end, like expected
return;
}
else
{
Source/Scripts/EasternKingdoms/Karazhan/Moroes.cs
+1 -1
View File
@@ -421,7 +421,7 @@ namespace Scripts.EasternKingdoms.Karazhan.Moroes
{
Unit target = SelectTarget(SelectAggroTarget.Random, 0, 100, true);
if (target)
if (target.getPowerType() == PowerType.Mana)
if (target.GetPowerType() == PowerType.Mana)
DoCast(target, SpellIds.Manaburn);
ManaBurn_Timer = 5000; // 3 sec cast
}
Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/LordJaraxxus.cs
+1 -1
View File
@@ -464,7 +464,7 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheCrusader
void FilterTargets(List<WorldObject> targets)
{
// get a list of players with mana
targets.RemoveAll(unit => unit.IsTypeId(TypeId.Player) && unit.ToPlayer().getPowerType() == PowerType.Mana);
targets.RemoveAll(unit => unit.IsTypeId(TypeId.Player) && unit.ToPlayer().GetPowerType() == PowerType.Mana);
if (targets.Empty())
return;
Source/Scripts/Northrend/FrozenHalls/ForgeOfSouls/BossBronjahm.cs
+1 -1
View File
@@ -258,7 +258,7 @@ namespace Scripts.Northrend.FrozenHalls.ForgeOfSouls.Bronjahm
{
void RecalculateDamage()
{
if (GetHitUnit().getPowerType() != PowerType.Mana)
if (GetHitUnit().GetPowerType() != PowerType.Mana)
return;
int maxDamage = GetCaster().GetMap().IsHeroic() ? 15000 : 10000;
Source/Scripts/Northrend/IcecrownCitadel/LadyDeathwhisper.cs
+1 -1
View File
@@ -225,7 +225,7 @@ namespace Scripts.Northrend.IcecrownCitadel
public override void Reset()
{
_Reset();
me.SetPower(PowerType.Mana, me.GetMaxPower(PowerType.Mana));
me.SetFullPower(PowerType.Mana);
_events.SetPhase(LadyConst.PhaseOne);
_waveCounter = 0;
_nextVengefulShadeTargetGUID.Clear();
Source/Scripts/Outlands/Zangarmarsh.cs
+1 -1
View File
@@ -49,7 +49,7 @@ namespace Scripts.Outlands
player.PlayerTalkClass.ClearMenus();
if (action == eTradeskill.GossipActionInfoDef + 1)
{
creature.setPowerType(PowerType.Mana);
creature.SetPowerType(PowerType.Mana);
creature.SetMaxPower(PowerType.Mana, 200); //set a "fake" mana value, we can't depend on database doing it in this case
creature.SetPower(PowerType.Mana, 200);
Source/Scripts/Spells/Generic.cs
+3 -3
View File
@@ -2047,7 +2047,7 @@ namespace Scripts.Spells.Generic
newPet.setDeathState(DeathState.Alive);
newPet.SetFullHealth();
newPet.SetPower(newPet.getPowerType(), newPet.GetMaxPower(newPet.getPowerType()));
newPet.SetFullPower(newPet.GetPowerType());
switch (newPet.GetEntry())
{
@@ -2171,7 +2171,7 @@ namespace Scripts.Spells.Generic
{
var target = obj.ToUnit();
if (target)
return target.getPowerType() != PowerType.Mana;
return target.GetPowerType() != PowerType.Mana;
return true;
});
@@ -3312,7 +3312,7 @@ namespace Scripts.Spells.Generic
{
Unit unit = target.ToUnit();
if (unit)
return unit.getPowerType() != PowerType.Mana;
return unit.GetPowerType() != PowerType.Mana;
return false;
});
}
Source/Scripts/Spells/Items.cs
+1 -1
View File
@@ -1180,7 +1180,7 @@ namespace Scripts.Spells.Items
Unit caster = eventInfo.GetActor();
uint spellId;
switch (caster.getPowerType())
switch (caster.GetPowerType())
{
case PowerType.Mana:
spellId = _manaSpellId;
Source/Scripts/Spells/Priest.cs
+1 -1
View File
@@ -496,7 +496,7 @@ namespace Scripts.Spells.Priest
{
Unit target = obj.ToUnit();
if (target)
return target.getPowerType() != PowerType.Mana;
return target.GetPowerType() != PowerType.Mana;
return true;
}));
Source/Scripts/World/DuelReset.cs
+6 -18
View File
@@ -49,24 +49,12 @@ namespace Scripts.World
if (_resetHealthMana)
{
player1.SaveHealthBeforeDuel();
player1.SetHealth(player1.GetMaxHealth());
player1.SaveManaBeforeDuel();
player1.ResetAllPowers();
player2.SaveHealthBeforeDuel();
player2.SetHealth(player2.GetMaxHealth());
// check if player1 class uses mana
if (player1.getPowerType() == PowerType.Mana || player1.GetClass() == Class.Druid)
{
player1.SaveManaBeforeDuel();
player1.SetPower(PowerType.Mana, player1.GetMaxPower(PowerType.Mana));
}
// check if player2 class uses mana
if (player2.getPowerType() == PowerType.Mana || player2.GetClass() == Class.Druid)
{
player2.SaveManaBeforeDuel();
player2.SetPower(PowerType.Mana, player2.GetMaxPower(PowerType.Mana));
}
player2.SaveManaBeforeDuel();
player2.ResetAllPowers();
}
}
@@ -92,11 +80,11 @@ namespace Scripts.World
loser.RestoreHealthAfterDuel();
// check if player1 class uses mana
if (winner.getPowerType() == PowerType.Mana || winner.GetClass() == Class.Druid)
if (winner.GetPowerType() == PowerType.Mana || winner.GetClass() == Class.Druid)
winner.RestoreManaAfterDuel();
// check if player2 class uses mana
if (loser.getPowerType() == PowerType.Mana || loser.GetClass() == Class.Druid)
if (loser.GetPowerType() == PowerType.Mana || loser.GetClass() == Class.Druid)
loser.RestoreManaAfterDuel();
}
}