Skip to content

Commit

Permalink
* Follow up 65bd0ee
Browse files Browse the repository at this point in the history 
* Corrected some item types
* Corrected flags of item_trade.txt
* Added items into item_flag.txt
* Updated item_package.txt with announce flag value

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
  • Loading branch information
@cydh
cydh committed Aug 1, 2016
1 parent 65bd0ee commit bc0e171
Show file tree
Hide file tree
Showing 4 changed files with 672 additions and 598 deletions.
18 changes: 9 additions & 9 deletions db/re/item_db.txt
View file
Expand Up @@ -9268,14 +9268,14 @@
17455,Premium_Battle_Manual_Box,Premium Battle Manual Box,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 22614,1; },{},{}
17456,Support_Package_II,Support Package II,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Support_Package_II); },{},{}
17457,Support_Package_II(10),Support Package II(10),18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Support_Package_II10); },{},{}
17461,Frozen_Egg_Costume,Frozen Egg Costume,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Frozen_Egg_Costume); },{},{}
17461,Frozen_Egg_Costume,Frozen Egg Costume,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Frozen_Egg_Costume); },{},{}
17464,Winter_Midgard_Egg,Winter Midgard Egg,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Winter_Midgard_Egg); },{},{}
17465,Refinement_Ore_Box_VI,Refinement Ore Box VI,3,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 7619,5; getitem 7620,5; getitem 14718,1; },{},{}
17466,Refinement_Ore_Box_VI(10),Refinement Ore Box VI(10),3,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 7619,50; getitem 7620,50; getitem 14718,11; },{},{}
17467,(Limited)_Token_of_Ziegfried_Box(50),(Limited) Token of Ziegfried Box(50),18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 6833,50; },{},{}
17468,Neuralizer_II_Box_3,Neuralizer II Box (3),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 14724,3;},{},{}
17469,Neuralizer_I_Box,Neuralizer I Box,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 14723,1;},{},{}
17470,Headgear_Costume_Scroll,Headgear Costume Scroll,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Headgear_Costume_Scroll); },{},{}
17470,Headgear_Costume_Scroll,Headgear Costume Scroll,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Headgear_Costume_Scroll); },{},{}
17471,Spring_Festival_Lucky_Egg,Spring Festival Lucky Egg,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,1,,,{ getgroupitem(IG_Spring_Festival_Lucky_Egg); },{},{}
17472,Support_Package_III,Support Package III,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Support_Package_III); },{},{}
17473,Support_Package_III(10),Support Package III(10),18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Support_Package_III10); },{},{}
Expand All @@ -9284,7 +9284,7 @@
17477,Unlimited_Box_II,Unlimited Box II,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Unlimited_Box_II); },{},{}
17478,Unlimited_Box_II(10),Unlimited Box II(10),18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Unlimited_Box_II10); },{},{}
17479,Midgard_Festival_Egg,Midgard Festival Egg,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Midgard_Festival_Egg); },{},{}
17481,Flower_Blossom_Scroll,Flower Blossom Scroll,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Flower_Blossom_Scroll); },{},{}
17481,Flower_Blossom_Scroll,Flower Blossom Scroll,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Flower_Blossom_Scroll); },{},{}
17482,Solaris_Festival_Scroll,Solaris Festival Scroll,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Solaris_Festival_Scroll); },{},{}
17483,Three_Master_Package_III,Three Master Package III,3,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Three_Master_Package_III); },{},{}
17484,Three_Master_Package_III(10),Three Master Package III(10),3,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Three_Master_Package_III10); },{},{}
Expand All @@ -9295,7 +9295,7 @@
17494,Rise_Midgard_Lucky_Egg,Rise Midgard Lucky Egg,18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Rise_Midgard_Lucky_Egg); },{},{}
17495,Lucky_Silvervine_Fruit_Box_III10,Lucky Silvervine Fruit Box III(10),18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Lucky_Silvervine_Fruit_Box_III10); },{},{}
17496,Lucky_Silvervine_Fruit_Box_III110,Lucky Silvervine Fruit Box III(110),18,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Lucky_Silvervine_Fruit_Box_III110); },{},{}
17497,Seaside_Costume_Scroll,Seaside Costume Scroll,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Seaside_Costume_Scroll); },{},{}
17497,Seaside_Costume_Scroll,Seaside Costume Scroll,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Seaside_Costume_Scroll); },{},{}
17498,Three_Master_Package_IV,Three Master Package IV,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 14534,20; getitem 14535,20; getitem 12578,20; getitem 22812,1; },{},{}
17499,Three_Master_Package_IV(10),Three Master Package IV(10),2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 14534,200; getitem 14535,200; getitem 12578,200; getitem 22812,11; },{},{}
17501,Support_Package_IV,Support Package IV,2,10,,10,,,,0,0xFFFFFFFF,63,2,,,,,,{ getitem 12208,2; getitem 12210,2; getitem 12883,2; getitem 14600,2; /*getitem Mysterious Water of Life,6;*/ if(!rand(100)) getitem 22823,1; },{},{}
Expand Down Expand Up @@ -9337,11 +9337,11 @@
17613,Chronosian_Lucky_Egg,Chronosian Lucky Egg,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Chronosian_Lucky_Egg); },{},{}
17628,Cyborg_Lucky_Egg,Cyborg Lucky Egg,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Cyborg_Lucky_Egg); },{},{}
17633,Undine_Lucky_Egg,Undine Lucky Egg,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Undine_Lucky_Egg); },{},{}
17648,Smithy_Lucky_Egg,Smithy Lucky Egg,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Smithy_Lucky_Egg); },{},{}
17659,Ganymede_Lucky_Egg,Ganymede Lucky Egg,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Ganymede_Lucky_Egg); },{},{}
17665,LastAngel_LuckyScroll,LastAngel LuckyScroll,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_LastAngel_LuckyScroll); },{},{}
17671,Valkyrie_Lucky_Egg,Valkyrie Lucky Egg,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Valkyrie_Lucky_Egg); },{},{}
17674,Splash_Rainbow_Lucky_Egg,Splash Rainbow Lucky Egg,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Splash_Rainbow_Lucky_Egg); },{},{}
17648,Smithy_Lucky_Egg,Smithy Lucky Egg,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Smithy_Lucky_Egg); },{},{}
17659,Ganymede_Lucky_Egg,Ganymede Lucky Egg,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Ganymede_Lucky_Egg); },{},{}
17665,LastAngel_LuckyScroll,LastAngel LuckyScroll,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_LastAngel_LuckyScroll); },{},{}
17671,Valkyrie_Lucky_Egg,Valkyrie Lucky Egg,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Valkyrie_Lucky_Egg); },{},{}
17674,Splash_Rainbow_Lucky_Egg,Splash Rainbow Lucky Egg,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Splash_Rainbow_Lucky_Egg); },{},{}
17681,Midgard_Lucky_Scroll,Midgard Lucky Scroll,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Midgard_Lucky_Scroll); },{},{}
17692,Blessing_Scarlet_Egg,Blessing Scarlet Egg,18,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getgroupitem(IG_Blessing_Scarlet_Egg); },{},{}
//===================================================================
Expand Down
65 changes: 64 additions & 1 deletion db/re/item_flag.txt
View file
Expand Up @@ -262,8 +262,10 @@
14667,2 //Yong_Kwang_Scroll
14699,2 //Memorial_Garuda_Lucky_Egg
14701,2 //Rune_Midgard_Imortal_Lucky_Egg
14735,2 //Shapeshifter_Costume
14741,2 //Midgard_Celebration_Lucky_Egg
14753,2 //Hero_Midgard_Egg
14805,2 //Almighty_Lucky_Egg
16245,2 //Tw_April_Scroll
16257,2 //Buddah_Scroll
16304,2 //Evil_Incarnation
Expand Down Expand Up @@ -381,17 +383,23 @@
17307,2 //Midgard_Egg
17317,2 //Sweet_Midgard_Egg
17320,2 //Birthday_IdRO10th_Scroll
17326,2 //Requiem_Egg,Requiem Egg
17326,2 //Requiem_Egg
17337,2 //Holy_Spirit_Egg
17431,2 //Miracle_Lucky_Egg
17435,2 //Legend_Hero_Lucky_Egg
17447,2 //Blessing_Midgard_Lucky_Egg
17461,2 //Frozen_Egg_Costume
17464,2 //Winter_Midgard_Egg
17470,2 //Headgear_Costume_Scroll
17471,2 //Spring_Festival_Lucky_Egg
17479,2 //Midgard_Festival_Egg
17481,2 //Flower_Blossom_Scroll
17482,2 //Solaris_Festival_Scroll
17490,2 //Time_Travel_Lucky_Egg
17493,2 //Burning_Feather_Costume_Scroll
17494,2 //Rise_Midgard_Lucky_Egg
17497,2 //Seaside_Costume_Scroll
17517,2 //Animal_Costume_Scroll
17519,2 //Epic_Heroes_Scroll
17526,2 //Majestic_Lucky_Egg
17532,2 //Blessing_Lucky_Egg
Expand All @@ -400,6 +408,17 @@
17584,2 //Venus_Lucky_Egg
17588,2 //Amora_Lucky_Egg
17598,2 //Sograt_Lucky_Scroll
17607,2 //Sanctuary_Lucky_Egg
17613,2 //Chronosian_Lucky_Egg
17628,2 //Cyborg_Lucky_Egg
17633,2 //Undine_Lucky_Egg
17648,2 //Smithy_Lucky_Egg
17659,2 //Ganymede_Lucky_Egg
17665,2 //LastAngel_LuckyScroll
17671,2 //Valkyrie_Lucky_Egg
17674,2 //Splash_Rainbow_Lucky_Egg
17681,2 //Midgard_Lucky_Scroll
17692,2 //Blessing_Scarlet_Egg
22514,2 //Candy_Holder
22558,2 //Lucky_Bag
22669,2 //HALLOWEEN_G_BOX
Expand Down Expand Up @@ -1321,6 +1340,12 @@
14497,4 //Pisces_Diadem_Box
14498,4 //Pisces_Crown_Box
14499,4 //Peacock_Feather_Box
14699,4 //Memorial_Garuda_Lucky_Egg
14701,4 //Rune_Midgard_Imortal_Lucky_Egg
14735,4 //Shapeshifter_Costume
14741,4 //Midgard_Celebration_Lucky_Egg
14753,4 //Hero_Midgard_Egg
14805,4 //Almighty_Lucky_Egg
16131,4 //Lady_Tanee_Doll_Box
16132,4 //Lunatic_Hat_Box
16133,4 //G_Staff_Of_Light_Box
Expand Down Expand Up @@ -1690,6 +1715,44 @@
17273,4 //INT_Biscuit_Stick_Box
17274,4 //DEX_Biscuit_Stick_Box
17275,4 //LUK_Biscuit_Stick_Box
17307,4 //Midgard_Egg
17317,4 //Sweet_Midgard_Egg
17320,4 //Birthday_IdRO10th_Scroll
17337,4 //Holy_Spirit_Egg
17431,4 //Miracle_Lucky_Egg
17435,4 //Legend_Hero_Lucky_Egg
17447,4 //Blessing_Midgard_Lucky_Egg
17461,4 //Frozen_Egg_Costume
17464,4 //Winter_Midgard_Egg
17470,4 //Headgear_Costume_Scroll
17471,4 //Spring_Festival_Lucky_Egg
17479,4 //Midgard_Festival_Egg
17481,4 //Flower_Blossom_Scroll
17482,4 //Solaris_Festival_Scroll
17490,4 //Time_Travel_Lucky_Egg
17493,4 //Burning_Feather_Costume_Scroll
17494,4 //Rise_Midgard_Lucky_Egg
17497,4 //Seaside_Costume_Scroll
17517,4 //Animal_Costume_Scroll
17519,4 //Epic_Heroes_Scroll
17526,4 //Majestic_Lucky_Egg
17532,4 //Blessing_Lucky_Egg
17552,4 //Garnet_Lucky_Egg
17572,4 //Erzulie_Lucky_Egg
17584,4 //Venus_Lucky_Egg
17588,4 //Amora_Lucky_Egg
17598,4 //Sograt_Lucky_Scroll
17607,4 //Sanctuary_Lucky_Egg
17613,4 //Chronosian_Lucky_Egg
17628,4 //Cyborg_Lucky_Egg
17633,4 //Undine_Lucky_Egg
17648,4 //Smithy_Lucky_Egg
17659,4 //Ganymede_Lucky_Egg
17665,4 //LastAngel_LuckyScroll
17671,4 //Valkyrie_Lucky_Egg
17674,4 //Splash_Rainbow_Lucky_Egg
17681,4 //Midgard_Lucky_Scroll
17692,4 //Blessing_Scarlet_Egg
//17297,4 //B_Halter_Box_1year
//17318,4 //10_Anniv_Package
//17319,4 //10_Anniv_Collection
Expand Down

0 comments on commit bc0e171

Please sign in to comment.