From ce5085a000ee7babb05b9e6a86410e13a75d7606 Mon Sep 17 00:00:00 2001 From: malufett Date: Fri, 28 Jun 2013 09:51:58 -0700 Subject: Fixed Bug#6991 -Where cardfix is not working properly. Thanks Kyeme Renewal Update: -updated/completed mastery fix damage factor(skills and sc). -initial implementation for new NPC skills (note: not yet functional dbs not yet updated). --- db/const.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'db') diff --git a/db/const.txt b/db/const.txt index b048dfd86..6a2bfe5b4 100644 --- a/db/const.txt +++ b/db/const.txt @@ -1053,7 +1053,7 @@ SC_BANDING_DEFENCE 384 SC_EARTHDRIVE 385 SC_INSPIRATION 386 SC_SPELLFIST 387 -SC_CRYSTALIZE 388 +SC_COLD 388 SC_STRIKING 389 SC_WARMER 390 SC_VACUUM_EXTREME 391 -- cgit v1.2.3-60-g2f50 From 918b1123963ac2f91a4d074b092ceef1db71b4e8 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Fri, 28 Jun 2013 18:45:38 -0300 Subject: BG Queue Testing http://hercules.ws/board/topic/1302-bg-queue-debug/ Signed-off-by: shennetsind --- conf/battlegrounds.conf | 14 +- db/const.txt | 4 + npc/custom/bgqueue/flavius.txt | 726 +++++++++++++++++++++++++++++++++++++++++ src/common/socket.h | 2 +- src/map/battleground.c | 62 +++- src/map/battleground.h | 2 + src/map/clif.c | 29 +- src/map/clif.h | 2 +- src/map/map.c | 3 +- src/map/packets_struct.h | 6 +- src/map/script.c | 109 ++++++- src/map/script.h | 2 + 12 files changed, 922 insertions(+), 39 deletions(-) create mode 100644 npc/custom/bgqueue/flavius.txt (limited to 'db') diff --git a/conf/battlegrounds.conf b/conf/battlegrounds.conf index b43899dd7..1c32d32ce 100644 --- a/conf/battlegrounds.conf +++ b/conf/battlegrounds.conf @@ -36,9 +36,11 @@ battlegrounds: ( minTeamPlayers: 6 /* minimum amount of team members required for a team (party or guild) to join */ delay_var: "Tierra_BG_Tick" /* npc variable name that will store the delay for this match */ maxDuration: 30 /* maximum duration in minutes, if reached game ends and highest score wins (or calls a draw if scores are equal) */ + fillDuration: 20 /* time in seconds to wait for more applications when minimum has been reached */ + pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */ },{ name: "Flavius" //must match the name in client files - event: "Flavius_BG1::OnPlayerListReady" + event: "start#bat_b01::OnPlayerListReady" minLevel: 80 maxLevel: 150 reward: {/* amount of badges awarded on each case */ @@ -46,11 +48,13 @@ battlegrounds: ( loss: 3 draw: 3 } - minPlayers: 6 /* minimum amount of players to start */ + minPlayers: 3 /* minimum amount of players to start (DEBUG VALUE, CHANGE BACK) */ maxPlayers: 60 /* maximum amount of players */ minTeamPlayers: 6 /* minimum amount of team members required for a team (party or guild) to join */ delay_var: "Flavius_BG_Tick" /* npc variable name that will store the delay for this match */ maxDuration: 30 /* maximum duration in minutes, if reached game ends and highest score wins (or calls a draw if scores are equal) */ + fillDuration: 20 /* time in seconds to wait for more applications when minimum has been reached */ + pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */ },{ name: "KVM (Level 80 and up)" //must match the name in client files event: "KvM03_BG::OnPlayerListReady" @@ -66,6 +70,8 @@ battlegrounds: ( minTeamPlayers: 5 /* minimum amount of team members required for a team (party or guild) to join */ delay_var: "KVM_BG_Tick" /* npc variable name that will store the delay for this match */ maxDuration: 30 /* maximum duration in minutes, if reached game ends and highest score wins (or calls a draw if scores are equal) */ + fillDuration: 20 /* time in seconds to wait for more applications when minimum has been reached */ + pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */ },{ name: "KVM (Level 60~79)" //must match the name in client files event: "KvM03_BG::OnPlayerListReady" @@ -81,6 +87,8 @@ battlegrounds: ( minTeamPlayers: 5 /* minimum amount of team members required for a team (party or guild) to join */ delay_var: "KVM_BG_Tick" /* npc variable name that will store the delay for this match */ maxDuration: 30 /* maximum duration in minutes, if reached game ends and highest score wins (or calls a draw if scores are equal) */ + fillDuration: 20 /* time in seconds to wait for more applications when minimum has been reached */ + pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */ },{ name: "KVM (Level 59 and below)" //must match the name in client files event: "KvM03_BG::OnPlayerListReady" @@ -96,6 +104,8 @@ battlegrounds: ( minTeamPlayers: 5 /* minimum amount of team members required for a team (party or guild) to join */ delay_var: "KVM_BG_Tick" /* npc variable name that will store the delay for this match */ maxDuration: 30 /* maximum duration in minutes, if reached game ends and highest score wins (or calls a draw if scores are equal) */ + fillDuration: 20 /* time in seconds to wait for more applications when minimum has been reached */ + pGameDuration: 20 /* time to wait for players to confirm their attendence after queueing process has finished */ } ) }) \ No newline at end of file diff --git a/db/const.txt b/db/const.txt index b048dfd86..e16b1aa52 100644 --- a/db/const.txt +++ b/db/const.txt @@ -3159,3 +3159,7 @@ IT_PETARMOR 8 IT_AMMO 10 IT_DELAYCONSUME 11 IT_CASH 18 + +HQO_OnDeath 0 +HQO_OnLogout 1 +HQO_OnMapChange 2 \ No newline at end of file diff --git a/npc/custom/bgqueue/flavius.txt b/npc/custom/bgqueue/flavius.txt new file mode 100644 index 000000000..a1606b344 --- /dev/null +++ b/npc/custom/bgqueue/flavius.txt @@ -0,0 +1,726 @@ +//===== Hercules Script ====================================== +// BattleGround System - Flavius +//===== By: ================================================== +//= L0ne_W0lf +//===== Current Version: ===================================== +//= 1.4 +//===== Description: ========================================= +//= [AEGIS Conversion] +//= Flavius Battleground. +//= - Winning Team: 9 badges +//= - Losing Team: 3 badge +//===== Additional Comments: ================================= +//= 1.0 First Version. +//= 1.1 Fixed pink crystal spawning as blue. [L0ne_W0lf] +//= 1.2 Updated 'waitingroom' to support required zeny/lvl. [Kisuka] +//= 1.3 Removed MaxLvl check in waitingrooms. Replaced setwall with setcell. +//= 1.4 Attempt at implementing BG Queue [Ind/Hercules] +//============================================================ + + +//Tacham, while the script is under testings the original will remain, meaning if you wanna test this you need to disable the other, or they'll conflict. +bat_b01,15,15,3 script start#bat_b01 844,{ +OnInit: + mapwarp "bat_b01","bat_room",154,150; + end; + +//$@bg_queue_id is cleared after this event ends +OnPlayerListReady: + set $@FlaviusBG1_id1, bg_create_team("bat_b01",10,290); + set $@FlaviusBG1_id2, bg_create_team("bat_b01",390,10); + + set $@Croix_QueueBG1, queue(); + set $@Guill_QueueBG1, queue(); + + queueopt($@Guill_QueueBG1,HQO_OnLogout,"start#bat_b01::OnGuillaumeQuit"); + queueopt($@Croix_QueueBG1,HQO_OnLogout,"start#bat_b01::OnCroixQuit"); + + set .@it,queueiterator($@bg_queue_id); + set .@i, 0; + + for( set .@member, qiget(.@it); qicheck(.@it); set .@member,qiget(.@it) ) { + announce "bg_queue:running_for:"+.@member,8; + if( .@i % 2 == 0 ) { + bg_join_team($@FlaviusBG1_id1,.@member); + queueadd($@Guill_QueueBG1,.@member); + } else { + bg_join_team($@FlaviusBG1_id2,.@member); + queueadd($@Croix_QueueBG1,.@member); + } + set .@i,.@i + 1; + } + qiclear(.@it); + + set $@FlaviusBG1, 1; + set $@FlaviusBG1_Victory, 0; + set $@Croix_ScoreBG1, 0; + set $@Guill_ScoreBG1, 0; + + bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1; + + donpcevent "OBJ#bat_b01_a::Onkill"; + donpcevent "OBJ#bat_b01_a::OnEnable"; + donpcevent "OBJ#bat_b01_b::Onkill"; + donpcevent "OBJ#bat_b01_b::OnEnable"; + donpcevent "guardian#bat_b01_a::Onkill"; + donpcevent "guardian#bat_b01_b::Onkill"; + donpcevent "guardian#bat_b01_a::OnEnable"; + donpcevent "guardian#bat_b01_b::OnEnable"; + donpcevent "cell#bat_b01_a::Onred"; + donpcevent "cell#bat_b01_b::Onred"; + donpcevent "time#bat_b01::OnEnable"; + disablenpc "Guillaume Vintenar#b01_a"; + disablenpc "Croix Vintenar#b01_b"; + disablenpc "Vintenar#bat_b01_aover"; + disablenpc "Vintenar#bat_b01_bover"; + bg_warp $@FlaviusBG1_id1,"bat_b01",87,75; + bg_warp $@FlaviusBG1_id2,"bat_b01",311,224; + donpcevent "countdown#bat_b01::OnEnable"; + initnpctimer; + end; + +OnReset: + donpcevent "OBJ#bat_b01_a::Onkill"; + donpcevent "OBJ#bat_b01_a::OnEnable"; + donpcevent "OBJ#bat_b01_b::Onkill"; + donpcevent "OBJ#bat_b01_b::OnEnable"; + donpcevent "guardian#bat_b01_a::Onkill"; + donpcevent "guardian#bat_b01_b::Onkill"; + donpcevent "guardian#bat_b01_a::OnEnable"; + donpcevent "guardian#bat_b01_b::OnEnable"; + donpcevent "cell#bat_b01_a::Onred"; + donpcevent "cell#bat_b01_b::Onred"; + donpcevent "time#bat_b01::OnEnable"; + disablenpc "Guillaume Vintenar#b01_a"; + disablenpc "Croix Vintenar#b01_b"; + disablenpc "Vintenar#bat_b01_aover"; + disablenpc "Vintenar#bat_b01_bover"; + bg_warp $@FlaviusBG1_id1,"bat_b01",87,75; + bg_warp $@FlaviusBG1_id2,"bat_b01",311,224; + end; + +OnGuillaumeQuit: +OnCroixQuit: + bg_leave; + end; + +OnTimer10000: + stopnpctimer; + donpcevent "#bat_b01_timer::OnEnable"; + end; + +OnMatchOver: + bg_match_over("Flavius"); + queuedel($@Croix_QueueBG1); + queuedel($@Guill_QueueBG1); + end; +} + +bat_b01,1,1,3 script OBJ#bat_b01_a 844,{ +OnEnable: + bg_monster $@FlaviusBG1_id1,"bat_b01",61,150,"Pink Crystal",1915,"OBJ#bat_b01_a::OnMyMobDead"; + end; + +Onkill: + killmonster "bat_b01","OBJ#bat_b01_a::OnMyMobDead"; + end; + +OnMyMobDead: + if (mobcount("bat_b01","OBJ#bat_b01_a::OnMyMobDead") < 1) { + mapannounce "bat_b01", "Guillaume's Crystal has been destroyed.",bc_map,"0xFFCE00"; + if ($@Croix_ScoreBG1 > 0) { + set $@FlaviusBG1_Victory,2; + set $@Croix_ScoreBG1,$@Croix_ScoreBG1+1; + enablenpc "Guillaume Vintenar#b01_a"; + enablenpc "Croix Vintenar#b01_b"; + donpcevent "time#bat_b01::Onstop"; + donpcevent "start#bat_b01::OnMatchOver"; + } + else { + set $@Croix_ScoreBG1,1; + donpcevent "time#bat_b01::OnEnable"; + donpcevent "start#bat_b01::onReset"; + } + donpcevent "#bat_b01_timer::OnStop"; + bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1; + bg_warp $@FlaviusBG1_id1,"bat_b01",10,290; + bg_warp $@FlaviusBG1_id2,"bat_b01",390,10; + donpcevent "#bat_b01_timer::OnEnable"; + } + end; +} +bat_room,2,151,3 script #bat_b01_timer 844,{ + end; + +OnEnable: + initnpctimer; + end; + +OnStop: + stopnpctimer; + end; + +OnTimer1000: + stopnpctimer; + initnpctimer; + set .@chk_bat_a01,getmapusers("bat_b01"); + if (.@chk_bat_a01 < 1) { + announce "bg_destroy:running_for:"+.@chk_bat_a01,8; + + set $@FlaviusBG1, 0; + if( $@FlaviusBG1_id1 ) { bg_destroy $@FlaviusBG1_id1; set $@FlaviusBG1_id1, 0; } + if( $@FlaviusBG1_id2 ) { bg_destroy $@FlaviusBG1_id2; set $@FlaviusBG1_id2, 0; } + } + end; +} + +bat_b01,1,2,3 script OBJ#bat_b01_b 844,{ +OnEnable: + bg_monster $@FlaviusBG1_id2,"bat_b01",328,150,"Blue Crystal",1914,"OBJ#bat_b01_b::OnMyMobDead"; + end; + +Onkill: + killmonster "bat_b01","OBJ#bat_b01_b::OnMyMobDead"; + end; + +OnMyMobDead: + if (mobcount("bat_b01","OBJ#bat_b01_b::OnMyMobDead") < 1) { + mapannounce "bat_b01", "Croix's Crystal has been destroyed.",bc_map,"0xFFCE00"; + if ($@Guill_ScoreBG1 > 0) { + set $@FlaviusBG1_Victory,1; + set $@Guill_ScoreBG1,$@Guill_ScoreBG1+1; + enablenpc "Guillaume Vintenar#b01_a"; + enablenpc "Croix Vintenar#b01_b"; + donpcevent "time#bat_b01::Onstop"; + donpcevent "start#bat_b01::OnMatchOver"; + } + else { + set $@Guill_ScoreBG1,1; + donpcevent "time#bat_b01::OnEnable"; + donpcevent "start#bat_b01::onReset"; + } + donpcevent "#bat_b01_timer::OnStop"; + bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1; + bg_warp $@FlaviusBG1_id1,"bat_b01",10,290; + bg_warp $@FlaviusBG1_id2,"bat_b01",390,10; + donpcevent "#bat_b01_timer::OnEnable"; + } + end; +} + +bat_b01,1,3,3 script guardian#bat_b01_a 844,{ +OnEnable: + bg_monster $@FlaviusBG1_id1,"bat_b01",108,159,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead"; + bg_monster $@FlaviusBG1_id1,"bat_b01",108,141,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead"; + end; + +Onkill: + killmonster "bat_b01","guardian#bat_b01_a::OnMyMobDead"; + end; + +OnMyMobDead: + if (mobcount("bat_b01","guardian#bat_b01_a::OnMyMobDead") < 1) { + donpcevent "cell#bat_b01_a::Ongreen"; + mapannounce "bat_b01", "The Guardian protecting Guillaume's Crystal has been slain.",bc_map,"0xFFCE00"; + } + end; +} + +bat_b01,1,3,3 script guardian#bat_b01_b 844,{ +OnEnable: + bg_monster $@FlaviusBG1_id2,"bat_b01",307,160,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead"; + bg_monster $@FlaviusBG1_id2,"bat_b01",307,138,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead"; + end; + +Onkill: + killmonster "bat_b01","guardian#bat_b01_b::OnMyMobDead"; + end; + +OnMyMobDead: + if (mobcount("bat_b01","guardian#bat_b01_b::OnMyMobDead") < 1) { + donpcevent "cell#bat_b01_b::Ongreen"; + mapannounce "bat_b01", "The Guardian protecting Croix's Crystal has been slain.",bc_map,"0xFFCE00"; + } + end; +} + +bat_b01,1,4,3 script cell#bat_b01_a 844,{ +Onred: + setcell "bat_b01",62,149,60,151,cell_basilica,1; + setcell "bat_b01",62,149,60,151,cell_walkable,0; + end; + +Ongreen: + setcell "bat_b01",62,149,60,151,cell_basilica,0; + setcell "bat_b01",62,149,60,151,cell_walkable,1; + end; +} + +bat_b01,1,5,3 script cell#bat_b01_b 844,{ +Onred: + setcell "bat_b01",327,151,329,149,cell_basilica,1; + setcell "bat_b01",327,151,329,149,cell_walkable,0; + end; + +Ongreen: + setcell "bat_b01",327,151,329,149,cell_basilica,0; + setcell "bat_b01",327,151,329,149,cell_walkable,1; + end; +} + +bat_b01,1,6,1 script time#bat_b01 844,{ +OnEnable: + donpcevent "Battle Therapist#b01_a::OnEnable"; + donpcevent "Battle Therapist#b01_b::OnEnable"; + end; + +Onstop: + donpcevent "Battle Therapist#b01_a::OnStop"; + donpcevent "Battle Therapist#b01_b::OnStop"; + end; +} + +bat_b01,10,294,3 script Battle Therapist#b01_a 95,{ + specialeffect2 EF_HEAL; + mes "[Battle Therapist]"; + mes "Just close your eyes,"; + mes "and take a deep breath."; + mes "You can be free from pain."; + close; + +OnTimer25000: + specialeffect EF_SANCTUARY; + enablenpc "bat_b01_rp1_a_warp"; + end; + +OnTimer26000: + disablenpc "bat_b01_rp1_a_warp"; + end; + +OnTimer26500: + stopnpctimer; + donpcevent "Battle Therapist#b01_a::onEnable"; + end; + +OnEnable: + initnpctimer; + enablenpc "Battle Therapist#b01_a"; + end; + +Onstop: + disablenpc "bat_b01_rp1_a_warp"; + disablenpc "Battle Therapist#b01_a"; + stopnpctimer; + end; +} + +bat_b01,10,290,0 script bat_b01_rp1_a_warp 45,10,10,{ +OnInit: + disablenpc "bat_b01_rp1_a_warp"; + end; + +OnTouch: + percentheal 100,100; + warp "bat_b01",87,73; + end; +} + +bat_b01,389,14,3 script Battle Therapist#b01_b 95,{ + specialeffect2 EF_HEAL; + mes "[Battle Therapist]"; + mes "Just close your eyes,"; + mes "and take a deep breath."; + mes "You can be free from pain."; + close; + +OnTimer25000: + specialeffect EF_SANCTUARY; + enablenpc "bat_b01_rp1_b_warp"; + end; + +OnTimer26000: + disablenpc "bat_b01_rp1_b_warp"; + end; + +OnTimer26500: + stopnpctimer; + donpcevent "Battle Therapist#b01_b::OnEnable"; + end; + +OnEnable: + initnpctimer; + enablenpc "Battle Therapist#b01_b"; + end; + +Onstop: + disablenpc "bat_b01_rp1_b_warp"; + disablenpc "Battle Therapist#b01_b"; + stopnpctimer; + end; +} + +bat_b01,389,10,0 script bat_b01_rp1_b_warp 45,9,9,{ +OnInit: + disablenpc "bat_b01_rp1_a_warp"; + end; + +OnTouch: + percentheal 100,100; + warp "bat_b01",312,225; + end; +} + +bat_b01,87,76,0 script A_CODE#bat_b01 -1,5,5,{ +OnTouch: + if (checkquest(2070) < 0) + setquest 2070; + end; +} + +bat_b01,312,224,0 script B_CODE#bat_b01 -1,5,5,{ +OnTouch: + if (checkquest(2070) < 0) + setquest 2070; + end; +} + +bat_b01,10,294,3 script Guillaume Vintenar#b01_a 934,{ + if ($@FlaviusBG1_id1 == getcharid(4)) { + if ($@FlaviusBG1_Victory == 1) { + set .@your_medal,countitem(7829); + set .@medal_gap,500 - .@your_medal; + if (.@medal_gap > 8) { + mes "[Axl Rose]"; + mes "Blessed Guillaume!"; + mes "Let's enjoy our glorious victory!"; + mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + close2; + getitem 7829,9; //BF_Badge2 + } + else { + mes "[Axl Rose]"; + mes "Blessed Guillaume!"; + mes "Let's enjoy our glorious victory!"; + mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + close2; + getitem 7829,.@medal_gap; //BF_Badge2 + } + } + else { + set .@your_medal,countitem(7829); + set .@medal_gap,500 - .@your_medal; + if (.@medal_gap > 2) { + mes "[Axl Rose]"; + mes "You lost, but you're dedicated to this battle."; + mes "This is a reward for your great dedication by Guillaume Marollo!"; + mes "Just take this defeat as a lesson, next time you will definitely win."; + close2; + getitem 7829,3; //BF_Badge2 + } + else { + mes "[Axl Rose]"; + mes "You lost, but you're dedicated to this battle."; + mes "This is a reward for your great dedication by Guillaume Marollo!"; + mes "Just take this defeat as a lesson, next time you will definitely win."; + close2; + getitem 7829,.@medal_gap; //BF_Badge2 + } + } + } + bg_leave; + warp "bat_room",154,150; + end; + +OnInit: + disablenpc "Guillaume Vintenar#b01_a"; + end; +} + +bat_b01,389,14,3 script Croix Vintenar#b01_b 934,{ + if ($@FlaviusBG1_id2 == getcharid(4)) { + if ($@FlaviusBG1_Victory == 2) { + set .@your_medal,countitem(7829); + set .@medal_gap,500 - .@your_medal; + if (.@medal_gap > 8) { + mes "[Swandery]"; + mes "Blessed Croix!"; + mes "Let's enjoy our glorious victory!"; + mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + close2; + getitem 7829,9; //BF_Badge2 + } + else { + mes "[Swandery]"; + mes "Blessed Croix!"; + mes "Let's enjoy our glorious victory!"; + mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + close2; + getitem 7829,.@medal_gap; //BF_Badge2 + } + } + else { + set .@your_medal,countitem(7829); + set .@medal_gap,500 - .@your_medal; + if (.@medal_gap > 2) { + mes "[Swandery]"; + mes "Oh, "+strcharinfo(0)+". Don't be sad."; + mes "Even though we didn't win, we did our best."; + mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one."; + close2; + getitem 7829,3; //BF_Badge2 + } + else { + mes "[Swandery]"; + mes "Oh, "+strcharinfo(0)+". Don't be sad."; + mes "Even though we didn't win, we did our best."; + mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one."; + close2; + getitem 7829,.@medal_gap; //BF_Badge2 + } + } + } + bg_leave; + warp "bat_room",154,150; + end; + +OnInit: + disablenpc "Croix Vintenar#b01_b"; + end; +} + +bat_b01,1,5,3 script countdown#bat_b01 844,{ +OnInit: + stopnpctimer; + end; + +OnEnable: + stopnpctimer; + initnpctimer; + end; + +Onstop: + stopnpctimer; + end; + +OnTimer7000: + mapannounce "bat_b01", "Guillaume Vintenar Axl Rose : Let's attack to destroy that Crystal!",bc_map,"0xFF9900"; + end; + +OnTimer8000: + mapannounce "bat_b01", "Croix Vintenar Swandery : Even though Guillaume is struggling to win against us, the victory is ours. Let's show them our power.",bc_map,"0xFF99CC"; + end; + +OnTimer1800000: + mapannounce "bat_b01", "Marollo VII : Guillaume Marollo, Croix Marollo! And their followers!",bc_map,"0x99CC00"; + end; + +OnTimer1803000: + mapannounce "bat_b01", "Marollo VII : Both camps are competitive, so it's hard to judge which team is superior.",bc_map,"0x99CC00"; + end; + +OnTimer1808000: + mapannounce "bat_b01", "Marollo VII : This battle of Flavian is such a waste of time. I will decide victory and defeat by your progress.",bc_map,"0x99CC00"; + end; + +OnTimer1822000: + mapannounce "bat_b01", "Marollo VII : If you can't accept the results, try again in another valley battle!",bc_map,"0x99CC00"; + end; + +OnTimer1825000: + mapannounce "bat_b01", "Axl Rose, Swandery : Yes, sir.",bc_map,"0x99CC00"; + end; + +OnTimer1830000: + donpcevent "time#bat_b01::Onstop"; + bg_warp $@FlaviusBG1_id1,"bat_b01",10,290; + bg_warp $@FlaviusBG1_id2,"bat_b01",390,10; + enablenpc "Vintenar#bat_b01_aover"; + enablenpc "Vintenar#bat_b01_bover"; + end; + +OnTimer1900000: + mapwarp "bat_b01","bat_room",154,150; + donpcevent "countdown#bat_b01::Onstop"; + donpcevent "start#bat_b01::OnMatchOver"; + end; +} + +bat_b01,81,83,3 script Guillaume Camp#flag21 973,{ end; } +bat_b01,94,83,3 script Guillaume Camp#flag22 973,{ end; } +bat_b01,81,66,3 script Guillaume Camp#flag23 973,{ end; } +bat_b01,94,66,3 script Guillaume Camp#flag24 973,{ end; } +bat_b01,139,142,3 script Guillaume Camp#flag25 973,{ end; } +bat_b01,139,158,3 script Guillaume Camp#flag26 973,{ end; } +bat_b01,110,161,3 script Guillaume Camp#flag27 973,{ end; } +bat_b01,110,137,3 script Guillaume Camp#flag28 973,{ end; } +bat_b01,63,135,3 script Guillaume Camp#flag29 973,{ end; } +bat_b01,63,165,3 script Guillaume Camp#flag30 973,{ end; } +bat_b01,10,296,3 script Guillaume Camp#flag31 973,{ end; } + +bat_b01,306,233,3 script Croix Camp#flag21 974,{ end; } +bat_b01,317,233,3 script Croix Camp#flag22 974,{ end; } +bat_b01,306,216,3 script Croix Camp#flag23 974,{ end; } +bat_b01,317,216,3 script Croix Camp#flag24 974,{ end; } +bat_b01,257,158,3 script Croix Camp#flag25 974,{ end; } +bat_b01,257,141,3 script Croix Camp#flag26 974,{ end; } +bat_b01,297,164,3 script Croix Camp#flag27 974,{ end; } +bat_b01,297,136,3 script Croix Camp#flag28 974,{ end; } +bat_b01,336,161,3 script Croix Camp#flag29 974,{ end; } +bat_b01,336,139,3 script Croix Camp#flag30 974,{ end; } +bat_b01,389,16,3 script Croix Camp#flag31 974,{ end; } + +bat_b01,10,294,3 script Vintenar#bat_b01_aover 419,{ + set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1; + if ($@FlaviusBG1_id1 == getcharid(4)) { + if (.@A_B_gap > 0) { + set .@your_medal,countitem(7829); + set .@medal_gap,500 - .@your_medal; + if (.@medal_gap > 8) { + mes "[Axl Rose]"; + mes "Blessed Guillaume!"; + mes "Let's enjoy our glorious victory!"; + mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + close2; + getitem 7829,9; //BF_Badge2 + } + else { + mes "[Axl Rose]"; + mes "Blessed Guillaume!"; + mes "Let's enjoy our glorious victory!"; + mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + close2; + getitem 7829,.@medal_gap; //BF_Badge2 + } + } + else if (.@A_B_gap == 0) { + set .@your_medal,countitem(7829); + set .@medal_gap,500 - .@your_medal; + if (.@medal_gap > 2) { + mes "[Axl Rose]"; + mes "You lost, but you're dedicated to this battle."; + mes "This is a reward for your great dedication by Guillaume Marollo!"; + mes "Just take this defeat as a lesson, next time you will definitely win."; + close2; + getitem 7829,3; //BF_Badge2 + } + else { + mes "[Axl Rose]"; + mes "You lost, but you're dedicated to this battle."; + mes "This is a reward for your great dedication by Guillaume Marollo!"; + mes "Just take this defeat as a lesson, next time you will definitely win."; + close2; + getitem 7829,.@medal_gap; //BF_Badge2 + } + } + else { + set .@your_medal,countitem(7829); + set .@medal_gap,500 - .@your_medal; + if (.@medal_gap > 2) { + mes "[Axl Rose]"; + mes "You lost, but you're dedicated to this battle."; + mes "This is a reward for your great dedication by Guillaume Marollo!"; + mes "Just take this defeat as a lesson, next time you will definitely win."; + close2; + getitem 7829,3; //BF_Badge2 + } + else { + mes "[Axl Rose]"; + mes "You lost, but you're dedicated to this battle."; + mes "This is a reward for your great dedication by Guillaume Marollo!"; + mes "Just take this defeat as a lesson, next time you will definitely win."; + close2; + getitem 7829,.@medal_gap; //BF_Badge2 + } + } + } + else { + mes "[Axl Rose]"; + mes "Why are you here, Croix mercenary? I am definitely sure of victory against foolish Croix such as you. Ha!"; + close; + } + bg_leave; + warp "bat_room",154,150; + end; + +OnInit: + disablenpc "Vintenar#bat_b01_aover"; + end; +} + +bat_b01,389,14,3 script Vintenar#bat_b01_bover 415,{ + set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1; + if ($@FlaviusBG1_id2 == getcharid(4)) { + if (.@A_B_gap > 0) { + set .@your_medal,countitem(7829); + set .@medal_gap,500 - .@your_medal; + if (.@medal_gap > 2) { + mes "[Swandery]"; + mes "Oh, "+strcharinfo(0)+". Don't be sad."; + mes "Even though we didn't win, we did our best."; + mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one."; + close2; + getitem 7829,3; //BF_Badge2 + } + else { + mes "[Swandery]"; + mes "Oh, "+strcharinfo(0)+". Don't be sad."; + mes "Even though we didn't win, we did our best."; + mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one."; + close2; + getitem 7829,.@medal_gap; //BF_Badge2 + } + } + else if (.@A_B_gap == 0) { + set .@your_medal,countitem(7829); + set .@medal_gap,500 - .@your_medal; + if (.@medal_gap > 2) { + mes "[Swandery]"; + mes "Oh, "+strcharinfo(0)+". Don't be sad."; + mes "Even though we didn't win, we did our best."; + mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one."; + close2; + getitem 7829,3; //BF_Badge2 + } + else { + mes "[Swandery]"; + mes "Oh, "+strcharinfo(0)+". Don't be sad."; + mes "Even though we didn't win, we did our best."; + mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one."; + close2; + getitem 7829,.@medal_gap; //BF_Badge2 + } + } + else { + set .@your_medal,countitem(7829); + set .@medal_gap,500 - .@your_medal; + if (.@medal_gap > 8) { + mes "[Swandery]"; + mes "Blessed Croix!"; + mes "Let's enjoy our glorious victory!"; + mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + close2; + getitem 7829,9; //BF_Badge2 + } + else { + mes "[Swandery]"; + mes "Blessed Croix!"; + mes "Let's enjoy our glorious victory!"; + mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + close2; + getitem 7829,.@medal_gap; //BF_Badge2 + } + } + } + else { + mes "[Swandery]"; + mes "Why do you come here as a Guillaume? You will be sent to where you should be!"; + close; + } + bg_leave; + warp "bat_room",154,150; + end; + +OnInit: + disablenpc "Vintenar#bat_b01_bover"; + end; +} diff --git a/src/common/socket.h b/src/common/socket.h index b58cbdccf..82f8b84c3 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -50,7 +50,7 @@ } while(0) /* [Ind/Hercules] */ -#define RFIFO2PTR(fd,len) (void*)(session[fd]->rdata + len) +#define RFIFO2PTR(fd) (void*)(session[fd]->rdata + session[fd]->rdata_pos) // buffer I/O macros #define RBUFP(p,pos) (((uint8*)(p)) + (pos)) diff --git a/src/map/battleground.c b/src/map/battleground.c index 88cc323bf..d54178347 100644 --- a/src/map/battleground.c +++ b/src/map/battleground.c @@ -21,6 +21,7 @@ #include "pet.h" #include "homunculus.h" #include "mercenary.h" +#include "mapreg.h" #include #include @@ -264,7 +265,7 @@ void bg_config_read(void) { config_setting_lookup_int(settings, "maximum_afk_seconds", &bg->mafksec); config_setting_lookup_bool(settings, "feature_off", &offline); - + if( offline == 0 ) bg->queue_on = true; @@ -279,7 +280,7 @@ void bg_config_read(void) { int prizeWin, prizeLoss, prizeDraw; int minPlayers, maxPlayers, minTeamPlayers; int maxDuration; - int fillup_duration, pregame_duration; + int fillup_duration = 0, pregame_duration = 0; bg->arena[i] = NULL; @@ -305,7 +306,7 @@ void bg_config_read(void) { maxLevel = MAX_LEVEL; } - if( !(reward = config_setting_get_member(settings, "reward")) ) { + if( !(reward = config_setting_get_member(arena, "reward")) ) { ShowError("bg_config_read: failed to find 'reward' for arena '%s'/#%d\n",aName,i); continue; } @@ -385,7 +386,7 @@ void bg_config_read(void) { bg->arena[i]->min_team_players = minTeamPlayers; safestrncpy(bg->arena[i]->delay_var, aDelayVar, NAME_LENGTH); bg->arena[i]->maxDuration = maxDuration; - bg->arena[i]->queue_id = -1; + bg->arena[i]->queue_id = script->queue_create(); bg->arena[i]->begin_timer = INVALID_TIMER; bg->arena[i]->fillup_timer = INVALID_TIMER; bg->arena[i]->pregame_duration = pregame_duration; @@ -425,17 +426,35 @@ void bg_queue_ready_ack (struct bg_arena *arena, struct map_session_data *sd, bo bg->queue_pc_cleanup(sd); return; } - if( response ) { + if( !response ) + bg->queue_pc_cleanup(sd); + else { + struct hQueue *queue = &script->hq[arena->queue_id]; + int i, count = 0; sd->bg_queue.ready = 1; + + for( i = 0; i < queue->items; i++ ) { + if( ( sd = iMap->id2sd(queue->item[i]) ) ) { + if( sd->bg_queue.ready == 1 ) + count++; + } + } /* check if all are ready then cancell timer, and start game */ - } else - bg->queue_pc_cleanup(sd); + if( count == i ) { + iTimer->delete_timer(arena->begin_timer,bg->begin_timer); + arena->begin_timer = INVALID_TIMER; + bg->begin(arena); + } + + } + } void bg_queue_player_cleanup(struct map_session_data *sd) { if ( sd->bg_queue.client_has_bg_data ) { clif->bgqueue_notice_delete(sd,BGQND_CLOSEWINDOW, sd->bg_queue.arena ? sd->bg_queue.arena->id : 0); } - script->queue_remove(sd->bg_queue.arena->queue_id,sd->status.account_id); + if( sd->bg_queue.arena ) + script->queue_remove(sd->bg_queue.arena->queue_id,sd->status.account_id); sd->bg_queue.arena = NULL; sd->bg_queue.ready = 0; sd->bg_queue.client_has_bg_data = 0; @@ -443,27 +462,27 @@ void bg_queue_player_cleanup(struct map_session_data *sd) { } void bg_match_over(struct bg_arena *arena, bool canceled) { struct hQueue *queue = &script->hq[arena->queue_id]; - int i;//, count = 0; - - /* if( !canceled ) */ + int i; for( i = 0; i < queue->items; i++ ) { struct map_session_data * sd = NULL; if( ( sd = iMap->id2sd(queue->item[i]) ) ) { bg->queue_pc_cleanup(sd); - clif->colormes(sd->fd,COLOR_RED,"BG Match Cancelled: not enough players"); + if( canceled ) + clif->colormes(sd->fd,COLOR_RED,"BG Match Cancelled: not enough players"); } } bg->arena[i]->begin_timer = INVALID_TIMER; bg->arena[i]->fillup_timer = INVALID_TIMER; /* reset queue */ + script->queue_clear(arena->queue_id); } void bg_begin(struct bg_arena *arena) { struct hQueue *queue = &script->hq[arena->queue_id]; int i, count = 0; - + for( i = 0; i < queue->items; i++ ) { struct map_session_data * sd = NULL; @@ -476,12 +495,14 @@ void bg_begin(struct bg_arena *arena) { } if( count < arena->min_players ) { - bg_match_over(arena,true); + bg->match_over(arena,true); } else { - ; + mapreg_setreg(add_str("$@bg_queue_id"),arena->queue_id);/* TODO: make this a arena-independant var? or just .@? */ + npc_event_do(arena->npc_event); /* we split evenly? */ /* but if a party of say 10 joins, it cant be split evenly unless by luck there are 10 soloers in the queue besides them */ /* not sure how to split T_T needs more info */ + /* currently running only on solo mode so we do it evenly */ } } int bg_begin_timer(int tid, unsigned int tick, int id, intptr_t data) { @@ -599,11 +620,12 @@ void bg_queue_add(struct map_session_data *sd, struct bg_arena *arena, enum bg_q clif->bgqueue_ack(sd,BGQA_SUCCESS,arena->id); + bg->queue_check(arena); } enum BATTLEGROUNDS_QUEUE_ACK bg_canqueue(struct map_session_data *sd, struct bg_arena *arena, enum bg_queue_types type) { int tick; unsigned int tsec; - if ( sd->status.base_level > arena->max_level || sd->status.base_level < arena->max_level ) + if ( sd->status.base_level > arena->max_level || sd->status.base_level < arena->min_level ) return BGQA_FAIL_LEVEL_INCORRECT; if ( !(sd->class_&JOBL_2) ) /* TODO: maybe make this a per-arena setting, so users may make custom arenas like baby-only,whatever. */ @@ -633,6 +655,11 @@ enum BATTLEGROUNDS_QUEUE_ACK bg_canqueue(struct map_session_data *sd, struct bg_ if( sd->bg_queue.arena != NULL ) return BGQA_DUPLICATE_REQUEST; + + if( type != BGQT_INDIVIDUAL ) {/* until we get the damn balancing correct */ + clif->colormes(sd->fd,COLOR_RED,"Queueing is only currently enabled only for Solo Mode"); + return BGQA_FAIL_TEAM_COUNT; + } switch(type) { case BGQT_GUILD: @@ -704,6 +731,7 @@ void do_init_battleground(void) { bg_team_db = idb_alloc(DB_OPT_RELEASE_DATA); iTimer->add_timer_func_list(bg_send_xy_timer, "bg_send_xy_timer"); iTimer->add_timer_interval(iTimer->gettick() + battle_config.bg_update_interval, bg_send_xy_timer, 0, 0, battle_config.bg_update_interval); + bg->config_read(); } void do_final_battleground(void) { @@ -738,6 +766,8 @@ void battleground_defaults(void) { bg->queue_pregame = bg_queue_pregame; bg->fillup_timer = bg_fillup_timer; bg->queue_ready_ack = bg_queue_ready_ack; + bg->match_over = bg_match_over; + bg->queue_check = bg_queue_check; /* */ bg->config_read = bg_config_read; } diff --git a/src/map/battleground.h b/src/map/battleground.h index 030d13d90..f76d84d0c 100644 --- a/src/map/battleground.h +++ b/src/map/battleground.h @@ -97,6 +97,8 @@ struct battleground_interface { void (*queue_pregame) (struct bg_arena *arena); int (*fillup_timer) (int tid, unsigned int tick, int id, intptr_t data); void (*queue_ready_ack) (struct bg_arena *arena, struct map_session_data *sd, bool response); + void (*match_over) (struct bg_arena *arena, bool canceled); + void (*queue_check) (struct bg_arena *arena); /* */ void (*config_read) (void); } bg_s; diff --git a/src/map/clif.c b/src/map/clif.c index e5132a938..373d510ba 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -545,8 +545,24 @@ int clif_send(const void* buf, int len, struct block_list* bl, enum send_target } break; + case BG_QUEUE: + if( sd && sd->bg_queue.arena ) { + struct hQueue *queue = &script->hq[sd->bg_queue.arena->queue_id]; + + for( i = 0; i < queue->items; i++ ) { + struct map_session_data * sd = NULL; + + if( ( sd = iMap->id2sd(queue->item[i]) ) ) { + WFIFOHEAD(sd->fd,len); + memcpy(WFIFOP(sd->fd,0), buf, len); + WFIFOSET(sd->fd,len); + } + } + } + break; + default: - ShowError("clif->send: Unrecognized type %d\n",type); + ShowError("clif_send: Unrecognized type %d\n",type); return -1; } @@ -17317,7 +17333,6 @@ void clif_status_change_end(struct block_list *bl, int tid, enum send_target tar } void clif_bgqueue_ack(struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_ACK response, unsigned char arena_id) { - switch (response) { case BGQA_FAIL_COOLDOWN: case BGQA_FAIL_DESERTER: @@ -17348,15 +17363,16 @@ void clif_bgqueue_notice_delete(struct map_session_data *sd, enum BATTLEGROUNDS_ } void clif_parse_bgqueue_register(int fd, struct map_session_data *sd) { - struct packet_bgqueue_register *p = P2PTR(fd, bgqueue_registerType); + struct packet_bgqueue_register *p = P2PTR(fd); struct bg_arena *arena = NULL; - if( !bg->queue_on ) return; /* temp, until feature is complete */ if( !(arena = bg->name2arena(p->bg_name)) ) { clif->bgqueue_ack(sd,BGQA_FAIL_BGNAME_INVALID,0); return; } + //debug + safestrncpy(arena->name, p->bg_name, sizeof(arena->name)); switch( (enum bg_queue_types)p->type ) { case BGQT_INDIVIDUAL: @@ -17387,7 +17403,6 @@ void clif_parse_bgqueue_checkstate(int fd, struct map_session_data *sd) { //struct packet_bgqueue_checkstate *p = P2PTR(fd, bgqueue_checkstateType); /* TODO: bgqueue_notice_delete should use this p->bg_name */ if( !bg->queue_on ) return; /* temp, until feature is complete */ if ( sd->bg_queue.arena && sd->bg_queue.type ) { - sd->bg_queue.client_has_bg_data = true; clif->bgqueue_update_info(sd,sd->bg_queue.arena->id,bg->id2pos(sd->bg_queue.arena->queue_id,sd->status.account_id)); } else clif->bgqueue_notice_delete(sd, BGQND_FAIL_NOT_QUEUING,0);/* TODO: wrong response, should respond with p->bg_name not id 0 */ @@ -17400,10 +17415,10 @@ void clif_parse_bgqueue_revoke_req(int fd, struct map_session_data *sd) { } void clif_parse_bgqueue_battlebegin_ack(int fd, struct map_session_data *sd) { - struct packet_bgqueue_battlebegin_ack *p = P2PTR(fd, bgqueue_checkstateType); + struct packet_bgqueue_battlebegin_ack *p = P2PTR(fd); struct bg_arena *arena; if( !bg->queue_on ) return; /* temp, until feature is complete */ - if( ( arena = bg->name2arena(p->bg_name) ) ) { + if( ( arena = bg->name2arena(p->bg_name) ) ) { bg->queue_ready_ack(arena,sd, ( p->result == 1 ) ? true : false); } else { clif->bgqueue_ack(sd,BGQA_FAIL_BGNAME_INVALID, 0); diff --git a/src/map/clif.h b/src/map/clif.h index bea701223..81376db15 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -43,7 +43,7 @@ struct eri; * Defines **/ #define packet_len(cmd) packet_db[cmd].len -#define P2PTR(fd,cmd) RFIFO2PTR(fd,packet_db[cmd].len) +#define P2PTR(fd) RFIFO2PTR(fd) #define clif_menuskill_clear(sd) (sd)->menuskill_id = (sd)->menuskill_val = (sd)->menuskill_val2 = 0; #define HCHSYS_NAME_LENGTH 20 diff --git a/src/map/map.c b/src/map/map.c index ee56f140f..99f585a8d 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1657,7 +1657,8 @@ int map_quit(struct map_session_data *sd) { } /* two times, the npc event above may assign a new one or delete others */ for( i = 0; i < sd->queues_count; i++ ) { - script->queue_remove(sd->queues[i],sd->status.account_id); + if( sd->queues[i] != -1 ) + script->queue_remove(sd->queues[i],sd->status.account_id); } npc_script_event(sd, NPCE_LOGOUT); diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index d77784dc5..8e7506686 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -404,13 +404,13 @@ struct packet_maptypeproperty2 { struct packet_bgqueue_ack { short PacketType; - short type; + unsigned char type; char bg_name[NAME_LENGTH]; } __attribute__((packed)); struct packet_bgqueue_notice_delete { short PacketType; - short type; + unsigned char type; char bg_name[NAME_LENGTH]; } __attribute__((packed)); @@ -438,7 +438,7 @@ struct packet_bgqueue_revoke_req { struct packet_bgqueue_battlebegin_ack { short PacketType; - short result; + unsigned char result; char bg_name[NAME_LENGTH]; char game_name[NAME_LENGTH]; } __attribute__((packed)); diff --git a/src/map/script.c b/src/map/script.c index 5cc48c7ce..354ec0522 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -17016,9 +17016,7 @@ struct hQueue *script_hqueue_get(int idx) { return NULL; return &script->hq[idx]; } -/* set .@id,queue(); */ -/* creates queue, returns created queue id */ -BUILDIN(queue) { +int script_hqueue_create(void) { int idx = script->hqs; int i; @@ -17039,8 +17037,12 @@ BUILDIN(queue) { script->hq[ idx ].onDeath[0] = '\0'; script->hq[ idx ].onLogOut[0] = '\0'; script->hq[ idx ].onMapChange[0] = '\0'; - - script_pushint(st,idx); + return idx; +} +/* set .@id,queue(); */ +/* creates queue, returns created queue id */ +BUILDIN(queue) { + script_pushint(st,script->queue_create()); return true; } /* set .@length,queuesize(.@queue_id); */ @@ -17135,7 +17137,7 @@ bool script_hqueue_remove(int idx, int var) { if( var >= START_ACCOUNT_NUM && (sd = iMap->id2sd(var)) ) { for(i = 0; i < sd->queues_count; i++) { - if( sd->queues[i] == var ) { + if( sd->queues[i] == idx ) { break; } } @@ -17237,7 +17239,33 @@ BUILDIN(queuedel) { return true; } +void script_hqueue_clear(int idx) { + if( idx < 0 || idx >= script->hqs || script->hq[idx].items == -1 ) { + ShowWarning("script_hqueue_clear: unknown queue id %d\n",idx); + return; + } else { + struct map_session_data *sd; + int i, j; + + for(i = 0; i < script->hq[idx].items; i++) { + if( script->hq[idx].item[i] != -1 ) { + if( script->hq[idx].item[i] >= START_ACCOUNT_NUM && (sd = iMap->id2sd(script->hq[idx].item[i])) ) { + for(j = 0; j < sd->queues_count; j++) { + if( sd->queues[j] == idx ) { + break; + } + } + + if( j != sd->queues_count ) + sd->queues[j] = -1; + } + script->hq[idx].item[i] = -1; + } + } + } + return; +} /* set .@id, queueiterator(.@queue_id); */ /* creates a new queue iterator, returns its id */ BUILDIN(queueiterator) { @@ -17281,7 +17309,7 @@ BUILDIN(qiget) { if( idx < 0 || idx >= script->hqis ) { ShowWarning("buildin_qiget: unknown queue iterator id %d\n",idx); script_pushint(st, 0); - } else if ( script->hqi[idx].pos == script->hqi[idx].items ) { + } else if ( script->hqi[idx].pos -1 == script->hqi[idx].items ) { script_pushint(st, 0); } else { struct hQueueIterator *it = &script->hqi[idx]; @@ -17298,7 +17326,7 @@ BUILDIN(qicheck) { if( idx < 0 || idx >= script->hqis ) { ShowWarning("buildin_qicheck: unknown queue iterator id %d\n",idx); script_pushint(st, 0); - } else if ( script->hqi[idx].pos == script->hqi[idx].items ) { + } else if ( script->hqi[idx].pos -1 == script->hqi[idx].items ) { script_pushint(st, 0); } else { script_pushint(st, 1); @@ -17355,7 +17383,66 @@ BUILDIN(packageitem) { return true; } +/* New Battlegrounds Stuff */ +/* bg_team_create(map_name,respawn_x,respawn_y) */ +/* returns created team id or -1 when fails */ +BUILDIN(bg_create_team) { + const char *map_name, *ev = "", *dev = "";//ev and dev will be dropped. + int x, y, mapindex = 0, bg_id; + + map_name = script_getstr(st,2); + if( strcmp(map_name,"-") != 0 ) { + mapindex = mapindex_name2id(map_name); + if( mapindex == 0 ) { // Invalid Map + script_pushint(st,0); + return true; + } + } + + x = script_getnum(st,3); + y = script_getnum(st,4); + + if( (bg_id = bg_create(mapindex, x, y, ev, dev)) == 0 ) { // Creation failed + script_pushint(st,-1); + } else + script_pushint(st,bg_id); + + return true; +} +/* bg_join_team(team_id{,optional account id}) */ +/* when account id is not present it tries to autodetect from the attached player (if any) */ +/* returns 0 when successful, 1 otherwise */ +BUILDIN(bg_join_team) { + struct map_session_data *sd; + int team_id = script_getnum(st, 2); + + if( script_hasdata(st, 3) ) + sd = iMap->id2sd(script_getnum(st, 3)); + else + sd = script->rid2sd(st); + + if( !sd ) + script_pushint(st, 1); + else + script_pushint(st,bg_team_join(team_id, sd)?0:1); + + return true; +} +/* bg_match_over( arena_name {, optional canceled } ) */ +/* returns 0 when successful, 1 otherwise */ +BUILDIN(bg_match_over) { + bool canceled = script_hasdata(st,3) ? true : false; + struct bg_arena *arena = bg->name2arena((char*)script_getstr(st, 2)); + + if( arena ) { + bg->match_over(arena,canceled); + script_pushint(st, 0); + } else + script_pushint(st, 1); + + return true; +} // declarations that were supposed to be exported from npc_chat.c #ifdef PCRE_SUPPORT BUILDIN(defpattern); @@ -17872,6 +17959,10 @@ void script_parse_builtin(void) { BUILDIN_DEF(packageitem,"?"), + /* New BG Commands [Hercules] */ + BUILDIN_DEF(bg_create_team,"sii"), + BUILDIN_DEF(bg_join_team,"i?"), + BUILDIN_DEF(bg_match_over,"s?"), }; int i,n, len = ARRAYLENGTH(BUILDIN), start = script->buildin_count; char* p; @@ -17974,4 +18065,6 @@ void script_defaults(void) { script->queue_add = script_hqueue_add; script->queue_del = script_hqueue_del; script->queue_remove = script_hqueue_remove; + script->queue_create = script_hqueue_create; + script->queue_clear = script_hqueue_clear; } diff --git a/src/map/script.h b/src/map/script.h index a047779a8..a77e957c0 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -383,6 +383,8 @@ struct script_interface { bool (*queue_add) (int idx, int var); bool (*queue_del) (int idx); bool (*queue_remove) (int idx, int var); + int (*queue_create) (void); + void (*queue_clear) (int idx); } script_s; struct script_interface *script; -- cgit v1.2.3-60-g2f50 From be2b1ae78b0d7798f57b3875097614b9c92f7a2c Mon Sep 17 00:00:00 2001 From: shennetsind Date: Wed, 3 Jul 2013 15:57:21 -0300 Subject: Updated item_group.conf Special Thanks to Muad_Dib for all the new info! and to Masao for bringing the issue to our attention. Signed-off-by: shennetsind --- db/pre-re/item_group.conf | 1704 +++++++++++++++++++++++++++++++++++++----- db/re/item_group.conf | 1796 ++++++++++++++++++++++++++++++++------------- 2 files changed, 2819 insertions(+), 681 deletions(-) (limited to 'db') diff --git a/db/pre-re/item_group.conf b/db/pre-re/item_group.conf index b2f4b1ac4..286711b3c 100644 --- a/db/pre-re/item_group.conf +++ b/db/pre-re/item_group.conf @@ -19,7 +19,7 @@ */ Old_Card_Album: ( - ("Poring_Card",8), + ("Poring_Card",9), ("Fabre_Card",10), ("Pupa_Card",6), ("Drops_Card",11), @@ -140,7 +140,6 @@ Old_Card_Album: ( "Baphomet__Card", "Daydric_Card", "Khalitzburg_Card", - "Joker_Card", "Evil_Druid_Card", "Gargoyle_Card", "Goat_Card", @@ -191,6 +190,7 @@ Old_Card_Album: ( "Mystcase_Card", "Miyabi_Ningyo_Card", "Violy_Card", + "Wander_Man_Card", "Bon_Gun_Card", "Brilight_Card", "Bloody_Murderer_Card", @@ -293,6 +293,7 @@ Old_Card_Album: ( "Hyegun_Card", "Phendark_Card", "Heater_Card", + "Antonio_Card", "Agav_Card", "Echio_Card", "Vanberk_Card", @@ -324,12 +325,6 @@ Old_Card_Album: ( "Necromancer_Card" ) Gift_Box: ( - ("Oridecon_Stone",4), - ("Elunium_Stone",2), - ("Oridecon",2), - "Elunium", - "Emperium", - "Steel", "Star_Crumb", "Flame_Heart", "Mistic_Frozen", @@ -387,24 +382,20 @@ Gift_Box: ( "Red_Potion", "Orange_Potion", "Yellow_Potion", + "White_Potion", + "Blue_Potion", "Green_Potion", + "Royal_Jelly", "Candy", "Candy_Striper", "Pet_Food", "Well_Baked_Cookie", "Piece_Of_Cake", - "Old_Blue_Box", "Old_Violet_Box", ("Gift_Box",19), "Girl's_Diary" ) Gift_Box_1: ( - ("Oridecon_Stone",4), - ("Elunium_Stone",2), - ("Oridecon",2), - "Elunium", - "Emperium", - "Steel", "Star_Crumb", "Flame_Heart", "Mistic_Frozen", @@ -462,24 +453,20 @@ Gift_Box_1: ( "Red_Potion", "Orange_Potion", "Yellow_Potion", + "White_Potion", + "Blue_Potion", "Green_Potion", + "Royal_Jelly", "Candy", "Candy_Striper", "Pet_Food", "Well_Baked_Cookie", "Piece_Of_Cake", - "Old_Blue_Box", "Old_Violet_Box", ("Gift_Box",19), "Girl's_Diary" ) Gift_Box_2: ( - ("Oridecon_Stone",4), - ("Elunium_Stone",2), - ("Oridecon",2), - "Elunium", - "Emperium", - "Steel", "Star_Crumb", "Flame_Heart", "Mistic_Frozen", @@ -537,24 +524,20 @@ Gift_Box_2: ( "Red_Potion", "Orange_Potion", "Yellow_Potion", + "White_Potion", + "Blue_Potion", "Green_Potion", + "Royal_Jelly", "Candy", "Candy_Striper", "Pet_Food", "Well_Baked_Cookie", "Piece_Of_Cake", - "Old_Blue_Box", "Old_Violet_Box", ("Gift_Box",19), "Girl's_Diary" ) Gift_Box_3: ( - ("Oridecon_Stone",4), - ("Elunium_Stone",2), - ("Oridecon",2), - "Elunium", - "Emperium", - "Steel", "Star_Crumb", "Flame_Heart", "Mistic_Frozen", @@ -612,24 +595,20 @@ Gift_Box_3: ( "Red_Potion", "Orange_Potion", "Yellow_Potion", + "White_Potion", + "Blue_Potion", "Green_Potion", + "Royal_Jelly", "Candy", "Candy_Striper", "Pet_Food", "Well_Baked_Cookie", "Piece_Of_Cake", - "Old_Blue_Box", "Old_Violet_Box", ("Gift_Box",19), "Girl's_Diary" ) Gift_Box_4: ( - ("Oridecon_Stone",4), - ("Elunium_Stone",2), - ("Oridecon",2), - "Elunium", - "Emperium", - "Steel", "Star_Crumb", "Flame_Heart", "Mistic_Frozen", @@ -687,13 +666,15 @@ Gift_Box_4: ( "Red_Potion", "Orange_Potion", "Yellow_Potion", + "White_Potion", + "Blue_Potion", "Green_Potion", + "Royal_Jelly", "Candy", "Candy_Striper", "Pet_Food", "Well_Baked_Cookie", "Piece_Of_Cake", - "Old_Blue_Box", "Old_Violet_Box", ("Gift_Box",19), "Girl's_Diary" @@ -742,7 +723,6 @@ Old_Blue_Box: ( ("Thief_Clothes",3), ("Thief_Clothes_",3), ("Ninja_Suit",3), - ("Wedding_Dress",3), ("G_Strings",3), ("Novice_Breast",3), ("Full_Plate_Armor",3), @@ -999,6 +979,7 @@ Old_Blue_Box: ( ("Snowy_Horn",3), ("Mini_Propeller",3), ("Mini_Glasses",3), + ("Prontera_Army_Cap",3), ("Pierrot_Nose",3), ("Gangster_Patch",3), ("Ganster_Mask",3), @@ -1024,7 +1005,6 @@ Old_Blue_Box: ( ("Viking_Helm",3), ("Joker_Jester",3), ("Machoman_Glasses",3), - ("Puppy_Love",3), ("Safety_Helmet",3), ("Indian_Hair_Piece",3), ("Antenna",3), @@ -1074,7 +1054,7 @@ Old_Blue_Box: ( ("Illusion_Flower",12), ("Shoot",12), ("Flower",12), - ("Emperium",12), + ("Empty_Bottle",12), ("Yellow_Gemstone",12), ("Red_Gemstone",12), ("Blue_Gemstone",12), @@ -1115,8 +1095,6 @@ Old_Blue_Box: ( ("Grasshopper_Doll",12), ("Monkey_Doll",12), ("Raccoondog_Doll",12), - ("Oridecon_Stone",12), - ("Elunium_Stone",12), ("Danggie",12), ("Tree_Root",12), ("Reptile_Tongue",12), @@ -1184,7 +1162,6 @@ Old_Blue_Box: ( ("Turtle_Shell",12), ("Voucher_Of_Orcish_Hero",12), ("Gold",12), - ("Alchol",12), ("Detrimindexta",12), ("Karvodailnirol",12), ("Counteragent",12), @@ -1197,8 +1174,6 @@ Old_Blue_Box: ( ("Violet_Dyestuffs",12), ("White_Dyestuffs",12), ("Black_Dyestuffs",12), - ("Oridecon",12), - ("Elunium",12), ("Anvil",12), ("Oridecon_Anvil",12), ("Golden_Anvil",12), @@ -1243,7 +1218,6 @@ Old_Blue_Box: ( ("Porcupine_Spike",12), ("Wild_Boar's_Mane",12), ("Tiger's_Skin",12), - ("Tiger_Footskin",12), ("Limb_Of_Mantis",12), ("Blossom_Of_Maneater",12), ("Root_Of_Maneater",12), @@ -1393,7 +1367,6 @@ Old_Blue_Box: ( ("Mystery_Iron_Bit",12), ("Great_Wing",12), ("Taegeuk_Plate",12), - ("Tuxedo",12), ("Leopard_Skin",12), ("Leopard_Talon",12), ("Packing_Ribbon",12), @@ -1468,7 +1441,9 @@ Old_Blue_Box: ( ("Red_Potion",12), ("Orange_Potion",12), ("Yellow_Potion",12), - ("Green_Potion",11), + ("White_Potion",12), + ("Blue_Potion",12), + ("Green_Potion",12), ("Red_Herb",12), ("Yellow_Herb",12), ("White_Herb",12), @@ -1487,6 +1462,7 @@ Old_Blue_Box: ( ("Fruit_Of_Mastela",12), ("Holy_Water",12), ("Panacea",12), + ("Royal_Jelly",12), ("Monster's_Feed",12), ("Candy",12), ("Candy_Striper",12), @@ -1511,8 +1487,9 @@ Old_Blue_Box: ( ("Rice_Cake",12), ("Chocolate",12), ("White_Chocolate",12), - "Wing_Of_Butterfly", - ("Old_Blue_Box",1173), + ("Wing_Of_Fly",12), + ("Wing_Of_Butterfly",12), + ("Branch_Of_Dead_Tree",512), ("Anodyne",12), ("Aloebera",12), ("Yggdrasilberry",12), @@ -1568,6 +1545,7 @@ Old_Blue_Box: ( "Angelic_Chain", "Satanic_Chain", "Sharp_Gear", + "Ghost_Bandana", "Ring_", "Earring_", "Necklace_", @@ -1674,14 +1652,14 @@ Old_Blue_Box: ( "Pot", "Burnt_Parts", "Pocket_Watch", - ("Ice_Heart",21), - ("Ice_Scale",22), - ("Bloody_Rune",22), - ("Rotten_Meat",22), - ("Sticky_Poison",22), + ("Ice_Heart",15), + ("Ice_Scale",15), + ("Bloody_Rune",15), + ("Rotten_Meat",15), + ("Sticky_Poison",15), "Suspicious_Hat", "White_Mask", - ("Old_White_Cloth",33), + ("Old_White_Cloth",34), ("Clattering_Skull",32), ("Broken_Farming_Utensil",34), "Orleans_Server", @@ -1750,7 +1728,6 @@ Old_Violet_Box: ( ("Silver_Robe_",7), ("Thief_Clothes_",7), ("Ninja_Suit",7), - ("Wedding_Dress",7), ("G_Strings",7), ("Novice_Breast",7), ("Novice_Plate",7), @@ -1926,6 +1903,7 @@ Old_Violet_Box: ( ("Snowy_Horn",7), ("Mini_Propeller",7), ("Mini_Glasses",7), + ("Prontera_Army_Cap",7), ("Pierrot_Nose",7), ("Gangster_Patch",7), ("Ganster_Mask",7), @@ -1951,7 +1929,6 @@ Old_Violet_Box: ( ("Viking_Helm",7), ("Joker_Jester",7), ("Machoman_Glasses",7), - ("Puppy_Love",7), ("Safety_Helmet",7), ("Indian_Hair_Piece",7), ("Antenna",7), @@ -2001,7 +1978,7 @@ Old_Violet_Box: ( ("Illusion_Flower",14), ("Shoot",14), ("Flower",14), - ("Emperium",14), + ("Empty_Bottle",14), ("Yellow_Gemstone",14), ("Red_Gemstone",14), ("Blue_Gemstone",14), @@ -2042,8 +2019,6 @@ Old_Violet_Box: ( ("Grasshopper_Doll",14), ("Monkey_Doll",14), ("Raccoondog_Doll",14), - ("Oridecon_Stone",14), - ("Elunium_Stone",14), ("Danggie",14), ("Tree_Root",14), ("Reptile_Tongue",14), @@ -2111,7 +2086,6 @@ Old_Violet_Box: ( ("Turtle_Shell",14), ("Voucher_Of_Orcish_Hero",14), ("Gold",14), - ("Alchol",14), ("Detrimindexta",14), ("Karvodailnirol",14), ("Counteragent",14), @@ -2124,9 +2098,7 @@ Old_Violet_Box: ( ("Violet_Dyestuffs",14), ("White_Dyestuffs",14), ("Black_Dyestuffs",14), - ("Oridecon",14), - ("Elunium",14), - ("Anvil",14), + ("Anvil",13), ("Oridecon_Anvil",14), ("Golden_Anvil",14), ("Emperium_Anvil",14), @@ -2170,7 +2142,6 @@ Old_Violet_Box: ( ("Porcupine_Spike",14), ("Wild_Boar's_Mane",14), ("Tiger's_Skin",14), - ("Tiger_Footskin",14), ("Limb_Of_Mantis",14), ("Blossom_Of_Maneater",14), ("Root_Of_Maneater",14), @@ -2320,7 +2291,6 @@ Old_Violet_Box: ( ("Mystery_Iron_Bit",14), ("Great_Wing",14), ("Taegeuk_Plate",14), - ("Tuxedo",14), ("Leopard_Skin",14), ("Leopard_Talon",14), ("Packing_Ribbon",14), @@ -2395,6 +2365,8 @@ Old_Violet_Box: ( ("Red_Potion",14), ("Orange_Potion",14), ("Yellow_Potion",14), + ("White_Potion",14), + ("Blue_Potion",14), ("Green_Potion",14), ("Red_Herb",14), ("Yellow_Herb",14), @@ -2414,6 +2386,7 @@ Old_Violet_Box: ( ("Fruit_Of_Mastela",14), ("Holy_Water",14), ("Panacea",14), + ("Royal_Jelly",14), ("Monster's_Feed",14), ("Candy",14), ("Candy_Striper",14), @@ -2438,7 +2411,9 @@ Old_Violet_Box: ( ("Rice_Cake",14), ("Chocolate",14), ("White_Chocolate",14), - ("Old_Blue_Box",614), + ("Wing_Of_Fly",14), + ("Wing_Of_Butterfly",14), + ("Branch_Of_Dead_Tree",214), ("Anodyne",14), ("Aloebera",14), ("Yggdrasilberry",14), @@ -2490,12 +2465,11 @@ Old_Violet_Box: ( ("Poison_Bottle",14), ("Gold_Pill",14), ("Guard_",6), - "Tiara", - "Crown", "Coronet", "Angelic_Chain", "Satanic_Chain", "Sharp_Gear", + "Ghost_Bandana", "Elven_Ears", "Holy_Robe", "Mage_Coat", @@ -2512,8 +2486,6 @@ Old_Violet_Box: ( "Pair_Of_Red_Ribbon", "Loard_Circlet", "Bone_Helm", - "Corsair", - "Assassin_Mask", "Horn_Of_Succubus", "Inccubus_Horn", "Spinx_Helm", @@ -2619,7 +2591,7 @@ Old_Violet_Box: ( "Suspicious_Hat", "White_Mask", ("Old_Violet_Box",103), - ("Old_White_Cloth",16), + ("Old_White_Cloth",17), ("Clattering_Skull",16), ("Broken_Farming_Utensil",17), "Inverse_Scale", @@ -2747,13 +2719,13 @@ Accessory_Box: ( "Rosary_", "Brooch_", "Earring_", + ("Vesper_Core01",2), ("Vesper_Core02",2), ("Vesper_Core03",2), ("Vesper_Core04",2), "Thimble_Of_Archer_", ("Red_Silk_Seal",2), "Orleans_Glove", - "Vesper_Core01", "Spiritual_Ring", "Shinobi's_Sash", "Hyper_Changer", @@ -2776,7 +2748,8 @@ Wrapped_Mask: ( ("Goblin_Mask_03",10), ("Goblin_Mask_04",10), ("Mr_Smile",9), - "Zherlthsh_Mask" + "Zherlthsh_Mask", + ("Hahoe_Mask",2) ) Bundle_Of_Magic_Scroll: ( "Earth_Scroll_1_5", @@ -2836,6 +2809,7 @@ Food_Package: ( "Leaflet_Of_Hinal", "Leaflet_Of_Aloe", "Fruit_Of_Mastela", + "Royal_Jelly", "Milk", "Lemon", "Long_Rice_Cake", @@ -2846,6 +2820,8 @@ First_Aid_Kit: ( ("Orange_Potion",5), ("Yellow_Potion",5), ("Slow_Down_Potion",5), + ("White_Potion",5), + ("Blue_Potion",5), ("Green_Potion",5), ("Red_Slim_Potion",5), ("Yellow_Slim_Potion",5), @@ -2876,14 +2852,19 @@ Cookie_Bag: ( "Chocolate_Drink", ("Candy",4) ) +Red_Box_: ( + ("Magic_Eyes",9), + ("Hibiscus",10), + ("Charming_Ribbon",10) +) Egg_Boy: ( ("Grape",299), ("Rice_Ball",522), ("Prohibition_Red_Candle",20), ("Realgar_Wine",100), ("Exorcize_Herb",50), - ("Crown",2), - "Inccubus_Horn" + ("Ghost_Bandana",5), + ("Inccubus_Horn",2) ) Egg_Girl: ( ("Grape",299), @@ -2891,18 +2872,20 @@ Egg_Girl: ( ("Sway_Apron",20), ("Realgar_Wine",100), ("Exorcize_Herb",50), - ("Tiara",2), ("Hair_Protector",5), - "Horn_Of_Succubus" + ("Horn_Of_Succubus",2) ) Giftbox_China: ( "Orange_Potion", "Yellow_Potion", + "White_Potion", + "Blue_Potion", "Green_Potion", "Honey", "Leaflet_Of_Hinal", ("Leaflet_Of_Aloe",2), "Panacea", + "Royal_Jelly", "Candy", "Candy_Striper", ("Old_Blue_Box",40), @@ -2924,7 +2907,6 @@ Giftbox_China: ( "Singing_Plant", "Ment", "Illusion_Flower", - "Emperium", "Yellow_Gemstone", "Red_Gemstone", "Blue_Gemstone", @@ -2960,8 +2942,6 @@ Giftbox_China: ( "Grasshopper_Doll", "Monkey_Doll", "Raccoondog_Doll", - "Oridecon_Stone", - "Elunium_Stone", "Jellopy", "Garlet", "Scell", @@ -2970,7 +2950,6 @@ Giftbox_China: ( "Mementos", "Voucher_Of_Orcish_Hero", "Gold", - "Alchol", "Detrimindexta", "Karvodailnirol", "Counteragent", @@ -2983,8 +2962,6 @@ Giftbox_China: ( "Violet_Dyestuffs", "White_Dyestuffs", "Black_Dyestuffs", - "Oridecon", - "Elunium", "Anvil", "Oridecon_Anvil", "Golden_Anvil", @@ -3135,7 +3112,6 @@ Giftbox_China: ( "Silver_Robe_", "Thief_Clothes_", "Ninja_Suit", - "Wedding_Dress", "G_Strings", "Sandals_", "Shoes_", @@ -3159,48 +3135,51 @@ Giftbox_China: ( "Silver_Ring", "Flower_Ring", "Diamond_Ring", - "Puppy_Love", "Safety_Helmet", "Indian_Hair_Piece", "Fin_Helm", - "Egg_Shell" -) -Old_Bleu_Box: ( - ("Cold_Scroll_1_5",2), - ("Fire_Scroll_1_5",2), - ("Wind_Scroll_1_5",2), - ("Fire_Scroll_2_5",2), - ("Fire_Scroll_3_5",2), - ("Holy_Scroll_1_5",2), - ("Cold_Scroll_2_5",2), - ("Gift_Box",2), - ("Milk",2), - ("Well_Baked_Cookie",2) + ("Egg_Shell",2) ) -Holy_Egg_2: ( - ("Oridecon",3), - ("Elunium",10), - ("White_Slim_Potion",30), - ("Blue_Potion",30), - ("Yggdrasilberry",3), - ("Seed_Of_Yggdrasil",2), - ("Leaf_Of_Yggdrasil",15), - ("Old_Card_Album",5), - "Drooping_Bunny" +Red_Box: ( + ("Twin_Ribbon",9), + ("Helm_Of_Darkness",11), + "Puppy_Hat", + ("Geographer_Band",11), + ("Laurel_Wreath",11), + ("Bird_Nest_Hat",11), + ("Alice_Doll",11), + ("Hibiscus",11), + ("Magic_Eyes",11), + ("Charming_Ribbon",11), + "Chinese_Crown", + ("Crescent_Helm",11), + ("Kabuki_Mask",12), + "Cat_Hat" ) -Red_Box_: ( - ("Magic_Eyes",9), - ("Hibiscus",10), - ("Charming_Ribbon",10) +Green_Box: ( + ("Str_Dish10",99), + ("Int_Dish10",100), + ("Vit_Dish10",100), + ("Agi_Dish10",100), + ("Dex_Dish10",100), + ("Luk_Dish10",100), + ("Yggdrasilberry",99), + ("Seed_Of_Yggdrasil",100), + ("Fire_Cracker",100), + ("Chocolate_Drink",100), + "Puppy_Hat" ) -Hometown_Gift: ( - "Hearty_Rice_Cake", - "Salty_Rice_Cake", - "Lucky_Rice_Cake", - "Sesame_Pastry", - "Honey_Pastry", - "Rainbow_Cake", - "Korea_Rice_Cake" +Old_Bleu_Box: ( + "Cold_Scroll_1_5", + "Fire_Scroll_1_5", + "Wind_Scroll_1_5", + "Fire_Scroll_2_5", + "Fire_Scroll_3_5", + "Holy_Scroll_1_5", + "Cold_Scroll_2_5", + "Gift_Box", + "Milk", + "Well_Baked_Cookie" ) Old_Yellow_Box: ( "Cookie_Hat", @@ -3213,6 +3192,8 @@ Old_Gift_Box: ( ("Fallen_Leaves_",45) ) Magic_Card_Album: ( + "Angeling_Card", + "Gryphon_Card", "Dark_Illusion_Card", "Deviling_Card", ("Dragon_Fly_Card",10), @@ -3248,30 +3229,21 @@ Masquerade_Ball_Box: ( ("Marvelous_Wig_",10), ("Ati_Atihan_Hat_",10) ) -Louise_Costume_Box: ( - ("Red_Bag",16), - ("Cool_Summer_Outfit",2) -) -Xmas_Gift: ( - ("Fire_Cracker_Love",6), - ("Gift_Box",66), - ("Old_Bleu_Box",36), - ("Set_Of_Taiming_Item",6), - ("Wrapped_Mask",6), - ("Old_Blue_Box",24), - ("Bundle_Of_Magic_Scroll",12), - ("Buche_De_Noel",24), - ("Speed_Up_Potion",12), - ("Slow_Down_Potion",12), - ("Cookie_Bag",12), - ("Red_Bag",6), - ("First_Aid_Kit",12), - ("Crystal_Jewel__",12), - ("HandMade_Chocolate",18), - ("HandMade_Chocolate_",18), - ("Chocolate_Drink",18), - ("Santa's_Hat_",12), - ("Fire_Cracker_Xmas",4) +Easter_Scroll: ( + ("Silver_Knife_Of_Chaste",109), + ("Heart_Of_Her",110), + ("No_Recipient",110), + ("Old_Broom",110), + ("Armlet_Of_Obedience",110), + ("Shining_Stone",110), + ("Contracts_In_Shadow",110), + ("Book_Of_Devil",110), + ("Pet_Incubator",205), + "Munak_Turban", + "Bongun_Hat", + "Munak_Turban_", + "Bongun_Hat_", + "Ghost_Bandana" ) Tresure_Box_WoE: ( ("Wind_Arrow_Container",23), @@ -3301,6 +3273,31 @@ Masquerade_Ball_Box2: ( ("Cap_Of_Blindness",10), "Dress_Hat" ) +Louise_Costume_Box: ( + ("Red_Bag",16), + ("Cool_Summer_Outfit",2) +) +Xmas_Gift: ( + ("Fire_Cracker_Love",6), + ("Gift_Box",66), + ("Old_Bleu_Box",36), + ("Set_Of_Taiming_Item",6), + ("Wrapped_Mask",6), + ("Old_Blue_Box",24), + ("Bundle_Of_Magic_Scroll",12), + ("Buche_De_Noel",24), + ("Speed_Up_Potion",12), + ("Slow_Down_Potion",12), + ("Cookie_Bag",12), + ("Red_Bag",6), + ("First_Aid_Kit",12), + ("Crystal_Jewel__",12), + ("HandMade_Chocolate",18), + ("HandMade_Chocolate_",18), + ("Chocolate_Drink",18), + ("Santa's_Hat_",12), + ("Fire_Cracker_Xmas",4) +) Pierre_Treasurebox: ( ("Scarlet_Dyestuffs",3), ("Lemon_Dyestuffs",3), @@ -3342,35 +3339,1352 @@ Cherish_Box_Ori: ( ("Ragnarok_Limited_Ed",3) ) Splendid_Box: ( - //not yet supported/not in pre-re "Imperial_Guard", +//unknown/unsupported - ("2153",2), + ("Bone_Plate",2), +//unknown/unsupported - ("15014",2), + ("Krasnaya",2), +//unknown/unsupported - ("1191",2), +//unknown/unsupported - ("1196",2), + ("Krishna",2), + ("Cakram",2), +//unknown/unsupported - ("1287",2), + ("Vecer_Axe",2), + ("Giant_Axe",2), +//unknown/unsupported - ("1433",2), +//unknown/unsupported - ("1649",2), + ("Falken_Blitz",2), +//unknown/unsupported - ("1746",2), +//unknown/unsupported - ("1930",2), +//unknown/unsupported - ("1984",2), + ("Krieg",2), + ("Weihna",2), +//unknown/unsupported - ("13061",2), + ("Ruber",2), + ("Erde",2), + ("Red_Square_Bag",2), +//unknown/unsupported - ("16003",2), +//unknown/unsupported - ("16010",2), +//unknown/unsupported - ("18103",2) +) +/* currently unsupported or unknown ('Old_C_Album_Armor') +Old_C_Album_Armor: ( + ("Pupa_Card",2), + ("Picky_Card",2), + ("Picky__Card",2), + ("Roda_Frog_Card",2), + ("Thief_Bug_Card",2), + ("Rocker_Card",2), + ("Desert_Wolf_Babe_Card",2), + ("Pecopeco_Card",2), + ("Steel_Chonchon_Card",2), + ("Cornutus_Card",2), + ("Savage_Card",2), + ("Sword_Fish_Card",2), + ("Dokebi_Card",2), + ("Pasana_Card",2), + ("Sand_Man_Card",2), + ("Marc_Card",2), + ("Argiope_Card",2), + ("Bathory_Card",2), + ("Evil_Druid_Card",2), + ("Goat_Card",2), + ("Flying_Deleter_Card",2), + ("Grizzly_Card",2), + ("Nightmare_Terror_Card",2), + ("Dark_Frame_Card",2), + ("Demon_Pungus_Card",2), + ("Disguise_Card",2), + ("Wraith_Dead_Card",2), + ("Loli_Ruri_Card",2), + ("Rybio_Card",2), + ("Majoruros_Card",2), + ("Brilight_Card",2), + ("Sasquatch_Card",2), + ("Succubus_Card",2), + ("Solider_Card",2), + ("Skel_Prisoner_Card",2), + ("Baby_Leopard_Card",2), + ("Anolian_Card",2), + ("Apocalips_Card",2), + ("Antonio_Card",2), + ("Wooden_Golem_Card",2), + ("Giant_Spider_Card",2), + ("Deleter_Card",2), + ("Geographer_Card",2), + ("Karakasa_Card",2), + ("Kraben_Card",2), + ("Cremy_Fear_Card",2), + ("Clock_Card",2), + ("Chimera_Card",2), + ("Killer_Mantis_Card",2), + ("Pest_Card",2), + ("Waste_Stove_Card",2), + ("Venomous_Card",2), + ("Porcellio_Card",2), + ("Obsidian_Card",2), + ("Mineral_Card",2), + ("Ygnizem_Card",2), + ("Removal_Card",2), + ("Venatu_Card",2), + ("Dimik_Card",2), + ("Archdam_Card",2), + ("Novus__Card",2), + ("Novus_Card",2), + ("Ancient_Mimic_Card",2), + ("Observation_Card",2), + ("Shelter_Card",2), + ("Aliza_Card",2), + ("Alicel_Card",2), + ("Skogul_Card",2), + ("Frus_Card",2), + ("Agav_Card",2), + ("Echio_Card",2), + ("Byorgue_Card",2), + ("Banshee_Master_Card",2), +//unknown/unsupported - "4462" +) +*/ +/* currently unsupported or unknown ('Old_C_Album_Helm') +Old_C_Album_Helm: ( + ("Stainer_Card",2), + ("Coco_Card",2), + ("Martin_Card",2), + ("Elder_Wilow_Card",2), + ("Giearth_Card",2), + ("Ghoul_Card",2), + ("Marduk_Card",2), + ("Deviruchi_Card",2), + ("Nightmare_Card",2), + ("Grand_Peco_Card",2), + ("Dark_Illusion_Card",2), + ("Dryad_Card",2), + ("Rideword_Card",2), + ("Leib_Olmai_Card",2), + ("Leaf_Cat_Card",2), + ("Mystcase_Card",2), + ("Stalactic_Golem_Card",2), + ("C_Tower_Manager_Card",2), + ("Archangeling_Card",2), + ("Wicked_Nymph_Card",2), + ("Wootan_Shooter_Card",2), + ("Wootan_Fighter_Card",2), + ("Incubus_Card",2), + ("Giant_Honet_Card",2), + ("Gibbet_Card",2), + ("Carat_Card",2), + ("Cramp_Card",2), + ("Permeter_Card",2), + ("Ungoliant_Card",2), + ("Mole_Card",2), + ("Gemini_Card",2), + ("Seyren_Card",2), + ("Magaleta_Card",2), + ("Katrinn_Card",2), + ("Acidus__Card",2), + ("Vanberk_Card",2), + ("Isilla_Card",2), + ("Knocker_Card",2), + ("Banshee_Card",2), +//unknown/unsupported - "4458", +//unknown/unsupported - "4459", +//unknown/unsupported - "4460", +//unknown/unsupported - "4461", +//unknown/unsupported - "4468" +) +*/ +/* currently unsupported or unknown ('Old_C_Album_Acc') +Old_C_Album_Acc: ( + ("Kukre_Card",2), + ("Tarou_Card",2), + ("Poporing_Card",2), + ("Worm_Tail_Card",2), + ("Muka_Card",2), + ("Creamy_Card",2), + ("Smokie_Card",2), + ("Poison_Spore_Card",2), + ("Yoyo_Card",2), + ("Vitata_Card",2), + ("Zerom_Card",2), + ("Pirate_Skel_Card",2), + ("Phen_Card",2), + ("Mantis_Card",2), + ("Marine_Sphere_Card",2), + ("Kobold_Card",2), + ("Obeaune_Card",2), + ("Horong_Card",2), + ("Joker_Card",2), + ("Gargoyle_Card",2), + ("Galapago_Card",2), + ("Rice_Cake_Boy_Card",2), + ("Poison_Toad_Card",2), + ("Raydric_Archer_Card",2), + ("Wraith_Card",2), + ("Lude_Card",2), + ("Marin_Card",2), + ("Mimic_Card",2), + ("Violy_Card",2), + ("Bon_Gun_Card",2), + ("Blazzer_Card",2), + ("Sageworm_Card",2), + ("Stem_Worm_Card",2), + ("Spring_Rabbit_Card",2), + ("Sleeper_Card",2), + ("Shinobi_Card",2), + ("Wild_Ginseng_Card",2), + ("Owl_Duke_Card",2), + ("Owl_Baron_Card",2), + ("Alligator_Card",2), + ("Orc_Archer_Card",2), + ("Evil_Cloud_Hermit_Card",2), + ("Wind_Ghost_Card",2), + ("Li_Me_Mang_Ryang_Card",2), + ("Dancing_Dragon_Card",2), + ("Tengu_Card",2), + ("Greatest_General_Card",2), + ("Cookie_Card",2), + ("Quve_Card",2), + ("Hylozoist_Card",2), + ("See_Otter_Card",2), + ("Blood_Butterfly_Card",2), + ("Heater_Card",2), + ("Anopheles_Card",2), + ("Armaia_Card",2), + ("Whikebain_Card",2), + ("Erend_Card",2), + ("Gremlin_Card",2), + ("Beholder_Card",2), + ("Green_Iguana_Card",2), + ("Hydro_Card",2), + ("Dragon_Egg_Card",2), + ("Plasma_Card",2), + ("Retribution_Card",2), + ("Snowier_Card",2), + ("Siroma_Card",2), + ("Gazeti_Card",2), + ("Galion_Card",2), + ("Stapo_Card",2), + ("Imp_Card",2), + ("Ragged_Zombie_Card",2), + ("Hell_Poodle_Card",2) +) +*/ +/* currently unsupported or unknown ('Old_C_Album_Shoes') +Old_C_Album_Shoes: ( + ("Zombie_Card",2), + ("Thief_Bug_Male_Card",2), + ("Eggyra_Card",2), + ("Matyr_Card",2), + ("Sohee_Card",2), + ("Verit_Card",2), + ("Gajomart_Card",2), + ("Antique_Firelock_Card",2), + ("Gullinbursti_Card",2), + ("Raggler_Card",2), + ("Merman_Card",2), + ("Megalith_Card",2), + ("Mini_Demon_Card",2), + ("Miyabi_Ningyo_Card",2), + ("Skeleton_General_Card",2), + ("Cookie_XMAS_Card",2), + ("Iron_Fist_Card",2), + ("Alarm_Card",2), + ("Am_Mut_Card",2), + ("Ancient_Worm_Card",2), + ("Wild_Rose_Card",2), + ("Explosion_Card",2), + ("Zombie_Prisoner_Card",2), + ("Cat_O_Nine_Tail_Card",2), + ("Freezer_Card",2), + ("Acidus_Card",2), + ("Ferus__Card",2), + ("Tha_Odium_Card",2), + ("Ice_Titan_Card",2), + ("Zombie_Slaughter_Card",2), +//unknown/unsupported - "4467" +) +*/ +/* currently unsupported or unknown ('Old_C_Album_Shield') +Old_C_Album_Shield: ( + ("Andre_Egg_Card",2), + ("Ambernite_Card",2), + ("Horn_Card",2), + ("Thara_Frog_Card",2), + ("Orc_Warrior_Card",2), + ("Megalodon_Card",2), + ("BigFoot_Card",2), + ("Argos_Card",2), + ("Rafflesia_Card",2), + ("Munak_Card",2), + ("Petit__Card",2), + ("Medusa_Card",2), + ("Khalitzburg_Card",2), + ("Anubis_Card",2), + ("Mysteltainn_Card",2), + ("Live_Peach_Tree_Card",2), + ("Sting_Card",2), + ("Increase_Soil_Card",2), + ("Arclouse_Card",2), + ("Ancient_Mummy_Card",2), + ("Executioner_Card",2), + ("Alice_Card",2), + ("Tirfing_Card",2), + ("Zherlthsh_Card",2), + ("Tamruan_Card",2), + ("Parasite_Card",2), + ("Penomena_Card",2), + ("High_Orc_Card",2), + ("Teddy_Bear_Card",2), + ("Tha_Despero_Card",2), + ("Hodremlin_Card",2), + ("Seeker_Card",2), + ("Muscipular_Card",2), + ("Flame_Skull_Card",2), + ("Tatacho_Card",2), + ("Aqua_Elemental_Card",2), + ("Draco_Card",2), + ("Luciola_Vespa_Card",2), + ("Centipede_Card",2), + ("Cornus_Card",2), + ("Dark_Shadow_Card",2) +) +*/ +/* currently unsupported or unknown ('Old_C_Album_Garment') +Old_C_Album_Garment: ( + ("Dustiness_Card",2), + ("Orc_Zombie_Card",2), + ("Hode_Card",2), + ("Frilldora_Card",2), + ("Marse_Card",2), + ("Whisper_Card",2), + ("Myst_Card",2), + ("Jakk_Card",2), + ("Marionette_Card",2), + ("Isis_Card",2), + ("Baphomet__Card",2), + ("Daydric_Card",2), + ("Nine_Tail_Card",2), + ("Deviling_Card",2), + ("Dragon_Tail_Card",2), + ("Dragon_Fly_Card",2), + ("Vagabond_Wolf_Card",2), + ("Mastering_Card",2), + ("Wander_Man_Card",2), + ("Vocal_Card",2), + ("Eclipse_Card",2), + ("Choco_Card",2), + ("Kapha_Card",2), + ("Whisper_Boss_Card",2), + ("Toad_Card",2), + ("Punk_Card",2), + ("Harpy_Card",2), + ("Hyegun_Card",2), + ("Noxious_Card",2), + ("Kavac_Card",2), + ("Chung_E_Card",2), + ("Orc_Baby_Card",2), + ("Aliot_Card",2), + ("Roween_Card",2), + ("Salamander_Card",2), + ("Kasa_Card",2), + ("Magmaring_Card",2) +) +*/ +/* currently unsupported or unknown ('Old_C_Album_Weapon') +Old_C_Album_Weapon: ( + ("Drops_Card",2), + ("Poring__Card",2), + ("Lunatic_Card",2), + ("Pecopeco_Egg_Card",2), + ("Savage_Babe_Card",2), + ("Andre_Larva_Card",2), + ("Hornet_Card",2), + ("Farmiliar_Card",2), + ("Plankton_Card",2), + ("Skeleton_Card",2), + ("Thief_Bug_Female_Card",2), + ("Wolf_Card",2), + ("Mandragora_Card",2), + ("Hydra_Card",2), + ("Snake_Card",2), + ("Andre_Card",2), + ("Vadon_Card",2), + ("Marina_Card",2), + ("Metaller_Card",2), + ("Goblin_Card",2), + ("Anacondaq_Card",2), + ("Caramel_Card",2), + ("Kaho_Card",2), + ("Scorpion_Card",2), + ("Drainliar_Card",2), + ("Golem_Card",2), + ("Magnolia_Card",2), + ("Flora_Card",2), + ("Desert_Wolf_Card",2), + ("Orc_Skeleton_Card",2), + ("Soldier_Skeleton_Card",2), + ("Skel_Worker_Card",2), + ("Archer_Skeleton_Card",2), + ("Zenorc_Card",2), + ("Requiem_Card",2), + ("Mummy_Card",2), + ("Strouf_Card",2), + ("Hunter_Fly_Card",2), + ("Side_Winder_Card",2), + ("Petit_Card",2), + ("Deviace_Card",2), + ("Minorous_Card",2), + ("Scorpion_King_Card",2), + ("Knight_Of_Abyss_Card",2), + ("Crab_Card",2), + ("Goblin_Leader_Card",2), + ("Steam_Goblin_Card",2), + ("Goblin_Archer_Card",2), + ("Gryphon_Card",2), + ("Gig_Card",2), + ("Neraid_Card",2), + ("Dark_Priest_Card",2), + ("The_Paper_Card",2), + ("Dullahan_Card",2), + ("Driller_Card",2), + ("Diabolic_Card",2), + ("Lava_Golem_Card",2), + ("Rotar_Zairo_Card",2), + ("Civil_Servant_Card",2), + ("Mutant_Dragon_Card",2), + ("Bloody_Murderer_Card",2), + ("Stone_Shooter_Card",2), + ("Assulter_Card",2), + ("Aster_Card",2), + ("Elder_Card",2), + ("Orc_Lady_Card",2), + ("Injustice_Card",2), + ("Shellfish_Card",2), + ("Zombie_Master_Card",2), + ("Zipper_Bear_Card",2), + ("Chepet_Card",2), + ("Caterpillar_Card",2), + ("Kobold_Leader_Card",2), + ("Kobold_Archer_Card",2), + ("Cruiser_Card",2), + ("Kind_Of_Beetle_Card",2), + ("Tri_Joint_Card",2), + ("Panzer_Goblin_Card",2), + ("Fur_Seal_Card",2), + ("Fake_Angel_Card",2), + ("Mobster_Card",2), + ("Garm_Baby_Card",2), + ("Phendark_Card",2), + ("Pitman_Card",2), + ("Metaling_Card",2), + ("Hill_Wind_Card",2), + ("Rawrel_Card",2), + ("Eremes_Card",2), + ("Harword_Card",2), + ("Shecil_Card",2), + ("Ferus_Card",2), + ("Deathword_Card",2), + ("Breeze_Card",2), + ("Solace_Card",2), + ("Tha_Maero_Card",2), + ("Tha_Dolor_Card",2), + ("Skeggiold_Card",2), + ("Drosera_Card",2), + ("Sword_Guardian_Card",2), + ("Bow_Guardian_Card",2), + ("Necromancer_Card",2), + ("Centipede_Larva_Card",2), + ("Hilsrion_Card",2), + ("Bloody_Knight_Card",2), +//unknown/unsupported - "4463", +//unknown/unsupported - "4464", +//unknown/unsupported - "4465", +//unknown/unsupported - "4466", +//unknown/unsupported - "4469", +//unknown/unsupported - "4470", +//unknown/unsupported - "4471", +//unknown/unsupported - "4472", +//unknown/unsupported - "4473", +//unknown/unsupported - "4474", +//unknown/unsupported - "4475", +//unknown/unsupported - "4476", +//unknown/unsupported - "4477" +) +*/ +/* currently unsupported or unknown ('Splendid_Box2') +Splendid_Box2: ( +//unknown/unsupported - "2153", "Bone_Plate", - //not yet supported/not in pre-re "Ebone_Armor", +//unknown/unsupported - "15014", "Krasnaya", - //not yet supported/not in pre-re "Alca_Bringer", - //not yet supported/not in pre-re "Chrome_Twohand_Sword", +//unknown/unsupported - "1191", +//unknown/unsupported - "1196", "Krishna", "Cakram", - //not yet supported/not in pre-re "Durga", +//unknown/unsupported - "1287", "Vecer_Axe", "Giant_Axe", - //not yet supported/not in pre-re "Imperial_Spear", - //not yet supported/not in pre-re "Rafini_Staff", +//unknown/unsupported - "1433", +//unknown/unsupported - "1649", "Falken_Blitz", - //not yet supported/not in pre-re "Elven_Bow", - //not yet supported/not in pre-re "Green_Whistle", - //not yet supported/not in pre-re "Stem_Whip", +//unknown/unsupported - "1746", +//unknown/unsupported - "1930", +//unknown/unsupported - "1984", "Krieg", "Weihna", - //not yet supported/not in pre-re "Black_Wing", +//unknown/unsupported - "13061", "Ruber", "Erde", - "Red_Square_Bag" - //not yet supported/not in pre-re "Carga_Mace", - //not yet supported/not in pre-re "Red_Ether_Bag", - //not yet supported/not in pre-re "Mystic_Bow" + "Red_Square_Bag", +//unknown/unsupported - "16003", +//unknown/unsupported - "16010", +//unknown/unsupported - "18103", + "Hunting_Spear", + "Piece_Of_Angent_Skin", + "Diabolus_Robe", + "Diabolus_Armor", + "Diabolus_Boots", + "Diabolus_Manteau", + "Bison_Horn", + "Dragon_Vest", + "Dragon_Manteau", + "Elven_Ears", + "Tidal_Shoes", + "Black_Leather_Boots", + "Black_Leather_Boots_", + "Variant_Shoes", + "Twin_Edge_B", + "Twin_Edge_R" +) +*/ +/* currently unsupported or unknown ('Mysterious_Egg') +Mysterious_Egg: ( + ("Lucky_Egg2",3), + ("Lucky_Egg_C3",3), + ("Lucky_Egg_C4",3), + ("Lucky_Egg_C5",3), + ("Lucky_Egg_C6",3), + ("Lucky_Egg_C",2) +) +*/ +/* currently unsupported or unknown ('High_Weapon_Box') +High_Weapon_Box: ( + ("Mail_Breaker",5), + ("Weeder_Knife",5), + ("Mama's_Knife",5), + ("Assasin_Dagger",5), + ("Exercise",5), + ("Azoth",5), + ("Sucsamad",5), + ("Grimtooth_",5), + ("Princess_Knife",5), + ("Cursed_Dagger",5), + ("Counter_Dagger",5), + ("Holy_Dagger",5), + ("Krieg",5), + ("Weihna",5), +//unknown/unsupported - ("13061",5), + ("Blood_Tears",5), + ("Unholy_Touch",5), + ("Drill_Katar",5), + ("Krishna",5), + ("Cakram",5), + ("Cleaver",5), + ("Great_Axe",5), + ("Sabbath",5), + ("Bradium_Stonehammer",5), + ("Slaughter",5), + ("Tomahawk",5), + ("Vecer_Axe",5), + ("Ice_Falchon",7), + ("Fire_Brand",7), + ("Scissores_Sword",7), + ("Cutlas",7), + ("Solar_Sword",7), + ("Mysteltainn_",7), + ("Tale_Fing_",7), + ("Byeorrun_Gum",7), + ("Immaterial_Sword",7), + ("Star_Dust_Blade",7), + ("Muramasa",7), + ("Dragon_Slayer",7), + ("Schweizersabel",7), + ("Zweihander",7), + ("Katzbalger",7), + ("Zweihander_",7), + ("Muscle_Cutter",7), + ("Schweizersabel_",7), + ("Dragon_Slayer_",7), + ("Tae_Goo_Lyeon",7), + ("Bloody_Eater",7), + ("Veteran_Sword",7), + ("Ruber",5), + ("Krasnaya",5), + ("Gungnir",5), + ("Gelerdria",5), + ("Tjungkuletti",5), + ("Gungnir_",5), + ("Crescent_Scythe",5), + ("Bill_Guisarme",5), + ("Zephyrus",5), + ("Longinus's_Spear",5), + ("Brionac",5), + ("Hell_Fire",5), + ("Gae_Bolg",5), + ("Crescent_Scythe_",5), + ("Spectral_Spear",5), + ("Ahlspiess",5), + ("Spectral_Spear_",5), + ("Gae_Bolg_",5), + ("Zephyrus_",5), + ("Wizardy_Staff",5), + ("Staff_Of_Wing",5), + ("Walking_Stick",5), + ("Holy_Stick",5), + ("Dead_Tree_Cane",5), + ("Kronos",5), + ("Dea_Staff",5), + ("Divine_Cross",5), + ("Golden_Mace",5), + ("Long_Mace",5), + ("Quadrille",5), + ("Golden_Mace_",5), + ("Nemesis",5), + ("Erde",5), + ("Red_Square_Bag",5), +//unknown/unsupported - ("16010",5), + ("Book_Of_The_Apocalypse",5), + ("Girl's_Diary",5), + ("Legacy_Of_Dragon",5), + ("Hardback",5), + ("Bible_Of_Battlefield",5), + ("Kaiser_Knuckle",5), + ("Claw_Of_Garm",5), + ("Dragon_Wing",5), + ("Bow_Of_Minstrel",5), + ("Ixion_Wing",5), + ("Nepenthes_Bow",5), + ("Cursed_Lyre",5), + ("Falken_Blitz",5), +//unknown/unsupported - ("18103",5), + ("Electronic_Guitar",5), + ("Oriental_Lute",5), + ("Oriental_Lute_",5), + ("Harp_Of_Nepenthes",5), + ("Lariat",5), + ("Rapture_Rose",5), + ("Chemeti",5), + ("Bladed_Whip",5), + ("Electric_Eel",5), + ("Sea_Witch_Foot",5), + ("Queen's_Whip",5), + ("Carrot_Whip",5), + ("Queen's_Whip_",5), + ("Stem_Of_Nepenthes",5), + "Thorn_Staff", + "Eraser", + "Destruction_Rod", + "Infiltrator", + "Infiltrator_", + "Heart_Breaker", + "Hurricane_Fury", + "Right_Epsilon", + "Doom_Slayer", + ("Sword_Breaker",4), +//unknown/unsupported - ("13431",2), +//unknown/unsupported - ("1196",2), + ("Excalibur",2), + ("Masamune",2), + ("Nagan",2), + ("Executioner_",2), + ("Executioner__",2), + ("Altas_Weapon",2), + ("Giant_Axe",2), + ("Guillotine",2), + ("Brood_Axe",2), + ("Wild_Beast_Claw",2), + ("Inverse_Scale",2), + ("Bloody_Roar",2), + ("Cardo",2), +//unknown/unsupported - ("1433",2), + ("Skewer",2), + ("Battle_Hook",2), +//unknown/unsupported - ("1654",2), + "Doom_Slayer_", + "Hunting_Spear", + "Edge", + "Violet_Fear", + "Death_Guidance", + "House_Auger", + "Bazerald", +//unknown/unsupported - "13062", + "Grand_Cross", + "Grand_Cross_", + "Death_Note", + "Berserk", + "Berserk_", + "Berserk_Guitar", +//unknown/unsupported - "1985", + ("Forturn_Sword",2), + ("Combat_Knife",2), + ("Moonlight_Sword",2), + ("Spike",2), + ("Spike_",2), + ("Slash",2), +//unknown/unsupported - ("1830",2), + ("Bow_Of_Roguemaster",2), + ("Balistar",2), + ("Balistar_",2), + ("Bow_Of_Rudra",2), +//unknown/unsupported - ("1930",2), +//unknown/unsupported - ("1984",2), +//unknown/unsupported - "1290", +//unknown/unsupported - "1291", +//unknown/unsupported - "1392", +//unknown/unsupported - "1393", +//unknown/unsupported - "1435", +//unknown/unsupported - "1584", +//unknown/unsupported - "1659", +//unknown/unsupported - "13069", +//unknown/unsupported - "13070", +//unknown/unsupported - "16017", +//unknown/unsupported - "18109", +//unknown/unsupported - "18110", +//unknown/unsupported - "18111" +) +*/ +/* currently unsupported or unknown ('Ink_Ball') +Ink_Ball: ( + ("Jellopy",39), + ("Large_Jellopy",20), + ("Gift_Box",20), + ("Food_Package",10), + ("Treasure_Box",6), + ("Blue_Gemstone",10), + ("First_Aid_Kit",5), + "Old_Blue_Box", + "Old_Violet_Box", + ("Hometown_Gift",14), + "Accessory_Box", + "Wrapped_Mask", + "Old_Card_Album", + ("Crystal_Blue",20) +) +*/ +/* currently unsupported or unknown ('God_Material_Box') +God_Material_Box: ( + "Iron_Glove", + "Iron_Maiden", + "Mystery_Wheel", + "Silver_Fancy", + "Anger_Of_Valkurye", + "Feather_Of_Angel", + "Foot_Step_Of_Cat", + "Beard_Of_Women", + "Root_Of_Stone", + "Soul_Of_Fish", + "Saliva_Of_Bird", + "Tendon_Of_Bear", + "Symbol_Of_Sun", + "Breath_Of_Soul", + "Crystal_Of_Snow", + "Indication_Of_Tempest", + "Slilince_Wave", + "Rough_Billows", + "Air_Stream" +) +*/ +/* currently unsupported or unknown ('Sg_Weapon_Supply_Box') +Sg_Weapon_Supply_Box: ( +//unknown/unsupported - "1294", +//unknown/unsupported - "1395", +//unknown/unsupported - ("1492",8), +//unknown/unsupported - ("2016",8), +//unknown/unsupported - ("21001",8), +//unknown/unsupported - "21002", +//unknown/unsupported - ("18113",3), +//unknown/unsupported - ("18114",8), +//unknown/unsupported - ("1586",8), +//unknown/unsupported - ("1587",8), +//unknown/unsupported - ("1832",3), +//unknown/unsupported - ("13072",3), +//unknown/unsupported - ("16020",3), +//unknown/unsupported - ("16021",3), +//unknown/unsupported - ("1396",8), +//unknown/unsupported - ("1436",8), +//unknown/unsupported - ("12677",13), +//unknown/unsupported - ("12678",13), +//unknown/unsupported - ("1293",2) ) -//unknown carrier / unsupported -/*Candy_Holder: ( +*/ +/* currently unsupported or unknown ('Old_Card_Album_') +Old_Card_Album_: ( + ("Poring_Card",14), + ("Fabre_Card",17), + ("Pupa_Card",6), + ("Drops_Card",18), + ("Poring__Card",2), + ("Lunatic_Card",14), + ("Pecopeco_Egg_Card",4), + ("Picky_Card",17), + ("Chonchon_Card",17), + ("Wilow_Card",17), + ("Picky__Card",17), + ("Thief_Bug_Egg_Card",19), + ("Andre_Egg_Card",12), + ("Roda_Frog_Card",5), + ("Condor_Card",12), + ("Thief_Bug_Card",12), + ("Savage_Babe_Card",5), + ("Hornet_Card",10), + ("Farmiliar_Card",10), + ("Rocker_Card",10), + ("Spore_Card",10), + ("Desert_Wolf_Babe_Card",5), + ("Plankton_Card",5), + ("Skeleton_Card",5), + ("Thief_Bug_Female_Card",9), + ("Kukre_Card",3), + ("Tarou_Card",9), + ("Wolf_Card",9), + ("Mandragora_Card",9), + ("Pecopeco_Card",3), + ("Ambernite_Card",6), + ("Poporing_Card",6), + ("Worm_Tail_Card",6), + ("Hydra_Card",3), + ("Muka_Card",3), + ("Snake_Card",3), + ("Zombie_Card",3), + ("Stainer_Card",3), + ("Creamy_Card",3), + ("Coco_Card",3), + ("Steel_Chonchon_Card",3), + ("Andre_Card",3), + ("Smokie_Card",3), + ("Horn_Card",3), + ("Martin_Card",3), + "Ghostring_Card", + ("Poison_Spore_Card",3), + ("Vadon_Card",3), + ("Thief_Bug_Male_Card",3), + ("Yoyo_Card",3), + ("Elder_Wilow_Card",3), + "Vitata_Card", + "Angeling_Card", + ("Marina_Card",3), + ("Dustiness_Card",3), + ("Metaller_Card",2), + ("Thara_Frog_Card",2), + ("Goblin_Card",2), + ("Cornutus_Card",2), + ("Anacondaq_Card",2), + ("Caramel_Card",2), + ("Zerom_Card",2), + ("Kaho_Card",2), + ("Orc_Warrior_Card",2), + ("Megalodon_Card",2), + ("Scorpion_Card",2), + ("Drainliar_Card",2), + ("Eggyra_Card",2), + ("Orc_Zombie_Card",2), + ("Golem_Card",2), + ("Pirate_Skel_Card",2), + ("BigFoot_Card",2), + ("Argos_Card",2), + ("Magnolia_Card",2), + ("Phen_Card",2), + ("Savage_Card",2), + ("Mantis_Card",2), + ("Flora_Card",2), + ("Hode_Card",2), + "Desert_Wolf_Card", + "Rafflesia_Card", + "Marine_Sphere_Card", + "Orc_Skeleton_Card", + "Soldier_Skeleton_Card", + "Giearth_Card", + "Frilldora_Card", + "Sword_Fish_Card", + "Munak_Card", + "Kobold_Card", + "Skel_Worker_Card", + "Obeaune_Card", + "Archer_Skeleton_Card", + "Marse_Card", + "Zenorc_Card", + "Matyr_Card", + "Dokebi_Card", + "Pasana_Card", + "Sohee_Card", + "Sand_Man_Card", + "Whisper_Card", + "Horong_Card", + "Requiem_Card", + "Marc_Card", + "Mummy_Card", + "Verit_Card", + "Myst_Card", + "Jakk_Card", + "Ghoul_Card", + "Strouf_Card", + "Marduk_Card", + "Marionette_Card", + "Argiope_Card", + "Hunter_Fly_Card", + "Isis_Card", + "Side_Winder_Card", + "Petit_Card", + "Bathory_Card", + "Petit__Card", + "Deviruchi_Card", + "Deviace_Card", + "Nightmare_Card", + "Baphomet__Card", + "Daydric_Card", + "Khalitzburg_Card", + "Joker_Card", + "Evil_Druid_Card", + "Gargoyle_Card", + "Goat_Card", + "Gajomart_Card", + "Galapago_Card", + "Crab_Card", + "Rice_Cake_Boy_Card", + "Steam_Goblin_Card", + "Goblin_Archer_Card", + "Flying_Deleter_Card", + "Nine_Tail_Card", + "Antique_Firelock_Card", + "Grand_Peco_Card", + "Grizzly_Card", + "Gullinbursti_Card", + "Gig_Card", + "Nightmare_Terror_Card", + "Neraid_Card", + "Dark_Frame_Card", + "The_Paper_Card", + "Demon_Pungus_Card", + "Poison_Toad_Card", + "Dullahan_Card", + "Dryad_Card", + "Dragon_Tail_Card", + "Driller_Card", + "Disguise_Card", + "Diabolic_Card", + "Lava_Golem_Card", + "Rideword_Card", + "Raggler_Card", + "Raydric_Archer_Card", + "Leib_Olmai_Card", + "Wraith_Dead_Card", + "Wraith_Card", + "Loli_Ruri_Card", + "Rotar_Zairo_Card", + "Lude_Card", + "Rybio_Card", + "Leaf_Cat_Card", + "Marin_Card", + "Merman_Card", + "Megalith_Card", + "Majoruros_Card", + "Civil_Servant_Card", + "Mini_Demon_Card", + "Mimic_Card", + "Mystcase_Card", + "Miyabi_Ningyo_Card", + "Violy_Card", + "Wander_Man_Card", + "Bon_Gun_Card", + "Brilight_Card", + "Bloody_Murderer_Card", + "Blazzer_Card", + "Sasquatch_Card", + "Live_Peach_Tree_Card", + "Succubus_Card", + "Sageworm_Card", + "Solider_Card", + "Skeleton_General_Card", + "Skel_Prisoner_Card", + "Stalactic_Golem_Card", + "Stem_Worm_Card", + "Stone_Shooter_Card", + "Sting_Card", + "Spring_Rabbit_Card", + "Sleeper_Card", + "C_Tower_Manager_Card", + "Shinobi_Card", + "Increase_Soil_Card", + "Wild_Ginseng_Card", + "Baby_Leopard_Card", + "Anolian_Card", + "Cookie_XMAS_Card", + "Owl_Duke_Card", + "Owl_Baron_Card", + "Iron_Fist_Card", + "Arclouse_Card", + "Apocalips_Card", + "Antonio_Card", + "Alarm_Card", + "Am_Mut_Card", + "Assulter_Card", + "Aster_Card", + "Ancient_Mummy_Card", + "Ancient_Worm_Card", + "Elder_Card", + "Alligator_Card", + "Alice_Card", + "Orc_Lady_Card", + "Orc_Archer_Card", + "Wild_Rose_Card", + "Wicked_Nymph_Card", + "Wooden_Golem_Card", + "Wootan_Shooter_Card", + "Wootan_Fighter_Card", + "Evil_Cloud_Hermit_Card", + "Wind_Ghost_Card", + "Li_Me_Mang_Ryang_Card", + "Explosion_Card", + "Injustice_Card", + "Incubus_Card", + "Giant_Spider_Card", + "Giant_Honet_Card", + "Dancing_Dragon_Card", + "Shellfish_Card", + "Zombie_Master_Card", + "Zombie_Prisoner_Card", + "Zherlthsh_Card", + "Gibbet_Card", + "Deleter_Card", + "Geographer_Card", + "Zipper_Bear_Card", + "Tengu_Card", + "Greatest_General_Card", + "Chepet_Card", + "Choco_Card", + "Karakasa_Card", + "Kapha_Card", + "Carat_Card", + "Caterpillar_Card", + "Cat_O_Nine_Tail_Card", + "Kobold_Archer_Card", + "Cookie_Card", + "Quve_Card", + "Kraben_Card", + "Cramp_Card", + "Cruiser_Card", + "Cremy_Fear_Card", + "Clock_Card", + "Chimera_Card", + "Killer_Mantis_Card", + "Tamruan_Card", + "Kind_Of_Beetle_Card", + "Tri_Joint_Card", + "Parasite_Card", + "Panzer_Goblin_Card", + "Permeter_Card", + "Fur_Seal_Card", + "Punk_Card", + "Penomena_Card", + "Pest_Card", + "Fake_Angel_Card", + "Freezer_Card", + "Hylozoist_Card", + "High_Orc_Card", + "Garm_Baby_Card", + "Harpy_Card", + "See_Otter_Card", + "Blood_Butterfly_Card", + "Hyegun_Card", + "Phendark_Card", + "Heater_Card", + "Waste_Stove_Card", + ("Venomous_Card",3), + "Noxious_Card", + ("Pitman_Card",3), + "Ungoliant_Card", + "Porcellio_Card", + "Obsidian_Card", + "Mineral_Card", + "Teddy_Bear_Card", + "Metaling_Card", + "Mole_Card", + ("Anopheles_Card",3), + ("Hill_Wind_Card",3), + "Ygnizem_Card", + ("Armaia_Card",3), + "Whikebain_Card", + "Erend_Card", + ("Rawrel_Card",3), + "Kavac_Card", + "Removal_Card", + "Gemini_Card", + ("Gremlin_Card",3), + "Beholder_Card", + "Seyren_Card", + ("Eremes_Card",3), + "Harword_Card", + "Katrinn_Card", + "Shecil_Card", + "Venatu_Card", + "Dimik_Card", + "Archdam_Card", + "Chung_E_Card", + "Orc_Baby_Card", + ("Green_Iguana_Card",3), + "Acidus_Card", + "Acidus__Card", + ("Ferus_Card",3), + "Ferus__Card", + "Novus__Card", + ("Novus_Card",3), + "Hydro_Card", + ("Dragon_Egg_Card",3), + "Ancient_Mimic_Card", + ("Deathword_Card",3), + "Plasma_Card", + "Breeze_Card", + ("Retribution_Card",3), + "Observation_Card", + "Shelter_Card", + "Solace_Card", + "Tha_Maero_Card", + "Tha_Odium_Card", + "Tha_Despero_Card", + "Aliza_Card", + "Alicel_Card", + "Aliot_Card", + "Skogul_Card", + "Frus_Card", + "Agav_Card", + "Echio_Card", + "Vanberk_Card", + "Isilla_Card", + "Hodremlin_Card", + "Seeker_Card", + ("Snowier_Card",2), + "Siroma_Card", + "Ice_Titan_Card", + "Gazeti_Card", + "Muscipular_Card", + ("Drosera_Card",2), + "Roween_Card", + "Galion_Card", + ("Stapo_Card",3), + "Byorgue_Card", + "Sword_Guardian_Card", + "Bow_Guardian_Card", + "Salamander_Card", + "Kasa_Card", + ("Magmaring_Card",2), + "Imp_Card", + "Knocker_Card", + "Zombie_Slaughter_Card", + ("Ragged_Zombie_Card",2), + ("Hell_Poodle_Card",2), + ("Banshee_Card",2), + "Flame_Skull_Card", + "Necromancer_Card" +) +*/ +/* currently unsupported or unknown ('High_Weapon_Box_') +High_Weapon_Box_: ( + ("Mail_Breaker",5), + ("Weeder_Knife",5), + ("Mama's_Knife",5), + ("Assasin_Dagger",5), + ("Exercise",5), + ("Azoth",5), + ("Sucsamad",5), + ("Grimtooth_",5), + ("Princess_Knife",5), + ("Cursed_Dagger",5), + ("Counter_Dagger",5), + ("Holy_Dagger",5), + ("Krieg",5), + ("Weihna",5), +//unknown/unsupported - ("13061",5), + ("Blood_Tears",5), + ("Unholy_Touch",5), + ("Drill_Katar",5), + ("Krishna",5), + ("Cakram",5), + ("Cleaver",5), + ("Great_Axe",5), + ("Sabbath",5), + ("Bradium_Stonehammer",5), + ("Slaughter",5), + ("Tomahawk",5), + ("Vecer_Axe",5), + ("Ice_Falchon",7), + ("Fire_Brand",7), + ("Scissores_Sword",7), + ("Cutlas",7), + ("Solar_Sword",7), + ("Mysteltainn_",7), + ("Tale_Fing_",7), + ("Byeorrun_Gum",7), + ("Immaterial_Sword",7), + ("Star_Dust_Blade",7), + ("Muramasa",7), + ("Dragon_Slayer",7), + ("Schweizersabel",7), + ("Zweihander",7), + ("Katzbalger",7), + ("Zweihander_",7), + ("Muscle_Cutter",7), + ("Schweizersabel_",7), + ("Dragon_Slayer_",7), + ("Tae_Goo_Lyeon",7), + ("Bloody_Eater",7), + ("Veteran_Sword",7), + ("Ruber",5), + ("Krasnaya",5), + ("Gungnir",5), + ("Gelerdria",5), + ("Tjungkuletti",5), + ("Gungnir_",5), + ("Crescent_Scythe",5), + ("Bill_Guisarme",5), + ("Zephyrus",5), + ("Longinus's_Spear",5), + ("Brionac",5), + ("Hell_Fire",5), + ("Gae_Bolg",5), + ("Crescent_Scythe_",5), + ("Spectral_Spear",5), + ("Ahlspiess",5), + ("Spectral_Spear_",5), + ("Gae_Bolg_",5), + ("Zephyrus_",5), + ("Wizardy_Staff",5), + ("Staff_Of_Wing",5), + ("Walking_Stick",5), + ("Holy_Stick",5), + ("Dead_Tree_Cane",5), + ("Kronos",5), + ("Dea_Staff",5), + ("Divine_Cross",5), + ("Golden_Mace",5), + ("Long_Mace",5), + ("Quadrille",5), + ("Golden_Mace_",5), + ("Nemesis",5), + ("Erde",5), + ("Red_Square_Bag",5), +//unknown/unsupported - ("16010",5), + ("Book_Of_The_Apocalypse",5), + ("Girl's_Diary",5), + ("Legacy_Of_Dragon",5), + ("Hardback",5), + ("Bible_Of_Battlefield",5), + ("Kaiser_Knuckle",5), + ("Claw_Of_Garm",5), + ("Dragon_Wing",5), + ("Bow_Of_Minstrel",5), + ("Ixion_Wing",5), + ("Nepenthes_Bow",5), + ("Cursed_Lyre",5), + ("Falken_Blitz",5), +//unknown/unsupported - ("18103",5), + ("Electronic_Guitar",5), + ("Oriental_Lute",5), + ("Oriental_Lute_",5), + ("Harp_Of_Nepenthes",5), + ("Lariat",5), + ("Rapture_Rose",5), + ("Chemeti",5), + ("Bladed_Whip",5), + ("Electric_Eel",5), + ("Sea_Witch_Foot",5), + ("Queen's_Whip",5), + ("Carrot_Whip",5), + ("Queen's_Whip_",5), + ("Stem_Of_Nepenthes",5), + "Thorn_Staff", + "Eraser", + "Destruction_Rod", + "Infiltrator", + "Infiltrator_", + "Heart_Breaker", + "Hurricane_Fury", + "Right_Epsilon", + "Doom_Slayer", + ("Sword_Breaker",4), +//unknown/unsupported - ("13431",2), +//unknown/unsupported - ("1196",2), + ("Excalibur",2), + ("Masamune",2), + ("Nagan",2), + ("Executioner_",2), + ("Executioner__",2), + ("Altas_Weapon",2), + ("Giant_Axe",2), + ("Guillotine",2), + ("Brood_Axe",2), + ("Wild_Beast_Claw",2), + ("Inverse_Scale",2), + ("Bloody_Roar",2), + ("Cardo",2), +//unknown/unsupported - ("1433",2), + ("Skewer",2), + ("Battle_Hook",2), +//unknown/unsupported - ("1654",2), + "Doom_Slayer_", + "Hunting_Spear", + "Edge", + "Violet_Fear", + "Death_Guidance", + "House_Auger", + "Bazerald", +//unknown/unsupported - "13062", + "Grand_Cross", + "Grand_Cross_", + "Death_Note", + "Berserk", + "Berserk_", + "Berserk_Guitar", +//unknown/unsupported - "1985", + ("Forturn_Sword",2), + ("Combat_Knife",2), + ("Moonlight_Sword",2), + ("Spike",2), + ("Spike_",2), + ("Slash",2), +//unknown/unsupported - ("1830",2), + ("Bow_Of_Roguemaster",2), + ("Balistar",2), + ("Balistar_",2), + ("Bow_Of_Rudra",2), +//unknown/unsupported - ("1930",2), +//unknown/unsupported - ("1984",2), +//unknown/unsupported - "1290", +//unknown/unsupported - "1291", +//unknown/unsupported - "1392", +//unknown/unsupported - "1393", +//unknown/unsupported - "1435", +//unknown/unsupported - "1584", +//unknown/unsupported - "1659", +//unknown/unsupported - "13069", +//unknown/unsupported - "13070", +//unknown/unsupported - "16017", +//unknown/unsupported - "18109", +//unknown/unsupported - "18110", +//unknown/unsupported - "18111" +) +*/ +Holy_Egg_2: ( + ("Oridecon",3), + ("Elunium",10), + ("White_Slim_Potion",30), + ("Blue_Potion",30), + ("Yggdrasilberry",3), + ("Seed_Of_Yggdrasil",2), + ("Leaf_Of_Yggdrasil",15), + ("Old_Card_Album",5), + "Drooping_Bunny" +) +/* currently unsupported or unknown ('Candy_Holder') +Candy_Holder: ( ("Honey",9), ("Candy",20), ("Well_Baked_Cookie",15), @@ -3382,6 +4696,66 @@ Splendid_Box: ( "Old_Violet_Box", "Contracts_In_Shadow", ("Niflheim_Ticket",10), - ("Pumpkin_Cake",5), +//unknown/unsupported - ("11550",5), ("Pumpkin_Pie",5) -)*/ \ No newline at end of file +) +*/ +Lotto_Box01: ( + "Lotto02", + "Lotto03", + "Lotto04", + "Lotto05", + "Lotto06", + "Lotto07", + "Lotto08", + "Lotto09" +) +Lotto_Box02: ( + "Lotto11", + "Lotto12", + "Lotto13", + "Lotto14", + "Lotto15", + "Lotto16", + "Lotto17", + "Lotto18" +) +Lotto_Box03: ( + "Lotto20", + "Lotto21", + "Lotto22", + "Lotto23", + "Lotto24", + "Lotto25", + "Lotto26", + "Lotto27" +) +Lotto_Box04: ( + "Lotto29", + "Lotto30", + "Lotto31", + "Lotto32", + "Lotto33", + "Lotto34", + "Lotto35", + "Lotto36" +) +Lotto_Box05: ( + "Lotto38", + "Lotto39", + "Lotto40", + "Lotto41", + "Lotto42", + "Lotto43", + "Lotto44", + "Lotto45" +) +/* currently unsupported or unknown ('Lucky_Bag') +Lucky_Bag: ( + ("Fire_Cracker",7), + ("Korea_Rice_Cake",6), + ("Handsei",2), +//unknown/unsupported - ("7647",3), +//unknown/unsupported - "7649" +) +*/ \ No newline at end of file diff --git a/db/re/item_group.conf b/db/re/item_group.conf index e392ae2b6..a58b88e91 100644 --- a/db/re/item_group.conf +++ b/db/re/item_group.conf @@ -19,7 +19,7 @@ */ Old_Card_Album: ( - ("Poring_Card",8), + ("Poring_Card",9), ("Fabre_Card",10), ("Pupa_Card",6), ("Drops_Card",11), @@ -140,7 +140,6 @@ Old_Card_Album: ( "Baphomet__Card", "Daydric_Card", "Khalitzburg_Card", - "Joker_Card", "Evil_Druid_Card", "Gargoyle_Card", "Goat_Card", @@ -191,6 +190,7 @@ Old_Card_Album: ( "Mystcase_Card", "Miyabi_Ningyo_Card", "Violy_Card", + "Wander_Man_Card", "Bon_Gun_Card", "Brilight_Card", "Bloody_Murderer_Card", @@ -293,6 +293,7 @@ Old_Card_Album: ( "Hyegun_Card", "Phendark_Card", "Heater_Card", + "Antonio_Card", "Agav_Card", "Echio_Card", "Vanberk_Card", @@ -324,12 +325,6 @@ Old_Card_Album: ( "Necromancer_Card" ) Gift_Box: ( - ("Oridecon_Stone",4), - ("Elunium_Stone",2), - ("Oridecon",2), - "Elunium", - "Emperium", - "Steel", "Star_Crumb", "Flame_Heart", "Mistic_Frozen", @@ -387,24 +382,20 @@ Gift_Box: ( "Red_Potion", "Orange_Potion", "Yellow_Potion", + "White_Potion", + "Blue_Potion", "Green_Potion", + "Royal_Jelly", "Candy", "Candy_Striper", "Pet_Food", "Well_Baked_Cookie", "Piece_Of_Cake", - "Old_Blue_Box", "Old_Violet_Box", ("Gift_Box",19), "Girl's_Diary" ) Gift_Box_1: ( - ("Oridecon_Stone",4), - ("Elunium_Stone",2), - ("Oridecon",2), - "Elunium", - "Emperium", - "Steel", "Star_Crumb", "Flame_Heart", "Mistic_Frozen", @@ -462,24 +453,20 @@ Gift_Box_1: ( "Red_Potion", "Orange_Potion", "Yellow_Potion", + "White_Potion", + "Blue_Potion", "Green_Potion", + "Royal_Jelly", "Candy", "Candy_Striper", "Pet_Food", "Well_Baked_Cookie", "Piece_Of_Cake", - "Old_Blue_Box", "Old_Violet_Box", ("Gift_Box",19), "Girl's_Diary" ) Gift_Box_2: ( - ("Oridecon_Stone",4), - ("Elunium_Stone",2), - ("Oridecon",2), - "Elunium", - "Emperium", - "Steel", "Star_Crumb", "Flame_Heart", "Mistic_Frozen", @@ -537,24 +524,20 @@ Gift_Box_2: ( "Red_Potion", "Orange_Potion", "Yellow_Potion", + "White_Potion", + "Blue_Potion", "Green_Potion", + "Royal_Jelly", "Candy", "Candy_Striper", "Pet_Food", "Well_Baked_Cookie", "Piece_Of_Cake", - "Old_Blue_Box", "Old_Violet_Box", ("Gift_Box",19), "Girl's_Diary" ) Gift_Box_3: ( - ("Oridecon_Stone",4), - ("Elunium_Stone",2), - ("Oridecon",2), - "Elunium", - "Emperium", - "Steel", "Star_Crumb", "Flame_Heart", "Mistic_Frozen", @@ -612,24 +595,20 @@ Gift_Box_3: ( "Red_Potion", "Orange_Potion", "Yellow_Potion", + "White_Potion", + "Blue_Potion", "Green_Potion", + "Royal_Jelly", "Candy", "Candy_Striper", "Pet_Food", "Well_Baked_Cookie", "Piece_Of_Cake", - "Old_Blue_Box", "Old_Violet_Box", ("Gift_Box",19), "Girl's_Diary" ) Gift_Box_4: ( - ("Oridecon_Stone",4), - ("Elunium_Stone",2), - ("Oridecon",2), - "Elunium", - "Emperium", - "Steel", "Star_Crumb", "Flame_Heart", "Mistic_Frozen", @@ -687,13 +666,15 @@ Gift_Box_4: ( "Red_Potion", "Orange_Potion", "Yellow_Potion", + "White_Potion", + "Blue_Potion", "Green_Potion", + "Royal_Jelly", "Candy", "Candy_Striper", "Pet_Food", "Well_Baked_Cookie", "Piece_Of_Cake", - "Old_Blue_Box", "Old_Violet_Box", ("Gift_Box",19), "Girl's_Diary" @@ -742,7 +723,6 @@ Old_Blue_Box: ( ("Thief_Clothes",3), ("Thief_Clothes_",3), ("Ninja_Suit",3), - ("Wedding_Dress",3), ("G_Strings",3), ("Novice_Breast",3), ("Full_Plate_Armor",3), @@ -999,6 +979,7 @@ Old_Blue_Box: ( ("Snowy_Horn",3), ("Mini_Propeller",3), ("Mini_Glasses",3), + ("Prontera_Army_Cap",3), ("Pierrot_Nose",3), ("Gangster_Patch",3), ("Ganster_Mask",3), @@ -1024,7 +1005,6 @@ Old_Blue_Box: ( ("Viking_Helm",3), ("Joker_Jester",3), ("Machoman_Glasses",3), - ("Puppy_Love",3), ("Safety_Helmet",3), ("Indian_Hair_Piece",3), ("Antenna",3), @@ -1074,7 +1054,7 @@ Old_Blue_Box: ( ("Illusion_Flower",12), ("Shoot",12), ("Flower",12), - ("Emperium",12), + ("Empty_Bottle",12), ("Yellow_Gemstone",12), ("Red_Gemstone",12), ("Blue_Gemstone",12), @@ -1115,8 +1095,6 @@ Old_Blue_Box: ( ("Grasshopper_Doll",12), ("Monkey_Doll",12), ("Raccoondog_Doll",12), - ("Oridecon_Stone",12), - ("Elunium_Stone",12), ("Danggie",12), ("Tree_Root",12), ("Reptile_Tongue",12), @@ -1184,7 +1162,6 @@ Old_Blue_Box: ( ("Turtle_Shell",12), ("Voucher_Of_Orcish_Hero",12), ("Gold",12), - ("Alchol",12), ("Detrimindexta",12), ("Karvodailnirol",12), ("Counteragent",12), @@ -1197,8 +1174,6 @@ Old_Blue_Box: ( ("Violet_Dyestuffs",12), ("White_Dyestuffs",12), ("Black_Dyestuffs",12), - ("Oridecon",12), - ("Elunium",12), ("Anvil",12), ("Oridecon_Anvil",12), ("Golden_Anvil",12), @@ -1243,7 +1218,6 @@ Old_Blue_Box: ( ("Porcupine_Spike",12), ("Wild_Boar's_Mane",12), ("Tiger's_Skin",12), - ("Tiger_Footskin",12), ("Limb_Of_Mantis",12), ("Blossom_Of_Maneater",12), ("Root_Of_Maneater",12), @@ -1393,7 +1367,6 @@ Old_Blue_Box: ( ("Mystery_Iron_Bit",12), ("Great_Wing",12), ("Taegeuk_Plate",12), - ("Tuxedo",12), ("Leopard_Skin",12), ("Leopard_Talon",12), ("Packing_Ribbon",12), @@ -1468,7 +1441,9 @@ Old_Blue_Box: ( ("Red_Potion",12), ("Orange_Potion",12), ("Yellow_Potion",12), - ("Green_Potion",11), + ("White_Potion",12), + ("Blue_Potion",12), + ("Green_Potion",12), ("Red_Herb",12), ("Yellow_Herb",12), ("White_Herb",12), @@ -1487,6 +1462,7 @@ Old_Blue_Box: ( ("Fruit_Of_Mastela",12), ("Holy_Water",12), ("Panacea",12), + ("Royal_Jelly",12), ("Monster's_Feed",12), ("Candy",12), ("Candy_Striper",12), @@ -1511,8 +1487,9 @@ Old_Blue_Box: ( ("Rice_Cake",12), ("Chocolate",12), ("White_Chocolate",12), - "Wing_Of_Butterfly", - ("Old_Blue_Box",1173), + ("Wing_Of_Fly",12), + ("Wing_Of_Butterfly",12), + ("Branch_Of_Dead_Tree",512), ("Anodyne",12), ("Aloebera",12), ("Yggdrasilberry",12), @@ -1568,6 +1545,7 @@ Old_Blue_Box: ( "Angelic_Chain", "Satanic_Chain", "Sharp_Gear", + "Ghost_Bandana", "Ring_", "Earring_", "Necklace_", @@ -1674,14 +1652,14 @@ Old_Blue_Box: ( "Pot", "Burnt_Parts", "Pocket_Watch", - ("Ice_Heart",21), - ("Ice_Scale",22), - ("Bloody_Rune",22), - ("Rotten_Meat",22), - ("Sticky_Poison",22), + ("Ice_Heart",15), + ("Ice_Scale",15), + ("Bloody_Rune",15), + ("Rotten_Meat",15), + ("Sticky_Poison",15), "Suspicious_Hat", "White_Mask", - ("Old_White_Cloth",33), + ("Old_White_Cloth",34), ("Clattering_Skull",32), ("Broken_Farming_Utensil",34), "Orleans_Server", @@ -1750,7 +1728,6 @@ Old_Violet_Box: ( ("Silver_Robe_",7), ("Thief_Clothes_",7), ("Ninja_Suit",7), - ("Wedding_Dress",7), ("G_Strings",7), ("Novice_Breast",7), ("Novice_Plate",7), @@ -1926,6 +1903,7 @@ Old_Violet_Box: ( ("Snowy_Horn",7), ("Mini_Propeller",7), ("Mini_Glasses",7), + ("Prontera_Army_Cap",7), ("Pierrot_Nose",7), ("Gangster_Patch",7), ("Ganster_Mask",7), @@ -1951,7 +1929,6 @@ Old_Violet_Box: ( ("Viking_Helm",7), ("Joker_Jester",7), ("Machoman_Glasses",7), - ("Puppy_Love",7), ("Safety_Helmet",7), ("Indian_Hair_Piece",7), ("Antenna",7), @@ -2001,7 +1978,7 @@ Old_Violet_Box: ( ("Illusion_Flower",14), ("Shoot",14), ("Flower",14), - ("Emperium",14), + ("Empty_Bottle",14), ("Yellow_Gemstone",14), ("Red_Gemstone",14), ("Blue_Gemstone",14), @@ -2042,8 +2019,6 @@ Old_Violet_Box: ( ("Grasshopper_Doll",14), ("Monkey_Doll",14), ("Raccoondog_Doll",14), - ("Oridecon_Stone",14), - ("Elunium_Stone",14), ("Danggie",14), ("Tree_Root",14), ("Reptile_Tongue",14), @@ -2111,7 +2086,6 @@ Old_Violet_Box: ( ("Turtle_Shell",14), ("Voucher_Of_Orcish_Hero",14), ("Gold",14), - ("Alchol",14), ("Detrimindexta",14), ("Karvodailnirol",14), ("Counteragent",14), @@ -2124,9 +2098,7 @@ Old_Violet_Box: ( ("Violet_Dyestuffs",14), ("White_Dyestuffs",14), ("Black_Dyestuffs",14), - ("Oridecon",14), - ("Elunium",14), - ("Anvil",14), + ("Anvil",13), ("Oridecon_Anvil",14), ("Golden_Anvil",14), ("Emperium_Anvil",14), @@ -2170,7 +2142,6 @@ Old_Violet_Box: ( ("Porcupine_Spike",14), ("Wild_Boar's_Mane",14), ("Tiger's_Skin",14), - ("Tiger_Footskin",14), ("Limb_Of_Mantis",14), ("Blossom_Of_Maneater",14), ("Root_Of_Maneater",14), @@ -2320,7 +2291,6 @@ Old_Violet_Box: ( ("Mystery_Iron_Bit",14), ("Great_Wing",14), ("Taegeuk_Plate",14), - ("Tuxedo",14), ("Leopard_Skin",14), ("Leopard_Talon",14), ("Packing_Ribbon",14), @@ -2395,6 +2365,8 @@ Old_Violet_Box: ( ("Red_Potion",14), ("Orange_Potion",14), ("Yellow_Potion",14), + ("White_Potion",14), + ("Blue_Potion",14), ("Green_Potion",14), ("Red_Herb",14), ("Yellow_Herb",14), @@ -2414,6 +2386,7 @@ Old_Violet_Box: ( ("Fruit_Of_Mastela",14), ("Holy_Water",14), ("Panacea",14), + ("Royal_Jelly",14), ("Monster's_Feed",14), ("Candy",14), ("Candy_Striper",14), @@ -2438,7 +2411,9 @@ Old_Violet_Box: ( ("Rice_Cake",14), ("Chocolate",14), ("White_Chocolate",14), - ("Old_Blue_Box",614), + ("Wing_Of_Fly",14), + ("Wing_Of_Butterfly",14), + ("Branch_Of_Dead_Tree",214), ("Anodyne",14), ("Aloebera",14), ("Yggdrasilberry",14), @@ -2490,12 +2465,11 @@ Old_Violet_Box: ( ("Poison_Bottle",14), ("Gold_Pill",14), ("Guard_",6), - "Tiara", - "Crown", "Coronet", "Angelic_Chain", "Satanic_Chain", "Sharp_Gear", + "Ghost_Bandana", "Elven_Ears", "Holy_Robe", "Mage_Coat", @@ -2512,8 +2486,6 @@ Old_Violet_Box: ( "Pair_Of_Red_Ribbon", "Loard_Circlet", "Bone_Helm", - "Corsair", - "Assassin_Mask", "Horn_Of_Succubus", "Inccubus_Horn", "Spinx_Helm", @@ -2619,7 +2591,7 @@ Old_Violet_Box: ( "Suspicious_Hat", "White_Mask", ("Old_Violet_Box",103), - ("Old_White_Cloth",16), + ("Old_White_Cloth",17), ("Clattering_Skull",16), ("Broken_Farming_Utensil",17), "Inverse_Scale", @@ -2747,13 +2719,13 @@ Accessory_Box: ( "Rosary_", "Brooch_", "Earring_", + ("Vesper_Core01",2), ("Vesper_Core02",2), ("Vesper_Core03",2), ("Vesper_Core04",2), "Thimble_Of_Archer_", ("Red_Silk_Seal",2), "Orleans_Glove", - "Vesper_Core01", "Spiritual_Ring", "Shinobi's_Sash", "Hyper_Changer", @@ -2776,7 +2748,8 @@ Wrapped_Mask: ( ("Goblin_Mask_03",10), ("Goblin_Mask_04",10), ("Mr_Smile",9), - "Zherlthsh_Mask" + "Zherlthsh_Mask", + ("Hahoe_Mask",2) ) Bundle_Of_Magic_Scroll: ( "Earth_Scroll_1_5", @@ -2836,6 +2809,7 @@ Food_Package: ( "Leaflet_Of_Hinal", "Leaflet_Of_Aloe", "Fruit_Of_Mastela", + "Royal_Jelly", "Milk", "Lemon", "Long_Rice_Cake", @@ -2846,6 +2820,8 @@ First_Aid_Kit: ( ("Orange_Potion",5), ("Yellow_Potion",5), ("Slow_Down_Potion",5), + ("White_Potion",5), + ("Blue_Potion",5), ("Green_Potion",5), ("Red_Slim_Potion",5), ("Yellow_Slim_Potion",5), @@ -2876,14 +2852,19 @@ Cookie_Bag: ( "Chocolate_Drink", ("Candy",4) ) +Red_Box_: ( + ("Magic_Eyes",9), + ("Hibiscus",10), + ("Charming_Ribbon",10) +) Egg_Boy: ( ("Grape",299), ("Rice_Ball",522), ("Prohibition_Red_Candle",20), ("Realgar_Wine",100), ("Exorcize_Herb",50), - ("Crown",2), - "Inccubus_Horn" + ("Ghost_Bandana",5), + ("Inccubus_Horn",2) ) Egg_Girl: ( ("Grape",299), @@ -2891,18 +2872,20 @@ Egg_Girl: ( ("Sway_Apron",20), ("Realgar_Wine",100), ("Exorcize_Herb",50), - ("Tiara",2), ("Hair_Protector",5), - "Horn_Of_Succubus" + ("Horn_Of_Succubus",2) ) Giftbox_China: ( "Orange_Potion", "Yellow_Potion", + "White_Potion", + "Blue_Potion", "Green_Potion", "Honey", "Leaflet_Of_Hinal", ("Leaflet_Of_Aloe",2), "Panacea", + "Royal_Jelly", "Candy", "Candy_Striper", ("Old_Blue_Box",40), @@ -2924,7 +2907,6 @@ Giftbox_China: ( "Singing_Plant", "Ment", "Illusion_Flower", - "Emperium", "Yellow_Gemstone", "Red_Gemstone", "Blue_Gemstone", @@ -2960,8 +2942,6 @@ Giftbox_China: ( "Grasshopper_Doll", "Monkey_Doll", "Raccoondog_Doll", - "Oridecon_Stone", - "Elunium_Stone", "Jellopy", "Garlet", "Scell", @@ -2970,7 +2950,6 @@ Giftbox_China: ( "Mementos", "Voucher_Of_Orcish_Hero", "Gold", - "Alchol", "Detrimindexta", "Karvodailnirol", "Counteragent", @@ -2983,8 +2962,6 @@ Giftbox_China: ( "Violet_Dyestuffs", "White_Dyestuffs", "Black_Dyestuffs", - "Oridecon", - "Elunium", "Anvil", "Oridecon_Anvil", "Golden_Anvil", @@ -3135,7 +3112,6 @@ Giftbox_China: ( "Silver_Robe_", "Thief_Clothes_", "Ninja_Suit", - "Wedding_Dress", "G_Strings", "Sandals_", "Shoes_", @@ -3159,48 +3135,51 @@ Giftbox_China: ( "Silver_Ring", "Flower_Ring", "Diamond_Ring", - "Puppy_Love", "Safety_Helmet", "Indian_Hair_Piece", "Fin_Helm", - "Egg_Shell" -) -Old_Bleu_Box: ( - ("Cold_Scroll_1_5",2), - ("Fire_Scroll_1_5",2), - ("Wind_Scroll_1_5",2), - ("Fire_Scroll_2_5",2), - ("Fire_Scroll_3_5",2), - ("Holy_Scroll_1_5",2), - ("Cold_Scroll_2_5",2), - ("Gift_Box",2), - ("Milk",2), - ("Well_Baked_Cookie",2) + ("Egg_Shell",2) ) -Holy_Egg_2: ( - ("Oridecon",3), - ("Elunium",10), - ("White_Slim_Potion",30), - ("Blue_Potion",30), - ("Yggdrasilberry",3), - ("Seed_Of_Yggdrasil",2), - ("Leaf_Of_Yggdrasil",15), - ("Old_Card_Album",5), - "Drooping_Bunny" +Red_Box: ( + ("Twin_Ribbon",9), + ("Helm_Of_Darkness",11), + "Puppy_Hat", + ("Geographer_Band",11), + ("Laurel_Wreath",11), + ("Bird_Nest_Hat",11), + ("Alice_Doll",11), + ("Hibiscus",11), + ("Magic_Eyes",11), + ("Charming_Ribbon",11), + "Chinese_Crown", + ("Crescent_Helm",11), + ("Kabuki_Mask",12), + "Cat_Hat" ) -Red_Box_: ( - ("Magic_Eyes",9), - ("Hibiscus",10), - ("Charming_Ribbon",10) +Green_Box: ( + ("Str_Dish10",99), + ("Int_Dish10",100), + ("Vit_Dish10",100), + ("Agi_Dish10",100), + ("Dex_Dish10",100), + ("Luk_Dish10",100), + ("Yggdrasilberry",99), + ("Seed_Of_Yggdrasil",100), + ("Fire_Cracker",100), + ("Chocolate_Drink",100), + "Puppy_Hat" ) -Hometown_Gift: ( - "Hearty_Rice_Cake", - "Salty_Rice_Cake", - "Lucky_Rice_Cake", - "Sesame_Pastry", - "Honey_Pastry", - "Rainbow_Cake", - "Korea_Rice_Cake" +Old_Bleu_Box: ( + "Cold_Scroll_1_5", + "Fire_Scroll_1_5", + "Wind_Scroll_1_5", + "Fire_Scroll_2_5", + "Fire_Scroll_3_5", + "Holy_Scroll_1_5", + "Cold_Scroll_2_5", + "Gift_Box", + "Milk", + "Well_Baked_Cookie" ) Old_Yellow_Box: ( "Cookie_Hat", @@ -3213,6 +3192,8 @@ Old_Gift_Box: ( ("Fallen_Leaves_",45) ) Magic_Card_Album: ( + "Angeling_Card", + "Gryphon_Card", "Dark_Illusion_Card", "Deviling_Card", ("Dragon_Fly_Card",10), @@ -3248,30 +3229,21 @@ Masquerade_Ball_Box: ( ("Marvelous_Wig_",10), ("Ati_Atihan_Hat_",10) ) -Louise_Costume_Box: ( - ("Red_Bag",16), - ("Cool_Summer_Outfit",2) -) -Xmas_Gift: ( - ("Fire_Cracker_Love",6), - ("Gift_Box",66), - ("Old_Bleu_Box",36), - ("Set_Of_Taiming_Item",6), - ("Wrapped_Mask",6), - ("Old_Blue_Box",24), - ("Bundle_Of_Magic_Scroll",12), - ("Buche_De_Noel",24), - ("Speed_Up_Potion",12), - ("Slow_Down_Potion",12), - ("Cookie_Bag",12), - ("Red_Bag",6), - ("First_Aid_Kit",12), - ("Crystal_Jewel__",12), - ("HandMade_Chocolate",18), - ("HandMade_Chocolate_",18), - ("Chocolate_Drink",18), - ("Santa's_Hat_",12), - ("Fire_Cracker_Xmas",4) +Easter_Scroll: ( + ("Silver_Knife_Of_Chaste",109), + ("Heart_Of_Her",110), + ("No_Recipient",110), + ("Old_Broom",110), + ("Armlet_Of_Obedience",110), + ("Shining_Stone",110), + ("Contracts_In_Shadow",110), + ("Book_Of_Devil",110), + ("Pet_Incubator",205), + "Munak_Turban", + "Bongun_Hat", + "Munak_Turban_", + "Bongun_Hat_", + "Ghost_Bandana" ) Tresure_Box_WoE: ( ("Wind_Arrow_Container",23), @@ -3301,6 +3273,31 @@ Masquerade_Ball_Box2: ( ("Cap_Of_Blindness",10), "Dress_Hat" ) +Louise_Costume_Box: ( + ("Red_Bag",16), + ("Cool_Summer_Outfit",2) +) +Xmas_Gift: ( + ("Fire_Cracker_Love",6), + ("Gift_Box",66), + ("Old_Bleu_Box",36), + ("Set_Of_Taiming_Item",6), + ("Wrapped_Mask",6), + ("Old_Blue_Box",24), + ("Bundle_Of_Magic_Scroll",12), + ("Buche_De_Noel",24), + ("Speed_Up_Potion",12), + ("Slow_Down_Potion",12), + ("Cookie_Bag",12), + ("Red_Bag",6), + ("First_Aid_Kit",12), + ("Crystal_Jewel__",12), + ("HandMade_Chocolate",18), + ("HandMade_Chocolate_",18), + ("Chocolate_Drink",18), + ("Santa's_Hat_",12), + ("Fire_Cracker_Xmas",4) +) Pierre_Treasurebox: ( ("Scarlet_Dyestuffs",3), ("Lemon_Dyestuffs",3), @@ -3342,6 +3339,465 @@ Cherish_Box_Ori: ( ("Ragnarok_Limited_Ed",3) ) Splendid_Box: ( + ("Imperial_Guard",2), + ("Bone_Plate",2), + ("Ebone_Armor",2), + ("Krasnaya",2), + ("Alca_Bringer",2), + ("Chrome_Twohand_Sword",2), + ("Krishna",2), + ("Cakram",2), + ("Durga",2), + ("Vecer_Axe",2), + ("Giant_Axe",2), + ("Imperial_Spear",2), + ("Rafini_Staff",2), + ("Falken_Blitz",2), + ("Elven_Bow",2), + ("Green_Whistle",2), + ("Stem_Whip",2), + ("Krieg",2), + ("Weihna",2), + ("Black_Wing",2), + ("Ruber",2), + ("Erde",2), + ("Red_Square_Bag",2), + ("Carga_Mace",2), + ("Red_Ether_Bag",2), + ("Mystic_Bow",2) +) +Old_C_Album_Armor: ( + ("Pupa_Card",2), + ("Picky_Card",2), + ("Picky__Card",2), + ("Roda_Frog_Card",2), + ("Thief_Bug_Card",2), + ("Rocker_Card",2), + ("Desert_Wolf_Babe_Card",2), + ("Pecopeco_Card",2), + ("Steel_Chonchon_Card",2), + ("Cornutus_Card",2), + ("Savage_Card",2), + ("Sword_Fish_Card",2), + ("Dokebi_Card",2), + ("Pasana_Card",2), + ("Sand_Man_Card",2), + ("Marc_Card",2), + ("Argiope_Card",2), + ("Bathory_Card",2), + ("Evil_Druid_Card",2), + ("Goat_Card",2), + ("Flying_Deleter_Card",2), + ("Grizzly_Card",2), + ("Nightmare_Terror_Card",2), + ("Dark_Frame_Card",2), + ("Demon_Pungus_Card",2), + ("Disguise_Card",2), + ("Wraith_Dead_Card",2), + ("Loli_Ruri_Card",2), + ("Rybio_Card",2), + ("Majoruros_Card",2), + ("Brilight_Card",2), + ("Sasquatch_Card",2), + ("Succubus_Card",2), + ("Solider_Card",2), + ("Skel_Prisoner_Card",2), + ("Baby_Leopard_Card",2), + ("Anolian_Card",2), + ("Apocalips_Card",2), + ("Antonio_Card",2), + ("Wooden_Golem_Card",2), + ("Giant_Spider_Card",2), + ("Deleter_Card",2), + ("Geographer_Card",2), + ("Karakasa_Card",2), + ("Kraben_Card",2), + ("Cremy_Fear_Card",2), + ("Clock_Card",2), + ("Chimera_Card",2), + ("Killer_Mantis_Card",2), + ("Pest_Card",2), + ("Waste_Stove_Card",2), + ("Venomous_Card",2), + ("Porcellio_Card",2), + ("Obsidian_Card",2), + ("Mineral_Card",2), + ("Ygnizem_Card",2), + ("Removal_Card",2), + ("Venatu_Card",2), + ("Dimik_Card",2), + ("Archdam_Card",2), + ("Novus__Card",2), + ("Novus_Card",2), + ("Ancient_Mimic_Card",2), + ("Observation_Card",2), + ("Shelter_Card",2), + ("Aliza_Card",2), + ("Alicel_Card",2), + ("Skogul_Card",2), + ("Frus_Card",2), + ("Agav_Card",2), + ("Echio_Card",2), + ("Byorgue_Card",2), + ("Banshee_Master_Card",2), + "Hardrock_Mammoth_Card" +) +Old_C_Album_Helm: ( + ("Stainer_Card",2), + ("Coco_Card",2), + ("Martin_Card",2), + ("Elder_Wilow_Card",2), + ("Giearth_Card",2), + ("Ghoul_Card",2), + ("Marduk_Card",2), + ("Deviruchi_Card",2), + ("Nightmare_Card",2), + ("Grand_Peco_Card",2), + ("Dark_Illusion_Card",2), + ("Dryad_Card",2), + ("Rideword_Card",2), + ("Leib_Olmai_Card",2), + ("Leaf_Cat_Card",2), + ("Mystcase_Card",2), + ("Stalactic_Golem_Card",2), + ("C_Tower_Manager_Card",2), + ("Archangeling_Card",2), + ("Wicked_Nymph_Card",2), + ("Wootan_Shooter_Card",2), + ("Wootan_Fighter_Card",2), + ("Incubus_Card",2), + ("Giant_Honet_Card",2), + ("Gibbet_Card",2), + ("Carat_Card",2), + ("Cramp_Card",2), + ("Permeter_Card",2), + ("Ungoliant_Card",2), + ("Mole_Card",2), + ("Gemini_Card",2), + ("Seyren_Card",2), + ("Magaleta_Card",2), + ("Katrinn_Card",2), + ("Acidus__Card",2), + ("Vanberk_Card",2), + ("Isilla_Card",2), + ("Knocker_Card",2), + ("Banshee_Card",2), + "Duneyrr_Card", + "Rata_Card", + "Rhyncho_Card", + "Phylla_Card", + "Dark_Pinguicula_Card" +) +Old_C_Album_Acc: ( + ("Kukre_Card",2), + ("Tarou_Card",2), + ("Poporing_Card",2), + ("Worm_Tail_Card",2), + ("Muka_Card",2), + ("Creamy_Card",2), + ("Smokie_Card",2), + ("Poison_Spore_Card",2), + ("Yoyo_Card",2), + ("Vitata_Card",2), + ("Zerom_Card",2), + ("Pirate_Skel_Card",2), + ("Phen_Card",2), + ("Mantis_Card",2), + ("Marine_Sphere_Card",2), + ("Kobold_Card",2), + ("Obeaune_Card",2), + ("Horong_Card",2), + ("Joker_Card",2), + ("Gargoyle_Card",2), + ("Galapago_Card",2), + ("Rice_Cake_Boy_Card",2), + ("Poison_Toad_Card",2), + ("Raydric_Archer_Card",2), + ("Wraith_Card",2), + ("Lude_Card",2), + ("Marin_Card",2), + ("Mimic_Card",2), + ("Violy_Card",2), + ("Bon_Gun_Card",2), + ("Blazzer_Card",2), + ("Sageworm_Card",2), + ("Stem_Worm_Card",2), + ("Spring_Rabbit_Card",2), + ("Sleeper_Card",2), + ("Shinobi_Card",2), + ("Wild_Ginseng_Card",2), + ("Owl_Duke_Card",2), + ("Owl_Baron_Card",2), + ("Alligator_Card",2), + ("Orc_Archer_Card",2), + ("Evil_Cloud_Hermit_Card",2), + ("Wind_Ghost_Card",2), + ("Li_Me_Mang_Ryang_Card",2), + ("Dancing_Dragon_Card",2), + ("Tengu_Card",2), + ("Greatest_General_Card",2), + ("Cookie_Card",2), + ("Quve_Card",2), + ("Hylozoist_Card",2), + ("See_Otter_Card",2), + ("Blood_Butterfly_Card",2), + ("Heater_Card",2), + ("Anopheles_Card",2), + ("Armaia_Card",2), + ("Whikebain_Card",2), + ("Erend_Card",2), + ("Gremlin_Card",2), + ("Beholder_Card",2), + ("Green_Iguana_Card",2), + ("Hydro_Card",2), + ("Dragon_Egg_Card",2), + ("Plasma_Card",2), + ("Retribution_Card",2), + ("Snowier_Card",2), + ("Siroma_Card",2), + ("Gazeti_Card",2), + ("Galion_Card",2), + ("Stapo_Card",2), + ("Imp_Card",2), + ("Ragged_Zombie_Card",2), + ("Hell_Poodle_Card",2) +) +Old_C_Album_Shoes: ( + ("Zombie_Card",2), + ("Thief_Bug_Male_Card",2), + ("Eggyra_Card",2), + ("Matyr_Card",2), + ("Sohee_Card",2), + ("Verit_Card",2), + ("Gajomart_Card",2), + ("Antique_Firelock_Card",2), + ("Gullinbursti_Card",2), + ("Raggler_Card",2), + ("Merman_Card",2), + ("Megalith_Card",2), + ("Mini_Demon_Card",2), + ("Miyabi_Ningyo_Card",2), + ("Skeleton_General_Card",2), + ("Cookie_XMAS_Card",2), + ("Iron_Fist_Card",2), + ("Alarm_Card",2), + ("Am_Mut_Card",2), + ("Ancient_Worm_Card",2), + ("Wild_Rose_Card",2), + ("Explosion_Card",2), + ("Zombie_Prisoner_Card",2), + ("Cat_O_Nine_Tail_Card",2), + ("Freezer_Card",2), + ("Acidus_Card",2), + ("Ferus__Card",2), + ("Tha_Odium_Card",2), + ("Ice_Titan_Card",2), + ("Zombie_Slaughter_Card",2), + "Heavy_Metaling_Card" +) +Old_C_Album_Shield: ( + ("Andre_Egg_Card",2), + ("Ambernite_Card",2), + ("Horn_Card",2), + ("Thara_Frog_Card",2), + ("Orc_Warrior_Card",2), + ("Megalodon_Card",2), + ("BigFoot_Card",2), + ("Argos_Card",2), + ("Rafflesia_Card",2), + ("Munak_Card",2), + ("Petit__Card",2), + ("Medusa_Card",2), + ("Khalitzburg_Card",2), + ("Anubis_Card",2), + ("Mysteltainn_Card",2), + ("Live_Peach_Tree_Card",2), + ("Sting_Card",2), + ("Increase_Soil_Card",2), + ("Arclouse_Card",2), + ("Ancient_Mummy_Card",2), + ("Executioner_Card",2), + ("Alice_Card",2), + ("Tirfing_Card",2), + ("Zherlthsh_Card",2), + ("Tamruan_Card",2), + ("Parasite_Card",2), + ("Penomena_Card",2), + ("High_Orc_Card",2), + ("Teddy_Bear_Card",2), + ("Tha_Despero_Card",2), + ("Hodremlin_Card",2), + ("Seeker_Card",2), + ("Muscipular_Card",2), + ("Flame_Skull_Card",2), + ("Tatacho_Card",2), + ("Aqua_Elemental_Card",2), + ("Draco_Card",2), + ("Luciola_Vespa_Card",2), + ("Centipede_Card",2), + ("Cornus_Card",2), + ("Dark_Shadow_Card",2) +) +Old_C_Album_Garment: ( + ("Dustiness_Card",2), + ("Orc_Zombie_Card",2), + ("Hode_Card",2), + ("Frilldora_Card",2), + ("Marse_Card",2), + ("Whisper_Card",2), + ("Myst_Card",2), + ("Jakk_Card",2), + ("Marionette_Card",2), + ("Isis_Card",2), + ("Baphomet__Card",2), + ("Daydric_Card",2), + ("Nine_Tail_Card",2), + ("Deviling_Card",2), + ("Dragon_Tail_Card",2), + ("Dragon_Fly_Card",2), + ("Vagabond_Wolf_Card",2), + ("Mastering_Card",2), + ("Wander_Man_Card",2), + ("Vocal_Card",2), + ("Eclipse_Card",2), + ("Choco_Card",2), + ("Kapha_Card",2), + ("Whisper_Boss_Card",2), + ("Toad_Card",2), + ("Punk_Card",2), + ("Harpy_Card",2), + ("Hyegun_Card",2), + ("Noxious_Card",2), + ("Kavac_Card",2), + ("Chung_E_Card",2), + ("Orc_Baby_Card",2), + ("Aliot_Card",2), + ("Roween_Card",2), + ("Salamander_Card",2), + ("Kasa_Card",2), + ("Magmaring_Card",2) +) +Old_C_Album_Weapon: ( + ("Drops_Card",2), + ("Poring__Card",2), + ("Lunatic_Card",2), + ("Pecopeco_Egg_Card",2), + ("Savage_Babe_Card",2), + ("Andre_Larva_Card",2), + ("Hornet_Card",2), + ("Farmiliar_Card",2), + ("Plankton_Card",2), + ("Skeleton_Card",2), + ("Thief_Bug_Female_Card",2), + ("Wolf_Card",2), + ("Mandragora_Card",2), + ("Hydra_Card",2), + ("Snake_Card",2), + ("Andre_Card",2), + ("Vadon_Card",2), + ("Marina_Card",2), + ("Metaller_Card",2), + ("Goblin_Card",2), + ("Anacondaq_Card",2), + ("Caramel_Card",2), + ("Kaho_Card",2), + ("Scorpion_Card",2), + ("Drainliar_Card",2), + ("Golem_Card",2), + ("Magnolia_Card",2), + ("Flora_Card",2), + ("Desert_Wolf_Card",2), + ("Orc_Skeleton_Card",2), + ("Soldier_Skeleton_Card",2), + ("Skel_Worker_Card",2), + ("Archer_Skeleton_Card",2), + ("Zenorc_Card",2), + ("Requiem_Card",2), + ("Mummy_Card",2), + ("Strouf_Card",2), + ("Hunter_Fly_Card",2), + ("Side_Winder_Card",2), + ("Petit_Card",2), + ("Deviace_Card",2), + ("Minorous_Card",2), + ("Scorpion_King_Card",2), + ("Knight_Of_Abyss_Card",2), + ("Crab_Card",2), + ("Goblin_Leader_Card",2), + ("Steam_Goblin_Card",2), + ("Goblin_Archer_Card",2), + ("Gryphon_Card",2), + ("Gig_Card",2), + ("Neraid_Card",2), + ("Dark_Priest_Card",2), + ("The_Paper_Card",2), + ("Dullahan_Card",2), + ("Driller_Card",2), + ("Diabolic_Card",2), + ("Lava_Golem_Card",2), + ("Rotar_Zairo_Card",2), + ("Civil_Servant_Card",2), + ("Mutant_Dragon_Card",2), + ("Bloody_Murderer_Card",2), + ("Stone_Shooter_Card",2), + ("Assulter_Card",2), + ("Aster_Card",2), + ("Elder_Card",2), + ("Orc_Lady_Card",2), + ("Injustice_Card",2), + ("Shellfish_Card",2), + ("Zombie_Master_Card",2), + ("Zipper_Bear_Card",2), + ("Chepet_Card",2), + ("Caterpillar_Card",2), + ("Kobold_Leader_Card",2), + ("Kobold_Archer_Card",2), + ("Cruiser_Card",2), + ("Kind_Of_Beetle_Card",2), + ("Tri_Joint_Card",2), + ("Panzer_Goblin_Card",2), + ("Fur_Seal_Card",2), + ("Fake_Angel_Card",2), + ("Mobster_Card",2), + ("Garm_Baby_Card",2), + ("Phendark_Card",2), + ("Pitman_Card",2), + ("Metaling_Card",2), + ("Hill_Wind_Card",2), + ("Rawrel_Card",2), + ("Eremes_Card",2), + ("Harword_Card",2), + ("Shecil_Card",2), + ("Ferus_Card",2), + ("Deathword_Card",2), + ("Breeze_Card",2), + ("Solace_Card",2), + ("Tha_Maero_Card",2), + ("Tha_Dolor_Card",2), + ("Skeggiold_Card",2), + ("Drosera_Card",2), + ("Sword_Guardian_Card",2), + ("Bow_Guardian_Card",2), + ("Necromancer_Card",2), + ("Centipede_Larva_Card",2), + ("Hilsrion_Card",2), + ("Bloody_Knight_Card",2), + "Tendrilrion_Card", + "Aunoe_Card", + "Fanat_Card", + "Beholder_Master_Card", + "Naga_Card", + "Nepenthes_Card", + "Draco_Egg_Card", + "Bradium_Golem_Card", + "Ancient_Tree_Card", + "Zakudam_Card", + "Cobalt_Mineral_Card", + "Pinguicula_Card", + "Hell_Apocalypse_Card" +) +/* currently unsupported or unknown ('Splendid_Box2') +Splendid_Box2: ( "Imperial_Guard", "Bone_Plate", "Ebone_Armor", @@ -3367,434 +3823,655 @@ Splendid_Box: ( "Red_Square_Bag", "Carga_Mace", "Red_Ether_Bag", - "Mystic_Bow" -) -Old_C_Album_Armor: ( - "Pupa_Card", - "Picky_Card", - "Picky__Card", - "Roda_Frog_Card", - "Thief_Bug_Card", - "Rocker_Card", - "Desert_Wolf_Babe_Card", - "Pecopeco_Card", - "Steel_Chonchon_Card", - "Cornutus_Card", - "Savage_Card", - "Sword_Fish_Card", - "Dokebi_Card", - "Pasana_Card", - "Sand_Man_Card", - "Marc_Card", - "Argiope_Card", - "Bathory_Card", - "Evil_Druid_Card", - "Goat_Card", - "Flying_Deleter_Card", - "Grizzly_Card", - "Nightmare_Terror_Card", - "Dark_Frame_Card", - "Demon_Pungus_Card", - "Disguise_Card", - "Wraith_Dead_Card", - "Loli_Ruri_Card", - "Rybio_Card", - "Majoruros_Card", - "Brilight_Card", - "Sasquatch_Card", - "Succubus_Card", - "Solider_Card", - "Skel_Prisoner_Card", - "Baby_Leopard_Card", - "Anolian_Card", - "Apocalips_Card", - "Wooden_Golem_Card", - "Giant_Spider_Card", - "Deleter_Card", - "Geographer_Card", - "Karakasa_Card", - "Kraben_Card", - "Cremy_Fear_Card", - "Clock_Card", - "Chimera_Card", - "Killer_Mantis_Card", - "Pest_Card", - "Waste_Stove_Card", - "Venomous_Card", - "Porcellio_Card", - "Obsidian_Card", - "Mineral_Card", - "Ygnizem_Card", - "Removal_Card", - "Venatu_Card", - "Dimik_Card", - "Archdam_Card", - "Novus__Card", - "Novus_Card", - "Ancient_Mimic_Card", - "Observation_Card", - "Shelter_Card", - "Aliza_Card", - "Alicel_Card", - "Skogul_Card", - "Frus_Card", - "Agav_Card", - "Echio_Card", - "Byorgue_Card", - "Banshee_Master_Card" + "Mystic_Bow", + "Hunting_Spear", + "Piece_Of_Angent_Skin", + "Diabolus_Robe", + "Diabolus_Armor", + "Diabolus_Boots", + "Diabolus_Manteau", + "Bison_Horn", + "Dragon_Vest", + "Dragon_Manteau", + "Elven_Ears", + "Tidal_Shoes", + "Black_Leather_Boots", + "Black_Leather_Boots_", + "Variant_Shoes", + "Twin_Edge_B", + "Twin_Edge_R" ) -Old_C_Album_Helm: ( - "Stainer_Card", - "Coco_Card", - "Martin_Card", - "Elder_Wilow_Card", - "Giearth_Card", - "Ghoul_Card", - "Marduk_Card", - "Deviruchi_Card", - "Nightmare_Card", - "Grand_Peco_Card", - "Dark_Illusion_Card", - "Dryad_Card", - "Rideword_Card", - "Leib_Olmai_Card", - "Leaf_Cat_Card", - "Mystcase_Card", - "Stalactic_Golem_Card", - "C_Tower_Manager_Card", - "Archangeling_Card", - "Wicked_Nymph_Card", - "Wootan_Shooter_Card", - "Wootan_Fighter_Card", - "Incubus_Card", - "Giant_Honet_Card", - "Gibbet_Card", - "Carat_Card", - "Cramp_Card", - "Permeter_Card", - "Ungoliant_Card", - "Mole_Card", - "Gemini_Card", - "Seyren_Card", - "Magaleta_Card", - "Katrinn_Card", - "Acidus__Card", - "Vanberk_Card", - "Isilla_Card", - "Knocker_Card", - "Banshee_Card" +*/ +/* currently unsupported or unknown ('Mysterious_Egg') +Mysterious_Egg: ( + ("Lucky_Egg2",3), + ("Lucky_Egg_C3",3), + ("Lucky_Egg_C4",3), + ("Lucky_Egg_C5",3), + ("Lucky_Egg_C6",3), + ("Lucky_Egg_C",2) ) -Old_C_Album_Acc: ( - "Kukre_Card", - "Tarou_Card", - "Poporing_Card", - "Worm_Tail_Card", - "Muka_Card", - "Smokie_Card", - "Poison_Spore_Card", - "Yoyo_Card", - "Vitata_Card", - "Zerom_Card", - "Pirate_Skel_Card", - "Phen_Card", - "Mantis_Card", - "Marine_Sphere_Card", - "Kobold_Card", - "Obeaune_Card", - "Horong_Card", - "Joker_Card", - "Gargoyle_Card", - "Galapago_Card", - "Rice_Cake_Boy_Card", - "Poison_Toad_Card", - "Raydric_Archer_Card", - "Wraith_Card", - "Lude_Card", - "Marin_Card", - "Mimic_Card", - "Violy_Card", - "Bon_Gun_Card", - "Blazzer_Card", - "Sageworm_Card", - "Stem_Worm_Card", - "Spring_Rabbit_Card", - "Sleeper_Card", - "Shinobi_Card", - "Wild_Ginseng_Card", - "Owl_Duke_Card", - "Owl_Baron_Card", - "Alligator_Card", - "Orc_Archer_Card", - "Evil_Cloud_Hermit_Card", - "Wind_Ghost_Card", - "Li_Me_Mang_Ryang_Card", - "Dancing_Dragon_Card", - "Tengu_Card", - "Greatest_General_Card", - "Cookie_Card", - "Quve_Card", - "Hylozoist_Card", - "See_Otter_Card", - "Blood_Butterfly_Card", - "Heater_Card", - "Anopheles_Card", - "Armaia_Card", - "Whikebain_Card", - "Erend_Card", - "Gremlin_Card", - "Beholder_Card", - "Green_Iguana_Card", - "Hydro_Card", - "Dragon_Egg_Card", - "Plasma_Card", - "Retribution_Card", - "Snowier_Card", - "Siroma_Card", - "Gazeti_Card", - "Galion_Card", - "Stapo_Card", - "Imp_Card", - "Ragged_Zombie_Card", - "Hell_Poodle_Card" +*/ +High_Weapon_Box: ( + ("Mail_Breaker",5), + ("Weeder_Knife",5), + ("Mama's_Knife",5), + ("Assasin_Dagger",5), + ("Exercise",5), + ("Azoth",5), + ("Sucsamad",5), + ("Grimtooth_",5), + ("Princess_Knife",5), + ("Cursed_Dagger",5), + ("Counter_Dagger",5), + ("Holy_Dagger",5), + ("Krieg",5), + ("Weihna",5), + ("Black_Wing",5), + ("Blood_Tears",5), + ("Unholy_Touch",5), + ("Drill_Katar",5), + ("Krishna",5), + ("Cakram",5), + ("Cleaver",5), + ("Great_Axe",5), + ("Sabbath",5), + ("Bradium_Stonehammer",5), + ("Slaughter",5), + ("Tomahawk",5), + ("Vecer_Axe",5), + ("Ice_Falchon",7), + ("Fire_Brand",7), + ("Scissores_Sword",7), + ("Cutlas",7), + ("Solar_Sword",7), + ("Mysteltainn_",7), + ("Tale_Fing_",7), + ("Byeorrun_Gum",7), + ("Immaterial_Sword",7), + ("Star_Dust_Blade",7), + ("Muramasa",7), + ("Dragon_Slayer",7), + ("Schweizersabel",7), + ("Zweihander",7), + ("Katzbalger",7), + ("Zweihander_",7), + ("Muscle_Cutter",7), + ("Schweizersabel_",7), + ("Dragon_Slayer_",7), + ("Tae_Goo_Lyeon",7), + ("Bloody_Eater",7), + ("Veteran_Sword",7), + ("Ruber",5), + ("Krasnaya",5), + ("Gungnir",5), + ("Gelerdria",5), + ("Tjungkuletti",5), + ("Gungnir_",5), + ("Crescent_Scythe",5), + ("Bill_Guisarme",5), + ("Zephyrus",5), + ("Longinus's_Spear",5), + ("Brionac",5), + ("Hell_Fire",5), + ("Gae_Bolg",5), + ("Crescent_Scythe_",5), + ("Spectral_Spear",5), + ("Ahlspiess",5), + ("Spectral_Spear_",5), + ("Gae_Bolg_",5), + ("Zephyrus_",5), + ("Wizardy_Staff",5), + ("Staff_Of_Wing",5), + ("Walking_Stick",5), + ("Holy_Stick",5), + ("Dead_Tree_Cane",5), + ("Kronos",5), + ("Dea_Staff",5), + ("Divine_Cross",5), + ("Golden_Mace",5), + ("Long_Mace",5), + ("Quadrille",5), + ("Golden_Mace_",5), + ("Nemesis",5), + ("Erde",5), + ("Red_Square_Bag",5), + ("Red_Ether_Bag",5), + ("Book_Of_The_Apocalypse",5), + ("Girl's_Diary",5), + ("Legacy_Of_Dragon",5), + ("Hardback",5), + ("Bible_Of_Battlefield",5), + ("Kaiser_Knuckle",5), + ("Claw_Of_Garm",5), + ("Dragon_Wing",5), + ("Bow_Of_Minstrel",5), + ("Ixion_Wing",5), + ("Nepenthes_Bow",5), + ("Cursed_Lyre",5), + ("Falken_Blitz",5), + ("Mystic_Bow",5), + ("Electronic_Guitar",5), + ("Oriental_Lute",5), + ("Oriental_Lute_",5), + ("Harp_Of_Nepenthes",5), + ("Lariat",5), + ("Rapture_Rose",5), + ("Chemeti",5), + ("Bladed_Whip",5), + ("Electric_Eel",5), + ("Sea_Witch_Foot",5), + ("Queen's_Whip",5), + ("Carrot_Whip",5), + ("Queen's_Whip_",5), + ("Stem_Of_Nepenthes",5), + "Thorn_Staff", + "Eraser", + "Destruction_Rod", + "Infiltrator", + "Infiltrator_", + "Heart_Breaker", + "Hurricane_Fury", + "Right_Epsilon", + "Doom_Slayer", + ("Sword_Breaker",4), + ("Chrome_Sword",2), + ("Chrome_Twohand_Sword",2), + ("Excalibur",2), + ("Masamune",2), + ("Nagan",2), + ("Executioner_",2), + ("Executioner__",2), + ("Altas_Weapon",2), + ("Giant_Axe",2), + ("Guillotine",2), + ("Brood_Axe",2), + ("Wild_Beast_Claw",2), + ("Inverse_Scale",2), + ("Bloody_Roar",2), + ("Cardo",2), + ("Imperial_Spear",2), + ("Skewer",2), + ("Battle_Hook",2), + ("Mental_Stick",2), + "Doom_Slayer_", + "Hunting_Spear", + "Edge", + "Violet_Fear", + "Death_Guidance", + "House_Auger", + "Bazerald", + "Ancient_Dagger", + "Grand_Cross", + "Grand_Cross_", + "Death_Note", + "Berserk", + "Berserk_", + "Berserk_Guitar", + "Rosebine", + ("Forturn_Sword",2), + ("Combat_Knife",2), + ("Moonlight_Sword",2), + ("Spike",2), + ("Spike_",2), + ("Slash",2), + ("Sura_Rampage",2), + ("Bow_Of_Roguemaster",2), + ("Balistar",2), + ("Balistar_",2), + ("Bow_Of_Rudra",2), + ("Green_Whistle",2), + ("Stem_Whip",2), + "Agent_Katar", + "Guillotine_Katar", + "Ignus_Steel", + "End_Sectora", + "Cannon_Spear", + "Cold_Magic_Book", + "Light_of_Recovery", + "As-nail", + "Scarlet-nail", + "Bloody_Cross", + "Thief_Crossbow", + "Giant_Crossbow", + "Creeper_Bow" ) -Old_C_Album_Shoes: ( - "Zombie_Card", - "Thief_Bug_Male_Card", - "Eggyra_Card", - "Matyr_Card", - "Sohee_Card", - "Verit_Card", - "Gajomart_Card", - "Antique_Firelock_Card", - "Gullinbursti_Card", - "Raggler_Card", - "Merman_Card", - "Megalith_Card", - "Mini_Demon_Card", - "Miyabi_Ningyo_Card", - "Skeleton_General_Card", - "Cookie_XMAS_Card", - "Iron_Fist_Card", - "Alarm_Card", - "Am_Mut_Card", - "Ancient_Worm_Card", - "Wild_Rose_Card", - "Explosion_Card", - "Zombie_Prisoner_Card", - "Cat_O_Nine_Tail_Card", - "Freezer_Card", - "Acidus_Card", - "Ferus__Card", - "Tha_Odium_Card", - "Ice_Titan_Card", - "Zombie_Slaughter_Card" +/* currently unsupported or unknown ('Ink_Ball') +Ink_Ball: ( + ("Jellopy",39), + ("Large_Jellopy",20), + ("Gift_Box",20), + ("Food_Package",10), + ("Treasure_Box",6), + ("Blue_Gemstone",10), + ("First_Aid_Kit",5), + "Old_Blue_Box", + "Old_Violet_Box", + ("Hometown_Gift",14), + "Accessory_Box", + "Wrapped_Mask", + "Old_Card_Album", + ("Crystal_Blue",20) ) -Old_C_Album_Shield: ( - "Andre_Egg_Card", - "Ambernite_Card", - "Horn_Card", - "Thara_Frog_Card", - "Orc_Warrior_Card", - "Megalodon_Card", - "BigFoot_Card", - "Argos_Card", - "Rafflesia_Card", - "Munak_Card", - "Petit__Card", - "Medusa_Card", - "Khalitzburg_Card", - "Anubis_Card", - "Mysteltainn_Card", - "Live_Peach_Tree_Card", - "Sting_Card", - "Increase_Soil_Card", - "Arclouse_Card", - "Ancient_Mummy_Card", - "Executioner_Card", - "Alice_Card", - "Tirfing_Card", - "Zherlthsh_Card", - "Tamruan_Card", - "Parasite_Card", - "Penomena_Card", - "High_Orc_Card", - "Teddy_Bear_Card", - "Tha_Despero_Card", - "Hodremlin_Card", - "Seeker_Card", - "Muscipular_Card", - "Flame_Skull_Card", - "Tatacho_Card", - "Aqua_Elemental_Card", - "Draco_Card", - "Luciola_Vespa_Card", - "Centipede_Card", - "Cornus_Card", - "Dark_Shadow_Card" +*/ +/* currently unsupported or unknown ('God_Material_Box') +God_Material_Box: ( + "Iron_Glove", + "Iron_Maiden", + "Mystery_Wheel", + "Silver_Fancy", + "Anger_Of_Valkurye", + "Feather_Of_Angel", + "Foot_Step_Of_Cat", + "Beard_Of_Women", + "Root_Of_Stone", + "Soul_Of_Fish", + "Saliva_Of_Bird", + "Tendon_Of_Bear", + "Symbol_Of_Sun", + "Breath_Of_Soul", + "Crystal_Of_Snow", + "Indication_Of_Tempest", + "Slilince_Wave", + "Rough_Billows", + "Air_Stream" ) -Old_C_Album_Weapon: ( - "Drops_Card", - "Poring__Card", - "Lunatic_Card", - "Pecopeco_Egg_Card", - "Savage_Babe_Card", - "Andre_Larva_Card", - "Hornet_Card", - "Farmiliar_Card", - "Plankton_Card", - "Skeleton_Card", - "Thief_Bug_Female_Card", - "Wolf_Card", - "Mandragora_Card", - "Hydra_Card", - "Snake_Card", - "Andre_Card", - "Vadon_Card", - "Marina_Card", - "Metaller_Card", - "Goblin_Card", - "Anacondaq_Card", - "Caramel_Card", - "Kaho_Card", - "Scorpion_Card", - "Drainliar_Card", - "Golem_Card", - "Magnolia_Card", - "Flora_Card", +*/ +/* currently unsupported or unknown ('Sg_Weapon_Supply_Box') +Sg_Weapon_Supply_Box: ( + "Velum_Scale", + "Velum_Buster", + ("Velum_Glaive",8), + ("Velum_Arcwand",8), + ("Velum_Claymore",8), + "Velum_Katzbalger", + ("Velum_Balista",3), + ("Velum_Crossbow",8), + ("Velum_Bible",8), + ("Velum_Great_Encyclopedia",8), + ("Velum_Claw",3), + ("Velum_Damascus",3), + ("Velum_Stunner",3), + ("Velum_Flail",3), + ("Velum_Guillotine",8), + ("Velum_Spear",8), +//unknown/unsupported - ("12677",13), +//unknown/unsupported - ("12678",13), + ("Velum_Jahmadar",2) +) +*/ +/* currently unsupported or unknown ('Old_Card_Album_') +Old_Card_Album_: ( + ("Poring_Card",14), + ("Fabre_Card",17), + ("Pupa_Card",6), + ("Drops_Card",18), + ("Poring__Card",2), + ("Lunatic_Card",14), + ("Pecopeco_Egg_Card",4), + ("Picky_Card",17), + ("Chonchon_Card",17), + ("Wilow_Card",17), + ("Picky__Card",17), + ("Thief_Bug_Egg_Card",19), + ("Andre_Egg_Card",12), + ("Roda_Frog_Card",5), + ("Condor_Card",12), + ("Thief_Bug_Card",12), + ("Savage_Babe_Card",5), + ("Hornet_Card",10), + ("Farmiliar_Card",10), + ("Rocker_Card",10), + ("Spore_Card",10), + ("Desert_Wolf_Babe_Card",5), + ("Plankton_Card",5), + ("Skeleton_Card",5), + ("Thief_Bug_Female_Card",9), + ("Kukre_Card",3), + ("Tarou_Card",9), + ("Wolf_Card",9), + ("Mandragora_Card",9), + ("Pecopeco_Card",3), + ("Ambernite_Card",6), + ("Poporing_Card",6), + ("Worm_Tail_Card",6), + ("Hydra_Card",3), + ("Muka_Card",3), + ("Snake_Card",3), + ("Zombie_Card",3), + ("Stainer_Card",3), + ("Creamy_Card",3), + ("Coco_Card",3), + ("Steel_Chonchon_Card",3), + ("Andre_Card",3), + ("Smokie_Card",3), + ("Horn_Card",3), + ("Martin_Card",3), + "Ghostring_Card", + ("Poison_Spore_Card",3), + ("Vadon_Card",3), + ("Thief_Bug_Male_Card",3), + ("Yoyo_Card",3), + ("Elder_Wilow_Card",3), + "Vitata_Card", + "Angeling_Card", + ("Marina_Card",3), + ("Dustiness_Card",3), + ("Metaller_Card",2), + ("Thara_Frog_Card",2), + ("Goblin_Card",2), + ("Cornutus_Card",2), + ("Anacondaq_Card",2), + ("Caramel_Card",2), + ("Zerom_Card",2), + ("Kaho_Card",2), + ("Orc_Warrior_Card",2), + ("Megalodon_Card",2), + ("Scorpion_Card",2), + ("Drainliar_Card",2), + ("Eggyra_Card",2), + ("Orc_Zombie_Card",2), + ("Golem_Card",2), + ("Pirate_Skel_Card",2), + ("BigFoot_Card",2), + ("Argos_Card",2), + ("Magnolia_Card",2), + ("Phen_Card",2), + ("Savage_Card",2), + ("Mantis_Card",2), + ("Flora_Card",2), + ("Hode_Card",2), "Desert_Wolf_Card", + "Rafflesia_Card", + "Marine_Sphere_Card", "Orc_Skeleton_Card", "Soldier_Skeleton_Card", + "Giearth_Card", + "Frilldora_Card", + "Sword_Fish_Card", + "Munak_Card", + "Kobold_Card", "Skel_Worker_Card", + "Obeaune_Card", "Archer_Skeleton_Card", + "Marse_Card", "Zenorc_Card", + "Matyr_Card", + "Dokebi_Card", + "Pasana_Card", + "Sohee_Card", + "Sand_Man_Card", + "Whisper_Card", + "Horong_Card", "Requiem_Card", + "Marc_Card", "Mummy_Card", + "Verit_Card", + "Myst_Card", + "Jakk_Card", + "Ghoul_Card", "Strouf_Card", + "Marduk_Card", + "Marionette_Card", + "Argiope_Card", "Hunter_Fly_Card", + "Isis_Card", "Side_Winder_Card", "Petit_Card", + "Bathory_Card", + "Petit__Card", + "Deviruchi_Card", "Deviace_Card", - "Minorous_Card", - "Scorpion_King_Card", - "Knight_Of_Abyss_Card", + "Nightmare_Card", + "Baphomet__Card", + "Daydric_Card", + "Khalitzburg_Card", + "Joker_Card", + "Evil_Druid_Card", + "Gargoyle_Card", + "Goat_Card", + "Gajomart_Card", + "Galapago_Card", "Crab_Card", - "Goblin_Leader_Card", + "Rice_Cake_Boy_Card", "Steam_Goblin_Card", "Goblin_Archer_Card", - "Gryphon_Card", + "Flying_Deleter_Card", + "Nine_Tail_Card", + "Antique_Firelock_Card", + "Grand_Peco_Card", + "Grizzly_Card", + "Gullinbursti_Card", "Gig_Card", + "Nightmare_Terror_Card", "Neraid_Card", - "Dark_Priest_Card", + "Dark_Frame_Card", "The_Paper_Card", + "Demon_Pungus_Card", + "Poison_Toad_Card", "Dullahan_Card", + "Dryad_Card", + "Dragon_Tail_Card", "Driller_Card", + "Disguise_Card", "Diabolic_Card", "Lava_Golem_Card", + "Rideword_Card", + "Raggler_Card", + "Raydric_Archer_Card", + "Leib_Olmai_Card", + "Wraith_Dead_Card", + "Wraith_Card", + "Loli_Ruri_Card", "Rotar_Zairo_Card", + "Lude_Card", + "Rybio_Card", + "Leaf_Cat_Card", + "Marin_Card", + "Merman_Card", + "Megalith_Card", + "Majoruros_Card", "Civil_Servant_Card", - "Mutant_Dragon_Card", + "Mini_Demon_Card", + "Mimic_Card", + "Mystcase_Card", + "Miyabi_Ningyo_Card", + "Violy_Card", + "Wander_Man_Card", + "Bon_Gun_Card", + "Brilight_Card", "Bloody_Murderer_Card", + "Blazzer_Card", + "Sasquatch_Card", + "Live_Peach_Tree_Card", + "Succubus_Card", + "Sageworm_Card", + "Solider_Card", + "Skeleton_General_Card", + "Skel_Prisoner_Card", + "Stalactic_Golem_Card", + "Stem_Worm_Card", "Stone_Shooter_Card", + "Sting_Card", + "Spring_Rabbit_Card", + "Sleeper_Card", + "C_Tower_Manager_Card", + "Shinobi_Card", + "Increase_Soil_Card", + "Wild_Ginseng_Card", + "Baby_Leopard_Card", + "Anolian_Card", + "Cookie_XMAS_Card", + "Owl_Duke_Card", + "Owl_Baron_Card", + "Iron_Fist_Card", + "Arclouse_Card", + "Apocalips_Card", + "Antonio_Card", + "Alarm_Card", + "Am_Mut_Card", "Assulter_Card", "Aster_Card", + "Ancient_Mummy_Card", + "Ancient_Worm_Card", "Elder_Card", + "Alligator_Card", + "Alice_Card", "Orc_Lady_Card", + "Orc_Archer_Card", + "Wild_Rose_Card", + "Wicked_Nymph_Card", + "Wooden_Golem_Card", + "Wootan_Shooter_Card", + "Wootan_Fighter_Card", + "Evil_Cloud_Hermit_Card", + "Wind_Ghost_Card", + "Li_Me_Mang_Ryang_Card", + "Explosion_Card", "Injustice_Card", + "Incubus_Card", + "Giant_Spider_Card", + "Giant_Honet_Card", + "Dancing_Dragon_Card", "Shellfish_Card", "Zombie_Master_Card", + "Zombie_Prisoner_Card", + "Zherlthsh_Card", + "Gibbet_Card", + "Deleter_Card", + "Geographer_Card", "Zipper_Bear_Card", + "Tengu_Card", + "Greatest_General_Card", "Chepet_Card", + "Choco_Card", + "Karakasa_Card", + "Kapha_Card", + "Carat_Card", "Caterpillar_Card", - "Kobold_Leader_Card", + "Cat_O_Nine_Tail_Card", "Kobold_Archer_Card", + "Cookie_Card", + "Quve_Card", + "Kraben_Card", + "Cramp_Card", "Cruiser_Card", + "Cremy_Fear_Card", + "Clock_Card", + "Chimera_Card", + "Killer_Mantis_Card", + "Tamruan_Card", "Kind_Of_Beetle_Card", "Tri_Joint_Card", + "Parasite_Card", "Panzer_Goblin_Card", + "Permeter_Card", "Fur_Seal_Card", + "Punk_Card", + "Penomena_Card", + "Pest_Card", "Fake_Angel_Card", - "Mobster_Card", + "Freezer_Card", + "Hylozoist_Card", + "High_Orc_Card", "Garm_Baby_Card", + "Harpy_Card", + "See_Otter_Card", + "Blood_Butterfly_Card", + "Hyegun_Card", "Phendark_Card", - "Pitman_Card", + "Heater_Card", + "Waste_Stove_Card", + ("Venomous_Card",3), + "Noxious_Card", + ("Pitman_Card",3), + "Ungoliant_Card", + "Porcellio_Card", + "Obsidian_Card", + "Mineral_Card", + "Teddy_Bear_Card", "Metaling_Card", - "Hill_Wind_Card", - "Rawrel_Card", - "Eremes_Card", + "Mole_Card", + ("Anopheles_Card",3), + ("Hill_Wind_Card",3), + "Ygnizem_Card", + ("Armaia_Card",3), + "Whikebain_Card", + "Erend_Card", + ("Rawrel_Card",3), + "Kavac_Card", + "Removal_Card", + "Gemini_Card", + ("Gremlin_Card",3), + "Beholder_Card", + "Seyren_Card", + ("Eremes_Card",3), "Harword_Card", + "Katrinn_Card", "Shecil_Card", - "Ferus_Card", - "Deathword_Card", + "Venatu_Card", + "Dimik_Card", + "Archdam_Card", + "Chung_E_Card", + "Orc_Baby_Card", + ("Green_Iguana_Card",3), + "Acidus_Card", + "Acidus__Card", + ("Ferus_Card",3), + "Ferus__Card", + "Novus__Card", + ("Novus_Card",3), + "Hydro_Card", + ("Dragon_Egg_Card",3), + "Ancient_Mimic_Card", + ("Deathword_Card",3), + "Plasma_Card", "Breeze_Card", + ("Retribution_Card",3), + "Observation_Card", + "Shelter_Card", "Solace_Card", "Tha_Maero_Card", - "Tha_Dolor_Card", - "Skeggiold_Card", - "Drosera_Card", + "Tha_Odium_Card", + "Tha_Despero_Card", + "Aliza_Card", + "Alicel_Card", + "Aliot_Card", + "Skogul_Card", + "Frus_Card", + "Agav_Card", + "Echio_Card", + "Vanberk_Card", + "Isilla_Card", + "Hodremlin_Card", + "Seeker_Card", + ("Snowier_Card",2), + "Siroma_Card", + "Ice_Titan_Card", + "Gazeti_Card", + "Muscipular_Card", + ("Drosera_Card",2), + "Roween_Card", + "Galion_Card", + ("Stapo_Card",3), + "Byorgue_Card", "Sword_Guardian_Card", "Bow_Guardian_Card", - "Necromancer_Card", - "Centipede_Larva_Card", - "Hilsrion_Card", - "Bloody_Knight_Card" -) -Old_C_Album_Garment: ( - ("Dustiness_Card",32), - ("Orc_Zombie_Card",32), - ("Hode_Card",32), - ("Frilldora_Card",32), - ("Marse_Card",32), - ("Whisper_Card",32), - ("Myst_Card",32), - ("Jakk_Card",32), - ("Marionette_Card",32), - ("Isis_Card",32), - ("Baphomet__Card",32), - ("Daydric_Card",32), - ("Nine_Tail_Card",32), - "Deviling_Card", - ("Dragon_Tail_Card",32), - ("Dragon_Fly_Card",32), - "Vagabond_Wolf_Card", - "Mastering_Card", - "Wander_Man_Card", - "Vocal_Card", - ("Eclipse_Card",32), - ("Choco_Card",32), - ("Kapha_Card",32), - ("Whisper_Boss_Card",32), - "Toad_Card", - ("Punk_Card",32), - ("Harpy_Card",32), - ("Hyegun_Card",32), - ("Noxious_Card",32), - "Kavac_Card", - ("Chung_E_Card",32), - ("Orc_Baby_Card",32), - ("Aliot_Card",32), - ("Roween_Card",32), - ("Salamander_Card",32), - ("Kasa_Card",32), - ("Magmaring_Card",33), - ("Condor_Card",31) + "Salamander_Card", + "Kasa_Card", + ("Magmaring_Card",2), + "Imp_Card", + "Knocker_Card", + "Zombie_Slaughter_Card", + ("Ragged_Zombie_Card",2), + ("Hell_Poodle_Card",2), + ("Banshee_Card",2), + "Flame_Skull_Card", + "Necromancer_Card" ) -//unknown carrier / unsupported -/*Candy_Holder: ( - ("Honey",9), - ("Candy",20), - ("Well_Baked_Cookie",15), - ("Piece_Of_Cake",10), - ("Bread",20), - "Old_Blue_Box", - "Yggdrasilberry", - "Old_Card_Album", - "Old_Violet_Box", - "Contracts_In_Shadow", - ("Niflheim_Ticket",10), - ("Pumpkin_Cake",5), - ("Pumpkin_Pie",5) -)*/ -High_Weapon_Box: ( +*/ +/* currently unsupported or unknown ('High_Weapon_Box_') +High_Weapon_Box_: ( ("Mail_Breaker",5), ("Weeder_Knife",5), ("Mama's_Knife",5), @@ -3917,7 +4594,6 @@ High_Weapon_Box: ( "Right_Epsilon", "Doom_Slayer", ("Sword_Breaker",4), - //("14420",2), -- Unknown/Unsupported ("Chrome_Sword",2), ("Chrome_Twohand_Sword",2), ("Excalibur",2), @@ -3978,4 +4654,92 @@ High_Weapon_Box: ( "Thief_Crossbow", "Giant_Crossbow", "Creeper_Bow" -) \ No newline at end of file +) +*/ +Holy_Egg_2: ( + ("Oridecon",3), + ("Elunium",10), + ("White_Slim_Potion",30), + ("Blue_Potion",30), + ("Yggdrasilberry",3), + ("Seed_Of_Yggdrasil",2), + ("Leaf_Of_Yggdrasil",15), + ("Old_Card_Album",5), + "Drooping_Bunny" +) +/* currently unsupported or unknown ('Candy_Holder') +Candy_Holder: ( + ("Honey",9), + ("Candy",20), + ("Well_Baked_Cookie",15), + ("Piece_Of_Cake",10), + ("Bread",20), + "Old_Blue_Box", + "Yggdrasilberry", + "Old_Card_Album", + "Old_Violet_Box", + "Contracts_In_Shadow", + ("Niflheim_Ticket",10), + ("Pumpkin_Cake",5), + ("Pumpkin_Pie",5) +) +*/ +Lotto_Box01: ( + "Lotto02", + "Lotto03", + "Lotto04", + "Lotto05", + "Lotto06", + "Lotto07", + "Lotto08", + "Lotto09" +) +Lotto_Box02: ( + "Lotto11", + "Lotto12", + "Lotto13", + "Lotto14", + "Lotto15", + "Lotto16", + "Lotto17", + "Lotto18" +) +Lotto_Box03: ( + "Lotto20", + "Lotto21", + "Lotto22", + "Lotto23", + "Lotto24", + "Lotto25", + "Lotto26", + "Lotto27" +) +Lotto_Box04: ( + "Lotto29", + "Lotto30", + "Lotto31", + "Lotto32", + "Lotto33", + "Lotto34", + "Lotto35", + "Lotto36" +) +Lotto_Box05: ( + "Lotto38", + "Lotto39", + "Lotto40", + "Lotto41", + "Lotto42", + "Lotto43", + "Lotto44", + "Lotto45" +) +/* currently unsupported or unknown ('Lucky_Bag') +Lucky_Bag: ( + ("Fire_Cracker",7), + ("Korea_Rice_Cake",6), + ("Handsei",2), +//unknown/unsupported - ("7647",3), +//unknown/unsupported - "7649" +) +*/ \ No newline at end of file -- cgit v1.2.3-60-g2f50 From d88be27960c4508c2f61a729fb5e4c89965b7e0b Mon Sep 17 00:00:00 2001 From: shennetsind Date: Wed, 3 Jul 2013 16:10:35 -0300 Subject: Follow up be2b1ae78b0d7798f57b3875097614b9c92f7a2c Special Thanks to ossi0110 Signed-off-by: shennetsind --- db/pre-re/item_group.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'db') diff --git a/db/pre-re/item_group.conf b/db/pre-re/item_group.conf index 286711b3c..a8beeca43 100644 --- a/db/pre-re/item_group.conf +++ b/db/pre-re/item_group.conf @@ -3361,7 +3361,7 @@ Splendid_Box: ( //unknown/unsupported - ("13061",2), ("Ruber",2), ("Erde",2), - ("Red_Square_Bag",2), + ("Red_Square_Bag",2) //unknown/unsupported - ("16003",2), //unknown/unsupported - ("16010",2), //unknown/unsupported - ("18103",2) -- cgit v1.2.3-60-g2f50