- Updated the effect list a bit

- Fixed some npc typos

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

7 files changed, 66 insertions, 60 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 350eded0f..32cdac826 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2007/05/11
+	* Updated the effect list a bit, changes by Au{R}oN
 	* Re-phrased the attacker flee/def penalty config descs [ultramage]
 	  Ref: http://www.eathena.ws/board/index.php?showtopic=150918
 	* Attempt to fix unwanted teleporting of immobile mobs [Playtester]
diff --git a/conf-tmpl/battle/items.conf b/conf-tmpl/battle/items.conf
index 18ea9a318..e52182328 100644
--- a/conf-tmpl/battle/items.conf
+++ b/conf-tmpl/battle/items.conf
@@ -15,16 +15,14 @@
 // Originally Translated by Peter Kieser <pfak@telus.net>
 // Made in to plainer English by Ancyker
 //--------------------------------------------------------------
-//Note 1: Directives can be set using on/off, yes/no or 1/0.
-//Note 2: All rates are in percents, 100 would mean 100%, 200
-//   would mean 200%, etc
-//Note 3: Value is not limited to 60K (see below)
-// Other Information:
-// All options are limited to a max of 60K (aprox) which is 600%
-// or 60secs as appropiate.
-// 1000 miliseconds is 1 second.
-// Unless otherwise specified, the minimum value is 0 for all
-// features.
+//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 not limited to 60k (see below)
+//Note 4: Value is a bitmask. If no description is given,
+//        assume object types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//Other Information:
+// All values are limited to a number between 0 and 60k
+// (60000, 600%, 60secs, ...), unless otherwise specified.
 //--------------------------------------------------------------
 
 // The highest value at which an item can be sold via the merchant vend skill. (in zeny) (Note 3)
@@ -75,8 +73,8 @@ item_check: no
 // On officials this is 0, but it's set to 100ms as a measure against bots/macros.
 item_use_interval: 100
 
-//Required level of bNoMagicDamage before Status Changes are blocked (Golden Thief Bug card).
-//For example, if left at 50. An item can give bNoMagicDamage,40;
+// Required level of bNoMagicDamage before Status Changes are blocked (Golden Thief Bug card).
+// For example, if left at 50. An item can give bNoMagicDamage,40;
 // which reduces magic damage by 40%, but does not blocks status changes.
 gtb_sc_immunity: 50
 
diff --git a/doc/effect_list.txt b/doc/effect_list.txt
index 0a3122df3..2ee473b4e 100644
--- a/doc/effect_list.txt
+++ b/doc/effect_list.txt
@@ -1,11 +1,12 @@
 //===== Athena Doc ========================================
-//= Client Effect List
+//= Client Effects List
 //===== By ================================================
 //= Valaris, Spira, Au{R}oN, Tharis, HiddenDragon
 //===== Version ===========================================
-//= 1.0
+//= 1.1
 //=========================================================
 //= 1.0 - Formatted to the standard
+//= 1.1 - New effects, from 2007/05/07 Sakexe [Au{R}oN]
 //===== Description =======================================
 //= A list of client-side effects sorted by their ID
 //=========================================================
@@ -17,7 +18,7 @@ You can produce these effects ingame by doing "@effect <number> 22" (22=self).
 It's also possible to attach effects to item/npc scripts by using 'misceffect'.
 
 number	description
-------  -----------
+------	-----------
 0.	Regular Hit
 1.	Melee Skill Hit (Bash)
 2.	Melee Skill Hit
@@ -221,7 +222,7 @@ number	description
 200.	(nothing)
 201.	(nothing)
 202.	Lv 99 Aura Bubble
-203.	Mental Strenght Lightning (Without Sound)
+203.	Mental Strength Lightning (Without Sound)
 204.	Red Herb/Potion
 205.	Orange Potion
 206.	Yellow Potion
@@ -339,14 +340,14 @@ number	description
 318.	Something Like Big Square Beam
 319.	Another Small Basilica
 320.	Offensive Heal
-321.	Warp NPC °_°
+321.	Warp NPC O.O
 322.	Big Sunlight Through The Roof
 323.	Small Sunlight Through The Roof
 324.	Medium Sunlight Through The Roof
 325.	Another Heal Effect
 326.	Chase Walk Left Foot
 327.	Chse Walk Right Foot
-328.	Asura Strike Word
+328.	Monk Asura Strike
 329.	Triple Strike
 330.	Combo Finish
 331.	Natural HP Regeneration
@@ -354,7 +355,7 @@ number	description
 333.	Autumn Leaves
 334.	Blind
 335.	Poison
-336.	Kirye Eleison/Parring/Defender Shield
+336.	Kyrie Eleison/Parrying Shield
 337.	Class Change
 338.	Super Novice/Taekwon Level Up Angel
 339.	Spiral Pierce
@@ -413,7 +414,7 @@ number	description
 392.	Reject Sword
 393.	Arrow Vulcan
 394.	Sheltering Bliss
-395.	Soul Change (The same of 384)
+395.	Soul Change (the same as 384)
 396.	Marionette Control
 397.	(nothing)
 398.	(nothing)
@@ -447,9 +448,9 @@ number	description
 426.	Running Hit Effect
 427.	(nothing)
 428.	(nothing)
-429.	Taekwon Normal Kick
-430.	The Same of 429
-431.	The Same of 429 and 430
+429.	Taekwon Normal Kicks
+430.	Taekwon Normal Kicks
+431.	Taekwon Normal Kicks
 432.	Star Gladiator Map Recognize
 433.	Something like 432
 434.	Like 429, 430 and 431
@@ -481,7 +482,7 @@ number	description
 460.	Green tornado (unused)
 461.	Blue tornado (unused)
 462.	Kaupe Dodge Effect
-463.	The Same of 462
+463.	Kaupe Dodge Effect
 464.	White tornado (unused)
 465.	Purple tornado (unused)
 466.	Another Round Kick
@@ -503,8 +504,8 @@ number	description
 482.	Demon of The Sun Moon And Stars (Level 8)
 483.	Demon of The Sun Moon And Stars (Level 9)
 484.	Demon of The Sun Moon And Stars (Level 10)
-485.	Lightning like Mental Strenght but White
-486.	Like Mental Strenght but White
+485.	Mental Strength Lightning but White
+486.	Mental Strength Lightning
 487.	Demon of The Sun Moon And Stars Ground Effect
 488.	Comfort Skills
 489.	(nothing)
@@ -518,9 +519,9 @@ number	description
 497.	Twilight Alchemy 1
 498.	Twilight Alchemy 2
 499.	Twilight Alchemy 3
-500.	Need More Test Skill
-501.	WTF?
-502.	Need More Test Skill
+500.	Player Become Blue with Blue Aura
+501.	Chase Walk Animation
+502.	Player Become Yellow with Yellow Aura
 503.	Soul Link Word
 504.	(nothing)
 505.	Memorize
@@ -528,18 +529,18 @@ number	description
 507.	Authoritative Badge
 508.	Fire Cracker
 509.	Valentine Day Hearth (Wings)
-510.	WOOH! Another Ashura Strike Word (Its the opposite of the original 328!!)
+510.	Champion Asura Strike
 511.	(nothing)
-512.	Chain Crush COmbo
-513.	O_O Like Area Cast Target
-514.	O_O I Really don't know this
+512.	Chain Crush Combo
+513.	Area Cast
+514.	Really Big Circle O.O
 515.	Einbroch Fog
 516.	Airship Cloud
 517.	(nothing)
 518.	Cart Termination
 519.	Speed Down Potion
 520.	Shield Bumerang
-521.	O_O I Really don't know this
+521.	Player Become Red with Red Aura
 522.	Gravitation Field
 523.	Tarot Card of Fate (The Fool)
 524.	Tarot Card of Fate (The Magician)
@@ -555,21 +556,21 @@ number	description
 534.	Tarot Card of Fate (The Tower)
 535.	Tarot Card of Fate (The Star)
 536.	Tarot Card of Fate (The Sun)
-537.	O_O I Really don't know this
-538.	O_O I Really don't know this
+537.	Acid Demonstration
+538.	Player Become Green with Green Aura
 539.	Throw Random Bottle
 540.	Instant Small->Normal
 541.	(nothing)
 542.	KA-Spell (1st Part)
 543.	Kahii
 544.	Warmth Red Sprite
-545.	Sound and... PUFF Crash Client :P
+545.	Sound and... PUFF Client Crash :P
 546.	Another HP/SP Regeneration
 547.	Estin
 548.	Istant Red Sprite
 549.	Istant Blue Sprite
 550.	Another Effect like Running Hit
-551.	O_O Effect Like Estun but with Circle
+551.	Effect Like Estun but with Circle
 552.	(nothing)
 553.	Esma
 554.	(nothing)
@@ -603,10 +604,10 @@ number	description
 582.	Another Super Novice/Taekwon Angel
 583.	Warmth Hit
 584.	Full Buster
-585.	A Gunslinger Skill
+585.	5 Medium Size Explosion
 586.	Somatology Lab Mobs Aura
-587.	WTF?
-588.	WTF?
+587.	Big Purple Flame
+588.	Little Red Flame
 589.	Eswoo
 590.	Running Stop
 591.	(nothing)
@@ -617,7 +618,7 @@ number	description
 596.	Food Effect (AGI)
 597.	Food Effect (DEX)
 598.	Food Effect (LUK)
-599.	O_O I Really don't know this
+599.	Cast Time Sound and Flashing Animation on Player
 600.	Something Happen Near Shadow Sprite
 601.	Sight Blaster
 602.	Something About 2nd Class New Skills
@@ -630,7 +631,7 @@ number	description
 609.	Cooking Failed
 610.	Success
 611.	Failed
-612.	-?-
+612.	Korean Words and /no1 Smile O.O
 613.	Throw Shuriken
 614.	Throw Kunai
 615.	Throw Fumma Shuriken
@@ -673,8 +674,8 @@ number	description
 652.	Like Regeneration Number but Red with a Sound
 653.	Like Regeneration Number but Red
 654.	Like Regeneration Number but Purple
-655.	Player Become Green slooooooowly
-656.	Green FLash
+655.	Mobs Skill (Change to Undead Element)
+656.	Final animation for Change Undead Element
 657.	(nothing)
 658.	(nothing)
 659.	(nothing)
@@ -684,8 +685,16 @@ number	description
 663.	(nothing)
 664.	(nothing)
 665.	Little Blue Ball Falling From Sky
-666.	New Mobs Skill (Earthquake)
+666.	Mobs Skill (Earthquake)
 667.	(nothing)
-668.	New Mobs Skill (Unamed)
-669.	New Mobs Skill (Unamed)
-670.+	No More Effects
+668.	Mobs Skill (Scream)
+669.	Mobs Skill (Critical Slash)
+670.	Mobs Skill (Scream Without Sound)
+671.	The Japan Earth Symbol (Like 'Seven Wind LV 1' but is in the Ground)
+672.	The Japan Wind Symbol (Like 'Seven Wind LV 2' but is in the Ground)
+673.	(nothing)
+674.	Like Curse Effect
+675.	Like Parrying/Kyrie Eleison barrier but is Yellow with small Cross in every barrier piece
+676.	Mobs Skill (Maybe is Full Screen Slow Down, or something like Slow Cast)
+677.	Mobs Skill (Unamed)
+678+.	No More Effects in 2007/05/07 Sakexe
diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt
index 900f2c3a8..2b81c9591 100644
--- a/npc/cities/izlude.txt
+++ b/npc/cities/izlude.txt
@@ -450,7 +450,7 @@ izlude,124,178,4	script	Soldier	105,{
 izlude,56,126,7	script	Cebalis::RedCebalis	85,{
 
 	mes "[Red]";
-	mes "The only slill that's needed for a";
+	mes "The only skill that's needed for a";
 	mes "Swordman is ^FF0000Bash^000000! Bash, Bash and";
 	mes "ONLY ^FF0000BASH^000000! No need to waste time";
 	mes "and effort for smaller skills!";
diff --git a/npc/quests/skills/knight_skills.txt b/npc/quests/skills/knight_skills.txt
index b7b1bb29c..41feec727 100644
--- a/npc/quests/skills/knight_skills.txt
+++ b/npc/quests/skills/knight_skills.txt
@@ -262,7 +262,7 @@ prontera,69,351,0	script	#Observer	111,{
 		mes "- enough. -";
 		close;
 	}
-	mes "- You can see the Calvary Division -";
+	mes "- You can see the Cavalry Division -";
 	mes "- training very hard. -";
 	mes "- The loud shoutings are quite annoying, -";
 	mes "- but they are working hard -";
diff --git a/npc/warps/fields/veins_fild.txt b/npc/warps/fields/veins_fild.txt
index b1e3fd196..cd49a48b3 100644
--- a/npc/warps/fields/veins_fild.txt
+++ b/npc/warps/fields/veins_fild.txt
@@ -39,12 +39,9 @@ ve_fild05,359,192,0	warp	veinswarp5019	1,1,ve_fild06,84,179
 ve_fild04,115,49,0	warp	veinswarp5020	1,1,ve_fild06,84,179
 
 ve_fild06,88,176,0	script	veinswarp5021	45,1,1,{
-	switch(rand(2)){
-		case 1:
-			warp "ve_fild04",115,52;
-			break;
-		default:
-			warp "ve_fild05",354,192;
-			break;
-	}
+	if (rand(2))
+		warp "ve_fild04",115,52;
+	else
+		warp "ve_fild05",354,192;
+	end;
 }
diff --git a/src/map/status.c b/src/map/status.c
index af86c8951..d75ab7c6a 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -5750,12 +5750,13 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 			val4 = BF_WEAPON|BF_MISC; //Type
 			break;
 		case SC_ENCHANTARMS:
+			//end previous enchants
+			skill_enchant_elemental_end(bl,type);
 			//Make sure the received element is valid.
 			if (val2 >= ELE_MAX)
 				val2 = val2%ELE_MAX;
 			else if (val2 < 0)
 				val2 = rand()%ELE_MAX;
-				skill_enchant_elemental_end(bl,type);
 			break;
 		case SC_ARMOR_ELEMENT:
 			//Place here SCs that have no SCB_* data, no skill associated, no ICON