opfromthestart
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove use_cmi

This commit is contained in:
Lizzy Fleckenstein 2022-05-25 13:46:54 +02:00 committed by cora
parent fc3992ceb6
commit 6ae722a6ee
1 changed files with 9 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
mods/ENTITIES/mcl_mobs/api.lua
View File

@ -23,10 +23,6 @@ MOB_CAP.water = 15
-- Localize -- Localize
local S = minetest.get_translator("mcl_mobs") local S = minetest.get_translator("mcl_mobs")
-- CMI support check
local use_cmi = minetest.global_exists("cmi")
-- Invisibility mod check -- Invisibility mod check
mobs.invis = {} mobs.invis = {}
if minetest.global_exists("invisibility") then if minetest.global_exists("invisibility") then
@ -850,10 +846,6 @@ local check_for_death = function(self, cause, cmi_cause)
death_handle(self) death_handle(self)
end end
if use_cmi then
cmi.notify_die(self.object, cmi_cause)
end
if on_die_exit == true then if on_die_exit == true then
self.state = "die" self.state = "die"
mcl_burning.extinguish(self.object) mcl_burning.extinguish(self.object)
@ -913,9 +905,6 @@ local check_for_death = function(self, cause, cmi_cause)
if not self.object:get_luaentity() then if not self.object:get_luaentity() then
return return
end end
if use_cmi then
cmi.notify_die(self.object, cmi_cause)
end
death_handle(self) death_handle(self)
local dpos = self.object:get_pos() local dpos = self.object:get_pos()
@ -3144,23 +3133,19 @@ local mob_punch = function(self, hitter, tflp, tool_capabilities, dir)
tflp = 0.2 tflp = 0.2
end end
if use_cmi then
damage = cmi.calculate_damage(self.object, hitter, tflp, tool_capabilities, dir)
else
for group,_ in pairs( (tool_capabilities.damage_groups or {}) ) do for group,_ in pairs( (tool_capabilities.damage_groups or {}) ) do
tmp = tflp / (tool_capabilities.full_punch_interval or 1.4) tmp = tflp / (tool_capabilities.full_punch_interval or 1.4)
if tmp < 0 then if tmp < 0 then
tmp = 0.0 tmp = 0.0
elseif tmp > 1 then elseif tmp > 1 then
tmp = 1.0 tmp = 1.0
end
damage = damage + (tool_capabilities.damage_groups[group] or 0)
* tmp * ((armor[group] or 0) / 100.0)
end end
damage = damage + (tool_capabilities.damage_groups[group] or 0)
* tmp * ((armor[group] or 0) / 100.0)
end end
if weapon then if weapon then
@ -3186,13 +3171,6 @@ local mob_punch = function(self, hitter, tflp, tool_capabilities, dir)
return return
end end
if use_cmi then
local cancel = cmi.notify_punch(self.object, hitter, tflp, tool_capabilities, dir, damage)
if cancel then return end
end
if tool_capabilities then if tool_capabilities then
punch_interval = tool_capabilities.full_punch_interval or 1.4 punch_interval = tool_capabilities.full_punch_interval or 1.4
end end
@ -3400,10 +3378,6 @@ local mob_staticdata = function(self)
self.following = nil self.following = nil
self.state = "stand" self.state = "stand"
if use_cmi then
self.serialized_cmi_components = cmi.serialize_components(self._cmi_components)
end
local tmp = {} local tmp = {}
for _,stat in pairs(self) do for _,stat in pairs(self) do
@ -3581,11 +3555,6 @@ local mob_activate = function(self, staticdata, def, dtime)
if def.after_activate then if def.after_activate then
def.after_activate(self, staticdata, def, dtime) def.after_activate(self, staticdata, def, dtime)
end end
if use_cmi then
self._cmi_components = cmi.activate_components(self.serialized_cmi_components)
cmi.notify_activate(self.object, dtime)
end
end end
@ -3596,10 +3565,6 @@ local mob_step = function(self, dtime)
mcl_burning.tick(self.object, dtime, self) mcl_burning.tick(self.object, dtime, self)
end end
if use_cmi then
cmi.notify_step(self.object, dtime)
end
local pos = self.object:get_pos() local pos = self.object:get_pos()
local yaw = 0 local yaw = 0