diff options
Diffstat (limited to 'npc/events')
| -rw-r--r-- | npc/events/halloween_2006.txt | 51 | ||||
| -rw-r--r-- | npc/events/lunar_2008.txt | 7 |
2 files changed, 10 insertions, 48 deletions
diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt index 8e8d60684..64fef4c0d 100644 --- a/npc/events/halloween_2006.txt +++ b/npc/events/halloween_2006.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Brainstorm //===== Current Version: ===================================== -//= 1.1a +//= 1.2 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +14,7 @@ //= 1.0 First semi-working conversion. [Brainstorm] //= 1.1 Refined Brainstorm's conversion. [L0ne_W0lf] //= 1.1a Minor fixes. (Screwed up weight checks somehow) [L0ne_W0lf] +//= 1.2 Added missing checkweights. [L0ne_W0lf] //============================================================ // Pumpkin Mojo quest (Event 1) @@ -29,18 +30,8 @@ OnTouch: } prontera,164,69,3 script Cool Devi#06_hw 738,{ - /*var max_max_c = CheckMaxCount 1201 1 - if max_max_c == 1 - mes "^3355FFWait a second!" - mes "Right now, you're carrying" - mes "too many things with you." - mes "Please come back after" - mes "using the Kafra Service" - mes "to store some of your items.^000000" - close; - }*/ set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 2000) { + if (.@now_weight < 2000 || checkweight(1201,1) == 0) { mes "^3355FFWait a second!"; mes "Right now, you're carrying"; mes "too many things with you."; @@ -236,18 +227,8 @@ prontera,164,69,3 script Cool Devi#06_hw 738,{ geffen,145,132,3 script Hoirin#06_hw 729,{ - /*var max_max_c = CheckMaxCount 1201 1 - if max_max_c == 1 - mes "^3355FFWait a second!" - mes "Right now, you're carrying" - mes "too many things with you." - mes "Please come back after" - mes "using the Kafra Service" - mes "to store some of your items.^000000" - close; - }*/ set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 2000) { + if (.@now_weight < 2000 || checkweight(1201,1) == 0) { mes "^3355FFWait a second!"; mes "Right now, you're carrying"; mes "too many things with you."; @@ -402,18 +383,8 @@ OnTouch: } nif_in,19,32,3 script Deviruchi#06_hw 738,{ - /*var max_max_c = CheckMaxCount 1201 1 - if max_max_c == 1 - mes "^3355FFWait a second!" - mes "Right now, you're carrying" - mes "too many things with you." - mes "Please come back after" - mes "using the Kafra Service" - mes "to store some of your items.^000000" - close; - }*/ set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 2000) { + if (.@now_weight < 2000 || checkweight(1201,1) == 0) { mes "^3355FFWait a second!"; mes "Right now, you're carrying"; mes "too many things with you."; @@ -504,18 +475,8 @@ nif_in,19,32,3 script Deviruchi#06_hw 738,{ // Creation of Pumpkin Pie (Event 2) nif_fild01,165,115,3 script Chicken Masta#06_hw 794,{ - /*var max_max_c = CheckMaxCount 1201 1 - if max_max_c == 1 - mes "^3355FFWait a second!" - mes "Right now, you're carrying" - mes "too many things with you." - mes "Please come back after" - mes "using the Kafra Service" - mes "to store some of your items.^000000" - close; - }*/ set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 2000) { + if (.@now_weight < 2000 || checkweight(1201,1) == 0) { mes "^3355FFWait a second!"; mes "Right now, you're carrying"; mes "too many things with you."; diff --git a/npc/events/lunar_2008.txt b/npc/events/lunar_2008.txt index 1492206e4..ff02788aa 100644 --- a/npc/events/lunar_2008.txt +++ b/npc/events/lunar_2008.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -20,7 +20,8 @@ //= or are unsure if your client supports that sprite, an //= alternate NPC header has been included. //===== Additional Comments: ================================= -//= v1.0 First version. +//= 1.0 First version. [L0ne_W0lf] +//= 1.1 Added missing checkweights. [L0ne_W0lf] //============================================================ payon_in01,193,30,4 script Rice Mill Grandma#rat 78,{ @@ -227,7 +228,7 @@ payon,215,127,4 script Rice Mill Man#rat 54,{ //payon,126,113,4 script Miss Lunar#rat 862,{ payon,126,113,4 script Miss Lunar#rat 719,{ mes "[Lunar]"; - if ((MaxWeight-Weight) < 3000) { + if ((MaxWeight-Weight) < 3000 || checkweight(1201,1) == 0) { mes "Oh, I'm sorry, but we"; mes "can't do any business if"; mes "you're carry so much stuff."; |