Commit 407ffb838640d013bae6be8df7ba006237d9a327

Authored by DarkGod
1 parent 425a88e3

fixed ogre fury

@@ -946,9 +946,9 @@ function _M:removeTemporaryValue(prop, id, noupdate) @@ -946,9 +946,9 @@ function _M:removeTemporaryValue(prop, id, noupdate)
946 else 946 else
947 if config.settings.cheat then 947 if config.settings.cheat then
948 if type(v) == "nil" then 948 if type(v) == "nil" then
949 - error("ERROR!!! unsupported temporary value type: "..type(v).." :=: "..tostring(v)) 949 + error("ERROR!!! unsupported temporary value type: "..type(v).." :=: "..tostring(v).." for "..tostring(prop))
950 else 950 else
951 - error("unsupported temporary value type: "..type(v).." :=: "..tostring(v)) 951 + error("unsupported temporary value type: "..type(v).." :=: "..tostring(v).." for "..tostring(prop))
952 end 952 end
953 end 953 end
954 end 954 end
@@ -3364,8 +3364,8 @@ newEffect{ @@ -3364,8 +3364,8 @@ newEffect{
3364 parameters = { stacks=1, max_stacks=5 }, 3364 parameters = { stacks=1, max_stacks=5 },
3365 charges = function(self, eff) return eff.stacks end, 3365 charges = function(self, eff) return eff.stacks end,
3366 do_effect = function(self, eff, add) 3366 do_effect = function(self, eff, add)
3367 - if eff.cdam then self:removeTemporaryValue("combat_critical_power", eff.cdam) end  
3368 - if eff.crit then self:removeTemporaryValue("combat_generic_crit", eff.crit) end 3367 + if eff.cdam then self:removeTemporaryValue("combat_critical_power", eff.cdam) eff.cdam = nil end
  3368 + if eff.crit then self:removeTemporaryValue("combat_generic_crit", eff.crit) eff.crit = nil end
3369 if add then 3369 if add then
3370 eff.cdam = self:addTemporaryValue("combat_critical_power", eff.stacks * 20) 3370 eff.cdam = self:addTemporaryValue("combat_critical_power", eff.stacks * 20)
3371 eff.crit = self:addTemporaryValue("combat_generic_crit", eff.stacks * 5) 3371 eff.crit = self:addTemporaryValue("combat_generic_crit", eff.stacks * 5)
@@ -3396,7 +3396,7 @@ newEffect{ @@ -3396,7 +3396,7 @@ newEffect{
3396 if eff.stacks > 1 and eff.dur <= 1 then 3396 if eff.stacks > 1 and eff.dur <= 1 then
3397 eff.stacks = eff.stacks - 1 3397 eff.stacks = eff.stacks - 1
3398 eff.dur = 7 3398 eff.dur = 7
3399 - e.do_effect(self, eff, false) 3399 + e.do_effect(self, eff, true)
3400 end 3400 end
3401 end 3401 end
3402 } 3402 }
@@ -6,7 +6,7 @@ if test -n "$2"; then @@ -6,7 +6,7 @@ if test -n "$2"; then
6 fi 6 fi
7 7
8 rm $name.ogv $name.avi 8 rm $name.ogv $name.avi
9 -recordmydesktop --windowid $1 --fps 50 --full-shots --device pulse -o $name.ogv 9 +recordmydesktop --windowid $1 --fps 30 --full-shots --device pulse -o $name.ogv
10 avconv -i $name.ogv -qscale 1 $name.avi 10 avconv -i $name.ogv -qscale 1 $name.avi
11 11
12 # mencoder $name.ogv -ovc xvid -oac mp3lame -xvidencopts pass=1 -o $name.avi 12 # mencoder $name.ogv -ovc xvid -oac mp3lame -xvidencopts pass=1 -o $name.avi