diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua index 3d600e93a81bb1c92c970a0176ab507df35ae1e8..af61c96b815d9b7ab15c090f7c797386d5c205ea 100644 --- a/game/modules/tome/class/Game.lua +++ b/game/modules/tome/class/Game.lua @@ -1115,7 +1115,9 @@ function _M:setupCommands() end end end end, [{"_g","ctrl"}] = function() if config.settings.cheat then - for id, _ in pairs(game.party.__ingredients_def) do game.party:collectIngredient(id, rng.range(1, 3)) end +-- for id, _ in pairs(game.party.__ingredients_def) do game.party:collectIngredient(id, rng.range(1, 3)) end + local m = game.zone:makeEntity(game.level, "actor", {random_elite=true}, nil, true) + game.zone:addEntity(game.level, m, "actor", game.player.x,game.player.y-1) end end, [{"_f","ctrl"}] = function() if config.settings.cheat then self.player.quests["love-melinda"] = nil diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua index 502d0e8b5c9e7d4f58b1270136e42ac8bdb60b3c..586e977e5680d1072cc4085b77e72500e9ec3bf3 100644 --- a/game/modules/tome/class/Object.lua +++ b/game/modules/tome/class/Object.lua @@ -535,7 +535,7 @@ function _M:getTextualDesc(compare_with) compare_fields(combat, compare_with, field, "travel_speed", "%+d%%", "Travel speed: ", 100, false, false, add_table) - compare_fields(combat, compare_with, field, "phase_power", "%+d%%", "Damage Shield penetration (this weapon only): ", 1, false, false, add_table) + compare_fields(combat, compare_with, field, "phasing", "%+d%%", "Damage Shield penetration (this weapon only): ", 1, false, false, add_table) if combat.tg_type and combat.tg_type == "beam" then desc:add({"color","YELLOW"}, ("Shots beam through all targets."), {"color","LAST"}, true) diff --git a/game/modules/tome/data/talents/gifts/gifts.lua b/game/modules/tome/data/talents/gifts/gifts.lua index b7b78e409aaf91962686bf16f04bd1508f72d78a..8bf272c191d5930b347984e728bb38ccaef11eaa 100644 --- a/game/modules/tome/data/talents/gifts/gifts.lua +++ b/game/modules/tome/data/talents/gifts/gifts.lua @@ -93,10 +93,16 @@ load("/data/talents/gifts/storm-drake.lua") function checkMaxSummon(self, silent) local nb = 0 - if not game.party then return end + -- Count party members - for act, def in pairs(game.party.members) do - if act.summoner and act.summoner == self and act.wild_gift_summon then nb = nb + 1 end + if game.party:hasMember(self) then + for act, def in pairs(game.party.members) do + if act.summoner and act.summoner == self and act.wild_gift_summon then nb = nb + 1 end + end + else + for _, act in pairs(game.level.entities) do + if act.summoner and act.summoner == self and act.wild_gift_summon then nb = nb + 1 end + end end local max = math.max(1, math.floor(self:getCun() / 10))