diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua index 4176336cd8b88b81d3b7a94cda053c872a463263..a86b29eb20be0f49792ab5b29cf2ebe27ea1e952 100644 --- a/game/modules/tome/class/Game.lua +++ b/game/modules/tome/class/Game.lua @@ -1670,7 +1670,10 @@ function _M:setupCommands() print("===============") end end, [{"_g","ctrl"}] = function() if config.settings.cheat then - error("lolzor plopadz kajzdhkhvkervkert 1") + for i = 1, 10000 do + game.log("PLOP") + profile.chat:addMessage("talk", "tome", "test", "test", "test", {"test", colors.GOLD}) + end do return end local o = game.zone:makeEntity(game.level, "object", {random_object=true}, nil, true) if o then diff --git a/game/modules/tome/data/damage_types.lua b/game/modules/tome/data/damage_types.lua index 520fded2888985d8d4d030d36b9e22a609c50519..46e03372fb2c4431a3a3b1c096210307787a5763 100644 --- a/game/modules/tome/data/damage_types.lua +++ b/game/modules/tome/data/damage_types.lua @@ -55,7 +55,7 @@ setDefaultProjector(function(src, x, y, type, dam, state) local crit_power = state.crit_power local add_dam = 0 - if src:attr("all_damage_convert") and src.all_damage_convert ~= type then + if src:attr("all_damage_convert") and src:attr("all_damage_convert_percent") and src.all_damage_convert ~= type then local ndam = dam * src.all_damage_convert_percent / 100 dam = dam - ndam local nt = src.all_damage_convert