Christmas 2024 - Ofelia's Event : Not yet completed

Groups 1, 2 and 4 are not yet hooked.
Untested.
No rewards are currently given.

2 files changed, 139 insertions, 81 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 432bd8481..8365050e6 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -411,7 +411,7 @@ constants_db: {
 	Ele_Ghost:     8
 	Ele_All:     255
 
-    // Compatibility, legacy, DO NOT USE
+	// Compatibility, legacy, DO NOT USE
 	Ele_Nature:    5
 	Ele_Poison:    5
 	Ele_Undead:    9
@@ -1670,8 +1670,8 @@ constants_db: {
 	HH_SAULC:          128
 	HH_MOUBOO:         256
 	HH_MOUBOOTAUR:     512
-    // Composed Variable for optimization
-    HH_REQUISITE:       15
+	// Composed Variable for optimization
+	HH_REQUISITE:       15
 
 	comment__: "difficulty levels"
 	EASY:       0
@@ -1847,6 +1847,7 @@ constants_db: {
 	NPC_LOF_STRANGER:       234
 	NPC_LOF_NOBLEMAN:       235
 	NPC_SHEILA:             236
+	NPC_ANGELA_SNOW:        237
 	NPC_ANGELA2:            238
 	NPC_DIMOND:             240
 	NPC_BARD_HARPS:         241
@@ -2055,7 +2056,7 @@ constants_db: {
 	NPC_SWITCH_ONLINE:      915
 	NPC_ROLLINGSTONE:       916
 
-    // Avatars (1000+)
+	// Avatars (1000+)
 	AVATAR_CARDA:           1000
 	AVATAR_CARD2:           1001
 	AVATAR_CARD3:           1002
@@ -2105,34 +2106,34 @@ constants_db: {
 	NO_INN:                 0
 	CURRENT_INN:            2
 
-    comment__: "CRAFT enum"
-    CRAFT_COOKING:          4
-    CRAFT_ALCHEMY:          8
-    CRAFT_EQUIPMENT:       16
-
-    comment__: "CRAFT Scope enum"
-    CRAFT_NPC:               4
-    CRAFT_PLAYER:            8
-    CRAFT_GUILD:             16
-
-    comment__: "CRAFT Rarity enum"
-    CRAFT_BASIC:         1
-    CRAFT_INTERMEDIARY:  2
-    CRAFT_ADVANCED:      4
-    CRAFT_EXPERT:        8
-    CRAFT_MASTER:       16
-
-    comment__: "CRAFT Bonus Correction enum"
-    CSYS_ARMOR:             1
-    CSYS_ZWEIHANDER:        2
-    CSYS_BRAWLING:          4
-    CSYS_RANGED:            8
-    CSYS_MAGICAL:          16
-    CSYS_SPECIAL:          32
-    CSYS_OTHER:            64
-    CSYS_SAVIOR:          128
-    CSYS_SHIELD:          256
-    CSYS_LEGENDARY:       512
+	comment__: "CRAFT enum"
+	CRAFT_COOKING:          4
+	CRAFT_ALCHEMY:          8
+	CRAFT_EQUIPMENT:       16
+
+	comment__: "CRAFT Scope enum"
+	CRAFT_NPC:               4
+	CRAFT_PLAYER:            8
+	CRAFT_GUILD:             16
+
+	comment__: "CRAFT Rarity enum"
+	CRAFT_BASIC:         1
+	CRAFT_INTERMEDIARY:  2
+	CRAFT_ADVANCED:      4
+	CRAFT_EXPERT:        8
+	CRAFT_MASTER:       16
+
+	comment__: "CRAFT Bonus Correction enum"
+	CSYS_ARMOR:             1
+	CSYS_ZWEIHANDER:        2
+	CSYS_BRAWLING:          4
+	CSYS_RANGED:            8
+	CSYS_MAGICAL:          16
+	CSYS_SPECIAL:          32
+	CSYS_OTHER:            64
+	CSYS_SAVIOR:          128
+	CSYS_SHIELD:          256
+	CSYS_LEGENDARY:       512
 
 	comment__: "Easter eggs enum"
 	EE_NONE:                0
@@ -2185,7 +2186,7 @@ constants_db: {
 	COLLECT_MOUNTS:         65536
 	COLLECT_PETS:           131072
 	COLLECT_ALL:            262144
-    // Maximum 32 collectibles, currently used: 19
+	// Maximum 32 collectibles, currently used: 19
 
 	comment__: "Misc Flags enum"
 	FLAG_NONE:              0
@@ -2204,12 +2205,12 @@ constants_db: {
 	MK_SHOWDOWN:            6
 	MK_CUTSCENE:            7
 
-    // Special
-    MK_SIEGE_DURATION:      790
-    MK_IDLE_DURATION:       30
-    MK_IDLE_VARIATION:      5
-    MK_SIEGE_TOTALPOWER:    1000
-    MK_FIRESOFSTEAM_START:  6
+	// Special
+	MK_SIEGE_DURATION:      790
+	MK_IDLE_DURATION:       30
+	MK_IDLE_VARIATION:      5
+	MK_SIEGE_TOTALPOWER:    1000
+	MK_FIRESOFSTEAM_START:  6
 
 	comment__: "Fortress Island Reqs"
 	MKIF_LV_0F:             3
@@ -2234,45 +2235,45 @@ constants_db: {
 	RB_DEFAULT:             19 // dispbottom + debugmes + pleasereport
 
 	comment__: "Blue Sage Constants"
-    // Q - Quest / Investigation Quest
+	// Q - Quest / Investigation Quest
 	BS_QVISITOR:       1
 	BS_QHELPER:        2
-    // PM - Page Maker
+	// PM - Page Maker
 	BS_PMINK:          1
 	BS_PMBINDING:      2
 	BS_PMPAGE:         4
 	BS_PMGLUE:         8
 	BS_PMALL:          15
-    // N - Npc
-    BS_NPC01:           1
-    BS_NPC02:           2
-    BS_NPC03:           4
-    BS_NPC04:           8
-    BS_NPC05:           16
-    BS_NPC06:           32
-    BS_NPC07:           64
-    BS_NPCALL:          127
-    // S - Slime Nest
-    BS_SNEST1:          1
-    BS_SNEST2:          2
-    BS_SNEST3:          4
-    BS_SNEST4:          8
-    BS_SNEST5:          16
-    BS_SNEST6:          32
-    BS_SNEST7:          64
-    BS_SNEST8:          128
-    BS_SNEST9:          256
-    BS_SNESTALL:        511
+	// N - Npc
+	BS_NPC01:           1
+	BS_NPC02:           2
+	BS_NPC03:           4
+	BS_NPC04:           8
+	BS_NPC05:           16
+	BS_NPC06:           32
+	BS_NPC07:           64
+	BS_NPCALL:          127
+	// S - Slime Nest
+	BS_SNEST1:          1
+	BS_SNEST2:          2
+	BS_SNEST3:          4
+	BS_SNEST4:          8
+	BS_SNEST5:          16
+	BS_SNEST6:          32
+	BS_SNEST7:          64
+	BS_SNEST8:          128
+	BS_SNEST9:          256
+	BS_SNESTALL:        511
 
 	comment__: "Fragments Expedition Constants"
-    FRAG_HASKEY:        1
-    FRAG_NEEDSKEY:      2
-    FRAG_EXPLOREDCAMP:  4
-    FRAG_CAMP_01:       8
-    FRAG_CAMP_02:       16
-    FRAG_CAMP_03:       32
-    FRAG_LETTER:        64
-    FRAG_LADDER:        128
+	FRAG_HASKEY:        1
+	FRAG_NEEDSKEY:      2
+	FRAG_EXPLOREDCAMP:  4
+	FRAG_CAMP_01:       8
+	FRAG_CAMP_02:       16
+	FRAG_CAMP_03:       32
+	FRAG_LETTER:        64
+	FRAG_LADDER:        128
 
 	comment__: "Rossy Quest Constants"
 	ROSSY_INSTIME:      900  // 15 minutes
@@ -2291,11 +2292,66 @@ constants_db: {
 	ROSSY_BOSSCAVE:     1024
 
 	comment__: "Event Feat Constants"
-    EVFEAT_EASTER:        1
-    EVFEAT_VALENTINE:     2
-    EVFEAT_CHRISTMAS:     4
-    EVFEAT_OLYMPICS:      8  // NOT IN USE
-    EVFEAT_PINKIE:        16 // NOT IN USE
+	EVFEAT_EASTER:        1
+	EVFEAT_VALENTINE:     2
+	EVFEAT_CHRISTMAS:     4
+	EVFEAT_OLYMPICS:      8  // NOT IN USE
+	EVFEAT_PINKIE:        16 // NOT IN USE
+
+	comment__: "Christmas 2024 Feat Constants"
+	X24_PVP:            1
+	X24_FEFE:           2
+	X24_BLOOD:          4
+	X24_CTF:            8
+	X24_GROATA:         16
+	X24_ICICLE:         32
+	X24_COD:            64
+	X24_ELECTION:       128
+	X24_MK:             256
+	X24_SIEGE:          256         // DUPLICATE
+	X24_HH:             512
+	X24_CELESTIA:       1024
+	X24_VORAZ:          2048
+	X24_GEMINI:         4096
+	X24_CINDY:          8192
+	X24_AEROS:          16384
+	X24_FORT:           16384       // DUPLICATE
+	X24_FISHING:        32768
+	X24_RAIN:           65536
+	X24_BOSS:           131072
+	X24_LOCKPICK:       262144
+	X24_DUNGEON:        524288
+	X24_SEALED:         1048576
+	X24_KAMELOT:        2097152
+	X24_DEMURE:         4194304
+	X24_BREWING:        8388608
+	X24_COOKING:        16777216
+	X24_REFINING:       33554432
+	X24_POKER:          67108864
+	X24_GROUP1:         134217728
+	X24_GROUP2:         268435456
+	X24_GROUP3:         536870912
+	X24_GROUP4:         1073741824
+
+	// Control for the groups
+	X24_G1_CRAPS:       0
+	X24_G1_SEQUENCE:    1
+	X24_G1_HIGHLOW:     2
+	X24_G1_BLACKJACK:   3
+	X24_G1_MAX:         4
+
+	X24_G2_UDT:         0
+	X24_G2_MPT:         1
+	X24_G2_MAX:         2
+
+	X24_G3_TREASURE:    0
+	X24_G3_TREE:        1
+	X24_G3_MAX:         2
+
+	X24_G4_INSURANCE:   0
+	X24_G4_GRENADE:     1
+	X24_G4_MAX:         2
+
 
 	comment__: "Homunculus deployment constants"
 	HCD_PIOUFIELDS: 1
@@ -2343,24 +2399,24 @@ constants_db: {
 	MODE_PARTY:     2
 
 	comment__: "craft skill groups IDs"
-    // Base tier
+	// Base tier
 	CRGROUP_BASE:  1
-    // First tier
+	// First tier
 	CRGROUP_ATK:    2
 	CRGROUP_DEF:    4
 	CRGROUP_ACC:    8
 	CRGROUP_EVD:   16
-    // Second tier
+	// Second tier
 	CRGROUP_REGEN:    32
 	CRGROUP_SPEED:    64
 	CRGROUP_DOUBLE:  128
 	CRGROUP_MAXPC:   256
-    // Third tier
+	// Third tier
 	CRGROUP_SCRESIST:   512
 	CRGROUP_SCINFLICT: 1024
 	CRGROUP_MANAUSE:   2048
 	CRGROUP_BOSSATK:   4096
-    // Final tier
+	// Final tier
 	CRGROUP_FINAL:   8192
 
 	comment__: "Effects"
@@ -2397,7 +2453,7 @@ constants_db: {
 	FX_HEALING:		703
 
 	comment__: "Emotes"
-    // TMW2 Emotes
+	// TMW2 Emotes
 	E_DISGUST:      1
 	E_SURPRISE:     2
 	E_HAPPY:        3
@@ -2415,7 +2471,7 @@ constants_db: {
 	E_QUEST:        15
 	E_THUMBUP:      16
 	E_DOUBT:        17
-    // Mana Plus Emotes
+	// Mana Plus Emotes
 	E_KITTY:        101
 	E_XD:           102
 	E_JOY:          103
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 6d295135d..8f375934c 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -190,6 +190,7 @@ item_db: (
 				monster(.@map$, .@x, .@y, l("Oak"), 1017, 1);
 				$TREE_PLANTED+=+1;
 				callfunc "SaggyScoreUpdate", callfunc("rand2", 1, 2);
+				callfunc "X24Event", X24_GROUP3, X24_G3_TREE;
 			} else {
 				monster(.@map$, .@x, .@y, l("Not An Oak"), SpringSquirrel, 1);
 			}
@@ -18100,6 +18101,7 @@ item_db: (
 				monster(.@map$, .@x, .@y, l("Oak"), 1017, 1);
 				$TREE_PLANTED+=+1;
 				callfunc "SaggyScoreUpdate", callfunc("rand2", 1, 2);
+				callfunc "X24Event", X24_GROUP3, X24_G3_TREE;
 			}
 		}
 	">