Browse Source

Updated Renewal Ninja shops. (incl. bugreport:8507)
http://rathena.org/board/tracker/issue-8507-ninja-merchant/

Fixed an NPC name length. (bugreport:8512)
http://rathena.org/board/tracker/issue-8512-riding-creature-master-shows-warning-in-console/

Signed-off-by: Euphy <euphy.raliel@rathena.org>

Euphy 11 năm trước cách đây
mục cha
commit
4226a23683

+ 1 - 1
db/re/item_db.txt

@@ -4152,7 +4152,7 @@
 6490,Magic_Clay_Fragment,Magic Clay Fragment,3,0,,10,,,,,,,,,,,,,{},{},{}
 6491,Magic_Clay,Magic Clay,3,0,,10,,,,,,,,,,,,,{},{},{}
 6492,Magic_Clay_Lump,Magic Clay Lump,3,0,,10,,,,,,,,,,,,,{},{},{}
-6493,Makibi,Makibi,3,30,,1,,,,,,,,,,,,,{},{},{}
+6493,Makibishi,Makibishi,3,30,,1,,,,,,,,,,,,,{},{},{}
 6494,Kafra_Coin2,Kafra Coin,3,0,,0,,,,,,,,,,,,,{},{},{}
 6495,Para_Logro_Badge,Eden Merit Badge,3,0,,0,,,,,,,,,,,,,{},{},{}
 6496,Tikbalang_Thick_Spine,Tikbalang's Thick Spine,3,300,,10,,,,,,,,,,,,,{},{},{}

+ 2 - 4
npc/merchants/shops.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
-//= 3.4
+//= 3.5
 //===== Compatible With: ===================================== 
 //= rAthena Project
 //===== Description: ========================================= 
@@ -38,6 +38,7 @@
 //= 3.2 Added Missing Items to the pet Groomers in prontera, payon, and yuno. BugReport:6680[Spre]
 //= 3.3 Moved more shops to Renewal file. [Euphy]
 //= 3.4 Moved Izlude shops to pre-re/re paths. [Streusel]
+//= 3.5 Moved Ninja shops to Pre-RE/RE paths. [Euphy]
 //============================================================ 
 
 //=======================================================
@@ -66,9 +67,6 @@ alde_alche,38,184,3	shop	Material Seller#alche	755,7143:-1,7141:-1,7140:-1,6248:
 ama_in01,89,28,5	shop	Armor Dealer#ama	757,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
 ama_in01,102,28,3	shop	Weapon Dealer#ama	766,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
 ama_in01,24,30,5	shop	Tool Dealer#ama	763,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-// Ninja Shops
-que_ng,72,31,2	shop	Boonji#nin	83,13250:-1,13251:-1,13252:-1,13253:-1,13254:-1
-que_ng,73,26,5	shop	Boonray#nin	83,2117:-1,7521:-1,7522:-1,7523:-1,7524:-1
 
 //=======================================================
 // Ayothaya

+ 9 - 1
npc/pre-re/merchants/shops.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Daegaladh
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= rAthena Project
 //===== Description: ========================================= 
@@ -11,8 +11,16 @@
 //===== Additional Comments: ================================= 
 //= 1.0 First version.
 //= 1.1 Moved Izlude shops to pre-re/re paths. [Streusel]
+//= 1.2 Moved Ninja shops to Pre-RE/RE paths. [Euphy]
 //============================================================ 
 
+//=======================================================
+// Amatsu
+//=======================================================
+// Ninja Shops
+que_ng,72,31,2	shop	Boonji#nin	83,13250:-1,13251:-1,13252:-1,13253:-1,13254:-1
+que_ng,73,26,5	shop	Boonray#nin	83,2117:-1,7521:-1,7522:-1,7523:-1,7524:-1
+
 //=======================================================
 // Izlude
 //=======================================================

+ 3 - 3
npc/re/merchants/renters.txt

@@ -118,9 +118,9 @@ prontera,130,213,5	script	Riding Creature Master	105,{
 }
 geffen,100,55,3	duplicate(Riding Creature Master)	Riding Creature Master#2	105
 payon,166,102,5	duplicate(Riding Creature Master)	Riding Creature Master#3	105
-aldebaran,133,109,5	duplicate(Riding Creature Master)	Riding Creature Master#6	105
-yuno,171,187,3	duplicate(Riding Creature Master)	Riding Creature Master#yuno	105
-rachel,106,130,5	duplicate(Riding Creature Master)	Riding Creature Master#ra	105
+aldebaran,133,109,5	duplicate(Riding Creature Master)	Riding Creature Master#4	105
+yuno,171,187,3	duplicate(Riding Creature Master)	Riding Creature Master#5	105
+rachel,106,130,5	duplicate(Riding Creature Master)	Riding Creature Master#6	105
 
 // Peco removing NPC
 //============================================================

+ 9 - 1
npc/re/merchants/shops.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= rAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.9
 //===== Compatible With: ===================================== 
 //= rAthena Project
 //===== Description: ========================================= 
@@ -18,8 +18,16 @@
 //= 1.6 Added Mora and Port Malaya merchants.
 //= 1.7 Added Izlude duplicates. [Euphy]
 //= 1.8 Added Rebellion Machines. [Rekiem]
+//= 1.9 Added Renewal Ninja shops. [Euphy]
 //============================================================ 
 
+//=======================================================
+// Amatsu
+//=======================================================
+// Ninja Shops
+que_ng,72,31,2	shop	Boonji#nin	83,13250:-1,13251:-1,13252:-1,13253:-1,13254:-1,13294:-1,6493:-1
+que_ng,73,26,5	shop	Boonray#nin	83,2117:-1,2171:-1,15053:-1,7521:-1,7522:-1,7523:-1,7524:-1,6512:-1,6513:-1,6514:-1,6515:-1
+
 //=======================================================
 // Comodo
 //=======================================================

+ 1 - 1
sql-files/item_db_re.sql

@@ -4183,7 +4183,7 @@ REPLACE INTO `item_db_re` VALUES (6489,'Cats_Invest_Certif','Cats Invest Certifi
 REPLACE INTO `item_db_re` VALUES (6490,'Magic_Clay_Fragment','Magic Clay Fragment',3,0,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (6491,'Magic_Clay','Magic Clay',3,0,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (6492,'Magic_Clay_Lump','Magic Clay Lump',3,0,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (6493,'Makibi','Makibi',3,30,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (6493,'Makibishi','Makibishi',3,30,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (6494,'Kafra_Coin2','Kafra Coin',3,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (6495,'Para_Logro_Badge','Eden Merit Badge',3,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (6496,'Tikbalang_Thick_Spine','Tikbalang\'s Thick Spine',3,300,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);