* Implemented Hall of Abyss:

-- Added investment NPCs; times are currently unofficial. (re/guild/invest_main.txt, re/guild/invest_npc.txt)
-- Added new guild mob spawns and updated FE; merged into a single file. (re/mobs/dungeons/gld_re.txt)
-- Added new warps. (re/warps/guildcastles.txt)
-- Added new quest entry 7349. (db/quest_db.txt)
* This does not contain the database updates (mob_db, item_db).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17368 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
euphyy 2013-06-16 05:57:22 +00:00
parent 50ded53db6
commit 39e5a1d0cf
10 changed files with 1901 additions and 53 deletions

View File

@ -997,6 +997,9 @@
7345,0,0,0,0,0,0,0,"List of Errands" 7345,0,0,0,0,0,0,0,"List of Errands"
7346,0,0,0,0,0,0,0,"List of Errands" 7346,0,0,0,0,0,0,0,"List of Errands"
// Hall of Abyss
7349,1800,0,0,0,0,0,0,"Vote"
// Port Malaya // Port Malaya
7350,0,0,0,0,0,0,0,"Cautious Village" 7350,0,0,0,0,0,0,0,"Cautious Village"
7351,0,0,0,0,0,0,0,"Better than My Old Button" 7351,0,0,0,0,0,0,0,"Better than My Old Button"

1678
npc/re/guild/invest_main.txt Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,66 @@
//===== rAthena Script =======================================
//= Hall of Abyss - NPC Duplicates
//===== By: ==================================================
//= Euphy
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= Expansion for War of Emperium FE.
//= Invest in each realm to unlock new maps:
//= - Guild Dungeon F2, total 20,000,000z.
//= - Hall of Abyss, total 70,000,000z.
//===== Additional Comments: =================================
//= 1.0 First version. [Euphy]
//============================================================
// Realms - Merchant Guilds, Gate Managers, Status Boards
//============================================================
alde_gld,186,157,3 duplicate(Cat Paw Merchant Guild) Cat Paw Merchant Megrez 549
alde_gld,191,164,3 duplicate(Gate Manager#realm) Gate Manager#alde_f00 421
alde_gld,188,158,3 duplicate(Investment Status Board) Investment Status Board::InvestStatus_Alde 857
gef_fild13,187,208,3 duplicate(Cat Paw Merchant Guild) Cat Paw Merchant Meraq 549
gef_fild13,189,206,3 duplicate(Gate Manager#realm) Gate Manager#gef_f00 421
gef_fild13,190,209,3 duplicate(Investment Status Board) Investment Status Board::InvestStatus_Gef 857
pay_gld,203,189,3 duplicate(Cat Paw Merchant Guild) Cat Paw Merchant Phecda 549
pay_gld,206,189,3 duplicate(Gate Manager#realm) Gate Manager#pay_f00 421
pay_gld,200,189,5 duplicate(Investment Status Board) Investment Status Board::InvestStatus_Pay 857
prt_gld,158,96,5 duplicate(Cat Paw Merchant Guild) Cat Paw Merchant Dubae 549
prt_gld,161,96,3 duplicate(Gate Manager#realm) Gate Manager#prt_f00 421
prt_gld,163,99,3 duplicate(Investment Status Board) Investment Status Board::InvestStatus_Prt 857
// Inside Castles - Gate Managers
//============================================================
aldeg_cas01,85,105,4 duplicate(Gate Manager#castle) Gate Manager#alde_f01 421
aldeg_cas02,124,49,3 duplicate(Gate Manager#castle) Gate Manager#alde_f02 421
aldeg_cas03,121,75,3 duplicate(Gate Manager#castle) Gate Manager#alde_f03 421
aldeg_cas04,25,67,7 duplicate(Gate Manager#castle) Gate Manager#alde_f04 421
aldeg_cas05,54,200,3 duplicate(Gate Manager#castle) Gate Manager#alde_f05 421
gefg_cas01,39,49,4 duplicate(Gate Manager#castle) Gate Manager#gef_f01 421
gefg_cas02,10,65,4 duplicate(Gate Manager#castle) Gate Manager#gef_f02 421
gefg_cas03,100,87,4 duplicate(Gate Manager#castle) Gate Manager#gef_f03 421
gefg_cas04,35,44,3 duplicate(Gate Manager#castle) Gate Manager#gef_f04 421
gefg_cas05,84,46,3 duplicate(Gate Manager#castle) Gate Manager#gef_f05 421
payg_cas01,129,59,3 duplicate(Gate Manager#castle) Gate Manager#pay_f01 421
payg_cas02,27,277,3 duplicate(Gate Manager#castle) Gate Manager#pay_f02 421
payg_cas03,51,266,3 duplicate(Gate Manager#castle) Gate Manager#pay_f03 421
payg_cas04,39,264,4 duplicate(Gate Manager#castle) Gate Manager#pay_f04 421
payg_cas05,272,252,4 duplicate(Gate Manager#castle) Gate Manager#pay_f05 421
prtg_cas01,114,178,3 duplicate(Gate Manager#castle) Gate Manager#prt_f01 421
prtg_cas02,89,63,5 duplicate(Gate Manager#castle) Gate Manager#prt_f02 421
prtg_cas03,72,109,3 duplicate(Gate Manager#castle) Gate Manager#prt_f03 421
prtg_cas04,29,263,4 duplicate(Gate Manager#castle) Gate Manager#prt_f04 421
prtg_cas05,24,23,4 duplicate(Gate Manager#castle) Gate Manager#prt_f05 421
// iRO NPC Locations
//============================================================
//prt_gld,148,253,4 duplicate(Cat Paw Merchants Notice) Cat Paw Merchants Notice::CatPawNotice_iRO 857
//prt_gld,145,255,6 duplicate(Namis#invest) Namis::Namis_iRO 545,4,4
//prt_gld,165,50,4 duplicate(Thanks Ticket Machine) Thanks Ticket Machine::ThanksMachine_iRO 564

View File

@ -1,52 +0,0 @@
//===== rAthena Script =======================================
//= Guild Dungeons Monster Spawn Script
//===== By: ==================================================
//= Athena (1.0)
//===== Current Version: =====================================
//= 1.3
//===== Compatible With: =====================================
//= Any Athena Version
//===== Additional Comments: =================================
//= 1.2 Official kRO 10.1 spawns [Playtester]
//= 1.3 Corrected MVP spawn variance. [Gepard]
//============================================================
//==================================================
// gld_dun01 - Guild Dungeon
//==================================================
gld_dun01,0,0,0,0 monster Am Mut 1301,20,5000,0,0
gld_dun01,0,0,0,0 monster Skeleton General 1290,10,5000,0,0
gld_dun01,0,0,0,0 monster Gajomart 1309,10,5000,0,0
gld_dun01,0,0,0,0 monster Cat o' Nine Tails 1307,3,1200000,0,0
gld_dun01,0,0,0,0 monster Vagabond Wolf 1092,1,14400000,7200000,1
gld_dun01,0,0,0,0 boss_monster Eddga 1115,1,28800000,600000,1
//==================================================
// gld_dun02 - Guild Dungeon
//==================================================
gld_dun02,0,0,0,0 monster Giant Hornet 1303,10,120000,60000,0
gld_dun02,0,0,0,0 monster Giant Spider 1304,10,240000,120000,0
gld_dun02,0,0,0,0 monster Ancient Worm 1305,7,120000,60000,0
gld_dun02,0,0,0,0 monster Killer Mantis 1294,5,120000,60000,0
gld_dun02,0,0,0,0 monster Owl Baron 1295,1,5000,0,0
gld_dun02,0,0,0,0 boss_monster Doppelganger 1046,1,28800000,600000,1
//==================================================
// gld_dun03 - Guild Dungeon
//==================================================
gld_dun03,0,0,0,0 monster Caterpillar 1300,20,5000,0,0
gld_dun03,0,0,0,0 monster Creamy Fear 1293,20,5000,0,0
gld_dun03,0,0,0,0 monster Leib Olmai 1306,20,5000,0,0
gld_dun03,0,0,0,0 monster Gullinbursti 1311,10,5000,0,0
gld_dun03,0,0,0,0 monster Maya Purple 1289,3,1200000,600000,0
gld_dun03,0,0,0,0 boss_monster Maya 1147,1,28800000,600000,1
//==================================================
// gld_dun04 - Guild Dungeon
//==================================================
gld_dun04,0,0,0,0 monster Zombie Master 1298,29,5000,0,0
gld_dun04,0,0,0,0 monster Wraith Dead 1291,27,5000,0,0
gld_dun04,0,0,0,0 monster Mini Demon 1292,3,5000,0,0
gld_dun04,0,0,0,0 monster Dark Illusion 1302,1,1200000,0,0
gld_dun04,0,0,0,0 monster Ghostring 1120,1,14400000,7200000,1
gld_dun04,0,0,0,0 boss_monster Dark Lord 1272,1,28800000,600000,1

View File

@ -0,0 +1,100 @@
//===== rAthena Script =======================================
//= Renewal Guild Monster Spawn Script
//===== By: ==================================================
//= Euphy
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
//= rAthena SVN
//===== Additional Comments: =================================
//= 1.0 First version, Hall of Abyss update. [Euphy]
//============================================================
//==================================================
// Baldur - gld_dun01, gld_dun01_2, gld2_pay
//==================================================
gld_dun01,0,0,0,0 monster Gullinbursti 1311,30,5000,0,0
gld_dun01,0,0,0,0 monster Leib Olmai 1306,55,5000,0,0
gld_dun01,0,0,0,0 monster Cat O' Nine Tails 1307,3,1200000,0,0
gld_dun01,0,0,0,0 boss_monster Moonlight Flower 1150,1,28800000,600000,1
gld_dun01_2,0,0,0,0 monster Skeleton General 1290,50,5000,0,0
gld_dun01_2,0,0,0,0 monster Am Mut 1301,15,5000,0,0
gld_dun01_2,0,0,0,0 monster Gajomart 1309,20,5000,0,0
gld_dun01_2,0,0,0,0 boss_monster Eddga 1115,1,28800000,600000,1
gld2_pay,0,0,0,0 monster Skeleton General 1290,60,5000,0,0
gld2_pay,0,0,0,0 monster Am Mut 1301,25,5000,0,0
gld2_pay,0,0,0,0 monster Gajomart 1309,30,5000,0,0
gld2_pay,0,0,0,0 boss_monster General Daehyun 2253,1,28800000,600000,1
gld2_pay,0,0,0,0 monster Samurai Soheon 2254,1,1800000,600000,1
//==================================================
// Luina - gld_dun02, gld_dun02_2, gld2_ald
//==================================================
gld_dun02,0,0,0,0 monster Giant Hornet 1303,30,5000,0,0
gld_dun02,0,0,0,0 monster Ancient Worm 1305,25,5000,0,0
gld_dun02,0,0,0,0 monster Giant Spider 1304,15,5000,0,0
gld_dun02,0,0,0,0 boss_monster Mistress 1059,1,28800000,600000,1
gld_dun02_2,0,0,0,0 monster Killer Mantis 1294,30,5000,0,0
gld_dun02_2,0,0,0,0 monster Angra Mantis 2133,40,5000,0,0
gld_dun02_2,0,0,0,0 monster Maya Purple 1289,3,1200000,600000,0
gld_dun02_2,0,0,0,0 boss_monster Maya 1147,1,28800000,600000,1
gld2_ald,0,0,0,0 monster Killer Mantis 1294,60,5000,0,0
gld2_ald,0,0,0,0 monster Angra Mantis 2133,70,5000,0,0
gld2_ald,0,0,0,0 monster Maya Purple 1289,3,1200000,0,0
gld2_ald,0,0,0,0 boss_monster Gioia 2251,1,28800000,600000,1
gld2_ald,0,0,0,0 monster Elvira 2252,1,1800000,600000,1
//==================================================
// Valkyrie - gld_dun03, gld_dun03_02, gld2_prt
//==================================================
gld_dun03,0,0,0,0 monster Caterpillar 1300,35,5000,0,0
gld_dun03,0,0,0,0 monster Creamy Fear 1293,35,5000,0,0
gld_dun03,0,0,0,0 boss_monster Baphomet 1039,1,28800000,600000,1
gld_dun03_2,0,0,0,0 monster Dark Axe Kobold 2284,13,5000,0,0
gld_dun03_2,0,0,0,0 monster Dark Hammer Kobold 2285,23,5000,0,0
gld_dun03_2,0,0,0,0 monster Dark Mace Kobold 2286,23,5000,0,0
gld_dun03_2,0,0,0,0 monster Dark Kobold Archer 2287,23,5000,0,0
gld_dun03_2,0,0,0,0 monster Kobold Leader 1296,1,14400000,7200000,1
gld_dun03_2,0,0,0,0 boss_monster Atroce 1785,1,28800000,600000,1
gld2_prt,0,0,0,0 monster Dark Axe Kobold 2284,25,5000,0,0
gld2_prt,0,0,0,0 monster Dark Hammer Kobold 2285,35,5000,0,0
gld2_prt,0,0,0,0 monster Dark Mace Kobold 2286,35,5000,0,0
gld2_prt,0,0,0,0 monster Dark Kobold Archer 2287,35,5000,0,0
gld2_prt,0,0,0,0 boss_monster Angry Student Pyuriel 2249,1,28800000,600000,1
gld2_prt,0,0,0,0 monster Warrior Laura 2250,1,1800000,600000,1
//==================================================
// Britoniah - gld_dun04, gld_dun04_02, gld2_gef
//==================================================
gld_dun04,0,0,0,0 monster Mini Demon 1292,10,5000,0,0
gld_dun04,0,0,0,0 monster Zombie Master 1298,55,5000,0,0
gld_dun04,0,0,0,0 monster Wraith Dead 1291,25,5000,0,0
gld_dun04,0,0,0,0 monster Ghostring 1120,1,14400000,7200000,1
gld_dun04,0,0,0,0 boss_monster Doppelganger 1046,1,28800000,600000,1
gld_dun04_2,0,0,0,0 monster Dark Frame 2282,15,5000,0,0
gld_dun04_2,0,0,0,0 monster Dark Priest 2283,15,5000,0,0
gld_dun04_2,0,0,0,0 monster Dark Shadow 2281,45,5000,0,0
gld_dun04_2,0,0,0,0 monster Dark Illusion 1302,1,1200000,0,0
gld_dun04_2,0,0,0,0 boss_monster Dark Lord 1272,1,28800000,600000,1
gld2_gef,0,0,0,0 monster Dark Frame 2282,20,5000,0,0
gld2_gef,0,0,0,0 monster Dark Priest 2283,20,5000,0,0
gld2_gef,0,0,0,0 monster Dark Shadow 2281,80,5000,0,0
gld2_gef,0,0,0,0 monster Dark Illusion 1302,1,1200000,0,0
gld2_gef,0,0,0,0 boss_monster Dark Guardian Kades 2255,1,28800000,600000,1
gld2_gef,0,0,0,0 monster Rudo 2256,1,1800000,600000,1
//==================================================
// Treasure Chests
//==================================================
gld2_pay,0,0,0,0 monster Treasure Chest 2288,5,5000,0,0
gld2_ald,0,0,0,0 monster Treasure Chest 2288,5,5000,0,0
gld2_prt,0,0,0,0 monster Treasure Chest 2288,5,5000,0,0
gld2_gef,0,0,0,0 monster Treasure Chest 2288,5,5000,0,0

View File

@ -0,0 +1,8 @@
// --------------------------------------------------------------
// - Renewal Guild Wars -
// --------------------------------------------------------------
// ----------------------- War of Emperium ----------------------
// - Hall of Abyss
npc: npc/re/guild/invest_main.txt
npc: npc/re/guild/invest_npc.txt

View File

@ -35,6 +35,7 @@ import: npc/scripts_warps.conf
// ------------------- Renewal Script Files --------------------- // ------------------- Renewal Script Files ---------------------
import: npc/re/scripts_athena.conf import: npc/re/scripts_athena.conf
import: npc/re/scripts_guild.conf
import: npc/re/scripts_jobs.conf import: npc/re/scripts_jobs.conf
import: npc/re/scripts_mapflags.conf import: npc/re/scripts_mapflags.conf
import: npc/re/scripts_monsters.conf import: npc/re/scripts_monsters.conf

View File

@ -18,8 +18,8 @@ npc: npc/re/mobs/dungeons/ein_dun.txt
npc: npc/re/mobs/dungeons/gef_dun.txt npc: npc/re/mobs/dungeons/gef_dun.txt
npc: npc/re/mobs/dungeons/gefenia.txt npc: npc/re/mobs/dungeons/gefenia.txt
npc: npc/re/mobs/dungeons/glastheim.txt npc: npc/re/mobs/dungeons/glastheim.txt
npc: npc/re/mobs/dungeons/gld_dun.txt
npc: npc/re/mobs/dungeons/gld_dunSE.txt npc: npc/re/mobs/dungeons/gld_dunSE.txt
npc: npc/re/mobs/dungeons/gld_re.txt
npc: npc/re/mobs/dungeons/gon_dun.txt npc: npc/re/mobs/dungeons/gon_dun.txt
npc: npc/re/mobs/dungeons/ice_dun.txt npc: npc/re/mobs/dungeons/ice_dun.txt
npc: npc/re/mobs/dungeons/in_sphinx.txt npc: npc/re/mobs/dungeons/in_sphinx.txt

View File

@ -38,3 +38,4 @@ npc: npc/re/warps/other/jobquests.txt
npc: npc/re/warps/other/paradise.txt npc: npc/re/warps/other/paradise.txt
npc: npc/re/warps/other/s_workshop.txt npc: npc/re/warps/other/s_workshop.txt
npc: npc/re/warps/other/sign.txt npc: npc/re/warps/other/sign.txt
npc: npc/re/warps/guildcastles.txt

View File

@ -0,0 +1,43 @@
//===== rAthena Script =======================================
//= Guild Castles Warp Script
//===== By: ==================================================
//= Euphy
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= Warp Points for Renewal Guild Castles
//===== Additional Comments: =================================
//= 1.0 First version. [Euphy]
//============================================================
// Hall of Abyss
//============================================================
gld2_prt,10,22,0 warp dun2prt_to_gld 1,1,prt_gld,252,247
gld2_prt,14,252,0 warp dun2prt_to_gld#2 1,1,prt_gld,63,66
gld2_prt,266,236,0 warp dun2prt_to_gld#3 1,1,prt_gld,252,247
gld2_prt,226,21,0 warp dun2prt_to_gld#4 1,1,prt_gld,63,66
gld2_prt,103,11,0 warp dun2prt_to_gld#5 1,1,prt_gld,252,247
gld_dun03_2,238,274,0 warp gdun03a_prtg#abyss 1,1,prt_gld,252,247
gld_dun03_2,42,30,0 warp gdun03b_prtg#abyss 1,1,prt_gld,63,66
gld2_pay,33,105,0 warp dun2pay_to_gld 1,1,pay_gld,53,141
gld2_pay,119,21,0 warp dun2pay_to_gld#2 1,1,pay_gld,53,141
gld2_pay,205,105,0 warp dun2pay_to_gld#3 1,1,pay_gld,53,141
gld2_pay,175,215,0 warp dun2pay_to_gld#4 1,1,pay_gld,53,141
gld2_pay,61,215,0 warp dun2pay_to_gld#5 1,1,pay_gld,53,141
gld_dun01_2,119,14,0 warp gdun01_payg#abyss 1,1,pay_gld,53,141
gld2_gef,28,205,0 warp dun2gef_to_gld 1,1,gef_fild13,42,331
gld2_gef,221,145,0 warp dun2gef_to_gld#2 1,1,gef_fild13,373,62
gld2_gef,175,198,0 warp dun2gef_to_gld#3 1,1,gef_fild13,42,331
gld2_gef,25,68,0 warp dun2gef_to_gld#4 1,1,gef_fild13,373,62
gld2_gef,111,35,0 warp dun2gef_to_gld#5 1,1,gef_fild13,42,331
gld_dun04_2,37,230,0 warp gdun04_g13a#abyss 1,1,gef_fild13,42,331
gld_dun04_2,110,20,0 warp gdun04_g13b#abyss 1,1,gef_fild13,373,62
gld2_ald,172,46,0 warp dun2gef_to_gld#6 1,1,alde_gld,242,121
gld2_ald,77,58,0 warp dun2gef_to_gld#7 1,1,alde_gld,229,185
gld2_ald,46,122,0 warp dun2gef_to_gld#8 1,1,alde_gld,242,121
gld2_ald,104,250,0 warp dun2gef_to_gld#9 1,1,alde_gld,229,185
gld2_ald,247,156,0 warp dun2gef_to_gld#10 1,1,alde_gld,242,121
gld_dun02_2,20,160,0 warp gdun02a_aldega#abyss 1,1,alde_gld,229,185
gld_dun02_2,180,112,0 warp gdun02b_aldegb#abyss 1,1,alde_gld,242,121