diff options
| author | daegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-08-01 05:06:59 +0000 |
|---|---|---|
| committer | daegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-08-01 05:06:59 +0000 |
| commit | 9a13c358e79e1a9ae97bcf120783abdaee6a2e39 (patch) | |
| tree | f428ffe6f4b3fa113300fe87e5d9d36e0a0021da /npc | |
| parent | 2ce5fb7de85ca0ca227cbf42b87130dbb4618cf7 (diff) | |
| download | hercules-9a13c358e79e1a9ae97bcf120783abdaee6a2e39.tar.gz hercules-9a13c358e79e1a9ae97bcf120783abdaee6a2e39.tar.bz2 hercules-9a13c358e79e1a9ae97bcf120783abdaee6a2e39.tar.xz hercules-9a13c358e79e1a9ae97bcf120783abdaee6a2e39.zip | |
Follow up r16545. Fixed some mistakes I made.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16548 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/kafras/functions_kafras.txt | 10 | ||||
| -rw-r--r-- | npc/pre-re/scripts_main.conf | 4 | ||||
| -rw-r--r-- | npc/re/scripts_main.conf | 4 | ||||
| -rw-r--r-- | npc/scripts_monsters.conf | 8 |
4 files changed, 14 insertions, 12 deletions
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 4fc08fc0e..0a6dad7d8 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -402,10 +402,12 @@ function script F_KafTele { if (@wrpD$[@num] == "Al De Baran") warp "aldebaran",168,112; if (@wrpD$[@num] == "Aldebaran") warp "aldebaran",168,112; if (@wrpD$[@num] == "Comodo") warp "comodo", 209, 143; - if(checkre(0) - if (@wrpD$[@num] == "Izlude") warp "izlude", 128, 98; - else - if (@wrpD$[@num] == "Izlude") warp "izlude", 91, 105; + if (@wrpD$[@num] == "Izlude") { + if(checkre(0)) + warp "izlude", 128, 98; + else + warp "izlude", 91, 105; + } if (@wrpD$[@num] == "Geffen") warp "geffen", 120, 39; if (@wrpD$[@num] == "Morroc") warp "morocc", 156, 46; if (@wrpD$[@num] == "Payon") warp "payon", 161, 58; diff --git a/npc/pre-re/scripts_main.conf b/npc/pre-re/scripts_main.conf index 339863856..e029447b5 100644 --- a/npc/pre-re/scripts_main.conf +++ b/npc/pre-re/scripts_main.conf @@ -19,11 +19,11 @@ // ------------------ Global Scripts Functions ------------------ // Utilitarian functions used by many scripts. -npc: npc/pre-re/other/Global_Functions.txt +npc: npc/other/Global_Functions.txt // -------------------- Cash Shop Functions --------------------- // Used by cash shop items in the Item Database. -npc: npc/pre-re/other/CashShop_Functions.txt +npc: npc/other/CashShop_Functions.txt // ------------------- Common Script Files ---------------------- import: npc/scripts_athena.conf diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf index d4d80461f..2bca12324 100644 --- a/npc/re/scripts_main.conf +++ b/npc/re/scripts_main.conf @@ -19,11 +19,11 @@ // ------------------ Global Scripts Functions ------------------ // Utilitarian functions used by many scripts. -npc: npc/re/other/Global_Functions.txt +npc: npc/other/Global_Functions.txt // -------------------- Cash Shop Functions --------------------- // Used by cash shop items in the Item Database. -npc: npc/re/other/CashShop_Functions.txt +npc: npc/other/CashShop_Functions.txt // ------------------- Common Script Files ---------------------- import: npc/scripts_athena.conf diff --git a/npc/scripts_monsters.conf b/npc/scripts_monsters.conf index 0e4eb626d..0409db90a 100644 --- a/npc/scripts_monsters.conf +++ b/npc/scripts_monsters.conf @@ -2,7 +2,7 @@ // - Monster Scripts - // -------------------------------------------------------------- -npc: npc/pre-re/mobs/bossnia.txt -npc: npc/pre-re/mobs/citycleaners.txt -npc: npc/pre-re/mobs/jail.txt -npc: npc/pre-re/mobs/pvp.txt +npc: npc/mobs/bossnia.txt +npc: npc/mobs/citycleaners.txt +npc: npc/mobs/jail.txt +npc: npc/mobs/pvp.txt |