From e3afdc2af4c5e50c79237ee092e25f39b7428e47 Mon Sep 17 00:00:00 2001 From: Michieru Date: Thu, 24 Oct 2013 12:10:43 +0200 Subject: Update to last rAthena npc. Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt --- npc/merchants/novice_exchange.txt | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'npc/merchants/novice_exchange.txt') diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt index cd8cede0e..d7f519d1f 100644 --- a/npc/merchants/novice_exchange.txt +++ b/npc/merchants/novice_exchange.txt @@ -1,23 +1,22 @@ //===== Hercules Script ====================================== //= Novice Goods Exchanger //===== By: ================================================== -//= ???, rAthena Dev Team +//= ???, rAthena Team //===== Current Version: ===================================== //= 1.4 //===== Description: ========================================= -//= [Aegis COnversion] +//= [Official Conversion] //= Exchanges your Basic Monster drops for Red Potions. //===== Additional Comments: ================================= //= 1.2 Rescripted to Aegis 10.standards. [L0ne_W0lf[ -//= Made it easier to add new items to exhange list -//= meaning only the exchange is done in a function now. +//= Made it easier to add new items to exhange list +//= meaning only the exchange is done in a function now. //= 1.3 Fixed dialog mix-up in function. [L0ne_W0lf] //= 1.4 Added checkweight, and input min/max values. [L0ne_W0lf] //============================================================ prontera,123,102,5 script Merchant#pron 85,{ - set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 6301 || checkweight(1201,1) == 0) { + if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) { mes "[Merchant]"; mes "Haha!"; mes "What are you, superhuman?"; @@ -73,8 +72,7 @@ prontera,123,102,5 script Merchant#pron 85,{ } morocc,180,259,3 script Merchant#morroc 85,{ - set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 6301 || checkweight(1201,1) == 0) { + if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) { mes "[Merchant]"; mes "Haha!"; mes "What are you, superhuman?"; @@ -131,8 +129,7 @@ morocc,180,259,3 script Merchant#morroc 85,{ } payon,200,134,5 script Merchant#pay 85,{ - set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 6301 || checkweight(1201,1) == 0) { + if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) { mes "[Merchant]"; mes "Haha!"; mes "What are you, superhuman?"; @@ -186,8 +183,7 @@ payon,200,134,5 script Merchant#pay 85,{ } aldebaran,152,63,5 script Merchant#alde 85,{ - set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 6301 || checkweight(1201,1) == 0) { + if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) { mes "[Merchant]"; mes "Haha!"; mes "What are you, superhuman?"; @@ -244,8 +240,7 @@ aldebaran,152,63,5 script Merchant#alde 85,{ } geffen,173,88,5 script Merchant#geff 85,{ - set .@now_weight,MaxWeight-Weight; - if (.@now_weight < 6301 || checkweight(1201,1) == 0) { + if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) { mes "[Merchant]"; mes "Haha!"; mes "What are you, superhuman?"; @@ -384,9 +379,9 @@ function script F_PotExchange { } } -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.1 Made it as a function. U can add your own Merchs [Lupus] //= 1.1a Fixed item select [KarLaeda] -//============================================================ +//============================================================ -- cgit v1.2.3-70-g09d2