summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-10-09 11:47:50 -0300
committerJesusaves <cpntb1@ymail.com>2020-10-09 11:47:50 -0300
commitc73c31527b1adf0a38141c369843928c6481a9ff (patch)
tree70b9f88550159052997c17b3ba176e5be1dca2bf
parent04f0bcc4cacee634a9c10b17541f332014c7354f (diff)
downloadserverdata-c73c31527b1adf0a38141c369843928c6481a9ff.tar.gz
serverdata-c73c31527b1adf0a38141c369843928c6481a9ff.tar.bz2
serverdata-c73c31527b1adf0a38141c369843928c6481a9ff.tar.xz
serverdata-c73c31527b1adf0a38141c369843928c6481a9ff.zip
Discord Booster Necklace.
Also, fix typos reported by YuckFou.
-rw-r--r--db/re/item_db.conf19
-rw-r--r--npc/003-1/itka.txt1
-rw-r--r--npc/005-1/ayasha.txt2
-rw-r--r--npc/commands/rent.txt31
-rw-r--r--npc/scripts.conf1
5 files changed, 52 insertions, 2 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index a340158d1..e5d287783 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -5770,6 +5770,25 @@ item_db: (
EquipLv: 9
Refine: false
},
+{
+ Id: 1022
+ AegisName: "DiscordNecklace"
+ Name: "Discord Necklace"
+ Type: "IT_ARMOR"
+ Buy: 2
+ Sell: 1
+ Weight: 1
+ Loc: "EQP_SHADOW_ACC_R"
+ Refine: false
+ Trade: {
+ notrade: true
+ nodrop: true
+ noselltonpc: true
+ nogstorage: true
+ nomail: true
+ noauction: true
+ }
+},
// <!-- Charms -->
{
Id: 1150
diff --git a/npc/003-1/itka.txt b/npc/003-1/itka.txt
index b7d087517..2a87bae45 100644
--- a/npc/003-1/itka.txt
+++ b/npc/003-1/itka.txt
@@ -7,7 +7,6 @@
mesn;
mesq lg("Hello, madam!", "Hello, sir!");
next;
- //mesq l("The inn north of me still haven't opened, which is a shame. I guess their cassino got too expensive.");
mesq l("Did you knew the casino on the inn up here was one of the most expensive on the whole world?");
next;
mesq l("Anyway, I am selling Cherry Cakes to sponsor my studies. Please buy as many as you want!");
diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt
index f71f1726d..3053a1405 100644
--- a/npc/005-1/ayasha.txt
+++ b/npc/005-1/ayasha.txt
@@ -107,7 +107,7 @@ L_Rent:
close;
L_DoRent:
- if (gettimetick(2) <= .RENT_TIME) mesq l("Sorry, you was taking too long to decide and I've rented my sword to somebody else.");
+ if (gettimetick(2) <= .RENT_TIME) mesq l("Sorry, you were taking too long to decide and I've rented my sword to somebody else.");
if (gettimetick(2) <= .RENT_TIME) close;
.RENT_TIME=gettimetick(2)+(15*60);
set Zeny, Zeny - 300;
diff --git a/npc/commands/rent.txt b/npc/commands/rent.txt
new file mode 100644
index 000000000..cafe41e33
--- /dev/null
+++ b/npc/commands/rent.txt
@@ -0,0 +1,31 @@
+// TMW2 Script
+//
+// @rentitem <item> <time>
+// Rents an <item> for <time>
+
+- script @rentitem 32767,{
+ end;
+
+OnCall:
+ //.@request$ = "";
+ //.@request$ += implode(.@atcmd_parameters$, " ");
+
+ .@item=atoi(.@atcmd_parameters$[0]);
+ .@time=atoi(.@atcmd_parameters$[1]);
+
+ if (!.@item || !.@time) {
+ dispbottom l("@rentitem <item numeric id> <time in seconds>");
+ end;
+ }
+
+ // Limiting to 365 days max
+ .@time=limit(15, .@time, 31536000);
+
+ rentitem(.@item, .@time);
+ end;
+
+OnInit:
+ bindatcmd "rentitem", "@rentitem::OnCall", 80, 99, 1;
+ end;
+}
+
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 89265b69f..ac6fea326 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -111,6 +111,7 @@
"npc/commands/python.txt",
"npc/commands/rate-management.txt",
"npc/commands/resync.txt",
+"npc/commands/rent.txt",
"npc/commands/scheduled-broadcasts.txt",
"npc/commands/shroom.txt",
"npc/commands/super-menu.txt",