diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-07 07:48:04 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-07 07:48:04 +0000 |
| commit | f4a6909849243c3e4776ddee4de962224e80ac9a (patch) | |
| tree | 7f1d512bbc95f38587d8d4acb6950dd3fda0a35a /conf-tmpl | |
| parent | 9d77a645e0c7d41683c6f478594be342fca27e99 (diff) | |
| download | hercules-f4a6909849243c3e4776ddee4de962224e80ac9a.tar.gz hercules-f4a6909849243c3e4776ddee4de962224e80ac9a.tar.bz2 hercules-f4a6909849243c3e4776ddee4de962224e80ac9a.tar.xz hercules-f4a6909849243c3e4776ddee4de962224e80ac9a.zip | |
- re-added the duplicit nj/gs name messages in msg_athena
- renamed atcommand_sub to is_atcommand_sub (charcommand too)
- reformatted conf-tmpl's comments a bit
- and a fix to the stable changelog to make my last commit more descriptive
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9625 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf-tmpl')
| -rw-r--r-- | conf-tmpl/battle/player.conf | 1 | ||||
| -rw-r--r-- | conf-tmpl/charcommand_athena.conf | 6 | ||||
| -rw-r--r-- | conf-tmpl/mapflag/noicewall.txt | 2 | ||||
| -rw-r--r-- | conf-tmpl/msg_athena.conf | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/conf-tmpl/battle/player.conf b/conf-tmpl/battle/player.conf index f0e8b9f1b..5ba79b4dd 100644 --- a/conf-tmpl/battle/player.conf +++ b/conf-tmpl/battle/player.conf @@ -123,7 +123,6 @@ show_hp_sp_drain: no // Display the gained hp/sp values from killing mobs? (Ie: Sky Deleter Card) show_hp_sp_gain: yes - // If set, when A accepts B as a friend, B will also be added to A's friend // list, otherwise, only A appears in B's friend list. // NOTE: this setting only enables friend auto-adding; auto-deletion does not work yet diff --git a/conf-tmpl/charcommand_athena.conf b/conf-tmpl/charcommand_athena.conf index f0f98695c..c0756b467 100644 --- a/conf-tmpl/charcommand_athena.conf +++ b/conf-tmpl/charcommand_athena.conf @@ -3,8 +3,8 @@ // Set here the symbol that you want to use for your commands // Only 1 character is get (default is '#'). You can set any character, -// except control-character (0x00-0x1f), '%' (party chat speaking) and '/' (standard ragnarok GM commands) -// and '@' (Standard GM Commands) +// except control-character (0x00-0x1f), '%' (party chat speaking), +// '/' (standard ragnarok GM commands) and '@' (Standard GM Commands) // With default character, all commands begin by a '#', example: #save SomePlayer command_symbol: # @@ -41,7 +41,7 @@ option: 60 //Save another character save: 60 -//Performs a stat and skill reset on someone else. +//Performs a stat and skill reset on someone else reset: 60 //Give another character spiritball effect diff --git a/conf-tmpl/mapflag/noicewall.txt b/conf-tmpl/mapflag/noicewall.txt index bf46eac2c..9647e63b7 100644 --- a/conf-tmpl/mapflag/noicewall.txt +++ b/conf-tmpl/mapflag/noicewall.txt @@ -1,5 +1,5 @@ //===== eAthena Script ======================================= -//= 1.6 Map flags that disable icewall skill +//= Map flags that disable icewall skill //===== By: ================================================== //= eAthena Dev Team //============================================================= diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf index f747f93f9..64356e673 100644 --- a/conf-tmpl/msg_athena.conf +++ b/conf-tmpl/msg_athena.conf @@ -549,6 +549,8 @@ 616: Taekwon 617: Star Gladiator 618: Soul Linker +619: Gunslinger +620: Ninja //... 650: Unknown Job |