From 7f79610cdcd5bd55de8d4e413f0679ef634b0a37 Mon Sep 17 00:00:00 2001
From: Erik Schilling <ablu.erikschilling@googlemail.com>
Date: Mon, 12 Aug 2013 21:59:28 +0200
Subject: Removed ability categories

---
 example/abilities.xml                | 40 +++++++++++++++---------------------
 example/scripts/abilities.lua        |  4 ++--
 example/scripts/monster/basic_ai.lua |  2 +-
 3 files changed, 20 insertions(+), 26 deletions(-)

(limited to 'example')

diff --git a/example/abilities.xml b/example/abilities.xml
index 71330dd0..1165c7f8 100644
--- a/example/abilities.xml
+++ b/example/abilities.xml
@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <abilities>
-    <ability-category name="Magic">
-        <ability
-            id="1"
-            name="Test Spell 1"
-            target="point"
-            useaction="attack"
-        />
-    </ability-category>
-    <ability-category name="Monster attack">
-        <ability
-            id="2"
-            name="Basic Monster strike"
-            target="being"
-            useaction="attack"
-        />
-    </ability-category>
-    <ability-category name="debug">
-        <ability
-            id="3"
-            name="debug"
-            target="point"
-        />
-    </ability-category>
+    <ability
+        id="1"
+        name="Magic/Test Spell 1"
+        target="point"
+        useaction="attack"
+    />
+    <ability
+        id="2"
+        name="Monster attack/Basic Monster strike"
+        target="being"
+        useaction="attack"
+    />
+    <ability
+        id="3"
+        name="debug"
+        target="point"
+    />
 </abilities>
diff --git a/example/scripts/abilities.lua b/example/scripts/abilities.lua
index 3878815a..cbdc22d3 100644
--- a/example/scripts/abilities.lua
+++ b/example/scripts/abilities.lua
@@ -8,7 +8,7 @@
 
 --]]
 
-local spell1 = get_ability_info("Magic_Test Spell 1")
+local spell1 = get_ability_info("Magic/Test Spell 1")
 spell1:on_use(function(user, x, y, abilityId)
     target = target or user
     local s_x, s_y = user:position()
@@ -38,7 +38,7 @@ spell1:on_use(function(user, x, y, abilityId)
 end)
 --spell1:on_recharged(function(ch) ch:say("Hoooooooo...") end)
 
-local debugspell = get_ability_info("debug_debug")
+local debugspell = get_ability_info("debug")
 debugspell:on_use(function(user)
     WARN("USED")
     user:give_experience(10)
diff --git a/example/scripts/monster/basic_ai.lua b/example/scripts/monster/basic_ai.lua
index b1dba32c..18d81640 100644
--- a/example/scripts/monster/basic_ai.lua
+++ b/example/scripts/monster/basic_ai.lua
@@ -172,7 +172,7 @@ local function mob_recharged(mob, ability_id)
 end
 
 local mob_attack_ability =
-        get_ability_info("Monster attack_Basic Monster strike")
+        get_ability_info("Monster attack/Basic Monster strike")
 mob_attack_ability:on_use(mob_attack)
 mob_attack_ability:on_recharged(mob_recharged)
 
-- 
cgit v1.2.3-70-g09d2