diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-09 19:00:35 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-09 19:00:35 +0000 |
| commit | 168677929dc43930a81a49a54d748a3b2298a811 (patch) | |
| tree | 8eb547e2537ea19df6ad193d66411db939d36827 /conf | |
| parent | 5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0 (diff) | |
| download | hercules-168677929dc43930a81a49a54d748a3b2298a811.tar.gz hercules-168677929dc43930a81a49a54d748a3b2298a811.tar.bz2 hercules-168677929dc43930a81a49a54d748a3b2298a811.tar.xz hercules-168677929dc43930a81a49a54d748a3b2298a811.zip | |
* Fixed some missing/wrong bits in merge from trunk (follow up to r14740).
- Fixed added files not being svn-copied (thus lacking svn history).
- Applied missing property changes.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14741 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/battle/feature.conf | 56 | ||||
| -rw-r--r-- | conf/mapflag/noskill.txt | 60 |
2 files changed, 58 insertions, 58 deletions
diff --git a/conf/battle/feature.conf b/conf/battle/feature.conf index ae1c00b33..344c213f4 100644 --- a/conf/battle/feature.conf +++ b/conf/battle/feature.conf @@ -1,28 +1,28 @@ -// ______ __ __
-// /\ _ \/\ \__/\ \
-// __\ \ \L\ \ \ ,_\ \ \___ __ ___ __
-// /'__`\ \ __ \ \ \/\ \ _ `\ /'__`\/' _ `\ /'__`\
-///\ __/\ \ \/\ \ \ \_\ \ \ \ \/\ __//\ \/\ \/\ \L\.\_
-//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
-// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
-// _ _ _ _ _ _ _ _ _ _ _ _ _
-// / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \
-//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
-// \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/
-//
-//--------------------------------------------------------------
-// eAthena Feature Configuration File
-//--------------------------------------------------------------
-// Note 1: Value is a config switch (on/off, yes/no or 1/0)
-// Note 2: Value is in percents (100 means 100%)
-// Note 3: Value is a bit field. If no description is given,
-// assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
-//--------------------------------------------------------------
-
-// Buying store (Note 1)
-// Requires: 2010-04-27aRagexeRE or later
-feature.buying_store: on
-
-// Search stores (Note 1)
-// Requires: 2010-08-03aRagexeRE or later
-feature.search_stores: on
+// ______ __ __ +// /\ _ \/\ \__/\ \ +// __\ \ \L\ \ \ ,_\ \ \___ __ ___ __ +// /'__`\ \ __ \ \ \/\ \ _ `\ /'__`\/' _ `\ /'__`\ +///\ __/\ \ \/\ \ \ \_\ \ \ \ \/\ __//\ \/\ \/\ \L\.\_ +//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\ +// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/ +// _ _ _ _ _ _ _ _ _ _ _ _ _ +// / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ +//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a ) +// \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ +// +//-------------------------------------------------------------- +// eAthena Feature Configuration File +//-------------------------------------------------------------- +// Note 1: Value is a config switch (on/off, yes/no or 1/0) +// Note 2: Value is in percents (100 means 100%) +// Note 3: Value is a bit field. If no description is given, +// assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun) +//-------------------------------------------------------------- + +// Buying store (Note 1) +// Requires: 2010-04-27aRagexeRE or later +feature.buying_store: on + +// Search stores (Note 1) +// Requires: 2010-08-03aRagexeRE or later +feature.search_stores: on diff --git a/conf/mapflag/noskill.txt b/conf/mapflag/noskill.txt index 28b1b70b7..82b6eb52e 100644 --- a/conf/mapflag/noskill.txt +++ b/conf/mapflag/noskill.txt @@ -1,30 +1,30 @@ -//===== eAthena Script =======================================
-//= Map flags that disable skills on a map
-//===== By: ==================================================
-//= eAthena Dev Team
-//= 1.0 [L0ne_W0lf]
-//= 1.1 Added additional maps. [L0ne_W0lf]
-//===== Current Version: =====================================
-
-//Prontera Arena ===============
-prt_are_in mapflag noskill
-
-//The Sign Quest ===============
-himinn mapflag noskill
-
-// Quiz Maps ===================
-quiz_00 mapflag noskill
-
-quiz_01 mapflag noskill
-
-quiz_02 mapflag noskill
-
-quiz_test mapflag noskill
-
-
-//Hugel Minigames ==============
-que_bingo mapflag noskill
-p_track01 mapflag noskill
-p_track02 mapflag noskill
-
-//evt_zombie mapflag noskill
+//===== eAthena Script ======================================= +//= Map flags that disable skills on a map +//===== By: ================================================== +//= eAthena Dev Team +//= 1.0 [L0ne_W0lf] +//= 1.1 Added additional maps. [L0ne_W0lf] +//===== Current Version: ===================================== + +//Prontera Arena =============== +prt_are_in mapflag noskill + +//The Sign Quest =============== +himinn mapflag noskill + +// Quiz Maps =================== +quiz_00 mapflag noskill + +quiz_01 mapflag noskill + +quiz_02 mapflag noskill + +quiz_test mapflag noskill + + +//Hugel Minigames ============== +que_bingo mapflag noskill +p_track01 mapflag noskill +p_track02 mapflag noskill + +//evt_zombie mapflag noskill |