Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

14.3 quests update (#4559)

Browse Source 
* Updated Hero Token Exchanger npc to match official npc
* Updated Dimensional Travel Quest to match official script
* Dimensional Travel Quest now uses the official variable for future reference and to fill the missing sequence
* Moved the npcs from dimensional travel quest to separate custom npcs from official conversion of npcs
* Added official system to spawn the mini-boss on moro_vol map
* Added Flaming Basin and Doom Prayers quests
* Updated the aegis name and english name of the items from moro_vol map
This commit is contained in:
Atemo 2020-03-03 18:15:09 +01:00 committed by GitHub
parent 91c9c6f827
commit 736a5a31f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 2573 additions and 1083 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
db/re/item_db.txt
View File

@ -4736,14 +4736,14 @@
6686,Brick,Brick,3,10,,2000,,,,,,,,,,,,,{},{},{} 6686,Brick,Brick,3,10,,2000,,,,,,,,,,,,,{},{},{}
6687,Rope__,Rope,3,10,,2000,,,,,,,,,,,,,{},{},{} 6687,Rope__,Rope,3,10,,2000,,,,,,,,,,,,,{},{},{}
6688,Wood_,Wood,3,10,,2000,,,,,,,,,,,,,{},{},{} 6688,Wood_,Wood,3,10,,2000,,,,,,,,,,,,,{},{},{}
6689,Fire_Beetle_Shell,Fire Beetle Shell,3,10,,0,,,,,,,,,,,,,{},{},{} 6689,BurningSkin,Burning Bug Skin,3,10,,0,,,,,,,,,,,,,{},{},{}
6690,Delicious_Stem,Delicious Stem,3,10,,0,,,,,,,,,,,,,{},{},{} 6690,YummyStem,Yummy Stem,3,10,,0,,,,,,,,,,,,,{},{},{}
6691,Fire_Feather,Fire Feather,3,10,,0,,,,,,,,,,,,,{},{},{} 6691,BurningFeather,Burning Feather,3,10,,0,,,,,,,,,,,,,{},{},{}
6692,Patrol_Journal,Patrol Journal,3,10,,1,,,,,,,,,,,,,{},{},{} 6692,PatrolLog,Patrol Log,3,10,,1,,,,,,,,,,,,,{},{},{}
6693,Stone_Blessing,Stone Blessing,3,10,,10,,,,,,,,,,,,,{},{},{} 6693,Stone_Of_Blessing,Stone Of Blessing,3,10,,10,,,,,,,,,,,,,{},{},{}
6694,Blood_of_The_Monster,Blood of The Monster,3,10,,10,,,,,,,,,,,,,{},{},{} 6694,Monster_Blood,Monster Blood,3,10,,10,,,,,,,,,,,,,{},{},{}
6695,Tooth_Rock_Of_Fire_Golem,Tooth Rock Of Fire Golem,3,10,,100,,,,,,,,,,,,,{},{},{} 6695,ToothOfFlameGolem,Golem's Fiery Stone Tooth,3,10,,100,,,,,,,,,,,,,{},{},{}
6696,Fire_Frill,Fire Frill,3,10,,10,,,,,,,,,,,,,{},{},{} 6696,ToothOfFlameFrilldora,Frilldora's Fiery Nape,3,10,,10,,,,,,,,,,,,,{},{},{}
6698,Wooden_Axe,Wooden Axe,3,10,,1000,,,,,,,,,,,,,{},{},{} 6698,Wooden_Axe,Wooden Axe,3,10,,1000,,,,,,,,,,,,,{},{},{}
6699,Faith_Silence,Faith Silence,3,10,,0,,,,,,,,,,,,,{},{},{} 6699,Faith_Silence,Faith Silence,3,10,,0,,,,,,,,,,,,,{},{},{}
6700,White_Snake_Scale,White Snake Scale,3,10,,0,,,,,,,,,,,,,{},{},{} 6700,White_Snake_Scale,White Snake Scale,3,10,,0,,,,,,,,,,,,,{},{},{}

6
db/re/mob_db.txt
View File

@ -2196,9 +2196,9 @@
//3036,MUTANT_VERIT //3036,MUTANT_VERIT
//3037,MUTANT_LUDE //3037,MUTANT_LUDE
3038,HIDDEN_MOB7,Hidden Mob 7,Monster 7,151,10000,1,0,0,1,2000,0,200,100,100,100,100,100,100,100,12,12,0,0,88,0x6370004,2000,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 3038,HIDDEN_MOB7,Hidden Mob 7,Monster 7,151,10000,1,0,0,1,2000,0,200,100,100,100,100,100,100,100,12,12,0,0,88,0x6370004,2000,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
3039,B_MOROCC_1,Blazing Morocc Reincarnation,Blazing Morocc Reincarnation,149,8000000,1,2855,1811,1,1901,145,199,35,126,91,63,61,114,37,0,0,2,8,27,0x0,110,576,480,432,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 3039,B_MOROCC_1,Blazing Morocc Reincarnation,Blazing Morocc Reincarnation,149,8000000,1,2855,1811,1,1901,145,199,35,126,91,63,61,114,37,0,0,2,8,27,0x2000085,110,576,480,432,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
3040,B_MOROCC_2,Distorted Morocc Reincarnation,Distorted Morocc Reincarnation,149,6400000,1,3311,2101,1,1625,159,92,5,121,86,71,65,113,44,10,12,1,6,67,0x2000000,150,576,648,300,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 3040,B_MOROCC_2,Distorted Morocc Reincarnation,Distorted Morocc Reincarnation,149,6400000,1,3311,2101,1,1625,159,92,5,121,86,71,65,113,44,10,12,1,6,67,0x2000085,150,576,648,300,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
3041,B_MOROCC_4,Freezing Morocc Reincarnation,Freezing Morocc Reincarnation,149,7700000,1,2995,2230,1,1235,599,109,54,114,88,62,97,164,43,0,0,1,6,61,0x2000000,150,1536,648,300,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 3041,B_MOROCC_4,Freezing Morocc Reincarnation,Freezing Morocc Reincarnation,149,7700000,1,2995,2230,1,1235,599,109,54,114,88,62,97,164,43,0,0,1,6,61,0x2000085,150,1536,648,300,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
//3042,WATERMELON_17 //3042,WATERMELON_17
//3043,WATERMELON_18 //3043,WATERMELON_18
//3044,WATERMELON_19 //3044,WATERMELON_19

15
db/re/quest_db.txt
View File

@ -140,6 +140,21 @@
1261,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Cursed Swordman" 1261,82800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Cursed Swordman"
1263,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Cursed Swordman" 1263,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Cursed Swordman"
1264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Flaming Basin and Doom Prayers"
1265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Flaming Basin and Doom Prayers"
// Note: Rate1 is unknown
1266,0,0,0,0,0,0,0,3021,6692,5000,0,0,0,0,0,0,"Flaming Basin and Doom Prayers"
1267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Flaming Basin and Doom Prayers"
1268,0,3021,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Flaming Basin and Doom Prayers"
1269,0,3022,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Flaming Basin and Doom Prayers"
1270,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Flaming Basin and Doom Prayers"
1271,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Flaming Basin and Doom Prayers"
1272,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Flaming Basin and Doom Prayers"
1273,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Flaming Basin and Doom Prayers"
1274,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Flaming Basin and Doom Prayers"
1275,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Flaming Basin and Doom Prayers"
1297,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Flaming Basin and Doom Prayers"
// Rockridge // Rockridge
1298,0,3740,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Gas! Gas!" 1298,0,3740,20,0,0,0,0,0,0,0,0,0,0,0,0,0,"Gas! Gas!"
1299,4:00,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Patrol Once a Day" 1299,4:00,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Patrol Once a Day"

18
npc/re/merchants/moro_cav_exchange.txt
View File

@ -1,21 +1,15 @@
//===== rAthena Script ======================================= //===== rAthena Script =======================================
//= Enchants NPCs. //= Enchants NPCs.
//===== Description: ========================================= //===== Description: =========================================
//= Hero Ring enchants NPCs - Walkthrough Conversion. //= [Official Conversion]
//= Hero Ring enchants NPCs
//===== Changelogs: ========================================== //===== Changelogs: ==========================================
//= 1.0 First Version. [Capuche] //= 1.0 First Version. [Capuche]
//= 1.1 Slight change to match official script. [Capuche]
//============================================================ //============================================================
moro_cav,32,73,5 script Hero Token Exchanger#1 4_F_SHADOWCHASER,{ moro_cav,32,73,5 script Hero Token Exchanger#1 4_F_SHADOWCHASER,{
disable_items; disable_items;
if (checkweight(1201,1) == 0) {// custom
mes "The kind of items you have is too various. Retry after reducing the sort of items.";
close;
}
if ((MaxWeight - Weight) < 10000) {
mes "You are overburdened, so you cannot proceed it anymore. Please try again after reduce the weight.";
close;
}
mes "[Hero Token Exchanger]"; mes "[Hero Token Exchanger]";
mes "If you fought Morocc"; mes "If you fought Morocc";
mes "and collected"; mes "and collected";
@ -24,6 +18,12 @@ moro_cav,32,73,5 script Hero Token Exchanger#1 4_F_SHADOWCHASER,{
mes "Do you want to take a look at my ring?"; mes "Do you want to take a look at my ring?";
while(true) { while(true) {
next; next;
if (checkweight(2163,2) == 0) {
mes "[Hero Token Exchanger]";
mes "Your pack has a lot of items,";
mes "Please come again after arrange it!";
close;
}
switch( select( "Ring description", "Exchange with the ring.", "End conversation." ) ) { switch( select( "Ring description", "Exchange with the ring.", "End conversation." ) ) {
case 1: case 1:
mes "[Hero Token Exchanger]"; mes "[Hero Token Exchanger]";

3
npc/re/mobs/dungeons/moro_vol.txt
View File

@ -18,6 +18,3 @@ moro_vol monster Fire Sandman 3021,30
moro_vol monster Fire Frilldora 3022,30 moro_vol monster Fire Frilldora 3022,30
moro_vol monster Fire Golem 3023,30 moro_vol monster Fire Golem 3023,30
moro_vol monster Fire Bug 3027,10 moro_vol monster Fire Bug 3027,10
moro_vol monster Blazing Morocc Reincarnation 3039,1
moro_vol monster Distorted Morocc Reincarnation 3040,1
moro_vol monster Freezing Morocc Reincarnation 3041,1

1063
npc/re/quests/quests_14_3.txt
View File

File diff suppressed because it is too large Load Diff

2531
npc/re/quests/quests_14_3_bis.txt
View File

File diff suppressed because it is too large Load Diff

4
sql-files/upgrades/upgrade_20200205.sql Normal file
View File

@ -0,0 +1,4 @@
UPDATE `char_reg_num` SET `key` = 'ep14_3_newerabs' WHERE `key` = 'ep14_3_dimensional_travel' AND `index` = 0 AND `value` < 2;
UPDATE `char_reg_num` SET `key` = 'ep14_3_newerabs', `value` = 3 WHERE `key` = 'ep14_3_dimensional_travel' AND `index` = 0 AND `value` = 2;
UPDATE `char_reg_num` SET `key` = 'ep14_3_newerabs', `value` = `value` + 2 WHERE `key` = 'ep14_3_dimensional_travel' AND `index` = 0 AND `value` < 8;
UPDATE `char_reg_num` SET `key` = 'ep14_3_newerabs', `value` = `value` + 7 WHERE `key` = 'ep14_3_dimensional_travel' AND `index` = 0 AND `value` > 7;