From 077d9c8dca0918995f48fe8b3c1e8525e0bf74f8 Mon Sep 17 00:00:00 2001 From: Matheus Macabu Date: Sat, 18 May 2013 16:00:28 -0300 Subject: Relocated mapflag from conf/ to npc/ and renamed some script files Signed-off-by: Matheus Macabu --- npc/pre-re/scripts.conf | 76 ++++++++++++++++++++++++++++++++++++++++++ npc/pre-re/scripts_athena.conf | 76 ------------------------------------------ 2 files changed, 76 insertions(+), 76 deletions(-) create mode 100644 npc/pre-re/scripts.conf delete mode 100644 npc/pre-re/scripts_athena.conf (limited to 'npc/pre-re') diff --git a/npc/pre-re/scripts.conf b/npc/pre-re/scripts.conf new file mode 100644 index 000000000..6a69ede0e --- /dev/null +++ b/npc/pre-re/scripts.conf @@ -0,0 +1,76 @@ +// -------------------------------------------------------------- +// - Pre-Renewal Core Scripts - +// -------------------------------------------------------------- + +// -------------------------- Airport --------------------------- +npc: npc/pre-re/airports/izlude.txt + +// --------------------------- Cities --------------------------- +npc: npc/pre-re/cities/alberta.txt +npc: npc/pre-re/cities/izlude.txt +npc: npc/pre-re/cities/jawaii.txt + +// --------------------------- Guides --------------------------- +npc: npc/pre-re/guides/guides_alberta.txt +npc: npc/pre-re/guides/guides_aldebaran.txt +npc: npc/pre-re/guides/guides_amatsu.txt +npc: npc/pre-re/guides/guides_ayothaya.txt +npc: npc/pre-re/guides/guides_comodo.txt +npc: npc/pre-re/guides/guides_einbroch.txt +npc: npc/pre-re/guides/guides_geffen.txt +npc: npc/pre-re/guides/guides_gonryun.txt +npc: npc/pre-re/guides/guides_hugel.txt +npc: npc/pre-re/guides/guides_izlude.txt +npc: npc/pre-re/guides/guides_juno.txt +npc: npc/pre-re/guides/guides_lighthalzen.txt +npc: npc/pre-re/guides/guides_louyang.txt +npc: npc/pre-re/guides/guides_morroc.txt +npc: npc/pre-re/guides/guides_moscovia.txt +npc: npc/pre-re/guides/guides_niflheim.txt +npc: npc/pre-re/guides/guides_payon.txt +npc: npc/pre-re/guides/guides_prontera.txt +npc: npc/pre-re/guides/guides_rachel.txt +npc: npc/pre-re/guides/guides_umbala.txt +npc: npc/pre-re/guides/guides_veins.txt + +// ---------------- Kafras & Cool Event Corp. ------------------- +npc: npc/pre-re/kafras/kafras_izl.txt + +// -------------------------- Merchant -------------------------- +npc: npc/pre-re/merchants/shops.txt + +// --------------------------- Others --------------------------- +// -------------------------------------------------------------- +npc: npc/pre-re/other/mercenary_rent.txt + +// --------------------------- Quests --------------------------- +// - Repeatable EXP Quests (iRO) -------------------------------- +//npc: npc/pre-re/quests/collection/quest_alligator.txt +//npc: npc/pre-re/quests/collection/quest_caramel.txt +// - Exploitable due to vendor selling Acorns in Moscovia +//npc: npc/pre-re/quests/collection/quest_coco.txt +//npc: npc/pre-re/quests/collection/quest_creamy.txt +//npc: npc/pre-re/quests/collection/quest_demonpungus.txt +//npc: npc/pre-re/quests/collection/quest_disguiseloliruri.txt +//npc: npc/pre-re/quests/collection/quest_dokebi.txt +//npc: npc/pre-re/quests/collection/quest_dryad.txt +//npc: npc/pre-re/quests/collection/quest_fabre.txt +//npc: npc/pre-re/quests/collection/quest_frilldora.txt +// - Exploitable due to vendor selling Antelope Horns in Niflheim +//npc: npc/pre-re/quests/collection/quest_goat.txt +//npc: npc/pre-re/quests/collection/quest_golem.txt +//npc: npc/pre-re/quests/collection/quest_hode.txt +//npc: npc/pre-re/quests/collection/quest_leafcat.txt +//npc: npc/pre-re/quests/collection/quest_mantis.txt +// - Exploitable due to vendor selling Bill of Birds in Morroc +//npc: npc/pre-re/quests/collection/quest_pecopeco.txt +//npc: npc/pre-re/quests/collection/quest_pupa.txt +//npc: npc/pre-re/quests/collection/quest_zhupolong.txt +// -------------------------------------------------------------- +npc: npc/pre-re/quests/mrsmile.txt +npc: npc/pre-re/quests/quests_izlude.txt +npc: npc/pre-re/quests/quests_lighthalzen.txt +npc: npc/pre-re/quests/monstertamers.txt +npc: npc/pre-re/quests/quests_nameless.txt +npc: npc/pre-re/quests/quests_13_1.txt +npc: npc/pre-re/quests/skills/swordman_skills.txt \ No newline at end of file diff --git a/npc/pre-re/scripts_athena.conf b/npc/pre-re/scripts_athena.conf deleted file mode 100644 index 6a69ede0e..000000000 --- a/npc/pre-re/scripts_athena.conf +++ /dev/null @@ -1,76 +0,0 @@ -// -------------------------------------------------------------- -// - Pre-Renewal Core Scripts - -// -------------------------------------------------------------- - -// -------------------------- Airport --------------------------- -npc: npc/pre-re/airports/izlude.txt - -// --------------------------- Cities --------------------------- -npc: npc/pre-re/cities/alberta.txt -npc: npc/pre-re/cities/izlude.txt -npc: npc/pre-re/cities/jawaii.txt - -// --------------------------- Guides --------------------------- -npc: npc/pre-re/guides/guides_alberta.txt -npc: npc/pre-re/guides/guides_aldebaran.txt -npc: npc/pre-re/guides/guides_amatsu.txt -npc: npc/pre-re/guides/guides_ayothaya.txt -npc: npc/pre-re/guides/guides_comodo.txt -npc: npc/pre-re/guides/guides_einbroch.txt -npc: npc/pre-re/guides/guides_geffen.txt -npc: npc/pre-re/guides/guides_gonryun.txt -npc: npc/pre-re/guides/guides_hugel.txt -npc: npc/pre-re/guides/guides_izlude.txt -npc: npc/pre-re/guides/guides_juno.txt -npc: npc/pre-re/guides/guides_lighthalzen.txt -npc: npc/pre-re/guides/guides_louyang.txt -npc: npc/pre-re/guides/guides_morroc.txt -npc: npc/pre-re/guides/guides_moscovia.txt -npc: npc/pre-re/guides/guides_niflheim.txt -npc: npc/pre-re/guides/guides_payon.txt -npc: npc/pre-re/guides/guides_prontera.txt -npc: npc/pre-re/guides/guides_rachel.txt -npc: npc/pre-re/guides/guides_umbala.txt -npc: npc/pre-re/guides/guides_veins.txt - -// ---------------- Kafras & Cool Event Corp. ------------------- -npc: npc/pre-re/kafras/kafras_izl.txt - -// -------------------------- Merchant -------------------------- -npc: npc/pre-re/merchants/shops.txt - -// --------------------------- Others --------------------------- -// -------------------------------------------------------------- -npc: npc/pre-re/other/mercenary_rent.txt - -// --------------------------- Quests --------------------------- -// - Repeatable EXP Quests (iRO) -------------------------------- -//npc: npc/pre-re/quests/collection/quest_alligator.txt -//npc: npc/pre-re/quests/collection/quest_caramel.txt -// - Exploitable due to vendor selling Acorns in Moscovia -//npc: npc/pre-re/quests/collection/quest_coco.txt -//npc: npc/pre-re/quests/collection/quest_creamy.txt -//npc: npc/pre-re/quests/collection/quest_demonpungus.txt -//npc: npc/pre-re/quests/collection/quest_disguiseloliruri.txt -//npc: npc/pre-re/quests/collection/quest_dokebi.txt -//npc: npc/pre-re/quests/collection/quest_dryad.txt -//npc: npc/pre-re/quests/collection/quest_fabre.txt -//npc: npc/pre-re/quests/collection/quest_frilldora.txt -// - Exploitable due to vendor selling Antelope Horns in Niflheim -//npc: npc/pre-re/quests/collection/quest_goat.txt -//npc: npc/pre-re/quests/collection/quest_golem.txt -//npc: npc/pre-re/quests/collection/quest_hode.txt -//npc: npc/pre-re/quests/collection/quest_leafcat.txt -//npc: npc/pre-re/quests/collection/quest_mantis.txt -// - Exploitable due to vendor selling Bill of Birds in Morroc -//npc: npc/pre-re/quests/collection/quest_pecopeco.txt -//npc: npc/pre-re/quests/collection/quest_pupa.txt -//npc: npc/pre-re/quests/collection/quest_zhupolong.txt -// -------------------------------------------------------------- -npc: npc/pre-re/quests/mrsmile.txt -npc: npc/pre-re/quests/quests_izlude.txt -npc: npc/pre-re/quests/quests_lighthalzen.txt -npc: npc/pre-re/quests/monstertamers.txt -npc: npc/pre-re/quests/quests_nameless.txt -npc: npc/pre-re/quests/quests_13_1.txt -npc: npc/pre-re/quests/skills/swordman_skills.txt \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 3b4b0876efdaa78bb55a6ab287fdbb0d50ead2e6 Mon Sep 17 00:00:00 2001 From: Matheus Macabu Date: Sat, 18 May 2013 16:04:10 -0300 Subject: Great. Forgot to add some files. Signed-off-by: Matheus Macabu --- npc/pre-re/scripts_main.conf | 4 ++-- npc/re/scripts_main.conf | 4 ++-- npc/scripts_mapflags.conf | 56 ++++++++++++++++++++++---------------------- 3 files changed, 32 insertions(+), 32 deletions(-) (limited to 'npc/pre-re') diff --git a/npc/pre-re/scripts_main.conf b/npc/pre-re/scripts_main.conf index e029447b5..db7ed1411 100644 --- a/npc/pre-re/scripts_main.conf +++ b/npc/pre-re/scripts_main.conf @@ -26,7 +26,7 @@ npc: npc/other/Global_Functions.txt npc: npc/other/CashShop_Functions.txt // ------------------- Common Script Files ---------------------- -import: npc/scripts_athena.conf +import: npc/scripts.conf import: npc/scripts_guild.conf import: npc/scripts_jobs.conf import: npc/scripts_mapflags.conf @@ -34,7 +34,7 @@ import: npc/scripts_monsters.conf import: npc/scripts_warps.conf // ----------------- Pre-Renewal Script Files ------------------- -import: npc/pre-re/scripts_athena.conf +import: npc/pre-re/scripts.conf import: npc/pre-re/scripts_jobs.conf import: npc/pre-re/scripts_monsters.conf import: npc/pre-re/scripts_warps.conf diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf index 2bca12324..d9dfcf267 100644 --- a/npc/re/scripts_main.conf +++ b/npc/re/scripts_main.conf @@ -26,7 +26,7 @@ npc: npc/other/Global_Functions.txt npc: npc/other/CashShop_Functions.txt // ------------------- Common Script Files ---------------------- -import: npc/scripts_athena.conf +import: npc/scripts.conf import: npc/scripts_guild.conf import: npc/scripts_jobs.conf import: npc/scripts_mapflags.conf @@ -34,7 +34,7 @@ import: npc/scripts_monsters.conf import: npc/scripts_warps.conf // ------------------- Renewal Script Files --------------------- -import: npc/re/scripts_athena.conf +import: npc/re/scripts.conf import: npc/re/scripts_jobs.conf import: npc/re/scripts_monsters.conf import: npc/re/scripts_warps.conf diff --git a/npc/scripts_mapflags.conf b/npc/scripts_mapflags.conf index 78adeba20..c0d2787f8 100644 --- a/npc/scripts_mapflags.conf +++ b/npc/scripts_mapflags.conf @@ -1,31 +1,31 @@ // -------------------------------------------------------------- // - Map Flags - // -------------------------------------------------------------- -npc: conf/mapflag/nopvp.txt -npc: conf/mapflag/gvg.txt -npc: conf/mapflag/jail.txt -npc: conf/mapflag/nightmare.txt -npc: conf/mapflag/nobranch.txt -npc: conf/mapflag/noexp.txt -npc: conf/mapflag/noicewall.txt -npc: conf/mapflag/noloot.txt -npc: conf/mapflag/nomemo.txt -npc: conf/mapflag/nopenalty.txt -npc: conf/mapflag/nosave.txt -npc: conf/mapflag/noteleport.txt -npc: conf/mapflag/noreturn.txt -npc: conf/mapflag/noskill.txt -npc: conf/mapflag/nowarp.txt -npc: conf/mapflag/nowarpto.txt -npc: conf/mapflag/partylock.txt -npc: conf/mapflag/pvp.txt -npc: conf/mapflag/pvp_noparty.txt -npc: conf/mapflag/pvp_noguild.txt -npc: conf/mapflag/night.txt -npc: conf/mapflag/zone.txt -npc: conf/mapflag/battleground.txt -npc: conf/mapflag/novending.txt -npc: conf/mapflag/town.txt -npc: conf/mapflag/reset.txt -npc: conf/mapflag/skillmodifier.txt -npc: conf/mapflag/skillduration.txt \ No newline at end of file +npc: npc/mapflag/nopvp.txt +npc: npc/mapflag/gvg.txt +npc: npc/mapflag/jail.txt +npc: npc/mapflag/nightmare.txt +npc: npc/mapflag/nobranch.txt +npc: npc/mapflag/noexp.txt +npc: npc/mapflag/noicewall.txt +npc: npc/mapflag/noloot.txt +npc: npc/mapflag/nomemo.txt +npc: npc/mapflag/nopenalty.txt +npc: npc/mapflag/nosave.txt +npc: npc/mapflag/noteleport.txt +npc: npc/mapflag/noreturn.txt +npc: npc/mapflag/noskill.txt +npc: npc/mapflag/nowarp.txt +npc: npc/mapflag/nowarpto.txt +npc: npc/mapflag/partylock.txt +npc: npc/mapflag/pvp.txt +npc: npc/mapflag/pvp_noparty.txt +npc: npc/mapflag/pvp_noguild.txt +npc: npc/mapflag/night.txt +npc: npc/mapflag/zone.txt +npc: npc/mapflag/battleground.txt +npc: npc/mapflag/novending.txt +npc: npc/mapflag/town.txt +npc: npc/mapflag/reset.txt +npc: npc/mapflag/skillmodifier.txt +npc: npc/mapflag/skillduration.txt \ No newline at end of file -- cgit v1.2.3-70-g09d2