summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-05 14:26:14 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-05 14:26:14 +0000
commit118f40a21b10c6d455898fb0b1c62f1931435a55 (patch)
treee674c423f7f7a399439ec8bddd1e29ce151cdee5
parent691ea1aafee42b620ac28282e55e222f6ef08b99 (diff)
downloadhercules-118f40a21b10c6d455898fb0b1c62f1931435a55.tar.gz
hercules-118f40a21b10c6d455898fb0b1c62f1931435a55.tar.bz2
hercules-118f40a21b10c6d455898fb0b1c62f1931435a55.tar.xz
hercules-118f40a21b10c6d455898fb0b1c62f1931435a55.zip
Fixed extra EOL in jro spawn
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9145 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/eamobs/jro/jro.txt40
2 files changed, 12 insertions, 29 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 9710c9342..bd5e564a7 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -34,6 +34,7 @@ KarLaeda
Date Added
======
11/05
+ * Fixed extra EOL in jro spawn [KarLaeda]
* Fixed reward of gunslinger job quest [Playtester]
11/04
* Many small fixes - tabs, parenthesis [KarLaeda]
diff --git a/npc/eamobs/jro/jro.txt b/npc/eamobs/jro/jro.txt
index 8aa3803f8..54d02fc41 100644
--- a/npc/eamobs/jro/jro.txt
+++ b/npc/eamobs/jro/jro.txt
@@ -103,8 +103,7 @@ tha_t07.gat,70,105,40,75 monster Lady Solace 1703,7,300000,120000,0
tha_t07.gat,70,105,40,75 monster Mistress of Shelter 1701,7,300000,120000,0
tha_t07.gat,70,105,40,75 monster Baroness of Retribution 1702,15,0,0,0
tha_t07.gat,70,105,40,75 monster Dame of Sentinel 1700,7,300000,120000,0
-tha_t07.gat,70,105,40,75 monster Despero of
-Thanatos 1705,2,1800000,1200000,0
+tha_t07.gat,70,105,40,75 monster Despero of Thanatos 1705,2,1800000,1200000,0
// tha_t08
@@ -112,8 +111,7 @@ tha_t08.gat,70,105,40,80 monster Death Word 1698,10,300000,120000,0
tha_t08.gat,70,105,40,80 monster Ancient Mimic 1699,10,300000,120000,0
tha_t08.gat,70,105,40,80 monster Lady Solace 1703,5,0,0,0
tha_t08.gat,70,105,40,80 monster Mistress of Shelter 1701,5,0,0,0
-tha_t08.gat,70,105,40,80 monster Baroness of
-Retribution 1702,20,300000,120000,0
+tha_t08.gat,70,105,40,80 monster Baroness of Retribution 1702,20,300000,120000,0
tha_t08.gat,70,105,40,80 monster Dame of Sentinel 1700,5,0,0,0
tha_t08.gat,70,105,40,80 monster Odium of Thanatos 1704,2,1800000,1200000,0
@@ -236,32 +234,28 @@ hu_fild05.gat,112,272,62,82 monster Petite 1156,2,0,0,0
hu_fild05.gat,112,272,62,82 monster Novus 1715,3,0,0,0
hu_fild05.gat,112,272,62,82 monster Novus 1718,3,0,0,0
hu_fild05.gat,112,272,62,82 monster Anopheles 1627,10,0,0,0
-hu_fild05.gat,112,272,62,82 monster Mutant
-Dragonoid 1262,1,24000000,1800000,0
+hu_fild05.gat,112,272,62,82 monster Mutant Dragonoid 1262,1,24000000,1800000,0
hu_fild05.gat,276,302,93,60 monster Grove 1687,15,0,0,0
hu_fild05.gat,276,302,93,60 monster Petite 1155,2,0,0,0
hu_fild05.gat,276,302,93,60 monster Petite 1156,3,0,0,0
hu_fild05.gat,276,302,93,60 monster Novus 1715,3,0,0,0
hu_fild05.gat,276,302,93,60 monster Novus 1718,3,0,0,0
hu_fild05.gat,276,302,93,60 monster Anopheles 1627,10,0,0,0
-hu_fild05.gat,276,302,93,60 monster Mutant
-Dragonoid 1262,1,24000000,1800000,0
+hu_fild05.gat,276,302,93,60 monster Mutant Dragonoid 1262,1,24000000,1800000,0
hu_fild05.gat,286,144,82,90 monster Grove 1687,15,0,0,0
hu_fild05.gat,286,144,82,90 monster Petite 1155,3,0,0,0
hu_fild05.gat,286,144,82,90 monster Petite 1156,2,0,0,0
hu_fild05.gat,286,144,82,90 monster Novus 1715,3,0,0,0
hu_fild05.gat,286,144,82,90 monster Novus 1718,3,0,0,0
hu_fild05.gat,286,144,82,90 monster Anopheles 1627,10,0,0,0
-hu_fild05.gat,286,144,82,90 monster Mutant
-Dragonoid 1262,1,24000000,1800000,0
+hu_fild05.gat,286,144,82,90 monster Mutant Dragonoid 1262,1,24000000,1800000,0
hu_fild05.gat,286,144,82,90 monster Grove 1687,15,0,0,0
hu_fild05.gat,118,106,80,70 monster Petite 1155,2,0,0,0
hu_fild05.gat,118,106,80,70 monster Petite 1156,3,0,0,0
hu_fild05.gat,118,106,80,70 monster Novus 1715,3,0,0,0
hu_fild05.gat,118,106,80,70 monster Novus 1718,3,0,0,0
hu_fild05.gat,118,106,80,70 monster Anopheles 1627,10,0,0,0
-hu_fild05.gat,118,106,80,70 monster Mutant
-Dragonoid 1262,1,24000000,1800000,0
+hu_fild05.gat,118,106,80,70 monster Mutant Dragonoid 1262,1,24000000,1800000,0
hu_fild05.gat,0,0,0,0 monster Anopheles 1627,10,0,0,0
hu_fild05.gat,0,0,0,0 monster Dragon Egg 1721,2,3600000,1800000,0
hu_fild05.gat,196,196,5,5 monster Dragon Egg 1721,1,3600000,1800000,0
@@ -321,7 +315,6 @@ jupe_core.gat,0,0,0,0 monster Dimik 1673,40,0,0,1
jupe_core.gat,0,0,0,0 monster Archdam 1668,40,0,0,1
jupe_core.gat,0,0,0,0 monster Vesper 1685,1,7200000,3600000,1
-
// lhz_dun01
lhz_dun01.gat,0,0,0,0 monster Metaling 1613,50,0,0,0
@@ -507,17 +500,12 @@ lhz_dun03.gat,180,113,13,9 monster Margaretha Sorin 1637,2,300000,120000,0
lhz_dun03.gat,180,113,13,9 monster Cecil Damon 1638,5,0,0,0
lhz_dun03.gat,180,113,13,9 monster Kathryne Keyron 1639,3,0,0,0
-lhz_dun03.gat,114,138,12,16 monster Lord Knight
-Seyren 1640,1,2700000,2400000,1
-lhz_dun03.gat,163,138,12,16 monster Whitesmith
-Howard 1642,1,3000000,2700000,1
-lhz_dun03.gat,139,158,20,11 monster Assassin Cross
-Eremes 1641,1,2580000,2340000,1
+lhz_dun03.gat,114,138,12,16 monster Lord Knight Seyren 1640,1,2700000,2400000,1
+lhz_dun03.gat,163,138,12,16 monster Whitesmith Howard 1642,1,3000000,2700000,1
+lhz_dun03.gat,139,158,20,11 monster Assassin Cross Eremes 1641,1,2580000,2340000,1
lhz_dun03.gat,139,117,20,11 monster Sniper Cecil 1644,1,2700000,2500000,1
-lhz_dun03.gat,138,138,36,34 monster High Priest
-Margaretha 1643,1,3300000,3000000,1
-lhz_dun03.gat,138,138,36,34 monster High Wizard
-Kathryne 1645,1,2580000,2460000,1
+lhz_dun03.gat,138,138,36,34 monster High Priest Margaretha 1643,1,3300000,3000000,1
+lhz_dun03.gat,138,138,36,34 monster High Wizard Kathryne 1645,1,2580000,2460000,1
// lhz_fild01
@@ -528,7 +516,6 @@ lhz_fild01.gat,0,0,0,0 monster Red Plant 1078,10,60000,30000,0
lhz_fild01.gat,0,0,0,0 monster Yellow Plant 1081,10,60000,30000,0
lhz_fild01.gat,0,0,0,0 monster Green Plant 1080,10,60000,30000,0
-
// lhz_fild02
lhz_fild02.gat,0,0,0,0 monster Metaling 1613,50,0,0,0
@@ -553,7 +540,6 @@ lhz_fild03.gat,0,0,0,0 monster Red Plant 1078,10,60000,30000,0
lhz_fild03.gat,0,0,0,0 monster Yellow Plant 1081,10,60000,30000,0
lhz_fild03.gat,0,0,0,0 monster Green Plant 1080,10,60000,30000,0
-
// ein_fild03
ein_fild03.gat,0,0,0,0 monster Metaling 1613,30,0,0,0
@@ -566,7 +552,6 @@ ein_fild03.gat,155,40,35,20 monster Horn 1128,5,60000,30000,1
ein_fild03.gat,0,0,0,0 monster Yellow Plant 1081,15,60000,30000,0
ein_fild03.gat,0,0,0,0 monster Green Plant 1080,15,60000,30000,0
-
// ein_fild04
ein_fild04.gat,0,0,0,0 monster Geographer 1368,15,0,0,0
@@ -582,9 +567,6 @@ ein_fild04.gat,0,0,0,0 monster Red Plant 1078,10,60000,30000,0
ein_fild04.gat,0,0,0,0 monster Yellow Plant 1081,10,60000,30000,0
ein_fild04.gat,0,0,0,0 monster Green Plant 1080,10,60000,30000,0
-
-
-
// einbech
einbech.gat,0,0,0,0 monster Wild Rose 1261,1,3600000,3000000,0