diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-10-30 08:46:09 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-10-30 08:46:09 +0000 |
| commit | 09ec9946e686f75252eab2447ef61b753a3f18f1 (patch) | |
| tree | 5dde356afd64716bbad6bbb3181a9da83d489238 /conf | |
| parent | 6bf8e81c98ef42067408f626df89561a8fc7f8ad (diff) | |
| download | hercules-09ec9946e686f75252eab2447ef61b753a3f18f1.tar.gz hercules-09ec9946e686f75252eab2447ef61b753a3f18f1.tar.bz2 hercules-09ec9946e686f75252eab2447ef61b753a3f18f1.tar.xz hercules-09ec9946e686f75252eab2447ef61b753a3f18f1.zip | |
- Fixed a copy-paste 'nowarpto' mapflag. (bugreport:3688)
- Updated documentation for 'rentitem'. (follow up to r14082)
- Fixed a variable name in Valentines 2009 quest. (bugreport:3644)
- Added a missing 'input' in Alchemist Job quest. (bugreport:3695)
- Fixed a typo in Cooking Quest. (bugreport:3691)
- Fixed some typos in Veins Quest. (bugreport:3588) and (bugreport:3692)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14111 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/mapflag/nowarpto.txt | 4 | ||||
| -rw-r--r-- | conf/msg_athena.conf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt index 25d8c3786..c37d6e194 100644 --- a/conf/mapflag/nowarpto.txt +++ b/conf/mapflag/nowarpto.txt @@ -122,8 +122,8 @@ spl_fild01 mapflag nowarpto spl_in01 mapflag nowarpto //Orc's Memory =================== -1@cata mapflag nowarpto -2@cata mapflag nowarpto +1@orcs mapflag nowarpto +2@orcs mapflag nowarpto // Nidhoggr's Instance =========== 1@nyd mapflag nowarpto diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf index 3e2eb4567..6a7db3946 100644 --- a/conf/msg_athena.conf +++ b/conf/msg_athena.conf @@ -255,7 +255,7 @@ 239: Game time: After, the game will be in daylight for %s. 240: %d monster(s) summoned! 241: You can now attack and kill players freely. -242: You be attacked and killed by players. +242: You can now be attacked and killed by players. 243: Skills have been disabled on this map. 244: Skills have been enabled on this map. 245: Server Uptime: %ld days, %ld hours, %ld minutes, %ld seconds. |