Skip to content
Snippets Groups Projects
Commit 3cff8084 authored by dg's avatar dg
Browse files

fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@3820 51575b47-30f0-44d4-a5cc-537603b46e54
parent 36a2e1e3
No related branches found
No related tags found
No related merge requests found
......@@ -100,7 +100,7 @@ function _M:tickLevel(level)
for i = 1, #arr do
e = arr[i]
if e and e.act and e.energy then
if e.actBase then
if e.actBase and e.energyBase then
if e.energyBase < self.energy_to_act then
e.energyBase = e.energyBase + self.energy_per_tick
end
......
......@@ -988,7 +988,7 @@ function _M:getPriceFlags()
if w.combat_def_ranged then price = price + w.combat_def_ranged * 1 end
if w.combat_armor then price = price + w.combat_armor * 1 end
if w.combat_physcrit then price = price + w.combat_physcrit * 1.4 end
if w.combat_critical_power then price = price + w.critical_power * 2 end
if w.combat_critical_power then price = price + w.combat_critical_power * 2 end
if w.combat_atk then price = price + w.combat_atk * 1 end
if w.combat_apr then price = price + w.combat_apr * 0.3 end
if w.combat_dam then price = price + w.combat_dam * 3 end
......@@ -1010,7 +1010,7 @@ function _M:getPriceFlags()
if w.size_category then price = price + w.size_category * 25 end
if w.esp_all then price = price + w.esp_all * 25 end
if w.esp_range then price = price + w.esp_range * 15 end
if w.can_breath then price = price + w.can_breath * 10 end
if w.can_breath then for t, v in pairs(w.can_breath) do price = price + v * 30 end end
--resists
if w.resists then for t, v in pairs(w.resists) do price = price + v * 0.15 end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment