HerculesWS · jasonch35 · Nov 4, 2024 · Nov 4, 2024 · Nov 4, 2024 · Nov 4, 2024
diff --git a/conf/messages.conf b/conf/messages.conf
@@ -54,7  54,7 @@
 24: Job level raised.
 25: Job level lowered.
 26: [%d] seconds left until you can use
-27: Storage has been not loaded yet.
 27: %s has not been loaded yet.
 28: No player found.
 29: 1 player found.
 30: %d players found.
@@ -91,7  91,11 @@
 62: Judgement has passed.
 63: Mercy has been shown.
 64: Mercy has been granted.
-//65-69 FREE
 65: Please specify a storage ID or name. (usage: @storeall <storage name/ID>).
 66: Please specify a storage ID or name. (usage: @clearstorage <storage name/ID>).
 67: Please specify a storage ID or name. (usage: @storage <storage name/ID>).
 68: Please specify a storage ID or name. (usage: @storagelist <storage name/ID>).
 69: Invalid storage name or ID
 70: You have learned the skill.
 71: You have forgotten the skill.
 72: War of Emperium has been initiated.
@@ -779,7  783,7 @@
 918: Please enter a speed value (usage: @speed <%d-%d>).
 
 // @storage
-919: Storage opened.
 919: %s opened.
 
 // @guildstorage
 920: Guild storage opened.
@@ -1507,7  1511,7 @@
 1393: You can't use commands while dead.
 
 // @clearstorage
-1394: Your storage was cleaned.
 1394: Your %s has now been cleaned.
 1395: Your guild storage was cleaned.
 
 // @clearcart

diff --git a/conf/storage.conf b/conf/storage.conf
@@ -0,0  1,53 @@
 //================= Hercules Database ==========================================
 //=       _   _                     _
 //=      | | | |                   | |
 //=      | |_| | ___ _ __ ___ _   _| | ___  ___
 //=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //================= License ====================================================
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
 //= Copyright (C) 2014-2024  Hercules Dev Team
 //= Copyright (C) 2017 Smokexyz
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
 //= the Free Software Foundation, either version 3 of the License, or
 //= (at your option) any later version.
 //=
 //= This program is distributed in the hope that it will be useful,
 //= but WITHOUT ANY WARRANTY; without even the implied warranty of
 //= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //= GNU General Public License for more details.
 //=
 //= You should have received a copy of the GNU General Public License
 //= along with this program. If not, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 //= Storage Configuration
 //================= Description ================================================
 //= There can be an unlimited amount of storages and limits.
 //= All setting names are case-sensitive and must be keyed accurately.
 //= Storage capacity will default to MAX_STORAGE in mmo.h if set higher
 //= Storage ID 1 is the default (official) storage for accounts.
 //==============================================================================
 
 storage_conf: (
 /******************************************************************************
 ***************************** Entry structure *********************************
 *******************************************************************************
 {
 	Id: (int)				Unique Identifier
 	Name: (string)			Name of the storage sent to the client.
 	Constant: (string)		Constant to be used by scripts
 	Capacity: (int)			Maximum capacity of the storage.
 }
 *******************************************************************************/
 {
 	Id: 1
 	Name: "Main Storage"
 	Constant: "STORAGE_TYPE_MAIN"
 	Capacity: 600
 },
 )
diff --git a/doc/atcommands.txt b/doc/atcommands.txt
@@ -560,9  560,9 @@ Using the command without a message will enable or disable main chat.
 
 ---------------------------------------
 
-@storage
 @storage <storage name/id>
 
-Opens your Kafra storage.
 Opens your specified Kafra storage.
 
 ---------------------------------------
 
@@ -731,9  731,9 @@ Valid item types:
 
 ---------------------------------------
 
-@storeall
 @storeall <storage name/id>
 
-Places all inventory and equipped items directly into your Kafra Storage.
 Places all inventory and equipped items directly into your specified storage.
 
 ---------------------------------------
 
@@ -743,10  743,15 @@ Deletes all inventory items (not equipped items).
 
 ---------------------------------------
 
-@clearstorage
 @clearstorage <storage name/id>
 
 Deletes all items in specified storage.
 
 ---------------------------------------
 
 @cleargstorage
 
-Deletes all items in storage (or guild storage).
 Deletes all items in guild storage.
 
 ---------------------------------------
 

diff --git a/doc/script_commands.txt b/doc/script_commands.txt
@@ -6217,19  6217,32 @@ has no gear, script will be terminated with an error.
 //=====================================
 ---------------------------------------
 
-*openstorage()
 *openstorage(<storage_constant>{, <storage_mode>});
 
-This will open character's Kafra storage window on the client connected to
-the invoking character. It can be used from any kind of NPC or item
-script, not just limited to Kafra Staff.
 This command opens the specified <storage_constant> storage window on the client
 connected to the invoking character. It can be used from any kind of NPC or
 item script and is not limited to Kafra Staff interactions.
 
-The storage window opens regardless of whether there are open NPC dialogs
-or not, but it is preferred to close the dialog before displaying the
-storage window, to avoid any disruption when both windows overlap.
 The storage window will open regardless of whether there are open NPC dialogs,
 but it is recommended to close any dialogs before displaying the storage window
 to avoid overlapping interface elements, which could disrupt the user experience.
 
 Parameters:
 	<storage_constant>:	Specifies which storage to open (e.g., STORAGE_TYPE_MAIN).
 						Constants are declared in conf/storage.conf
 	<storage_mode> (optional): Defines the access permissions for the storage window.
 
 Storage Modes (bitmask):
 	STORAGE_ACCESS_VIEW:	View storage only.
 	STORAGE_ACCESS_GET:		Allow retrieving items from storage.
 	STORAGE_ACCESS_PUT:		Allow depositing items into storage.
 	STORAGE_ACCESS_ALL:		(Default mode) Full access for viewing, retrieving,
 							and depositing items.
 
 Example Usage:
 	mes("I will now open your stash for you");
 	close2();
-	openstorage();
 	openstorage(STORAGE_TYPE_MAIN);
 	end;
 
 The mapflag 'nostorage' when set to type '2' (or 3), will not open the

diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt
@@ -474,7  474,7 @@ L_Storage:
 	}
 	mes "Close this window and I will open your storage.";
 	close2;
-	openstorage;
 	openstorage(STORAGE_TYPE_MAIN);
 	end;
 
 L_StorageJBlow:

diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
@@ -293,7  293,7 @@ function	script	F_KafStor	{
 	}
 	callfunc("F_CheckKafCode"); //check your storage password, if set
 	close2;
-	openstorage;
 	openstorage(STORAGE_TYPE_MAIN);
 	cutin "", 255;
 	end;
 }

diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt
@@ -92,7  92,7 @@ aldeba_in,96,181,4	script	Kafra Service	4_F_KAFRA5,{
 		mes "Thank you for your patronage.";
 		callfunc("F_CheckKafCode");    //check your storage password, if set
 		close2;
-		openstorage;
 		openstorage(STORAGE_TYPE_MAIN);
 		break;
 	case 3:
 		mes "[Kafra Leilah]";

diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt
@@ -46,7  46,7 @@ function	script	F_CashStore	{
 	mes "Welcome to the Kafra Corporation.";
 	mes "Here, let me open your Storage for you.";
 	close2;
-	openstorage;
 	openstorage(STORAGE_TYPE_MAIN);
 	cutin "",255;
 	return;
 }

diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
@@ -7686,7  7686,7 @@ function Catwarp;
 				mes "Your storage will";
 				mes "be opened shortly.";
 				close2;
-				openstorage;
 				openstorage(STORAGE_TYPE_MAIN);
 				end;
 			}
 			else {
@@ -7733,7  7733,7 @@ function Catwarp;
 				mes "Your storage will";
 				mes "be opened shortly.";
 				close2;
-				openstorage;
 				openstorage(STORAGE_TYPE_MAIN);
 				end;
 			}
 			else {
@@ -7855,7  7855,7 @@ function Catwarp;
 				mes "Your storage will";
 				mes "be opened shortly.";
 				close2;
-				openstorage;
 				openstorage(STORAGE_TYPE_MAIN);
 				end;
 			}
 			else {

diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
@@ -109,7  109,7 @@ spl_fild02,25,211,4	script	Cat Hand Agent#spl	4_M_BOSSCAT,{
 				mes "Thank you.";
 				mes "Your storage will be opened shortly.";
 				close2;
-				openstorage;
 				openstorage(STORAGE_TYPE_MAIN);
 				end;
 			}
 			else {
@@ -156,7  156,7 @@ spl_fild02,25,211,4	script	Cat Hand Agent#spl	4_M_BOSSCAT,{
 				mes "Thank you.";
 				mes "Your storage will be opened shortly.";
 				close2;
-				openstorage;
 				openstorage(STORAGE_TYPE_MAIN);
 				end;
 			}
 			else {
@@ -277,7  277,7 @@ spl_fild02,25,211,4	script	Cat Hand Agent#spl	4_M_BOSSCAT,{
 				mes "Thank you.";
 				mes "Your storage will be opened shortly.";
 				close2;
-				openstorage;
 				openstorage(STORAGE_TYPE_MAIN);
 				end;
 			}
 			else {

diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt
@@ -1194,7  1194,7 @@ mora,48,128,0	script	Drawer#mora_warehouse	HIDDEN_NPC,{
 			close;
 		}
 		Zeny -= 100;
-		openstorage;
 		openstorage(STORAGE_TYPE_MAIN);
 		close;
 	case 2:
 		mes "- You gave up using the warehouse. -";

diff --git a/npc/re/jobs/2e/rebellion.txt b/npc/re/jobs/2e/rebellion.txt
@@ -987,7  987,7 @@ job_gun,216,138,4	script	Butler Karlex	1_M_01,{
 	mes("Thank you for using the service.");
 	close2();
 	if (.@select == 2) {
-		openstorage();
 		openstorage(STORAGE_TYPE_MAIN);
 	}
 	end;
 }

diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt
@@ -5422,7  5422,7 @@ iz_ac01,95,46,5	script	Kafra Guide Trainer#ac	4_F_KAFRA1,{
 						mes("Thanks for using~!");
 						close2();
 						cutin("", 255);
-						openstorage;
 						openstorage(STORAGE_TYPE_MAIN);
 						end;
 					} else {
 						mes("[Kafra Guide Trainer]");

diff --git a/npc/re/other/dimensional_gap.txt b/npc/re/other/dimensional_gap.txt
@@ -137,7  137,7 @@ dali,112,95,4	script	Logistics Manager	4_M_MERCAT2,{
 		mes("You need at least 200 zeny to use the Storage.");
 	} else {
 		Zeny -= 200;
-		openstorage();
 		openstorage(STORAGE_TYPE_MAIN);
 	}
 	close();
 }

diff --git a/npc/re/quests/eden/eden_service.txt b/npc/re/quests/eden/eden_service.txt
@@ -65,7  65,7 @@
 					}
 					Zeny -= 500;
 					close2;
-					openstorage;
 					openstorage(STORAGE_TYPE_MAIN);
 					end;
 				}
 				mes "I don't have enough zeny.";

diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt
@@ -449,7  449,7 @@ dic_in01,254,119,0	script	Item Storage#01	CLEAR_NPC,{
 	}
 	Zeny -= 500;
 	close2;
-	openstorage;
 	openstorage(STORAGE_TYPE_MAIN);
 	end;
 }
 

diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt
@@ -371,7  371,7 @@ malangdo,184,139,4	script	Storekeeper#mal	4_CAT_ADV2,{
 	mes "[Storekeeper]";
 	mes "Thank you.";
 	close2;
-	openstorage;
 	openstorage(STORAGE_TYPE_MAIN);
 	end;
 }
 

diff --git a/npc/woe-fe/agit_main.txt b/npc/woe-fe/agit_main.txt
@@ -367,7  367,7 @@ OnRecvCastle:
 			mes "the Kafra Service.";
 			close2;
 			cutin "",255;
-			openstorage;
 			openstorage(STORAGE_TYPE_MAIN);
 			end;
 		case 2:
 			mes "[Kafra Employee]";

diff --git a/npc/woe-se/agit_main_se.txt b/npc/woe-se/agit_main_se.txt
@@ -869,7  869,7 @@ OnInit:
 				mes("have at least Novice Skill");
 				mes("Lv.6 to use the Storage.");
 			}
-			else openstorage;
 			else openstorage(STORAGE_TYPE_MAIN);
 			break;
 		case 2:
 			mes("[Kafra Employee]");

diff --git a/sql-files/main.sql b/sql-files/main.sql
@@ -967,6  967,7 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1599908598); -- 2020-09-1
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1613840320); -- 2021-02-20--19-57.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1618058468); -- 2021-04-10--15-36.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1653155461); -- 2022-05-21--29-49.sql
 INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1730631632); -- 2024-11-03--07-00.sql
 
 --
 -- Table structure for table `storage`
@@ -975,6  976,7 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1653155461); -- 2022-05-2
 CREATE TABLE IF NOT EXISTS `storage` (
   `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
   `account_id` INT UNSIGNED NOT NULL DEFAULT '0',
   `storage_id` INT UNSIGNED NOT NULL DEFAULT '1',
   `nameid` INT UNSIGNED NOT NULL DEFAULT '0',
   `amount` SMALLINT UNSIGNED NOT NULL DEFAULT '0',
   `equip` INT UNSIGNED NOT NULL DEFAULT '0',
@@ -1000,7  1002,8 @@ CREATE TABLE IF NOT EXISTS `storage` (
   `bound` TINYINT UNSIGNED NOT NULL DEFAULT '0',
   `unique_id` BIGINT UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
-  KEY `account_id` (`account_id`)
   KEY `account_id` (`account_id`),
   KEY `storage_id` (`storage_id`)
 ) ENGINE=MyISAM;
 
 CREATE TABLE IF NOT EXISTS `rodex_items` (

diff --git a/sql-files/upgrades/2024-11-03--07-00.sql b/sql-files/upgrades/2024-11-03--07-00.sql
@@ -0,0  1,24 @@
 #1730631632
 
 -- This file is part of Hercules.
 -- http://herc.ws - http://github.com/HerculesWS/Hercules
 --
 -- Copyright (C) 2013-2024 Hercules Dev Team
 --
 -- Hercules is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation, either version 3 of the License, or
 -- (at your option) any later version.
 --
 -- This program is distributed in the hope that it will be useful,
 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -- GNU General Public License for more details.
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ALTER TABLE `storage` ADD `storage_id` INT UNSIGNED NOT NULL DEFAULT '1' AFTER `account_id`,
 ADD INDEX `storage_id` (`storage_id`);
 
 INSERT INTO `sql_updates` (`timestamp`) VALUES (1730631632);
-Original file line number
+Diff line change
@@ Expand Up / @@ -449,7 449,7 @@ dic_in01,254,119,0 script Item Storage#01 CLEAR_NPC,{ @@
     	}
     	Zeny -= 500;
     	close2;
-    	openstorage;
+    	openstorage(STORAGE_TYPE_MAIN);
     	end;
     }
@@ Expand Down @@