Sfoglia il codice sorgente

Updates 16.1 quests to official scripts (#4719)

* Added a sql update to replace the main quest variables

Thanks to @Akaineko-astasi and @Badarosk0 !
Atemo 4 anni fa
parent
commit
47c471e3d0

+ 11 - 11
db/re/item_db_etc.yml

@@ -23426,7 +23426,7 @@ Body:
       NoMail: true
       NoAuction: true
   - Id: 6920
-    AegisName: Rune_Magic_Powder
+    AegisName: RuneMagicPowder
     Name: Rune Magic Powder
     Type: Etc
     Buy: 10
@@ -23440,7 +23440,7 @@ Body:
       NoMail: true
       NoAuction: true
   - Id: 6921
-    AegisName: Dehumidifiers
+    AegisName: Desiccant
     Name: Dehumidifiers
     Type: Etc
     Buy: 10
@@ -23456,7 +23456,7 @@ Body:
     Flags:
       BuyingStore: true
   - Id: 6923
-    AegisName: Bright_Fire_Lights
+    AegisName: Bright_Lights
     Name: Bright Fire Lights
     Type: Etc
     Buy: 10
@@ -23471,7 +23471,7 @@ Body:
       NoMail: true
       NoAuction: true
   - Id: 6924
-    AegisName: Red_Eye
+    AegisName: Red_Eyes
     Name: Red Eye
     Type: Etc
     Buy: 10
@@ -23479,7 +23479,7 @@ Body:
     Flags:
       BuyingStore: true
   - Id: 6925
-    AegisName: Letter_Of_Prisoner
+    AegisName: Prisoner_Letter
     Name: Letter Of Prisoner
     Type: Etc
     Buy: 10
@@ -23507,7 +23507,7 @@ Body:
       NoMail: true
       NoAuction: true
   - Id: 6927
-    AegisName: Stone_That_Contained_Sea
+    AegisName: Filled_With_SeaStones
     Name: Stone That Contained Sea
     Type: Etc
     Buy: 10
@@ -23521,7 +23521,7 @@ Body:
       NoMail: true
       NoAuction: true
   - Id: 6928
-    AegisName: Poring_Scourer
+    AegisName: Poring_Loofah
     Name: Poring Scourer
     Type: Etc
     Buy: 10
@@ -23535,7 +23535,7 @@ Body:
       NoMail: true
       NoAuction: true
   - Id: 6929
-    AegisName: Letter_With_Stamped_Seal
+    AegisName: Letters_Stamped_Seal
     Name: Letter With Stamped Seal
     Type: Etc
     Buy: 10
@@ -23549,7 +23549,7 @@ Body:
       NoMail: true
       NoAuction: true
   - Id: 6930
-    AegisName: Samples_New_Business_Items
+    AegisName: Biz_Items_Sample
     Name: Samples New Business Items
     Type: Etc
     Buy: 10
@@ -23620,8 +23620,8 @@ Body:
       NoMail: true
       NoAuction: true
   - Id: 6935
-    AegisName: Advanced_Dish
-    Name: Advanced Dish
+    AegisName: Luxurious_Dish
+    Name: High-Class Dish
     Type: Etc
     Buy: 10
     Trade:

+ 1 - 1
db/re/item_db_usable.yml

@@ -46906,7 +46906,7 @@ Body:
       itemskill "AL_INCAGI",1;
       heal -15,0;
   - Id: 22901
-    AegisName: Question_Old_Blue_Box
+    AegisName: BlueboxOfQuestions
     Name: Mysterious Blue Box
     Type: Usable
     Buy: 20

+ 2 - 2
db/re/mob_db.yml

@@ -81493,7 +81493,7 @@ Body:
     DamageMotion: 432
     Ai: 04
     Drops:
-      - Item: Dehumidifiers
+      - Item: Desiccant
         Rate: 2000
         StealProtected: true
       - Item: Frozenwolf_Card
@@ -81565,7 +81565,7 @@ Body:
     DamageMotion: 480
     Ai: 04
     Drops:
-      - Item: Red_Eye
+      - Item: Red_Eyes
         Rate: 2000
         StealProtected: true
       - Item: Watcher_Card

+ 9 - 9
db/re/quest_db.yml

@@ -2359,7 +2359,7 @@ Body:
     Title: Lowly Standards
     Drops:
       - Mob: WATCHER
-        Item: Red_Eye
+        Item: Red_Eyes
         Rate: 2000
   - Id: 5429
     Title: "[Stand by]Lowly Standards"
@@ -2368,7 +2368,7 @@ Body:
     Title: "[Repeat]Lowly Standards"
     Drops:
       - Mob: WATCHER
-        Item: Red_Eye
+        Item: Red_Eyes
         Rate: 2000
   - Id: 5431
     Title: Clean Life
@@ -2392,7 +2392,7 @@ Body:
     Title: Refreshing Prison Life
     Drops:
       - Mob: FROZENWOLF
-        Item: Dehumidifiers
+        Item: Desiccant
         Rate: 2000
   - Id: 5440
     Title: "[Stand by]Refreshing Prison Life"
@@ -2401,7 +2401,7 @@ Body:
     Title: "[Repeat]Refreshing Prison Life"
     Drops:
       - Mob: FROZENWOLF
-        Item: Dehumidifiers
+        Item: Desiccant
         Rate: 2000
   - Id: 5442
     Title: Suppressing Darkness
@@ -6400,7 +6400,7 @@ Body:
     Title: Why Should I Prepare for the Banquets?
     Drops:
       - Mob: GLASS_PLATE
-        Item: Advanced_Dish
+        Item: Luxurious_Dish
         Rate: 3000
   - Id: 11420
     Title: Why Should I Prepare for the Banquets?
@@ -6420,7 +6420,7 @@ Body:
     Title: "Banquet: Washing 15 Dishes"
     Drops:
       - Mob: GLASS_PLATE
-        Item: Advanced_Dish
+        Item: Luxurious_Dish
         Rate: 3000
   - Id: 11427
     Title: Complete Today's Dish Collecting
@@ -8219,7 +8219,7 @@ Body:
     Title: Please Find the Token of Memory
     Drops:
       - Mob: MEDUSA
-        Item: Stone_That_Contained_Sea
+        Item: Filled_With_SeaStones
         Rate: 3000
   - Id: 14488
     Title: Please Deliver My Love
@@ -8229,7 +8229,7 @@ Body:
     Title: My Love Once More
     Drops:
       - Mob: MEDUSA
-        Item: Stone_That_Contained_Sea
+        Item: Filled_With_SeaStones
         Rate: 3000
   - Id: 14491
     Title: I Have to Turn It Down Again
@@ -8240,7 +8240,7 @@ Body:
     Title: Today I Feel
     Drops:
       - Mob: MEDUSA
-        Item: Stone_That_Contained_Sea
+        Item: Filled_With_SeaStones
         Rate: 3000
   - Id: 14494
     Title: I Have to Turn It Down Again

+ 1 - 1
npc/re/instances/RitualOfBlessing.txt

@@ -613,7 +613,7 @@ OnDisable:
 		mes "There is much left for use to find out.";
 		erasequest 7692;
 		setquest 7693;// Surprise Attack
-		banquet_main_quest = 9;
+		ep16_royal = 9;
 		next;
 		mes "[Kronecker]";
 		mes "Whoever left here, clear out with the wounded near you!";

+ 4 - 4
npc/re/instances/RoomOfConsciousness.txt

@@ -744,10 +744,10 @@ OnMobDead:
 	enablenpc instance_npcname("Iris#6mir");
 	enablenpc instance_npcname("Bijou#6mir");
 
-	if (playerattached() && 'exploit_disabled && banquet_main_quest == 21) {
+	if (playerattached() && 'exploit_disabled && ep16_royal == 19) {
 		erasequest 7700;// Once More!
 		setquest 7701;// Lost Imir Heart
-		banquet_main_quest = 22;
+		ep16_royal = 20;
 	}
 	end;
 }
@@ -882,10 +882,10 @@ OnStop:
 	mes "[Fenrir]";
 	mes "We'd better get out of here, too! This place is too dangerous!";
 	close2;
-	if (banquet_main_quest == 21) {
+	if (ep16_royal == 19) {
 		erasequest 7700;// Once More!
 		setquest 7701;// Lost Imir Heart
-		banquet_main_quest = 22;
+		ep16_royal = 20;
 	}
 	warp "prt_lib_q",88,83;
 	end;

+ 2 - 2
npc/re/mobs/prt_cas.txt

@@ -6,5 +6,5 @@
 //= 1.0 First version. [Capuche]
 //============================================================
 
-// Prontera Castle
-prt_cas,367,138,15,19	monster	Plate	3455,15
+// Prontera Castle - GLASS_PLATE
+prt_cas,367,138,16,22	monster	Plate	3455,15

File diff suppressed because it is too large
+ 291 - 235
npc/re/quests/quests_16_1.txt


+ 3 - 3
npc/re/quests/quests_16_2.txt

@@ -10,7 +10,7 @@
 prt_cas_q,29,28,0	script	#ep162_evt_npc_con	HIDDEN_WARP_NPC,2,2,{
 	end;
 OnTouch:
-	if (banquet_main_quest < 18)	// pre-req : access to room of consciousness (first time)
+	if (ep16_royal < 17)	// pre-req : access to room of consciousness (first time)
 		end;
 	if (terra_gloria_main == 0) {
 		cloakoffnpc "Nihil M. Heine#ep162_01", getcharid(0);
@@ -35,7 +35,7 @@ prt_cas_q,23,33,2	duplicate(dummy_cloaked_npc)	Crux#ep162_03	4_EP16_CRUX
 prt_cas_q,23,32,3	duplicate(dummy_cloaked_npc)	Kronecker G. Heine#ep162	4_EP16_GRANZ
 
 prt_cas_q,21,39,3	script	Nihil M. Heine#ep162_01	4_EP16_NIHIL,{
-	if (banquet_main_quest < 18)	// pre-req : access to room of consciousness (first time)
+	if (ep16_royal < 17)	// pre-req : access to room of consciousness (first time)
 		end;
 	if (terra_gloria_main == 0) {
 		cutin "ep16_nihi_miseria_heine02.bmp",2;
@@ -340,7 +340,7 @@ prt_cas_q,21,39,3	script	Nihil M. Heine#ep162_01	4_EP16_NIHIL,{
 }
 
 prt_cas_q,23,36,3	script	Spica Nerius#ep162_01	4_EP16_SPICA,{
-	if (banquet_main_quest < 18)
+	if (ep16_royal < 17)
 		end;
 	if (terra_gloria_main == 1) {
 		cutin "ep16_spica_nerius01.bmp",1;

+ 158 - 91
npc/re/warps/cities/prontera.txt

@@ -6,94 +6,161 @@
 //= 1.0 Prontera castle map changed in ep16.1 [Capuche]
 //============================================================
 
-//= Prontera City ============================================
-prontera,156,358,0	warp	prt_cas_B#prt_cas_A	1,1,prt_cas,216,146
-
-//= Prontera Castle ===========================================
-prt_cas,216,142,0	warp	prt_cas_A#prt_cas_B	1,1,prontera,156,354
-
-prt_cas,82,175,0	warp	prt_cas_C#prt_cas_D	1,1,prt_gld,159,30
-
-// castle left side
-prt_cas_q,154,8,0	warp	prt_cas_F#prt_cas_E	1,1,prt_cas,156,163
-
-prt_cas,164,177,0	warp	prt_cas_G#prt_cas_H	1,1,prt_cas,54,156
-prt_cas,54,152,0	warp	prt_cas_H#prt_cas_G	1,1,prt_cas,164,172
-
-prt_cas,197,148,0	warp	prt_cas_I#prt_cas_J	1,1,prt_cas,31,117
-prt_cas,31,120,0	warp	prt_cas_J#prt_cas_I	1,1,prt_cas,197,152
-
-prt_cas,178,148,0	warp	prt_cas_K#prt_cas_L	1,1,prt_cas,27,43
-prt_cas,27,47,0	warp	prt_cas_L#prt_cas_K	1,1,prt_cas,178,152
-
-// Rooms
-// Belle
-prt_cas_q,130,8,0	warp	prt_cas_M#prt_cas_N	1,1,prt_cas_q,30,28
-prt_cas_q,34,28,0	warp	prt_cas_N#prt_cas_M	1,1,prt_cas_q,134,8
-
-// Heine
-prt_cas_q,34,78,0	warp	prt_cas_O#prt_cas_P	1,1,prt_cas_q,134,32
-
-// Nerius
-// it's locked
-prt_cas_q,34,128,0	warp	prt_cas_Q#prt_cas_R	1,1,prt_cas_q,134,56
-
-// Walther
-prt_cas_q,130,80,0	warp	prt_cas_S#prt_cas_T	1,1,prt_cas_q,30,178
-prt_cas_q,34,178,0	warp	prt_cas_T#prt_cas_S	1,1,prt_cas_q,134,80
-
-// castle right side
-prt_cas_q,132,119,0	warp	prt_cas_V#prt_cas_U	1,1,prt_cas,274,163
-
-prt_cas,268,176,0	warp	prt_cas_W#prt_cas_X	1,1,prt_cas,110,156
-prt_cas,110,152,0	warp	prt_cas_X#prt_cas_W	1,1,prt_cas,268,172
-
-prt_cas,253,148,0	warp	prt_cas_Y#prt_cas_Z	1,1,prt_cas,174,37
-prt_cas,174,40,0	warp	prt_cas_Z#prt_cas_Y	1,1,prt_cas,253,152
-
-prt_cas,235,148,0	warp	prt_cas_1#prt_cas_2	1,1,prt_cas,174,104
-prt_cas,174,108,0	warp	prt_cas_2#prt_cas_1	1,1,prt_cas,235,152
-
-// Rooms
-// Wigner
-prt_cas_q,153,119,0	warp	prt_cas_3#prt_cas_4	1,1,prt_cas_q,78,21
-prt_cas_q,74,21,0	warp	prt_cas_4#prt_cas_3	1,1,prt_cas_q,149,119
-
-// Richards
-prt_cas_q,153,143,0	warp	prt_cas_5#prt_cas_6	1,1,prt_cas_q,78,77
-prt_cas_q,74,77,0	warp	prt_cas_6#prt_cas_5	1,1,prt_cas_q,149,143
-
-// Geoborg
-prt_cas_q,153,167,0	warp	prt_cas_7#prt_cas_8	1,1,prt_cas_q,78,131
-prt_cas_q,74,131,0	warp	prt_cas_8#prt_cas_7	1,1,prt_cas_q,149,167
-
-// Roegenburg
-prt_cas_q,153,191,0	warp	prt_cas_9#prt_cas_10	1,1,prt_cas_q,78,189
-prt_cas_q,74,189,0	warp	prt_cas_10#prt_cas_9	1,1,prt_cas_q,149,191
-
-// Hall
-prt_cas,216,184,0	warp	prt_cas_11#prt_cas_12	1,1,prt_cas,93,212
-prt_cas,93,208,0	warp	prt_cas_12#prt_cas_11	1,1,prt_cas,216,180
-
-// Dinner room
-prt_cas,54,217,0	warp	prt_cas_13#prt_cas_14	1,1,prt_cas,388,137
-prt_cas,392,137,0	warp	prt_cas_14#prt_cas_13	1,1,prt_cas,58,217
-
-// Kitchen
-prt_cas,41,275,0	warp	prt_cas_15#prt_cas_16	1,1,prt_cas,320,182
-prt_cas,320,178,0	warp	prt_cas_16#prt_cas_15	1,1,prt_cas,41,271
-
-// Library
-prt_cas,130,218,0	warp	prt_cas_17#prt_cas_18	1,1,prt_cas,303,48
-prt_cas,300,48,0	warp	prt_cas_18#prt_cas_17	1,1,prt_cas,127,218
-
-// Prison
-prt_pri00,54,139,0	warp	prt_cas_19#prt_cas_20	1,1,prt_cas,182,258
-
-prt_prison,155,290,0	warp2	prt_cas_21#prt_cas_22	2,2,prt_pri00,50,120
-
-prt_cas,174,234,0	warp	prt_cas_23#prt_cas_24	1,1,prt_cas,247,107
-prt_cas,247,111,0	warp	prt_cas_24#prt_cas_23	1,1,prt_cas,174,237
-
-// Prontera invasion
-prt_q,155,358,0	warp	prt_cas_25#prt_cas_26	1,1,prt_lib_q,89,43
+prt_lib_q,9,25,0	script	lib_q_to_pprt	WARPNPC,1,1,{
+	end;
+OnTouch:
+	if (ep16_royal < 21) {
+		mes "There are more to find out.";
+		mes "Go back to Nillem.";
+		close;
+	}
+	warp "prt_q",155,354;
+	end;
+}
+
+prt_cas,152,163,0	script	way_to_qroom_L_qroom_L_to_way	WARPNPC,1,1,{
+	end;
+OnTouch:
+	if (ep16_royal == 0) {
+		npctalk "That way is a royal villa for VIPs. Outsiders cannot access the place.", "Royal Guardian Knight#02", bc_self;
+		setpcblock PCBLOCK_NPC, true;
+		sleep2 3000;
+		setpcblock PCBLOCK_NPC, false;
+		npctalk "If you are invited, a severnt should be there to greet you. Please be guided officially.", "Royal Guardian Knight#02", bc_self;
+		end;
+	}
+	warp "prt_cas_q",150,8;
+    end;
+}
+
+prt_cas,278,163,0	script	way_to_qroom_R_qroom_R_to_way	WARPNPC,1,1,{
+	end;
+OnTouch:
+	if (ep16_royal == 0) {
+		npctalk "That way is a royal villa for VIPs. Outsiders cannot access the place.", "Royal Guardian Knight#03", bc_self;
+		setpcblock PCBLOCK_NPC, true;
+		sleep2 3000;
+		setpcblock PCBLOCK_NPC, false;
+		npctalk "If you are invited, a severnt should be there to greet you. Please be guided officially.", "Royal Guardian Knight#03", bc_self;
+		end;
+	}
+	warp "prt_cas_q",135,119;
+    end;
+}
+
+prt_cas_q,130,32,0	script	qroom_heine_in_qroom_heine_out	WARPNPC,1,1,{
+	end;
+OnTouch:
+	if (ep16_royal > 7 && ep16_royal < 16) {
+		mes "It is locked.";
+		close;
+	}
+	warp "prt_cas_q",30,78;
+    end;
+}
+
+prt_cas_q,130,56,0	script	qroom_nerius_in_qroom_nerius_out	WARPNPC,1,1,{
+	end;
+OnTouch:
+	if (ep16_royal > 2 && ep16_royal < 15 && ep16_royal != 7) {
+		mes "It is locked.";
+		close;
+	}
+	if (ep16_royal == 15) {
+		if (isbegin_quest(7697) < 1) {
+			mes "Let's first reply to the servant that the invitation will be accepted.";
+			close;
+		}
+	}
+	warp "prt_cas_q",30,128;
+    end;
+}
+
+prt_lib,9,24,0	script	lib_to_prt_prison	WARPNPC,1,1,{
+	end;
+OnTouch_:
+	if (ep16_royal > 13)
+		warp "prt_pri00",60,127;
+	else {
+		mes "[Guardian Knight]";
+		mes "You cannot go that way.";
+		close2;
+		warp "prt_lib",60,61;
+	}
+	end;
+}
+
+prt_cas,188,258,0	script	prt_cas_to_prt_pri00	WARPNPC,1,1,{
+	end;
+OnTouch_:
+	if (ep16_royal >= 2)
+		warp "prt_pri00",54,134;
+	else {
+		npctalk "You shouldn't enter the place like that.", "Guardian Knight#ep16_prigate01", bc_self;
+		setpcblock PCBLOCK_NPC, true;
+		sleep2 2000;
+		setpcblock PCBLOCK_NPC, false;
+		warp "prt_cas",182,258;
+	}
+	end;
+}
+
+prt_pri00,54,139,0	warp	prt_pri_to_prt_cas	1,1,prt_cas,182,258
+
+prt_prison,155,290,0	warp2	prt_prison_OUT	2,2,prt_pri00,50,120
+
+prt_q,155,358,0	warp	#prt_q_tp_lib_q	1,1,prt_lib_q,89,43
+
+prt_cas_q,34,78,0	warp	qroom_heine_out_qroom_heine_in	1,1,prt_cas_q,134,32
+prt_cas_q,154,8,0	warp	qroom_L_to_way_way_to_qroom_L	1,1,prt_cas,156,163
+prt_cas_q,132,119,0	warp	qroom_R_to_way_way_to_qroom_R	1,1,prt_cas,274,163
+prt_cas_q,130,8,0	warp	qroom_vip_in_qroom_vip_out	1,1,prt_cas_q,30,28
+prt_cas_q,34,28,0	warp	qroom_vip_out_qroom_vip_in	1,1,prt_cas_q,134,8
+
+prt_cas_q,34,128,0	warp	qroom_nerius_out_qroom_nerius_in	1,1,prt_cas_q,134,56
+prt_cas_q,130,80,0	warp	qroom_valter_in_qroom_balter_out	1,1,prt_cas_q,30,178
+prt_cas_q,34,178,0	warp	qroom_balter_out_qroom_valter_in	1,1,prt_cas_q,134,80
+prt_cas_q,153,119,0	warp	qroom_wigner_in_qroom_wigner_out	1,1,prt_cas_q,78,21
+prt_cas_q,74,21,0	warp	qroom_wigner_out_qroom_wigner_in	1,1,prt_cas_q,149,119
+prt_cas_q,153,143,0	warp	qroom_richard_in_qroom_richard_out	1,1,prt_cas_q,78,77
+prt_cas_q,74,77,0	warp	qroom_richard_out_qroom_richard_in	1,1,prt_cas_q,149,143
+prt_cas_q,153,167,0	warp	qroom_geob_in_qroom_geob_out	1,1,prt_cas_q,78,131
+prt_cas_q,74,131,0	warp	qroom_geob_out_qroom_geob_in	1,1,prt_cas_q,149,167
+prt_cas_q,153,191,0	warp	qroom_lugen_in_qroom_lugen_out	1,1,prt_cas_q,78,189
+prt_cas_q,74,189,0	warp	qroom_lugen_out_qroom_lugen_in	1,1,prt_cas_q,149,191
+prt_cas,216,184,0	warp	mainhall_in_mainhall_out	1,1,prt_cas,93,212
+prt_cas,93,208,0	warp	mainhall_out_mainhall_in	1,1,prt_cas,216,180
+prt_cas,197,148,0	warp	guestroom_l1_in_guestroom_l1	1,1,prt_cas,31,117
+prt_cas,31,120,0	warp	guestroom_l1_guestroom_l1_in	1,1,prt_cas,197,152
+prt_cas,178,148,0	warp	guestroom_l2_in_guestroom_l2	1,1,prt_cas,27,43
+prt_cas,27,47,0	warp	guestroom_l2_guestroom_l2_in	1,1,prt_cas,178,152
+prt_cas,235,148,0	warp	guestroom_r1_in_guestroom_r1	1,1,prt_cas,174,104
+prt_cas,174,108,0	warp	guestroom_r1_guestroom_r1_in	1,1,prt_cas,235,152
+prt_cas,253,148,0	warp	guestroom_r2_in_guestroom_r2	1,1,prt_cas,174,37
+prt_cas,174,40,0	warp	guestroom_r2_guestroom_r2_in	1,1,prt_cas,253,152
+prt_cas,164,177,0	warp	way_up_L_way_down_L	1,1,prt_cas,54,156
+prt_cas,54,152,0	warp	way_down_L_way_up_L	1,1,prt_cas,164,172
+prt_cas,268,176,0	warp	way_up_R_way_down_R	1,1,prt_cas,110,156
+prt_cas,110,152,0	warp	way_down_R_way_up_R	1,1,prt_cas,268,172
+prt_cas,82,175,0	warp	way_to_gld_gld_to_cas	1,1,prt_gld,159,30
+prt_gld,159,24,0	warp	gld_to_cas_way_to_gld	1,1,prt_cas,82,171
+prt_cas,130,218,0	warp	library_in_library_out	1,1,prt_cas,303,48
+prt_cas,300,48,0	warp	library_out_library_in	1,1,prt_cas,127,218
+prt_cas,174,234,0	warp	cruroom_in_cruroom_out	1,1,prt_cas,247,107
+prt_cas,247,111,0	warp	cruroom_out_cruroom_in	1,1,prt_cas,174,237
+prt_cas,41,275,0	warp	cuisine_in_cuisine_out	1,1,prt_cas,320,182
+prt_cas,320,178,0	warp	cuisine_out_cuisine_in	1,1,prt_cas,41,271
+prt_cas,54,217,0	warp	dining_in_dining_out	1,1,prt_cas,388,137
+prt_cas,392,137,0	warp	dining_out_dining_in	1,1,prt_cas,58,217
+prt_cas,19,342,0	warp	queen_room_in_queen_room_out	1,1,prt_cas,269,313
+prt_cas,273,313,0	warp	queen_room_out_queen_room_in	1,1,prt_cas,23,342
+prt_cas,174,342,0	warp	king_room_in_king_room_out	1,1,prt_cas,322,336
+prt_cas,318,336,0	warp	king_room_out_king_room_in	1,1,prt_cas,170,342
+prt_cas,48,330,0	warp	queen_office_in_queein_office_out	1,1,prt_cas,251,242
+prt_cas,251,246,0	warp	queein_office_out_queen_office_in	1,1,prt_cas,48,334
+prt_cas,146,330,0	warp	king_office_in_king_office_out	1,1,prt_cas,309,288
+prt_cas,309,291,0	warp	king_office_out_king_office_in	1,1,prt_cas,146,334
+prt_cas,254,347,0	warp	garden_in_garden_out	1,1,prt_cas,96,18
+prt_cas,96,14,0	warp	garden_out_garden_in	1,1,prt_cas,254,343
+prt_cas,216,142,0	warp	cas_out_prt_to_cas	1,1,prontera,156,354
+prontera,156,358,0	warp	prt_to_cas_cas_out	1,1,prt_cas,216,146

+ 10 - 10
sql-files/item_db_re_etc.sql

@@ -2094,22 +2094,22 @@ 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 (6916,'Piece_Of_Soul_Monkey','Piece Of Soul Monkey','Etc',10,100,true,true,true,true,true,true,true);
 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 (6917,'Piece_Of_Soul_Chicken','Piece Of Soul Chicken','Etc',10,100,true,true,true,true,true,true,true);
 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 (6919,'TokenOfHonor','Honor Token','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_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (6920,'Rune_Magic_Powder','Rune Magic Powder','Etc',10,10,100,true,true,true,true,true,true);
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_buyingstore`) VALUES (6921,'Dehumidifiers','Dehumidifiers','Etc',10,10,true);
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (6920,'RuneMagicPowder','Rune Magic Powder','Etc',10,10,100,true,true,true,true,true,true);
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_buyingstore`) VALUES (6921,'Desiccant','Dehumidifiers','Etc',10,10,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_buyingstore`) VALUES (6922,'Sandpaper','Sandpaper','Etc',10,10,true);
-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 (6923,'Bright_Fire_Lights','Bright Fire Lights','Etc',10,10,100,true,true,true,true,true,true,true);
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_buyingstore`) VALUES (6924,'Red_Eye','Red Eye','Etc',10,10,true);
-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 (6925,'Letter_Of_Prisoner','Letter Of Prisoner','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_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (6923,'Bright_Lights','Bright Fire Lights','Etc',10,10,100,true,true,true,true,true,true,true);
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_buyingstore`) VALUES (6924,'Red_Eyes','Red Eye','Etc',10,10,true);
+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 (6925,'Prisoner_Letter','Letter Of Prisoner','Etc',10,100,true,true,true,true,true,true,true);
 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 (6926,'Midgards_Histories','Rune-Midgarts History Book','Etc',10,100,true,true,true,true,true,true,true);
-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 (6927,'Stone_That_Contained_Sea','Stone That Contained Sea','Etc',10,100,true,true,true,true,true,true,true);
-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 (6928,'Poring_Scourer','Poring Scourer','Etc',10,100,true,true,true,true,true,true,true);
-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 (6929,'Letter_With_Stamped_Seal','Letter With Stamped Seal','Etc',10,100,true,true,true,true,true,true,true);
-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 (6930,'Samples_New_Business_Items','Samples New Business Items','Etc',10,100,true,true,true,true,true,true,true);
+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 (6927,'Filled_With_SeaStones','Stone That Contained Sea','Etc',10,100,true,true,true,true,true,true,true);
+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 (6928,'Poring_Loofah','Poring Scourer','Etc',10,100,true,true,true,true,true,true,true);
+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 (6929,'Letters_Stamped_Seal','Letter With Stamped Seal','Etc',10,100,true,true,true,true,true,true,true);
+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 (6930,'Biz_Items_Sample','Samples New Business Items','Etc',10,100,true,true,true,true,true,true,true);
 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 (6931,'Secret_Documents','Secret Documents','Etc',10,100,true,true,true,true,true,true,true);
 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 (6932,'Rare_Book','Rare Book','Etc',10,100,true,true,true,true,true,true,true);
 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 (6933,'Banquet_Invitation_Letter','Banquet Invitation Letter','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_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (6934,'Magnificent_Dish','Magnificent Dish','Etc',10,1000,100,true,true,true,true,true,true,true);
-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 (6935,'Advanced_Dish','Advanced Dish','Etc',10,100,true,true,true,true,true,true,true);
+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 (6935,'Luxurious_Dish','High-Class Dish','Etc',10,100,true,true,true,true,true,true,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_buyingstore`) VALUES (6936,'Cold_Core','Cold Core','Etc',10,10,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_buyingstore`) VALUES (6937,'Silicone_Shell','Silicone Shell','Etc',10,10,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_buyingstore`) VALUES (6938,'Hedgehog_Picks','Hedgehog Picks','Etc',10,10,true);

+ 1 - 1
sql-files/item_db_re_usable.sql

@@ -3209,7 +3209,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`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22895,'Limited_2015_Status_Initialization_Volume','(Limited)2015 Status Initialization Volume','Usable',20,100,true,true,true,true,true,true,true,true,'/*Works like item 6320, can reset up to 3x within 1 hour*/');
 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`,`script`) VALUES (22896,'Limited_Old_Status_Initialization_Volume','(Limited)Old Status Initialization Volume','Usable',20,100,true,true,true,true,true,true,true,true,'/*Works like item 6320, can reset up to 3x within 1 hour*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`script`) VALUES (22899,'DowntownMap','Parchment City','Usable',20,'itemskill "AL_INCAGI",1;\nheal -15,0;');
-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`,`script`) VALUES (22901,'Question_Old_Blue_Box','Mysterious Blue Box','Usable',20,100,true,true,true,true,true,true,true,'callfunc("F_Mysterious_box");');
+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`,`script`) VALUES (22901,'BlueboxOfQuestions','Mysterious Blue Box','Usable',20,100,true,true,true,true,true,true,true,'callfunc("F_Mysterious_box");');
 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 (22902,'Sealed_Card_Album_Scroll_II','Sealed Card Album Scroll II','Usable',20,10,100,true,true,true,true,true,true,true,'getitem callfunc("F_Rand",6238,6239,17474,22829,24243,24244,24245),1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`script`) VALUES (22905,'Enchant_Stone_Box6','Costume Enchant Stone Box 6','Cash',10,10,1,'getgroupitem(IG_Enchant_Stone_Box6);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`script`) VALUES (22953,'Enchant_Stone_Box7','Costume Enchant Stone Box 7','Cash',10,10,1,'getgroupitem(IG_Enchant_Stone_Box7);');

+ 2 - 2
sql-files/mob_db_re.sql

@@ -2090,9 +2090,9 @@ REPLACE INTO `mob_db_re` (`id`,`name_aegis`,`name_english`,`name_japanese`,`leve
 REPLACE INTO `mob_db_re` (`id`,`name_aegis`,`name_english`,`name_japanese`,`level`,`hp`,`attack`,`attack2`,`defense`,`magic_defense`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`attack_range`,`skill_range`,`chase_range`,`size`,`race`,`element`,`element_level`,`walk_speed`,`attack_delay`,`attack_motion`,`damage_motion`,`ai`,`class`,`mode_canmove`,`mode_mvp`,`mvpdrop1_item`,`mvpdrop1_rate`,`mvpdrop2_item`,`mvpdrop2_rate`,`mvpdrop3_item`,`mvpdrop3_rate`,`drop1_item`,`drop1_rate`,`drop2_item`,`drop2_rate`,`drop3_item`,`drop3_rate`,`drop4_item`,`drop4_rate`,`drop4_nosteal`) VALUES (3254,'T_W_O','T_W_O','T_W_O',165,48000000,3955,196,158,134,90,141,7,87,267,70,3,10,12,'Large','Demon','Dark',3,150,1250,500,350,'10','Boss',true,true,'Questioned_Parts',5000,'Old_Violet_Box',5000,'Old_Violet_Box',5000,'Test_Reagent',3000,'Spanner',500,'Old_Steel_Plate',2000,'T_W_O_Card',1,true);
 REPLACE INTO `mob_db_re` (`id`,`name_aegis`,`name_english`,`name_japanese`,`level`,`hp`,`base_exp`,`job_exp`,`attack`,`attack2`,`defense`,`magic_defense`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`attack_range`,`skill_range`,`chase_range`,`size`,`race`,`element`,`element_level`,`walk_speed`,`attack_delay`,`attack_motion`,`damage_motion`,`ai`,`mode_canmove`) VALUES (3255,'GHOUL_H','Smelly Ghoul','Smelly Ghoul',155,178652,10233,10598,2235,216,99,55,98,55,61,22,133,2,1,10,12,'Small','Plant','Wind',1,200,2050,500,660,'10',true);
 REPLACE INTO `mob_db_re` (`id`,`name_aegis`,`name_english`,`name_japanese`,`level`,`hp`,`base_exp`,`job_exp`,`attack`,`attack2`,`defense`,`magic_defense`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`attack_range`,`skill_range`,`chase_range`,`size`,`race`,`element`,`element_level`,`walk_speed`,`attack_delay`,`attack_motion`,`damage_motion`,`ai`,`mode_canmove`) VALUES (3256,'ZOMBIE_H','Smelly Zombie','Smelly Zombie',148,134615,6859,6903,1995,450,91,42,76,53,54,21,125,3,1,10,12,'Small','Formless','Neutral',3,220,2155,960,480,'10',true);
-REPLACE INTO `mob_db_re` (`id`,`name_aegis`,`name_english`,`name_japanese`,`level`,`hp`,`base_exp`,`job_exp`,`attack`,`attack2`,`defense`,`magic_defense`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`attack_range`,`skill_range`,`chase_range`,`size`,`race`,`element`,`element_level`,`walk_speed`,`attack_delay`,`attack_motion`,`damage_motion`,`ai`,`drop1_item`,`drop1_rate`,`drop1_nosteal`,`drop2_item`,`drop2_rate`,`drop2_nosteal`) VALUES (3442,'FROZENWOLF','Frozen Wolf','Frozen Wolf',140,80000,5000,5000,1000,1000,50,50,100,80,100,100,100,50,1,10,12,'Medium','Brute','Water',1,200,1120,420,432,'04','Dehumidifiers',2000,true,'Frozenwolf_Card',1,true);
+REPLACE INTO `mob_db_re` (`id`,`name_aegis`,`name_english`,`name_japanese`,`level`,`hp`,`base_exp`,`job_exp`,`attack`,`attack2`,`defense`,`magic_defense`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`attack_range`,`skill_range`,`chase_range`,`size`,`race`,`element`,`element_level`,`walk_speed`,`attack_delay`,`attack_motion`,`damage_motion`,`ai`,`drop1_item`,`drop1_rate`,`drop1_nosteal`,`drop2_item`,`drop2_rate`,`drop2_nosteal`) VALUES (3442,'FROZENWOLF','Frozen Wolf','Frozen Wolf',140,80000,5000,5000,1000,1000,50,50,100,80,100,100,100,50,1,10,12,'Medium','Brute','Water',1,200,1120,420,432,'04','Desiccant',2000,true,'Frozenwolf_Card',1,true);
 REPLACE INTO `mob_db_re` (`id`,`name_aegis`,`name_english`,`name_japanese`,`level`,`hp`,`base_exp`,`job_exp`,`attack`,`attack2`,`defense`,`magic_defense`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`attack_range`,`skill_range`,`chase_range`,`size`,`race`,`element`,`element_level`,`walk_speed`,`attack_delay`,`attack_motion`,`damage_motion`,`ai`,`drop1_item`,`drop1_rate`,`drop1_nosteal`,`drop2_item`,`drop2_rate`,`drop2_nosteal`) VALUES (3443,'TAFFY','Taffy','Taffy',145,100000,6000,6000,1500,1500,125,47,100,80,100,100,100,50,1,10,12,'Medium','Brute','Earth',1,200,1604,1344,2016,'17','Sandpaper',2000,true,'Tappy_Card',1,true);
-REPLACE INTO `mob_db_re` (`id`,`name_aegis`,`name_english`,`name_japanese`,`level`,`hp`,`base_exp`,`job_exp`,`attack`,`attack2`,`defense`,`magic_defense`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`attack_range`,`skill_range`,`chase_range`,`size`,`race`,`element`,`element_level`,`walk_speed`,`attack_delay`,`attack_motion`,`damage_motion`,`ai`,`drop1_item`,`drop1_rate`,`drop1_nosteal`,`drop2_item`,`drop2_rate`,`drop2_nosteal`) VALUES (3444,'WATCHER','Watcher','Watcher',145,120000,7000,7000,1400,1400,125,47,100,80,100,100,80,50,6,10,12,'Small','Formless','Wind',1,190,576,1344,480,'04','Red_Eye',2000,true,'Watcher_Card',1,true);
+REPLACE INTO `mob_db_re` (`id`,`name_aegis`,`name_english`,`name_japanese`,`level`,`hp`,`base_exp`,`job_exp`,`attack`,`attack2`,`defense`,`magic_defense`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`attack_range`,`skill_range`,`chase_range`,`size`,`race`,`element`,`element_level`,`walk_speed`,`attack_delay`,`attack_motion`,`damage_motion`,`ai`,`drop1_item`,`drop1_rate`,`drop1_nosteal`,`drop2_item`,`drop2_rate`,`drop2_nosteal`) VALUES (3444,'WATCHER','Watcher','Watcher',145,120000,7000,7000,1400,1400,125,47,100,80,100,100,80,50,6,10,12,'Small','Formless','Wind',1,190,576,1344,480,'04','Red_Eyes',2000,true,'Watcher_Card',1,true);
 REPLACE INTO `mob_db_re` (`id`,`name_aegis`,`name_english`,`name_japanese`,`level`,`hp`,`attack`,`attack2`,`defense`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`attack_range`,`skill_range`,`chase_range`,`size`,`race`,`element`,`element_level`,`walk_speed`,`attack_delay`,`attack_motion`,`damage_motion`,`ai`,`drop1_item`,`drop1_rate`,`drop1_nosteal`) VALUES (3445,'P_ARCHER_SKELETON','Enchanted Archer Skelet','Enchanted Archer Skelet',114,10000,200,100,20,20,60,30,60,150,30,14,10,12,'Medium','Undead','Undead',3,300,1152,864,576,'04','P_Archer_Skeleton_Card',1,true);
 REPLACE INTO `mob_db_re` (`id`,`name_aegis`,`name_english`,`name_japanese`,`level`,`hp`,`attack`,`attack2`,`defense`,`magic_defense`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`attack_range`,`skill_range`,`chase_range`,`size`,`race`,`element`,`element_level`,`walk_speed`,`attack_delay`,`attack_motion`,`damage_motion`,`ai`,`drop1_item`,`drop1_rate`,`drop1_nosteal`) VALUES (3446,'P_SKELETON','Enchanted Skeleton','Enchanted Skeleton',114,10000,200,200,20,20,80,60,30,120,90,30,1,10,12,'Medium','Undead','Undead',3,250,1440,528,576,'04','P_Skeleton_Card',1,true);
 REPLACE INTO `mob_db_re` (`id`,`name_aegis`,`name_english`,`name_japanese`,`level`,`hp`,`attack`,`attack2`,`defense`,`magic_defense`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`attack_range`,`skill_range`,`chase_range`,`size`,`race`,`element`,`element_level`,`walk_speed`,`attack_delay`,`attack_motion`,`damage_motion`,`ai`,`drop1_item`,`drop1_rate`,`drop1_nosteal`) VALUES (3447,'P_SOLDIER_SKELETON','Enchanted Soldier Skele','Enchanted Soldier Skele',115,20000,200,100,20,20,120,60,30,60,90,30,1,10,12,'Medium','Undead','Undead',3,250,1440,576,432,'04','P_Soldier_Skeleton_Card',1,true);

+ 39 - 0
sql-files/upgrades/upgrade_20210308.sql

@@ -0,0 +1,39 @@
+-- 16.1 official variables
+UPDATE `char_reg_num` SET `key` = 'ep16_royal' WHERE `key` = 'banquet_main_quest' AND `value` < 16;
+UPDATE `char_reg_num` SET `key` = 'ep16_royal', `value` = `value` - 1 WHERE `key` = 'banquet_main_quest' AND `value` < 20;
+UPDATE `char_reg_num` SET `key` = 'ep16_royal', `value` = `value` - 2 WHERE `key` = 'banquet_main_quest' AND `value` < 26;
+UPDATE `char_reg_num` SET `key` = 'ep16_royal', `value` = 25 WHERE `key` = 'banquet_main_quest' AND `value` > 25;
+
+DELETE FROM `char_reg_num` WHERE `key` = 'banquet_nerius_quest';
+DELETE FROM `char_reg_num` WHERE `key` = 'banquet_heine_quest';
+DELETE FROM `char_reg_num` WHERE `key` = 'banquet_richard_quest';
+
+UPDATE `char_reg_num` SET `key` = 'ep16_wal' WHERE `key` = 'banquet_walther_quest' AND `value` < 2;
+UPDATE `char_reg_num` SET `key` = 'ep16_wal', `value` = `value` - 1 WHERE `key` = 'banquet_walther_quest' AND `value` > 1;
+UPDATE `char_reg_num` SET `key` = 'ep16_lug' WHERE `key` = 'banquet_roegenburg_quest';
+UPDATE `char_reg_num` SET `key` = 'ep16_gaobs' WHERE `key` = 'banquet_geoborg_quest';
+
+UPDATE `char_reg_num` SET `key` = 'ep16_wig' WHERE `key` = 'banquet_wigner_quest' AND `value` < 5;
+UPDATE `char_reg_num` SET `key` = 'ep16_wig', `value` = `value` + 5 WHERE `key` = 'banquet_wigner_quest' AND `value` > 5;
+UPDATE `char_reg_num` c, `quest` q SET c.`key` = 'ep16_wig', c.`value` = 10
+WHERE c.`key` = 'banquet_wigner_quest' AND c.`value` = 5 AND q.`quest_id` = 14482 AND q.`state` = 1;
+UPDATE `char_reg_num` c, `quest` q SET c.`key` = 'ep16_wig', c.`value` = 9
+WHERE c.`key` = 'banquet_wigner_quest' AND c.`value` = 5 AND q.`quest_id` = 14480 AND q.`state` = 2;
+UPDATE `char_reg_num` c, `quest` q SET c.`key` = 'ep16_wig', c.`value` = 8
+WHERE c.`key` = 'banquet_wigner_quest' AND c.`value` = 5 AND q.`quest_id` = 14480 AND q.`state` = 1;
+UPDATE `char_reg_num` c, `quest` q SET c.`key` = 'ep16_wig', c.`value` = 7
+WHERE c.`key` = 'banquet_wigner_quest' AND c.`value` = 5 AND q.`quest_id` = 14481 AND q.`state` = 2;
+UPDATE `char_reg_num` c, `quest` q SET c.`key` = 'ep16_wig', c.`value` = 6
+WHERE c.`key` = 'banquet_wigner_quest' AND c.`value` = 5 AND q.`quest_id` = 14481 AND q.`state` = 1;
+UPDATE `char_reg_num` SET `key` = 'ep16_wig' WHERE `key` = 'banquet_wigner_quest' AND `value` = 5;
+
+UPDATE `char_reg_num` SET `key` = 'ep16_cookbs' WHERE `key` = 'banquet_quest_cooking' AND `value` < 3;
+UPDATE `char_reg_num` SET `key` = 'ep16_cookbs', `value` = 2 WHERE `key` = 'banquet_quest_cooking' AND `value` = 3;
+UPDATE `char_reg_num` SET `key` = 'ep16_cookbs', `value` = `value` + 8 WHERE `key` = 'banquet_quest_cooking' AND `value` > 3;
+
+DELETE FROM `quest` WHERE `quest_id` = 11428;
+DELETE FROM `quest` WHERE `quest_id` = 11429;
+DELETE FROM `quest` WHERE `quest_id` = 11430;
+DELETE FROM `quest` WHERE `quest_id` = 11431;
+
+DELETE FROM `char_reg_num` WHERE `key` = 'banquet_quest_sauce';

Some files were not shown because too many files changed in this diff