* Merged eAthena ea:15187 by ai4rei, effect list improvements (doc\effect_list.txt)

* Follow-up r16787, revised documentation and comments on MD5 hash check
* Added svn:eol-style=native property on some recent files

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16788 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 67 insertions, 73 deletions

diff --git a/doc/effect_list.txt b/doc/effect_list.txt
index b93d4bf8a..5c1b48e9b 100644
--- a/doc/effect_list.txt
+++ b/doc/effect_list.txt
@@ -739,14 +739,14 @@ Number	Description
 720.	Yellow version of Soul Breaker
 721.	Adoramus (lightning bolt)
 722.	Ignition Break (big explosion)
-723.	Noise Sound
+723.	Hundred Spear (sound effect)
 724.	Green version of Detecting
-725.	Detecting
+725.	Oratorio (like Detecting)
 726.	Frost Misty (blue vapor and bubbles)
-727.	Comet
+727.	Crimson Rock
 728.	Small fire (part of Hell Inferno)
 729.	Marsh of Abyss (like Close Confine)
-730.	Small, cartoony explosion
+730.	Small, cartoony explosion (part of Soul Expansion)
 731.	Dragon Howling (blinking, expanding circle)
 732.	Spike from the ground
 733.	Fluffy Ball flying by
@@ -755,35 +755,35 @@ Number	Description
 736.	(Nothing)
 737.	(Nothing)
 738.	(Nothing)
-739.	Small pod appearing
-740.	Different small pod
-741.	Different small pod
-742.	Different small pod
-743.	Different small pod
+739.	Old Magenta Trap
+740.	Old Cobald Trap
+741.	Old Maize Trap
+742.	Old Verdure Trap
+743.	White Ranger Trap
 744.	Camouflage
 745.	Aimed Bolt (crosshairs)
 746.	Arrow Storm
 747.	Falling white feathers
 748.	Falling blue feathers
-749.	Shields
+749.	Millennium Shield
 750.	Detonator (blue sparkles)
-751.	Shots from a direction
-752.	Some blinking filter
-753.	Sparkles
+751.	Releasing summoned warlock spheres
+752.	Like Energy Coat, but not as dark
+753.	Clearance
 754.	Green warp portal (root of Epiclesis)
 755.	Oratio (spinning blue symbol)
 756.	Enchant Blade (like Berserk Potion)
-757.	Stargate-like wormhole animation
-758.	Rolling Cutter (1)
-759.	Rolling Cutter (2)
-760.	Rolling Cutter (3)
-761.	Rolling Cutter (4)
-762.	Rolling Cutter (5)
-763.	Rolling Cutter (6)
-764.	Rolling Cutter (7)
-765.	Rolling Cutter (8)
-766.	Rolling Cutter (9)
-767.	Rolling Cutter (10)
+757.	Third Class Aura (Middle)
+758.	Rolling Cutter - Spin Count 1
+759.	Rolling Cutter - Spin Count 2
+760.	Rolling Cutter - Spin Count 3
+761.	Rolling Cutter - Spin Count 4
+762.	Rolling Cutter - Spin Count 5
+763.	Rolling Cutter - Spin Count 6
+764.	Rolling Cutter - Spin Count 7
+765.	Rolling Cutter - Spin Count 8
+766.	Rolling Cutter - Spin Count 9
+767.	Rolling Cutter - Spin Count 10
 768.	Blinking
 769.	Cross Ripper Slasher (flying knives)
 770.	Strip sound
@@ -791,10 +791,10 @@ Number	Description
 772.	Poison particles
 773.	Expanding purple aura (part of Phantom Menace)
 774.	Axe Boomerang
-775.	Spin
-776.	Half-automatic gunshots
+775.	Spinning character sprite
+776.	Like Desperado sound effect
 777.	Faded light from the ground [S]
-778.	Expanding white aura
+778.	Expanding white aura (like Clearance)
 779.	Faded light from the ground [S]
 780.	Expanding red aura (from Infrared Scan)
 781.	Magnetic Field (purple chains)
@@ -805,8 +805,8 @@ Number	Description
 786.	Symbol with bleeping sound [S]
 787.	Flare Launcher (line of fire)
 788.	Venom Impress (green skull)
-789.	Two Ancillas
-790.	Flame symbol
+789.	Freezing Status Effect (two ancillas)
+790.	Burning Status Effect (flame symbol)
 791.	Two ice shots
 792.	Upward streaming white particles
 793.	Same, but more brief
diff --git a/doc/md5_hashcheck.txt b/doc/md5_hashcheck.txt
index 13cda2bb9..9c2f3b8b5 100644
--- a/doc/md5_hashcheck.txt
+++ b/doc/md5_hashcheck.txt
@@ -1,44 +1,38 @@
-//===== rAthena Documentation ================================

-//= Login Server's MD5 Hash Check

-//===== By: ==================================================

-//= rAthena Dev Team

-//===== Current Version: =====================================

-//= 20120921

-//===== Description: =========================================

-//= This file outlines how the built-in MD5 Hash Check is

-//= used and steps enable it.

-//============================================================

-

-In revision r16771, the login server received an update that allows it to perform

-a server-side check of the client to find out it's MD5 hash. This update is an

-effort towards ensuring that a user has either:

-a.) not been tampered with the client

-b.) using the client specific to that particular server

-

-At present, we know that the client can only send the correct MD5 hash to the server

-when using particular server types, so a diff is required to ensure that any client

-can send the hash. A link to the required diff plugin for WeeDiffGen can be found at:

-http://rathena.org/board/topic/70841-r16771-client-md5-hash-check/

-

-Check conf/login_athena.conf for instruction on how to enable it.

-

-In conf/login_athena.conf you will find the following:

-// Client MD5 hash check

-// Check client hash?

-client_hash_check: off

-

-This setting simply accepts on or off.

-

-

-// Put your client hashes here, a player can login into the server using

-// a hash with a group_id equal or lower the account group_id

-// Format: group_id, hash

-// Examples:

-client_hash: 0, 113e195e6c051bb1cfb12a644bb084c5

-client_hash: 99, cb1ea78023d337c38e8ba5124e2338ae

-

-Once enabled, you would use those lines to configure this feature (or even as an example).

-The group_id can be any of the groups in conf/groups.conf and can be particularly useful

-if, for example, you wanted to restrict normal players from dual-clienting and use a lower

-number for chat flooding, but wanted to allow dual-clienting and 255 lines before the chat

-flood kicks in for your GMs.
\ No newline at end of file
+//===== rAthena Documentation ================================
+//= MD5 Hash Check
+//===== By: ==================================================
+//= rAthena Dev Team
+//===== Current Version: =====================================
+//= 20120921
+//===== Description: =========================================
+//= This file outlines the login server's MD5 hash check.
+//============================================================
+
+The login server is able to perform a check of the client's MD5 hash.
+This will ensure that a user has not tampered with the client and that
+the client is the one specific to your server.
+
+The client can only send the correct MD5 hash to the server on certain
+server types, so a client diff is required to ensure the hash is sent.
+A link containing the required WeeDiffGen plugin can be found at:
+http://rathena.org/board/topic/70841-r16771-client-md5-hash-check/
+
+The settings for the hash check are located in conf\login_athena.conf:
+
+// Client MD5 hash check
+// If turned on, the login server will check if the client's hash matches
+// the value below, and will not connect tampered clients.
+// Note: see doc\md5_hashcheck.txt for more details.
+client_hash_check: off
+
+// Client MD5 hashes
+// A player can login with a client hash at or below the account group_id.
+// Format: group_id, hash
+client_hash: 0, 113e195e6c051bb1cfb12a644bb084c5
+client_hash: 99, cb1ea78023d337c38e8ba5124e2338ae
+
+To enable MD5 hash checks, set 'client_hash_check' to 'on'.
+The 'client_hash' group_id can be any of the groups in conf\groups.conf,
+and is particularly useful if you wanted to allow GMs a different client
+than normal players; for example, a GM client could be hexed differently
+with dual-clienting enabled and chat flood disabled.
\ No newline at end of file