From d69d91b33a2e833e8b32baa29af22809ade406ba Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Sat, 9 Jun 2012 19:47:10 +0200
Subject: Lua: Move "Far Reaching Attack" ability to C

---
 lib/core/player.lua            | 26 --------------------------
 lib/mods/theme/core/player.lua | 26 --------------------------
 lib/mods/theme/scpt/init.lua   |  3 ---
 lib/mods/theme/scpt/mkeys.lua  | 35 -----------------------------------
 lib/scpt/init.lua              |  3 ---
 lib/scpt/mkeys.lua             | 35 -----------------------------------
 6 files changed, 128 deletions(-)
 delete mode 100644 lib/mods/theme/scpt/mkeys.lua
 delete mode 100644 lib/scpt/mkeys.lua

(limited to 'lib')

diff --git a/lib/core/player.lua b/lib/core/player.lua
index cb1b5cab..f5c7c13b 100644
--- a/lib/core/player.lua
+++ b/lib/core/player.lua
@@ -56,32 +56,6 @@ function player.get_wild_coord()
 end
 
 
---- Mkeys
-
--- Create a new power
-__mkey_fct = {}
-function add_mkey(p)
-	local i
-
-	assert(p.mkey, "No mkey mkey!")
-	assert(p.fct, "No mkeey fct!")
-
-	__mkey_fct[p.mkey] = p.fct
-end
-
-function __mkey_fct_activate(power)
-	if __mkey_fct[power] then
-		__mkey_fct[power]()
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
--- Register in the hook list
-add_hook_script(HOOK_MKEY, "__mkey_fct_activate", "__mkey_fct_activate")
-
-
 -- Subraces
 function subrace(racem)
 	return race_mod_info[racem + 1]
diff --git a/lib/mods/theme/core/player.lua b/lib/mods/theme/core/player.lua
index cb1b5cab..f5c7c13b 100644
--- a/lib/mods/theme/core/player.lua
+++ b/lib/mods/theme/core/player.lua
@@ -56,32 +56,6 @@ function player.get_wild_coord()
 end
 
 
---- Mkeys
-
--- Create a new power
-__mkey_fct = {}
-function add_mkey(p)
-	local i
-
-	assert(p.mkey, "No mkey mkey!")
-	assert(p.fct, "No mkeey fct!")
-
-	__mkey_fct[p.mkey] = p.fct
-end
-
-function __mkey_fct_activate(power)
-	if __mkey_fct[power] then
-		__mkey_fct[power]()
-		return TRUE
-	else
-		return FALSE
-	end
-end
-
--- Register in the hook list
-add_hook_script(HOOK_MKEY, "__mkey_fct_activate", "__mkey_fct_activate")
-
-
 -- Subraces
 function subrace(racem)
 	return race_mod_info[racem + 1]
diff --git a/lib/mods/theme/scpt/init.lua b/lib/mods/theme/scpt/init.lua
index 85099e19..0d59bfd2 100644
--- a/lib/mods/theme/scpt/init.lua
+++ b/lib/mods/theme/scpt/init.lua
@@ -5,9 +5,6 @@
 -- Load the class specific stuff
 tome_dofile("player.lua")
 
--- Add the mkey activations
-tome_dofile("mkeys.lua")
-
 -- Add the schools of magic
 schools_init()
 school_spells_init()
diff --git a/lib/mods/theme/scpt/mkeys.lua b/lib/mods/theme/scpt/mkeys.lua
deleted file mode 100644
index 82fe4ede..00000000
--- a/lib/mods/theme/scpt/mkeys.lua
+++ /dev/null
@@ -1,35 +0,0 @@
--- Mkeys for skills & abilities
-
--- Far reaching attack of polearms
-add_mkey
-{
-	["mkey"]	= 102,
-	["fct"]	 = function()
-			local weapon = get_object(INVEN_WIELD);
-			if weapon.tval == TV_POLEARM then
-			else
-				msg_print("You will need a long polearm for this!")
-				return
-			end
-
-			ret, dir = get_rep_dir()
-			if ret == FALSE then return end
-
-			local dy, dx = explode_dir(dir)
-			dy = dy * 2
-			dx = dx * 2
-		    	targety = player.py + dy
-		    	targetx = player.px + dx
-
-			local max_blows = get_skill_scale(SKILL_POLEARM, player.num_blow / 2)
-			if max_blows == 0 then max_blows = 1 end
-
-			if get_skill(SKILL_POLEARM) >= 40 then
-				energy_use = energy_use + 200
-				return project(0, 0, targety, targetx, max_blows, GF_ATTACK, bor(PROJECT_BEAM, PROJECT_KILL))
-			else
-				energy_use = energy_use + 200
-				return project(0, 0, targety, targetx, max_blows, GF_ATTACK, bor(PROJECT_BEAM, PROJECT_STOP, PROJECT_KILL))
-			end
-	end,
-}
diff --git a/lib/scpt/init.lua b/lib/scpt/init.lua
index 3be0887c..b3c73304 100644
--- a/lib/scpt/init.lua
+++ b/lib/scpt/init.lua
@@ -5,9 +5,6 @@
 -- Load the class specific stuff
 tome_dofile("player.lua")
 
--- Add the mkey activations
-tome_dofile("mkeys.lua")
-
 -- Add the schools of magic
 schools_init()
 school_spells_init()
diff --git a/lib/scpt/mkeys.lua b/lib/scpt/mkeys.lua
deleted file mode 100644
index 82fe4ede..00000000
--- a/lib/scpt/mkeys.lua
+++ /dev/null
@@ -1,35 +0,0 @@
--- Mkeys for skills & abilities
-
--- Far reaching attack of polearms
-add_mkey
-{
-	["mkey"]	= 102,
-	["fct"]	 = function()
-			local weapon = get_object(INVEN_WIELD);
-			if weapon.tval == TV_POLEARM then
-			else
-				msg_print("You will need a long polearm for this!")
-				return
-			end
-
-			ret, dir = get_rep_dir()
-			if ret == FALSE then return end
-
-			local dy, dx = explode_dir(dir)
-			dy = dy * 2
-			dx = dx * 2
-		    	targety = player.py + dy
-		    	targetx = player.px + dx
-
-			local max_blows = get_skill_scale(SKILL_POLEARM, player.num_blow / 2)
-			if max_blows == 0 then max_blows = 1 end
-
-			if get_skill(SKILL_POLEARM) >= 40 then
-				energy_use = energy_use + 200
-				return project(0, 0, targety, targetx, max_blows, GF_ATTACK, bor(PROJECT_BEAM, PROJECT_KILL))
-			else
-				energy_use = energy_use + 200
-				return project(0, 0, targety, targetx, max_blows, GF_ATTACK, bor(PROJECT_BEAM, PROJECT_STOP, PROJECT_KILL))
-			end
-	end,
-}
-- 
cgit v1.2.3