Implementation of Hercules Ultimate Storage System (HUSS) #1763

sagunkho · 2017-06-04T16:15:51Z

Pull Request Prelude

I have followed proper Hercules code styling.
I have read and understood the contribution guidelines before making this PR.
I am aware that this PR will be closed if the above-mentioned criteria are not fulfilled.

Changes Proposed

Design

Implementation of the Hercules Ultimate Storage System
Storages can now be created through a configuration file that describes their attributes.
Example storage configuration:

{
        Id: (int)                              (required|unique) Unique Identifier
        Name: (string)                         (required) Name of the storage sent to the client.
        Capacity: (int)                        (required) Maximum capacity of the storage.
}

Additional storages are handled with dynamic arrays that will save a tonne of memory when created, as opposed to a design in which they were implemented using fixed length arrays. In simple terms, a storage of 600 items would approximately cost the same amount of memory as 600 storages with 1 item each.
They are saved in the same storage database (SQL) as the original separating them by a storage identifier.
An infinite number of storages can be created, there are no limits.
The current design implementation only allow saving/loading of approximately 1600 items per storage due to packet size limits.

PS. Make sure you apply SQL upgrades for this patch!

Access Modes

Storage access modes can be set through the openstorage builtin command.

	STORAGE_ACCESS_VIEW     // View storage only
	STORAGE_ACCESS_GET      // Allow getting items from storage.
	STORAGE_ACCESS_PUT      // Allow putting items to storage.
	STORAGE_ACCESS_ALL      // Allow all actions.

Default storage mode : STORAGE_ACCESS_ALL

Script Commands

Changed: openstorage(<storage_id>{, <storage_mode>})

Affected Branches: master

Issues addressed: #1762

Known Issues and TODO List

Allow resending packets with remaining item data that exceeds packet size (in the case where storage capacity is above the limit).
Alternatively, Screw sending any storage details to the character server and handle everything on the map server level.
Test storage modes.
Storage names are only sent client side when an item is present in the storage. (part of the clif_storagelist clause in storage_storageopen

HerculesWSAPI · 2017-06-04T16:16:01Z

This change is

Jedzkie · 2017-11-28T02:57:07Z

@Smokexyz any news on this?

Murilo-BiO · 2017-06-06T00:49:17Z

src/common/mmo.h

@@ -64,7 +64,7 @@
 // 20120307 - 2012-03-07aRagexeRE+ - 0x970

 #ifndef PACKETVER
-	#define PACKETVER 20141022
+	#define PACKETVER 20150513


Did you change it for testing or the default PACKETVER will really change? If it will change, I think it should be in a separate commit.

Yep this was for testing only, I forgot to revert the change.

Murilo-BiO · 2017-11-28T08:22:18Z

doc/script_commands.txt

@@ -5537,9 +5539,15 @@ storage window, to avoid any disruption when both windows overlap.

 	mes("I will now open your stash for you");
 	close2();
-	openstorage();
+	openstorage(1);


I think you forgot to use openstorage(STORAGE_TYPE_MAIN) with the new constant for storage type.

sagunkho · 2017-12-23T03:52:47Z

@HerculesWS/developers Is there anything to be done on this? If so, I can work on it as I rebase for conflict resolution. @4144 @MishimaHaruna

4144 · 2017-12-23T15:29:04Z

src/map/storage.c

+	int i = 0;
+	struct storage_data *stor = NULL;
+
+	nullpo_retr(NULL, sd);


Here need return not NULL but some kind of default storage.
Because in other code no checks for return from storage->ensure

4144 · 2017-12-23T15:31:01Z

src/map/storage.c

 {
 	struct item_data *data = NULL;
 	struct item *it = NULL;
+	const struct storage_settings *stst = storage->get_settings(stor->uid);


missing nullpo check for stor variable

4144 · 2017-12-23T15:32:07Z

src/map/storage.c

 {
+	const struct storage_settings *stst = storage->get_settings(stor->uid);


missing nullpo check for stor variable

4144 · 2017-12-23T15:33:49Z

src/map/storage.c

 {
+	const struct storage_settings *stst = storage->get_settings(stor->uid);


missing nullpo check for stor variable.
Check after this line is useless, because here server already crashed

4144 · 2017-12-23T15:35:30Z

src/map/storage.c

 {
+	const struct storage_settings *stst = storage->get_settings(stor->uid);


here missing nullpo check for stor too.
Next check for stor is useless

4144 · 2017-12-23T15:37:54Z

src/map/storage.c

 {
 	int flag = 0;
 	struct item *it = NULL;

 	nullpo_ret(sd);

-	Assert_ret(sd->storage.received == true);
+	Assert_ret(stor->received == true);


missing nullpo for stor variable

xBeret · 2018-01-21T15:07:14Z

@Smokexyz If you have some time please look at PR, thanks.

SombraRO · 2018-07-12T15:25:50Z

@Asheraf you think of rebase in this in that PR, it seems that it exists in the official a long time?

marcosbucarte · 2018-08-08T12:31:36Z

@dastgirp Do you think of rebase? using more than one storage is good for private server.

dastgirp · 2018-08-28T02:45:42Z

I forgot that this wasn't merged, will see what I can do

marcosbucarte · 2018-08-31T00:37:41Z

Thanks @dastgirp for looking at this.

SombraRO · 2019-03-03T21:30:32Z

@dastgirp @4144 @Asheraf @MishimaHaruna @sagunkho Something about it? it would be interesting to implement this in hercules

AnnieRuru · 2019-03-31T10:40:11Z

just wanna tell this is already in rathena -> rathena/rathena@46b1de7
just without the memory slasher, means content-wise we are lagging behind
https://rathena.org/board/topic/115116-personal-char-storage/

tlacson7 · 2019-04-01T17:35:07Z

@dastgirp yeah boi!!! your the man!

Zarbony · 2019-05-30T17:16:59Z

Umm will this System merged?
I need the option to add more storages :)
Still rAthena got this already and i change my running system now to Hercules

4144 · 2019-05-30T18:12:28Z

Umm will this System merged?

not yet merged, here code too outdated...

MishimaHaruna added the status:inprogress Issue is being worked on / the pull request is still a WIP label Jun 4, 2017

sagunkho force-pushed the storages branch 2 times, most recently from 9629ee6 to 429b8c4 Compare June 4, 2017 16:57

sagunkho added the status:code-review Awaiting code review label Jun 4, 2017

sagunkho force-pushed the storages branch 3 times, most recently from 9a60418 to 7a4989c Compare June 6, 2017 13:48

sagunkho removed the status:inprogress Issue is being worked on / the pull request is still a WIP label Jun 17, 2017

Helianthella moved this from Stalled / Forgotten to Release Candidate (review) in Project Board Aug 5, 2017

Helianthella added the status:needs-rebase The PR has diverged from the stable branch and needs to be rebased label Oct 8, 2017

Helianthella added this to the future release milestone Oct 8, 2017

MishimaHaruna modified the milestones: future release, Release v2017.11.19 Oct 22, 2017

MishimaHaruna modified the milestones: Release v2017.11.19, future release, Release v2017.12.17 Nov 18, 2017

Murilo-BiO reviewed Nov 28, 2017

View reviewed changes

MishimaHaruna modified the milestones: Release v2017.12.17, future release Dec 17, 2017

sagunkho requested review from 4144 and MishimaHaruna December 23, 2017 04:48

4144 requested changes Dec 23, 2017

View reviewed changes

MishimaHaruna modified the milestones: future release, Release v2018.01.14 Dec 23, 2017

ghost assigned sagunkho Dec 26, 2017

Add SQL Files for HUSS.

8a75e79

sagunkho force-pushed the storages branch from 5faf41c to f44e0bf Compare December 26, 2017 07:20

Followup with review edits.

e82ebd0

sagunkho force-pushed the storages branch from f44e0bf to e82ebd0 Compare December 26, 2017 07:50

sagunkho removed the status:needs-rebase The PR has diverged from the stable branch and needs to be rebased label Jan 6, 2018

MishimaHaruna modified the milestones: Release v2018.01.14, future release, Release v2018.02.11 Jan 14, 2018

MishimaHaruna modified the milestones: Release v2018.02.11, Release v2018.03.11 Feb 10, 2018

MishimaHaruna modified the milestones: Release v2018.03.11, Release v2018.04.08 Mar 11, 2018

sagunkho closed this Mar 12, 2018

MishimaHaruna removed this from the Release v2018.04.08 milestone Apr 8, 2018

MishimaHaruna unassigned sagunkho Apr 8, 2018

sagunkho reopened this Jan 16, 2019

dastgirp self-assigned this Mar 9, 2019

dastgirp removed their assignment May 16, 2020

dastgirp mentioned this pull request May 16, 2020

Hercules Ultimate Storage System #2724

Open

4 tasks

Samuel23 mentioned this pull request Jun 18, 2024

HUSS #3302

Open

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implementation of Hercules Ultimate Storage System (HUSS) #1763

Implementation of Hercules Ultimate Storage System (HUSS) #1763

sagunkho commented Jun 4, 2017 •

edited

Loading

HerculesWSAPI commented Jun 4, 2017

Jedzkie commented Nov 28, 2017

Murilo-BiO Jun 6, 2017

sagunkho Nov 28, 2017

Murilo-BiO Nov 28, 2017

sagunkho commented Dec 23, 2017 •

edited

Loading

4144 Dec 23, 2017

4144 Dec 23, 2017

4144 Dec 23, 2017

4144 Dec 23, 2017

4144 Dec 23, 2017

4144 Dec 23, 2017

xBeret commented Jan 21, 2018 •

edited

Loading

SombraRO commented Jul 12, 2018

marcosbucarte commented Aug 8, 2018

dastgirp commented Aug 28, 2018

marcosbucarte commented Aug 31, 2018

SombraRO commented Mar 3, 2019

AnnieRuru commented Mar 31, 2019

tlacson7 commented Apr 1, 2019

Zarbony commented May 30, 2019

4144 commented May 30, 2019

		{
		const struct storage_settings *stst = storage->get_settings(stor->uid);

Implementation of Hercules Ultimate Storage System (HUSS) #1763

Are you sure you want to change the base?

Implementation of Hercules Ultimate Storage System (HUSS) #1763

Conversation

sagunkho commented Jun 4, 2017 • edited Loading

Pull Request Prelude

Changes Proposed

Design

Access Modes

Script Commands

Known Issues and TODO List

HerculesWSAPI commented Jun 4, 2017

Jedzkie commented Nov 28, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sagunkho commented Dec 23, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xBeret commented Jan 21, 2018 • edited Loading

SombraRO commented Jul 12, 2018

marcosbucarte commented Aug 8, 2018

dastgirp commented Aug 28, 2018

marcosbucarte commented Aug 31, 2018

SombraRO commented Mar 3, 2019

AnnieRuru commented Mar 31, 2019

tlacson7 commented Apr 1, 2019

Zarbony commented May 30, 2019

4144 commented May 30, 2019

sagunkho commented Jun 4, 2017 •

edited

Loading

sagunkho commented Dec 23, 2017 •

edited

Loading

xBeret commented Jan 21, 2018 •

edited

Loading