fix 2+ ante scaling breaking on e308 limit

Author: lord-ruby

big-num/bignumber.lua

@@ -370,7 +370,7 @@ R.MAX_DISP_INTEGER=1000000
 R.NaN=0/0
 R.NEGATIVE_INFINITY = -1/0
 R.POSITIVE_INFINITY = 1/0
-R.E_MAX_SAFE_INTEGER="e"..tostring(R.MAX_SAFE_INTEGER)
+R and R.E_MAX_SAFE_INTEGER or 9e15="e"..tostring(R.MAX_SAFE_INTEGER)
 R.EE_MAX_SAFE_INTEGER="ee"..tostring(R.MAX_SAFE_INTEGER)
 R.TETRATED_MAX_SAFE_INTEGER="10^^"..tostring(R.MAX_SAFE_INTEGER)
 

big-num/omeganum.lua

@@ -38,7 +38,7 @@ R.MAX_DISP_INTEGER=1000000
 R.NaN=0/0
 R.NEGATIVE_INFINITY = -1/0
 R.POSITIVE_INFINITY = 1/0
-R.E_MAX_SAFE_INTEGER="e"..tostring(R.MAX_SAFE_INTEGER)
+R and R.E_MAX_SAFE_INTEGER or 9e15="e"..tostring(R.MAX_SAFE_INTEGER)
 R.EE_MAX_SAFE_INTEGER="ee"..tostring(R.MAX_SAFE_INTEGER)
 R.TETRATED_MAX_SAFE_INTEGER="10^^"..tostring(R.MAX_SAFE_INTEGER)
 
@@ -613,15 +613,15 @@ function Big:add(other)
     local p=x:min(other);
     local q=x:max(other);
     local t = -1;
-    if (p.array[2] == 2) and not p:gt(R.E_MAX_SAFE_INTEGER) then
+    if (p.array[2] == 2) and not p:gt(R and R.E_MAX_SAFE_INTEGER or 9e15) then
         p.array[2] = 1
         p.array[1] = 10 ^ p.array[1]
     end
-    if (q.array[2] == 2) and not q:gt(R.E_MAX_SAFE_INTEGER) then
+    if (q.array[2] == 2) and not q:gt(R and R.E_MAX_SAFE_INTEGER or 9e15) then
         q.array[2] = 1
         q.array[1] = 10 ^ q.array[1]
     end
-    if (q:gt(R.E_MAX_SAFE_INTEGER) or q:div(p):gt(R.MAX_SAFE_INTEGER)) then
+    if (q:gt(R and R.E_MAX_SAFE_INTEGER or 9e15) or q:div(p):gt(R.MAX_SAFE_INTEGER)) then
         t = q;
     elseif (q.array[2] == nil) or (q.array[2] == 0) then
         t= Big:create(x:to_number()+other:to_number());
@@ -667,15 +667,15 @@ function Big:sub(other)
     local q = x:max(other);
     local n = other:gt(x);
     local t = -1;
-    if (p.array[2] == 2) and not p:gt(R.E_MAX_SAFE_INTEGER) then
+    if (p.array[2] == 2) and not p:gt(R and R.E_MAX_SAFE_INTEGER or 9e15) then
         p.array[2] = 1
         p.array[1] = 10 ^ p.array[1]
     end
-    if (q.array[2] == 2) and not q:gt(R.E_MAX_SAFE_INTEGER) then
+    if (q.array[2] == 2) and not q:gt(R and R.E_MAX_SAFE_INTEGER or 9e15) then
         q.array[2] = 1
         q.array[1] = 10 ^ q.array[1]
     end
-    if (q:gt(R.E_MAX_SAFE_INTEGER) or q:div(p):gt(R.MAX_SAFE_INTEGER)) then
+    if (q:gt(R and R.E_MAX_SAFE_INTEGER or 9e15) or q:div(p):gt(R.MAX_SAFE_INTEGER)) then
         t = q;
         if n then
             t = t:neg()
@@ -1057,7 +1057,7 @@ function Big:tetrate(other)
     local r = t:pow(y-f)
     local l = Big:create(R.NaN)
     local i = 0
-    local m = Big:create(R.E_MAX_SAFE_INTEGER)
+    local m = Big:create(R and R.E_MAX_SAFE_INTEGER or 9e15)
     while ((f ~= 0) and r:lt(m) and (i < 100)) do
         if (f > 0) then
             r = t:pow(r)
@@ -1188,7 +1188,7 @@ function Big:lambertw()
         x.array[1] = x.array[1] - 1
         return x;
     end
-    if (x:gt(R.E_MAX_SAFE_INTEGER)) then
+    if (x:gt(R and R.E_MAX_SAFE_INTEGER or 9e15)) then
         return Big:d_lambertw(x)
     else
         return Big:create(Big:f_lambertw(x.sign*x.array[1]))

talisman.lua

@@ -240,20 +240,20 @@ function lenient_bignum(x)
       if ante < 1 then return to_big(100) end
       if ante <= 8 then 
         local amount = amounts[ante]
-        if (amount:lt(R.E_MAX_SAFE_INTEGER)) then
-          local exponent = to_big(10)^(math.floor(amount:log10() - to_big(1))):to_number()
-          amount = math.floor(amount / exponent):to_number() * exponent
+        if to_big(amount) < to_big(R and R.E_MAX_SAFE_INTEGER or 9e15) then
+          local exponent = to_big(10)^to_number(math.floor(math.log(amount, 10) - to_big(1)))
+          amount = to_number(math.floor(amount / exponent)) * exponent
         end
-        amount:normalize()
+        if type(amount) == "table" then amount:normalize() end
         return amount
        end
       local a, b, c, d = amounts[8], amounts[8]/amounts[7], ante-8, 1 + 0.2*(ante-8)
       local amount = math.floor(a*(b + (b*k*c)^d)^c)
-      if (amount:lt(R.E_MAX_SAFE_INTEGER)) then
-        local exponent = to_big(10)^(math.floor(amount:log10() - to_big(1))):to_number()
-        amount = math.floor(amount / exponent):to_number() * exponent
+      if to_big(amount) < to_big(R and R.E_MAX_SAFE_INTEGER or 9e15) then
+        local exponent = to_big(10)^to_number(math.floor(math.log(amount, 10) - to_big(1)))
+        amount = to_number(math.floor(amount / exponent)) * exponent
       end
-      amount:normalize()
+      if type(amount) == "table" then amount:normalize() end
       return amount
     end
   end
@@ -272,11 +272,11 @@ function lenient_bignum(x)
         if ante <= 8 then return amounts[ante] end
         local a, b, c, d = amounts[8],1.6,ante-8, 1 + 0.2*(ante-8)
         local amount = a*(b+(k*c)^d)^c
-        if (amount:lt(R.E_MAX_SAFE_INTEGER)) then
-          local exponent = to_big(10)^(math.floor(amount:log10() - to_big(1))):to_number()
-          amount = math.floor(amount / exponent):to_number() * exponent
+        if to_big(amount) < to_big(R and R.E_MAX_SAFE_INTEGER or 9e15) then
+          local exponent = to_big(10)^to_number(math.floor(math.log(amount, 10) - to_big(1)))
+          amount = to_number(math.floor(amount / exponent)) * exponent
         end
-        amount:normalize()
+        if type(amount) == "table" then amount:normalize() end
         return amount
       elseif G.GAME.modifiers.scaling == 2 then 
         local amounts = {
@@ -287,11 +287,11 @@ function lenient_bignum(x)
         if ante <= 8 then return amounts[ante] end
         local a, b, c, d = amounts[8],1.6,ante-8, 1 + 0.2*(ante-8)
         local amount = a*(b+(k*c)^d)^c
-        if (amount:lt(R.E_MAX_SAFE_INTEGER)) then
-          local exponent = to_big(10)^(math.floor(amount:log10() - to_big(1))):to_number()
-          amount = math.floor(amount / exponent):to_number() * exponent
+        if to_big(amount) < to_big(R and R.E_MAX_SAFE_INTEGER or 9e15) then
+          local exponent = to_big(10)^to_number(math.floor(math.log(amount, 10) - to_big(1)))
+          amount = to_number(math.floor(amount / exponent)) * exponent
         end
-        amount:normalize()
+        if type(amount) == "table" then amount:normalize() end
         return amount
       elseif G.GAME.modifiers.scaling == 3 then 
         local amounts = {
@@ -302,11 +302,11 @@ function lenient_bignum(x)
         if ante <= 8 then return amounts[ante] end
         local a, b, c, d = amounts[8],1.6,ante-8, 1 + 0.2*(ante-8)
         local amount = a*(b+(k*c)^d)^c
-        if (amount:lt(R.E_MAX_SAFE_INTEGER)) then
-          local exponent = to_big(10)^(math.floor(amount:log10() - to_big(1))):to_number()
-          amount = math.floor(amount / exponent):to_number() * exponent
+        if to_big(amount) < to_big(R and R.E_MAX_SAFE_INTEGER or 9e15) then
+          local exponent = to_big(10)^to_number(math.floor(math.log(amount, 10) - to_big(1)))
+          amount = to_number(math.floor(amount / exponent)) * exponent
         end
-        amount:normalize()
+        if type(amount) == "table" then amount:normalize() end
         return amount
       end
     end