summaryrefslogtreecommitdiff
path: root/npc/jobs/1-1/merchant.txt
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-04-02 22:06:40 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-04-02 22:06:40 +0000
commitab9000884a33241b4a293826a9dc0506b8c3c326 (patch)
tree4a32734282524268a39fd3181d8c1ce34936ab91 /npc/jobs/1-1/merchant.txt
parent47b830dbd449936e3dffc96424f025930bad719f (diff)
downloadhercules-ab9000884a33241b4a293826a9dc0506b8c3c326.tar.gz
hercules-ab9000884a33241b4a293826a9dc0506b8c3c326.tar.bz2
hercules-ab9000884a33241b4a293826a9dc0506b8c3c326.tar.xz
hercules-ab9000884a33241b4a293826a9dc0506b8c3c326.zip
finished Valkirye
fixed Skill Points exploit in Assassin Job Quest git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1383 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/jobs/1-1/merchant.txt')
-rw-r--r--npc/jobs/1-1/merchant.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt
index 49ca27475..afd58ac42 100644
--- a/npc/jobs/1-1/merchant.txt
+++ b/npc/jobs/1-1/merchant.txt
@@ -3,19 +3,21 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
-//= eAthena 7.15 +
+//= eAthena 1.0 +
//===== Description: =========================================
//= <Description>
//===== Additional Comments: =================================
//= Fully working
+//= v1.1 Added instant job change for High Novice [Lupus]
//============================================================
// == Guild NPCs ==
// -- Mahnsoo --
alberta_in.gat,53,43,6 script Chief Mahnsoo 86,{
+ callfunc "F_ToHigh",29,"Merchant High",34,"White Smith",153,154,155,0,"Chief Mahnsoo";
mes "[Chief Mahnsoo]";
if(Class==Job_Novice && job_merchant_q3 == 4) goto L_MakeMerc;
if(Class==Job_Novice && job_merchant_q3 == 3) goto L_GiveRecpt;