From f31277b327df701361391b1d4b8bd6f89f4e3109 Mon Sep 17 00:00:00 2001
From: Erik Schilling <ablu.erikschilling@googlemail.com>
Date: Sat, 27 Apr 2013 21:09:23 +0200
Subject: [Abilities] Removed the old autoattack system

As a side effect i had to remove the monster attack AI for now. I will
readd this as next thing.
---
 example/items.xml                       | 12 -----
 example/monsters.xml                    | 80 ---------------------------------
 example/scripts/maps/desert.lua         |  2 -
 example/scripts/monster/testmonster.lua | 14 ------
 4 files changed, 108 deletions(-)

(limited to 'example')

diff --git a/example/items.xml b/example/items.xml
index 9d862a93..5d2db93d 100644
--- a/example/items.xml
+++ b/example/items.xml
@@ -117,12 +117,6 @@
         </equip>
         <effect trigger="equip">
             <modifier attribute="acc1" value="1.0" />
-            <attack skill="102" warmuptime="1" cooldowntime="5" reusetime="1"
-                basedamage="1" deltadamage="10" chancetohit="200" range="320"
-                element="fire" type="physical" />
-            <attack skill="102" priority="2" warmuptime="100" cooldowntime="10" reusetime="100"
-                basedamage="50" deltadamage="10" chancetohit="200" range="320"
-                element="neutral" type="physical" />
         </effect>
         <effect trigger="in-inventory">
             <modifier attribute="vit" value="100" />
@@ -137,9 +131,6 @@
             <slot type="hand" required="2" />
         </equip>
         <effect trigger="equip">
-            <attack skill="106" warmuptime="10" cooldowntime="166"
-                basedamage="50" deltadamage="10" chancetohit="2" range="160"
-                element="neutral" type="physical" />
             <modifier attribute="acc1" value="1.5" />
         </effect>
         <effect trigger="in-inventory">
@@ -155,9 +146,6 @@
             <slot type="hand" required="1" />
         </equip>
         <effect trigger="equip">
-            <attack skill="100" warmuptime="10" cooldowntime="10" reusetime="20"
-                basedamage="50" deltadamage="10" chancetohit="2" range="32"
-                element="neutral" type="physical" />
             <modifier attribute="acc1" value="1.5" />
         </effect>
         <effect trigger="in-inventory">
diff --git a/example/monsters.xml b/example/monsters.xml
index 75438c8a..f577c69f 100644
--- a/example/monsters.xml
+++ b/example/monsters.xml
@@ -63,32 +63,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
             stroll-range="32"
             attack-distance="32"
             />
-        <attack id="1"
-            priority="1"
-            type="physical"
-            warmuptime="10"
-            cooldowntime="10"
-            reusetime="10"
-            basedamage="10"
-            deltadamage="1"
-            chancetohit="1000"
-            element="neutral"
-            range="32"
-            animation="attack"
-            />
-        <attack id="2"
-            priority="2"
-            type="physical"
-            warmuptime="0"
-            cooldowntime="100"
-            reusetime="100"
-            basedamage="100"
-            deltadamage="1"
-            chancetohit="1000"
-            element="neutral"
-            range="32"
-            animation="attack"
-            />
     </monster>
 
     <monster id="2" name="Scorpion">
@@ -121,34 +95,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
             stroll-range="64"
             attack-distance="64"
             />
-        <!-- slow, strong, long-range tail attack-->
-        <attack id="1"
-            priority="1"
-            type="physical"
-            warmuptime="10"
-            cooldowntime="100"
-            reusetime="100"
-            basedamage="20"
-            deltadamage="1"
-            chancetohit="1000"
-            element="neutral"
-            range="32"
-            animation="attack"
-            />
-        <!-- fast, weak, short-range scissor attack -->
-        <attack id="2"
-            priority="2"
-            type="physical"
-            warmuptime="0"
-            cooldowntime="5"
-            reusetime="1"
-            basedamage="5"
-            deltadamage="1"
-            chancetohit="1000"
-            element="neutral"
-            range="32"
-            animation="attack"
-            />
     </monster>
 
     <monster id="3" name="Red Scorpion">
@@ -184,19 +130,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
             stroll-range="32"
             attack-distance="64"
             />
-        <attack id="1"
-            priority="1"
-            type="physical"
-            warmuptime="0"
-            cooldowntime="100"
-            reusetime="100"
-            basedamage="100"
-            deltadamage="1"
-            chancetohit="1000"
-            element="neutral"
-            range="32"
-            animation="attack"
-            />
     </monster>
 
     <monster id="4" name="Green Slime">
@@ -220,19 +153,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
             physical-defence="0"
             magical-defence="0"
             />
-        <attack id="1"
-            priority="1"
-            type="physical"
-            warmuptime="0"
-            cooldowntime="100"
-            reusetime="100"
-            basedamage="100"
-            deltadamage="1"
-            chancetohit="1000"
-            element="neutral"
-            range="32"
-            animation="attack"
-            />
         <!-- Is fulfilling some unknown purpose that requires it to move around
         a lot and leaves no time for pursing attackers -->
         <behavior
diff --git a/example/scripts/maps/desert.lua b/example/scripts/maps/desert.lua
index 5f7f2d28..343ee6c4 100644
--- a/example/scripts/maps/desert.lua
+++ b/example/scripts/maps/desert.lua
@@ -130,13 +130,11 @@ function Tamer(npc, ch, list)
     end
 
     local m1 = monster_create("Maggot", ch:position())
-    m1:change_anger(ch, 100)
 
     -- (The following is not safe, since the being might have been removed by
     --  the time this function gets executed (especially with the above code))
     --
     --schedule_in(0.5, function()
     --            m1:say("Roaaarrrr!!!")
-    --            m1:change_anger(ch, 100)
     --            end)
 end
diff --git a/example/scripts/monster/testmonster.lua b/example/scripts/monster/testmonster.lua
index 21b6a7b2..42cf1d2d 100644
--- a/example/scripts/monster/testmonster.lua
+++ b/example/scripts/monster/testmonster.lua
@@ -14,19 +14,5 @@ local function update(mob)
     end
 end
 
-local function strike(mob, victim, hit)
-    if hit > 0 then
-        mob:say("Take this! "..hit.." damage!")
-        victim:say("Oh Noez!")
-    else
-        mob:say("Oh no, my attack missed!")
-        victim:say("Whew...")
-    end
-end
-
 local maggot = get_monster_class("maggot")
 maggot:on_update(update)
-local attacks = maggot:attacks();
-for i, attack in ipairs(attacks) do
-    attack:on_attack(strike)
-end
-- 
cgit v1.2.3-70-g09d2