diff --git a/Crossroads/CrossroadsVillagerQuestV2.lua b/Crossroads/CrossroadsVillagerQuestV2.lua index 6b3f50b..885562d 100644 --- a/Crossroads/CrossroadsVillagerQuestV2.lua +++ b/Crossroads/CrossroadsVillagerQuestV2.lua @@ -18,10 +18,6 @@ local messages = { "The blood of our enemies will water the fields of our glory!", "This land is ours, and we will defend it with our lives!", "We are the Horde, and we know no fear!", - - - - } diff --git a/Faction_Shared/BlightedZombie.lua b/Faction_Shared/BlightedZombie.lua index a71924c..c956680 100644 --- a/Faction_Shared/BlightedZombie.lua +++ b/Faction_Shared/BlightedZombie.lua @@ -1,7 +1,7 @@ local BlightedZombie = {} function BlightedZombie.OnSpawn(event, creature) -creature:SetMaxHealth(17720) +--creature:SetMaxHealth(17720) creature:CastSpell(creature:GetVictim(), 17683, true) end diff --git a/Faction_Shared/BlisteringZombie.lua b/Faction_Shared/BlisteringZombie.lua index f3a0a44..745a7d8 100644 --- a/Faction_Shared/BlisteringZombie.lua +++ b/Faction_Shared/BlisteringZombie.lua @@ -37,18 +37,9 @@ local function OnDied(event, creature, killer) creature:RemoveEvents() end -local function OnWaypointReached(event, creature) - if math.random(1, 100) <= 50 then -- 50% chance to spawn 400019 - local x, y, z, o = creature:GetLocation() - local xOffset = math.random(-10, 10) - local yOffset = math.random(-10, 10) - local nx, ny, nz = x + xOffset, y + yOffset, z - creature:SpawnCreature(400119, nx, ny, nz, o, 3, 200000) - end -end RegisterCreatureEvent(400029, 1, OnEnterCombat) RegisterCreatureEvent(400029, 2, OnLeaveCombat) RegisterCreatureEvent(400029, 4, OnDied) RegisterCreatureEvent(400029, 5, OnSpawn) -RegisterCreatureEvent(400029, 6, OnWaypointReached) + diff --git a/Faction_Shared/CreepStalker.lua b/Faction_Shared/CreepStalker.lua index 042c122..2698185 100644 --- a/Faction_Shared/CreepStalker.lua +++ b/Faction_Shared/CreepStalker.lua @@ -9,8 +9,8 @@ local function CastStun(eventId, delay, calls, creature) end local function OnEnterCombat(event, creature, target) - creature:RegisterEvent(CastRake, 5000, 0) - creature:RegisterEvent(CastStun, 12000, 0) + creature:RegisterEvent(CastRake, 5000, 0) + creature:RegisterEvent(CastStun, 12000, 0) end local function OnLeaveCombat(event, creature) diff --git a/Faction_Shared/Ghoul.lua b/Faction_Shared/Ghoul.lua index c330ad5..ac2ca67 100644 --- a/Faction_Shared/Ghoul.lua +++ b/Faction_Shared/Ghoul.lua @@ -13,10 +13,10 @@ creature:CastSpell(creature, 47496, true) end local function OnEnterCombat(event, creature, target) - creature:RegisterEvent(CastLeap, 100, 1) - creature:RegisterEvent(CastPlague, 100, 1) - creature:RegisterEvent(CastPlague, 20000, 0) - creature:RegisterEvent(CastExplode, 23000, 0) + creature:RegisterEvent(CastLeap, 100, 1) + creature:RegisterEvent(CastPlague, 100, 1) + creature:RegisterEvent(CastPlague, 20000, 0) + creature:RegisterEvent(CastExplode, 23000, 0) end local function OnLeaveCombat(event, creature) diff --git a/Faction_Shared/RandomScourgeAttack.lua b/Faction_Shared/RandomScourgeAttack.lua index d44fce1..d80356e 100644 --- a/Faction_Shared/RandomScourgeAttack.lua +++ b/Faction_Shared/RandomScourgeAttack.lua @@ -2,7 +2,7 @@ local ENABLED = true -- set to false to disable local GAME_EVENT_ID = 17 -- Set the game event ID local MAX_NPC_SPAWN = 3 -- Set the maximum number of NPCs to spawn simultaneously. Extremely high numbers will hurt performance -local ATTACK_CHANCE = 15 -- Set the likelihood of an attack here, in percent +local ATTACK_CHANCE = 10 -- Set the likelihood of an attack here, in percent local DAZE_SPELL_ID = 100201 -- Set the spell ID for daze local MINIMUM_LEVEL = 15 -- Set min level to be active local EXCLUDED_MAP_ID = 530 diff --git a/Faction_Shared/SkeletalWarrior.lua b/Faction_Shared/SkeletalWarrior.lua index 27ae95d..1d1b437 100644 --- a/Faction_Shared/SkeletalWarrior.lua +++ b/Faction_Shared/SkeletalWarrior.lua @@ -3,7 +3,7 @@ local SkeletalWarrior = {} function SkeletalWarrior.OnSpawn(event, creature) -creature:SetMaxHealth(7720) +--creature:SetMaxHealth(7720) creature:SetEquipmentSlots(10570, 0, 0) creature:CastSpell(creature:GetVictim(), 17683, true) end diff --git a/Lakeshire/quest_30018_spawn_bunnies.lua b/Lakeshire/quest_30018_spawn_bunnies.lua index 58baf1f..abaa3af 100644 --- a/Lakeshire/quest_30018_spawn_bunnies.lua +++ b/Lakeshire/quest_30018_spawn_bunnies.lua @@ -9,9 +9,12 @@ local SPAWN_TYPE = 3 local DESPAWN_TIMER = 200000 local CAST_SPELL_ID = 67040 local CAST_SPELL_ID2 = 32826 +local CAST_SPELL_ID3 = 100231 +local CAST_SPELL_DELAY3 = 120000 local function CastSpellWithDelay(event, delay, calls, creature) creature:CastSpell(creature, CAST_SPELL_ID, false) + creature:CastSpell(creature, 46565, true) end local function CastSpellPolyVis(event, delay, calls, creature) @@ -19,12 +22,19 @@ local function CastSpellPolyVis(event, delay, calls, creature) creature:CastSpell(creature, 72523, true) end +local function CastSpellOnSelfAfterDelay(event, delay, calls, creature) + creature:CastSpell(creature, CAST_SPELL_ID3, true) + creature:RemoveAllAuras() + creature:RemoveEvents() +end + local function OnQuestAccept(event, player, creature, quest) if quest:GetId() == QUEST_ID then creature:PerformEmote(1) creature:SetReactState(0) creature:RegisterEvent(CastSpellPolyVis, 17000, 1) creature:RegisterEvent(CastSpellWithDelay, 18200, 1) + creature:RegisterEvent(CastSpellOnSelfAfterDelay, CAST_SPELL_DELAY3, 1) local x, y, z, o = creature:GetLocation() for i = 1, 5 do local randomX = x + math.random(-4, 4) @@ -62,4 +72,4 @@ end RegisterCreatureEvent(CREATURE_SPAWNER, CREATURE_EVENT_ON_QUEST_ACCEPT, OnQuestAccept) RegisterCreatureEvent(UNDEAD_WARLORD, CREATURE_EVENT_ON_DIE, OnCreatureDeath) -RegisterCreatureEvent(CREATURE_SPAWNER, CREATURE_EVENT_ON_DIE, OnSpawnerDeath) +RegisterCreatureEvent(CREATURE_SPAWNER, CREATURE_EVENT_ON_DIE, OnSpawnerDeath) \ No newline at end of file