summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/messages.conf10
-rw-r--r--npc/003-1/quirino.txt9
-rw-r--r--sql-files/main.sql1
3 files changed, 16 insertions, 4 deletions
diff --git a/conf/messages.conf b/conf/messages.conf
index 18fbb03c8..3f98ecc0b 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -52,7 +52,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: Storage '%s' has been not loaded yet.
28: No player found.
29: 1 player found.
30: %d players found.
@@ -89,7 +89,11 @@
62: Judgement has passed.
63: Mercy has been shown.
64: Mercy has been granted.
-//65-69 FREE
+65: Please specify a storage name. (usage: @storeall <storage name/ID>).
+66: Please specify a storage name. (usage: @clearstorage <storage name/ID>).
+67: Invalid storage name or ID
+68: Please specify a storage name. (usage: @storage <storage name/ID>).
+// 69 FREE
70: You have learned the skill.
71: You have forgotten the skill.
72: War of Emperium has been initiated.
@@ -740,7 +744,7 @@
918: Please enter a speed value (usage: @speed <%d-%d>).
// @storage
-919: Storage opened.
+919: Storage #%d opened.
// @guildstorage
920: Guild storage opened.
diff --git a/npc/003-1/quirino.txt b/npc/003-1/quirino.txt
index 412f40e25..cd55882fb 100644
--- a/npc/003-1/quirino.txt
+++ b/npc/003-1/quirino.txt
@@ -59,6 +59,7 @@ L_Register:
l("Yeah, sign me up!"),
l("No, not at the moment."),
l("Does it counts to Honor Ranking?"),
+ l("You are holding a few items of mine..."),
l("Information");
switch (@menu) {
@@ -68,7 +69,13 @@ L_Register:
close;
case 3:
quirinHonor();
+ break;
case 4:
+ openstorage(2, STORAGE_ACCESS_GET);
+ closeclientdialog;
+ close;
+ break;
+ case 5:
quirinInfo();
}
goto L_Register;
@@ -137,7 +144,7 @@ L_Full:
mes "";
if (@menu == 2) {
closeclientdialog;
- charcommand("@storeall");
+ charcommand("@storeall 2");
}
close;
diff --git a/sql-files/main.sql b/sql-files/main.sql
index 7b99aa0ee..e2280d225 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -997,6 +997,7 @@ INSERT IGNORE INTO `sql_updates` (`timestamp`) VALUES (1596240000); -- 2020-08-0
CREATE TABLE IF NOT EXISTS `storage` (
`id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
`account_id` INT(11) UNSIGNED NOT NULL DEFAULT '0',
+ `storage_id` INT UNSIGNED NOT NULL DEFAULT '1',
`nameid` INT(11) UNSIGNED NOT NULL DEFAULT '0',
`amount` INT(11) UNSIGNED NOT NULL DEFAULT '0',
`equip` INT(11) UNSIGNED NOT NULL DEFAULT '0',