server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Petition: Move guild charter cost to configuration

Browse Source
This commit is contained in:
Meltie2013 2022-03-16 20:52:20 -05:00 committed by Antz
parent a9806a58e5
commit 5037a80b4b
No known key found for this signature in database
GPG Key ID: 0DF907270598C85F
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/MangosParams.cmake
View File

@ -1,5 +1,5 @@
set(MANGOS_EXP "CLASSIC") set(MANGOS_EXP "CLASSIC")
set(MANGOS_PKG "Mangos Zero") set(MANGOS_PKG "Mangos Zero")
set(MANGOS_WORLD_VER 2021010100) set(MANGOS_WORLD_VER 2022031600)
set(MANGOS_REALM_VER 2021010100) set(MANGOS_REALM_VER 2021010100)
set(MANGOS_AHBOT_VER 2021010100) set(MANGOS_AHBOT_VER 2021010100)

8
src/game/WorldHandlers/PetitionsHandler.cpp
View File

@ -118,7 +118,7 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket& recv_data)
return; return;
} }
if (_player->GetMoney() < cost) if (_player->GetMoney() < sWorld.getConfig(CONFIG_UNIT32_GUILD_PETITION_COST))
{ {
// player hasn't got enough money // player hasn't got enough money
_player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, charterid, 0); _player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, charterid, 0);
@ -133,8 +133,8 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket& recv_data)
return; return;
} }
_player->ModifyMoney(-(int32)cost); _player->ModifyMoney(-int64(sWorld.getConfig(CONFIG_UNIT32_GUILD_PETITION_COST)));
Item* charter = _player->StoreNewItem(dest, charterid, true); Item* charter = _player->StoreNewItem(dest, GUILD_CHARTER, true);
if (!charter) if (!charter)
{ {
return; return;
@ -691,7 +691,7 @@ void WorldSession::SendPetitionShowList(ObjectGuid guid)
data << uint32(1); // index data << uint32(1); // index
data << uint32(GUILD_CHARTER); // charter entry data << uint32(GUILD_CHARTER); // charter entry
data << uint32(CHARTER_DISPLAY_ID); // charter display id data << uint32(CHARTER_DISPLAY_ID); // charter display id
data << uint32(GUILD_CHARTER_COST); // charter cost data << uint32(sWorld.getConfig(CONFIG_UNIT32_GUILD_PETITION_COST)); // charter cost
data << uint32(0); // unknown data << uint32(0); // unknown
data << uint32(4); // required signs data << uint32(4); // required signs
} }

1
src/game/WorldHandlers/World.cpp
View File

@ -775,6 +775,7 @@ void World::LoadConfigSettings(bool reload)
setConfig(CONFIG_UINT32_INSTANT_LOGOUT, "InstantLogout", SEC_MODERATOR); setConfig(CONFIG_UINT32_INSTANT_LOGOUT, "InstantLogout", SEC_MODERATOR);
setConfig(CONFIG_UNIT32_GUILD_PETITION_COST, "Guild.PetitionCost", 1000);
setConfigMin(CONFIG_UINT32_GUILD_EVENT_LOG_COUNT, "Guild.EventLogRecordsCount", GUILD_EVENTLOG_MAX_RECORDS, GUILD_EVENTLOG_MAX_RECORDS); setConfigMin(CONFIG_UINT32_GUILD_EVENT_LOG_COUNT, "Guild.EventLogRecordsCount", GUILD_EVENTLOG_MAX_RECORDS, GUILD_EVENTLOG_MAX_RECORDS);
setConfig(CONFIG_UINT32_TIMERBAR_FATIGUE_GMLEVEL, "TimerBar.Fatigue.GMLevel", SEC_CONSOLE); setConfig(CONFIG_UINT32_TIMERBAR_FATIGUE_GMLEVEL, "TimerBar.Fatigue.GMLevel", SEC_CONSOLE);

1
src/game/WorldHandlers/World.h
View File

@ -173,6 +173,7 @@ enum eConfigUInt32Values
CONFIG_UINT32_BATTLEGROUND_PREMATURE_FINISH_TIMER, CONFIG_UINT32_BATTLEGROUND_PREMATURE_FINISH_TIMER,
CONFIG_UINT32_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH, CONFIG_UINT32_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH,
CONFIG_UINT32_BATTLEGROUND_QUEUE_ANNOUNCER_JOIN, CONFIG_UINT32_BATTLEGROUND_QUEUE_ANNOUNCER_JOIN,
CONFIG_UNIT32_GUILD_PETITION_COST,
CONFIG_UINT32_GUILD_EVENT_LOG_COUNT, CONFIG_UINT32_GUILD_EVENT_LOG_COUNT,
CONFIG_UINT32_TIMERBAR_FATIGUE_GMLEVEL, CONFIG_UINT32_TIMERBAR_FATIGUE_GMLEVEL,
CONFIG_UINT32_TIMERBAR_FATIGUE_MAX, CONFIG_UINT32_TIMERBAR_FATIGUE_MAX,

5
src/mangosd/mangosd.conf.dist.in
View File

@ -673,6 +673,10 @@ SD3ErrorLogFile = "scriptdev3-errors.log"
# Default: 0 (not allowed) # Default: 0 (not allowed)
# 1 (allowed) # 1 (allowed)
# #
# Guild.PetitionCost
# The cost for guild petition charter (in copper)
# Default: 1000 (10 silver)
#
# Guild.EventLogRecordsCount # Guild.EventLogRecordsCount
# Count of guild event log records stored in guild_eventlog table # Count of guild event log records stored in guild_eventlog table
# Increase to store more guild events in table, minimum is 100 # Increase to store more guild events in table, minimum is 100
@ -823,6 +827,7 @@ Instance.UnloadDelay = 1800000
Quests.LowLevelHideDiff = 4 Quests.LowLevelHideDiff = 4
Quests.HighLevelHideDiff = 7 Quests.HighLevelHideDiff = 7
Quests.IgnoreRaid = 0 Quests.IgnoreRaid = 0
Guild.PetitionCost = 1000
Guild.EventLogRecordsCount = 100 Guild.EventLogRecordsCount = 100
TimerBar.Fatigue.GMLevel = 4 TimerBar.Fatigue.GMLevel = 4
TimerBar.Fatigue.Max = 60 TimerBar.Fatigue.Max = 60