* Initial release idRO Cash trader NPC. npc: npc/re/merchants/cash_tr…

…ader-idRO.txt (disabled by default)

* Added some items following idRO Cash trader NPC (added on db/re/item_db.txt)
* Updated documentation on doc/script_command.txt and npc.c
* Follow up d4128ce

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>

db/re/item_combo_db.txt

@@ -262,3 +262,4 @@
 1990:2989,{ bonus2 bSkillAtk,"CG_ARROWVULCAN",200; }
 4488:4169,{ if(getequiprefinerycnt(EQI_SHOES) >= 15) { bonus bMaxHPrate,15; bonus bMaxSPrate,15; } else { bonus bMaxHPrate,10; bonus bMaxSPrate,10; } }
 4608:4609,{ bonus2 bAddSize,Size_Medium,15; bonus2 bAddSize,Size_Large,15; bonus2 bSubSize,Size_Medium,5; bonus2 bSubSize,Size_Large,5; }
+2177:18574,{ bonus2 bAddClass,Class_Boss,5; bonus2 bMagicAddClass,Class_Boss,5; if (getequiprefinerycnt(EQI_HEAD_TOP) > 7) { bonus2 bAddClass,Class_Boss,5; bonus2 bMagicAddClass,Class_Boss,5; } }

db/re/mob_db.txt

@@ -1552,7 +1552,7 @@
 //2398,LITTLE_PORING
 //2399,E_MINI_DEMON
 //2400,E_DIABOLIC
-2401,G_PORING,Poring,Poring,1,60,1,0,0,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,480,672,0,0,0,0,0,0,0,item1,rate1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2401,G_PORING,Poring,Poring,1,60,1,0,0,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,480,672,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //2402,POPORING_IMMUNE_M
 //2403,POPORING_IMMUNE_A
 

doc/script_commands.txt

@@ -273,6 +273,9 @@ these floating NPC objects are for. More on that below.
 -%TAB%shop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}
 <map name>,<x>,<y>,<facing>%TAB%shop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}
 
+-%TAB%cashshop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}
+<map name>,<x>,<y>,<facing>%TAB%cashshop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}
+
 -%TAB%itemshop%TAB%<NPC Name>%TAB%<sprite id>,<costitemid>{:<discount>},<itemid>:<price>{,<itemid>:<price>...}
 <map name>,<x>,<y>,<facing>%TAB%itemshop%TAB%<NPC Name>%TAB%<sprite id>,<costitemid>{:<discount>},<itemid>:<price>{,<itemid>:<price>...}
 

npc/re/scripts_athena.conf

@@ -83,6 +83,7 @@ npc: npc/re/merchants/renters.txt
 npc: npc/re/merchants/shops.txt
 //npc: npc/re/merchants/ticket_refiner.txt
 //npc: npc/re/merchants/enchan_upg.txt
+//npc: npc/re/merchants/cash_trader-idRO.txt
 
 // --------------------------- Others ---------------------------
 npc: npc/re/other/bulletin_boards.txt

sql-files/mob_db_re.sql

@@ -1618,7 +1618,7 @@ REPLACE INTO `mob_db_re` VALUES (2380,'XMAS_SMOKEY_GIFT','Smokey Gift','Smokey G
 #2398,LITTLE_PORING
 #2399,E_MINI_DEMON
 #2400,E_DIABOLIC
-REPLACE INTO `mob_db_re` VALUES (2401,'G_PORING','Poring','Poring',1,60,1,0,0,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,480,672,0,0,0,0,0,0,0,item1,rate1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db_re` VALUES (2401,'G_PORING','Poring','Poring',1,60,1,0,0,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,480,672,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 #2402,POPORING_IMMUNE_M
 #2403,POPORING_IMMUNE_A
 

src/map/npc.c

@@ -2302,9 +2302,9 @@ static const char* npc_parse_warp(char* w1, char* w2, char* w3, char* w4, const
  * Parses a shop/cashshop npc.
  * Line definition :
  * <map name>,<x>,<y>,<facing>%TAB%shop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}
+ * <map name>,<x>,<y>,<facing>%TAB%cashshop%TAB%<NPC Name>%TAB%<sprite id>,<itemid>:<price>{,<itemid>:<price>...}
  * <map name>,<x>,<y>,<facing>%TAB%itemshop%TAB%<NPC Name>%TAB%<sprite id>,<costitemid>{:<discount>},<itemid>:<price>{,<itemid>:<price>...}
  * <map name>,<x>,<y>,<facing>%TAB%pointshop%TAB%<NPC Name>%TAB%<sprite id>,<costvariable>{:<discount>},<itemid>:<price>{,<itemid>:<price>...}
- * @TODO missing cashshop line definition
  * @param w1 : word 1 before tab (<from map name>,<x>,<y>,<facing>)
  * @param w2 : word 2 before tab (shop|cashshop|itemshop|pointshop), keyword that sent us in this parsing
  * @param w3 : word 3 before tab (<NPC Name>)