Level 2 Puzzles are finished. Still pending: Level 1, Level 3 and Level 4

2 files changed, 74 insertions, 0 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 75b4af8d..42c1c023 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3378,6 +3378,9 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 
 	comment__: "Christmas 2021 Constants"
 	X21_ACCEPTED:       1
+	X21_PLANTPUZZLE:    128
+	X21_LEVEL3:         256
+	X21_RIDDLEDONE:     512
 	X21_BOSSDEFEAT:     1024
 	X21_ALYSSAINIT:     2048
 	X21_ALYSSARESCUE:   4096
diff --git a/db/pre-re/mob_db.conf b/db/pre-re/mob_db.conf
index 50798b57..653b30e0 100644
--- a/db/pre-re/mob_db.conf
+++ b/db/pre-re/mob_db.conf
@@ -7002,4 +7002,75 @@ mob_db: (
 		CandyPumpkin: 1250
 	}
 },
+{
+	Id: 1164
+	SpriteName: "ChristmasTree"
+	Name: "Christmas Tree"
+	Lv: 40
+	Hp: 10000
+	Sp: 0
+	Exp: 3647
+	JExp: 392
+	AttackRange: 2
+	Attack: [40, 40]
+	Def: 20
+	Mdef: 40
+	Stats: {
+		Str: 30
+		Agi: 30
+		Vit: 30
+		Int: 30
+		Dex: 30
+		Luk: 30
+	}
+	ViewRange: 9
+	ChaseRange: 10
+	Size: 1
+	Race: 0
+	Element: (0, 1)
+	Mode: {
+		CanMove: true
+		CanAttack: true
+		ChangeTargetMelee: true
+		ChangeTargetChase: true
+	}
+	MoveSpeed: 190
+	AttackDelay: 1500
+	AttackMotion: 800
+	DamageMotion: 800
+},
+{
+	Id: 1165
+	SpriteName: "ChristmasGift"
+	Name: "Christmas Gift"
+	Lv: 1
+	Hp: 1
+	Sp: 0
+	Exp: 1
+	JExp: 1
+	AttackRange: 1
+	Attack: [0, 0]
+	Def: 0
+	Mdef: 5
+	Stats: {
+		Str: 0
+		Agi: 0
+		Vit: 0
+		Int: 0
+		Dex: 0
+		Luk: 0
+	}
+	ViewRange: 9
+	ChaseRange: 10
+	Size: 1
+	Race: 3
+	Element: (2, 1)
+	MoveSpeed: 800
+	AttackDelay: 800
+	AttackMotion: 672
+	DamageMotion: 480
+	Drops: {
+		FourLeafClover: 5
+	}
+},
 )