Browse Source

* Added jRO Eclage mob spawns. (credits: refis, Auriga)
* Fixed an overflow in custom wedding script. (bugreport:8032)

Signed-off-by: Euphy <euphy@rathena.org>

Euphy 11 years ago
parent
commit
0fe7006883

+ 1 - 1
npc/custom/etc/marriage.txt

@@ -719,7 +719,7 @@ function SF_TryRegister {
 		close;
 		close;
 	}
 	}
 	set Zeny,Zeny-@cost;
 	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) {
 	if (@bride) {
 		set $wed_bride_progress,1;
 		set $wed_bride_progress,1;
 		set $wed_bride$,strcharinfo(0);
 		set $wed_bride$,strcharinfo(0);

+ 1 - 1
npc/other/arena/arena_aco.txt

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

+ 1 - 1
npc/other/arena/arena_lvl50.txt

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

+ 1 - 1
npc/other/arena/arena_lvl60.txt

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

+ 1 - 1
npc/other/arena/arena_lvl70.txt

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

+ 1 - 1
npc/other/arena/arena_lvl80.txt

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

+ 1 - 1
npc/other/arena/arena_party.txt

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

+ 1 - 1
npc/other/arena/arena_room.txt

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

+ 1 - 1
npc/pre-re/mobs/dungeons/abbey.txt

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

+ 1 - 1
npc/pre-re/mobs/dungeons/thor_v.txt

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

+ 1 - 1
npc/re/mobs/dungeons/abbey.txt

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

+ 1 - 1
npc/re/mobs/dungeons/bra_dun.txt

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

+ 1 - 1
npc/re/mobs/dungeons/dew_dun.txt

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

+ 1 - 1
npc/re/mobs/dungeons/dic_dun.txt

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

+ 39 - 0
npc/re/mobs/dungeons/ecl_tdun.txt

@@ -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

+ 1 - 1
npc/re/mobs/dungeons/ma_dun.txt

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

+ 1 - 1
npc/re/mobs/dungeons/mal_dun.txt

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

+ 1 - 1
npc/re/mobs/dungeons/thor_v.txt

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

+ 1 - 1
npc/re/mobs/fields/bifrost.txt

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

+ 1 - 1
npc/re/mobs/fields/dewata.txt

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

+ 19 - 0
npc/re/mobs/fields/eclage.txt

@@ -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

+ 1 - 1
npc/re/mobs/fields/malaya.txt

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

+ 2 - 0
npc/re/scripts_monsters.conf

@@ -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/c_tower.txt
 npc: npc/re/mobs/dungeons/dew_dun.txt
 npc: npc/re/mobs/dungeons/dew_dun.txt
 npc: npc/re/mobs/dungeons/dic_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/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
@@ -59,6 +60,7 @@ npc: npc/re/mobs/fields/brasilis.txt
 npc: npc/re/mobs/fields/comodo.txt
 npc: npc/re/mobs/fields/comodo.txt
 npc: npc/re/mobs/fields/dewata.txt
 npc: npc/re/mobs/fields/dewata.txt
 npc: npc/re/mobs/fields/dicastes.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/einbroch.txt
 npc: npc/re/mobs/fields/geffen.txt
 npc: npc/re/mobs/fields/geffen.txt
 npc: npc/re/mobs/fields/gonryun.txt
 npc: npc/re/mobs/fields/gonryun.txt

+ 1 - 1
npc/re/scripts_warps.conf

@@ -16,7 +16,7 @@ npc: npc/re/warps/cities/yggdrasil.txt
 // -------------------------- Dungeons --------------------------
 // -------------------------- Dungeons --------------------------
 npc: npc/re/warps/dungeons/bra_dun.txt
 npc: npc/re/warps/dungeons/bra_dun.txt
 npc: npc/re/warps/dungeons/dic_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/iz_dun.txt
 npc: npc/re/warps/dungeons/moc_pryd.txt
 npc: npc/re/warps/dungeons/moc_pryd.txt
 
 

+ 0 - 0
npc/re/warps/dungeons/ecl_dun.txt → npc/re/warps/dungeons/ecl_tdun.txt