Compare commits
28 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f06300031e | |||
| 442c708e85 | |||
| 451d783994 | |||
| 1df95daa5a | |||
| f9cb8e6e44 | |||
| a0ec2976ef | |||
| 991afe708a | |||
| 72cede7878 | |||
| deff67efeb | |||
| 7c4b2c77bb | |||
| f04afd14d8 | |||
| 73c4349fa9 | |||
| 86cb8811b1 | |||
| 0c72d04d38 | |||
| 2f1278cb7c | |||
| f8177f5ac4 | |||
| 98858d29b5 | |||
| 334d127e6a | |||
| bca073ef4a | |||
| 423e140f46 | |||
| 2bf075d616 | |||
| b920ec50ab | |||
| e965678adf | |||
| 5918cf7b1a | |||
| e04f0f068c | |||
| 85287568b5 | |||
| 9d7bfe2516 | |||
| b5f3f51208 |
@@ -341,6 +341,14 @@ import_encounter_journal_sql() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
import_premium_sql() {
|
||||||
|
log "Started importing Premium SQL files"
|
||||||
|
|
||||||
|
local world_premium_sql="$ROOT_DIR/sql/Premium/world.sql"
|
||||||
|
|
||||||
|
import_sql_file "acore_world" "$world_premium_sql"
|
||||||
|
}
|
||||||
|
|
||||||
if (($# > 0)); then
|
if (($# > 0)); then
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-h|--help)
|
-h|--help)
|
||||||
@@ -373,6 +381,7 @@ import_playerbots_ru_sql
|
|||||||
import_encounter_journal_sql
|
import_encounter_journal_sql
|
||||||
import_store_sql
|
import_store_sql
|
||||||
import_transmog_sql
|
import_transmog_sql
|
||||||
|
import_premium_sql
|
||||||
configure_server_motd
|
configure_server_motd
|
||||||
|
|
||||||
log "custom SQL bootstrap completed"
|
log "custom SQL bootstrap completed"
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
return {}
|
||||||
@@ -0,0 +1,204 @@
|
|||||||
|
local PLAYER_EVENT_ON_LOGIN = 3
|
||||||
|
local PLAYER_EVENT_ON_SPELL_CAST = 5
|
||||||
|
local PLAYER_EVENT_ON_LOGOUT = 4
|
||||||
|
local PLAYER_EVENT_ON_COMMAND = 42
|
||||||
|
local PLAYER_EVENT_ON_BEFORE_TELEPORT = 67
|
||||||
|
|
||||||
|
|
||||||
|
local ACCOUNT_FLAG_RECURRING_BILLING = 8192
|
||||||
|
|
||||||
|
local SUMMON_SQUIRE_SPELL_ID = 80000
|
||||||
|
local HEARTHSTONE_SPELL_ID = 8690
|
||||||
|
|
||||||
|
local SQUIRE_CREATURE_TEMPLATE_ID = 9000001
|
||||||
|
|
||||||
|
local ALLIANCE_AUCTIONEER_CREATURE_TEMPLATE_ID = 15659
|
||||||
|
local HORDE_AUCTIONEER_CREATURE_TEMPLATE_ID = 8673
|
||||||
|
|
||||||
|
local NPC_TEXT_ID = 10000000
|
||||||
|
|
||||||
|
local premiums_table = {}
|
||||||
|
local squires_table = {}
|
||||||
|
|
||||||
|
---todo extract to utils
|
||||||
|
---@param inputstr string
|
||||||
|
---@param separator string
|
||||||
|
---@return table
|
||||||
|
local function SplitString(inputstr, separator)
|
||||||
|
if separator == nil then
|
||||||
|
separator = "%s"
|
||||||
|
end
|
||||||
|
local t = {}
|
||||||
|
for str in string.gmatch(inputstr, "([^" .. separator .. "]+)") do
|
||||||
|
table.insert(t, str)
|
||||||
|
end
|
||||||
|
return t
|
||||||
|
end
|
||||||
|
|
||||||
|
---@return boolean
|
||||||
|
local function IsPremium(player)
|
||||||
|
return premiums_table[player:GetAccountId()] == true
|
||||||
|
end
|
||||||
|
|
||||||
|
local function OnPremiumPlayer(player)
|
||||||
|
player:SendAreaTriggerMessage(
|
||||||
|
'На вашем аккаунте активна подписка Premium! Благодарим за поддержку проекта MoonWell.')
|
||||||
|
|
||||||
|
player:LearnSpell(SUMMON_SQUIRE_SPELL_ID)
|
||||||
|
player:SendBroadcastMessage("Милостью Элуны вам была выдана способность |cff71d5ff|Hspell:" ..
|
||||||
|
SUMMON_SQUIRE_SPELL_ID .. "|h[" .. "Призыв Оруженосца]h|")
|
||||||
|
|
||||||
|
player:ResetSpellCooldown(HEARTHSTONE_SPELL_ID)
|
||||||
|
end
|
||||||
|
|
||||||
|
local function RefreshPremiumStatus(player)
|
||||||
|
local query = AuthDBQuery("SELECT flags FROM account WHERE id = " .. player:GetAccountId())
|
||||||
|
|
||||||
|
if query then
|
||||||
|
local function HasFlag(mask, flag)
|
||||||
|
return bit_and(mask, flag) == flag
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
local flags = query:GetUInt32(0)
|
||||||
|
|
||||||
|
if HasFlag(flags, ACCOUNT_FLAG_RECURRING_BILLING) then
|
||||||
|
premiums_table[player:GetAccountId()] = true
|
||||||
|
|
||||||
|
OnPremiumPlayer(player)
|
||||||
|
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
local function ApplyPremium(player)
|
||||||
|
AuthDBExecute(
|
||||||
|
string.format(
|
||||||
|
"UPDATE account SET flags = flags | %d WHERE id = %d",
|
||||||
|
ACCOUNT_FLAG_RECURRING_BILLING,
|
||||||
|
player:GetAccountId()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
RefreshPremiumStatus(player)
|
||||||
|
end
|
||||||
|
|
||||||
|
local function OnLogin(event, player)
|
||||||
|
RefreshPremiumStatus(player)
|
||||||
|
end
|
||||||
|
|
||||||
|
--- @param event any
|
||||||
|
--- @param player any
|
||||||
|
--- @param command string
|
||||||
|
--- @param chatHandler any
|
||||||
|
local function OnCommand(event, player, command, chatHandler)
|
||||||
|
---Console is not supported yet
|
||||||
|
if not player then return end
|
||||||
|
|
||||||
|
local parts = SplitString(command:lower(), ' ')
|
||||||
|
|
||||||
|
if parts[1] ~= 'premium' then return end
|
||||||
|
|
||||||
|
if parts[2] == 'add' then
|
||||||
|
ApplyPremium(player:GetSelection())
|
||||||
|
end
|
||||||
|
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
local function OnSummonSquireCast(player)
|
||||||
|
local x, y, z, o = player:GetLocation()
|
||||||
|
|
||||||
|
if (squires_table[player:GetGUIDLow()] ~= nil) then
|
||||||
|
local existing_squire = player:GetMap():GetWorldObject(squires_table[player:GetGUIDLow()])
|
||||||
|
if (existing_squire ~= nil) then
|
||||||
|
existing_squire:DespawnOrUnsummon()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local squire = player:SpawnCreature(SQUIRE_CREATURE_TEMPLATE_ID, x + 1, y + 1, z, o, 1, 30000)
|
||||||
|
squires_table[player:GetGUIDLow()] = squire:GetGUID()
|
||||||
|
|
||||||
|
if squire then
|
||||||
|
squire:SetFaction(player:GetFaction())
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local function OnSpellCast(event, player, spell, skipCheck)
|
||||||
|
local spellId = spell:GetEntry()
|
||||||
|
|
||||||
|
if spellId == SUMMON_SQUIRE_SPELL_ID then
|
||||||
|
OnSummonSquireCast(player)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local function OnGossipHello(event, player, creature)
|
||||||
|
player:GossipClearMenu()
|
||||||
|
|
||||||
|
player:GossipMenuAddItem(4, "Открыть почтовый ящик", 900001, 1)
|
||||||
|
player:GossipMenuAddItem(1, "Открыть банк", 900001, 2)
|
||||||
|
player:GossipMenuAddItem(6, "Открыть аукцион", 900001, 3)
|
||||||
|
player:GossipMenuAddItem(4, "Отремонтировать снаряжение", 900001, 4)
|
||||||
|
|
||||||
|
player:GossipSendMenu(NPC_TEXT_ID, creature)
|
||||||
|
end
|
||||||
|
|
||||||
|
local function OnGossipSelect(event, player, creature, sender, intid, code)
|
||||||
|
if sender == 900001 then
|
||||||
|
if intid == 1 then
|
||||||
|
player:SendShowMailBox(creature:GetGUID())
|
||||||
|
player:GossipComplete()
|
||||||
|
end
|
||||||
|
|
||||||
|
if intid == 2 then
|
||||||
|
player:SendShowBank(creature)
|
||||||
|
player:GossipComplete()
|
||||||
|
end
|
||||||
|
|
||||||
|
if intid == 3 then
|
||||||
|
local x, y, z, o = player:GetLocation()
|
||||||
|
local auctioneer_template = player:GetTeam() == 0 and ALLIANCE_AUCTIONEER_CREATURE_TEMPLATE_ID or
|
||||||
|
HORDE_AUCTIONEER_CREATURE_TEMPLATE_ID
|
||||||
|
local auctioneer = player:SpawnCreature(auctioneer_template, x, y, z, o, 1, 30000)
|
||||||
|
auctioneer:SetDisplayId(11686)
|
||||||
|
|
||||||
|
player:SendAuctionMenu(auctioneer)
|
||||||
|
|
||||||
|
player:GossipComplete()
|
||||||
|
end
|
||||||
|
|
||||||
|
if intid == 4 then
|
||||||
|
player:DurabilityRepairAll()
|
||||||
|
player:PlayDirectSound(1116)
|
||||||
|
player:GossipComplete()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local function OnLogout(event, player)
|
||||||
|
player:RemoveSpell(SUMMON_SQUIRE_SPELL_ID)
|
||||||
|
squires_table[player:GetGUID()] = nil
|
||||||
|
end
|
||||||
|
|
||||||
|
local function OnBeforeTeleport(event, player, mapid, x, y, z, orientation, options, target)
|
||||||
|
if not IsPremium(player) then return end
|
||||||
|
|
||||||
|
-- Get current generic spell (SpellType 1)
|
||||||
|
local current_spell = player:GetCurrentSpell(1)
|
||||||
|
|
||||||
|
if current_spell ~= nil and current_spell:GetEntry() == HEARTHSTONE_SPELL_ID then
|
||||||
|
player:ResetSpellCooldown(HEARTHSTONE_SPELL_ID)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
RegisterCreatureGossipEvent(SQUIRE_CREATURE_TEMPLATE_ID, 1, OnGossipHello)
|
||||||
|
RegisterCreatureGossipEvent(SQUIRE_CREATURE_TEMPLATE_ID, 2, OnGossipSelect)
|
||||||
|
RegisterPlayerEvent(PLAYER_EVENT_ON_LOGIN, OnLogin)
|
||||||
|
RegisterPlayerEvent(PLAYER_EVENT_ON_LOGOUT, OnLogout)
|
||||||
|
RegisterPlayerEvent(PLAYER_EVENT_ON_COMMAND, OnCommand)
|
||||||
|
RegisterPlayerEvent(PLAYER_EVENT_ON_SPELL_CAST, OnSpellCast)
|
||||||
|
RegisterPlayerEvent(PLAYER_EVENT_ON_BEFORE_TELEPORT, OnBeforeTeleport)
|
||||||
@@ -61,9 +61,9 @@
|
|||||||
# false - (disabled)
|
# false - (disabled)
|
||||||
|
|
||||||
Eluna.Enabled = true
|
Eluna.Enabled = true
|
||||||
Eluna.TraceBack = false
|
Eluna.TraceBack = true
|
||||||
Eluna.ScriptPath = "lua_scripts"
|
Eluna.ScriptPath = "lua_scripts"
|
||||||
Eluna.PlayerAnnounceReload = false
|
Eluna.PlayerAnnounceReload = true
|
||||||
Eluna.RequirePaths = ""
|
Eluna.RequirePaths = ""
|
||||||
Eluna.RequireCPaths = ""
|
Eluna.RequireCPaths = ""
|
||||||
Eluna.AutoReload = false
|
Eluna.AutoReload = false
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -233,6 +233,7 @@ namespace Hooks
|
|||||||
PLAYER_EVENT_ON_AURA_APPLY = 64, // (event, player, aura)
|
PLAYER_EVENT_ON_AURA_APPLY = 64, // (event, player, aura)
|
||||||
PLAYER_EVENT_ON_HEAL = 65, // (event, player, target, gain) - Can return new heal amount
|
PLAYER_EVENT_ON_HEAL = 65, // (event, player, target, gain) - Can return new heal amount
|
||||||
PLAYER_EVENT_ON_DAMAGE = 66, // (event, player, target, damage) - Can return new damage amount
|
PLAYER_EVENT_ON_DAMAGE = 66, // (event, player, target, damage) - Can return new damage amount
|
||||||
|
PLAYER_EVENT_ON_BEFORE_TELEPORT = 67, // (event, player, mapid, x, y, z, orientation, options, target)
|
||||||
|
|
||||||
PLAYER_EVENT_COUNT
|
PLAYER_EVENT_COUNT
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -497,6 +497,7 @@ public:
|
|||||||
void OnPlayerAuraApply(Player* player, Aura* aura);
|
void OnPlayerAuraApply(Player* player, Aura* aura);
|
||||||
void OnPlayerHeal(Player* player, Unit* target, uint32& gain);
|
void OnPlayerHeal(Player* player, Unit* target, uint32& gain);
|
||||||
void OnPlayerDamage(Player* player, Unit* target, uint32& gain);
|
void OnPlayerDamage(Player* player, Unit* target, uint32& gain);
|
||||||
|
bool OnPlayerBeforeTeleport(Player* player, uint32 mapid, float x, float y, float z, float orientation, uint32 options, Unit* target);
|
||||||
|
|
||||||
/* Vehicle */
|
/* Vehicle */
|
||||||
void OnInstall(Vehicle* vehicle);
|
void OnInstall(Vehicle* vehicle);
|
||||||
|
|||||||
@@ -825,4 +825,20 @@ void Eluna::OnPlayerDamage(Player* player, Unit* target, uint32& damage)
|
|||||||
}
|
}
|
||||||
|
|
||||||
CleanUpStack(3);
|
CleanUpStack(3);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool Eluna::OnPlayerBeforeTeleport(Player* player, uint32 mapid, float x, float y, float z, float orientation, uint32 options, Unit* target)
|
||||||
|
{
|
||||||
|
START_HOOK_WITH_RETVAL(PLAYER_EVENT_ON_BEFORE_TELEPORT, true);
|
||||||
|
|
||||||
|
Push(player);
|
||||||
|
Push(mapid);
|
||||||
|
Push(x);
|
||||||
|
Push(y);
|
||||||
|
Push(z);
|
||||||
|
Push(orientation);
|
||||||
|
Push(options);
|
||||||
|
Push(target);
|
||||||
|
|
||||||
|
return CallAllFunctionsBool(PlayerEventBindings, key, true);
|
||||||
|
}
|
||||||
|
|||||||
@@ -785,6 +785,7 @@ namespace LuaGlobalFunctions
|
|||||||
* PLAYER_EVENT_ON_AURA_APPLY = 64, // (event, player, aura)
|
* PLAYER_EVENT_ON_AURA_APPLY = 64, // (event, player, aura)
|
||||||
* PLAYER_EVENT_ON_HEAL = 65, // (event, player, target, heal) - Can return new heal amount
|
* PLAYER_EVENT_ON_HEAL = 65, // (event, player, target, heal) - Can return new heal amount
|
||||||
* PLAYER_EVENT_ON_DAMAGE = 66, // (event, player, target, damage) - Can return new damage amount
|
* PLAYER_EVENT_ON_DAMAGE = 66, // (event, player, target, damage) - Can return new damage amount
|
||||||
|
* PLAYER_EVENT_ON_BEFORE_TELEPORT = 67, // (event, player, target, damage) - Can return new damage amount
|
||||||
* };
|
* };
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -0,0 +1,376 @@
|
|||||||
|
-- Create Squire NPC
|
||||||
|
INSERT
|
||||||
|
INTO
|
||||||
|
acore_world.creature_template (entry,
|
||||||
|
difficulty_entry_1,
|
||||||
|
difficulty_entry_2,
|
||||||
|
difficulty_entry_3,
|
||||||
|
KillCredit1,
|
||||||
|
KillCredit2,
|
||||||
|
name,
|
||||||
|
subname,
|
||||||
|
IconName,
|
||||||
|
gossip_menu_id,
|
||||||
|
minlevel,
|
||||||
|
maxlevel,
|
||||||
|
`exp`,
|
||||||
|
faction,
|
||||||
|
npcflag,
|
||||||
|
speed_walk,
|
||||||
|
speed_run,
|
||||||
|
speed_swim,
|
||||||
|
speed_flight,
|
||||||
|
detection_range,
|
||||||
|
`rank`,
|
||||||
|
dmgschool,
|
||||||
|
DamageModifier,
|
||||||
|
BaseAttackTime,
|
||||||
|
RangeAttackTime,
|
||||||
|
BaseVariance,
|
||||||
|
RangeVariance,
|
||||||
|
unit_class,
|
||||||
|
unit_flags,
|
||||||
|
unit_flags2,
|
||||||
|
dynamicflags,
|
||||||
|
family,
|
||||||
|
`type`,
|
||||||
|
type_flags,
|
||||||
|
lootid,
|
||||||
|
pickpocketloot,
|
||||||
|
skinloot,
|
||||||
|
PetSpellDataId,
|
||||||
|
VehicleId,
|
||||||
|
mingold,
|
||||||
|
maxgold,
|
||||||
|
AIName,
|
||||||
|
MovementType,
|
||||||
|
HoverHeight,
|
||||||
|
HealthModifier,
|
||||||
|
ManaModifier,
|
||||||
|
ArmorModifier,
|
||||||
|
ExperienceModifier,
|
||||||
|
RacialLeader,
|
||||||
|
movementId,
|
||||||
|
RegenHealth,
|
||||||
|
flags_extra,
|
||||||
|
ScriptName,
|
||||||
|
VerifiedBuild)
|
||||||
|
VALUES
|
||||||
|
(9000001,
|
||||||
|
29831,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
'Eluna Squire',
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
0,
|
||||||
|
81,
|
||||||
|
81,
|
||||||
|
2,
|
||||||
|
21,
|
||||||
|
69,341,185,
|
||||||
|
1.0,
|
||||||
|
1.42857,
|
||||||
|
1.0,
|
||||||
|
1.0,
|
||||||
|
20.0,
|
||||||
|
1,
|
||||||
|
0,
|
||||||
|
7.5,
|
||||||
|
2000,
|
||||||
|
2000,
|
||||||
|
1.0,
|
||||||
|
1.0,
|
||||||
|
1,
|
||||||
|
64,
|
||||||
|
2048,
|
||||||
|
8,
|
||||||
|
0,
|
||||||
|
6,
|
||||||
|
72,
|
||||||
|
100003,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
1163,
|
||||||
|
1524,
|
||||||
|
'PassiveAI',
|
||||||
|
0,
|
||||||
|
1.0,
|
||||||
|
4.0,
|
||||||
|
1.0,
|
||||||
|
1.0,
|
||||||
|
2.5,
|
||||||
|
0,
|
||||||
|
144,
|
||||||
|
1,
|
||||||
|
0,
|
||||||
|
'',
|
||||||
|
12340) ON DUPLICATE KEY UPDATE entry = entry;
|
||||||
|
|
||||||
|
|
||||||
|
-- Add Squire localization
|
||||||
|
INSERT INTO
|
||||||
|
acore_world.creature_template_locale (entry,
|
||||||
|
locale,
|
||||||
|
Name,
|
||||||
|
Title,
|
||||||
|
VerifiedBuild)
|
||||||
|
VALUES
|
||||||
|
(9000001,
|
||||||
|
'ruRU',
|
||||||
|
'Оруженосец',
|
||||||
|
'',
|
||||||
|
12340) ON DUPLICATE KEY UPDATE entry = entry;
|
||||||
|
|
||||||
|
|
||||||
|
-- Add Squire model
|
||||||
|
INSERT
|
||||||
|
INTO
|
||||||
|
acore_world.creature_template_model (CreatureID,
|
||||||
|
Idx,
|
||||||
|
CreatureDisplayID,
|
||||||
|
DisplayScale,
|
||||||
|
Probability,
|
||||||
|
VerifiedBuild)
|
||||||
|
VALUES
|
||||||
|
(9000001,
|
||||||
|
0,
|
||||||
|
16927,
|
||||||
|
1.0,
|
||||||
|
1.0,
|
||||||
|
12340) ON
|
||||||
|
DUPLICATE KEY
|
||||||
|
UPDATE
|
||||||
|
CreatureID = CreatureID;
|
||||||
|
|
||||||
|
-- Add Squire dialogue text
|
||||||
|
INSERT
|
||||||
|
INTO
|
||||||
|
acore_world.npc_text (ID,
|
||||||
|
text0_0,
|
||||||
|
text0_1,
|
||||||
|
BroadcastTextID0,
|
||||||
|
lang0,
|
||||||
|
Probability0,
|
||||||
|
em0_0,
|
||||||
|
em0_1,
|
||||||
|
em0_2,
|
||||||
|
em0_3,
|
||||||
|
em0_4,
|
||||||
|
em0_5,
|
||||||
|
text1_0,
|
||||||
|
text1_1,
|
||||||
|
BroadcastTextID1,
|
||||||
|
lang1,
|
||||||
|
Probability1,
|
||||||
|
em1_0,
|
||||||
|
em1_1,
|
||||||
|
em1_2,
|
||||||
|
em1_3,
|
||||||
|
em1_4,
|
||||||
|
em1_5,
|
||||||
|
text2_0,
|
||||||
|
text2_1,
|
||||||
|
BroadcastTextID2,
|
||||||
|
lang2,
|
||||||
|
Probability2,
|
||||||
|
em2_0,
|
||||||
|
em2_1,
|
||||||
|
em2_2,
|
||||||
|
em2_3,
|
||||||
|
em2_4,
|
||||||
|
em2_5,
|
||||||
|
text3_0,
|
||||||
|
text3_1,
|
||||||
|
BroadcastTextID3,
|
||||||
|
lang3,
|
||||||
|
Probability3,
|
||||||
|
em3_0,
|
||||||
|
em3_1,
|
||||||
|
em3_2,
|
||||||
|
em3_3,
|
||||||
|
em3_4,
|
||||||
|
em3_5,
|
||||||
|
text4_0,
|
||||||
|
text4_1,
|
||||||
|
BroadcastTextID4,
|
||||||
|
lang4,
|
||||||
|
Probability4,
|
||||||
|
em4_0,
|
||||||
|
em4_1,
|
||||||
|
em4_2,
|
||||||
|
em4_3,
|
||||||
|
em4_4,
|
||||||
|
em4_5,
|
||||||
|
text5_0,
|
||||||
|
text5_1,
|
||||||
|
BroadcastTextID5,
|
||||||
|
lang5,
|
||||||
|
Probability5,
|
||||||
|
em5_0,
|
||||||
|
em5_1,
|
||||||
|
em5_2,
|
||||||
|
em5_3,
|
||||||
|
em5_4,
|
||||||
|
em5_5,
|
||||||
|
text6_0,
|
||||||
|
text6_1,
|
||||||
|
BroadcastTextID6,
|
||||||
|
lang6,
|
||||||
|
Probability6,
|
||||||
|
em6_0,
|
||||||
|
em6_1,
|
||||||
|
em6_2,
|
||||||
|
em6_3,
|
||||||
|
em6_4,
|
||||||
|
em6_5,
|
||||||
|
text7_0,
|
||||||
|
text7_1,
|
||||||
|
BroadcastTextID7,
|
||||||
|
lang7,
|
||||||
|
Probability7,
|
||||||
|
em7_0,
|
||||||
|
em7_1,
|
||||||
|
em7_2,
|
||||||
|
em7_3,
|
||||||
|
em7_4,
|
||||||
|
em7_5,
|
||||||
|
VerifiedBuild)
|
||||||
|
VALUES
|
||||||
|
(10000000,
|
||||||
|
'',
|
||||||
|
'By the grace of the stars, I have been bound to your side, $n. This ancient pile of bones is ready to serve you.',
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0.0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0.0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0.0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0.0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0.0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0.0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0.0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0.0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0) ON DUPLICATE KEY UPDATE ID = ID;
|
||||||
|
|
||||||
|
-- Add squire dialogue text locale
|
||||||
|
INSERT
|
||||||
|
INTO
|
||||||
|
acore_world.npc_text_locale (ID,
|
||||||
|
Locale,
|
||||||
|
Text0_0,
|
||||||
|
Text0_1,
|
||||||
|
Text1_0,
|
||||||
|
Text1_1,
|
||||||
|
Text2_0,
|
||||||
|
Text2_1,
|
||||||
|
Text3_0,
|
||||||
|
Text3_1,
|
||||||
|
Text4_0,
|
||||||
|
Text4_1,
|
||||||
|
Text5_0,
|
||||||
|
Text5_1,
|
||||||
|
Text6_0,
|
||||||
|
Text6_1,
|
||||||
|
Text7_0,
|
||||||
|
Text7_1)
|
||||||
|
VALUES
|
||||||
|
(10000000,
|
||||||
|
'ruRU',
|
||||||
|
'',
|
||||||
|
'Милостью высших сил я был приставлен к тебе, $n. Эти древние кости готовы служить. Чего желаешь?',
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
'') ON DUPLICATE KEY UPDATE ID = ID;
|
||||||
|
|
||||||
|
|
||||||
@@ -30,13 +30,13 @@
|
|||||||
#include "WorldPacket.h"
|
#include "WorldPacket.h"
|
||||||
#include "WorldSession.h"
|
#include "WorldSession.h"
|
||||||
|
|
||||||
//void called when player click on auctioneer npc
|
// void called when player click on auctioneer npc
|
||||||
void WorldSession::HandleAuctionHelloOpcode(WorldPacket& recvData)
|
void WorldSession::HandleAuctionHelloOpcode(WorldPacket &recvData)
|
||||||
{
|
{
|
||||||
ObjectGuid guid; //NPC guid
|
ObjectGuid guid; // NPC guid
|
||||||
recvData >> guid;
|
recvData >> guid;
|
||||||
|
|
||||||
Creature* unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER);
|
Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER);
|
||||||
if (!unit)
|
if (!unit)
|
||||||
{
|
{
|
||||||
LOG_DEBUG("network", "WORLD: HandleAuctionHelloOpcode - Unit ({}) not found or you can't interact with him.", guid.ToString());
|
LOG_DEBUG("network", "WORLD: HandleAuctionHelloOpcode - Unit ({}) not found or you can't interact with him.", guid.ToString());
|
||||||
@@ -50,8 +50,8 @@ void WorldSession::HandleAuctionHelloOpcode(WorldPacket& recvData)
|
|||||||
SendAuctionHello(guid, unit);
|
SendAuctionHello(guid, unit);
|
||||||
}
|
}
|
||||||
|
|
||||||
//this void causes that auction window is opened
|
// this void causes that auction window is opened
|
||||||
void WorldSession::SendAuctionHello(ObjectGuid guid, Creature* unit)
|
void WorldSession::SendAuctionHello(ObjectGuid guid, Creature *unit)
|
||||||
{
|
{
|
||||||
if (GetPlayer()->GetLevel() < sWorld->getIntConfig(CONFIG_AUCTION_LEVEL_REQ))
|
if (GetPlayer()->GetLevel() < sWorld->getIntConfig(CONFIG_AUCTION_LEVEL_REQ))
|
||||||
{
|
{
|
||||||
@@ -62,18 +62,18 @@ void WorldSession::SendAuctionHello(ObjectGuid guid, Creature* unit)
|
|||||||
if (!sScriptMgr->CanSendAuctionHello(this, guid, unit))
|
if (!sScriptMgr->CanSendAuctionHello(this, guid, unit))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
AuctionHouseEntry const* ahEntry = AuctionHouseMgr::GetAuctionHouseEntryFromFactionTemplate(unit->GetFaction());
|
AuctionHouseEntry const *ahEntry = AuctionHouseMgr::GetAuctionHouseEntryFromFactionTemplate(unit->GetFaction());
|
||||||
if (!ahEntry)
|
if (!ahEntry)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
WorldPacket data(MSG_AUCTION_HELLO, 12);
|
WorldPacket data(MSG_AUCTION_HELLO, 12);
|
||||||
data << guid;
|
data << guid;
|
||||||
data << uint32(ahEntry->houseId);
|
data << uint32(ahEntry->houseId);
|
||||||
data << uint8(1); // 3.3.3: 1 - AH enabled, 0 - AH disabled
|
data << uint8(1); // 3.3.3: 1 - AH enabled, 0 - AH disabled
|
||||||
SendPacket(&data);
|
SendPacket(&data);
|
||||||
}
|
}
|
||||||
|
|
||||||
//call this method when player bids, creates, or deletes auction
|
// call this method when player bids, creates, or deletes auction
|
||||||
void WorldSession::SendAuctionCommandResult(uint32 auctionId, uint32 Action, uint32 ErrorCode, uint32 bidError)
|
void WorldSession::SendAuctionCommandResult(uint32 auctionId, uint32 Action, uint32 ErrorCode, uint32 bidError)
|
||||||
{
|
{
|
||||||
WorldPacket data(SMSG_AUCTION_COMMAND_RESULT, 16);
|
WorldPacket data(SMSG_AUCTION_COMMAND_RESULT, 16);
|
||||||
@@ -81,11 +81,11 @@ void WorldSession::SendAuctionCommandResult(uint32 auctionId, uint32 Action, uin
|
|||||||
data << Action;
|
data << Action;
|
||||||
data << ErrorCode;
|
data << ErrorCode;
|
||||||
if (!ErrorCode && Action)
|
if (!ErrorCode && Action)
|
||||||
data << bidError; //when bid, then send 0, once...
|
data << bidError; // when bid, then send 0, once...
|
||||||
SendPacket(&data);
|
SendPacket(&data);
|
||||||
}
|
}
|
||||||
|
|
||||||
//this function sends notification, if bidder is online
|
// this function sends notification, if bidder is online
|
||||||
void WorldSession::SendAuctionBidderNotification(uint32 location, uint32 auctionId, ObjectGuid bidder, uint32 bidSum, uint32 diff, uint32 item_template)
|
void WorldSession::SendAuctionBidderNotification(uint32 location, uint32 auctionId, ObjectGuid bidder, uint32 bidSum, uint32 diff, uint32 item_template)
|
||||||
{
|
{
|
||||||
WorldPacket data(SMSG_AUCTION_BIDDER_NOTIFICATION, (8 * 4));
|
WorldPacket data(SMSG_AUCTION_BIDDER_NOTIFICATION, (8 * 4));
|
||||||
@@ -99,22 +99,22 @@ void WorldSession::SendAuctionBidderNotification(uint32 location, uint32 auction
|
|||||||
SendPacket(&data);
|
SendPacket(&data);
|
||||||
}
|
}
|
||||||
|
|
||||||
//this void causes on client to display: "Your auction sold"
|
// this void causes on client to display: "Your auction sold"
|
||||||
void WorldSession::SendAuctionOwnerNotification(AuctionEntry* auction)
|
void WorldSession::SendAuctionOwnerNotification(AuctionEntry *auction)
|
||||||
{
|
{
|
||||||
WorldPacket data(SMSG_AUCTION_OWNER_NOTIFICATION, (8 * 4));
|
WorldPacket data(SMSG_AUCTION_OWNER_NOTIFICATION, (8 * 4));
|
||||||
data << uint32(auction->Id);
|
data << uint32(auction->Id);
|
||||||
data << uint32(auction->bid);
|
data << uint32(auction->bid);
|
||||||
data << uint32(0); //unk
|
data << uint32(0); // unk
|
||||||
data << uint64(0); //unk (bidder guid?)
|
data << uint64(0); // unk (bidder guid?)
|
||||||
data << uint32(auction->item_template);
|
data << uint32(auction->item_template);
|
||||||
data << uint32(0); //unk
|
data << uint32(0); // unk
|
||||||
data << float(0); //unk (time?)
|
data << float(0); // unk (time?)
|
||||||
SendPacket(&data);
|
SendPacket(&data);
|
||||||
}
|
}
|
||||||
|
|
||||||
//this void creates new auction and adds auction to some auctionhouse
|
// this void creates new auction and adds auction to some auctionhouse
|
||||||
void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
|
void WorldSession::HandleAuctionSellItem(WorldPacket &recvData)
|
||||||
{
|
{
|
||||||
ObjectGuid auctioneer;
|
ObjectGuid auctioneer;
|
||||||
uint32 itemsCount, etime, bid, buyout;
|
uint32 itemsCount, etime, bid, buyout;
|
||||||
@@ -161,19 +161,19 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
|
|||||||
if (bid > MAX_MONEY_AMOUNT || buyout > MAX_MONEY_AMOUNT)
|
if (bid > MAX_MONEY_AMOUNT || buyout > MAX_MONEY_AMOUNT)
|
||||||
{
|
{
|
||||||
LOG_DEBUG("network", "WORLD: HandleAuctionSellItem - Player {} ({}) attempted to sell item with higher price than max gold amount.",
|
LOG_DEBUG("network", "WORLD: HandleAuctionSellItem - Player {} ({}) attempted to sell item with higher price than max gold amount.",
|
||||||
_player->GetName(), _player->GetGUID().ToString());
|
_player->GetName(), _player->GetGUID().ToString());
|
||||||
SendAuctionCommandResult(0, AUCTION_SELL_ITEM, ERR_AUCTION_DATABASE_ERROR);
|
SendAuctionCommandResult(0, AUCTION_SELL_ITEM, ERR_AUCTION_DATABASE_ERROR);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER);
|
Creature *creature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER);
|
||||||
if (!creature)
|
if (!creature)
|
||||||
{
|
{
|
||||||
LOG_DEBUG("network", "WORLD: HandleAuctionSellItem - Unit ({}) not found or you can't interact with him.", auctioneer.ToString());
|
LOG_DEBUG("network", "WORLD: HandleAuctionSellItem - Unit ({}) not found or you can't interact with him.", auctioneer.ToString());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
AuctionHouseEntry const* auctionHouseEntry = AuctionHouseMgr::GetAuctionHouseEntryFromFactionTemplate(creature->GetFaction());
|
AuctionHouseEntry const *auctionHouseEntry = AuctionHouseMgr::GetAuctionHouseEntryFromFactionTemplate(creature->GetFaction());
|
||||||
if (!auctionHouseEntry)
|
if (!auctionHouseEntry)
|
||||||
{
|
{
|
||||||
LOG_DEBUG("network", "WORLD: HandleAuctionSellItem - Unit ({}) has wrong faction.", auctioneer.ToString());
|
LOG_DEBUG("network", "WORLD: HandleAuctionSellItem - Unit ({}) has wrong faction.", auctioneer.ToString());
|
||||||
@@ -184,25 +184,25 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
|
|||||||
|
|
||||||
switch (etime)
|
switch (etime)
|
||||||
{
|
{
|
||||||
case 1*MIN_AUCTION_TIME:
|
case 1 * MIN_AUCTION_TIME:
|
||||||
case 2*MIN_AUCTION_TIME:
|
case 2 * MIN_AUCTION_TIME:
|
||||||
case 4*MIN_AUCTION_TIME:
|
case 4 * MIN_AUCTION_TIME:
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (GetPlayer()->HasUnitState(UNIT_STATE_DIED))
|
if (GetPlayer()->HasUnitState(UNIT_STATE_DIED))
|
||||||
GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
|
GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
|
||||||
|
|
||||||
Item* items[MAX_AUCTION_ITEMS];
|
Item *items[MAX_AUCTION_ITEMS];
|
||||||
|
|
||||||
uint32 finalCount = 0;
|
uint32 finalCount = 0;
|
||||||
uint32 itemEntry = 0;
|
uint32 itemEntry = 0;
|
||||||
|
|
||||||
for (uint32 i = 0; i < itemsCount; ++i)
|
for (uint32 i = 0; i < itemsCount; ++i)
|
||||||
{
|
{
|
||||||
Item* item = _player->GetItemByGuid(itemGUIDs[i]);
|
Item *item = _player->GetItemByGuid(itemGUIDs[i]);
|
||||||
|
|
||||||
if (!item)
|
if (!item)
|
||||||
{
|
{
|
||||||
@@ -214,8 +214,8 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
|
|||||||
itemEntry = item->GetTemplate()->ItemId;
|
itemEntry = item->GetTemplate()->ItemId;
|
||||||
|
|
||||||
if (sAuctionMgr->GetAItem(item->GetGUID()) || !item->CanBeTraded() || item->IsNotEmptyBag() ||
|
if (sAuctionMgr->GetAItem(item->GetGUID()) || !item->CanBeTraded() || item->IsNotEmptyBag() ||
|
||||||
item->GetTemplate()->HasFlag(ITEM_FLAG_CONJURED) || item->GetUInt32Value(ITEM_FIELD_DURATION) ||
|
item->GetTemplate()->HasFlag(ITEM_FLAG_CONJURED) || item->GetUInt32Value(ITEM_FIELD_DURATION) ||
|
||||||
item->GetCount() < count[i] || itemEntry != item->GetTemplate()->ItemId)
|
item->GetCount() < count[i] || itemEntry != item->GetTemplate()->ItemId)
|
||||||
{
|
{
|
||||||
SendAuctionCommandResult(0, AUCTION_SELL_ITEM, ERR_AUCTION_DATABASE_ERROR);
|
SendAuctionCommandResult(0, AUCTION_SELL_ITEM, ERR_AUCTION_DATABASE_ERROR);
|
||||||
return;
|
return;
|
||||||
@@ -246,7 +246,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
|
|||||||
|
|
||||||
for (uint32 i = 0; i < itemsCount; ++i)
|
for (uint32 i = 0; i < itemsCount; ++i)
|
||||||
{
|
{
|
||||||
Item* item = items[i];
|
Item *item = items[i];
|
||||||
|
|
||||||
if (item->GetMaxStackCount() < finalCount)
|
if (item->GetMaxStackCount() < finalCount)
|
||||||
{
|
{
|
||||||
@@ -257,10 +257,10 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
|
|||||||
|
|
||||||
for (uint32 i = 0; i < itemsCount; ++i)
|
for (uint32 i = 0; i < itemsCount; ++i)
|
||||||
{
|
{
|
||||||
Item* item = items[i];
|
Item *item = items[i];
|
||||||
|
|
||||||
uint32 auctionTime = uint32(etime * sWorld->getRate(RATE_AUCTION_TIME));
|
uint32 auctionTime = uint32(etime * sWorld->getRate(RATE_AUCTION_TIME));
|
||||||
AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(creature->GetFaction());
|
AuctionHouseObject *auctionHouse = sAuctionMgr->GetAuctionsMap(creature->GetFaction());
|
||||||
|
|
||||||
uint32 deposit = sAuctionMgr->GetAuctionDeposit(auctionHouseEntry, etime, item, finalCount);
|
uint32 deposit = sAuctionMgr->GetAuctionDeposit(auctionHouseEntry, etime, item, finalCount);
|
||||||
if (!_player->HasEnoughMoney(deposit))
|
if (!_player->HasEnoughMoney(deposit))
|
||||||
@@ -271,22 +271,14 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
|
|||||||
|
|
||||||
_player->ModifyMoney(-int32(deposit));
|
_player->ModifyMoney(-int32(deposit));
|
||||||
|
|
||||||
AuctionEntry* AH = new AuctionEntry;
|
AuctionEntry *AH = new AuctionEntry;
|
||||||
AH->Id = sObjectMgr->GenerateAuctionID();
|
AH->Id = sObjectMgr->GenerateAuctionID();
|
||||||
|
|
||||||
if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
|
if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
|
||||||
AH->houseId = AuctionHouseId::Neutral;
|
AH->houseId = AuctionHouseId::Neutral;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
CreatureData const* auctioneerData = sObjectMgr->GetCreatureData(creature->GetSpawnId());
|
CreatureTemplate const *auctioneerInfo = creature->GetCreatureTemplate();
|
||||||
if (!auctioneerData)
|
|
||||||
{
|
|
||||||
LOG_ERROR("network.opcode", "Data for auctioneer not found ({})", auctioneer.ToString());
|
|
||||||
delete AH;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
CreatureTemplate const* auctioneerInfo = sObjectMgr->GetCreatureTemplate(auctioneerData->id);
|
|
||||||
if (!auctioneerInfo)
|
if (!auctioneerInfo)
|
||||||
{
|
{
|
||||||
LOG_ERROR("network.opcode", "Non existing auctioneer ({})", auctioneer.ToString());
|
LOG_ERROR("network.opcode", "Non existing auctioneer ({})", auctioneer.ToString());
|
||||||
@@ -294,7 +286,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
AuctionHouseEntry const* AHEntry = sAuctionMgr->GetAuctionHouseEntryFromFactionTemplate(auctioneerInfo->faction);
|
AuctionHouseEntry const *AHEntry = sAuctionMgr->GetAuctionHouseEntryFromFactionTemplate(auctioneerInfo->faction);
|
||||||
AH->houseId = AuctionHouseId(AHEntry->houseId);
|
AH->houseId = AuctionHouseId(AHEntry->houseId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -314,7 +306,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
|
|||||||
AH->auctionHouseEntry = auctionHouseEntry;
|
AH->auctionHouseEntry = auctionHouseEntry;
|
||||||
|
|
||||||
LOG_DEBUG("network.opcode", "CMSG_AUCTION_SELL_ITEM: Player {} ({}) is selling item {} entry {} ({}) with count {} with initial bid {} with buyout {} and with time {} (in sec) in auctionhouse {}",
|
LOG_DEBUG("network.opcode", "CMSG_AUCTION_SELL_ITEM: Player {} ({}) is selling item {} entry {} ({}) with count {} with initial bid {} with buyout {} and with time {} (in sec) in auctionhouse {}",
|
||||||
_player->GetName(), _player->GetGUID().ToString(), item->GetTemplate()->Name1, item->GetEntry(), item->GetGUID().ToString(), item->GetCount(), bid, buyout, auctionTime, AH->GetHouseId());
|
_player->GetName(), _player->GetGUID().ToString(), item->GetTemplate()->Name1, item->GetEntry(), item->GetGUID().ToString(), item->GetCount(), bid, buyout, auctionTime, AH->GetHouseId());
|
||||||
sAuctionMgr->AddAItem(item);
|
sAuctionMgr->AddAItem(item);
|
||||||
auctionHouse->AddAuction(AH);
|
auctionHouse->AddAuction(AH);
|
||||||
|
|
||||||
@@ -332,21 +324,21 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
|
|||||||
if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE))
|
if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE))
|
||||||
{
|
{
|
||||||
LOG_GM(GetAccountId(), "GM {} (Account: {}) created auction: {} (Item: {} Count: {}) Bid: {} Buyout: {}",
|
LOG_GM(GetAccountId(), "GM {} (Account: {}) created auction: {} (Item: {} Count: {}) Bid: {} Buyout: {}",
|
||||||
_player->GetName(), GetAccountId(), AH->Id,
|
_player->GetName(), GetAccountId(), AH->Id,
|
||||||
item->GetTemplate()->Name1, item->GetCount(), bid, buyout);
|
item->GetTemplate()->Name1, item->GetCount(), bid, buyout);
|
||||||
}
|
}
|
||||||
|
|
||||||
GetPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CREATE_AUCTION, 1);
|
GetPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CREATE_AUCTION, 1);
|
||||||
|
|
||||||
LOG_INFO("entities.player.auctionhouse", "AuctionHouse: Account: {} (IP: {}), Player [{}] (GUID: {}) created auction #{}: Item '{}' (Entry: {}) x{}, StartBid: {} copper, Buyout: {} copper, Deposit: {} copper",
|
LOG_INFO("entities.player.auctionhouse", "AuctionHouse: Account: {} (IP: {}), Player [{}] (GUID: {}) created auction #{}: Item '{}' (Entry: {}) x{}, StartBid: {} copper, Buyout: {} copper, Deposit: {} copper",
|
||||||
GetAccountId(), GetRemoteAddress(), _player->GetName(), _player->GetGUID().GetCounter(), AH->Id,
|
GetAccountId(), GetRemoteAddress(), _player->GetName(), _player->GetGUID().GetCounter(), AH->Id,
|
||||||
item->GetTemplate()->Name1, item->GetEntry(), item->GetCount(), bid, buyout, deposit);
|
item->GetTemplate()->Name1, item->GetEntry(), item->GetCount(), bid, buyout, deposit);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else // Required stack size of auction does not match to current item stack size, clone item and set correct stack size
|
else // Required stack size of auction does not match to current item stack size, clone item and set correct stack size
|
||||||
{
|
{
|
||||||
Item* newItem = item->CloneItem(finalCount, _player);
|
Item *newItem = item->CloneItem(finalCount, _player);
|
||||||
if (!newItem)
|
if (!newItem)
|
||||||
{
|
{
|
||||||
LOG_ERROR("network.opcode", "CMSG_AUCTION_SELL_ITEM: Could not create clone of item {}", item->GetEntry());
|
LOG_ERROR("network.opcode", "CMSG_AUCTION_SELL_ITEM: Could not create clone of item {}", item->GetEntry());
|
||||||
@@ -367,13 +359,13 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
|
|||||||
AH->auctionHouseEntry = auctionHouseEntry;
|
AH->auctionHouseEntry = auctionHouseEntry;
|
||||||
|
|
||||||
LOG_DEBUG("network.opcode", "CMSG_AUCTION_SELL_ITEM: Player {} ({}) is selling item {} entry {} ({}) with count {} with initial bid {} with buyout {} and with time {} (in sec) in auctionhouse {}",
|
LOG_DEBUG("network.opcode", "CMSG_AUCTION_SELL_ITEM: Player {} ({}) is selling item {} entry {} ({}) with count {} with initial bid {} with buyout {} and with time {} (in sec) in auctionhouse {}",
|
||||||
_player->GetName(), _player->GetGUID().ToString(), newItem->GetTemplate()->Name1, newItem->GetEntry(), newItem->GetGUID().ToString(), newItem->GetCount(), bid, buyout, auctionTime, AH->GetHouseId());
|
_player->GetName(), _player->GetGUID().ToString(), newItem->GetTemplate()->Name1, newItem->GetEntry(), newItem->GetGUID().ToString(), newItem->GetCount(), bid, buyout, auctionTime, AH->GetHouseId());
|
||||||
sAuctionMgr->AddAItem(newItem);
|
sAuctionMgr->AddAItem(newItem);
|
||||||
auctionHouse->AddAuction(AH);
|
auctionHouse->AddAuction(AH);
|
||||||
|
|
||||||
for (uint32 j = 0; j < itemsCount; ++j)
|
for (uint32 j = 0; j < itemsCount; ++j)
|
||||||
{
|
{
|
||||||
Item* item2 = items[j];
|
Item *item2 = items[j];
|
||||||
|
|
||||||
// Item stack count equals required count, ready to delete item - cloned item will be used for auction
|
// Item stack count equals required count, ready to delete item - cloned item will be used for auction
|
||||||
if (item2->GetCount() == count[j])
|
if (item2->GetCount() == count[j])
|
||||||
@@ -406,23 +398,23 @@ void WorldSession::HandleAuctionSellItem(WorldPacket& recvData)
|
|||||||
if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE))
|
if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE))
|
||||||
{
|
{
|
||||||
LOG_GM(GetAccountId(), "GM {} (Account: {}) created auction: {} (Item: {} Count: {}) Bid: {} Buyout: {}",
|
LOG_GM(GetAccountId(), "GM {} (Account: {}) created auction: {} (Item: {} Count: {}) Bid: {} Buyout: {}",
|
||||||
_player->GetName(), GetAccountId(), AH->Id,
|
_player->GetName(), GetAccountId(), AH->Id,
|
||||||
newItem->GetTemplate()->Name1, newItem->GetCount(), bid, buyout);
|
newItem->GetTemplate()->Name1, newItem->GetCount(), bid, buyout);
|
||||||
}
|
}
|
||||||
|
|
||||||
GetPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CREATE_AUCTION, 1);
|
GetPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CREATE_AUCTION, 1);
|
||||||
|
|
||||||
LOG_INFO("entities.player.auctionhouse", "AuctionHouse: Account: {} (IP: {}), Player [{}] (GUID: {}) created auction #{}: Item '{}' (Entry: {}) x{}, StartBid: {} copper, Buyout: {} copper, Deposit: {} copper",
|
LOG_INFO("entities.player.auctionhouse", "AuctionHouse: Account: {} (IP: {}), Player [{}] (GUID: {}) created auction #{}: Item '{}' (Entry: {}) x{}, StartBid: {} copper, Buyout: {} copper, Deposit: {} copper",
|
||||||
GetAccountId(), GetRemoteAddress(), _player->GetName(), _player->GetGUID().GetCounter(), AH->Id,
|
GetAccountId(), GetRemoteAddress(), _player->GetName(), _player->GetGUID().GetCounter(), AH->Id,
|
||||||
newItem->GetTemplate()->Name1, newItem->GetEntry(), newItem->GetCount(), bid, buyout, deposit);
|
newItem->GetTemplate()->Name1, newItem->GetEntry(), newItem->GetCount(), bid, buyout, deposit);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//this function is called when client bids or buys out auction
|
// this function is called when client bids or buys out auction
|
||||||
void WorldSession::HandleAuctionPlaceBid(WorldPacket& recvData)
|
void WorldSession::HandleAuctionPlaceBid(WorldPacket &recvData)
|
||||||
{
|
{
|
||||||
ObjectGuid auctioneer;
|
ObjectGuid auctioneer;
|
||||||
uint32 auctionId;
|
uint32 auctionId;
|
||||||
@@ -431,7 +423,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket& recvData)
|
|||||||
recvData >> auctionId >> price;
|
recvData >> auctionId >> price;
|
||||||
|
|
||||||
if (!auctionId || !price)
|
if (!auctionId || !price)
|
||||||
return; //check for cheaters
|
return; // check for cheaters
|
||||||
|
|
||||||
if (sWorld->getBoolConfig(CONFIG_TRIAL_RESTRICTION_AUCTION) && IsTrialAccount())
|
if (sWorld->getBoolConfig(CONFIG_TRIAL_RESTRICTION_AUCTION) && IsTrialAccount())
|
||||||
{
|
{
|
||||||
@@ -439,7 +431,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket& recvData)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER);
|
Creature *creature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER);
|
||||||
if (!creature)
|
if (!creature)
|
||||||
{
|
{
|
||||||
LOG_DEBUG("network", "WORLD: HandleAuctionPlaceBid - Unit ({}) not found or you can't interact with him.", auctioneer.ToString());
|
LOG_DEBUG("network", "WORLD: HandleAuctionPlaceBid - Unit ({}) not found or you can't interact with him.", auctioneer.ToString());
|
||||||
@@ -450,10 +442,10 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket& recvData)
|
|||||||
if (GetPlayer()->HasUnitState(UNIT_STATE_DIED))
|
if (GetPlayer()->HasUnitState(UNIT_STATE_DIED))
|
||||||
GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
|
GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
|
||||||
|
|
||||||
AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(creature->GetFaction());
|
AuctionHouseObject *auctionHouse = sAuctionMgr->GetAuctionsMap(creature->GetFaction());
|
||||||
|
|
||||||
AuctionEntry* auction = auctionHouse->GetAuction(auctionId);
|
AuctionEntry *auction = auctionHouse->GetAuction(auctionId);
|
||||||
Player* player = GetPlayer();
|
Player *player = GetPlayer();
|
||||||
|
|
||||||
if (!sScriptMgr->OnPlayerCanPlaceAuctionBid(player, auction))
|
if (!sScriptMgr->OnPlayerCanPlaceAuctionBid(player, auction))
|
||||||
{
|
{
|
||||||
@@ -470,16 +462,16 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket& recvData)
|
|||||||
|
|
||||||
if (auction->owner == player->GetGUID())
|
if (auction->owner == player->GetGUID())
|
||||||
{
|
{
|
||||||
//you cannot bid your own auction:
|
// you cannot bid your own auction:
|
||||||
SendAuctionCommandResult(0, AUCTION_PLACE_BID, ERR_AUCTION_BID_OWN);
|
SendAuctionCommandResult(0, AUCTION_PLACE_BID, ERR_AUCTION_BID_OWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// impossible have online own another character (use this for speedup check in case online owner)
|
// impossible have online own another character (use this for speedup check in case online owner)
|
||||||
Player* auction_owner = ObjectAccessor::FindConnectedPlayer(auction->owner);
|
Player *auction_owner = ObjectAccessor::FindConnectedPlayer(auction->owner);
|
||||||
if (!auction_owner && sCharacterCache->GetCharacterAccountIdByGuid(auction->owner) == GetAccountId())
|
if (!auction_owner && sCharacterCache->GetCharacterAccountIdByGuid(auction->owner) == GetAccountId())
|
||||||
{
|
{
|
||||||
//you cannot bid your another character auction:
|
// you cannot bid your another character auction:
|
||||||
SendAuctionCommandResult(0, AUCTION_PLACE_BID, ERR_AUCTION_BID_OWN);
|
SendAuctionCommandResult(0, AUCTION_PLACE_BID, ERR_AUCTION_BID_OWN);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -490,16 +482,16 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket& recvData)
|
|||||||
|
|
||||||
// price too low for next bid if not buyout
|
// price too low for next bid if not buyout
|
||||||
if ((price < auction->buyout || auction->buyout == 0) &&
|
if ((price < auction->buyout || auction->buyout == 0) &&
|
||||||
price < auction->bid + AuctionEntry::CalculateAuctionOutBid(auction->bid))
|
price < auction->bid + AuctionEntry::CalculateAuctionOutBid(auction->bid))
|
||||||
{
|
{
|
||||||
//auction has already higher bid, client tests it!
|
// auction has already higher bid, client tests it!
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!player->HasEnoughMoney(price))
|
if (!player->HasEnoughMoney(price))
|
||||||
{
|
{
|
||||||
//you don't have enought money!, client tests!
|
// you don't have enought money!, client tests!
|
||||||
//SendAuctionCommandResult(auction->auctionId, AUCTION_PLACE_BID, ???);
|
// SendAuctionCommandResult(auction->auctionId, AUCTION_PLACE_BID, ???);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -528,7 +520,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket& recvData)
|
|||||||
|
|
||||||
GetPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_AUCTION_BID, price);
|
GetPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_AUCTION_BID, price);
|
||||||
|
|
||||||
CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_AUCTION_BID);
|
CharacterDatabasePreparedStatement *stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_AUCTION_BID);
|
||||||
stmt->SetData(0, auction->bidder.GetCounter());
|
stmt->SetData(0, auction->bidder.GetCounter());
|
||||||
stmt->SetData(1, auction->bid);
|
stmt->SetData(1, auction->bid);
|
||||||
stmt->SetData(2, auction->Id);
|
stmt->SetData(2, auction->Id);
|
||||||
@@ -539,23 +531,23 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket& recvData)
|
|||||||
if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE))
|
if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE))
|
||||||
{
|
{
|
||||||
LOG_GM(GetAccountId(), "GM {} (Account: {}) bid on auction: {} (Item: {} Count: {}) Bid: {}",
|
LOG_GM(GetAccountId(), "GM {} (Account: {}) bid on auction: {} (Item: {} Count: {}) Bid: {}",
|
||||||
player->GetName(), GetAccountId(), auction->Id,
|
player->GetName(), GetAccountId(), auction->Id,
|
||||||
auction->item_template, auction->itemCount, price);
|
auction->item_template, auction->itemCount, price);
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG_INFO("entities.player.auctionhouse", "AuctionHouse: Account: {} (IP: {}), Player [{}] (GUID: {}) placed bid on auction #{}: Item (Entry: {}) x{}, Bid: {} copper, Owner: {} (GUID: {})",
|
LOG_INFO("entities.player.auctionhouse", "AuctionHouse: Account: {} (IP: {}), Player [{}] (GUID: {}) placed bid on auction #{}: Item (Entry: {}) x{}, Bid: {} copper, Owner: {} (GUID: {})",
|
||||||
GetAccountId(), GetRemoteAddress(), player->GetName(), player->GetGUID().GetCounter(),
|
GetAccountId(), GetRemoteAddress(), player->GetName(), player->GetGUID().GetCounter(),
|
||||||
auction->Id, auction->item_template, auction->itemCount, price, auction->owner.GetCounter(), auction->owner.GetCounter());
|
auction->Id, auction->item_template, auction->itemCount, price, auction->owner.GetCounter(), auction->owner.GetCounter());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//buyout:
|
// buyout:
|
||||||
if (player->GetGUID() == auction->bidder)
|
if (player->GetGUID() == auction->bidder)
|
||||||
player->ModifyMoney(-int32(auction->buyout - auction->bid));
|
player->ModifyMoney(-int32(auction->buyout - auction->bid));
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
player->ModifyMoney(-int32(auction->buyout));
|
player->ModifyMoney(-int32(auction->buyout));
|
||||||
if (auction->bidder) //buyout for bidded auction ..
|
if (auction->bidder) // buyout for bidded auction ..
|
||||||
sAuctionMgr->SendAuctionOutbiddedMail(auction, auction->buyout, GetPlayer(), trans);
|
sAuctionMgr->SendAuctionOutbiddedMail(auction, auction->buyout, GetPlayer(), trans);
|
||||||
}
|
}
|
||||||
auction->bidder = player->GetGUID();
|
auction->bidder = player->GetGUID();
|
||||||
@@ -573,13 +565,13 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket& recvData)
|
|||||||
if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE))
|
if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE))
|
||||||
{
|
{
|
||||||
LOG_GM(GetAccountId(), "GM {} (Account: {}) bought out auction: {} (Item: {} Count: {}) Buyout: {}",
|
LOG_GM(GetAccountId(), "GM {} (Account: {}) bought out auction: {} (Item: {} Count: {}) Buyout: {}",
|
||||||
player->GetName(), GetAccountId(), auction->Id,
|
player->GetName(), GetAccountId(), auction->Id,
|
||||||
auction->item_template, auction->itemCount, auction->buyout);
|
auction->item_template, auction->itemCount, auction->buyout);
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG_INFO("entities.player.auctionhouse", "AuctionHouse: Account: {} (IP: {}), Player [{}] (GUID: {}) bought out auction #{}: Item (Entry: {}) x{}, Buyout: {} copper, Owner: {} (GUID: {})",
|
LOG_INFO("entities.player.auctionhouse", "AuctionHouse: Account: {} (IP: {}), Player [{}] (GUID: {}) bought out auction #{}: Item (Entry: {}) x{}, Buyout: {} copper, Owner: {} (GUID: {})",
|
||||||
GetAccountId(), GetRemoteAddress(), player->GetName(), player->GetGUID().GetCounter(),
|
GetAccountId(), GetRemoteAddress(), player->GetName(), player->GetGUID().GetCounter(),
|
||||||
auction->Id, auction->item_template, auction->itemCount, auction->buyout, auction->owner.GetCounter(), auction->owner.GetCounter());
|
auction->Id, auction->item_template, auction->itemCount, auction->buyout, auction->owner.GetCounter(), auction->owner.GetCounter());
|
||||||
|
|
||||||
auction->DeleteFromDB(trans);
|
auction->DeleteFromDB(trans);
|
||||||
|
|
||||||
@@ -590,8 +582,8 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket& recvData)
|
|||||||
CharacterDatabase.CommitTransaction(trans);
|
CharacterDatabase.CommitTransaction(trans);
|
||||||
}
|
}
|
||||||
|
|
||||||
//this void is called when auction_owner cancels his auction
|
// this void is called when auction_owner cancels his auction
|
||||||
void WorldSession::HandleAuctionRemoveItem(WorldPacket& recvData)
|
void WorldSession::HandleAuctionRemoveItem(WorldPacket &recvData)
|
||||||
{
|
{
|
||||||
ObjectGuid auctioneer;
|
ObjectGuid auctioneer;
|
||||||
uint32 auctionId;
|
uint32 auctionId;
|
||||||
@@ -604,7 +596,7 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket& recvData)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER);
|
Creature *creature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer, UNIT_NPC_FLAG_AUCTIONEER);
|
||||||
if (!creature)
|
if (!creature)
|
||||||
{
|
{
|
||||||
LOG_DEBUG("network", "WORLD: HandleAuctionRemoveItem - Unit ({}) not found or you can't interact with him.", auctioneer.ToString());
|
LOG_DEBUG("network", "WORLD: HandleAuctionRemoveItem - Unit ({}) not found or you can't interact with him.", auctioneer.ToString());
|
||||||
@@ -615,47 +607,47 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket& recvData)
|
|||||||
if (GetPlayer()->HasUnitState(UNIT_STATE_DIED))
|
if (GetPlayer()->HasUnitState(UNIT_STATE_DIED))
|
||||||
GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
|
GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
|
||||||
|
|
||||||
AuctionHouseObject* auctionHouse = sAuctionMgr->GetAuctionsMap(creature->GetFaction());
|
AuctionHouseObject *auctionHouse = sAuctionMgr->GetAuctionsMap(creature->GetFaction());
|
||||||
|
|
||||||
AuctionEntry* auction = auctionHouse->GetAuction(auctionId);
|
AuctionEntry *auction = auctionHouse->GetAuction(auctionId);
|
||||||
Player* player = GetPlayer();
|
Player *player = GetPlayer();
|
||||||
|
|
||||||
CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction();
|
CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction();
|
||||||
if (auction && auction->owner == player->GetGUID())
|
if (auction && auction->owner == player->GetGUID())
|
||||||
{
|
{
|
||||||
Item* pItem = sAuctionMgr->GetAItem(auction->item_guid);
|
Item *pItem = sAuctionMgr->GetAItem(auction->item_guid);
|
||||||
if (!pItem)
|
if (!pItem)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (auction->bidder) // If we have a bidder, we have to send him the money he paid
|
if (auction->bidder) // If we have a bidder, we have to send him the money he paid
|
||||||
{
|
{
|
||||||
uint32 auctionCut = auction->GetAuctionCut();
|
uint32 auctionCut = auction->GetAuctionCut();
|
||||||
if (!player->HasEnoughMoney(auctionCut)) //player doesn't have enough money, maybe message needed
|
if (!player->HasEnoughMoney(auctionCut)) // player doesn't have enough money, maybe message needed
|
||||||
return;
|
return;
|
||||||
//some auctionBidderNotification would be needed, but don't know that parts..
|
// some auctionBidderNotification would be needed, but don't know that parts..
|
||||||
sAuctionMgr->SendAuctionCancelledToBidderMail(auction, trans);
|
sAuctionMgr->SendAuctionCancelledToBidderMail(auction, trans);
|
||||||
player->ModifyMoney(-int32(auctionCut));
|
player->ModifyMoney(-int32(auctionCut));
|
||||||
}
|
}
|
||||||
|
|
||||||
// item will deleted or added to received mail list
|
// item will deleted or added to received mail list
|
||||||
MailDraft(auction->BuildAuctionMailSubject(AUCTION_CANCELED), AuctionEntry::BuildAuctionMailBody(ObjectGuid::Empty, 0, auction->buyout, auction->deposit))
|
MailDraft(auction->BuildAuctionMailSubject(AUCTION_CANCELED), AuctionEntry::BuildAuctionMailBody(ObjectGuid::Empty, 0, auction->buyout, auction->deposit))
|
||||||
.AddItem(pItem)
|
.AddItem(pItem)
|
||||||
.SendMailTo(trans, player, auction, MAIL_CHECK_MASK_COPIED);
|
.SendMailTo(trans, player, auction, MAIL_CHECK_MASK_COPIED);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
SendAuctionCommandResult(0, AUCTION_CANCEL, ERR_AUCTION_DATABASE_ERROR);
|
SendAuctionCommandResult(0, AUCTION_CANCEL, ERR_AUCTION_DATABASE_ERROR);
|
||||||
//this code isn't possible ... maybe there should be assert
|
// this code isn't possible ... maybe there should be assert
|
||||||
LOG_ERROR("network.opcode", "CHEATER : {}, he tried to cancel auction (id: {}) of another player, or auction is nullptr", player->GetGUID().ToString(), auctionId);
|
LOG_ERROR("network.opcode", "CHEATER : {}, he tried to cancel auction (id: {}) of another player, or auction is nullptr", player->GetGUID().ToString(), auctionId);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//inform player, that auction is removed
|
// inform player, that auction is removed
|
||||||
SendAuctionCommandResult(auction->Id, AUCTION_CANCEL, ERR_AUCTION_OK);
|
SendAuctionCommandResult(auction->Id, AUCTION_CANCEL, ERR_AUCTION_OK);
|
||||||
|
|
||||||
LOG_INFO("entities.player.auctionhouse", "AuctionHouse: Account: {} (IP: {}), Player [{}] (GUID: {}) cancelled auction #{}: Item (Entry: {}) x{}, Buyout: {} copper",
|
LOG_INFO("entities.player.auctionhouse", "AuctionHouse: Account: {} (IP: {}), Player [{}] (GUID: {}) cancelled auction #{}: Item (Entry: {}) x{}, Buyout: {} copper",
|
||||||
GetAccountId(), GetRemoteAddress(), player->GetName(), player->GetGUID().GetCounter(),
|
GetAccountId(), GetRemoteAddress(), player->GetName(), player->GetGUID().GetCounter(),
|
||||||
auction->Id, auction->item_template, auction->itemCount, auction->buyout);
|
auction->Id, auction->item_template, auction->itemCount, auction->buyout);
|
||||||
|
|
||||||
// Now remove the auction
|
// Now remove the auction
|
||||||
|
|
||||||
@@ -667,15 +659,15 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket& recvData)
|
|||||||
auctionHouse->RemoveAuction(auction);
|
auctionHouse->RemoveAuction(auction);
|
||||||
}
|
}
|
||||||
|
|
||||||
//called when player lists his bids
|
// called when player lists his bids
|
||||||
void WorldSession::HandleAuctionListBidderItems(WorldPacket& recvData)
|
void WorldSession::HandleAuctionListBidderItems(WorldPacket &recvData)
|
||||||
{
|
{
|
||||||
ObjectGuid guid; //NPC guid
|
ObjectGuid guid; // NPC guid
|
||||||
uint32 listfrom; //page of auctions
|
uint32 listfrom; // page of auctions
|
||||||
uint32 outbiddedCount; //count of outbidded auctions
|
uint32 outbiddedCount; // count of outbidded auctions
|
||||||
|
|
||||||
recvData >> guid;
|
recvData >> guid;
|
||||||
recvData >> listfrom; // not used in fact (this list not have page control in client)
|
recvData >> listfrom; // not used in fact (this list not have page control in client)
|
||||||
recvData >> outbiddedCount;
|
recvData >> outbiddedCount;
|
||||||
if (recvData.size() != (16 + outbiddedCount * 4))
|
if (recvData.size() != (16 + outbiddedCount * 4))
|
||||||
{
|
{
|
||||||
@@ -683,7 +675,7 @@ void WorldSession::HandleAuctionListBidderItems(WorldPacket& recvData)
|
|||||||
outbiddedCount = 0;
|
outbiddedCount = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER);
|
Creature *creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER);
|
||||||
if (!creature)
|
if (!creature)
|
||||||
{
|
{
|
||||||
LOG_DEBUG("network", "WORLD: HandleAuctionListBidderItems - Unit ({}) not found or you can't interact with him.", guid.ToString());
|
LOG_DEBUG("network", "WORLD: HandleAuctionListBidderItems - Unit ({}) not found or you can't interact with him.", guid.ToString());
|
||||||
@@ -699,7 +691,7 @@ void WorldSession::HandleAuctionListBidderItems(WorldPacket& recvData)
|
|||||||
if (GetPlayer()->HasUnitState(UNIT_STATE_DIED))
|
if (GetPlayer()->HasUnitState(UNIT_STATE_DIED))
|
||||||
GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
|
GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
|
||||||
|
|
||||||
AuctionHouseEntry const* ahEntry = AuctionHouseMgr::GetAuctionHouseEntryFromFactionTemplate(creature->GetFaction());
|
AuctionHouseEntry const *ahEntry = AuctionHouseMgr::GetAuctionHouseEntryFromFactionTemplate(creature->GetFaction());
|
||||||
if (!ahEntry)
|
if (!ahEntry)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -719,16 +711,16 @@ void WorldSession::HandleAuctionListBidderItems(WorldPacket& recvData)
|
|||||||
sAuctionMgr->GetAuctionHouseSearcher()->QueueSearchRequest(new AuctionSearchBidderListRequest(auctionHouseFaction, std::move(auctionIds), GetPlayer()->GetGUID()));
|
sAuctionMgr->GetAuctionHouseSearcher()->QueueSearchRequest(new AuctionSearchBidderListRequest(auctionHouseFaction, std::move(auctionIds), GetPlayer()->GetGUID()));
|
||||||
}
|
}
|
||||||
|
|
||||||
//this void sends player info about his auctions
|
// this void sends player info about his auctions
|
||||||
void WorldSession::HandleAuctionListOwnerItems(WorldPacket& recvData)
|
void WorldSession::HandleAuctionListOwnerItems(WorldPacket &recvData)
|
||||||
{
|
{
|
||||||
ObjectGuid guid;
|
ObjectGuid guid;
|
||||||
uint32 listfrom;
|
uint32 listfrom;
|
||||||
|
|
||||||
recvData >> guid;
|
recvData >> guid;
|
||||||
recvData >> listfrom; // not used in fact (this list does not have page control in client)
|
recvData >> listfrom; // not used in fact (this list does not have page control in client)
|
||||||
|
|
||||||
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER);
|
Creature *creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER);
|
||||||
if (!creature)
|
if (!creature)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -736,7 +728,7 @@ void WorldSession::HandleAuctionListOwnerItems(WorldPacket& recvData)
|
|||||||
if (GetPlayer()->HasUnitState(UNIT_STATE_DIED))
|
if (GetPlayer()->HasUnitState(UNIT_STATE_DIED))
|
||||||
GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
|
GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
|
||||||
|
|
||||||
AuctionHouseEntry const* ahEntry = AuctionHouseMgr::GetAuctionHouseEntryFromFactionTemplate(creature->GetFaction());
|
AuctionHouseEntry const *ahEntry = AuctionHouseMgr::GetAuctionHouseEntryFromFactionTemplate(creature->GetFaction());
|
||||||
if (!ahEntry)
|
if (!ahEntry)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -745,8 +737,8 @@ void WorldSession::HandleAuctionListOwnerItems(WorldPacket& recvData)
|
|||||||
sAuctionMgr->GetAuctionHouseSearcher()->QueueSearchRequest(new AuctionSearchOwnerListRequest(auctionHouseFaction, GetPlayer()->GetGUID()));
|
sAuctionMgr->GetAuctionHouseSearcher()->QueueSearchRequest(new AuctionSearchOwnerListRequest(auctionHouseFaction, GetPlayer()->GetGUID()));
|
||||||
}
|
}
|
||||||
|
|
||||||
//this void is called when player clicks on search button
|
// this void is called when player clicks on search button
|
||||||
void WorldSession::HandleAuctionListItems(WorldPacket& recvData)
|
void WorldSession::HandleAuctionListItems(WorldPacket &recvData)
|
||||||
{
|
{
|
||||||
std::string searchedname;
|
std::string searchedname;
|
||||||
uint8 levelmin, levelmax, usable;
|
uint8 levelmin, levelmax, usable;
|
||||||
@@ -754,7 +746,7 @@ void WorldSession::HandleAuctionListItems(WorldPacket& recvData)
|
|||||||
ObjectGuid guid;
|
ObjectGuid guid;
|
||||||
|
|
||||||
recvData >> guid;
|
recvData >> guid;
|
||||||
recvData >> listfrom; // start, used for page control listing by 50 elements
|
recvData >> listfrom; // start, used for page control listing by 50 elements
|
||||||
recvData >> searchedname;
|
recvData >> searchedname;
|
||||||
|
|
||||||
recvData >> levelmin >> levelmax;
|
recvData >> levelmin >> levelmax;
|
||||||
@@ -791,7 +783,7 @@ void WorldSession::HandleAuctionListItems(WorldPacket& recvData)
|
|||||||
|
|
||||||
wstrToLower(wsearchedname);
|
wstrToLower(wsearchedname);
|
||||||
|
|
||||||
Creature* creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER);
|
Creature *creature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_AUCTIONEER);
|
||||||
if (!creature)
|
if (!creature)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -799,7 +791,7 @@ void WorldSession::HandleAuctionListItems(WorldPacket& recvData)
|
|||||||
if (_player->HasUnitState(UNIT_STATE_DIED))
|
if (_player->HasUnitState(UNIT_STATE_DIED))
|
||||||
_player->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
|
_player->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
|
||||||
|
|
||||||
AuctionHouseEntry const* ahEntry = AuctionHouseMgr::GetAuctionHouseEntryFromFactionTemplate(creature->GetFaction());
|
AuctionHouseEntry const *ahEntry = AuctionHouseMgr::GetAuctionHouseEntryFromFactionTemplate(creature->GetFaction());
|
||||||
if (!ahEntry)
|
if (!ahEntry)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -830,12 +822,12 @@ void WorldSession::HandleAuctionListItems(WorldPacket& recvData)
|
|||||||
usablePlayerInfo.raceMask = GetPlayer()->getRaceMask();
|
usablePlayerInfo.raceMask = GetPlayer()->getRaceMask();
|
||||||
usablePlayerInfo.level = GetPlayer()->GetLevel();
|
usablePlayerInfo.level = GetPlayer()->GetLevel();
|
||||||
|
|
||||||
SkillStatusMap const& skillMap = GetPlayer()->GetSkillStatusMap();
|
SkillStatusMap const &skillMap = GetPlayer()->GetSkillStatusMap();
|
||||||
for (auto const& pair : skillMap)
|
for (auto const &pair : skillMap)
|
||||||
usablePlayerInfo.skills.insert(std::make_pair(pair.first, GetPlayer()->GetSkillValue(pair.first)));
|
usablePlayerInfo.skills.insert(std::make_pair(pair.first, GetPlayer()->GetSkillValue(pair.first)));
|
||||||
|
|
||||||
PlayerSpellMap const& spellMap = GetPlayer()->GetSpellMap();
|
PlayerSpellMap const &spellMap = GetPlayer()->GetSpellMap();
|
||||||
for (auto const& pair : spellMap)
|
for (auto const &pair : spellMap)
|
||||||
{
|
{
|
||||||
if (pair.second->State != PLAYERSPELL_REMOVED && pair.second->IsInSpec(GetPlayer()->GetActiveSpec()))
|
if (pair.second->State != PLAYERSPELL_REMOVED && pair.second->IsInSpec(GetPlayer()->GetActiveSpec()))
|
||||||
usablePlayerInfo.spells.insert(pair.first);
|
usablePlayerInfo.spells.insert(pair.first);
|
||||||
@@ -846,14 +838,14 @@ void WorldSession::HandleAuctionListItems(WorldPacket& recvData)
|
|||||||
sAuctionMgr->GetAuctionHouseSearcher()->QueueSearchRequest(new AuctionSearchListRequest(auctionHouseFaction, std::move(ahSearchInfo), std::move(ahPlayerInfo)));
|
sAuctionMgr->GetAuctionHouseSearcher()->QueueSearchRequest(new AuctionSearchListRequest(auctionHouseFaction, std::move(ahSearchInfo), std::move(ahPlayerInfo)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void WorldSession::HandleAuctionListPendingSales(WorldPacket& recvData)
|
void WorldSession::HandleAuctionListPendingSales(WorldPacket &recvData)
|
||||||
{
|
{
|
||||||
recvData.read_skip<uint64>();
|
recvData.read_skip<uint64>();
|
||||||
|
|
||||||
uint32 count = 0;
|
uint32 count = 0;
|
||||||
|
|
||||||
WorldPacket data(SMSG_AUCTION_LIST_PENDING_SALES, 4);
|
WorldPacket data(SMSG_AUCTION_LIST_PENDING_SALES, 4);
|
||||||
data << uint32(count); // count
|
data << uint32(count); // count
|
||||||
/*for (uint32 i = 0; i < count; ++i)
|
/*for (uint32 i = 0; i < count; ++i)
|
||||||
{
|
{
|
||||||
data << ""; // string
|
data << ""; // string
|
||||||
|
|||||||
Reference in New Issue
Block a user