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

* Added jRO Eclage mob spawns. (credits: refis, Auriga)

Browse Source 
* Fixed an overflow in custom wedding script. (bugreport:8032)

Signed-off-by: Euphy <euphy@rathena.org>
This commit is contained in:
Euphy 2013-08-30 15:26:44 -04:00
parent fb74928700
commit 0fe7006883
25 changed files with 81 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
npc/custom/etc/marriage.txt
View File

@ -719,7 +719,7 @@ function SF_TryRegister {
close;
}
set Zeny,Zeny-@cost;
sc_start SC_Wedding,3600000000,1; //Start Wedding Effect (SC_WEDDING)
sc_start SC_Wedding,3600000,1; //Start Wedding Effect (SC_WEDDING)
if (@bride) {
set $wed_bride_progress,1;
set $wed_bride$,strcharinfo(0);

2
npc/other/arena/arena_aco.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Izlude Arena Script
//===== By: ==================================================
//= L0ne_W0lf

2
npc/other/arena/arena_lvl50.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Izlude Arena Level 50
//===== By: ==================================================
//= SinSloth

2
npc/other/arena/arena_lvl60.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Izlude Arena Level 60
//===== By: ==================================================
//= SinSloth

2
npc/other/arena/arena_lvl70.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Izlude Arena Level 70
//===== By: ==================================================
//= SinSloth

2
npc/other/arena/arena_lvl80.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Izlude Arena Level 80
//===== By: ==================================================
//= SinSloth

2
npc/other/arena/arena_party.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Izlude Party Arena
//===== By: ==================================================
//= SinSloth

2
npc/other/arena/arena_room.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Izlude Arena Room
//===== By: ==================================================
//= SinSloth

2
npc/pre-re/mobs/dungeons/abbey.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Abbey Dungeon Monster Spawn Script
//===== By: ==================================================
//= $ephiroth

2
npc/pre-re/mobs/dungeons/thor_v.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Thor Volcano Monster Spawn Script
//===== By: ==================================================
//= Playtester

2
npc/re/mobs/dungeons/abbey.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Abbey Dungeon Monster Spawn Script
//===== By: ==================================================
//= $ephiroth

2
npc/re/mobs/dungeons/bra_dun.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Brasilis Dungeon Monster Spawn Script
//===== By: ==================================================
//= Kisuka

2
npc/re/mobs/dungeons/dew_dun.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Dewata Dungeon Monster Spawn Script
//===== By: ==================================================
//= Chilly

2
npc/re/mobs/dungeons/dic_dun.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= El Dicastes Dungeon Monster Spawn Script
//===== By: ==================================================
//= Kisuka

39
npc/re/mobs/dungeons/ecl_tdun.txt Normal file
View File

@ -0,0 +1,39 @@
//===== rAthena Script =======================================
//= Eclage Dungeon Monster Spawn Script
//===== By: ==================================================
//= refis
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= jRO monster spawns, taken from Auriga.
//===== Additional Comments: =================================
//= 1.0 First version. [Euphy]
//============================================================
//==================================================
// ecl_tdun01 - Eclage Dungeon
//==================================================
ecl_tdun01.gat,0,0,0,0 monster Cenere 2365,5,5000,0,0
ecl_tdun01.gat,0,0,0,0 monster Antique Book 2366,5,5000,0,0
ecl_tdun01.gat,0,0,0,0 monster Blue Lichtern 2367,5,5000,0,0
//==================================================
// ecl_tdun02 - Eclage Dungeon
//==================================================
ecl_tdun02.gat,0,0,0,0 monster Cenere 2365,10,5000,0,0
ecl_tdun02.gat,0,0,0,0 monster Antique Book 2366,10,5000,0,0
ecl_tdun02.gat,0,0,0,0 monster Blue Lichtern 2367,15,5000,0,0
ecl_tdun02.gat,0,0,0,0 monster Yellow Lichtern 2368,5,5000,0,0
//==================================================
// ecl_tdun03 - Eclage Dungeon
//==================================================
ecl_tdun03.gat,0,0,0,0 monster Cenere 2365,15,5000,0,0
ecl_tdun03.gat,0,0,0,0 monster Antique Book 2366,15,5000,0,0
ecl_tdun03.gat,0,0,0,0 monster Blue Lichtern 2367,5,5000,0,0
ecl_tdun03.gat,0,0,0,0 monster Yellow Lichtern 2368,15,5000,0,0
ecl_tdun03.gat,0,0,0,0 monster Red Lichtern 2369,10,5000,0,0
ecl_tdun03.gat,0,0,0,0 monster Green Lichtern 2370,15,5000,0,0
ecl_tdun03.gat,0,0,0,0 monster Faithful Manager 2371,5,5000,0,0

2
npc/re/mobs/dungeons/ma_dun.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Malaya Port Dungeon Monster Spawn Script
//===== By: ==================================================
//= Chilly

2
npc/re/mobs/dungeons/mal_dun.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Malangdo Dungeon Monster Spawn Script
//===== By: ==================================================
//= Chilly

2
npc/re/mobs/dungeons/thor_v.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Thor Volcano Monster Spawn Script
//===== By: ==================================================
//= Playtester

2
npc/re/mobs/fields/bifrost.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Bifrost Field Monster Spawn Script
//===== By: ==================================================
//= Chilly

2
npc/re/mobs/fields/dewata.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Dewata Field Monster Spawn Script
//===== By: ==================================================
//= Chilly

19
npc/re/mobs/fields/eclage.txt Normal file
View File

@ -0,0 +1,19 @@
//===== rAthena Script =======================================
//= Eclage Field Monster Spawn Script
//===== By: ==================================================
//= refis
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= jRO monster spawns, taken from Auriga.
//===== Additional Comments: =================================
//= 1.0 First version. [Euphy]
//============================================================
//==================================================
// ecl_fild01 - Blooming Flower Land
//==================================================
ecl_fild01.gat,0,0,0,0 monster Menblatt 2363,60,5000,0,0
ecl_fild01.gat,0,0,0,0 monster Petal 2364,20,5000,0,0

2
npc/re/mobs/fields/malaya.txt
View File

@ -1,4 +1,4 @@
//===== rAthena Script ========================================
//===== rAthena Script =======================================
//= Malaya Port Field Monster Spawn Script
//===== By: ==================================================
//= Chilly

2
npc/re/scripts_monsters.conf
View File

@ -17,6 +17,7 @@ npc: npc/re/mobs/dungeons/bra_dun.txt
npc: npc/re/mobs/dungeons/c_tower.txt
npc: npc/re/mobs/dungeons/dew_dun.txt
npc: npc/re/mobs/dungeons/dic_dun.txt
npc: npc/re/mobs/dungeons/ecl_tdun.txt
npc: npc/re/mobs/dungeons/ein_dun.txt
npc: npc/re/mobs/dungeons/gef_dun.txt
npc: npc/re/mobs/dungeons/gefenia.txt
@ -59,6 +60,7 @@ npc: npc/re/mobs/fields/brasilis.txt
npc: npc/re/mobs/fields/comodo.txt
npc: npc/re/mobs/fields/dewata.txt
npc: npc/re/mobs/fields/dicastes.txt
npc: npc/re/mobs/fields/eclage.txt
npc: npc/re/mobs/fields/einbroch.txt
npc: npc/re/mobs/fields/geffen.txt
npc: npc/re/mobs/fields/gonryun.txt

2
npc/re/scripts_warps.conf
View File

@ -16,7 +16,7 @@ npc: npc/re/warps/cities/yggdrasil.txt
// -------------------------- Dungeons --------------------------
npc: npc/re/warps/dungeons/bra_dun.txt
npc: npc/re/warps/dungeons/dic_dun.txt
npc: npc/re/warps/dungeons/ecl_dun.txt
npc: npc/re/warps/dungeons/ecl_tdun.txt
npc: npc/re/warps/dungeons/iz_dun.txt
npc: npc/re/warps/dungeons/moc_pryd.txt

0
npc/re/warps/dungeons/ecl_dun.txt → npc/re/warps/dungeons/ecl_tdun.txt
View File