From d6179ebd0c2f112bf8aa70a7dd5b59656c2649f2 Mon Sep 17 00:00:00 2001
From: Jedzkie <jedzkie13@rocketmail.com>
Date: Mon, 14 Dec 2015 23:44:25 +0800
Subject: Update the Mercenary item database. Change Item ID and Mercenary ID
 to Constants.

---
 db/pre-re/item_db.conf | 110 ++++++++++++++++++++++++-------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

(limited to 'db/pre-re')

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index ac739d5f8..4e2240c31 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -63276,7 +63276,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6017,1800000; ">
+	Script: <" mercenary_create MER_ARCHER01, 1800000; ">
 },
 {
 	Id: 12154
@@ -63294,7 +63294,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6018,1800000; ">
+	Script: <" mercenary_create MER_ARCHER02, 1800000; ">
 },
 {
 	Id: 12155
@@ -63312,7 +63312,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6019,1800000; ">
+	Script: <" mercenary_create MER_ARCHER03, 1800000; ">
 },
 {
 	Id: 12156
@@ -63330,7 +63330,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6020,1800000; ">
+	Script: <" mercenary_create MER_ARCHER04, 1800000; ">
 },
 {
 	Id: 12157
@@ -63348,7 +63348,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6021,1800000; ">
+	Script: <" mercenary_create MER_ARCHER05, 1800000; ">
 },
 {
 	Id: 12158
@@ -63366,7 +63366,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6022,1800000; ">
+	Script: <" mercenary_create MER_ARCHER06, 1800000; ">
 },
 {
 	Id: 12159
@@ -63384,7 +63384,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6023,1800000; ">
+	Script: <" mercenary_create MER_ARCHER07, 1800000; ">
 },
 {
 	Id: 12160
@@ -63402,7 +63402,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6024,1800000; ">
+	Script: <" mercenary_create MER_ARCHER08, 1800000; ">
 },
 {
 	Id: 12161
@@ -63420,7 +63420,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6025,1800000; ">
+	Script: <" mercenary_create MER_ARCHER09, 1800000; ">
 },
 {
 	Id: 12162
@@ -63438,7 +63438,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6026,1800000; ">
+	Script: <" mercenary_create MER_ARCHER10, 1800000; ">
 },
 {
 	Id: 12163
@@ -63456,7 +63456,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6037,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN01, 1800000; ">
 },
 {
 	Id: 12164
@@ -63474,7 +63474,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6038,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN02, 1800000; ">
 },
 {
 	Id: 12165
@@ -63492,7 +63492,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6039,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN03, 1800000; ">
 },
 {
 	Id: 12166
@@ -63510,7 +63510,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6040,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN04, 1800000; ">
 },
 {
 	Id: 12167
@@ -63528,7 +63528,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6041,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN05, 1800000; ">
 },
 {
 	Id: 12168
@@ -63546,7 +63546,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6042,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN06, 1800000; ">
 },
 {
 	Id: 12169
@@ -63564,7 +63564,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6043,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN07, 1800000; ">
 },
 {
 	Id: 12170
@@ -63582,7 +63582,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6044,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN08, 1800000; ">
 },
 {
 	Id: 12171
@@ -63600,7 +63600,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6045,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN09, 1800000; ">
 },
 {
 	Id: 12172
@@ -63618,7 +63618,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6046,1800000; ">
+	Script: <" mercenary_create MER_SWORDMAN10, 1800000; ">
 },
 {
 	Id: 12173
@@ -63636,7 +63636,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6027,1800000; ">
+	Script: <" mercenary_create MER_LANCER01, 1800000; ">
 },
 {
 	Id: 12174
@@ -63654,7 +63654,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6028,1800000; ">
+	Script: <" mercenary_create MER_LANCER02, 1800000; ">
 },
 {
 	Id: 12175
@@ -63672,7 +63672,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6029,1800000; ">
+	Script: <" mercenary_create MER_LANCER03, 1800000; ">
 },
 {
 	Id: 12176
@@ -63690,7 +63690,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6030,1800000; ">
+	Script: <" mercenary_create MER_LANCER04, 1800000; ">
 },
 {
 	Id: 12177
@@ -63708,7 +63708,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6031,1800000; ">
+	Script: <" mercenary_create MER_LANCER05, 1800000; ">
 },
 {
 	Id: 12178
@@ -63726,7 +63726,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6032,1800000; ">
+	Script: <" mercenary_create MER_LANCER06, 1800000; ">
 },
 {
 	Id: 12179
@@ -63744,7 +63744,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6033,1800000; ">
+	Script: <" mercenary_create MER_LANCER07, 1800000; ">
 },
 {
 	Id: 12180
@@ -63762,7 +63762,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6034,1800000; ">
+	Script: <" mercenary_create MER_LANCER08, 1800000; ">
 },
 {
 	Id: 12181
@@ -63780,7 +63780,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6035,1800000; ">
+	Script: <" mercenary_create MER_LANCER09, 1800000; ">
 },
 {
 	Id: 12182
@@ -63798,7 +63798,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 6036,1800000; ">
+	Script: <" mercenary_create MER_LANCER10, 1800000; ">
 },
 {
 	Id: 12183
@@ -65166,7 +65166,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" mercenary_create 2058,1800000; ">
+	Script: <" mercenary_create M_MIMIC, 1800000; ">
 },
 {
 	Id: 12277
@@ -65180,7 +65180,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" mercenary_create 2059,1800000; ">
+	Script: <" mercenary_create M_DISGUISE, 1800000; ">
 },
 {
 	Id: 12278
@@ -65194,7 +65194,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" mercenary_create 2060,1800000; ">
+	Script: <" mercenary_create M_ALICE, 1800000; ">
 },
 {
 	Id: 12279
@@ -65541,7 +65541,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 1965,1800000; ">
+	Script: <" mercenary_create M_WILD_ROSE, 1800000; ">
 },
 {
 	Id: 12301
@@ -65559,7 +65559,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 1966,1800000; ">
+	Script: <" mercenary_create M_DOPPELGANGER, 1800000; ">
 },
 {
 	Id: 12302
@@ -65577,7 +65577,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" mercenary_create 1967,1800000; ">
+	Script: <" mercenary_create M_YGNIZEM, 1800000; ">
 },
 {
 	Id: 12303
@@ -65959,7 +65959,7 @@ item_db: (
 	Buy: 0
 	Weight: 10
 	BuyingStore: true
-	Script: <" mercenary_create 2000,1800000; ">
+	Script: <" mercenary_create M_GAMEMASTER, 1800000; ">
 },
 {
 	Id: 12330
@@ -65969,7 +65969,7 @@ item_db: (
 	Buy: 0
 	Weight: 10
 	BuyingStore: true
-	Script: <" mercenary_create 2001,1800000; ">
+	Script: <" mercenary_create F_GAMEMASTER, 1800000; ">
 },
 {
 	Id: 12331
@@ -66697,7 +66697,7 @@ item_db: (
 	Type: 2
 	Buy: 10
 	Weight: 10
-	Script: <" mercenary_create 2034,1800000; ">
+	Script: <" mercenary_create M_DESERT_WOLF_B, 1800000; ">
 },
 {
 	Id: 12381
@@ -66707,8 +66707,8 @@ item_db: (
 	Buy: 10
 	Weight: 10
 	Script: <"
-		if(strcharinfo(3)=="job3_arch02") {
-			mercenary_create 2037,1800000;
+		if (strcharinfo(3) == "job3_arch02") {
+			mercenary_create VALKYRIE_A, 1800000;
 		}
 
 	">
@@ -66721,8 +66721,8 @@ item_db: (
 	Buy: 10
 	Weight: 10
 	Script: <"
-		if(strcharinfo(3)=="job3_arch02") {
-			mercenary_create 2038,1800000;
+		if (strcharinfo(3) == "job3_arch02") {
+			mercenary_create VALKYRIE_B, 1800000;
 		}
 
 	">
@@ -79296,7 +79296,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 12276,5; ">
+	Script: <" getitem Mimic_Scroll, 5; ">
 },
 {
 	Id: 13897
@@ -79310,7 +79310,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 12277,5; ">
+	Script: <" getitem Disguise_Scroll, 5; ">
 },
 {
 	Id: 13898
@@ -79324,7 +79324,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 12278,5; ">
+	Script: <" getitem Alice_Scroll, 5; ">
 },
 {
 	Id: 13899
@@ -79338,7 +79338,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 12276,10; ">
+	Script: <" getitem Mimic_Scroll, 10; ">
 },
 {
 	Id: 13900
@@ -79352,7 +79352,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 12277,10; ">
+	Script: <" getitem Disguise_Scroll, 10; ">
 },
 {
 	Id: 13901
@@ -79366,7 +79366,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 12278,10; ">
+	Script: <" getitem Alice_Scroll, 10; ">
 },
 {
 	Id: 13902
@@ -81716,7 +81716,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12276,5; ">
+	Script: <" getitem Mimic_Scroll, 5; ">
 },
 {
 	Id: 14031
@@ -81734,7 +81734,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12277,5; ">
+	Script: <" getitem Disguise_Scroll, 5; ">
 },
 {
 	Id: 14032
@@ -81752,7 +81752,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12278,5; ">
+	Script: <" getitem Alice_Scroll, 5; ">
 },
 {
 	Id: 14033
@@ -81770,7 +81770,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12276,10; ">
+	Script: <" getitem Mimic_Scroll, 10; ">
 },
 {
 	Id: 14034
@@ -81788,7 +81788,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12277,10; ">
+	Script: <" getitem Disguise_Scroll, 10; ">
 },
 {
 	Id: 14035
@@ -81806,7 +81806,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 12278,10; ">
+	Script: <" getitem Alice_Scroll, 10; ">
 },
 {
 	Id: 14036
-- 
cgit v1.2.3-70-g09d2