Commit 132b660c3b17085cafa945f8321160f6659ca589

Authored by dg
1 parent 203d5acc

fix


git-svn-id: http://svn.net-core.org/repos/t-engine4@5104 51575b47-30f0-44d4-a5cc-537603b46e54
@@ -1115,7 +1115,9 @@ function _M:setupCommands() @@ -1115,7 +1115,9 @@ function _M:setupCommands()
1115 end end 1115 end end
1116 end end, 1116 end end,
1117 [{"_g","ctrl"}] = function() if config.settings.cheat then 1117 [{"_g","ctrl"}] = function() if config.settings.cheat then
1118 - for id, _ in pairs(game.party.__ingredients_def) do game.party:collectIngredient(id, rng.range(1, 3)) end 1118 +-- for id, _ in pairs(game.party.__ingredients_def) do game.party:collectIngredient(id, rng.range(1, 3)) end
  1119 + local m = game.zone:makeEntity(game.level, "actor", {random_elite=true}, nil, true)
  1120 + game.zone:addEntity(game.level, m, "actor", game.player.x,game.player.y-1)
1119 end end, 1121 end end,
1120 [{"_f","ctrl"}] = function() if config.settings.cheat then 1122 [{"_f","ctrl"}] = function() if config.settings.cheat then
1121 self.player.quests["love-melinda"] = nil 1123 self.player.quests["love-melinda"] = nil
@@ -535,7 +535,7 @@ function _M:getTextualDesc(compare_with) @@ -535,7 +535,7 @@ function _M:getTextualDesc(compare_with)
535 535
536 compare_fields(combat, compare_with, field, "travel_speed", "%+d%%", "Travel speed: ", 100, false, false, add_table) 536 compare_fields(combat, compare_with, field, "travel_speed", "%+d%%", "Travel speed: ", 100, false, false, add_table)
537 537
538 - compare_fields(combat, compare_with, field, "phase_power", "%+d%%", "Damage Shield penetration (this weapon only): ", 1, false, false, add_table) 538 + compare_fields(combat, compare_with, field, "phasing", "%+d%%", "Damage Shield penetration (this weapon only): ", 1, false, false, add_table)
539 539
540 if combat.tg_type and combat.tg_type == "beam" then 540 if combat.tg_type and combat.tg_type == "beam" then
541 desc:add({"color","YELLOW"}, ("Shots beam through all targets."), {"color","LAST"}, true) 541 desc:add({"color","YELLOW"}, ("Shots beam through all targets."), {"color","LAST"}, true)
@@ -93,10 +93,16 @@ load("/data/talents/gifts/storm-drake.lua") @@ -93,10 +93,16 @@ load("/data/talents/gifts/storm-drake.lua")
93 93
94 function checkMaxSummon(self, silent) 94 function checkMaxSummon(self, silent)
95 local nb = 0 95 local nb = 0
96 - if not game.party then return end 96 +
97 -- Count party members 97 -- Count party members
98 - for act, def in pairs(game.party.members) do  
99 - if act.summoner and act.summoner == self and act.wild_gift_summon then nb = nb + 1 end 98 + if game.party:hasMember(self) then
  99 + for act, def in pairs(game.party.members) do
  100 + if act.summoner and act.summoner == self and act.wild_gift_summon then nb = nb + 1 end
  101 + end
  102 + else
  103 + for _, act in pairs(game.level.entities) do
  104 + if act.summoner and act.summoner == self and act.wild_gift_summon then nb = nb + 1 end
  105 + end
100 end 106 end
101 107
102 local max = math.max(1, math.floor(self:getCun() / 10)) 108 local max = math.max(1, math.floor(self:getCun() / 10))