Misc updates. (#483)

Signed-off-by: Egi Ginting <exneval.rayz@gmail.com>
idathena · Sep 20, 2018 · 4bdd552 · 4bdd552
1 parent c37dae5
commit 4bdd552
Show file tree

Hide file tree

Showing 29 changed files with 727 additions and 40 deletions.
diff --git a/conf/battle/feature.conf b/conf/battle/feature.conf
@@ -89,3 +89,7 @@ feature.privateairship: off
 // Refine UI (Note 1)
 // Requires: 2016-10-12aRagexeRE or later
 feature.refineui: off
+
+// Stylist UI (Note 1)
+// Requires: 2015-11-04aRagexeRE or later
+feature.stylistui: off
diff --git a/conf/msg_conf/map_msg.conf b/conf/msg_conf/map_msg.conf
@@ -844,7 +844,15 @@
 780: Perintah ini dinonaktifkan melalui konfiguarsi server.
 781: Kamu sudah membuka refine UI.
 
-//782-899 kosong
+// Stylist Shop
+// Mail sender
+782: Styling Shop
+// Mail title: Item has been delivered
+783: <MSG>2949</MSG>
+// Mail body: Thank you for purchasing
+784: <MSG>2950</MSG>
+
+//785-899 kosong
 
 //------------------------------------
 // Pesan dalam perintah atcommand

diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt
@@ -3105,7 +3105,7 @@
 6044,Letter_From_Otto,Letter from Otto,3,0,,10,,,,,,,,,,,,,{},{},{}
 6045,Supply_Box,Supply Box,3,0,,0,,,,,,,,,,,,,{},{},{}
 6046,Clothing_Dye_Coupon,Clothing Dye Coupon,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-6047,Clothing_Dye_Coupon_II,Clothing Dye Coupon II,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+6047,Clothing_Dye_Coupon2,Clothing Dye Coupon II,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 6048,Unidentified_Mineral,Unidentified Mineral,3,0,,10,,,,,,,,,,,,,{},{},{}
 6049,Marlin,Marlin,3,0,,10,,,,,,,,,,,,,{},{},{}
 6050,Mercenary_Contract,Mercenary Contract,3,0,,10,,,,,,,,,,,,,{},{},{}
@@ -3455,6 +3455,8 @@
 6513,Charm_Ice,Ice Amulet,3,100,,1,,,,,,,,,,,,,{},{},{}
 6514,Charm_Wind,Wind Amulet,3,100,,1,,,,,,,,,,,,,{},{},{}
 6515,Charm_Earth,Earth Amulet,3,100,,1,,,,,,,,,,,,,{},{},{}
+6707,Cash_Hair_Coupon,Cash Hair Coupon,3,10,,10,,,,,,,,,,,,,{},{},{}
+6959,Costume_Change_Ticket,Costume Change Ticket,3,0,,0,,,,,,,,,,,,,{},{},{}
 7001,Mould_Powder,Mould Powder,3,466,,10,,,,,,,,,,,,,{},{},{}
 7002,Ogre_Tooth,Ogre Tooth,3,658,,10,,,,,,,,,,,,,{},{},{}
 7003,Anolian_Skin,Anolian Skin,3,968,,10,,,,,,,,,,,,,{},{},{}
@@ -6580,8 +6582,13 @@
 16680,Universal_Catalog_Gold_Box50,Universal Catalog Gold 50 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,50; },{},{}
 16776,Universal_Catalog_Gold_Box10,Universal Catalog Gold 10 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,10; },{},{}
 16777,Universal_Catalog_Gold_Box50,Universal Catalog Gold 50 Box,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12581,50; },{},{}
+16843,Beauty_Gift_Coupon_Box,Beauty Gift Coupon Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 7622,1; },{},{}
+16854,Clothing_Dye_Coupon_Box,Clothing Dye Coupon Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6046,1; },{},{}
+16855,Clothing_Dye_Orig_Coupon_Box,Original Clothing Dye Coupon Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6047,1; },{},{}
 17104,HD_Oridecon_50Box,HD Oridecon 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6240,50; },{},{}
 17105,HD_Elunium_50Box,HD Elunium 50 Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6241,50; },{},{}
+17336,Cash_Hair_Coupon_Box,Cash Hair Coupon Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6707,1; },{},{}
+17634,Costume_Change_Ticket_Box,Costume Change Ticket Box,18,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6959,1; },{},{}
 // Mechanic/Genetic Cannonballs
 //===================================================================
 18000,Cannon_Ball,Cannon Ball,10,100,,10,100,,,,0x00040400,8,2,32768,,99,,8,{},{},{}

diff --git a/db/pre-re/item_trade.txt b/db/pre-re/item_trade.txt
@@ -1440,6 +1440,9 @@
 16396,457,100	// HD Elunium 10 Box
 16461,73,100	// Red Wing Hat Box
 16555,73,100	// Pr Reset Stone Box
+16843,475,100	// Beauty Gift Coupon Box
+16854,475,100	// Clothing Dye Coupon Box
+16855,475,100	// Original Clothing Dye Coupon Box
 
 // Misc. Items
 1313,499,100	// Tourist Axe

diff --git a/db/pre-re/pet_db.conf b/db/pre-re/pet_db.conf
@@ -1,5 +1,5 @@
 //=========================================================================
-//= Pets Database
+//= Pre-renewal Pets Database
 //=========================================================================
 
 /**************************************************************************

diff --git a/db/pre-re/refine_db.conf b/db/pre-re/refine_db.conf
@@ -23,7 +23,7 @@ Armors/WeaponLevel1~4: {                           // Specifies weapon level or
 	Rates: {                                   // Per level configuration of the refine rates.
 		Lv1~10: {                          // Lv1 ~ Lv10.
 			NormalChance: (int)        // (optional, defaults to 100) Chance of successful refine using normal ores (100 = 100%).
-			EnrichedChance: (int)      // (optional, defaults to 100 for weapons below refine level 20, otherwise 0.) Chance of successful refine using enriched ores (100 = 100%).
+			EnrichedChance: (int)      // (optional, defaults to 100 for weapons below refine level 10, otherwise 0.) Chance of successful refine using enriched ores (100 = 100%).
 			EventNormalChance: (int)   // (optional, defaults to 100) Chance of successful refine using normal ores (100 = 100%) during a refine event.
 			EventEnrichedChance: (int) // (optional, defaults to 100 for weapons below refine level 10, otherwise 0.) Chance of successful refine using enriched ores (100 = 100%) during a refine event.
 			Bonus: (int)               // (optional, defaults to 0) Bonus (Armor) for this level of refine.

diff --git a/db/re/item_db.txt b/db/re/item_db.txt
@@ -4013,7 +4013,7 @@
 6044,Letter_From_Otto,Letter from Otto,3,0,,10,,,,,,,,,,,,,{},{},{}
 6045,Supply_Box,Supply Box,3,0,,0,,,,,,,,,,,,,{},{},{}
 6046,Clothing_Dye_Coupon,Clothing Dye Coupon,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-6047,Clothing_Dye_Coupon_II,Clothing Dye Coupon II,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+6047,Clothing_Dye_Coupon2,Clothing Dye Coupon II,2,0,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 6048,Unidentified_Mineral,Unidentified Mineral,3,0,,10,,,,,,,,,,,,,{},{},{}
 6049,Marlin,Marlin,3,0,,10,,,,,,,,,,,,,{},{},{}
 6050,Mercenary_Contract,Mercenary Contract,3,0,,10,,,,,,,,,,,,,{},{},{}
@@ -4615,7 +4615,7 @@
 6704,Warrior_Anger,Warrior Anger,3,10,,0,,,,,,,,,,,,,{},{},{}
 6705,Warrior_Certificate,Warrior Certificate,3,10,,0,,,,,,,,,,,,,{},{},{}
 6706,Guardian_Flowers,Guardian Flowers,3,10,,0,,,,,,,,,,,,,{},{},{}
-6707,Jeremy_Beauty_Coupon,Jeremy Beauty Coupon,3,10,,10,,,,,,,,,,,,,{},{},{}
+6707,Cash_Hair_Coupon,Cash Hair Coupon,3,10,,10,,,,,,,,,,,,,{},{},{}
 6708,Mana_Crystal,Mana Crystal,3,10,,,,,,,,,,,,,,,{},{},{}
 6709,Crisp_Silk,Crisp Silk,3,10,,0,,,,,,,,,,,,,{},{},{}
 6710,Tied_Snake,Tied Snake,3,10,,0,,,,,,,,,,,,,{},{},{}
@@ -8948,6 +8948,9 @@
 16826,Sagittarius_Scr_Box,Sagittarius Scr Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Sagittarius_Scr_Box); },{},{}
 16837,Dungeon_Teleport_Scroll_II_Box_5,Dungeon Teleport Scroll II Box(5),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 16838,Dungeon_Teleport_Scroll_II_Box_10,Dungeon Teleport Scroll II Box(10),2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+16843,Beauty_Gift_Coupon_Box,Beauty Gift Coupon Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 7622,1; },{},{}
+16854,Clothing_Dye_Coupon_Box,Clothing Dye Coupon Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6046,1; },{},{}
+16855,Clothing_Dye_Orig_Coupon_Box,Original Clothing Dye Coupon Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6047,1; },{},{}
 16864,Siege_Map_Teleport_Scroll_Box_10,Siege Map Teleport Scroll Box(10),18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14591,10; },{},{}
 16865,Siege_Map_Teleport_Scroll_Box_30,Siege Map Teleport Scroll Box(30),18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14591,30; },{},{}
 16866,Siege_Map_Teleport_Scroll_II_Box_10,Siege Map Teleport Scroll II Box(10),18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 14591,10; },{},{}
@@ -9171,6 +9174,7 @@
 17326,Requiem_Egg,Requiem Egg,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Requiem_Egg); },{},{}
 17331,Event_Almighty_Box,Event Almighty Box,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Event_Almighty_Box); },{},{}
 17332,Event_Almighty_Box(100),Event Almighty Box(100),18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Event_Almighty_Box10); },{},{}
+17336,Cash_Hair_Coupon_Box,Cash Hair Coupon Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 6707,1; },{},{}
 17337,Holy_Spirit_Egg,Holy Spirit Egg,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Holy_Spirit_Egg); },{},{}
 17338,Ore_Box_V,Ore Box V,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 7619,5; getitem 7620,5; getitem 14696,1; },{},{}
 17339,Ore_Box_V(10),Ore Box V(10),18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 7619,50; getitem 7620,50; getitem 14696,11; },{},{}

diff --git a/db/re/item_trade.txt b/db/re/item_trade.txt
@@ -539,7 +539,7 @@
 6044,499,100	// Letter_From_Otto
 6045,499,100	// Supply_Box
 6046,475,100	// Clothing_Dye_Coupon
-6047,475,100	// Clothing_Dye_Coupon_II
+6047,475,100	// Clothing_Dye_Coupon2
 6048,499,100	// Unidentified_Mineral
 6049,499,100	// Marlin
 6050,475,100	// Mercenary_Contract
@@ -3280,7 +3280,7 @@
 //16839,475,100	//
 //16840,475,100	//
 //16841,475,100	//
-//16843,475,100	//
+16843,475,100	// Beauty_Gift_Coupon_Box
 //16844,475,100	//
 //16845,475,100	//
 //16846,475,100	//
@@ -3291,8 +3291,8 @@
 //16851,475,100	//
 //16852,475,100	//
 //16853,475,100	//
-//16854,475,100	//
-//16855,475,100	//
+16854,475,100	// Clothing_Dye_Coupon_Box
+16855,475,100	// Clothing_Dye_Orig_Coupon_Box
 //16856,475,100	//
 //16857,475,100	//
 //16858,475,100	//

diff --git a/db/re/pet_db.conf b/db/re/pet_db.conf
@@ -1,5 +1,5 @@
 //=========================================================================
-//= Pets Database
+//= Renewal Pets Database
 //=========================================================================
 
 /**************************************************************************