Lua: Moved mimicry to C

4 files changed, 0 insertions, 519 deletions

diff --git a/lib/mods/theme/core/init.lua b/lib/mods/theme/core/init.lua
index 3db34076..9d0c01a3 100644
--- a/lib/mods/theme/core/init.lua
+++ b/lib/mods/theme/core/init.lua
@@ -17,7 +17,6 @@ tome_dofile_anywhere(ANGBAND_DIR_CORE, "monsters.lua")
 tome_dofile_anywhere(ANGBAND_DIR_CORE, "building.lua")
 tome_dofile_anywhere(ANGBAND_DIR_CORE, "dungeon.lua")
 tome_dofile_anywhere(ANGBAND_DIR_CORE, "s_aux.lua")
-tome_dofile_anywhere(ANGBAND_DIR_CORE, "mimc_aux.lua")
 tome_dofile_anywhere(ANGBAND_DIR_CORE, "quests.lua")
 tome_dofile_anywhere(ANGBAND_DIR_CORE, "gods.lua")
 
diff --git a/lib/mods/theme/core/mimc_aux.lua b/lib/mods/theme/core/mimc_aux.lua
deleted file mode 100644
index cea1f4dc..00000000
--- a/lib/mods/theme/core/mimc_aux.lua
+++ /dev/null
@@ -1,96 +0,0 @@
--- Mimic shapes helper file
-
-__mimics = {}
-__mimics_max = 1
-__mimics_names = {}
-
-function add_mimic_shape(t)
-	assert(t.name, "no mimic name")
-	assert(t.desc, "no mimic desc")
-	assert(t.calc, "no mimic calc")
-	assert(t.level, "no mimic level")
-	assert(t.duration, "no mimic duration")
-
-	if not t.limit then t.limit = 0 end
-
-	if not t.obj_name then
-		t.obj_name = t.name
-	end
-
-	t.show_name = '['..t.name..']'
-
-	-- if it needs hooks, add them
-	if t.hooks then
-		add_hooks(t.hooks)
-	end
-
-	-- Add it in a name to index hash table
-	__mimics_names[t.name] = __mimics_max
-
-	__mimics[__mimics_max] = t
-	__mimics_max = __mimics_max + 1
-end
-
-function resolve_mimic_name(name)
-	if __mimics_names[name] then
-		return __mimics_names[name]
-	else
-		return -1
-	end
-end
-
-function find_random_mimic_shape(level, limit, realm)
-	local mimic, tries
-
-	tries = 1000
-	while tries > 0 do
-		tries = tries - 1
-		mimic = rand_range(1, __mimics_max - 1)
-		if (not realm) or (__mimics[mimic].realm == realm) then
-			if limit >= __mimics[mimic].limit then
-				if (rand_int(__mimics[mimic].level * 3) < level) and (__mimics[mimic].rarity < 100)  and (magik(100 - __mimics[mimic].rarity) == TRUE) then
-					break
-				end
-			end
-		end
-	end
-	if tries > 0 then
-		return mimic
-	else
-		return resolve_mimic_name("Abomination")
-	end
-end
-
-function get_mimic_info(mimic, info)
-	if not __mimics[mimic] then return 0 end
-	return __mimics[mimic][info]
-end
-
-function get_mimic_rand_dur(mimic)
-	return rand_range(__mimics[mimic].duration[1], __mimics[mimic].duration[2])
-end
-
-function calc_mimic(mimic)
-	return __mimics[mimic].calc()
-end
-
-function calc_mimic_power(mimic)
-	if __mimics[mimic].power then __mimics[mimic].power() end
-end
-
---- Here comes the only vital shape
-
-add_mimic_shape
-{
-	["name"] =      "Abomination",
-	["obj_name"] =  "Abominable Cloak",
-	["desc"] = 	"Abominations are failed experiments of powerful wizards.",
-	["realm"] =     nil,
-	["level"] =     1,
-	["rarity"] =    101,
-	["duration"] =  {20, 100},
-	["calc"] =      function ()
-			apply_flags(TR1_SPEED + TR1_STR + TR1_INT + TR1_WIS + TR1_DEX + TR1_CON + TR1_CHR, 0, 0, 0, 0, 0, -10)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_AGGRAVATE)
-       	end,
-}
diff --git a/lib/mods/theme/scpt/init.lua b/lib/mods/theme/scpt/init.lua
index 7a229abd..063ca21b 100644
--- a/lib/mods/theme/scpt/init.lua
+++ b/lib/mods/theme/scpt/init.lua
@@ -11,9 +11,6 @@ tome_dofile("help.lua")
 -- let the store specific stuff happen!
 tome_dofile("stores.lua")
 
--- Add the mimic shapes
-tome_dofile("mimic.lua")
-
 -- Add the mkey activations
 tome_dofile("mkeys.lua")
 
diff --git a/lib/mods/theme/scpt/mimic.lua b/lib/mods/theme/scpt/mimic.lua
deleted file mode 100644
index f38f70f7..00000000
--- a/lib/mods/theme/scpt/mimic.lua
+++ /dev/null
@@ -1,419 +0,0 @@
--- Define the various possible mimic shapes
-
--- Nature shapes
-add_mimic_shape
-{
-	["name"] =      "Mouse",
-	["obj_name"] =  "Mouse Fur",
-	["desc"] = 	"Mice are small, fast and very stealthy",
-	["realm"] =     "nature",
-	["level"] =     1,
-	["rarity"] =    10,
-	["duration"] =  {20, 40},
-	["calc"] =      function ()
-			-- Mice run!
-			player.pspeed = player.pspeed + 5 + (player.mimic_level / 7)
-
-			-- They can crtawl under your armor to hit you ;)
-			player.to_h = player.to_h + 10 + (player.mimic_level / 5)
-			player.dis_to_h = player.dis_to_h + 10 + (player.mimic_level / 5)
-
-			-- But they are not very powerfull
-			player.to_d = player.to_d / 5
-			player.dis_to_d = player.dis_to_d / 5
-
-			-- But they are stealthy
-			player.skill_stl = player.skill_stl + 10 + (player.mimic_level / 5)
-
-			-- Stat mods
-			player.modify_stat(A_STR, -5)
-			player.modify_stat(A_DEX, 3)
-			player.modify_stat(A_CON, 1)
-
-	end,
-	["power"] =     function()
-			if player.mimic_level >= 30 then
-				player.add_power(POWER_INVISIBILITY)
-			end
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Eagle",
-	["obj_name"] =  "Feathered Cloak",
-	["desc"] = 	"Eagles are master of the air, good hunters with excellent vision.",
-	["realm"] =     "nature",
-	["level"] =     10,
-	["rarity"] =    30,
-	["duration"] =  {10, 50},
-	["calc"] =      function ()
-			player.ffall = TRUE
-			player.pspeed = player.pspeed + 2 + (player.mimic_level / 6)
-
-			player.modify_stat(A_STR, -3)
-			player.modify_stat(A_DEX, 2 + (player.mimic_level / 15))
-			player.modify_stat(A_CON, 4 + (player.mimic_level / 20))
-			player.modify_stat(A_INT, -1)
-			player.modify_stat(A_WIS, 1)
-			player.modify_stat(A_CHR, -1)
-
-			if player.mimic_level >= 20 then
-                player.xtra_f4 = bor(player.xtra_f4, TR4_FLY)
-                player.xtra_f3 = bor(player.xtra_f3, TR3_SEE_INVIS)
-			end
-			if player.mimic_level >= 25 then
-                player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-			end
-			if player.mimic_level >= 30 then
-                player.xtra_f2 = bor(player.xtra_f2, TR2_RES_ELEC)
-			end
-			if player.mimic_level >= 30 then
-                player.xtra_f3 = bor(player.xtra_f3, TR3_SH_ELEC)
-			end
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Wolf",
-	["obj_name"] =  "Wolf Pelt",
-	["desc"] = 	"Wolves are masters of movement, strong and have excellent eyesight.",
-	["realm"] =     "nature",
-	["level"] =     20,
-	["rarity"] =    40,
-	["duration"] =  {10, 50},
-	["calc"] =      function ()
-			player.modify_stat(A_STR, 2 + (player.mimic_level / 20))
-			player.modify_stat(A_DEX, 3 + (player.mimic_level / 20))
-			player.modify_stat(A_INT, -3)
-			player.modify_stat(A_CHR, -2)
-
-			player.pspeed = player.pspeed + 10 + (player.mimic_level / 5)
-
-            player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-            player.xtra_f2 = bor(player.xtra_f2, TR2_RES_FEAR)
-
-			if player.mimic_level >= 10 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_COLD)
-			end
-			if player.mimic_level >= 15 then
-                player.xtra_f3 = bor(player.xtra_f3, TR3_SEE_INVIS)
-			end
-			if player.mimic_level >= 30 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_DARK)
-			end
-			if player.mimic_level >= 35 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_CONF)
-			end
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Spider",
-	["obj_name"] =  "Spider Web",
-	["desc"] = 	"Spiders are clever and become good climbers.",
-	["realm"] =     "nature",
-	["level"] =     25,
-	["rarity"] =    50,
-	["duration"] =  {10, 50},
-	["calc"] =      function ()
-			player.modify_stat(A_STR, -4)
-			player.modify_stat(A_DEX, 1 + (player.mimic_level / 8))
-			player.modify_stat(A_INT, 1 + (player.mimic_level / 5))
-			player.modify_stat(A_WIS, 1 + (player.mimic_level / 5))
-			player.modify_stat(A_CON, -5)
-			player.modify_stat(A_CHR, -10)
-
-			player.pspeed = player.pspeed + 5
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_FEAR)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_DARK)
-
-			if player.mimic_level >= 40 then
-                player.xtra_f4 = bor(player.xtra_f4, TR4_CLIMB)
-			end
-
-	end,
-	["power"] =     function()
-			if player.mimic_level >= 25 then
-				player.add_power(POWER_WEB)
-			end
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Elder Ent",
-	["obj_name"] =  "Entish Bark",
-	["desc"] = 	"Ents are powerful tree-like beings dating from the dawn of time.",
-	["realm"] =     "nature",
-	["level"] =     40,
-	["rarity"] =    60,
-	["duration"] =  {10, 30},
-	["limit"] =     TRUE,
-	["calc"] =      function ()
-			player.pspeed = player.pspeed - 5 - (player.mimic_level / 10)
-
-			player.to_a = player.to_a + 10 + player.mimic_level
-			player.dis_to_a = player.dis_to_a + 10 + player.mimic_level
-
-			player.modify_stat(A_STR, player.mimic_level / 5)
-			player.modify_stat(A_INT, - (player.mimic_level / 7))
-			player.modify_stat(A_WIS, - (player.mimic_level / 7))
-			player.modify_stat(A_DEX, -4)
-			player.modify_stat(A_CON, player.mimic_level / 5)
-			player.modify_stat(A_CHR, -7)
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_COLD)
-            player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-            player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN)
-            player.xtra_f3 = bor(player.xtra_f3, TR3_SEE_INVIS)
-            player.xtra_f2 = bor(player.xtra_f2, TR2_SENS_FIRE)
-	end,
-	["power"] =     function ()
-			player.add_power(PWR_GROW_TREE)
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Vapour",
-	["obj_name"] =  "Cloak of Mist",
-	["desc"] = 	"A sentient cloud, darting around",
-	["realm"] =     "nature",
-	["level"] =     15,
-	["rarity"] =    10,
-	["duration"] =  {10, 40},
-	["calc"] =      function ()
-
-			player.pspeed = player.pspeed + 5
-
-			--Try to hit a cloud!
-			player.to_a = player.to_a + 40 + player.mimic_level
-			player.dis_to_a = player.dis_to_a + 40 + player.mimic_level
-
-			--Try to hit WITH a cloud!
-			player.to_h = player.to_h - 40
-			player.dis_to_h = player.dis_to_h -40
-
-			-- Stat mods
-			player.modify_stat(A_STR, -4)
-			player.modify_stat(A_DEX, 5)
-			player.modify_stat(A_CON, -4)
-			player.modify_stat(A_CHR, -10)
-
-			-- But they are stealthy
-			player.skill_stl = player.skill_stl + 10 + (player.mimic_level / 5)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_SHARDS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_COLD)
-            player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-            player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN)
-            player.xtra_f3 = bor(player.xtra_f3, TR3_SEE_INVIS)
-            player.xtra_f2 = bor(player.xtra_f2, TR2_SENS_FIRE)
-            player.xtra_f3 = bor(player.xtra_f3, TR3_FEATHER)
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Serpent",
-	["obj_name"] =  "Snakeskin Cloak",
-	["desc"] = 	"Serpents are fast, lethal predators.",
-	["realm"] =     "nature",
-	["level"] =     30,
-	["rarity"] =    25,
-	["duration"] =  {15, 20},
-	["calc"] =      function ()
-			player.pspeed = player.pspeed + 10 + (player.mimic_level / 6)
-			player.to_a = player.to_a + 3 + (player.mimic_level / 8)
-			player.dis_to_a = player.dis_to_a + 3 + (player.mimic_level / 8)
-
-			player.modify_stat(A_STR, player.mimic_level / 8)
-			player.modify_stat(A_INT, -6)
-			player.modify_stat(A_WIS, -6)
-			player.modify_stat(A_DEX, -4)
-			player.modify_stat(A_CON, player.mimic_level / 7)
-			player.modify_stat(A_CHR, -6)
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			if player.mimic_level >= 25 then
-            	player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-			end
-	end,
-}
-
-add_mimic_shape
-{
-	["name"] =      "Mumak",
-	["obj_name"] =  "Mumak Hide",
-	["desc"] = 	"A giant, elaphantine form.",
-	["realm"] =     "nature",
-	["level"] =     40,
-	["rarity"] =    40,
-	["duration"] =  {15, 20},
-	["calc"] =      function ()
-			player.pspeed = player.pspeed - 5 - (player.mimic_level / 10)
-			player.to_a = player.to_a + 10 + (player.mimic_level / 6)
-			player.dis_to_a = player.dis_to_a + 10 + (player.mimic_level / 6)
-			player.to_d = player.to_d + 5 + ((player.mimic_level * 2) / 3)
-			player.dis_to_d = player.dis_to_d + 5 + ((player.mimic_level * 2) / 3)
-
-			player.modify_stat(A_STR, player.mimic_level / 4)
-			player.modify_stat(A_INT, -8)
-			player.modify_stat(A_WIS, -4)
-			player.modify_stat(A_DEX, -5)
-			player.modify_stat(A_CON, player.mimic_level / 3)
-			player.modify_stat(A_CHR, -10)
-
-			if player.mimic_level >= 10 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_FEAR)
-			end
-			if player.mimic_level >= 25 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_CONF)
-			end
-			if player.mimic_level >= 30 then
-            	player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-			end
-			if player.mimic_level >= 35 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_NEXUS)
-			end
-	end,
-}
-
---------- Extra shapes -----------
-
--- For Beornings
-add_mimic_shape
-{
-	["name"] =      "Bear",
-	["desc"] = 	"A fierce, terrible bear.",
-	["realm"] =     nil,
-	["level"] =     1,
-	["rarity"] =    101,
-	["duration"] =  {50, 200},
-	["limit"] =     TRUE,
-	["calc"] =      function ()
-			player.pspeed = player.pspeed - 5 + (player.mimic_level / 5)
-
-			player.to_a = player.to_a + 5 + ((player.mimic_level * 2) / 3)
-			player.dis_to_a = player.dis_to_a + 5 + ((player.mimic_level * 2) / 3)
-
-			player.modify_stat(A_STR, player.mimic_level / 11)
-			player.modify_stat(A_INT, player.mimic_level / 11)
-			player.modify_stat(A_WIS, player.mimic_level / 11)
-			player.modify_stat(A_DEX, -1)
-			player.modify_stat(A_CON, player.mimic_level / 11)
-			player.modify_stat(A_CHR, -10)
-
-			if player.mimic_level >= 10 then
-            	player.xtra_f2 = bor(player.xtra_f2, TR2_FREE_ACT)
-			end
-			if player.mimic_level >= 20 then
-	            player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN)
-			end
-			if player.mimic_level >= 30 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_CONF)
-			end
-			if player.mimic_level >= 35 then
-				player.xtra_f2 = bor(player.xtra_f2, TR2_RES_NEXUS)
-			end
-
-			-- activate the skill
-			skill(SKILL_BEAR).hidden = FALSE
-	end,
-}
-
--- For balrog corruptions
-add_mimic_shape
-{
-	["name"] =      "Balrog",
-	["desc"] = 	"A corrupted maia.",
-	["realm"] =     nil,
-	["level"] =     1,
-	["rarity"] =    101,
-	["duration"] =  {30, 70},
-	["limit"] =     TRUE,
-	["calc"] =      function ()
-			player.modify_stat(A_STR, 5 + player.mimic_level / 5)
-			player.modify_stat(A_INT, player.mimic_level / 10)
-			player.modify_stat(A_WIS, - ( 5 + player.mimic_level / 10))
-			player.modify_stat(A_DEX, player.mimic_level / 10)
-			player.modify_stat(A_CON, 5 + player.mimic_level / 5)
-			player.modify_stat(A_CHR, - ( 5 + player.mimic_level / 10))
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_ACID)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_FIRE)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_ELEC)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_DARK)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_CHAOS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_HOLD_LIFE)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_FEATHER)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_SH_FIRE)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_LITE1)
-			return 1
-	end,
-}
-
--- For avatar spell
-add_mimic_shape
-{
-	["name"] =      "Maia",
-	["desc"] = 	"A near god-like being.",
-	["realm"] =     nil,
-	["level"] =     1,
-	["rarity"] =    101,
-	["duration"] =  {30, 70},
-	["limit"] =     TRUE,
-	["calc"] =      function ()
-			player.modify_stat(A_STR, 5 + player.mimic_level / 5)
-			player.modify_stat(A_INT, 5 + player.mimic_level / 5)
-			player.modify_stat(A_WIS, 5 + player.mimic_level / 5)
-			player.modify_stat(A_DEX, 5 + player.mimic_level / 5)
-			player.modify_stat(A_CON, 5 + player.mimic_level / 5)
-			player.modify_stat(A_CHR, 5 + player.mimic_level / 5)
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_FIRE)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_ELEC)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_ACID)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_COLD)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_LITE)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_DARK)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_CHAOS)
-			player.xtra_f2 = bor(player.xtra_f2, TR2_HOLD_LIFE)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_FEATHER)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_REGEN)
-			return 2
-	end,
-}
-
--- For Geomancy
-add_mimic_shape
-{
-	["name"] =      "Fire Elem.",
-	["desc"] = 	"A towering column of flames",
-	["realm"] =     nil,
-	["level"] =     1,
-	["rarity"] =    101,
-	["duration"] =  {10, 10},
-	["limit"] =     TRUE,
-	["calc"] =      function ()
-			player.modify_stat(A_STR, 5 + (player.mimic_level / 5))
-			player.modify_stat(A_DEX, 5 + (player.mimic_level / 5))
-			player.modify_stat(A_WIS, -5 - (player.mimic_level / 5))
-
-			player.xtra_f2 = bor(player.xtra_f2, TR2_IM_FIRE)
-			-- was immune to poison in the 3.0.0 version
-			player.xtra_f2 = bor(player.xtra_f2, TR2_RES_POIS)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_SH_FIRE)
-			player.xtra_f3 = bor(player.xtra_f3, TR3_LITE1)
-			return 0
-	end,
-}