Implemented the item group IG_XMAS_PACKAGE_14, IG_EASTER_EGG and IG_PITAPAT_BOX (#6121)

* Implemented
IG_XMAS_PACKAGE_14
IG_EASTER_EGG
IG_PITAPAT_BOX
from Aegis data

db/re/item_db_equip.yml

@@ -128787,21 +128787,6 @@ Body:
       bonus bAspdRate,7;
       bonus bVariableCastrate,-10;
       bonus bCritAtkRate,10;
-  - Id: 490022
-    AegisName: TrustRing
-    Name: Thunder Ring
-    Type: Armor
-    Weight: 300
-    Slots: 1
-    Locations:
-      Both_Accessory: true
-    EquipLevelMin: 100
-    Script: |
-      bonus2 bAddRace,RC_All,5;
-      bonus bMatkRate,5;
-      bonus2 bAddEle,Ele_Water,10;
-      bonus2 bMagicAddEle,Ele_Water,10;
-      bonus2 bSubEle,Ele_Water,5;
   - Id: 490020
     AegisName: Grace_Magic_Ring
     Name: Grace Magic Ring
@@ -128825,6 +128810,21 @@ Body:
       bonus bAspdRate,7;
       bonus bVariableCastrate,-10;
       bonus2 bMagicAddEle,Ele_All,10;
+  - Id: 490022
+    AegisName: TrustRing
+    Name: Thunder Ring
+    Type: Armor
+    Weight: 300
+    Slots: 1
+    Locations:
+      Both_Accessory: true
+    EquipLevelMin: 100
+    Script: |
+      bonus2 bAddRace,RC_All,5;
+      bonus bMatkRate,5;
+      bonus2 bAddEle,Ele_Water,10;
+      bonus2 bMagicAddEle,Ele_Water,10;
+      bonus2 bSubEle,Ele_Water,5;
   - Id: 490024
     AegisName: Auto_B_R
     Name: Automatic Booster R

db/re/item_db_etc.yml

@@ -34068,19 +34068,6 @@ Body:
     Name: Cat Hand Ticket
     Type: Etc
     Buy: 10
-  - Id: 22870
-    AegisName: Xmas_Package_14
-    Name: Christmas Package
-    Type: Etc
-    Weight: 10
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
   - Id: 22875
     AegisName: Sealed_Beelzebub_Card
     Name: Sealed Beelzebub Card

db/re/item_db_usable.yml

@@ -41310,6 +41310,8 @@ Body:
       NoGuildStorage: true
       NoMail: true
       NoAuction: true
+    Script: |
+      rentitem 12622,259200;
   - Id: 17181
     AegisName: Jan_Groove_Box
     Name: Jan Groove Box
@@ -44994,6 +44996,10 @@ Body:
     Type: Delayconsume
     Buy: 10
     Weight: 10
+    Flags:
+      Container: true
+    Script: |
+      getgroupitem(IG_EASTER_EGG);
   - Id: 22592
     AegisName: Happy_Call_Box
     Name: Happy Call Box
@@ -45750,6 +45756,8 @@ Body:
     Type: Usable
     Buy: 10
     Weight: 100
+    Flags:
+      Container: true
     Trade:
       Override: 100
       NoDrop: true
@@ -45760,7 +45768,7 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      /*No clue the random item yet*/
+      getgroupitem(IG_PITAPAT_BOX);
   - Id: 22721
     AegisName: ?_Box
     Name: "? Box"
@@ -46764,6 +46772,23 @@ Body:
       NoAuction: true
     Script: |
       RouletteBronze++;
+  - Id: 22870
+    AegisName: Xmas_Package_14
+    Name: Christmas Package
+    Type: Usable
+    Weight: 10
+    Flags:
+      Container: true
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
+    Script: |
+      getgroupitem(IG_XMAS_PACKAGE_14);
   - Id: 22873
     AegisName: Sealed_Beelzebub_Scroll_II
     Name: Sealed Beelzebub Scroll II

db/re/item_group_db.yml

@@ -23139,3 +23139,149 @@ Body:
           - Item: Detale_Card
             Rate: 1
             Announced: true
+  - Group: XMAS_PACKAGE_14
+    SubGroups:
+      - SubGroup: 1
+        List:
+          - Item: Event_Cake
+            Rate: 800
+            Amount: 10
+            UniqueId: true
+          - Item: White_Slim_Potion_B
+            Rate: 800
+            Amount: 5
+            UniqueId: true
+          - Item: White_Potion_B
+            Rate: 900
+            Amount: 5
+            UniqueId: true
+          - Item: Chocolate_Drink_B
+            Rate: 700
+            Amount: 3
+            UniqueId: true
+          - Item: Blue_Potion_B
+            Rate: 700
+            Amount: 3
+            UniqueId: true
+          - Item: Center_Potion_B
+            Rate: 800
+            Amount: 3
+            UniqueId: true
+          - Item: Berserk_Potion_B
+            Rate: 800
+            Amount: 3
+            UniqueId: true
+          - Item: Awakening_Potion_B
+            Rate: 800
+            Amount: 3
+            UniqueId: true
+          - Item: Yggdrasilberry
+            Rate: 294
+            Amount: 3
+            UniqueId: true
+          - Item: C_Polar_Bear_Cap
+            Rate: 1
+            Amount: 1
+            UniqueId: true
+          - Item: C_Mini_Tree_J
+            Rate: 1
+            Amount: 1
+            UniqueId: true
+          - Item: C_Cat_Santa_Hat
+            Rate: 1
+            Amount: 1
+            UniqueId: true
+          - Item: C_Rudolph_Santa_Hat
+            Rate: 1
+            Amount: 1
+            UniqueId: true
+          - Item: C_Santa_Hat_2
+            Rate: 1
+            Amount: 1
+            UniqueId: true
+          - Item: C_ShineSantaPoring
+            Rate: 1
+            Amount: 1
+            UniqueId: true
+          - Item: Str_Dish07
+            Rate: 400
+            Amount: 1
+            UniqueId: true
+          - Item: Agi_Dish07
+            Rate: 400
+            Amount: 1
+            UniqueId: true
+          - Item: Vit_Dish07
+            Rate: 400
+            Amount: 1
+            UniqueId: true
+          - Item: Int_Dish07
+            Rate: 400
+            Amount: 1
+            UniqueId: true
+          - Item: Dex_Dish07
+            Rate: 400
+            Amount: 1
+            UniqueId: true
+          - Item: Luk_Dish07
+            Rate: 400
+            Amount: 1
+            UniqueId: true
+          - Item: Old_Card_Album
+            Rate: 100
+            Amount: 1
+            UniqueId: true
+  - Group: EASTER_EGG
+    SubGroups:
+      - SubGroup: 1
+        List:
+          - Item: Candy
+            Rate: 4
+            Amount: 5
+          - Item: Piece_Of_Cake
+            Rate: 4
+            Amount: 3
+          - Item: Jam_Pancake
+            Rate: 4
+            Amount: 2
+          - Item: Fruit_Of_Mastela
+            Rate: 3
+            Amount: 1
+          - Item: Mystery_Egg
+            Rate: 1
+            Amount: 1
+  - Group: PITAPAT_BOX
+    SubGroups:
+      - SubGroup: 1
+        List:
+          - Item: Solo_Gift_Basket
+            Rate: 1000
+            Amount: 1
+          - Item: Couple_Event_Basket
+            Rate: 1000
+            Amount: 1
+          - Item: Strawberry_Choco
+            Rate: 2000
+            Amount: 5
+          - Item: Chocolate_Drink
+            Rate: 2000
+            Amount: 3
+          - Item: Candy_Striper
+            Rate: 2000
+            Amount: 5
+          - Item: Angeling_Potion
+            Rate: 1000
+            Amount: 3
+          - Item: Diamond_Ring
+            Rate: 300
+            Amount: 1
+            Announced: true
+          - Item: Witherless_Rose
+            Rate: 400
+            Amount: 1
+            Announced: true
+          - Item: Jewel_Ring
+            Rate: 300
+            Amount: 1
+            Announced: true
+

sql-files/item_db_re_etc.sql

@@ -3299,7 +3299,6 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (22720,'Novus_Ball','Novus Ball','Etc',10,100,true,true,true,true,true,true,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (22802,'Safe_to_6_Equipment_Certificate','Safe to 6 Equipment Certificate','Etc',10,10,100,true,true,true,true,true,true,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`) VALUES (22814,'Cat_Hand_Ticket','Cat Hand Ticket','Etc',10);
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (22870,'Xmas_Package_14','Christmas Package','Etc',10,100,true,true,true,true,true,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_top`,`location_head_mid`,`location_head_low`,`flag_dropeffect`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22875,'Sealed_Beelzebub_Card','Sealed Beelzebub Card','Card',20,10,true,true,true,'CLIENT',100,true,true,true,true,true,true,'bonus bVariableCastrate,-15;\n/*Item removed on 2014-12-17*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`) VALUES (25000,'SPdrainStone_Top','SP Absorption Stone(Upper)','Etc',100);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`) VALUES (25001,'DEFStone_Middle','Def Stone(Middle)','Etc',100);

sql-files/item_db_re_usable.sql

@@ -2803,7 +2803,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (17160,'Character_Name_Change_Card_Box','Character Name Change Card Box','Cash',20,10,100,true,true,true,true,true,true,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`flag_uniqueid`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (17162,'Boarding_Halter_Box7','Boarding Halter Box7','Cash',10,true,100,true,true,true,true,true,true,true,'rentitem 12622,604800;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_container`,`script`) VALUES (17165,'Challenge_Kit','Challenge Kit','Usable',20,10,true,'getgroupitem(IG_Challenge_Kit);\n/*getitem Blessing_10_Scroll,20; getitem Inc_Agi_10_Scroll,20;*/');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`flag_uniqueid`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (17176,'Boarding_Halter_Box3','Halter Lead Box[Trial]','Cash',20,true,100,true,true,true,true,true,true,true);
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`flag_uniqueid`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (17176,'Boarding_Halter_Box3','Halter Lead Box[Trial]','Cash',20,true,100,true,true,true,true,true,true,true,'rentitem 12622,259200;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_uniqueid`) VALUES (17181,'Jan_Groove_Box','Jan Groove Box','Usable',20,10,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`flag_uniqueid`,`script`) VALUES (17184,'3rd_Test_Pass_Box','3rd Test Pass Box','Cash',true,'getitem 6583,1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_uniqueid`) VALUES (17203,'Free_Pass_Box','Free Pass Box','Usable',20,10,true);
@@ -3061,7 +3061,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VAL
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22567,'Squad_Prize','Expedition Award Box','Usable',20,100,100,true,true,'/* TODO */');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`) VALUES (22568,'Nyd_Summon_Scroll','Nidhoggur Summon Scroll','Usable',20,100);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (22569,'Gift_New_start','Gift New start','Cash',10,100,100,true,true,true,true,true,true,true);
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`) VALUES (22571,'Easter_Egg','Easter Egg','Delayconsume',10,10);
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_container`,`script`) VALUES (22571,'Easter_Egg','Easter Egg','Delayconsume',10,10,true,'getgroupitem(IG_EASTER_EGG);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (22592,'Happy_Call_Box','Happy Call Box','Cash',10,100,true,true,true,true,true,true,true,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`) VALUES (22605,'Gingerbread2','Ginger Bread','Usable',10,10);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22610,'New_Beginnings_Box','New Beginnings Box','Usable',10,10,100,true,true,true,true,true,true,true,'getitem 12803,1;\ngetitem 12802,1;\ngetitem 12809,1;');
@@ -3123,7 +3123,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`script`) VALUES (22705,'Minus_Int','INT Reduction Potion','Delayconsume',10,'callfunc "F_CashReduceStat",bInt,-1,22705;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`script`) VALUES (22706,'Minus_Dex','DEX Reduction Potion','Delayconsume',10,'callfunc "F_CashReduceStat",bDex,-1,22706;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`script`) VALUES (22707,'Minus_Luk','LUK Reduction Potion','Delayconsume',10,'callfunc "F_CashReduceStat",bLuk,-1,22707;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22708,'Pitapat_Box','Thrilling Box','Usable',10,100,100,true,true,true,true,true,true,true,'/*No clue the random item yet*/');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_container`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22708,'Pitapat_Box','Thrilling Box','Usable',10,100,true,100,true,true,true,true,true,true,true,'getgroupitem(IG_PITAPAT_BOX);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`script`) VALUES (22721,'?_Box','? Box','Cash',10,'/*No clue the random item yet*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22734,'Revolution_Quiz_Box','Revolution Quiz Box','Cash',10,10,100,true,true,true,true,true,true,true,true,'getitem 6635,2;\ngetitem 6423,1;\n/*1x Enchanted Letter Introduction*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22735,'Sealed_Moonlight_Flower_Scroll','Sealed Moonlight Flower Scroll','Cash',10,10,100,true,true,true,true,true,true,true,'/*TODO: Confirm the rates*/\ngetitem callfunc("F_Rand",6228,6232,24150,19934,6635,17474),1;');
@@ -3200,6 +3200,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22861,'December_Gift_Box','December Gift Box','Usable',10,100,100,true,true,true,true,true,true,true,'getitem 22869,10;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`flag_container`,`script`) VALUES (22868,'Enchant_Stone_Box5','Costume Enchant Stone Box 5','Usable',10,true,'getgroupitem(IG_Enchant_Stone_Box5);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22869,'Lucky_Roulette_Tickets','Lucky Roulette Ticket','Usable',10,100,50,100,true,true,true,true,true,true,true,true,'RouletteBronze++;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`flag_container`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22870,'Xmas_Package_14','Christmas Package','Usable',10,true,100,true,true,true,true,true,true,'getgroupitem(IG_XMAS_PACKAGE_14);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22873,'Sealed_Beelzebub_Scroll_II','Sealed Beelzebub Scroll II','Usable',10,10,100,true,true,true,true,true,true,true,'getitem callfunc("F_Rand",22875,6238,6239,6228,6232,24231,24232,17474,6635),1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22874,'Sealed_Beelzebub_Card_Album','Sealed Beelzebub Card Album','Usable',10,50,100,true,true,true,true,true,true,true,'/*No Info*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (22876,'Shabby_Purse','Old Money Pocket','Usable','specialeffect2 EF_STEAL;\nZeny += rand(100,1000);');

src/map/itemdb.hpp

@@ -756,6 +756,9 @@ enum e_random_item_group {
 	IG_ENCHANT_STONE_BOX19,
 	IG_ENCHANT_STONE_BOX20,
 	IG_ENCHANT_STONE_BOX21,
+	IG_XMAS_PACKAGE_14,
+	IG_EASTER_EGG,
+	IG_PITAPAT_BOX,
 
 	IG_MAX,
 };

src/map/script_constants.hpp

@@ -5227,6 +5227,9 @@
 	export_constant(IG_ENCHANT_STONE_BOX19);
 	export_constant(IG_ENCHANT_STONE_BOX20);
 	export_constant(IG_ENCHANT_STONE_BOX21);
+	export_constant(IG_XMAS_PACKAGE_14);
+	export_constant(IG_EASTER_EGG);
+	export_constant(IG_PITAPAT_BOX);
 
 	/* unit stop walking */
 	export_constant(USW_NONE);