diff --git a/recursive-macro.js b/recursive-macro.js index f8b0fd0..d0672b9 100644 --- a/recursive-macro.js +++ b/recursive-macro.js @@ -57,10 +57,10 @@ var areas = "Planet": 2.5e14, "Star": 3e18, "Solar System": 3e21, - "Galaxy": 2e42, - "Cluster": 2e46, - "Universe": 2e52, - "Multiverse": 2e55, + "Galaxy": 2e45, + "Cluster": 2e49, + "Universe": 7e53, + "Multiverse": 5e56, "Soldier": 1, "Tank": 10, "Artillery": 12, diff --git a/units.js b/units.js index 35b23e7..3201348 100644 --- a/units.js +++ b/units.js @@ -211,9 +211,15 @@ function approxLength(m, singular=false) { } else if (m < 149.6e12) { let length = round(m/149.6e9,1); return length + (singular || length == 1 ? " AU" : " AUs"); - } else { + } else if (m < 9.4607e22) { let length = round(m/9.4607e15,4); return length + (singular || length == 1 ? " light year" : " light years"); + } else if (m < 5e26) { + let length = round(m/9.4607e21,3); + return length + (singular || length == 1 ? " galaxy" : " galaxies"); + } else { + let length = round(m/4.40e26,3); + return length + (singular || length == 1 ? " universe" : " universes"); } }