From 06526e32ea7608dfc62ad5aeca91cf78ff3a446f Mon Sep 17 00:00:00 2001 From: euphyy Date: Mon, 25 Feb 2013 03:04:33 +0000 Subject: * Part one of fixing bugreport:6527. This does not yet change functionality. -- Added 'disable_items' to all applicable scripts. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17160 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/quests/newgears/2004_headgears.txt | 11 +++++------ npc/quests/newgears/2005_headgears.txt | 7 ++++++- npc/quests/seals/mjolnir_seal.txt | 4 +++- 3 files changed, 14 insertions(+), 8 deletions(-) (limited to 'npc/quests') diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt index 4a347877d..71c33e6aa 100644 --- a/npc/quests/newgears/2004_headgears.txt +++ b/npc/quests/newgears/2004_headgears.txt @@ -3,7 +3,9 @@ //===== By: ================================================== //= Dj-Yhn //===== Current Version: ===================================== -//= 1.6 +//= 1.6a +//===== Compatible With: ===================================== +//= Hercules Git //===== Description: ========================================= //= [Aegis Conversion] //= 2004 New Headgears. Official Quests @@ -31,6 +33,7 @@ //= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 1.5 Vito'd function call for checkweight. [L0ne_W0lf] //= 1.6 Replaced effect numerics with constants. [L0ne_W0lf] +//= 1.6a Added 'disable_items' command. [Euphy] //============================================================ // Black Cat Ears @@ -635,7 +638,7 @@ geffen,67,87,3 script Ipore#1 700,{ // Angel Wing Ears, Devil Wing Ears //============================================================ yuno,241,52,3 script Old Blacksmith#hgear 813,{ - //DisableItemMove + disable_items; if (checkweight(1201,1) == 0) { mes "- Wait a minute! -"; mes "- Currently you're carrying -"; @@ -643,9 +646,6 @@ yuno,241,52,3 script Old Blacksmith#hgear 813,{ mes "- Please try again after -"; mes "- you put some items into Kafra Storage. -"; close; - // close2; - // EnableItemMove - // end; } mes "[Skillful Looking Artisan]"; mes "Aha~"; @@ -958,7 +958,6 @@ yuno,241,52,3 script Old Blacksmith#hgear 813,{ mes "I'm always here at this scenic spot so I can enjoy the view. Just come back whenever you feel like it."; close; } - //EnableItemMove } // Sea-Otter Hat diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt index 862e9d364..e60169ab0 100644 --- a/npc/quests/newgears/2005_headgears.txt +++ b/npc/quests/newgears/2005_headgears.txt @@ -3,7 +3,9 @@ //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== -//= 1.3 +//= 1.3a +//===== Compatible With: ===================================== +//= Hercules Git //===== Description: ========================================= //= [Aegis Conversion] //= 2005 Headgears Official Quest. @@ -13,6 +15,7 @@ //= 1.2 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.3 Fixed item check bugs, added missing airport NPC, // and took out unneeded breaks [Xantara] [Muad_Dib] +//= 1.3a Added 'disable_items' command. [Euphy] //============================================================ yuno,222,116,3 script Kasis#LhzHat 851,{ @@ -225,6 +228,7 @@ yuno,222,116,3 script Kasis#LhzHat 851,{ } lighthalzen,143,68,0 script Strange Guy#LhzHat 47,{ + disable_items; if(DTHATQ == 0) { mes "[Strange Guy]"; @@ -1083,6 +1087,7 @@ lhz_in02,91,38,5 script Margaret Mary#LhzHat 90,{ } lighthalzen,182,89,0 script Relaxed-Looking Lady 91,{ + disable_items; if(LHZBTQ == 0) { mes "[Relaxed-Looking Lady]"; diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt index 95a3d5098..e2be244ea 100644 --- a/npc/quests/seals/mjolnir_seal.txt +++ b/npc/quests/seals/mjolnir_seal.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== -//= 1.8 +//= 1.8a //===== Compatible With: ===================================== //= rAthena //===== Description: ========================================= @@ -20,6 +20,7 @@ //= Corrected Sudi's and player's HP settings. //= 1.7 Fixed a copy/paste error in Nordri. [L0ne_W0lf] //= 1.8 Fixed item check for Oridecon. [L0ne_W0lf] +//= 1.8a Added 'disable_items' command. [Euphy] //============================================================ prontera,124,297,3 script Tialfi 706,{ @@ -1934,6 +1935,7 @@ mjolnir_01,35,136,7 script Dwarf Blacksmith#west 826,{ } } else if(god_mjo_3 == 1) { + disable_items; mes "[Vestri]"; mes "Great...!"; mes "Which one should I upgrade first, huh? My heart is pounding with anticipation..."; -- cgit v1.2.3-70-g09d2