Guildhalls and guild bank. by Znote · Pull Request #2214 · otland/forgottenserver

Znote · 2017-03-25T13:19:01Z

WIP #2213 Click on issue link for further description.

Edit: 13. Jul 2020: Feature implementation complete!
Edit: 15. Nov 2020: Rebase with master to continue testing

Schema changes

houses.type to determine if it is a house or guildhall.
guilds.balance to determine the guild balance.
guild_transactions table to log transactions between guildmember and the guild, as well as between guilds.
Schema version update to 25 27

data folder changes

Lua migrations added to reflect schema changes.
Changed 4 houses to be flagged as guildhalls.

Engine/C++/Lua changes

house:getType() return house type enums. 1 = HOUSE_TYPE_NORMAL, 2 = HOUSE_TYPE_GUILDHALL
Update database houses table with house type
Modify house owner to no longer be Player guid implicit, but either player.guid or guild.id depending on house type.
Create bank NPC to support (unrestricted) deposit to and (restricted) withdraws from guild banks. And (restricted) transfers between guilds.
Make bank NPC use guild_transactions and give player receipts for their deposits and withdrawals.

WIP Known issues / todo:

Testing rent paying. (might have broken rent/payhouses)?
Looking at house doors seems to have inconsistent behavior (Does not always display house data) Edit: Does not seem to be related to this PR, getting same issue with otland/master
Testing selling guildhalls with !sellhouse
Todo: ~~Transfer funds between guilds~~ Fixed 29.06.2020
Todo: ~~guild_transaction table was a bit too ambigious, want to rename the guild columns~~ Fixed 29.06.2020
Todo: ~~!buyhouse: account for guild:getBankBalance() and only for guild leaders~~ Fixed 12.07.2020
Todo: ~~sell house account for guildhalls~~ Fixed 13.07.2020

as of 10.7 update we have Receipts:
Receipts are pieces of paper which confirm whether or not guild-related transactions were successful, and also provide details about said transactions. There are 2 types of receipts:

Receipt (Fail) - a receipt of a failed transaction
Receipt (Success) - a receipt of a successful transaction

[source]

Postoned for later PR/skipped:

Guild War System talk actions #3104 Modify guild_wars to use guild_transactions and guild bank. This is skipped because currently, guild_wars does not have a monetary stake in TFS yet. I consider this a separate feature (monetary stakes for guildwar + integration with guild_transactions).
House auction system in Lua #3105 House auction system talkactions (dealing with ongoing bids, reserved balance during bid period, Receipt (fail/success))

schema.sql

Znote · 2017-03-26T00:43:10Z

@djarek I would like for this to get into the TFS 1.3 milestone if possible (If we manage to finish it up before then). I don't think the changes are so major that we need to stall it for 2.0.

djarek · 2017-03-26T19:48:14Z

@Znote
If it's ready before 1.3 we will merge it.

ranisalt · 2017-03-27T06:09:34Z

1.3 still has some 2 or 3 months to maturate before release, FYI.

DSpeichert · 2017-12-18T02:21:02Z

@Znote migration requires rename.

ghost · 2019-11-03T01:39:01Z

as of 10.7 update we have Receipts:
Receipts are pieces of paper which confirm whether or not guild-related transactions were successful, and also provide details about said transactions. There are 2 types of receipts:

Receipt (Fail) - a receipt of a failed transaction
Receipt (Success) - a receipt of a successful transaction

[source]

ghost · 2020-05-10T01:00:53Z

piece of guild bank code from the user jlcvp from Otserver global I guess:
https://pastebin.com/cFp9GArZ very useful

These functions were added in order for the upcoming sample `Banker` NPC #2934 and in the future for the guild balance feature #2214 - function getPlayerDatabaseInfo(name_or_guid) TFS 1.3 function that queries for player information from the database, returns a table of useful information if success, false if player doesn't exist. - function isNumber(str) used in several distros but wasn't there on compat.lua yet - function Player.transferMoneyTo(self, target, amount) - function Player.withdrawMoney(self, amount) - function Player.depositMoney(self, amount) - function isValidMoney(money) - function getMoneyCount(string) - function getMoneyWeight(money) Co-authored-by: Znote <stefan_brannfjell@live.no>

Based on feedback from ranisalt Changed to_guild_id to to_guild as the reference guild_id is implicit. Changed from_guild_id to from_guild as the reference guild_id is implicit. Changed guild_transactions.type from tinyint to enum to make the meaning more implicit. Changed houses.type from tinyint to enum to make the meaning more implicit. Also made the migration itself more human-readable by using Lua multi-line string declaration.

Znote · 2020-06-18T15:55:25Z

Starting to step lightly into the source code, now the server will update the database with house type (normal house or guildhall) depending on which flags you put on houses in RME.

schema.sql

data/talkactions/scripts/buyhouse.lua

ghost · 2020-07-12T22:02:11Z

oops, there is still the !sellhouse command missing xD

Znote · 2020-07-13T11:26:27Z

oops, there is still the !sellhouse command missing xD

sellhouse.lua only initiates a house trade between players, what I had to fix was house:startTrade(player, tradePartner) which unfortunately is a source function. :P (had to check house type, make sure both players are in a guild, make sure they are both guild leaders etc...)

ghost

I think we are all set to leave the draft phase, so more people can see and test this awesome PR

ranisalt · 2020-11-15T18:51:39Z

Please merge these database migrations into one

Znote · 2020-11-15T20:37:04Z

Please merge these database migrations into one

It is only one, I just git stashed and applied it between rebase to catch up to otland/master migration version. What was previously 25.lua is now 27.lua, because another merged PR snagged 25.lua
28.lua returns false in accordance to structure convention and signals the end of migrations. (Until another PR modifies it for their need).

Znote · 2020-11-15T23:04:29Z

WIP Known issues / todo:

Testing rent paying. (might have broken rent/payhouses)?
Looking at house doors seems to have inconsistent behavior (Does not always display house data) Edit: Does not seem to be related to this PR, getting same issue with otland/master
Testing selling guildhalls with !sellhouse

ranisalt · 2020-11-16T00:25:48Z

@Znote oops. github notifications pranked me

Schema and Lua migrations for guild halls and guild bank.

d76dc5a

djarek added the feature New feature or functionality label Mar 25, 2017

ghost reviewed Mar 25, 2017

View reviewed changes

schema.sql Outdated Show resolved Hide resolved

djarek added this to the 2.0 milestone Mar 25, 2017

Better SQL structure for the guild_transactions table.

6e6ba52

DSpeichert mentioned this pull request Feb 17, 2019

Guild halls support #2467

Closed

liontts mentioned this pull request Sep 27, 2019

Guildhalls opentibiabr/otservbr-global-archived#487

Closed

dudantas mentioned this pull request Oct 20, 2019

Guild bank opentibiabr/otservbr-global-archived#306

Closed

2 tasks

Znote added 5 commits November 3, 2019 15:53

Resolve conflicts

c681f48

Merge with master and resolve conflicts

16336b6

Revert filename change back to 19.lua

bba6f97

Correct merge mistakes

82a14dc

Rename migration to 25.

5748c4f

ghost mentioned this pull request Apr 11, 2020

Added sample Banker NPC #2934

Merged

Znote added 5 commits June 18, 2020 14:46

Merge remote-tracking branch 'otland/master' into 2213

b534426

Add houses.type column after houses.id

432b273

Marked 4 houses as guildhalls.

711321b

Added house type enum and propagate house type to database

b6372dd

ghost reviewed Jun 18, 2020

View reviewed changes

schema.sql Outdated Show resolved Hide resolved

MySQL Enum value WITHDRAW instead of WITHDRAWAL

c52c6ba

Znote marked this pull request as draft June 18, 2020 16:03

Znote added 3 commits July 12, 2020 21:22

buyhouse.lua support guildhall purchase.

3ee2f37

Merge branch 'master' into 2213

a355019

Must be guild leader to buy guildhall.

852b901

ghost suggested changes Jul 12, 2020

View reviewed changes

data/talkactions/scripts/buyhouse.lua Outdated Show resolved Hide resolved

data/talkactions/scripts/buyhouse.lua Outdated Show resolved Hide resolved

Znote added 2 commits July 13, 2020 13:15

buyhouse: review feedback, eye friendly code

1625491

Sell guildhall support (untested)

d11e44d

ghost approved these changes Jul 13, 2020

View reviewed changes

ghost previously approved these changes Jul 13, 2020

View reviewed changes

Znote marked this pull request as ready for review July 13, 2020 15:30

DSpeichert requested a review from ranisalt August 24, 2020 02:07

Znote added 3 commits November 15, 2020 14:38

Revert outdated migrations

d8bf253

Merge remote-tracking branch 'otland/master' into 2213

216ff40

Updated migrations

2dc848f

Znote dismissed ghost ’s stale review via 2dc848f November 15, 2020 15:18

ghost approved these changes Nov 15, 2020

View reviewed changes

luanluciano93 approved these changes Nov 15, 2020

View reviewed changes

Znote added the needs-testing Needs testing with screenshots label Nov 15, 2020

ghost mentioned this pull request Aug 25, 2021

List of missing TFS features from Cipbia up to version 10.98 #3600

Closed

16 tasks

ghost modified the milestones: 2.0, 1.6 Sep 15, 2021

omarcopires mentioned this pull request Dec 21, 2021

List of missing TFS features from all versions #3871

Open

Znote mentioned this pull request Feb 10, 2022

Paying house rent does not work nekiro/TFS-1.5-Downgrades#116

Closed

EvilHero90 closed this May 14, 2024

Conversation

Znote commented Mar 25, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Schema changes

data folder changes

Engine/C++/Lua changes

WIP Known issues / todo:

Postoned for later PR/skipped:

Uh oh!

Uh oh!

Znote commented Mar 26, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

djarek commented Mar 26, 2017

Uh oh!

ranisalt commented Mar 27, 2017

Uh oh!

DSpeichert commented Dec 18, 2017

Uh oh!

ghost commented Nov 3, 2019

Uh oh!

ghost commented May 10, 2020

Uh oh!

Znote commented Jun 18, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ghost commented Jul 12, 2020

Uh oh!

Znote commented Jul 13, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost left a comment

Choose a reason for hiding this comment

Uh oh!

ranisalt commented Nov 15, 2020

Uh oh!

Znote commented Nov 15, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Znote commented Nov 15, 2020

WIP Known issues / todo:

Uh oh!

ranisalt commented Nov 16, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Znote commented Mar 25, 2017 •

edited

Loading

Znote commented Mar 26, 2017 •

edited

Loading

Znote commented Jul 13, 2020 •

edited

Loading

Znote commented Nov 15, 2020 •

edited

Loading