Okie ladies and gentleman if this commit breaks anything it's jman's and maki's fault, yes, blame them.

Fixing pre-re / re npc support, moving /config/ folder to src root so other servers may also make use of the #define renewal dir and other stuff. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16382 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-07-08 19:30:07 +00:00 · 2012-07-08 19:30:07 +00:00 · 086af74531
commit 086af74531
parent 24e655bd3c
1229 changed files with 551508 additions and 793 deletions
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@ -118,9 +118,6 @@ help_txt: conf/help.txt
 help2_txt: conf/help2.txt
 charhelp_txt: conf/charhelp.txt

-// Scripts
-import: npc/scripts_main.conf
-
 // Maps:
 import: conf/maps_athena.conf

--- a/mac.rathena-start.scpt
+++ b/mac.rathena-start.scpt
--- a/npc/pre-re/airports/airships.txt
+++ b/npc/pre-re/airports/airships.txt
--- a/npc/pre-re/airports/einbroch.txt
+++ b/npc/pre-re/airports/einbroch.txt
--- a/npc/pre-re/airports/hugel.txt
+++ b/npc/pre-re/airports/hugel.txt
--- a/npc/pre-re/airports/izlude.txt
+++ b/npc/pre-re/airports/izlude.txt
--- a/npc/pre-re/airports/lighthalzen.txt
+++ b/npc/pre-re/airports/lighthalzen.txt
--- a/npc/pre-re/airports/rachel.txt
+++ b/npc/pre-re/airports/rachel.txt
--- a/npc/pre-re/airports/yuno.txt
+++ b/npc/pre-re/airports/yuno.txt
--- a/npc/pre-re/battleground/bg_common.txt
+++ b/npc/pre-re/battleground/bg_common.txt
--- a/npc/pre-re/battleground/flavius/flavius01.txt
+++ b/npc/pre-re/battleground/flavius/flavius01.txt
--- a/npc/pre-re/battleground/flavius/flavius02.txt
+++ b/npc/pre-re/battleground/flavius/flavius02.txt
--- a/npc/pre-re/battleground/flavius/flavius_enter.txt
+++ b/npc/pre-re/battleground/flavius/flavius_enter.txt
--- a/npc/pre-re/battleground/kvm/kvm01.txt
+++ b/npc/pre-re/battleground/kvm/kvm01.txt
--- a/npc/pre-re/battleground/kvm/kvm02.txt
+++ b/npc/pre-re/battleground/kvm/kvm02.txt
--- a/npc/pre-re/battleground/kvm/kvm03.txt
+++ b/npc/pre-re/battleground/kvm/kvm03.txt
--- a/npc/pre-re/battleground/kvm/kvm_enter.txt
+++ b/npc/pre-re/battleground/kvm/kvm_enter.txt
--- a/npc/pre-re/battleground/kvm/kvm_item_pay.txt
+++ b/npc/pre-re/battleground/kvm/kvm_item_pay.txt
--- a/npc/pre-re/battleground/tierra/tierra01.txt
+++ b/npc/pre-re/battleground/tierra/tierra01.txt
--- a/npc/pre-re/battleground/tierra/tierra02.txt
+++ b/npc/pre-re/battleground/tierra/tierra02.txt
--- a/npc/pre-re/battleground/tierra/tierra_enter.txt
+++ b/npc/pre-re/battleground/tierra/tierra_enter.txt
--- a/npc/pre-re/cities/alberta.txt
+++ b/npc/pre-re/cities/alberta.txt
--- a/npc/pre-re/cities/aldebaran.txt
+++ b/npc/pre-re/cities/aldebaran.txt
--- a/npc/pre-re/cities/amatsu.txt
+++ b/npc/pre-re/cities/amatsu.txt
--- a/npc/pre-re/cities/ayothaya.txt
+++ b/npc/pre-re/cities/ayothaya.txt
--- a/npc/pre-re/cities/brasilis.txt
+++ b/npc/pre-re/cities/brasilis.txt
--- a/npc/pre-re/cities/comodo.txt
+++ b/npc/pre-re/cities/comodo.txt
--- a/npc/pre-re/cities/dewata.txt
+++ b/npc/pre-re/cities/dewata.txt
--- a/npc/pre-re/cities/dicastes.txt
+++ b/npc/pre-re/cities/dicastes.txt
--- a/npc/pre-re/cities/einbech.txt
+++ b/npc/pre-re/cities/einbech.txt
--- a/npc/pre-re/cities/einbroch.txt
+++ b/npc/pre-re/cities/einbroch.txt
--- a/npc/pre-re/cities/geffen.txt
+++ b/npc/pre-re/cities/geffen.txt
--- a/npc/pre-re/cities/gonryun.txt
+++ b/npc/pre-re/cities/gonryun.txt
--- a/npc/pre-re/cities/hugel.txt
+++ b/npc/pre-re/cities/hugel.txt
--- a/npc/pre-re/cities/izlude.txt
+++ b/npc/pre-re/cities/izlude.txt
--- a/npc/pre-re/cities/jawaii.txt
+++ b/npc/pre-re/cities/jawaii.txt
--- a/npc/pre-re/cities/lighthalzen.txt
+++ b/npc/pre-re/cities/lighthalzen.txt
--- a/npc/pre-re/cities/louyang.txt
+++ b/npc/pre-re/cities/louyang.txt
--- a/npc/pre-re/cities/lutie.txt
+++ b/npc/pre-re/cities/lutie.txt
--- a/npc/pre-re/cities/manuk.txt
+++ b/npc/pre-re/cities/manuk.txt
--- a/npc/pre-re/cities/morocc.txt
+++ b/npc/pre-re/cities/morocc.txt
--- a/npc/pre-re/cities/moscovia.txt
+++ b/npc/pre-re/cities/moscovia.txt
--- a/npc/pre-re/cities/niflheim.txt
+++ b/npc/pre-re/cities/niflheim.txt
--- a/npc/pre-re/cities/payon.txt
+++ b/npc/pre-re/cities/payon.txt
--- a/npc/pre-re/cities/prontera.txt
+++ b/npc/pre-re/cities/prontera.txt
--- a/npc/pre-re/cities/rachel.txt
+++ b/npc/pre-re/cities/rachel.txt
--- a/npc/pre-re/cities/splendide.txt
+++ b/npc/pre-re/cities/splendide.txt
--- a/npc/pre-re/cities/umbala.txt
+++ b/npc/pre-re/cities/umbala.txt
--- a/npc/pre-re/cities/veins.txt
+++ b/npc/pre-re/cities/veins.txt
--- a/npc/pre-re/cities/yuno.txt
+++ b/npc/pre-re/cities/yuno.txt
--- a/npc/pre-re/events/MemorialDay_2008.txt
+++ b/npc/pre-re/events/MemorialDay_2008.txt
--- a/npc/pre-re/events/StPatrick_2008.txt
+++ b/npc/pre-re/events/StPatrick_2008.txt
--- a/npc/pre-re/events/bossnia.txt
+++ b/npc/pre-re/events/bossnia.txt
--- a/npc/pre-re/events/children_week.txt
+++ b/npc/pre-re/events/children_week.txt
--- a/npc/pre-re/events/christmas_2005.txt
+++ b/npc/pre-re/events/christmas_2005.txt
--- a/npc/pre-re/events/christmas_2008.txt
+++ b/npc/pre-re/events/christmas_2008.txt
--- a/npc/pre-re/events/dumplingfestival.txt
+++ b/npc/pre-re/events/dumplingfestival.txt
--- a/npc/pre-re/events/easter_2008.txt
+++ b/npc/pre-re/events/easter_2008.txt
--- a/npc/pre-re/events/event_skill_reset.txt
+++ b/npc/pre-re/events/event_skill_reset.txt
--- a/npc/pre-re/events/gdevent_aru.txt
+++ b/npc/pre-re/events/gdevent_aru.txt
--- a/npc/pre-re/events/gdevent_sch.txt
+++ b/npc/pre-re/events/gdevent_sch.txt
--- a/npc/pre-re/events/god_se_festival.txt
+++ b/npc/pre-re/events/god_se_festival.txt
--- a/npc/pre-re/events/halloween_2006.txt
+++ b/npc/pre-re/events/halloween_2006.txt
--- a/npc/pre-re/events/halloween_2008.txt
+++ b/npc/pre-re/events/halloween_2008.txt
--- a/npc/pre-re/events/halloween_2009.txt
+++ b/npc/pre-re/events/halloween_2009.txt
--- a/npc/pre-re/events/idul_fitri.txt
+++ b/npc/pre-re/events/idul_fitri.txt
--- a/npc/pre-re/events/lunar_2008.txt
+++ b/npc/pre-re/events/lunar_2008.txt
--- a/npc/pre-re/events/nguild/nguild_dunsw.txt
+++ b/npc/pre-re/events/nguild/nguild_dunsw.txt
--- a/npc/pre-re/events/nguild/nguild_ev_agit.txt
+++ b/npc/pre-re/events/nguild/nguild_ev_agit.txt
--- a/npc/pre-re/events/nguild/nguild_flags.txt
+++ b/npc/pre-re/events/nguild/nguild_flags.txt
--- a/npc/pre-re/events/nguild/nguild_guardians.txt
+++ b/npc/pre-re/events/nguild/nguild_guardians.txt
--- a/npc/pre-re/events/nguild/nguild_kafras.txt
+++ b/npc/pre-re/events/nguild/nguild_kafras.txt
--- a/npc/pre-re/events/nguild/nguild_managers.txt
+++ b/npc/pre-re/events/nguild/nguild_managers.txt
--- a/npc/pre-re/events/nguild/nguild_treas.txt
+++ b/npc/pre-re/events/nguild/nguild_treas.txt
--- a/npc/pre-re/events/nguild/nguild_warper.txt
+++ b/npc/pre-re/events/nguild/nguild_warper.txt
--- a/npc/pre-re/events/twintowers.txt
+++ b/npc/pre-re/events/twintowers.txt
--- a/npc/pre-re/events/valentinesday.txt
+++ b/npc/pre-re/events/valentinesday.txt
--- a/npc/pre-re/events/valentinesday_2009.txt
+++ b/npc/pre-re/events/valentinesday_2009.txt
--- a/npc/pre-re/events/valentinesday_2012.txt
+++ b/npc/pre-re/events/valentinesday_2012.txt
--- a/npc/pre-re/events/whiteday.txt
+++ b/npc/pre-re/events/whiteday.txt
--- a/npc/pre-re/events/xmas.txt
+++ b/npc/pre-re/events/xmas.txt
--- a/npc/pre-re/guides/guides_alberta.txt
+++ b/npc/pre-re/guides/guides_alberta.txt
--- a/npc/pre-re/guides/guides_aldebaran.txt
+++ b/npc/pre-re/guides/guides_aldebaran.txt
--- a/npc/pre-re/guides/guides_amatsu.txt
+++ b/npc/pre-re/guides/guides_amatsu.txt
--- a/npc/pre-re/guides/guides_ayothaya.txt
+++ b/npc/pre-re/guides/guides_ayothaya.txt
--- a/npc/pre-re/guides/guides_brasilis.txt
+++ b/npc/pre-re/guides/guides_brasilis.txt
--- a/npc/pre-re/guides/guides_comodo.txt
+++ b/npc/pre-re/guides/guides_comodo.txt
--- a/npc/pre-re/guides/guides_einbroch.txt
+++ b/npc/pre-re/guides/guides_einbroch.txt
--- a/npc/pre-re/guides/guides_geffen.txt
+++ b/npc/pre-re/guides/guides_geffen.txt
--- a/npc/pre-re/guides/guides_gonryun.txt
+++ b/npc/pre-re/guides/guides_gonryun.txt
--- a/npc/pre-re/guides/guides_hugel.txt
+++ b/npc/pre-re/guides/guides_hugel.txt
--- a/npc/pre-re/guides/guides_izlude.txt
+++ b/npc/pre-re/guides/guides_izlude.txt
--- a/npc/pre-re/guides/guides_juno.txt
+++ b/npc/pre-re/guides/guides_juno.txt
--- a/npc/pre-re/guides/guides_lighthalzen.txt
+++ b/npc/pre-re/guides/guides_lighthalzen.txt
--- a/npc/pre-re/guides/guides_louyang.txt
+++ b/npc/pre-re/guides/guides_louyang.txt
--- a/npc/pre-re/guides/guides_lutie.txt
+++ b/npc/pre-re/guides/guides_lutie.txt
--- a/npc/pre-re/guides/guides_morroc.txt
+++ b/npc/pre-re/guides/guides_morroc.txt
--- a/npc/pre-re/guides/guides_moscovia.txt
+++ b/npc/pre-re/guides/guides_moscovia.txt
--- a/npc/pre-re/guides/guides_niflheim.txt
+++ b/npc/pre-re/guides/guides_niflheim.txt
--- a/npc/pre-re/guides/guides_payon.txt
+++ b/npc/pre-re/guides/guides_payon.txt
--- a/Show More
+++ b/Show More