mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-22 12:18:27 +00:00
Move HateLine to a better ID
This commit is contained in:
nytmyr
@@ -1077,7 +1077,7 @@ WHERE bot_spells_entries.spell_id = spells_new.id);
|
||||
ManifestEntry{
|
||||
.version = 9051,
|
||||
.description = "2024_11_26_remove_sk_icb.sql",
|
||||
.check = "SELECT * FROM `bot_spells_entries` where `type` = 55",
|
||||
.check = "SELECT * FROM `bot_spells_entries` where `type` = 24",
|
||||
.condition = "empty",
|
||||
.match = "",
|
||||
.sql = R"(
|
||||
@@ -1088,88 +1088,88 @@ AND `type` = 10;
|
||||
|
||||
INSERT INTO `bot_spells_entries` (`npc_spells_id`, `spell_id`, `type`, `minlevel`, `maxlevel`)
|
||||
VALUES
|
||||
(3003, 10175, 55, 72, 76),
|
||||
(3003, 10173, 55, 72, 76),
|
||||
(3003, 10174, 55, 72, 76),
|
||||
(3003, 14956, 55, 77, 81),
|
||||
(3003, 14954, 55, 77, 81),
|
||||
(3003, 14955, 55, 77, 81),
|
||||
(3003, 19070, 55, 82, 86),
|
||||
(3003, 19068, 55, 82, 86),
|
||||
(3003, 19069, 55, 82, 86),
|
||||
(3003, 25298, 55, 87, 91),
|
||||
(3003, 25299, 55, 87, 91),
|
||||
(3003, 25297, 55, 87, 91),
|
||||
(3003, 28348, 55, 92, 96),
|
||||
(3003, 28349, 55, 92, 96),
|
||||
(3003, 28347, 55, 92, 96),
|
||||
(3003, 34351, 55, 97, 254),
|
||||
(3003, 34352, 55, 97, 254),
|
||||
(3003, 34350, 55, 97, 254),
|
||||
(3003, 40078, 55, 98, 254),
|
||||
(3003, 40079, 55, 98, 254),
|
||||
(3003, 40080, 55, 98, 254),
|
||||
(3005, 1221, 55, 33, 41),
|
||||
(3005, 1222, 55, 42, 52),
|
||||
(3005, 1223, 55, 53, 58),
|
||||
(3005, 1224, 55, 59, 62),
|
||||
(3005, 3405, 55, 63, 66),
|
||||
(3005, 5329, 55, 67, 70),
|
||||
(3005, 5336, 55, 69, 73),
|
||||
(3005, 10258, 55, 71, 71),
|
||||
(3005, 10259, 55, 71, 71),
|
||||
(3005, 10257, 55, 71, 71),
|
||||
(3005, 10261, 55, 72, 76),
|
||||
(3005, 10262, 55, 72, 76),
|
||||
(3005, 10260, 55, 72, 76),
|
||||
(3005, 10291, 55, 74, 78),
|
||||
(3005, 10292, 55, 74, 78),
|
||||
(3005, 10293, 55, 74, 78),
|
||||
(3005, 15160, 55, 76, 76),
|
||||
(3005, 15161, 55, 76, 76),
|
||||
(3005, 15162, 55, 76, 76),
|
||||
(3005, 15165, 55, 77, 81),
|
||||
(3005, 15163, 55, 77, 81),
|
||||
(3005, 15164, 55, 77, 81),
|
||||
(3005, 15186, 55, 79, 83),
|
||||
(3005, 15184, 55, 79, 83),
|
||||
(3005, 15185, 55, 79, 83),
|
||||
(3005, 19315, 55, 81, 81),
|
||||
(3005, 19313, 55, 81, 81),
|
||||
(3005, 19314, 55, 81, 81),
|
||||
(3005, 19317, 55, 82, 86),
|
||||
(3005, 19318, 55, 82, 86),
|
||||
(3005, 19316, 55, 82, 86),
|
||||
(3005, 19338, 55, 84, 88),
|
||||
(3005, 19339, 55, 84, 88),
|
||||
(3005, 19337, 55, 84, 88),
|
||||
(3005, 25581, 55, 86, 86),
|
||||
(3005, 25582, 55, 86, 86),
|
||||
(3005, 25580, 55, 86, 86),
|
||||
(3005, 25586, 55, 87, 91),
|
||||
(3005, 25587, 55, 87, 91),
|
||||
(3005, 25588, 55, 87, 91),
|
||||
(3005, 25641, 55, 89, 93),
|
||||
(3005, 25642, 55, 89, 93),
|
||||
(3005, 25643, 55, 89, 93),
|
||||
(3005, 28659, 55, 91, 91),
|
||||
(3005, 28657, 55, 91, 91),
|
||||
(3005, 28658, 55, 91, 91),
|
||||
(3005, 28665, 55, 92, 96),
|
||||
(3005, 28663, 55, 92, 96),
|
||||
(3005, 28664, 55, 92, 96),
|
||||
(3005, 28735, 55, 94, 98),
|
||||
(3005, 28733, 55, 94, 98),
|
||||
(3005, 28734, 55, 94, 98),
|
||||
(3005, 34688, 55, 96, 96),
|
||||
(3005, 34689, 55, 96, 96),
|
||||
(3005, 34687, 55, 96, 96),
|
||||
(3005, 34694, 55, 97, 254),
|
||||
(3005, 34695, 55, 97, 254),
|
||||
(3005, 34693, 55, 97, 254),
|
||||
(3005, 34752, 55, 99, 254),
|
||||
(3005, 34753, 55, 99, 254),
|
||||
(3005, 34751, 55, 99, 254);
|
||||
(3003, 10175, 24, 72, 76),
|
||||
(3003, 10173, 24, 72, 76),
|
||||
(3003, 10174, 24, 72, 76),
|
||||
(3003, 14956, 24, 77, 81),
|
||||
(3003, 14954, 24, 77, 81),
|
||||
(3003, 14955, 24, 77, 81),
|
||||
(3003, 19070, 24, 82, 86),
|
||||
(3003, 19068, 24, 82, 86),
|
||||
(3003, 19069, 24, 82, 86),
|
||||
(3003, 25298, 24, 87, 91),
|
||||
(3003, 25299, 24, 87, 91),
|
||||
(3003, 25297, 24, 87, 91),
|
||||
(3003, 28348, 24, 92, 96),
|
||||
(3003, 28349, 24, 92, 96),
|
||||
(3003, 28347, 24, 92, 96),
|
||||
(3003, 34351, 24, 97, 254),
|
||||
(3003, 34352, 24, 97, 254),
|
||||
(3003, 34350, 24, 97, 254),
|
||||
(3003, 40078, 24, 98, 254),
|
||||
(3003, 40079, 24, 98, 254),
|
||||
(3003, 40080, 24, 98, 254),
|
||||
(3005, 1221, 24, 33, 41),
|
||||
(3005, 1222, 24, 42, 52),
|
||||
(3005, 1223, 24, 53, 58),
|
||||
(3005, 1224, 24, 59, 62),
|
||||
(3005, 3405, 24, 63, 66),
|
||||
(3005, 5329, 24, 67, 70),
|
||||
(3005, 5336, 24, 69, 73),
|
||||
(3005, 10258, 24, 71, 71),
|
||||
(3005, 10259, 24, 71, 71),
|
||||
(3005, 10257, 24, 71, 71),
|
||||
(3005, 10261, 24, 72, 76),
|
||||
(3005, 10262, 24, 72, 76),
|
||||
(3005, 10260, 24, 72, 76),
|
||||
(3005, 10291, 24, 74, 78),
|
||||
(3005, 10292, 24, 74, 78),
|
||||
(3005, 10293, 24, 74, 78),
|
||||
(3005, 15160, 24, 76, 76),
|
||||
(3005, 15161, 24, 76, 76),
|
||||
(3005, 15162, 24, 76, 76),
|
||||
(3005, 15165, 24, 77, 81),
|
||||
(3005, 15163, 24, 77, 81),
|
||||
(3005, 15164, 24, 77, 81),
|
||||
(3005, 15186, 24, 79, 83),
|
||||
(3005, 15184, 24, 79, 83),
|
||||
(3005, 15185, 24, 79, 83),
|
||||
(3005, 19315, 24, 81, 81),
|
||||
(3005, 19313, 24, 81, 81),
|
||||
(3005, 19314, 24, 81, 81),
|
||||
(3005, 19317, 24, 82, 86),
|
||||
(3005, 19318, 24, 82, 86),
|
||||
(3005, 19316, 24, 82, 86),
|
||||
(3005, 19338, 24, 84, 88),
|
||||
(3005, 19339, 24, 84, 88),
|
||||
(3005, 19337, 24, 84, 88),
|
||||
(3005, 25581, 24, 86, 86),
|
||||
(3005, 25582, 24, 86, 86),
|
||||
(3005, 25580, 24, 86, 86),
|
||||
(3005, 25586, 24, 87, 91),
|
||||
(3005, 25587, 24, 87, 91),
|
||||
(3005, 25588, 24, 87, 91),
|
||||
(3005, 25641, 24, 89, 93),
|
||||
(3005, 25642, 24, 89, 93),
|
||||
(3005, 25643, 24, 89, 93),
|
||||
(3005, 28659, 24, 91, 91),
|
||||
(3005, 28657, 24, 91, 91),
|
||||
(3005, 28658, 24, 91, 91),
|
||||
(3005, 28665, 24, 92, 96),
|
||||
(3005, 28663, 24, 92, 96),
|
||||
(3005, 28664, 24, 92, 96),
|
||||
(3005, 28735, 24, 94, 98),
|
||||
(3005, 28733, 24, 94, 98),
|
||||
(3005, 28734, 24, 94, 98),
|
||||
(3005, 34688, 24, 96, 96),
|
||||
(3005, 34689, 24, 96, 96),
|
||||
(3005, 34687, 24, 96, 96),
|
||||
(3005, 34694, 24, 97, 254),
|
||||
(3005, 34695, 24, 97, 254),
|
||||
(3005, 34693, 24, 97, 254),
|
||||
(3005, 34752, 24, 99, 254),
|
||||
(3005, 34753, 24, 99, 254),
|
||||
(3005, 34751, 24, 99, 254);
|
||||
|
||||
DELETE
|
||||
FROM bot_spells_entries
|
||||
|
||||
+34
-34
@@ -677,39 +677,39 @@ namespace BotSpellTypes
|
||||
constexpr uint16 PreCombatBuffSong = 21;
|
||||
constexpr uint16 Fear = 22;
|
||||
constexpr uint16 Stun = 23;
|
||||
constexpr uint16 GroupCures = 24;
|
||||
constexpr uint16 CompleteHeal = 25;
|
||||
constexpr uint16 FastHeals = 26;
|
||||
constexpr uint16 VeryFastHeals = 27;
|
||||
constexpr uint16 GroupHeals = 28;
|
||||
constexpr uint16 GroupCompleteHeals = 29;
|
||||
constexpr uint16 GroupHoTHeals = 30;
|
||||
constexpr uint16 HoTHeals = 31;
|
||||
constexpr uint16 AENukes = 32;
|
||||
constexpr uint16 AERains = 33;
|
||||
constexpr uint16 AEMez = 34;
|
||||
constexpr uint16 AEStun = 35;
|
||||
constexpr uint16 AEDebuff = 36;
|
||||
constexpr uint16 AESlow = 37;
|
||||
constexpr uint16 AESnare = 38;
|
||||
constexpr uint16 AEFear = 39;
|
||||
constexpr uint16 AEDispel = 40;
|
||||
constexpr uint16 AERoot = 41;
|
||||
constexpr uint16 AEDoT = 42;
|
||||
constexpr uint16 AELifetap = 43;
|
||||
constexpr uint16 PBAENuke = 44;
|
||||
constexpr uint16 PetBuffs = 45;
|
||||
constexpr uint16 PetRegularHeals = 46;
|
||||
constexpr uint16 PetCompleteHeals = 47;
|
||||
constexpr uint16 PetFastHeals = 48;
|
||||
constexpr uint16 PetVeryFastHeals = 49;
|
||||
constexpr uint16 PetHoTHeals = 50;
|
||||
constexpr uint16 DamageShields = 51;
|
||||
constexpr uint16 ResistBuffs = 52;
|
||||
constexpr uint16 PetDamageShields = 53;
|
||||
constexpr uint16 PetResistBuffs = 54;
|
||||
constexpr uint16 HateLine = 55;
|
||||
constexpr uint16 AEHateLine = 56;
|
||||
constexpr uint16 HateLine = 24;
|
||||
constexpr uint16 GroupCures = 25;
|
||||
constexpr uint16 CompleteHeal = 26;
|
||||
constexpr uint16 FastHeals = 27;
|
||||
constexpr uint16 VeryFastHeals = 28;
|
||||
constexpr uint16 GroupHeals = 29;
|
||||
constexpr uint16 GroupCompleteHeals = 30;
|
||||
constexpr uint16 GroupHoTHeals = 31;
|
||||
constexpr uint16 HoTHeals = 32;
|
||||
constexpr uint16 AENukes = 33;
|
||||
constexpr uint16 AERains = 34;
|
||||
constexpr uint16 AEMez = 35;
|
||||
constexpr uint16 AEStun = 36;
|
||||
constexpr uint16 AEDebuff = 37;
|
||||
constexpr uint16 AESlow = 38;
|
||||
constexpr uint16 AESnare = 39;
|
||||
constexpr uint16 AEFear = 40;
|
||||
constexpr uint16 AEDispel = 41;
|
||||
constexpr uint16 AERoot = 42;
|
||||
constexpr uint16 AEDoT = 43;
|
||||
constexpr uint16 AELifetap = 44;
|
||||
constexpr uint16 AEHateLine = 45;
|
||||
constexpr uint16 PBAENuke = 46;
|
||||
constexpr uint16 PetBuffs = 47;
|
||||
constexpr uint16 PetRegularHeals = 48;
|
||||
constexpr uint16 PetCompleteHeals = 49;
|
||||
constexpr uint16 PetFastHeals = 50;
|
||||
constexpr uint16 PetVeryFastHeals = 51;
|
||||
constexpr uint16 PetHoTHeals = 52;
|
||||
constexpr uint16 DamageShields = 53;
|
||||
constexpr uint16 ResistBuffs = 54;
|
||||
constexpr uint16 PetDamageShields = 55;
|
||||
constexpr uint16 PetResistBuffs = 56;
|
||||
|
||||
// Command Spell Types
|
||||
constexpr uint16 Teleport = 100; // this is handled by ^depart so uses other logic
|
||||
@@ -727,7 +727,7 @@ namespace BotSpellTypes
|
||||
constexpr uint16 SummonCorpse = 112;
|
||||
|
||||
constexpr uint16 START = BotSpellTypes::Nuke; // Do not remove or change this
|
||||
constexpr uint16 END = BotSpellTypes::AEHateLine; // Do not remove this, increment as needed
|
||||
constexpr uint16 END = BotSpellTypes::PetResistBuffs; // Do not remove this, increment as needed
|
||||
constexpr uint16 COMMANDED_START = BotSpellTypes::Lull; // Do not remove or change this
|
||||
constexpr uint16 COMMANDED_END = BotSpellTypes::SummonCorpse; // Do not remove this, increment as needed
|
||||
}
|
||||
|
||||
@@ -1045,7 +1045,7 @@ std::list<BotSpell_wPriority> Bot::GetPrioritizedBotSpellsBySpellType(Bot* botCa
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
if (spellType == debugSpellType) { LogTestDebugDetail("{} - #{}: [{} #{}] - {} says, '{} #{} - Passed TGB checks.'", __FILE__, __LINE__, botCaster->GetSpellTypeNameByID(spellType), spellType, botCaster->GetCleanName(), spells[botSpellList[i].spellid].name, botSpellList[i].spellid); }; //deleteme
|
||||
|
||||
if (!IsPBAESpell(botSpellList[i].spellid) && !botCaster->CastChecks(botSpellList[i].spellid, tar, spellType, false, IsAEBotSpellType(spellType))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user