CONTENT III SUPER MERGE REQUEST

Included:
* Tulimshar Casino
* Placeholder fixing/filling
* Food Questline
* Rossy Quest
* Galimatia Quest (mostly by Livio)
* Edourard bugs
* Blood Donor Quest (from Moubootaur Legends)
* Merchant Guild Quest
* Mundane Bugfix
* La Marine
* Hurns Doctor easter eggs
* Sailing to Argaes with Legion
* Other things not relevant enough to be noted down, I guess

4 files changed, 159 insertions, 29 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 51a00953..76541432 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4953,22 +4953,24 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 	NPC_MANATREE:           210
 	NPC_HENRY:              211
 	NPC_NUNIA:              212
-	NPC_EOMIE:				213
-	NPC_BARD:				214
-	NPC_ADRIAN:				215
-	NPC_JOELIN:				216
-	NPC_HETCHEL:			217
-	NPC_MICHEL:				218
-	NPC_KPG_MANAGER:		219
-	NPC_SANDER:				220
-	NPC_NICKOS:				221
-	NPC_INYA:				222
-	NPC_KARL:				223
-	NPC_SILVIA:				224
-	NPC_ANWAR:				225
-	NPC_REBECCA:			226
-	NPC_PAULINE:			227
+	NPC_EOMIE:              213
+	NPC_BARD:               214
+	NPC_ADRIAN:             215
+	NPC_JOELIN:             216
+	NPC_HETCHEL:            217
+	NPC_MICHEL:             218
+	NPC_KPG_MANAGER:        219
+	NPC_SANDER:             220
+	NPC_NICKOS:             221
+	NPC_INYA:               222
+	NPC_KARL:               223
+	NPC_SILVIA:             224
+	NPC_ANWAR:              225
+	NPC_REBECCA:            226
+	NPC_PAULINE:            227
 	NPC_JUKEBOX:            228
+	NPC_LA_MARINE:          229
+	NPC_TIKI:               230
 
 	NPC_CONFUSED_TREE:      400
 	NPC_ALIGE:              401
@@ -5038,14 +5040,15 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 	NPC_SEWER_GATE:         467
 	NPC_SEWER_WHEEL:        468
 	NPC_TREASURE:           469
-	NPC_MORCANT:			470
+	NPC_MORCANT:            470
 	NPC_UKAR_FEMALE_BROTHERHOOD: 471
 	NPC_RAIJIN_MALE_BROTHERHOOD: 472
 	NPC_HUMAN_MALE_BROTHERHOOD: 473
-	NPC_MAGE_RED:			474
-	NPC_MAGE_BROWN:			475
-	NPC_MAGE_BLUE:			476
-	NPC_HAL:				477
+	NPC_MAGE_RED:           474
+	NPC_MAGE_BROWN:         475
+	NPC_MAGE_BLUE:          476
+	NPC_HAL:                477
+	NPC_SUMMONING_CIRC:     478
 
 	NPC_TEST1:              800
 	NPC_PLAYER:             801
@@ -5062,6 +5065,23 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 	NPC_DAN_NOTE:           912
 	NPC_OFFSET_NO_SPRITE:   998
 
+    // Avatars (1000+)
+	AVATAR_CARDA:           1000
+	AVATAR_CARD2:           1001
+	AVATAR_CARD3:           1002
+	AVATAR_CARD4:           1003
+	AVATAR_CARD5:           1004
+	AVATAR_CARD6:           1005
+	AVATAR_CARD7:           1006
+	AVATAR_CARD8:           1007
+	AVATAR_CARD9:           1008
+	AVATAR_CARD10:          1009
+	AVATAR_CARDJ:           1010
+	AVATAR_CARDQ:           1011
+	AVATAR_CARDK:           1012
+	AVATAR_CARD_JOKER:      1013
+	AVATAR_CARD_COVER:      1015
+
 	comment__: "special npcs"
 	NPC_EMPTY:              -1
 	NPC_WARP:               45
@@ -5175,8 +5195,24 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 	LANG_DE:    3
 	MAX_LANG:   3
 
+	comment__: "Daily Constants"
+	DAILY_LOWLEVEL:     0
+    DAILY_IGNORED:      1
+    DAILY_NOPTS:        2
+    DAILY_NOITEMS:      3
+    DAILY_OK:           4
+
 	comment__: "Misc settings"
 	CHEST_WAITTIME: 900 // 15 minutes
+	ROSSY_INSTIME:  1200 // 20 minutes
+	VEGAN:          1
+	CARNIVOROUS:    2
+
+	comment__: "Merchant Requests"
+	MERCQ_LETTER:   1
+	MERCQ_GOODS:    2
+	MERCQ_SCOUT:    3
+	MERCQ_NONE:     99
 
 	comment__: "Magic constants"
 	CLASS_OTHER:        0
@@ -5187,5 +5223,27 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 	CLASS_WATER:        5
 	CLASS_HARMONY:      6
 
+	comment__: "Location Constants"
+	TP_NONE:            0
+	TP_ARTIS:           1
+	TP_TULIM:           2
+	TP_HURNS:           4
+	TP_CANDOR:          8
+	TP_ARGAES:          16
+
+	comment__: "Rossy Quest Constants"
+	ROSSY_PROLOGUE:     1
+	ROSSY_CAVE1:        2
+	ROSSY_CAVE2:        4
+	ROSSY_CAVE3:        8
+	ROSSY_CAVE4:        16
+	ROSSY_CAVE5:        32
+	ROSSY_CAVE6:        64
+	ROSSY_CAVE7:        128
+	ROSSY_CAVE8:        256
+	ROSSY_CAVE9:        512
+	ROSSY_READY:        1023
+	ROSSY_BOSSCAVE:     1024
+
 	@include "conf/import/constants.conf"
 }
diff --git a/db/map_index.txt b/db/map_index.txt
index d3d4f255..7acdcebf 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -157,12 +157,17 @@
 020-2-31 157
 020-2-32 158
 020-2-33 159
-020-2-4 160
-020-2-5 161
-020-2-6 162
-020-2-7 163
-020-2-8 164
-020-2-9 165
-sec_pri 166
-test 167
-testbg 168
+020-2-34 160
+020-2-4 161
+020-2-5 162
+020-2-6 163
+020-2-7 164
+020-2-8 165
+020-2-9 166
+botcheck 167
+fermi 168
+marine-2 169
+marine 170
+sec_pri 171
+test 172
+testbg 173
diff --git a/db/quest_db.conf b/db/quest_db.conf
index 794d6e80..88158915 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -199,6 +199,14 @@ quest_db: (
 	Id: 58
 	Name: "ArgaesQuest_Galimatia"
 },
+{
+	Id: 59
+	Name: "HurnscaldQuests_Rossy"
+},
+{
+	Id: 60
+	Name: "HurnscaldQuests_BloodDonor"
+},
 
 // Event and General Quests (100~149)
 {
@@ -213,6 +221,48 @@ quest_db: (
 	Id: 102
 	Name: "Halloween_BarrelQuest"
 },
+{
+	Id: 103
+	Name: "General_SmearedHands"
+},
+{
+	Id: 104
+	Name: "General_MerchantRequest"
+},
+
+// Tonori Quests (150~199)
+{
+	Id: 150
+	Name: "TonoriQuest_Kylian"
+},
+{
+	Id: 151
+	Name: "TonoriQuest_Anwar"
+},
+{
+	Id: 152
+	Name: "TonoriQuest_Imec"
+},
+{
+	Id: 153
+	Name: "TonoriQuest_Hetchel"
+},
+{
+	Id: 154
+	Name: "TonoriQuest_Inya"
+},
+{
+	Id: 155
+	Name: "TonoriQuest_Heathin"
+},
+{
+	Id: 156
+	Name: "TonoriQuest_Riskim"
+},
+{
+	Id: 157
+	Name: "TonoriQuest_Hocus"
+},
 
 // Test Quests, Debug Quests, etc. (1000+)
 {
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 49a35b5c..b8ad71ab 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2535,6 +2535,23 @@ item_db: (
 	Sell: 120
 	Weight: 110
 },
+{
+	Id: 821
+	AegisName: "Suitcase"
+	Name: "Suitcase"
+	Type: "IT_ETC"
+	Buy: 900
+	Sell: 150
+	Weight: 8000
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
 // Necklaces
 {
 	Id: 1000