From 9dbe3d3db3e6b3e39b4300dddae7a8032b4280a1 Mon Sep 17 00:00:00 2001
From: silvernexus <silvernexus@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sat, 10 Oct 2020 16:32:45 +0000
Subject: [PATCH] Make aggravation a castable spell with level-scaling.

git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@21489 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 ChangeLog                              | 17 ++++++++++++-----
 spell/MoodChange/spell_aggravation.arc | 14 ++++++++------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 098b76dc8..cd94e0fb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Make aggravation a castable spell, and give it level-scaling
+The code to prevent charm monsters abuse
+from like 2010 appears to have caused the lvl 1
+aggravation horns to be essentially useless.
+spell/MoodChange/spell_aggravation.arc
+Daniel Hawkins 2020-10-10
+
 Add the file as a random drop.
 treasures.trs
 Daniel Hawkins 2020-10-09
@@ -399,7 +406,7 @@ Rick Tanner 2017-03-25
 
 Patch #270 New Items - 6 different items
 * Patch accepted with changes as summarized in the patch entry
-at Sourceforge. Basically, changes for clarity and removed 
+at Sourceforge. Basically, changes for clarity and removed
 duplicate and conflicting item properties identified by
 Gridarta for Crossfire
 armour/helmet/bone_helm.arc
@@ -416,7 +423,7 @@ weapon/sword/giants_knife.arc
 weapon/sword/giants_knife.base.111.png
 Rick Tanner 2017-03-19
 
-Patch #267 New Items - 7 different items 
+Patch #267 New Items - 7 different items
 * Changed attacktype of the Order Sword to remove GodPower, now uses
 Magic, Physical and WeaponMagic instead
 * Changed attacketype of Bloodreaver Axe to remove GodPower and disease
@@ -608,11 +615,11 @@ random/randomTrea.arc
 random/randomWeal.arc
 random/randomWeap.arc
 random/random_ore.arc
-random/random_tree.arc 
+random/random_tree.arc
 RJT 2014-09-08
 
 New graphic and face for random_ore tile, it was using the same
-face as random_mineral before. 
+face as random_mineral before.
 random/randomOre.base.111.png
 random/randomOre.face
 random/random_ore.arc
@@ -1215,7 +1222,7 @@ construct/town/dragon_guild.base.x11.png
 RJT 2012-09-21
 
 New Graphic and archetype for West Guild building and West Guild Storage building.
-Based on existing guild graphics but with a sign or banner on the front. 
+Based on existing guild graphics but with a sign or banner on the front.
 construct/town/guild2storage_west.base.x11.png
 construct/town/guild2storage_west.arc
 construct/town/guild2_west.arc
diff --git a/spell/MoodChange/spell_aggravation.arc b/spell/MoodChange/spell_aggravation.arc
index b631685d3..9bf6b63d1 100644
--- a/spell/MoodChange/spell_aggravation.arc
+++ b/spell/MoodChange/spell_aggravation.arc
@@ -3,20 +3,22 @@ face spell_aggravation.111
 anim_suffix spellcasting
 name aggravation
 name_pl aggravation
-level 1
-sp 1
+level 5
+sp 5
+max_sp 10
 casting_time 1
 path_attuned 1024
-skill ????
+skill sorcery
 type 101
 subtype 34
-value 10
+value 25
 no_drop 1
 invisible 1
-range 25
+range 10
+range_modifier 5
 undead 1
 monster 1
 msg
-Aggravation is used to change the mood of unagressive creatures so that they attack the caster.
+With a well-placed taunt, aggravation can drive most creatures into a rage, compelling them to attack you instead of an ally or no one at all.
 endmsg
 end