From ea1a321438e75b66b3fc8148b6eaa41d049761dd Mon Sep 17 00:00:00 2001 From: euphyy Date: Mon, 24 Dec 2012 17:30:14 +0000 Subject: > Pre-Renewal fixes, major credits to Deep Forest for his detailed reports: * Separated Renewal Alberta features with checkre() and new files, follow-up r16125 (bugreport:7041). * Moved remaining Renewal shops out of pre-Renewal file, follow-up r16138 / r16104 (bugreport:7042). * Moved Renewal refining features to a separate file, and made some changes, follow-up r16126 (bugreport:7043). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17042 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/quests/skills/merchant_skills.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'npc/quests/skills/merchant_skills.txt') diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt index def5ec6aa..9fb596132 100644 --- a/npc/quests/skills/merchant_skills.txt +++ b/npc/quests/skills/merchant_skills.txt @@ -3,16 +3,16 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= -//= Quests for skills: Crazy Uproar, Change Cart, Cart -// Revolution +//= Quests for skills: Crazy Uproar, Change Cart, Cart Revolution //===== Additional Comments: ================================= //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= 1.6 Updated to latest available official file. [Masao] //= 1.7 Fixed JobLevel requirements. [Euphy] +//= 1.8 Moved Alberta NPC to pre-re/re paths. [Euphy] //============================================================ alberta,83,96,5 script Necko 98,7,7,{ @@ -332,7 +332,7 @@ alberta,119,221,6 script Charlron 107,{ close; } -alberta,232,103,6 script Gershaun 57,{ +- script ::Gershaun_alberta -1,{ if (BaseClass == Job_Merchant) { if (getskilllv("MC_CARTREVOLUTION") == 1) { mes "[Gershaun]"; -- cgit v1.2.3-60-g2f50