summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-27 10:23:48 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-27 10:23:48 +0000
commitf9a83bf431138de6fc43763bbf8858516a8d0b62 (patch)
tree82bc4f4d8e24c87aaf783455b74904890b4d9b68
parent76c525df7fd9ed50492b3cc298cd3b468b3abae5 (diff)
downloadhercules-f9a83bf431138de6fc43763bbf8858516a8d0b62.tar.gz
hercules-f9a83bf431138de6fc43763bbf8858516a8d0b62.tar.bz2
hercules-f9a83bf431138de6fc43763bbf8858516a8d0b62.tar.xz
hercules-f9a83bf431138de6fc43763bbf8858516a8d0b62.zip
* Another Episode 12 change, and more 13.1 content. [L0ne_W0lf]
- Moved Voting staff in Morroc to Morroc Ruins. - Added Manuk/Slpendide mob spawn files (commented out.) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13970 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/kafras/dts_warper.txt7
-rw-r--r--npc/mobs/fields/manuk.txt27
-rw-r--r--npc/mobs/fields/splendide.txt25
-rw-r--r--npc/scripts_monsters.conf2
5 files changed, 61 insertions, 3 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 628ce49d8..d6752483a 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,9 @@
Date Added
======
2009/07/26
+ * Rev. 13970 Another Episode 12 change, and more 13.1 content. [L0ne_W0lf]
+ - Moved Voting staff in Morroc to Morroc Ruins.
+ - Added Manuk/Slpendide mob spawn files (commented out.)
* Rev. 13969 Added Quest Log commands for 1-1 job quests and trans quest. [L0ne_W0lf]
2009/07/18
* Fixed "OnMobDeath" doesn't work sometime in Izlude Party Arena. [Inkfish]
diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt
index f9cd33df6..58aba58bc 100644
--- a/npc/kafras/dts_warper.txt
+++ b/npc/kafras/dts_warper.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Evera
//===== Current Version: =====================================
-//= 2.5
+//= 2.6
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -50,6 +50,7 @@
//= 2.3b corrected Glast warp coords [Lupus] 2.3c Bailand -> Bayalan
//= 2.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//= 2.5 Converted from Aegis file. (11.3) [L0ne_W0lf]
+//= 2.6 Moved Morroc NPCs to Morroc Ruins. [L0ne_W0lf]
//============================================================
einbroch,246,70,0 script Vote Timer#ein -1,{
@@ -686,7 +687,7 @@ yuno,162,191,4 script Kafra Voting Staff#yuno 861,{
prontera,164,125,4 script Kafra Voting Staff#prt 116,{
callfunc "F_VoteKafra",2;
}
-morocc,164,114,4 script Kafra Voting Staff#moc 116,{
+moc_ruins,97,133,4 script Kafra Voting Staff#moc 116,{
callfunc "F_VoteKafra",2;
}
geffen,122,37,4 script Kafra Voting Staff#gef 116,{
@@ -1098,7 +1099,7 @@ yuno,153,191,6 script Cool Event Staff#yuno::VotingStaffCCE 874,{
}
prontera,147,125,6 duplicate(VotingStaffCCE) Cool Event Staff#prt 874
-morocc,155,114,6 duplicate(VotingStaffCCE) Cool Event Staff#moc 874
+moc_ruins,104,133,6 duplicate(VotingStaffCCE) Cool Event Staff#moc 874
geffen,117,37,6 duplicate(VotingStaffCCE) Cool Event Staff#gef 874
payon,153,182,6 duplicate(VotingStaffCCE) Cool Event Staff#pay 874
alberta,114,70,6 duplicate(VotingStaffCCE) Cool Event Staff#alb 874
diff --git a/npc/mobs/fields/manuk.txt b/npc/mobs/fields/manuk.txt
new file mode 100644
index 000000000..75e9e2908
--- /dev/null
+++ b/npc/mobs/fields/manuk.txt
@@ -0,0 +1,27 @@
+//===== eAthena Script =======================================
+//= Manuk Fields Monster Spawn Script
+//===== By: ==================================================
+//= alexx, MaC
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Additional Comments: =================================
+//= 1.0 Official spawn ammounts from Aegis script [alexx]
+//============================================================
+
+//============================================================
+// man_fild01 - Manuk Field
+//============================================================
+man_fild01,0,0,0,0 monster Nepenthes 1988,105,0,0,0
+man_fild01,0,0,0,0 monster Hillthion 1989,10,0,0,0
+man_fild01,0,0,0,0 monster Centipede Larva 1999,30,0,0,0
+man_fild01,0,0,0,0 monster Centipede 1987,2,0,0,0
+
+//============================================================
+// man_fild03 - Manuk Field
+//============================================================
+man_fild03,0,0,0,0 monster Hillthion 1989,25,0,0,0
+man_fild03,0,0,0,0 monster Tatacho 1986,25,0,0,0
+man_fild03,0,0,0,0 monster Centipede 1987,25,0,0,0
+man_fild03,0,0,0,0 monster Hardrock Mammoth 1990,1,14400000,0,0
diff --git a/npc/mobs/fields/splendide.txt b/npc/mobs/fields/splendide.txt
new file mode 100644
index 000000000..36db99266
--- /dev/null
+++ b/npc/mobs/fields/splendide.txt
@@ -0,0 +1,25 @@
+//===== eAthena Script =======================================
+//= Splendide Fields Monster Spawn Script
+//===== By: ==================================================
+//= alexx, MaC
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Additional Comments: =================================
+//= 1.0 Official spawn ammounts from Aegis script [alexx]
+//============================================================
+
+//==================================================
+// spl_fild02 - Splendide Field
+//==================================================
+spl_fild02,0,0,0,0 monster Pinguicula 1995,95,0,0,0
+spl_fild02,0,0,0,0 monster Luciola Vespa 1994,15,0,0,0
+
+//==================================================
+// spl_fild03 - Splendide Field
+//==================================================
+spl_fild03,0,0,0,0 monster Luciola Vespa 1994,35,0,0,0
+spl_fild03,0,0,0,0 monster Cornus 1992,25,0,0,0
+spl_fild03,0,0,0,0 monster Naga 1993,20,0,0,0
+spl_fild03,0,0,0,0 monster Tendril Lion 1991,1,3600000,0,0 \ No newline at end of file
diff --git a/npc/scripts_monsters.conf b/npc/scripts_monsters.conf
index cdc8c7bc2..0fd6a1525 100644
--- a/npc/scripts_monsters.conf
+++ b/npc/scripts_monsters.conf
@@ -15,6 +15,7 @@ npc: npc/mobs/fields/jawaii.txt
npc: npc/mobs/fields/lighthalzen.txt
npc: npc/mobs/fields/louyang.txt
npc: npc/mobs/fields/lutie.txt
+//npc: npc/mobs/fields/manuk.txt
npc: npc/mobs/fields/mjolnir.txt
npc: npc/mobs/fields/morocc.txt
npc: npc/mobs/fields/moscovia.txt
@@ -22,6 +23,7 @@ npc: npc/mobs/fields/niflheim.txt
npc: npc/mobs/fields/payon.txt
npc: npc/mobs/fields/prontera.txt
npc: npc/mobs/fields/rachel.txt
+//npc: npc/mobs/fields/splendide.txt
npc: npc/mobs/fields/umbala.txt
npc: npc/mobs/fields/veins.txt
npc: npc/mobs/fields/yuno.txt