Guildhalls and guild bank.

data/items/items.xml

@@ -33359,10 +33359,12 @@
 	<item fromid="24283" toid="24300" article="a" name="hoard of cursed gold" />
 	<item id="24301" article="a" name="receipt">
 		<attribute key="weight" value="25" />
+		<attribute key="readable" value="1" />
 		<attribute key="description" value="This receipt serves as a reference to a successful guild bank transfer." />
 	</item>
 	<item id="24302" article="a" name="receipt">
 		<attribute key="weight" value="25" />
+		<attribute key="readable" value="1" />
 		<attribute key="description" value="This receipt serves as a reference to a unsuccessful guild bank transfer." />
 	</item>
 	<item id="24303" name="black crystals" />

data/migrations/27.lua

@@ -1,3 +1,22 @@
 function onUpdateDatabase()
-	return false
+	print("> Updating database to version 27 (guildhalls, guild banks #2213)")
+	db.query("ALTER TABLE `houses` ADD `type` ENUM('HOUSE', 'GUILDHALL') NOT NULL DEFAULT 'HOUSE' AFTER `id`")
+	db.query("ALTER TABLE `guilds` ADD `balance` bigint(20) UNSIGNED NOT NULL DEFAULT '0'")
+	db.query([[
+		CREATE TABLE IF NOT EXISTS `guild_transactions` (
+			`id` int(11) NOT NULL AUTO_INCREMENT,
+			`guild_id` int(11) NOT NULL,
+			`guild_associated` int(11) DEFAULT NULL,
+			`player_associated` int(11) DEFAULT NULL,
+			`type` ENUM('DEPOSIT', 'WITHDRAW') NOT NULL,
+			`category` ENUM ('OTHER', 'RENT', 'MATERIAL', 'SERVICES', 'REVENUE', 'CONTRIBUTION') NOT NULL DEFAULT 'OTHER',
+			`balance` bigint(20) UNSIGNED NOT NULL DEFAULT '0',
+			`time` bigint(20) NOT NULL,
+			PRIMARY KEY (`id`),
+			FOREIGN KEY (`guild_id`) REFERENCES `guilds`(`id`) ON DELETE CASCADE,
+			FOREIGN KEY (`guild_associated`) REFERENCES `guilds`(`id`) ON DELETE SET NULL,
+			FOREIGN KEY (`player_associated`) REFERENCES `players`(`id`) ON DELETE SET NULL
+		) ENGINE=InnoDB;
+	]])
+	return true
 end

data/migrations/28.lua

@@ -0,0 +1,3 @@
+function onUpdateDatabase()
+	return false
+end

data/npc/GuildBanker.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<npc name="Guild Banker" script="guildbank.lua" walkinterval="2000" floorchange="0">
+	<health now="100" max="100" />
+	<look type="132" head="38" body="85" legs="78" feet="116" addons="3" />
+</npc>

data/talkactions/scripts/buyhouse.lua

@@ -19,23 +19,81 @@ function onSay(player, words, param)
 		return false
 	end
 
-	if house:getOwnerGuid() > 0 then
-		player:sendCancelMessage("This house already has an owner.")
+	-- HOUSE_TYPE_NORMAL
+	if house:getType() == HOUSE_TYPE_NORMAL then
+		if house:getOwnerGuid() > 0 then
+			player:sendCancelMessage("This house already has an owner.")
+			return false
+		end
+
+		if player:getHouse() then
+			player:sendCancelMessage("You are already the owner of a house.")
+			return false
+		end
+
+		local price = house:getTileCount() * housePrice
+		if not player:removeMoney(price) then
+			player:sendCancelMessage("You do not have enough money.")
+			return false
+		end
+
+		house:setOwnerGuid(player:getGuid())
+		player:sendTextMessage(MESSAGE_INFO_DESCR, "You have successfully bought this house, be sure to have the money for the rent in the bank.")
 		return false
 	end
 
-	if player:getHouse() then
-		player:sendCancelMessage("You are already the owner of a house.")
+	-- HOUSE_TYPE_GUILDHALL
+	if house:getOwnerGuild() > 0 then
+		player:sendCancelMessage("This guildhall already has an owner.")
+		return false
+	end
+
+	local guild = player:getGuild()
+	if guild:getHouseId() then
+		player:sendCancelMessage("Your guild already owns a guildhall.")
+		return false
+	end
+
+	if guild:getOwnerGuid() ~= player:getGuid() then
+		player:sendCancelMessage("Only Guild Leaders can buy guildhalls.")
 		return false
 	end
 
 	local price = house:getTileCount() * housePrice
-	if not player:removeTotalMoney(price) then
-		player:sendCancelMessage("You do not have enough money.")
+	local balance = guild:getBankBalance()
+	if price > balance then
+		player:sendCancelMessage("Your guild bank do not have enough money, it is missing ".. price - balance .. " gold.")
 		return false
 	end
 
+	guild:setBankBalance(balance - price)
+	local currentTime = os.time()
+	local insertData = table.concat({
+		guild:getId(),
+		player:getGuid(),
+		"'WITHDRAW'",
+		"'RENT'",
+		price,
+		currentTime
+	},',')
+	db.query("INSERT INTO `guild_transactions` (`guild_id`, `player_associated`, `type`, `category`, `balance`, `time`) VALUES ("..insertData..");")
+
+	local receipt = Game.createItem(ITEM_RECEIPT_SUCCESS, 1)
+
+	receipt:setAttribute(ITEM_ATTRIBUTE_TEXT, table.concat({
+		"Date: " .. os.date("%d. %b %Y - %H:%M:%S", currentTime),
+		"Type: Guild Withdraw",
+		"Category: House rent",
+		"House: ".. house:getName(),
+		"Gold Amount: " .. price,
+		"Receipt Owner: " .. player:getName(),
+		"Recipient: The " .. guild:getName(),
+		"\nWe are happy to inform you that your transfer request was successfully carried out."
+	},"\n"))
+
+	player:addItemEx(receipt)
+
 	house:setOwnerGuid(player:getGuid())
-	player:sendTextMessage(MESSAGE_INFO_DESCR, "You have successfully bought this house, be sure to have the money for the rent in the bank.")
+	player:sendTextMessage(MESSAGE_INFO_DESCR, "You have successfully bought this guildhall, be sure to have the money for the rent in the guild bank.")
 	return false
 end

data/world/forgotten-house.xml

@@ -27,7 +27,7 @@
 	<house name="Hilltop 1" houseid="27" entryx="166" entryy="409" entryz="6" rent="0" townid="2" size="28" />
 	<house name="Hilltop 2" houseid="28" entryx="177" entryy="400" entryz="6" rent="0" townid="2" size="33" />
 	<house name="Hilltop 3" houseid="29" entryx="178" entryy="412" entryz="6" rent="0" townid="2" size="42" />
-	<house name="Hilltop Hall" houseid="30" entryx="193" entryy="405" entryz="5" rent="0" townid="2" size="158" />
+	<house name="Hilltop Hall" houseid="30" entryx="193" entryy="405" entryz="5" rent="0" guildhall="true" townid="2" size="158" />
 	<house name="Rhyves Flats 1" houseid="31" entryx="166" entryy="365" entryz="7" rent="0" townid="2" size="10" />
 	<house name="Rhyves Flats 2" houseid="32" entryx="166" entryy="361" entryz="7" rent="0" townid="2" size="10" />
 	<house name="Rhyves Flats 3" houseid="33" entryx="166" entryy="358" entryz="7" rent="0" townid="2" size="10" />
@@ -55,8 +55,8 @@
 	<house name="Kazgal Close6" houseid="55" entryx="215" entryy="457" entryz="12" rent="0" townid="3" size="30" />
 	<house name="Kazgal Close 7" houseid="56" entryx="218" entryy="454" entryz="12" rent="0" townid="3" size="30" />
 	<house name="Kazgal Close 8" houseid="57" entryx="224" entryy="454" entryz="12" rent="0" townid="3" size="30" />
-	<house name="Hammersmith Hall" houseid="58" entryx="230" entryy="439" entryz="12" rent="0" townid="3" size="164" />
-	<house name="Varnack's Cavern" houseid="59" entryx="253" entryy="444" entryz="12" rent="0" townid="3" size="185" />
+	<house name="Hammersmith Hall" houseid="58" entryx="230" entryy="439" entryz="12" rent="0" guildhall="true" townid="3" size="164" />
+	<house name="Varnack's Cavern" houseid="59" entryx="253" entryy="444" entryz="12" rent="0" guildhall="true" townid="3" size="185" />
 	<house name="Saund Street 1" houseid="60" entryx="231" entryy="550" entryz="6" rent="0" townid="5" size="10" />
 	<house name="Saund Street 2" houseid="61" entryx="226" entryy="550" entryz="6" rent="0" townid="5" size="14" />
 	<house name="Saund Street 3" houseid="62" entryx="241" entryy="554" entryz="6" rent="0" townid="5" size="10" />
@@ -102,7 +102,7 @@
 	<house name="Farm Lane 4" houseid="102" entryx="116" entryy="399" entryz="7" rent="0" townid="2" size="30" />
 	<house name="The Square 1" houseid="103" entryx="127" entryy="406" entryz="7" rent="0" townid="2" size="22" />
 	<house name="The Square 2 (Shop)" houseid="104" entryx="121" entryy="398" entryz="7" rent="0" townid="2" size="26" />
-	<house name="Central Hall" houseid="105" entryx="125" entryy="381" entryz="7" rent="0" townid="2" size="163" />
+	<house name="Central Hall" houseid="105" entryx="125" entryy="381" entryz="7" rent="0" guildhall="true" townid="2" size="163" />
 	<house name="The Square 3" houseid="106" entryx="136" entryy="380" entryz="7" rent="0" townid="2" size="18" />
 	<house name="The Square 4 (Shop)" houseid="107" entryx="143" entryy="391" entryz="7" rent="0" townid="2" size="33" />
 	<house name="Church Avenue 6" houseid="108" entryx="158" entryy="404" entryz="7" rent="0" townid="2" size="20" />

schema.sql

@@ -132,13 +132,29 @@ CREATE TABLE IF NOT EXISTS `guilds` (
   `name` varchar(255) NOT NULL,
   `ownerid` int(11) NOT NULL,
   `creationdata` int(11) NOT NULL,
+  `balance` bigint(20) unsigned NOT NULL DEFAULT '0',
   `motd` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   UNIQUE KEY (`name`),
   UNIQUE KEY (`ownerid`),
   FOREIGN KEY (`ownerid`) REFERENCES `players`(`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
+CREATE TABLE IF NOT EXISTS `guild_transactions` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `guild_id` int(11) NOT NULL,
+  `guild_associated` int(11) DEFAULT NULL,
+  `player_associated` int(11) DEFAULT NULL,
+  `type` ENUM('DEPOSIT', 'WITHDRAW') NOT NULL,
+  `category` ENUM ('OTHER', 'RENT', 'MATERIAL', 'SERVICES', 'REVENUE', 'CONTRIBUTION') NOT NULL DEFAULT 'OTHER',
+  `balance` bigint(20) UNSIGNED NOT NULL DEFAULT '0',
+  `time` bigint(20) NOT NULL,
+  PRIMARY KEY (`id`),
+  FOREIGN KEY (`guild_id`) REFERENCES `guilds`(`id`) ON DELETE CASCADE,
+  FOREIGN KEY (`guild_associated`) REFERENCES `guilds`(`id`) ON DELETE SET NULL,
+  FOREIGN KEY (`player_associated`) REFERENCES `players`(`id`) ON DELETE SET NULL
+) ENGINE=InnoDB;
+
 CREATE TABLE IF NOT EXISTS `guild_invites` (
   `player_id` int(11) NOT NULL DEFAULT '0',
   `guild_id` int(11) NOT NULL DEFAULT '0',
@@ -207,6 +223,7 @@ CREATE TABLE IF NOT EXISTS `houses` (
   `highest_bidder` int(11) NOT NULL DEFAULT '0',
   `size` int(11) NOT NULL DEFAULT '0',
   `beds` int(11) NOT NULL DEFAULT '0',
+  `type` ENUM('HOUSE', 'GUILDHALL') NOT NULL DEFAULT 'HOUSE',
   PRIMARY KEY (`id`),
   KEY `owner` (`owner`),
   KEY `town_id` (`town_id`)
@@ -349,7 +366,7 @@ CREATE TABLE IF NOT EXISTS `towns` (
   UNIQUE KEY `name` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;
 
-INSERT INTO `server_config` (`config`, `value`) VALUES ('db_version', '26'), ('motd_hash', ''), ('motd_num', '0'), ('players_record', '0');
+INSERT INTO `server_config` (`config`, `value`) VALUES ('db_version', '27'), ('motd_hash', ''), ('motd_num', '0'), ('players_record', '0');
 
 DROP TRIGGER IF EXISTS `ondelete_players`;
 DROP TRIGGER IF EXISTS `oncreate_guilds`;

src/const.h

@@ -501,6 +501,8 @@ enum item_t : uint16_t {
 	ITEM_LETTER = 2597,
 	ITEM_LETTER_STAMPED = 2598,
 	ITEM_LABEL = 2599,
+	ITEM_RECEIPT_SUCCESS = 24301,
+	ITEM_RECEIPT_FAIL = 24302,
 
 	ITEM_AMULETOFLOSS = 2173,
 

src/enums.h

@@ -459,6 +459,10 @@ enum ReturnValue {
 	RETURNVALUE_TRADEPLAYERHIGHESTBIDDER,
 	RETURNVALUE_YOUCANNOTTRADETHISHOUSE,
 	RETURNVALUE_YOUDONTHAVEREQUIREDPROFESSION,
+	RETURNVALUE_TRADEPLAYERNOTINAGUILD,
+	RETURNVALUE_TRADEGUILDALREADYOWNSAHOUSE,
+	RETURNVALUE_TRADEPLAYERNOTGUILDLEADER,
+	RETURNVALUE_YOUARENOTGUILDLEADER,
 	RETURNVALUE_CANNOTMOVEITEMISNOTSTOREITEM,
 	RETURNVALUE_ITEMCANNOTBEMOVEDTHERE,
 };

src/guild.cpp

@@ -81,3 +81,11 @@ void Guild::addRank(uint32_t rankId, const std::string& rankName, uint8_t level)
 {
 	ranks.emplace_back(std::make_shared<GuildRank>(rankId, rankName, level));
 }
+
+void Guild::setBankBalance(uint64_t balance) {
+	bankBalance = balance;
+	Database& db = Database::getInstance();
+	std::ostringstream query;
+	query << "UPDATE `guilds` SET `balance`=" << bankBalance << " WHERE `id`=" << id;
+	db.executeQuery(query.str());
+}

src/guild.h

@@ -57,6 +57,25 @@ class Guild
 			memberCount = count;
 		}
 
+		uint64_t getBankBalance() const {
+			return bankBalance;
+		}
+		void setBankBalance(uint64_t balance);
+
+		uint32_t getHouseId() const {
+			return houseId;
+		}
+		void setHouseId(uint32_t id) {
+			houseId = id;
+		}
+
+		uint32_t getOwnerGUID() const {
+			return ownerGUID;
+		}
+		void setOwnerGUID(uint32_t guid) {
+			ownerGUID = guid;
+		}
+
 		const std::vector<GuildRank_ptr>& getRanks() const {
 			return ranks;
 		}
@@ -79,6 +98,9 @@ class Guild
 		std::string motd;
 		uint32_t id;
 		uint32_t memberCount = 0;
+		uint64_t bankBalance = 0;
+		uint32_t ownerGUID = 0;
+		uint32_t houseId = 0;
 };
 
 #endif