From ee1be5410bf30c2122753c633c6418ebdc7a1978 Mon Sep 17 00:00:00 2001
From: masao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Tue, 3 Jan 2012 19:38:57 +0000
Subject: - Follow up r15363. * Enabled Item Scripts for Job change specific
 Items.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15364 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 db/item_db.txt           | 18 +++++++++---------
 npc/jobs/3-1/warlock.txt |  1 +
 sql-files/item_db.sql    | 18 +++++++++---------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/db/item_db.txt b/db/item_db.txt
index 4cfbcc0a5..25ad5ebb9 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -5418,16 +5418,16 @@
 12378,2009_Rice_Cake_Soup,Rice Cake Soup,2,10,,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12379,Pope's_Cookie,Pope Cookie,2,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12380,Desert_Wolf_Babe_Scroll,Job Change Flute,2,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ mercenary_create 2034,1800000; },{},{}
-12381,ValkyrieA_Scroll,Ancient Languages Scroll,2,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getmapxy .@map$,.@x,.@y,0; if(.@map$ == "job3_arch02") { mercenary_create 2037,1800000; } },{},{}
-12382,ValkyrieB_Scroll,Ancient Languages Scroll,2,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getmapxy .@map$,.@x,.@y,0; if(.@map$ == "job3_arch02") { mercenary_create 2038,1800000; } },{},{}
+12381,ValkyrieA_Scroll,Ancient Languages Scroll,2,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(strcharinfo(3) == "job3_arch02")  { mercenary_create 2037,1800000; } },{},{}
+12382,ValkyrieB_Scroll,Ancient Languages Scroll,2,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(strcharinfo(3) == "job3_arch02")  { mercenary_create 2038,1800000; } },{},{}
 12383,Vulcan_Bullet_Magazine,Vulcan Bullet Magazine,2,11000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12384,Rainbow_Ruby_Water,Rainbow Ruby,11,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ /* getmapxy .@map$,.@x,.@y,0; if(.@map$ == "job3_war02") { itemSkill "WL_FROSTMISTY",5; } */ },{},{}
-12385,Rainbow_Ruby_Fire,Rainbow Ruby,11,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ /* getmapxy .@map$,.@x,.@y,0; if(.@map$ == "job3_war02") { itemskill "WL_CRIMSONROCK",5; } */ },{},{}
-12386,Rainbow_Ruby_Wind,Rainbow Ruby,11,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ /* getmapxy .@map$,.@x,.@y,0; if(.@map$ == "job3_war02") { itemskill "WL_CHAINLIGHTNING",5; } */ },{},{}
-12387,Rainbow_Ruby_Earth,Rainbow Ruby,11,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ /* getmapxy .@map$,.@x,.@y,0; if(.@map$ == "job3_war02") { itemskill "WL_EARTHSTRAIN",5; } */ },{},{}
-12388,Runstone_Crush,Rhydo Runestone For Apprentice,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ /* getmapxy .@map$,.@x,.@y,0; if(.@map$ == "job3_rune02") { itemskill "RK_CRUSHSTRIKE",1; } */ },{},{}
-12389,Runstone_Storm,Pertz Runestone For Apprentice,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ /* getmapxy .@map$,.@x,.@y,0; if(.@map$ == "job3_rune02") { itemskill "RK_STORMBLAST",1; } */ },{},{}
-12390,Runstone_Millennium,Verkana Runestone For Apprentice,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ /* getmapxy .@map$,.@x,.@y,0; if(.@map$ == "job3_rune02") { itemskill "RK_MILLENNIUMSHIELD",1; } */ },{},{}
+12384,Rainbow_Ruby_Water,Rainbow Ruby,11,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ if(strcharinfo(3) == "job3_war02") { itemSkill "WL_FROSTMISTY",5; } },{},{}
+12385,Rainbow_Ruby_Fire,Rainbow Ruby,11,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ if(strcharinfo(3) == "job3_war02") { itemskill "WL_CRIMSONROCK",5; } },{},{}
+12386,Rainbow_Ruby_Wind,Rainbow Ruby,11,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ if(strcharinfo(3) == "job3_war02") { itemskill "WL_CHAINLIGHTNING",5; } },{},{}
+12387,Rainbow_Ruby_Earth,Rainbow Ruby,11,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ if(strcharinfo(3) == "job3_war02") { itemskill "WL_EARTHSTRAIN",5; } },{},{}
+12388,Runstone_Crush,Rhydo Runestone For Apprentice,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(strcharinfo(3) == "job3_rune02") { itemskill "RK_CRUSHSTRIKE",1; } },{},{}
+12389,Runstone_Storm,Pertz Runestone For Apprentice,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(strcharinfo(3) == "job3_rune02") { itemskill "RK_STORMBLAST",1; } },{},{}
+12390,Runstone_Millennium,Verkana Runestone For Apprentice,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(strcharinfo(3) == "job3_rune02") { itemskill "RK_MILLENNIUMSHIELD",1; } },{},{}
 12391,Lucky_Egg_C,Lucky Egg,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12392,Repair_A,Repair A,0,220,,70,,,,,0x00000400,8,2,,,,,,{/* madoheal rand(200,300),0; */},{},{}
 12393,Repair_B,Repair B,0,500,,70,,,,,0x00000400,8,2,,,,,,{/* madoheal rand(300,400),0; */},{},{}
diff --git a/npc/jobs/3-1/warlock.txt b/npc/jobs/3-1/warlock.txt
index 0c20e44df..47b8c01b2 100644
--- a/npc/jobs/3-1/warlock.txt
+++ b/npc/jobs/3-1/warlock.txt
@@ -2,6 +2,7 @@
 // Warlock Job change Quest
 //===== By: ================================================== 
 //= Masao
+//= Credits: Muad_Dib
 //===== Current Version: ===================================== 
 //= 1.0
 //===== Compatible With: ===================================== 
diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql
index 8da77eb13..05f41e836 100644
--- a/sql-files/item_db.sql
+++ b/sql-files/item_db.sql
@@ -5116,16 +5116,16 @@ REPLACE INTO `item_db` VALUES (12377,'Mysterious_PET_Bottle2','Mysterious PET Bo
 REPLACE INTO `item_db` VALUES (12378,'2009_Rice_Cake_Soup','Rice Cake Soup',2,10,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (12379,'Pope\'s_Cookie','Pope Cookie',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (12380,'Desert_Wolf_Babe_Scroll','Job Change Flute',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'mercenary_create 2034,1800000;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12381,'ValkyrieA_Scroll','Ancient Languages Scroll',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getmapxy .@map$,.@x,.@y,0; if(.@map$ == \"job3_arch02\") { mercenary_create 2037,1800000; }',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12382,'ValkyrieB_Scroll','Ancient Languages Scroll',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'getmapxy .@map$,.@x,.@y,0; if(.@map$ == \"job3_arch02\") { mercenary_create 2038,1800000; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12381,'ValkyrieA_Scroll','Ancient Languages Scroll',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'if(strcharinfo(3) == "job3_arch02")  { mercenary_create 2037,1800000; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12382,'ValkyrieB_Scroll','Ancient Languages Scroll',2,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'if(strcharinfo(3) == "job3_arch02")  { mercenary_create 2038,1800000; }',NULL,NULL);
 REPLACE INTO `item_db` VALUES (12383,'Vulcan_Bullet_Magazine','Vulcan Bullet Magazine',2,11000,NULL,500,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db` VALUES (12384,'Rainbow_Ruby_Water','Rainbow Ruby',11,0,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'/* getmapxy .@map$,.@x,.@y,0; if(.@map$ == \"job3_war02\") { itemSkill \"WL_FROSTMISTY\",5; } */',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12385,'Rainbow_Ruby_Fire','Rainbow Ruby',11,0,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'/* getmapxy .@map$,.@x,.@y,0; if(.@map$ == \"job3_war02\") { itemskill \"WL_CRIMSONROCK\",5; } */',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12386,'Rainbow_Ruby_Wind','Rainbow Ruby',11,0,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'/* getmapxy .@map$,.@x,.@y,0; if(.@map$ == \"job3_war02\") { itemskill \"WL_CHAINLIGHTNING\",5; } */',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12387,'Rainbow_Ruby_Earth','Rainbow Ruby',11,0,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'/* getmapxy .@map$,.@x,.@y,0; if(.@map$ == \"job3_war02\") { itemskill \"WL_EARTHSTRAIN\",5; } */',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12388,'Runstone_Crush','Rhydo Runestone For Apprentice',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'/* getmapxy .@map$,.@x,.@y,0; if(.@map$ == \"job3_rune02\") { itemskill \"RK_CRUSHSTRIKE\",1; } */',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12389,'Runstone_Storm','Pertz Runestone For Apprentice',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'/* getmapxy .@map$,.@x,.@y,0; if(.@map$ == \"job3_rune02\") { itemskill \"RK_STORMBLAST\",1; } */',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12390,'Runstone_Millennium','Verkana Runestone For Apprentice',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'/* getmapxy .@map$,.@x,.@y,0; if(.@map$ == \"job3_rune02\") { itemskill \"RK_MILLENNIUMSHIELD\",1; } */',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12384,'Rainbow_Ruby_Water','Rainbow Ruby',11,0,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'if(strcharinfo(3) == "job3_war02") { itemSkill "WL_FROSTMISTY",5; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12385,'Rainbow_Ruby_Fire','Rainbow Ruby',11,0,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'if(strcharinfo(3) == "job3_war02") { itemskill "WL_CRIMSONROCK",5; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12386,'Rainbow_Ruby_Wind','Rainbow Ruby',11,0,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'if(strcharinfo(3) == "job3_war02") { itemskill "WL_CHAINLIGHTNING",5; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12387,'Rainbow_Ruby_Earth','Rainbow Ruby',11,0,NULL,50,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'if(strcharinfo(3) == "job3_war02") { itemskill "WL_EARTHSTRAIN",5; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12388,'Runstone_Crush','Rhydo Runestone For Apprentice',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'if(strcharinfo(3) == "job3_rune02") { itemskill "RK_CRUSHSTRIKE",1; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12389,'Runstone_Storm','Pertz Runestone For Apprentice',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'if(strcharinfo(3) == "job3_rune02") { itemskill "RK_STORMBLAST",1; }',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12390,'Runstone_Millennium','Verkana Runestone For Apprentice',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'if(strcharinfo(3) == "job3_rune02") { itemskill "RK_MILLENNIUMSHIELD",1; }',NULL,NULL);
 REPLACE INTO `item_db` VALUES (12391,'Lucky_Egg_C','Lucky Egg',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (12392,'RepairA','Repair A',2,220,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (12393,'RepairB','Repair B',2,500,NULL,140,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-- 
cgit v1.2.3-70-g09d2