Преглед изворни кода

Episode 15 update (#5297)

* updates 15.1 using aegis files
- Police quests
- Wandering Bard Quest
- gm npc
- added doom Prayers spawn event on verus04
- Corrected To Phantasmagorika! quest
- Corrected Vestige quest
- Added Reward Coordinator and Contribution Certificate Vending Machine npcs (the daily quests coming with them are officially disabled but the rewards npcs remain)
- Added the missing kafra on verus04
- Corrected the main quest

* updates 15.2
- Corrected misc npcs
- Corrected Krotzel's Request quest
- Corrected memory quest

* Corrected the item DB and quest DB

Added a sql file to replace the old player variables
Atemo пре 4 година
родитељ
комит
dbe5ba748b

+ 14 - 14
db/re/item_db.txt

@@ -4792,16 +4792,16 @@
 6745,HealStone_Bottom,Recovery Stone (Low),6,20,,10,,,,,,,,,,,,,{},{},{}
 6746,Iron_Artifacts,Steel Artifact,3,10,,0,,,,,,,,,,,,,{},{},{}
 6747,Iron_Artifacts_,Steel Artifact,3,10,,0,,,,,,,,,,,,,{},{},{}
-6748,Daily_Report_He_And_His_Team,Daily Report He And His Team,3,10,,0,,,,,,,,,,,,,{},{},{}
-6749,Operation_Control_Device,Operation Control Device,3,10,,0,,,,,,,,,,,,,{},{},{}
+6748,Excavator_Repoet,Daily Report He And His Team,3,10,,0,,,,,,,,,,,,,{},{},{}
+6749,Power_Control_Device,Operation Control Device,3,10,,0,,,,,,,,,,,,,{},{},{}
 6750,Failed_Engine,Failed Engine,3,10,,10,,,,,,,,,,,,,{},{},{}
 6751,Crushed_Can_Iron_Plate,Crushed Can Iron Plate,3,10,,10,,,,,,,,,,,,,{},{},{}
 6752,Charleston_Parts,Charleston Parts,3,10,,10,,,,,,,,,,,,,{},{},{}
-6753,Token_Of_Destruction,Token Of Destruction,3,10,,0,,,,,,,,,,,,,{},{},{}
-6754,Collected_Medicinal_Herbs,Collected Medicinal Herbs,3,10,,0,,,,,,,,,,,,,{},{},{}
+6753,Sign_Of_Destruction,Token Of Destruction,3,10,,0,,,,,,,,,,,,,{},{},{}
+6754,Collected_Herb,Collected Medicinal Herbs,3,10,,0,,,,,,,,,,,,,{},{},{}
 6755,Contaminated_Magic,Contaminated Magic,3,20,,10,,,,,,,,,,,,,{},{},{}
-6756,Cohesive_Energy,Cohesive Energy,3,20,,0,,,,,,,,,,,,,{},{},{}
-6757,The_Memory_Recorder,The Memory Recorder,3,20,,0,,,,,,,,,,,,,{},{},{}
+6756,Condensed_Energy,Cohesive Energy,3,20,,0,,,,,,,,,,,,,{},{},{}
+6757,Memory_Record,The Memory Recorder,3,20,,0,,,,,,,,,,,,,{},{},{}
 
 6762,Banana_Can,Banana Can,3,0,,10,,,,,,,,,,,,,{},{},{}
 6763,Spicy_Rice_Cake,Spicy Rice Cake,3,0,,10,,,,,,,,,,,,,{},{},{}
@@ -4848,11 +4848,11 @@
 6819,Acolyte_Soul,Acolyte Soul,3,10,,10,,,,,,,,,,,,,{},{},{}
 6820,Particles_Of_Energy,Energy Fragment,3,0,,10,,,,,,,,,,,,,{},{},{}
 6821,Solo_Troops_Badge,Single Union Badge,3,0,,0,,,,,,,,,,,,,{},{},{}
-6824,Experimental_Dong_Memory_Record,Experimental Dong Memory Record,3,10,,10,,,,,,,,,,,,,{},{},{}
+6824,Lab_Memory_Record,Experimental Dong Memory Record,3,10,,10,,,,,,,,,,,,,{},{},{}
 6825,Air_Cleaner_Box,Air Cleaner Box,3,10,,10000,,,,,,,,,,,,,{},{},{}
 6826,Fresh_Grapes,Fresh Grapes,3,10,,100,,,,,,,,,,,,,{},{},{}
-6827,Complete_Machine_Parts,Complete Machine Parts,3,10,,0,,,,,,,,,,,,,{},{},{}
-6828,Gravity_Safety_Device,Gravity Safety Device,3,10,,100,,,,,,,,,,,,,{},{},{}
+6827,Normal_Parts,Complete Machine Parts,3,10,,0,,,,,,,,,,,,,{},{},{}
+6828,Gravity_Parts,Gravity Safety Device,3,10,,100,,,,,,,,,,,,,{},{},{}
 6832,Questioned_Parts,Questioned Parts,3,10,,10,,,,,,,,,,,,,{},{},{}
 6833,Limited_Token_of_Ziegfried,(Limited) Token of Ziegfried,3,10,,10,,,,,,,,,,,,,{},{},{}
 6834,Legendary_Fur,Legendary Fur,3,10,,10,,,,,,,,,,,,,{},{},{}
@@ -11485,11 +11485,11 @@
 22685,Solo_Christmas_Gift,Single Union Christmas Gift,2,0,,0,,,,,0xFFFFFFFF,63,2,,,0,,,{ getgroupitem(IG_Solo_Christmas_Gift); },{},{}
 22686,Solo_Cookie,Single Cookie,0,0,,50,,,,,0xFFFFFFFF,63,2,,,0,,,{ percentheal 5,5; },{},{}
 22687,Pieces_Of_Sentiment,Sentimental Fragment,11,0,,1,,,,0,0xFFFFFFFF,63,2,,,100,,,{ callfunc("F_Pieces_Of_Sentiment"); },{},{}
-22691,Record_Fragment1,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",98,143; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 1; } },{},{}
-22692,Record_Fragment2,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",45,276; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 2; } },{},{}
-22693,Record_Fragment3,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",217,346; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 3; } },{},{}
-22694,Record_Fragment4,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",273,235; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 4; } },{},{}
-22695,Record_Fragment5,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",275,290; if (callfunc("F_time_limit_recorder") == 1) { recorder_quest_type = 5; } },{},{}
+22691,Piece_Of_Record1,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",98,143; },{},{}
+22692,Piece_Of_Record2,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",45,276; },{},{}
+22693,Piece_Of_Record3,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",217,346; },{},{}
+22694,Piece_Of_Record4,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",273,235; },{},{}
+22695,Piece_Of_Record5,Record Fragment,0,,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ warp "un_bk_q",275,290; },{},{}
 22699,Test_Reagent,Test Reagent,2,,,30,,,,,0xFFFFFFFF,63,2,,,,,,{ bonus_script "bonus bFlee,100;",5,9; sc_start SC_BLIND,5000,0,10000,0; },{},{}
 22700,Jumping_Support_Box,Jumping Support Box,18,10,,0,,,,0,0xFFFFFFFF,63,2,,,,,,{ /*TODO: getitem 12529,1; getitem 12323,200; getitem 12324,50; and 5 boxes that containing quivers + oridecons*/ },{},{}
 22702,STR_Soul_Potion,STR Reduction Potion,11,10,,0,,,,,0xFFFFFFFF,63,2,,,,,,{ callfunc "F_CashReduceStat",bStr,-1,22702; },{},{}

+ 23 - 23
db/re/mob_db.txt

@@ -2279,13 +2279,13 @@
 //3119,E_RUNAWAY5_,Runaway 5,Runaway 5,1,10,1,0,0,1,1,1,1,0,1,1,1,1,1,1,10,12,0,0,20,0x11F0000,170,1084,2304,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //3120,M_ISIS
 //3121,Q_BYORGUE
-//3122,CHARLESTON1
-//3123,CHARLESTON2
-//3124,CHARLESTON3
-3125,STEP,Step,Step,130,55403,0,3088,2392,1,871,695,101,58,117,127,55,61,116,60,10,12,0,6,22,0x2000000,250,0,780,0,0,0,0,0,0,0,0,6751,1000,998,150,13213,400,0,0,0,0,0,0,0,0,0,0,0,0,4698,1
-//3126,ROCK_STEP
-//3127,KICK_STEP
-//3128,KICK_AND_KICK
+3122,CHARLESTON1,Charleston 1,Charleston 1,140,2614000,1,36804,21064,1,3210,695,123,68,189,78,81,51,108,56,10,12,2,6,22,0x3095,150,676,2400,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3123,CHARLESTON2,Charleston 3,Charleston 2,140,2614000,1,36804,21064,1,3210,695,123,68,189,78,81,51,108,56,10,12,2,6,22,0x3095,150,676,2400,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3124,CHARLESTON3,Charleston 3,Charleston 3,145,23671401,1,3132000,2473000,1,1500,1000,200,90,208,106,205,206,228,105,10,12,2,6,60,0x620B695,200,676,2016,672,0,0,0,0,0,0,0,16031,200,28101,200,16033,100,21011,200,22043,400,22044,400,6752,5000,0,0,0,0,0,0
+3125,STEP,Step,Step,130,55403,1,3088,2392,1,871,695,101,58,117,127,55,61,116,60,10,12,0,6,20,0x0000083,100,676,672,480,0,0,0,0,0,0,0,6751,1000,998,150,6213,400,6961,50,6962,50,0,0,0,0,0,0,0,0,4698,1
+3126,ROCK_STEP,Rock Step,Lockstep,131,71056,1,3609,2209,2,1100,325,85,59,99,95,70,124,155,80,10,12,1,6,40,0x0000085,150,676,1056,480,0,0,0,0,0,0,0,6750,500,999,350,7319,500,6961,50,6962,50,0,0,0,0,0,0,0,0,4699,1
+3127,KICK_STEP,Kick Step,Hallway 1 Security Devi,132,73644,1,3607,2205,7,1151,218,80,50,99,92,72,122,161,76,10,12,1,6,20,0x0000084,200,676,816,480,0,0,0,0,0,0,0,6750,400,999,250,7319,300,6961,50,6962,50,0,0,0,0,0,0,0,0,27012,1
+3128,KICK_AND_KICK,Kick And Kick,Security Robot,133,68018,1,3729,2032,1,1484,158,98,54,164,116,66,59,141,58,10,12,1,6,40,0x0000085,200,676,576,480,0,0,0,0,0,0,0,6751,500,998,100,6961,50,6962,50,0,0,0,0,0,0,0,0,0,0,27013,1
 //3129,ORC_ZOMBIE_ANNIV
 //3130,ORC_ARCHER_ANNIV
 //3131,ORC_BABY_ANNIV
@@ -2310,13 +2310,13 @@
 //3150,MG_AMDARAIS_H
 //3151,MG_CORRUPTION_ROOT_H
 //3152,G_MG_KHALITZBURG_H
-3153,EXCAVATOR_ROBOT,Excavator Robot,Excavator Robot,163,166860,0,15026,16915,1,4785,192,138,53,102,104,72,57,98,57,10,12,1,0,60,0x0000085,250,1020,500,768,0,0,0,0,0,0,0,11597,251,984,101,6962,101,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-3154,RECON_ROBOT,Recon Robot,Recon Robot,165,256000,0,15796,17738,1,2989,280,128,60,112,60,72,57,120,77,10,12,2,0,80,0x0000085,170,1072,672,384,0,0,0,0,0,0,0,998,1001,756,1001,11597,151,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-3155,REPAIR_ROBOT,Repair Robot,Repair Robot,155,154760,0,11748,47654,1,2051,216,99,55,98,39,30,35,95,45,10,12,0,3,24,0x0000085,300,1500,500,660,0,0,0,0,0,0,0,998,5000,756,1501,999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-3156,EXPLORATION_ROVER,Exploration Rover,Exploration Rover,168,293640,0,18172,126234,1,2513,802,105,41,100,63,35,99,106,61,10,12,2,7,80,0x0000085,165,1552,1152,336,0,0,0,0,0,0,0,998,5000,756,1,999,1,6961,1,0,0,0,0,0,0,0,0,0,0,0,0
-3157,RUIN_BELIEVER1,Ruin Grace Believer,Ruin Grace Believer,100,61350,0,4666,3874,1,993,250,91,50,88,61,51,62,136,60,10,12,1,7,40,0x0000085,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-3158,RUIN_BELIEVER2,Ruin Grace Believer,Ruin Grace Believer,100,61350,0,4666,139500,1,993,250,91,50,88,61,51,62,136,60,10,12,1,7,40,0x0000085,200,2125,2112,0,0,0,0,0,0,0,0,6753,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-3159,ILLEGAL_PROMOTION,Illegal Promotion,Illegal Promotion,100,10,0,0,0,1,1,1,1,50,1,1,1,1,1,1,10,12,0,0,40,0x0370020,200,0,0,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3153,EXCAVATOR_ROBOT,Excavator Robot,Excavator Robot,163,166860,1,15026,16915,1,4785,192,138,53,102,104,72,57,98,57,10,12,1,0,60,0x0000085,250,1020,500,768,0,0,0,0,0,0,0,11597,1,984,1,6962,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3154,RECON_ROBOT,Recon Robot,Recon Robot,165,256000,1,15796,17738,3,2989,280,127,60,112,60,72,57,120,77,10,12,2,0,80,0x0000085,170,1072,672,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3155,REPAIR_ROBOT,Repair Robot,Repair Robot,155,154760,1,11748,13237,1,2051,216,99,55,98,39,30,35,95,45,10,12,0,3,24,0x0000085,300,1500,500,660,0,0,0,0,0,0,0,998,5000,756,1501,999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3156,EXPLORATION_ROVER,Exploration Rover,Exploration Rover,168,293640,1,18172,35065,3,2513,802,105,41,100,63,35,99,106,61,10,12,2,7,80,0x0000085,165,1552,1152,336,0,0,0,0,0,0,0,998,5000,756,1,999,1,6961,1,0,0,0,0,0,0,0,0,0,0,0,0
+3157,RUIN_BELIEVER1,Ruin Grace Believer,Ruin Grace Believer,100,61350,1,4666,3874,1,993,250,91,50,88,61,51,62,136,60,10,12,1,7,40,0x0000085,200,800,2112,768,0,0,0,0,0,0,0,6753,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3158,RUIN_BELIEVER2,Ruin Grace Believer,Ruin Grace Believer,100,61350,1,4666,3874,1,993,250,91,50,88,61,51,62,136,60,10,12,1,7,40,0x0000085,200,800,2112,768,0,0,0,0,0,0,0,6753,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3159,ILLEGAL_PROMOTION,Illegal Promotion,Illegal Promotion,100,10,1,0,0,1,1,1,1,50,1,1,1,1,1,1,10,12,0,0,40,0x0370020,200,800,2112,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //3160,BOILED_RICE_DUANWU
 //3161,BOMB
 //3162,ELEPHANT
@@ -2405,15 +2405,15 @@
 3245,V_B_ALPHOCCIO,Minstrel Alphoccio,Minstrel Alphoccio,186,10800000,1,3000000,3000000,1,8000,12000,240,200,240,300,140,400,300,180,10,12,1,7,84,0x6283695,100,76,864,288,0,0,0,0,0,0,0,23016,3000,20748,150,20748,500,22687,5000,6818,10000,6818,10000,6818,10000,0,0,0,0,4673,1
 3246,V_B_TRENTINI,Wanderer Trentini,Wanderer Trentini,186,10800000,1,3000000,3000000,2,8000,12000,200,200,220,300,140,400,300,160,10,12,1,7,84,0x6283695,100,76,864,288,0,0,0,0,0,0,0,23016,3000,20748,150,20748,500,22687,5000,6818,10000,6818,10000,6818,10000,0,0,0,0,4683,1
 3247,CENERE_G,Cenere G,Green Cenere,150,140088,1,7635,7698,1,1897,110,91,81,70,48,40,37,100,45,10,12,0,0,24,0x0000085,300,1500,720,360,0,0,0,0,0,0,0,6561,5000,7322,500,7001,1500,7320,1000,12815,500,0,0,0,0,0,0,0,0,27014,1
-3248,REPAIR_ROBOT_T,Repair Robot T,Repair Robot Turbo,158,186320,1,13208,14489,1,2431,226,118,59,101,42,55,35,110,45,10,12,0,0,40,0x000008B,300,1500,500,660,0,0,0,0,0,0,0,7512,500,7507,250,998,2000,999,500,11597,1500,0,0,0,0,0,0,0,0,27015,1
-3249,EXPLORATION_ROVER_T,Exploration Rover T,Explorer Robot Turbo,171,318117,1,19826,41023,3,2945,841,121,67,118,80,45,121,138,65,10,12,2,0,80,0x0000085,165,1552,1152,336,0,0,0,0,0,0,0,7512,500,7507,250,998,2000,999,500,11597,1500,0,0,0,0,0,0,0,0,27016,1
-3250,SCR_MT_ROBOTS,Scr Mt Robots,Can Robot,155,30,1,61,58,1,95,2,100,99,35,42,20,12,68,3,10,12,0,0,20,0x0070085,300,2400,500,400,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27017,1
-3251,GC109,Machine Component,Machine Component,149,217650,1,6598,5931,1,2678,1257,121,71,60,132,45,35,155,15,10,12,0,0,47,0x0000085,120,1000,500,600,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27018,1
-3252,DR815,Machine Component,Machine Component,153,245670,1,7255,7011,1,3315,761,143,45,88,98,88,21,116,22,10,12,1,0,27,0x0000085,135,1500,600,500,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27019,1
-3253,SYS_MSG,Sys Msg,System message,160,100,1,0,0,1,1,1,276,99,0,0,0,188,0,0,10,12,0,0,20,0xC170081,2000,3000,600,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-3254,T_W_O,T_W_O,T_W_O,165,48000000,1,0,0,1,3955,196,158,134,90,141,7,87,267,70,10,12,2,6,67,0x6280085,150,1250,500,350,0,6832,5000,617,5000,617,5000,22699,3000,1531,500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27020,1
-3255,GHOUL_H,Ghoul H,Smelly Ghoul,155,178652,1,10233,10598,1,2235,216,99,55,98,55,61,22,133,2,10,12,0,3,24,0x0000085,200,0,500,660,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-3256,ZOMBIE_H,Zombie H,Smelly Zombie,148,134615,1,6859,6903,1,1995,450,91,42,76,53,54,21,125,3,10,12,0,0,60,0x0000085,220,0,960,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3248,REPAIR_ROBOT_T,Repair Robot T,Repair Robot Turbo,158,186320,1,13208,14489,1,2431,226,118,59,101,42,55,35,110,45,10,12,0,0,40,0x000008B,300,1500,500,660,0,0,0,0,0,0,0,7512,500,7507,250,998,2000,999,500,11597,1500,6961,50,6962,50,0,0,0,0,27015,1
+3249,EXPLORATION_ROVER_T,Exploration Rover T,Explorer Robot Turbo,171,318117,1,19826,41023,3,2945,841,121,67,118,80,45,121,138,65,10,12,2,0,80,0x0000085,165,1552,1152,336,0,0,0,0,0,0,0,7512,500,7507,250,998,2000,999,500,11597,1500,6961,50,6962,50,0,0,0,0,27016,1
+3250,SCR_MT_ROBOTS,Scr Mt Robots,Can Robot,155,30,1,61,58,1,95,2,100,99,35,42,20,12,68,3,10,12,0,0,20,0x0070085,300,2400,500,400,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,6961,50,6962,50,0,0,0,0,0,0,0,0,27017,1
+3251,GC109,Machine Component,Machine Component,149,217650,1,6598,5931,1,2678,1257,121,71,60,132,45,35,155,15,10,12,0,0,47,0x0000085,120,1000,500,600,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,6961,50,6962,50,0,0,0,0,0,0,0,0,27018,1
+3252,DR815,Machine Component,Machine Component,153,245670,1,7255,7011,1,3315,761,143,45,88,98,88,21,116,22,10,12,1,0,27,0x0000085,135,1500,600,500,0,0,0,0,0,0,0,7512,1000,7507,1500,7319,2000,6961,50,6962,50,0,0,0,0,0,0,0,0,27019,1
+3253,SYS_MSG,Sys Msg,System message,160,100,1,0,0,12,1,1,276,99,0,0,0,188,0,0,10,12,2,6,27,0xC170081,2000,3000,600,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3254,T_W_O,T_W_O,T_W_O,165,48000000,1,0,0,3,3955,196,158,134,90,141,7,87,267,70,10,12,2,6,67,0x6280085,150,1250,500,350,0,6832,5000,617,5000,617,5000,22699,3000,1531,500,7319,2000,0,0,0,0,0,0,0,0,0,0,0,0,27020,1
+3255,GHOUL_H,Ghoul H,Smelly Ghoul,155,178652,1,10233,10598,1,2235,216,99,55,98,55,61,22,133,2,10,12,0,3,24,0x0000085,200,2050,500,660,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+3256,ZOMBIE_H,Zombie H,Smelly Zombie,148,134615,1,6859,6903,1,1995,450,91,42,76,53,54,21,125,3,10,12,0,0,60,0x0000085,220,2155,960,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //3257,MALE_PORING
 //3258,FEMALE_PORING
 //3259,FANTASTIC_B_UNICORN

+ 23 - 56
db/re/mob_skill_db.txt

@@ -11871,62 +11871,29 @@
 3246,V_B_TRENTINI@NPC_WIDESLEEP,attack,668,5,100,1000,20000,no,self,always,,,,,,,,
 3246,V_B_TRENTINI@NPC_WIDECONFUSE,attack,667,5,100,1000,20000,no,target,always,,,,,,,,
 
-//=================================================================
-// Phantasmagorika 15.2 Mob Skills Placeholder (Gathered from jRO)
-//=================================================================
-
-3153,Excavator Robot@NPC_BLOODDRAIN,angry,199,1,1000,0,3000,no,target,always,0,,,,,,,
-3153,Excavator Robot@NPC_STONESKIN,attack,675,3,10000,0,30000,yes,self,always,0,,,,,,,
-3153,Excavator Robot@NPC_STUNATTACK,attack,179,5,800,1000,5000,no,target,always,0,,,,,,,
-3153,Excavator Robot@NPC_ARMORBRAKE,attack,344,10,500,0,5000,no,target,always,0,,,,,,,
-3153,Excavator Robot@NPC_STONESKIN,chase,675,3,10000,0,30000,yes,self,always,0,,,,,,,
-3153,Excavator Robot@NPC_BLOODDRAIN,attack,199,1,500,0,5000,no,target,always,0,,,,,,,
-3153,Excavator Robot@NPC_STONESKIN,idle,675,3,10000,0,30000,yes,self,always,0,,,,,,,
-3153,Excavator Robot@AL_TELEPORT,idle,26,1,10000,0,0,no,target,rudeattacked,0,,,,,,,
-
-3154,Recon Robot@NPC_GUIDEDATTACK,attack,172,5,500,0,20000,no,target,always,0,,,,,,,
-3154,Recon Robot@NPC_STUNATTACK,attack,179,5,800,1000,5000,no,target,always,0,,,,,,,
-
-3155,Repair Robot@NPC_STUNATTACK,any,179,5,500,1000,5000,no,target,always,0,,,,,,,
-3155,Repair Robot@NPC_GUIDEDATTACK,attack,172,5,1000,0,15000,no,target,always,0,,,,,,,
-
-3156,Exploration Rover@NPC_SUMMONSLAVE,idle,196,5,10000,700,10000,no,self,casttargeted,1,3157,3158,,,,,
-3156,Exploration Rover@NPC_GUIDEDATTACK,attack,172,5,1000,0,10000,no,target,always,0,,,,,,,
-3156,Exploration Rover@NPC_SUMMONSLAVE,attack,196,5,10000,700,10000,no,target,attackpcge,10,3157,3158,,,,,
-
-3247,Cenere G@NPC_PETRIFYATTACK,attack,180,3,500,500,5000,no,target,always,0,,,,,,,
-3247,Cenere G@MG_THUNDERSTORM,chase,21,10,3000,1000,10000,no,target,always,0,,,,,,,
-3247,Cenere G@NPC_POISONATTACK,any,188,1,5000,0,5000,no,target,always,0,,,,,,,
-3247,Cenere G@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
-3247,Cenere G@MG_THUNDERSTORM,attack,21,10,3000,1000,10000,no,target,always,0,,,,,,,
-
-3248,Repair Robot T@AL_PNEUMA,attack,25,1,2000,0,5000,yes,self,longrangeattacked,0,,,,,,,
-3248,Repair Robot T@AL_TELEPORT,idle,26,1,10000,0,0,no,target,rudeattacked,0,,,,,,,
-3248,Repair Robot T@NPC_CRITICALSLASH,attack,170,1,2000,0,2000,no,target,always,0,,,,,,,
-3248,Repair Robot T@NPC_GUIDEDATTACK,attack,172,5,1000,0,5000,no,target,always,0,,,,,,,
-3248,Repair Robot T@KN_TWOHANDQUICKEN,attack,60,30,10000,0,120000,yes,target,myhpltmaxrate,40,,,,,,,
-3248,Repair Robot T@NPC_STUNATTACK,attack,179,5,500,1000,5000,no,target,always,0,,,,,,,
-3248,Repair Robot T@AL_PNEUMA,chase,25,1,2000,0,5000,no,self,longrangeattacked,0,,,,,,,
-
-3249,Exploration Rover T@KN_TWOHANDQUICKEN,attack,60,30,10000,0,120000,yes,self,myhpltmaxrate,40,,,,,,,
-3249,Exploration Rover T@AL_PNEUMA,chase,25,1,2000,0,5000,no,self,longrangeattacked,0,,,,,,,
-3249,Exploration Rover T@AL_TELEPORT,walk,26,1,10000,0,0,no,target,rudeattacked,0,,,,,,,
-3249,Exploration Rover T@NPC_CRITICALWOUND,attack,673,2,1000,0,5000,no,target,always,0,,,,,,,
-3249,Exploration Rover T@NPC_GUIDEDATTACK,attack,172,5,1000,0,5000,no,target,always,0,,,,,,,
-3249,Exploration Rover T@AL_PNEUMA,attack,25,1,2000,0,5000,no,self,longrangeattacked,0,,,,,,,
-
-3253,SYS_MSG@AL_HEAL,attack,28,10,500,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
-3253,SYS_MSG@AL_HEAL,chase,28,10,500,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
-3253,SYS_MSG@AL_HEAL,idle,28,10,500,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
-
-3254,T_W_O@NPC_PIERCINGATT,attack,158,10,300,0,30000,no,target,always,0,,,,,,,
-3254,T_W_O@NPC_PIERCINGATT,chase,158,10,500,0,5000,no,target,always,0,,,,,,,
-3254,T_W_O@NPC_SILENCEATTACK,attack,178,5,750,250,10000,no,target,casttargeted,0,,,,,,6,
-3254,T_W_O@NPC_SILENCEATTACK,chase,178,5,750,250,3000,no,target,casttargeted,0,,,,,,6,
-3254,T_W_O@NPC_WIDESLEEP,attack,668,5,400,0,15000,no,self,always,0,,,,,,,
-3254,T_W_O@NPC_WIDESTONE,attack,666,5,600,0,30000,no,self,always,0,,,,,,,
-3254,T_W_O@NPC_WIDESOULDRAIN,attack,680,10,1000,0,60000,no,self,always,0,,,,,,,
-3254,T_W_O@NPC_CRITICALWOUND,attack,673,5,150,500,45000,no,target,always,,,,,,,,
+// Phantasmagorika 15.2
+3124,CHARLESTON3@NPC_AGIUP,idle,350,1,2000,0,10000,yes,self,always,0,,,,,,,
+3124,CHARLESTON3@AL_HEAL,idle,28,11,10000,0,3000,yes,self,always,0,,,,,,,
+3124,CHARLESTON3@HW_NAPALMVULCAN,chase,400,5,3000,500,10000,no,target,always,0,,,,,,,
+3124,CHARLESTON3@WZ_VERMILION,chase,85,5,2000,1000,15000,no,target,always,0,,,,,,,
+3124,CHARLESTON3@HW_NAPALMVULCAN,attack,400,5,3000,500,10000,no,target,always,0,,,,,,,
+3124,CHARLESTON3@WZ_VERMILION,attack,85,21,1500,4000,20000,no,target,always,0,,,,,,,
+3124,CHARLESTON3@WZ_METEOR,attack,83,11,1500,4000,20000,no,target,always,0,,,,,,,
+3125,STEP@SM_BASH,attack,5,5,1000,0,5000,yes,target,always,0,,,,,,,
+3126,ROCK_STEP@BS_HAMMERFALL,attack,110,5,1000,1000,5000,no,target,always,0,,,,,,,
+3127,KICK_STEP@ASC_BREAKER,attack,379,5,1000,0,5000,yes,target,always,0,,,,,,,
+3128,KICK_AND_KICK@NPC_STUNATTACK,attack,179,3,500,1000,5000,no,target,always,0,,,,,,,
+3253,SYS_MSG@AL_HEAL,attack,28,11,5000,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
+3253,SYS_MSG@AL_HEAL,chase,28,11,5000,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
+3253,SYS_MSG@AL_HEAL,idle,28,11,5000,500,5000,yes,friend,friendhpltmaxrate,50,,,,,,,
+3254,T_W_O@NPC_PIERCINGATT,attack,158,10,3000,0,30000,no,target,always,0,,,,,,,
+3254,T_W_O@NPC_PIERCINGATT,chase,158,10,5000,0,5000,no,target,always,0,,,,,,,
+3254,T_W_O@NPC_SILENCEATTACK,attack,178,5,7500,250,10000,no,target,casttargeted,0,,,,,,6,
+3254,T_W_O@NPC_SILENCEATTACK,chase,178,5,7500,250,3000,no,target,casttargeted,0,,,,,,6,
+3254,T_W_O@NPC_WIDESLEEP,attack,668,5,4000,0,15000,no,self,always,0,,,,,,,
+3254,T_W_O@NPC_WIDESTONE,attack,666,5,6000,0,30000,no,self,always,0,,,,,,,
+3254,T_W_O@NPC_WIDESOULDRAIN,attack,680,10,10000,0,60000,no,self,always,0,,,,,,,
+3254,T_W_O@NPC_CRITICALWOUND,attack,673,5,1500,500,45000,no,target,always,,,,,,,,
 
 3505,DR_BIG_EGGRING@NPC_SUMMONSLAVE,attack,196,4,10000,2000,10000,no,self,slavele,3,3508,,,,,,
 3505,DR_BIG_EGGRING@NPC_SUMMONSLAVE,idle,196,4,10000,2000,10000,no,self,slavele,3,3508,,,,,,

+ 4 - 3
db/re/quest_db.yml

@@ -4086,13 +4086,13 @@ Body:
     Title: Core Collection
     Drops:
       - Mob: RECON_ROBOT
-        Item: Operation_Control_Device
+        Item: Power_Control_Device
         Rate: 5000
       - Mob: REPAIR_ROBOT
-        Item: Operation_Control_Device
+        Item: Power_Control_Device
         Rate: 5000
       - Mob: EXPLORATION_ROVER
-        Item: Operation_Control_Device
+        Item: Power_Control_Device
         Rate: 5000
   - Id: 7616
     Title: Core Collection - Down
@@ -6207,6 +6207,7 @@ Body:
     Title: Let the Specialists Handle It
   - Id: 11377
     Title: Act of Kindness
+    TimeLimit: +1d
   - Id: 11378
     Title: "Trick or treat "
   - Id: 11379

+ 14 - 0
npc/re/kafras/cool_event_corp.txt

@@ -0,0 +1,14 @@
+//===== rAthena Script =======================================
+//= Cool Event Corp. Staff
+//===== Description: =========================================
+//= Cool Event Corp. Staff (Save, Storage & Pushcart Service)
+//===== Changelogs: ==========================================
+//= 1.0 Added Verus. [Capuche]
+//============================================================ 
+
+verus04,121,243,4	script	Cool Event Corp Staff::CoolEventCorpStaffVerus	4_M_ZONDAMAN,{
+	callfunc "F_CoolEventCorp",
+		"Save:Use Storage::Rent a Pushcart::Cancel",
+		"in Verus","verus04",121,246;
+	end;
+}

Разлика између датотеке није приказан због своје велике величине
+ 143 - 1323
npc/re/quests/quests_15_1.txt


Разлика између датотеке није приказан због своје велике величине
+ 3817 - 954
npc/re/quests/quests_15_2.txt


+ 1 - 0
npc/re/scripts_athena.conf

@@ -84,6 +84,7 @@ npc: npc/re/instances/WolfchevLaboratory.txt
 //npc: npc/custom/official/GeffenMagicTournament.txt
 
 // ---------------- Kafras & Cool Event Corp. -------------------
+npc: npc/re/kafras/cool_event_corp.txt
 npc: npc/re/kafras/kafras.txt
 npc: npc/re/kafras/Kafra_Teleportation_Services.txt
 npc: npc/re/kafras/Zonda_Teleportation_Services.txt

+ 23 - 93
npc/re/warps/other/un_myst.txt

@@ -4,129 +4,59 @@
 //= Warp Points for episodes 15.1 & 15.2
 //===== Changelogs: ==========================================
 //= 1.0 First version. [Capuche]
+//= 2.0 Updated using Aegis files. [Capuche]
 //============================================================
 
 // A
-un_myst,124,189,0	script	#un_myst_entrance	WARPNPC,1,1,{
-	end;
-OnTouch:
-	warp "un_myst",171,197;
-	@weird_piece = 1;
-	end;
-}
-un_myst,171,183,0	warp2	#un_myst_A_1	1,1,un_myst,259,200
+un_myst,124,189,0	warp2	#m101	1,1,un_myst,171,197
+un_myst,171,183,0	warp2	#m102	1,1,un_myst,259,200
 
-un_myst,258,208,0	script	#un_myst_A_2	WARPNPC,1,1,{
+un_myst,258,208,0	script	#m103	WARPNPC,1,1,{
 	end;
 OnTouch:
-	.@r = rand(9);
-	if (.@r == 0)
-		warp "un_myst",329,205;
-	else if (.@r < 5)
+	.@r = rand(1,100);
+	if (.@r < 40)
 		warp "un_myst",291,203;
-	else
-		warp "un_myst",259,200;
-	end;
-}
-un_myst,295,208,0	script	#un_myst_A_3	WARPNPC,1,1,{
-	end;
-OnTouch:
-	.@r = rand(9);
-	if (.@r == 0)
+	else if (.@r > 80)
 		warp "un_myst",329,205;
-	else if (.@r < 5)
-		warp "un_myst",291,203;
 	else
 		warp "un_myst",259,200;
 	end;
 }
+un_myst,295,208,0	duplicate(#m103)	#m104	WARPNPC,1,1
 
 // B
-un_myst,393,139,0	script	#un_myst_B_1	WARPNPC,1,1,{
+un_myst,393,139,0	script	#m201	WARPNPC,1,1,{
 	end;
 OnTouch:
-	.@r = rand(9);
-	if (.@r == 0)
-		warp "un_myst",176,137;
-	else if (.@r < 5)
-		warp "un_myst",138,138;
-	else
+	.@r = rand(1,100);
+	if (.@r < 40)
 		warp "un_myst",86,136;
-	end;
-}
-un_myst,104,136,0	script	#un_myst_B_2	WARPNPC,1,1,{
-	end;
-OnTouch:
-	.@r = rand(9);
-	if (.@r == 0)
+	else if (.@r > 80)
 		warp "un_myst",176,137;
-	else if (.@r < 5)
-		warp "un_myst",138,138;
 	else
-		warp "un_myst",86,136;
-	end;
-}
-un_myst,138,140,0	script	#un_myst_B_3	WARPNPC,1,1,{
-	end;
-OnTouch:
-	.@r = rand(9);
-	if (.@r == 0)
-		warp "un_myst",176,137;
-	else if (.@r < 5)
 		warp "un_myst",138,138;
-	else
-		warp "un_myst",86,136;
 	end;
 }
+un_myst,104,136,0	duplicate(#m201)	#m202	WARPNPC,1,1
+un_myst,138,140,0	duplicate(#m201)	#m203	WARPNPC,1,1
 
 // C
-un_myst,75,91,0	script	#un_myst_C_1	WARPNPC,1,1,{
+un_myst,75,91,0	script	#m301	WARPNPC,1,1,{
 	end;
 OnTouch:
-	.@r = rand(9);
-	if (.@r == 0)
-		warp "un_myst",217,84;
-	else if (.@r < 5)
-		warp "un_myst",160,89;
-	else
-		warp "un_myst",107,88;
-	end;
-}
-un_myst,169,89,0	script	#un_myst_C_2	WARPNPC,1,1,{
-	end;
-OnTouch:
-	.@r = rand(9);
-	if (.@r == 0)
-		warp "un_myst",217,84;
-	else if (.@r < 5)
-		warp "un_myst",160,89;
-	else
+	.@r = rand(1,100);
+	if (.@r < 40)
 		warp "un_myst",107,88;
-	end;
-}
-un_myst,121,82,0	script	#un_myst_C_3	WARPNPC,1,1,{
-	end;
-OnTouch:
-	.@r = rand(9);
-	if (.@r == 0)
-		warp "un_myst",217,84;
-	else if (.@r < 5)
+	else if (.@r > 80)
 		warp "un_myst",160,89;
 	else
-		warp "un_myst",107,88;
-	end;
-}
-un_myst,219,88,0	script	#un_myst_C_4	WARPNPC,1,1,{
-	end;
-OnTouch:
-	.@r = rand(9);
-	if (.@r == 0)
 		warp "un_myst",217,84;
-	else if (.@r < 5)
-		warp "un_myst",160,89;
-	else
-		warp "un_myst",107,88;
 	end;
 }
+un_myst,121,82,0	duplicate(#m301)	#m302	WARPNPC,1,1
+un_myst,169,89,0	duplicate(#m301)	#m303	WARPNPC,1,1
+un_myst,219,88,0	duplicate(#m301)	#m304	WARPNPC,1,1
 
-un_myst,108,38,0	warp2	#un_myst_tamarin	1,1,un_myst,209,33
+un_bunker,387,79,0	warp2	#room_out_	1,1,un_bunker,300,166
+un_myst,108,38,0	warp2	#way	1,1,un_myst,209,33

+ 698 - 128
npc/re/warps/other/verus.txt

@@ -4,6 +4,7 @@
 //= Warp Points for episodes 15.1 & 15.2
 //===== Changelogs: ==========================================
 //= 1.0 First version. [Capuche]
+//= 2.0 Updated using Aegis files. [Capuche]
 //============================================================
 
 verus04,204,163,0	warp2	fr_ver04_to_tun	1,1,ver_tunn,13,35
@@ -15,142 +16,711 @@ verus02,72,16,0	warp2	verus02_to_verus03	1,1,verus03,169,255
 verus03,122,17,0	warp2	fr_ver03_to_ver04_1	1,1,verus04,121,264
 verus03,44,17,0	warp2	fr_ver03_to_ver04_2	1,1,verus04,44,264
 
+verus03,52,254,0	script	verus03_to_verus01	WARPNPC,1,1,{
+	end;
+OnTouch:
+	if (ep15_2_permit < 1) {
+		mes "[Access Controller]";
+		mes "I am sorry but only permitted members can enter from this point.";
+		close;
+	}
+	warp "verus01",243,62;
+	end;
+}
+
+verus03,169,259,0	script	verus03_to_verus02	WARPNPC,1,1,{
+	end;
+OnTouch:
+	if (ep15_2_permit < 1) {
+		mes "[Access Controller]";
+		mes "I am sorry but only permitted members can enter from this point.";
+		close;
+	}
+	warp "verus02",72,19;
+	end;
+}
+
 juperos_01,245,87,0	warp2	fr_ju_to_eju	1,1,ver_eju,13,148
 ver_eju,10,148,0	warp2	fr_eju_to_ju	1,1,juperos_01,242,87
-ver_eju,107,36,0	warp2	fr_eju_to_tun	2,2,ver_tunn,84,82
+ver_eju,107,36,0	warp2	fr_eju_to_tun	2,3,ver_tunn,84,82
 ver_tunn,84,86,0	warp2	fr_tun_to_eju	1,1,ver_eju,113,38
 ver_tunn,10,36,0	warp2	fr_tun_to_ver04	1,1,verus04,202,165
 
 lhz_in01,276,238,0	warp2	in_to_out#e152i02	1,1,lhz_in01,276,230
 
 // Bunker
-un_bunker,41,275,0	warp2	A_0#A_1	1,1,un_bunker,21,276
 un_bunker,98,85,0	warp2	#bunker_out	1,1,verus01,115,190
-un_bunker,24,276,0	warp2	A_1#A_0	1,1,un_bunker,45,275
-un_bunker,24,256,0	warp2	A_2#A_3	1,1,un_bunker,26,190
-un_bunker,23,190,0	warp2	A_3#A_2	1,1,un_bunker,21,256
-un_bunker,31,196,0	warp2	A_4#A_5	1,1,un_bunker,22,378
-un_bunker,21,375,0	warp2	A_5#A_4	1,1,un_bunker,32,193
-un_bunker,51,196,0	warp2	A_6#A_7	1,1,un_bunker,68,378
-un_bunker,67,375,0	warp2	A_7#A_6	1,1,un_bunker,52,193
-un_bunker,60,183,0	warp2	A_8#A_9	1,1,un_bunker,75,235
-un_bunker,71,236,0	warp2	A_9#A_8	1,1,un_bunker,57,182
-un_bunker,60,169,0	warp2	A_10#A_11	1,1,un_bunker,72,168
-un_bunker,69,167,0	warp2	A_11#A_10	1,1,un_bunker,57,168
-un_bunker,47,135,0	warp2	A_12#A_13	1,1,un_bunker,37,134
-un_bunker,40,135,0	warp2	A_13#A_12	1,1,un_bunker,50,134
-un_bunker,57,118,0	warp2	A_14#A_15	1,1,un_bunker,72,117
-un_bunker,69,118,0	warp2	A_15#A_14	1,1,un_bunker,53,117
-un_bunker,97,124,0	warp2	A_16#A_17	1,1,un_bunker,100,144
-un_bunker,97,141,0	warp2	A_17#A_16	1,1,un_bunker,98,121
-un_bunker,128,118,0	warp2	A_18#A_19	1,1,un_bunker,144,117
-un_bunker,140,118,0	warp2	A_19#A_18	1,1,un_bunker,125,117
-un_bunker,137,168,0	warp2	A_20#A_21	1,1,un_bunker,122,167
-un_bunker,126,168,0	warp2	A_21#A_20	1,1,un_bunker,140,167
-un_bunker,137,185,0	warp2	A_22#A_23	1,1,un_bunker,120,235
-un_bunker,124,236,0	warp2	A_23#A_22	1,1,un_bunker,140,184
-un_bunker,147,196,0	warp2	A_24#A_25	1,1,un_bunker,106,378
-un_bunker,105,375,0	warp2	A_25#A_24	1,1,un_bunker,148,193
-un_bunker,167,196,0	warp2	A_26#A_27	1,1,un_bunker,152,378
-un_bunker,151,375,0	warp2	A_27#A_26	1,1,un_bunker,168,193
-un_bunker,174,190,0	warp2	A_28#A_29	1,1,un_bunker,172,229
-un_bunker,169,230,0	warp2	A_29#A_28	1,1,un_bunker,171,189
-un_bunker,213,346,0	warp2	A_30#A_31	1,1,un_bunker,213,299
-un_bunker,216,300,0	warp2	A_31#A_30	1,1,un_bunker,216,345
-un_bunker,216,280,0	warp2	A_32#A_33	1,1,un_bunker,220,261
-un_bunker,217,262,0	warp2	A_33#A_32	1,1,un_bunker,213,279
-un_bunker,249,268,0	warp2	A_34#A_35	1,1,un_bunker,390,380
-un_bunker,389,377,0	warp2	A_35#A_34	1,1,un_bunker,250,265
-un_bunker,258,262,0	warp2	A_36#A_37	1,1,un_bunker,274,289
-un_bunker,271,290,0	warp2	A_37#A_36	1,1,un_bunker,255,261
-un_bunker,258,236,0	warp2	A_38#A_39	1,1,un_bunker,272,235
-un_bunker,269,236,0	warp2	A_39#A_38	1,1,un_bunker,255,235
-un_bunker,245,214,0	warp2	A_40#A_41	1,1,un_bunker,226,213
-un_bunker,230,214,0	warp2	A_41#A_40	1,1,un_bunker,248,213
-un_bunker,262,200,0	warp2	A_42#A_43	1,1,un_bunker,274,199
-un_bunker,271,200,0	warp2	A_43#A_42	1,1,un_bunker,258,199
-un_bunker,75,128,0	warp2	A_44#B_1	1,1,un_bunker,276,196
-un_bunker,275,191,0	warp2	B_1#A_44	1,1,un_bunker,76,121
-un_bunker,119,128,0	warp2	A_45#B_2	1,1,un_bunker,319,196
-un_bunker,320,191,0	warp2	B_2#A_45	1,1,un_bunker,120,121
-un_bunker,297,206,0	warp2	B_3#B_4	1,1,un_bunker,298,224
-un_bunker,297,221,0	warp2	B_4#B_3	1,1,un_bunker,298,203
-un_bunker,324,200,0	warp2	B_5#B_6	1,1,un_bunker,344,199
-un_bunker,339,200,0	warp2	B_6#B_5	1,1,un_bunker,321,199
-un_bunker,350,214,0	warp2	B_7#B_8	1,1,un_bunker,368,213
-un_bunker,365,214,0	warp2	B_8#B_7	1,1,un_bunker,347,213
-un_bunker,337,236,0	warp2	B_9#B_10	1,1,un_bunker,323,235
-un_bunker,326,236,0	warp2	B_10#B_9	1,1,un_bunker,340,235
-un_bunker,281,266,0	warp2	B_11#B_12	1,1,un_bunker,282,282
-un_bunker,281,279,0	warp2	B_12#B_11	1,1,un_bunker,282,263
-un_bunker,313,266,0	warp2	B_13#B_14	1,1,un_bunker,314,282
-un_bunker,313,279,0	warp2	B_14#B_13	1,1,un_bunker,314,262
-un_bunker,324,290,0	warp2	B_15#B_16	1,1,un_bunker,340,261
-un_bunker,337,262,0	warp2	B_16#B_15	1,1,un_bunker,321,289
-un_bunker,343,270,0	warp2	B_17#B_18	1,1,un_bunker,382,328
-un_bunker,381,325,0	warp2	B_18#B_17	1,1,un_bunker,344,267
-un_bunker,370,264,0	warp2	B_19#B_20	1,1,un_bunker,388,263
-un_bunker,385,264,0	warp2	B_20#B_19	1,1,un_bunker,367,263
-un_bunker,297,192,0	warp2	B_21#B_22	1,1,un_bunker,298,181
-un_bunker,297,186,0	warp2	B_22#B_21	1,1,un_bunker,298,196
-un_bunker,229,163,0	warp2	B_23#B_24	1,1,un_bunker,159,52
-un_bunker,164,51,0	warp2	B_24#B_23	1,1,un_bunker,233,164
-un_bunker,366,164,0	warp2	B_25#B_26	1,1,un_bunker,31,51
-un_bunker,27,52,0	warp2	B_26#B_25	1,1,un_bunker,361,163
-un_bunker,387,79,0	warp2	alp2#out	1,1,un_bunker,366,164
+un_bunker,41,275,0	warp2	MechanicalRoom#b_J-0	1,1,un_bunker,21,276
+un_bunker,24,276,0	warp2	J-0#b_MechanicalRoom	1,1,un_bunker,45,275
+un_bunker,24,256,0	warp2	J-0#b_L-1	1,1,un_bunker,26,190
+un_bunker,23,190,0	warp2	L-1#b_J-0	1,1,un_bunker,21,256
+un_bunker,31,196,0	warp2	L-1#b_D-1	1,1,un_bunker,22,378
+un_bunker,21,375,0	warp2	D-1#b_L-1	1,1,un_bunker,32,193
+un_bunker,51,196,0	warp2	L-1#b_D-2	1,1,un_bunker,68,378
+un_bunker,67,375,0	warp2	D-2#b_L-1	1,1,un_bunker,52,193
+un_bunker,60,183,0	warp2	L-1#b_ControlRoom	1,1,un_bunker,75,235
+un_bunker,71,236,0	warp2	ControlRoom#b_L-1	1,1,un_bunker,57,182
+un_bunker,60,169,0	warp2	L-1#b_Monitoring room	1,1,un_bunker,72,168
+un_bunker,69,167,0	warp2	Monitoring room#b_L-1	1,1,un_bunker,57,168
+un_bunker,47,135,0	warp2	L-1#b_B-1	1,1,un_bunker,37,134
+un_bunker,40,135,0	warp2	B-1#b_L-1	1,1,un_bunker,50,134
+un_bunker,57,118,0	warp2	L-1#b_A-0	1,1,un_bunker,72,117
+un_bunker,69,118,0	warp2	A-0#b_L-1	1,1,un_bunker,53,117
+un_bunker,97,124,0	warp2	A-0#b_Monitoring room	1,1,un_bunker,100,144
+un_bunker,97,141,0	warp2	Monitoring room#b_A-0	1,1,un_bunker,98,121
+un_bunker,128,118,0	warp2	A-0#b_L-2	1,1,un_bunker,144,117
+un_bunker,140,118,0	warp2	L-2#b_A-0	1,1,un_bunker,125,117
+un_bunker,137,168,0	warp2	L-2#b_Monitoring room	1,1,un_bunker,122,167
+un_bunker,126,168,0	warp2	Monitoring room#b_L-2	1,1,un_bunker,140,167
+un_bunker,137,185,0	warp2	L-2#b_ControlRoom	1,1,un_bunker,120,235
+un_bunker,124,236,0	warp2	ControlRoom#b_L-2	1,1,un_bunker,140,184
+un_bunker,147,196,0	warp2	L-2#b_E-1	1,1,un_bunker,106,378
+un_bunker,105,375,0	warp2	E-1#b_L-2	1,1,un_bunker,148,193
+un_bunker,167,196,0	warp2	L-2#b_E-2	1,1,un_bunker,152,378
+un_bunker,151,375,0	warp2	E-2#b_L-2	1,1,un_bunker,168,193
+un_bunker,174,190,0	warp2	L-2#b_K-0	1,1,un_bunker,172,229
+un_bunker,169,230,0	warp2	K-0#b_L-2	1,1,un_bunker,171,189
+un_bunker,213,346,0	warp2	Farm#b_C-0	1,1,un_bunker,213,299
+un_bunker,216,300,0	warp2	C-0#b_Farm	1,1,un_bunker,216,345
+un_bunker,216,280,0	warp2	C-0#b_G-1	1,1,un_bunker,220,261
+un_bunker,217,262,0	warp2	G-1#b_C-0	1,1,un_bunker,213,279
+un_bunker,249,268,0	warp2	G-1#b_M-0	1,1,un_bunker,390,380
+un_bunker,389,377,0	warp2	M-0#b_G-1	1,1,un_bunker,250,265
+un_bunker,258,262,0	warp2	G-1#b_Cafeteria	1,1,un_bunker,274,289
+un_bunker,271,290,0	warp2	Cafeteria#b_G-1	1,1,un_bunker,255,261
+un_bunker,258,236,0	warp2	G-1#b_Clinic	1,1,un_bunker,272,235
+un_bunker,269,236,0	warp2	Clinic#b_G-1	1,1,un_bunker,255,235
+un_bunker,245,214,0	warp2	G-1#b_F-1	1,1,un_bunker,226,213
+un_bunker,230,214,0	warp2	F-1#b_G-1	1,1,un_bunker,248,213
+un_bunker,262,200,0	warp2	G-1#b_H-0	1,1,un_bunker,274,199
+un_bunker,271,200,0	warp2	H-0#b_G-1	1,1,un_bunker,258,199
+un_bunker,75,128,0	warp2	LA-0#b_LH-0	1,1,un_bunker,276,196
+un_bunker,275,191,0	warp2	LH-0#b_LA-0	1,1,un_bunker,76,121
+un_bunker,119,128,0	warp2	RA-0#b_RH-0	1,1,un_bunker,319,196
+un_bunker,320,191,0	warp2	RH-0#b_RA-0	1,1,un_bunker,120,121
+un_bunker,297,206,0	warp2	H-0#b_Clinic	1,1,un_bunker,298,224
+un_bunker,297,221,0	warp2	Clinic#b_H-0	1,1,un_bunker,298,203
+un_bunker,324,200,0	warp2	H-0#b_G-2	1,1,un_bunker,344,199
+un_bunker,339,200,0	warp2	G-2#b_H-0	1,1,un_bunker,321,199
+un_bunker,350,214,0	warp2	G-2#b_F-2	1,1,un_bunker,368,213
+un_bunker,365,214,0	warp2	F-2#b_G-2	1,1,un_bunker,347,213
+un_bunker,337,236,0	warp2	G-2#b_Clinic	1,1,un_bunker,323,235
+un_bunker,326,236,0	warp2	Clinic#b_G-2	1,1,un_bunker,340,235
+un_bunker,281,266,0	warp2	LClinic#b_LCafeteria	1,1,un_bunker,282,282
+un_bunker,281,279,0	warp2	LCafeteria#b_LClinic	1,1,un_bunker,282,263
+un_bunker,313,266,0	warp2	RClinic#b_RCafeteria	1,1,un_bunker,314,282
+un_bunker,313,279,0	warp2	RCafeteria#b_RClinic	1,1,un_bunker,314,262
+un_bunker,324,290,0	warp2	Cafeteria#b_G-2	1,1,un_bunker,340,261
+un_bunker,337,262,0	warp2	G-2#b_Cafeteria	1,1,un_bunker,321,289
+un_bunker,343,270,0	warp2	G-2#b_N-0	1,1,un_bunker,382,328
+un_bunker,381,325,0	warp2	N-0#b_G-2	1,1,un_bunker,344,267
+un_bunker,370,264,0	warp2	G-2#b_I-0	1,1,un_bunker,388,263
+un_bunker,385,264,0	warp2	I-0#b_G-2	1,1,un_bunker,367,263
+un_bunker,297,192,0	warp2	H-0#b_Z-0	1,1,un_bunker,298,181
+un_bunker,297,186,0	warp2	Z-0#b_H-0	1,1,un_bunker,298,196
+un_bunker,229,163,0	warp2	Z-0#b_Z-1	1,1,un_bunker,159,52
+un_bunker,164,51,0	warp2	Z-1#b_Z-0	1,1,un_bunker,233,164
+un_bunker,366,164,0	warp2	Z-0#b_Z-2	1,1,un_bunker,31,51
+un_bunker,27,52,0	warp2	Z-2#b_Z-0	1,1,un_bunker,361,163
 
 // Memory bunker
-un_bk_q,69,118,0	warp2	A-0#L-1	1,1,un_bk_q,53,117
-un_bk_q,128,118,0	warp2	A-0#L-2	1,1,un_bk_q,144,117
-un_bk_q,97,124,0	warp2	A-0#Monitoring room	1,1,un_bk_q,100,144
-un_bk_q,40,135,0	warp2	B-1#L-1	1,1,un_bk_q,50,134
-un_bk_q,71,236,0	warp2	Control room#L-1	1,1,un_bk_q,57,182
-un_bk_q,124,236,0	warp2	Control room#L-2	1,1,un_bk_q,140,184
-un_bk_q,216,280,0	warp2	C-0#G-1	1,1,un_bk_q,220,261
-un_bk_q,21,375,0	warp2	D-1#L-1	1,1,un_bk_q,32,193
-un_bk_q,67,375,0	warp2	D-2#L-1	1,1,un_bk_q,52,193
-un_bk_q,105,375,0	warp2	E-1#L-2	1,1,un_bk_q,148,193
-un_bk_q,151,375,0	warp2	E-2#L-2	1,1,un_bk_q,168,193
-un_bk_q,230,214,0	warp2	F-1#G-1	1,1,un_bk_q,248,213
-un_bk_q,365,214,0	warp2	F-2#G-2	1,1,un_bk_q,347,213
-un_bk_q,258,262,0	warp2	G-1#Cafeteria	1,1,un_bk_q,274,289
-un_bk_q,217,262,0	warp2	G-1#C-0	1,1,un_bk_q,213,279
-un_bk_q,245,214,0	warp2	G-1#F-1	1,1,un_bk_q,226,213
-un_bk_q,262,200,0	warp2	G-1#H-0	1,1,un_bk_q,274,199
-un_bk_q,249,268,0	warp2	G-1#M-0	1,1,un_bk_q,390,380
-un_bk_q,350,214,0	warp2	G-2#F-2	1,1,un_bk_q,368,213
-un_bk_q,324,200,0	warp2	G-2#H-0	1,1,un_bk_q,344,199
-un_bk_q,370,264,0	warp2	G-2#I-0	1,1,un_bk_q,388,263
-un_bk_q,343,270,0	warp2	G-2#N-0	1,1,un_bk_q,382,328
-un_bk_q,337,262,0	warp2	H-0#Cafeteria	1,1,un_bk_q,321,289
-un_bk_q,271,200,0	warp2	H-0#G-1	1,1,un_bk_q,258,199
-un_bk_q,339,200,0	warp2	H-0#G-2	1,1,un_bk_q,321,199
-un_bk_q,297,192,0	warp2	H-0#Z-0	1,1,un_bk_q,298,181
-un_bk_q,385,264,0	warp2	I-0#G-2	1,1,un_bk_q,367,263
-un_bk_q,24,256,0	warp2	J-0#L-1	1,1,un_bk_q,26,190
-un_bk_q,24,276,0	warp2	J-0#Machine Warehouse	1,1,un_bk_q,45,275
-un_bk_q,169,230,0	warp2	K-0#L-2	1,1,un_bk_q,171,189
-un_bk_q,60,183,0	warp2	L-1#Control room	1,1,un_bk_q,75,235
-un_bk_q,60,169,0	warp2	L-1#Monitoring room	1,1,un_bk_q,72,168
-un_bk_q,137,168,0	warp2	L-2#Monitoring room	1,1,un_bk_q,122,167
-un_bk_q,57,118,0	warp2	L-1#A-0	1,1,un_bk_q,72,117
-un_bk_q,47,135,0	warp2	L-1#B-1	1,1,un_bk_q,37,134
-un_bk_q,31,196,0	warp2	L-1#D-1	1,1,un_bk_q,22,378
-un_bk_q,51,196,0	warp2	L-1#D-2	1,1,un_bk_q,68,378
-un_bk_q,23,190,0	warp2	L-1#J-0	1,1,un_bk_q,21,256
-un_bk_q,137,185,0	warp2	L-2#Control room	1,1,un_bk_q,120,235
-un_bk_q,140,118,0	warp2	L-2#A-0	1,1,un_bk_q,125,117
-un_bk_q,147,196,0	warp2	L-2#E-1	1,1,un_bk_q,106,378
-un_bk_q,167,196,0	warp2	L-2#E-2	1,1,un_bk_q,152,378
-un_bk_q,174,190,0	warp2	L-2#K-0	1,1,un_bk_q,172,229
-un_bk_q,389,377,0	warp2	M-0#G-1	1,1,un_bk_q,250,265
-un_bk_q,381,325,0	warp2	N-0#G-2	1,1,un_bk_q,344,267
-un_bk_q,297,186,0	warp2	Z-0#H-0	1,1,un_bk_q,298,196
-un_bk_q,164,51,0	warp2	Z-1#Z-0	1,1,un_bk_q,233,164
-un_bk_q,27,52,0	warp2	Z-2#Z-0	1,1,un_bk_q,361,163
-un_bk_q,229,163,0	warp2	Z-0#Z-1	1,1,un_bk_q,159,52
-un_bk_q,366,164,0	warp2	Z-0#Z-2	1,1,un_bk_q,31,51
-un_bk_q,75,128,0	warp2	LA-0#LH-0	1,1,un_bk_q,276,196
-un_bk_q,275,191,0	warp2	LH-0#LA-0	1,1,un_bk_q,76,121
-un_bk_q,119,128,0	warp2	RA-0#RH-0	1,1,un_bk_q,319,196
-un_bk_q,320,191,0	warp2	RH-0#RA-0	1,1,un_bk_q,120,121
+un_bk_q,41,275,0	script	Machine Warehouse#J-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	if (.@cooldown_status_day[0] == 0 && .@cooldown_status_day[1] == 0 && .@cooldown_status_day[2] == 0 && .@cooldown_status_day[3] == 0 && .@cooldown_status_day[4] == 0) {
+		emotion 24, getnpcid(0, "Mechanician Mugeosi#EP15.2MR");
+		mes "[Mechanician Mugeosi]";
+		mes "Ah! You're the adventurer send to deliver air cleaners. You are at the right place. Come this way.";
+		close;
+	}
+	warp "un_bk_q",21,276;
+	end;
+}
+
+un_bk_q,24,276,0	script	J-0#Machine Warehouse	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",45,275;
+	end;
+}
+
+un_bk_q,24,256,0	script	J-0#L-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",26,190;
+	end;
+}
+
+un_bk_q,23,190,0	script	L-1#J-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",21,256;
+	end;
+}
+
+un_bk_q,31,196,0	script	L-1#D-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",22,378;
+	end;
+}
+
+un_bk_q,21,375,0	script	D-1#L-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",32,193;
+	end;
+}
+
+un_bk_q,51,196,0	script	L-1#D-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",68,378;
+	end;
+}
+
+un_bk_q,67,375,0	script	D-2#L-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",52,193;
+	end;
+}
+
+un_bk_q,60,183,0	script	L-1#Control room	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",75,235;
+	end;
+}
+
+un_bk_q,71,236,0	script	Control room#L-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",57,182;
+	end;
+}
+
+un_bk_q,60,169,0	script	L-1#b_Monitoring room_	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",72,168;
+	end;
+}
+
+un_bk_q,69,167,0	script	b_Monitoring room#L-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	if (.@cooldown_status_day[0] == 0 && .@cooldown_status_day[1] == 0 && .@cooldown_status_day[2] == 0 && .@cooldown_status_day[3] == 0 && .@cooldown_status_day[4] == 0) {
+		mes "[Bunker Sayhu]";
+		mes "Hey!! Where do you think you're going when we're trying to get a headcount? Get over here.";
+		close;
+	}
+	warp "un_bk_q",57,168;
+	end;
+}
+
+un_bk_q,47,135,0	script	L-1#B-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",37,134;
+	end;
+}
+
+un_bk_q,40,135,0	script	B-1#L-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",50,134;
+	end;
+}
+
+un_bk_q,57,118,0	script	L-1#A-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",72,117;
+	end;
+}
+
+un_bk_q,69,118,0	script	A-0#L-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",53,117;
+	end;
+}
+
+un_bk_q,97,124,0	script	A-0#b_Monitoring room_	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",100,144;
+	end;
+}
+
+un_bk_q,97,141,0	script	Monitoring room#A-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	if (.@cooldown_status_day[0] == 0 && .@cooldown_status_day[1] == 0 && .@cooldown_status_day[2] == 0 && .@cooldown_status_day[3] == 0 && .@cooldown_status_day[4] == 0) {
+		mes "[Bunker Sayhu]";
+		mes "Hey!! Where do you think you're going when we're trying to get a headcount? Get over here.";
+		close;
+	}
+	warp "un_bk_q",98,121;
+	end;
+}
+
+un_bk_q,128,118,0	script	A-0#L-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",144,117;
+	end;
+}
+
+un_bk_q,140,118,0	script	L-2#A-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",125,117;
+	end;
+}
+
+un_bk_q,137,168,0	script	L-2#b_Monitoring room_	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",122,167;
+	end;
+}
+
+un_bk_q,126,168,0	script	b_Monitoring room#L-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	if (.@cooldown_status_day[0] == 0 && .@cooldown_status_day[1] == 0 && .@cooldown_status_day[2] == 0 && .@cooldown_status_day[3] == 0 && .@cooldown_status_day[4] == 0) {
+		emotion 19, getnpcid(0, "Bunker Sayhu#EP15.2MR");
+		mes "[Bunker Sayhu]";
+		mes "Hey!! Where do you think you're going when we're trying to get a headcount? Get over here.";
+		close;
+	}
+	warp "un_bk_q",140,167;
+	end;
+}
+
+un_bk_q,137,185,0	script	L-2#Control room	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",120,235;
+	end;
+}
+
+un_bk_q,124,236,0	script	Control room#L-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",140,184;
+	end;
+}
+
+un_bk_q,147,196,0	script	L-2#E-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",106,378;
+	end;
+}
+
+un_bk_q,105,375,0	script	E-1#L-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",148,193;
+	end;
+}
+
+un_bk_q,167,196,0	script	L-2#E-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",152,378;
+	end;
+}
+
+un_bk_q,151,375,0	script	E-2#L-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",168,193;
+	end;
+}
+
+un_bk_q,174,190,0	script	L-2#K-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",172,229;
+	end;
+}
+
+un_bk_q,169,230,0	script	K-0#L-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",171,189;
+	end;
+}
+
+un_bk_q,213,346,0	script	Farm#C-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	if (.@cooldown_status_day[0] == 0 && .@cooldown_status_day[1] == 0 && .@cooldown_status_day[2] == 0 && .@cooldown_status_day[3] == 0 && .@cooldown_status_day[4] == 0) {
+		emotion 14, getnpcid(0, "Bioengineer Ebrik#EP15.2MR");
+		mes "[Bioengineer Ebrik]";
+		mes "Are you the Adventurer here to help us with the grape harvest? Right here!!";
+		close;
+	}
+	warp "un_bk_q",213,299;
+	end;
+}
+
+un_bk_q,216,300,0	script	C-0#Farm	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	if ((isbegin_quest(5359) + isbegin_quest(5360) + isbegin_quest(5361) + isbegin_quest(5362)) != 1) {
+		mes "[Bioengineer Touring]";
+		mes "Wait a minute. You cannot enter the farm right now.";
+		close;
+	}
+	warp "un_bk_q",216,345;
+	end;
+}
+
+un_bk_q,216,280,0	script	C-0#G-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",220,261;
+	end;
+}
+
+un_bk_q,217,262,0	script	G-1#C-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",213,279;
+	end;
+}
+
+un_bk_q,249,268,0	script	G-1#M-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",390,380;
+	end;
+}
+
+un_bk_q,389,377,0	script	M-0#G-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",250,265;
+	end;
+}
+
+un_bk_q,258,262,0	script	G-1#Cafeteria	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",274,289;
+	end;
+}
+
+un_bk_q,271,290,0	script	Cafeteria#G-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	if (.@cooldown_status_day[0] == 0 && .@cooldown_status_day[1] == 0 && .@cooldown_status_day[2] == 0 && .@cooldown_status_day[3] == 0 && .@cooldown_status_day[4] == 0) {
+		emotion 6, getnpcid(0, "Transportation Executive Ernon#EP15.2MR");
+		mes "[Transportation Executive Ernon]";
+		mes "Hey~ This is a time to borrow even the hands of small children. Stop goofing around and come here.";
+		close;
+	}
+	warp "un_bk_q",255,261;
+	end;
+}
+
+un_bk_q,269,236,0	script	Clinic#G-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	if (.@cooldown_status_day[0] == 0 && .@cooldown_status_day[1] == 0 && .@cooldown_status_day[2] == 0 && .@cooldown_status_day[3] == 0 && .@cooldown_status_day[4] == 0) {
+		emotion 6, getnpcid(0, "Nurse Lapplad#EP15.2MR");
+		mes "[Nurse Lapplad]";
+		mes "Look here?! Where are you trying to go? We have to do some tests so don't leave and wait here!!";
+		close;
+	}
+	if ((isbegin_quest(5364) + isbegin_quest(5365)) == 1) {
+		emotion 6, getnpcid(0, "Nurse Lapplad#EP15.2MR");
+		mes "[Nurse Lapplad]";
+		mes "Hello? You have to deal with it before you can go? Where do you want to go!?";
+		close;
+	}
+	warp "un_bk_q",255,235;
+	end;
+}
+
+un_bk_q,245,214,0	script	G-1#F-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",226,213;
+	end;
+}
+
+un_bk_q,230,214,0	script	F-1#G-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",248,213;
+	end;
+}
+
+un_bk_q,262,200,0	script	G-1#H-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",274,199;
+	end;
+}
+
+un_bk_q,271,200,0	script	H-0#G-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",258,199;
+	end;
+}
+
+un_bk_q,75,128,0	script	LeftA-0#LeftH-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",276,196;
+	end;
+}
+
+un_bk_q,275,191,0	script	LeftH-0#LeftA-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",76,121;
+	end;
+}
+
+un_bk_q,119,128,0	script	RightA-0#RightH-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",319,196;
+	end;
+}
+
+un_bk_q,320,191,0	script	RightH-0#RightA-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",120,121;
+	end;
+}
+
+un_bk_q,297,221,0	script	Clinic#H-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	if (.@cooldown_status_day[0] == 0 && .@cooldown_status_day[1] == 0 && .@cooldown_status_day[2] == 0 && .@cooldown_status_day[3] == 0 && .@cooldown_status_day[4] == 0) {
+		emotion 6, getnpcid(0, "Nurse Lapplad#EP15.2MR");
+		mes "[Nurse Lapplad]";
+		mes "Look here?! Where are you trying to go? We have to do some tests so don't leave and wait here!!";
+		close;
+	}
+	if ((isbegin_quest(5364) + isbegin_quest(5365)) == 1) {
+		emotion 6, getnpcid(0, "Nurse Lapplad#EP15.2MR");
+		mes "[Nurse Lapplad]";
+		mes "Hello? You have to deal with it before you can go? Where do you want to go!?";
+		close;
+	}
+	warp "un_bk_q",298,203;
+	end;
+}
+
+un_bk_q,324,200,0	script	H-0#G-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",344,199;
+	end;
+}
+
+un_bk_q,339,200,0	script	G-2#H-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",321,199;
+	end;
+}
+
+un_bk_q,350,214,0	script	G-2#F-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",368,213;
+	end;
+}
+
+un_bk_q,365,214,0	script	F-2#G-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",347,213;
+	end;
+}
+
+un_bk_q,326,236,0	script	Clinic#G-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	if (.@cooldown_status_day[0] == 0 && .@cooldown_status_day[1] == 0 && .@cooldown_status_day[2] == 0 && .@cooldown_status_day[3] == 0 && .@cooldown_status_day[4] == 0) {
+		emotion 6, getnpcid(0, "Nurse Lapplad#EP15.2MR");
+		mes "[Nurse Lapplad]";
+		mes "Look here?! Where are you trying to go? We have to do some tests so don't leave and wait here!!";
+		close;
+	}
+	if ((isbegin_quest(5364) + isbegin_quest(5365)) == 1) {
+		emotion 6, getnpcid(0, "Nurse Lapplad#EP15.2MR");
+		mes "[Nurse Lapplad]";
+		mes "Hello? You have to deal with it before you can go? Where do you want to go!?";
+		close;
+	}
+	warp "un_bk_q",340,235;
+	end;
+}
+
+un_bk_q,324,290,0	script	Cafeteria#G-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	if (.@cooldown_status_day[0] == 0 && .@cooldown_status_day[1] == 0 && .@cooldown_status_day[2] == 0 && .@cooldown_status_day[3] == 0 && .@cooldown_status_day[4] == 0) {
+		emotion 6, getnpcid(0, "Transportation Executive Ernon#EP15.2MR");
+		mes "[Transportation Executive Ernon]";
+		mes "Hey~ This is a time to borrow even the hands of small children. Stop goofing around and come here.";
+		close;
+	}
+	warp "un_bk_q",340,261;
+	end;
+}
+
+un_bk_q,337,262,0	script	G-2#Cafeteria	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",321,289;
+	end;
+}
+
+un_bk_q,343,270,0	script	G-2#N-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",382,328;
+	end;
+}
+
+un_bk_q,381,325,0	script	N-0#G-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",344,267;
+	end;
+}
+
+un_bk_q,370,264,0	script	G-2#I-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",388,263;
+	end;
+}
+
+un_bk_q,385,264,0	script	I-0#G-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",367,263;
+	end;
+}
+
+un_bk_q,297,192,0	script	H-0#Z-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",298,181;
+	end;
+}
+
+un_bk_q,297,186,0	script	Z-0#H-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",298,196;
+	end;
+}
+
+un_bk_q,229,163,0	script	Z-0#Z-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",159,52;
+	end;
+}
+
+un_bk_q,164,51,0	script	Z-1#Z-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",233,164;
+	end;
+}
+
+un_bk_q,366,164,0	script	Z-0#Z-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",31,51;
+	end;
+}
+
+un_bk_q,27,52,0	script	Z-2#Z-0	WARPNPC,1,1,{
+	end;
+OnTouch:
+	callfunc( "F_time_limit_recorder", .@cooldown_status_day );
+	warp "un_bk_q",361,163;
+	end;
+}

+ 21 - 0
sql-files/upgrades/upgrade_20200729.sql

@@ -0,0 +1,21 @@
+-- Verus police quests
+DELETE FROM `char_reg_num` WHERE `key` = 'trap_doom_prayers' AND `index` = 0;
+DELETE FROM `char_reg_num` WHERE `key` = 'count_stone_seiden' AND `index` = 0;
+-- Verus Wandering Bard quest
+DELETE FROM `char_reg_num` WHERE `key` = 'wandering_bard_quest' AND `index` = 0;
+-- To Phantasmagorika! quest
+UPDATE `char_reg_num` SET `key` = 'ep15_1_elb' WHERE `key` = 'VER_ELEVATOR' AND `value` < 100 AND `index` = 0;
+UPDATE `char_reg_num` SET `key` = 'ep15_1_elb', `value` = `value` - 94 WHERE `key` = 'VER_ELEVATOR' AND `value` >= 100 AND `value` < 1000 AND `index` = 0;
+-- Vestige quest
+UPDATE `char_reg_num` SET `key` = 'ep15_2_bslast', `value` = `value` - 999 WHERE `key` = 'VER_ELEVATOR' AND `value` >= 1000 AND `index` = 0;
+-- Krotzel's Request quests
+UPDATE `char_reg_num` SET `key` = 'ep15_2_brigan' WHERE `key` = 'VER_REPORTER' AND `index` = 0;
+-- Main quest
+INSERT INTO `char_reg_num` (`char_id`, `key`, `index`, `value`) SELECT `char_id`, 'ep15_2_permit', 0, 1 FROM `char_reg_num` WHERE `key` = 'VER_MAIN' AND `value` >= 19 AND `index` = 0;
+UPDATE `char_reg_num` SET `key` = 'ep15_1_atnad' WHERE `key` = 'VER_MAIN' AND `value` < 31 AND `index` = 0;
+UPDATE `char_reg_num` SET `key` = 'ep15_1_atnad', `value` = 30 WHERE `key` = 'VER_MAIN' AND `value` > 30 AND `value` < 37 AND `index` = 0;
+UPDATE `char_reg_num` SET `key` = 'ep15_1_atnad', `value` = `value` - 6 WHERE `key` = 'VER_MAIN' AND `value` > 36 AND `index` = 0;
+DELETE FROM `char_reg_num` WHERE `key` = 'VERUS_DAILY_QUEST' AND `index` = 0;
+-- Memory quest
+DELETE FROM `char_reg_num` WHERE `key` = 'recorder_quest_type' AND `index` = 0;
+DELETE FROM `char_reg_num` WHERE `key` = 'recorder_quest_status' AND `index` = 0;

Неке датотеке нису приказане због велике количине промена