Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Guild Storage Skill #1092

Merged
merged 19 commits into from
Aug 5, 2021
Merged

Guild Storage Skill #1092

merged 19 commits into from
Aug 5, 2021

Conversation

dastgirp
Copy link
Member

@dastgirp dastgirp commented Jan 11, 2016 •
edited by MishimaHaruna
Loading

Tested with 2014-10-22, it works now :)
Needs rebase though, can you do rebase and review @MishimaHaruna

This change is Reviewable

@MishimaHaruna MishimaHaruna added the status:inprogress Issue is being worked on / the pull request is still a WIP label Jan 11, 2016
@MishimaHaruna MishimaHaruna self-assigned this Jan 12, 2016
@MishimaHaruna
Copy link
Member

Gonna try and split it into atomic commits (and squash the fixup commits)

@MishimaHaruna MishimaHaruna added type:enhancement Issue describes an enhancement or feature that should be implemented component:core Affecting the Hercules core (i.e. not the game mechanics directly) component:SQL Affecting the SQL databases labels Jan 17, 2016
@MishimaHaruna
Copy link
Member

To be merged after #1100

@theultramage
Copy link
Contributor

Oh cool, someone came up with a similar cleanup to what I posted.
I skimmed the above patches, one significant thing I suggest is to reconsider the 'if PACKETVER' wrappers if if's possible to code the feature in an unified way.

@MishimaHaruna
Copy link
Member

Cleaned up a little and rebased. Up for review (there may be issues left)

@MishimaHaruna MishimaHaruna added status:code-review Awaiting code review and removed status:inprogress Issue is being worked on / the pull request is still a WIP labels Jan 23, 2016
MishimaHaruna
MishimaHaruna reviewed Jan 23, 2016
View reviewed changes
db/re/skill_db.txt Outdated
@@ -1273,3 +1273,4 @@
10013,0,0,4,0,0x3,0,1,0,yes,0,0x10,0,none,0, GD_EMERGENCYCALL,Urgent Call
10014,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0, GD_DEVELOPMENT,Permanent Development
//10015,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0, GD_ITEMEMERGENCYCALL,Unknown Skill
10016,0,0,0,0,0,0,5,0,no,0,0x10,0,none,0, GD_GUILD_STORAGE,Guild Storage Expansion
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Entry missing in pre-renewal. To be added.

@MishimaHaruna
Copy link
Member

Addressed my own comments, rebased

@MishimaHaruna MishimaHaruna force-pushed the GD_GUILD_STORAGE branch 2 times, most recently from 056801a to 4513960 Compare February 26, 2016 13:43
@MishimaHaruna
Copy link
Member

Would anyone be able to review this, @HerculesWS/developers ? Considering that I edited a lot of the code, I'd rather have someone else review it.

@Jedzkie
Copy link
Contributor

Jedzkie commented Mar 12, 2016

@dastgir

@MishimaHaruna
Copy link
Member

Rebased, still pending review

@MishimaHaruna MishimaHaruna removed the codereview:accepted Code review was positive and the pull request can be accepted as is label Jun 2, 2021
@marcosbucarte
Copy link

will this commit someday get into hercules? because every month it is added to the Release

MishimaHaruna
MishimaHaruna requested changes Jul 8, 2021
View reviewed changes
Copy link
Member

@MishimaHaruna MishimaHaruna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added some comments that I'll address before merging. Moving this once again to the next release.

sql-files/upgrades/index.txt Outdated Show resolved Hide resolved
src/common/mmo.h Show resolved Hide resolved
src/char/int_storage.c Outdated Show resolved Hide resolved
src/map/pc.c Outdated Show resolved Hide resolved
panikon and others added 18 commits August 5, 2021 02:32
@panikon @MishimaHaruna
struct guild_storage cleanup (part 1)
ce1e901 
- Changed storage_status to bool, renamed to in_use.

Signed-off-by: Haru <[email protected]>
@panikon @MishimaHaruna
struct guild_storage cleanup (part 2)
c9d4f9c 
- Changed dirty to bool

Signed-off-by: Haru <[email protected]>
@panikon @MishimaHaruna
struct guild_storage cleanup (part 3)
4f1469c 
- Changed lock to bool, renamed to locked.

Signed-off-by: Haru <[email protected]>
@panikon @MishimaHaruna
Updated SQL structure to support GD_GUILD_STORAGE
73e5847 
Signed-off-by: Haru <[email protected]>
@panikon @MishimaHaruna
Added basic support to variable guild storage size
eb24d0c 
- Added new field to struct guild: max_storage
- Documented struct guild.

Signed-off-by: Haru <[email protected]>
@MishimaHaruna
HPM Hooks Update
0543694 
Signed-off-by: Haru <[email protected]>
@panikon @MishimaHaruna
Added basic support to dynamic guild storage
a6dfce6 
- Changed guild_storage.items to a dynamic array.
- Updated inter-server packets in order to send guild_storage.items dynamically

Signed-off-by: Haru <[email protected]>
@MishimaHaruna
HPM Hooks Update
ac38844 
Signed-off-by: Haru <[email protected]>
@panikon @MishimaHaruna
Implemented official guild storage (GD_GUILD_STORAGE)
72f1314 
Signed-off-by: Haru <[email protected]>
@panikon @MishimaHaruna
Added storage permissions to the enum guild_permission
80078b8 
- Available in PACKETVER >= 20140205

Signed-off-by: Haru <[email protected]>
@MishimaHaruna
HPM Hooks Update
639f130 
Signed-off-by: Haru <[email protected]>
@MishimaHaruna
Make it possible to disable the official guild storage system for rec…
a4ef8c0 
…ent packetvers

If DISABLE_OFFICIAL_GUILD_STORAGE is defined, the official guild storage
system won't be enabled and the custom one will be left in place, as to
not to require additional skill points to access existing storages.

if the OFFICIAL_GUILD_STORAGE flag is enabled on the command line, it is
sanity checked against the current PACKETVER to avoid enabling an
unsupported configuration.

Signed-off-by: Haru <[email protected]>
@MishimaHaruna
Make chr->memitemdata_to_sql() compatible with dynamically sized stor…
6f57fc8 
…ages such as the guild storage

Signed-off-by: Haru <[email protected]>
@MishimaHaruna
Address pull request review comments
f650179 
Signed-off-by: Haru <[email protected]>
@MishimaHaruna
Fix the value of MAX_GUILD_STORAGE when the official guild storage is…
d8de65a 
… enabled

It is now set to the maximum achieval guild storage size

Signed-off-by: Haru <[email protected]>
@MishimaHaruna
Add a GUILD_STORAGE_EXPANSION_STEP macro to control the amount of gui…
9717417 
…ld storage slots gained per skill level (when using the official guild storage)

Signed-off-by: Haru <[email protected]>
@MishimaHaruna
Rename the guild storage migration script
1fa8c74 
Signed-off-by: Haru <[email protected]>
@MishimaHaruna
Update the skill ranges to include the guild storage skill
ac36ae6 
Signed-off-by: Haru <[email protected]>
@MishimaHaruna
HPM Hooks Update
8867d3b 
Signed-off-by: Haru <[email protected]>
@MishimaHaruna MishimaHaruna merged commit 822554f into master Aug 5, 2021
@MishimaHaruna MishimaHaruna deleted the GD_GUILD_STORAGE branch August 5, 2021 02:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MishimaHaruna MishimaHaruna MishimaHaruna approved these changes

Assignees

@MishimaHaruna MishimaHaruna

Labels
component:core Affecting the Hercules core (i.e. not the game mechanics directly) component:SQL Affecting the SQL databases status:code-review Awaiting code review type:enhancement Issue describes an enhancement or feature that should be implemented
Projects
None yet
Milestone
Release v2021.08.04
Development

Successfully merging this pull request may close these issues.
10 participants
@dastgirp @MishimaHaruna @theultramage @Jedzkie @sagunkho @Zarbony @MrKeiKun @marcosbucarte @Asheraf @panikon