From 3d545fd51a461a0005ae605dc627e15893bf5573 Mon Sep 17 00:00:00 2001 From: ultramage Date: Sat, 22 Dec 2007 17:26:15 +0000 Subject: [PATCH] Cleaned the script conf files (see topic:171384 for details) git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11962 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 2 ++ npc/scripts_athena.conf | 13 ++----------- npc/scripts_custom.conf | 14 +------------- npc/scripts_eaac.conf | 18 ------------------ npc/scripts_eamonsters.conf | 14 -------------- npc/scripts_guild.conf | 14 +------------- npc/scripts_jmonsters.conf | 14 -------------- npc/scripts_jobs.conf | 15 +-------------- npc/scripts_main.conf | 20 +------------------- npc/scripts_mapflags.conf | 14 -------------- npc/scripts_monsters.conf | 14 -------------- npc/scripts_warps.conf | 15 +-------------- 12 files changed, 9 insertions(+), 158 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 8cc975cc8e..530df46d95 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,7 @@ Date Added ====== +2007/12/22 + * Cleaned the script conf files (see topic:171384 for details) [ultramage] 2007/12/16 * Rev. 11922 Touched up Merchant quest Biliban Kafra function [L0ne_W0lf] - Will now return to the previous script execution if all conditions fail. diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf index d56a01b91f..44b850757b 100644 --- a/npc/scripts_athena.conf +++ b/npc/scripts_athena.conf @@ -1,16 +1,7 @@ // -------------------------------------------------------------- -// - Warning!! Acktung!! Awas!! gevaar!! peligro!! ВыGЃEыGЃE - +// - Core Scripts - // -------------------------------------------------------------- -// - All scripts here should be used at your own risk. If you - -// - have edited it yourself, we are not responsible for any - -// - Damages or whatsoever. Do not report any bugs unless you - -// - are sure they exist. Please provide evidence and proof. - -// - eAthena developers are not responsible for any damages or - -// - disruptions of service during the service of the server - -// - caused by the included scripts or for any damages - -// - resulting in the use of the scripts. - -// - Thanks, - -// - eAthena Dev Team - + // -------------------------------------------------------------- // --------------------------- Cities --------------------------- npc: npc/cities/alberta.txt diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf index 19ba3f2d39..4aa716e972 100644 --- a/npc/scripts_custom.conf +++ b/npc/scripts_custom.conf @@ -2,19 +2,7 @@ // - Custom Scripts - // -------------------------------------------------------------- // All the custom scripts, remove the '//' to enable... -// -------------------------------------------------------------- -// - Warning!! Acktung!! Awas!! gevaar!! peligro!! ВыGЃEыGЃE - -// -------------------------------------------------------------- -// - All scripts here should be used at your own risk. If you - -// - have edited it yourself, we are not responsible for any - -// - Damages or whatsoever. Do not report any bugs unless you - -// - are sure they exist. Please provide evidence and proof. - -// - eAthena developers are not responsible for any damages or - -// - disruptions of service during the service of the server - -// - caused by the included scripts or for any damages - -// - resulting in the use of the scripts. - -// - Thanks, - -// - eAthena Dev Team - + // -------------------------------------------------------------- // ------------------------- My Scripts ------------------------- //npc: npc/location/to/script.txt diff --git a/npc/scripts_eaac.conf b/npc/scripts_eaac.conf index 9369ab644f..78ac259a8f 100644 --- a/npc/scripts_eaac.conf +++ b/npc/scripts_eaac.conf @@ -1,24 +1,6 @@ // -------------------------------------------------------------- // - eAAC Scripts - // -------------------------------------------------------------- -// All the custom scripts, remove the '//' to enable... -// -------------------------------------------------------------- -// - Warning!! Acktung!! Awas!! gevaar!! peligro!! ВыGЃEыGЃE - -// -------------------------------------------------------------- -// - All scripts here should be used at your own risk. If you - -// - have edited it yourself, we are not responsible for any - -// - Damages or whatsoever. Do not report any bugs unless you - -// - are sure they exist. Please provide evidence and proof. - -// - eAthena developers are not responsible for any damages or - -// - disruptions of service during the service of the server - -// - caused by the included scripts or for any damages - -// - resulting in the use of the scripts. - -// - Thanks, - -// - eAthena Dev Team - -// - Files organized, sorted and compiled together by erKURITA - -// - To activate a script, simply remove the // in the - -// - corresponding npc: line. In case of the Kafra Express, - -// - just remove the // in the import: line - // -------------------------------------------------------------- // ----------------------- Kafra Express ------------------------ diff --git a/npc/scripts_eamonsters.conf b/npc/scripts_eamonsters.conf index da716644a2..dcad1149e0 100644 --- a/npc/scripts_eamonsters.conf +++ b/npc/scripts_eamonsters.conf @@ -1,18 +1,4 @@ // -------------------------------------------------------------- -// - Warning!! Acktung!! Awas!! gevaar!! peligro!! Внимание! - -// -------------------------------------------------------------- -// - All scripts here should be used at your own risk. If you - -// - have edited it yourself, we are not responsible for any - -// - Damages or whatsoever. Do not report any bugs unless you - -// - are sure they exist. Please provide evidence and proof. - -// - eAthena developers are not responsible for any damages or - -// - disruptions of service during the service of the server - -// - caused by the included scripts or for any damages - -// - resulting in the use of the scripts. - -// - Thanks, - -// - eAthena Dev Team - -// -------------------------------------------------------------- -// -------------------------------------------------------------- // - Monster Scripts - // -------------------------------------------------------------- npc: npc/mobs/citycleaners.txt diff --git a/npc/scripts_guild.conf b/npc/scripts_guild.conf index 11412d06d9..3241e9c08d 100644 --- a/npc/scripts_guild.conf +++ b/npc/scripts_guild.conf @@ -1,18 +1,6 @@ // -------------------------------------------------------------- -// - Warning!! Acktung!! Awas!! gevaar!! peligro!! Внимание! - +// - Guild Wars - // -------------------------------------------------------------- -// - All scripts here should be used at your own risk. If you - -// - have edited it yourself, we are not responsible for any - -// - Damages or whatsoever. Do not report any bugs unless you - -// - are sure they exist. Please provide evidence and proof. - -// - eAthena developers are not responsible for any damages or - -// - disruptions of service during the service of the server - -// - caused by the included scripts or for any damages - -// - resulting in the use of the scripts. - -// - Thanks, - -// - eAthena Dev Team - -// -------------------------------------------------------------- -// ------------------------- Guild Wars ------------------------- // -- Guild Wars: General npc: npc/guild/gldfunc_manager.txt npc: npc/guild/gldfunc_dunsw.txt diff --git a/npc/scripts_jmonsters.conf b/npc/scripts_jmonsters.conf index 0ff9c77c5d..dae7b95cd7 100644 --- a/npc/scripts_jmonsters.conf +++ b/npc/scripts_jmonsters.conf @@ -1,18 +1,4 @@ // -------------------------------------------------------------- -// - Warning!! Acktung!! Awas!! gevaar!! peligro!! Внимание! - -// -------------------------------------------------------------- -// - All scripts here should be used at your own risk. If you - -// - have edited it yourself, we are not responsible for any - -// - Damages or whatsoever. Do not report any bugs unless you - -// - are sure they exist. Please provide evidence and proof. - -// - eAthena developers are not responsible for any damages or - -// - disruptions of service during the service of the server - -// - caused by the included scripts or for any damages - -// - resulting in the use of the scripts. - -// - Thanks, - -// - eAthena Dev Team - -// -------------------------------------------------------------- -// -------------------------------------------------------------- // - Monster Scripts - // -------------------------------------------------------------- diff --git a/npc/scripts_jobs.conf b/npc/scripts_jobs.conf index e129ea60f8..ba08f2bf05 100644 --- a/npc/scripts_jobs.conf +++ b/npc/scripts_jobs.conf @@ -1,22 +1,9 @@ // -------------------------------------------------------------- // - Job Scripts - // -------------------------------------------------------------- -// -------------------------------------------------------------- -// - Warning!! Acktung!! Awas!! gevaar!! peligro!! ВыGЃEыGЃE - -// -------------------------------------------------------------- -// - All scripts here should be used at your own risk. If you - -// - have edited it yourself, we are not responsible for any - -// - Damages or whatsoever. Do not report any bugs unless you - -// - are sure they exist. Please provide evidence and proof. - -// - eAthena developers are not responsible for any damages or - -// - disruptions of service during the service of the server - -// - caused by the included scripts or for any damages - -// - resulting in the use of the scripts. - -// - Thanks, - -// - eAthena Dev Team - + // -------------------------------------------------------------- // ------------------------- Job Quests ------------------------- - // -- Novice npc: npc/jobs/novice/novice.txt npc: npc/jobs/novice/supernovice.txt diff --git a/npc/scripts_main.conf b/npc/scripts_main.conf index 55cb92ee7c..fda24f8ee5 100644 --- a/npc/scripts_main.conf +++ b/npc/scripts_main.conf @@ -16,32 +16,14 @@ // only as information/reference. // // -------------------------------------------------------------- -// -------------------------------------------------------------- -// - Warning!! Acktung!! Awas!! gevaar!! peligro!! Внимание! - -// -------------------------------------------------------------- -// - All scripts here should be used at your own risk. If you - -// - have edited it yourself, we are not responsible for any - -// - Damages or whatsoever. Do not report any bugs unless you - -// - are sure they exist. Please provide evidence and proof. - -// - eAthena developers are not responsible for any damages or - -// - disruptions of service during the service of the server - -// - caused by the included scripts or for any damages - -// - resulting in the use of the scripts. - -// - Thanks, - -// - eAthena Dev Team - -// -------------------------------------------------------------- // ------------------ Global Scripts Functions ------------------ // Utilitarian functions used by many scripts. npc: npc/other/Global_Functions.txt // -------------------------------------------------------------- // -------------------- Cash Shop Functions -------------------- -// Used by 4 items in the Item Database. +// Used by cash shop items in the Item Database. npc: npc/other/CashShop_Functions.txt // -------------------------------------------------------------- -// ------------------------ PCLoginEvent ------------------------ -// NPC which is activated for every player who logs in. -//npc: npc/sample/PCLoginEvent.txt -// -------------------------------------------------------------- // ------------------------ Script Files ------------------------ import: npc/scripts_mapflags.conf import: npc/scripts_warps.conf diff --git a/npc/scripts_mapflags.conf b/npc/scripts_mapflags.conf index afeb9a7504..d055c85bf9 100644 --- a/npc/scripts_mapflags.conf +++ b/npc/scripts_mapflags.conf @@ -1,18 +1,4 @@ // -------------------------------------------------------------- -// - Warning!! Acktung!! Awas!! gevaar!! peligro!! Внимание! - -// -------------------------------------------------------------- -// - All scripts here should be used at your own risk. If you - -// - have edited it yourself, we are not responsible for any - -// - Damages or whatsoever. Do not report any bugs unless you - -// - are sure they exist. Please provide evidence and proof. - -// - eAthena developers are not responsible for any damages or - -// - disruptions of service during the service of the server - -// - caused by the included scripts or for any damages - -// - resulting in the use of the scripts. - -// - Thanks, - -// - eAthena Dev Team - -// -------------------------------------------------------------- -// -------------------------------------------------------------- // - Map Flags - // -------------------------------------------------------------- npc: conf/mapflag/gvg.txt diff --git a/npc/scripts_monsters.conf b/npc/scripts_monsters.conf index 71cfe5844c..efa67117b8 100644 --- a/npc/scripts_monsters.conf +++ b/npc/scripts_monsters.conf @@ -1,18 +1,4 @@ // -------------------------------------------------------------- -// - Warning!! Acktung!! Awas!! gevaar!! peligro!! Внимание! - -// -------------------------------------------------------------- -// - All scripts here should be used at your own risk. If you - -// - have edited it yourself, we are not responsible for any - -// - Damages or whatsoever. Do not report any bugs unless you - -// - are sure they exist. Please provide evidence and proof. - -// - eAthena developers are not responsible for any damages or - -// - disruptions of service during the service of the server - -// - caused by the included scripts or for any damages - -// - resulting in the use of the scripts. - -// - Thanks, - -// - eAthena Dev Team - -// -------------------------------------------------------------- -// -------------------------------------------------------------- // - Monster Scripts - // -------------------------------------------------------------- npc: npc/mobs/citycleaners.txt diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf index 90ca209064..a7382dc678 100644 --- a/npc/scripts_warps.conf +++ b/npc/scripts_warps.conf @@ -1,20 +1,7 @@ // -------------------------------------------------------------- -// - Warning!! Acktung!! Awas!! gevaar!! peligro!! Внимание! - -// -------------------------------------------------------------- -// - All scripts here should be used at your own risk. If you - -// - have edited it yourself, we are not responsible for any - -// - Damages or whatsoever. Do not report any bugs unless you - -// - are sure they exist. Please provide evidence and proof. - -// - eAthena developers are not responsible for any damages or - -// - disruptions of service during the service of the server - -// - caused by the included scripts or for any damages - -// - resulting in the use of the scripts. - -// - Thanks, - -// - eAthena Dev Team - -// -------------------------------------------------------------- -// -------------------------------------------------------------- // - Warp Scripts - // -------------------------------------------------------------- + // --------------------------- Cities --------------------------- npc: npc/warps/cities/alberta.txt npc: npc/warps/cities/aldebaran.txt