Tweak rounding functions

obsidian-level-maker · Sep 26, 2024 · 5bb26d7 · 5bb26d7
1 parent 07cde30
commit 5bb26d7
Show file tree

Hide file tree

Showing 31 changed files with 221 additions and 233 deletions.
diff --git a/games/doom/factory.lua b/games/doom/factory.lua
@@ -9577,8 +9577,8 @@ function DOOM.factory_setup()
         error("Prefab not a multiple of four: " .. tostring(P.name))
       end
 
-      P.long = int(f_long / 4)
-      P.deep = int(f_deep / 4)
+      P.long = math.round(f_long / 4)
+      P.deep = math.round(f_deep / 4)
     else
       error("Unsupported scale " .. tostring(P.scale) .. " in prefab: " .. tostring(P.name))
     end

diff --git a/games/doom/x_doom1.lua b/games/doom/x_doom1.lua
@@ -10595,8 +10595,8 @@ function ULTDOOM.factory_setup()
         error("Prefab not a multiple of four: " .. tostring(P.name))
       end
 
-      P.long = int(f_long / 4)
-      P.deep = int(f_deep / 4)
+      P.long = math.round(f_long / 4)
+      P.deep = math.round(f_deep / 4)
     else
       error("Unsupported scale " .. tostring(P.scale) .. " in prefab: " .. tostring(P.name))
     end

diff --git a/games/heretic/factory.lua b/games/heretic/factory.lua
@@ -6004,8 +6004,8 @@ function HERETIC.factory_setup()
         error("Prefab not a multiple of four: " .. tostring(P.name))
       end
 
-      P.long = int(f_long / 4)
-      P.deep = int(f_deep / 4)
+      P.long = math.round(f_long / 4)
+      P.deep = math.round(f_deep / 4)
     else
       error("Unsupported scale " .. tostring(P.scale) .. " in prefab: " .. tostring(P.name))
     end

diff --git a/games/noah/factory.lua b/games/noah/factory.lua
@@ -5171,7 +5171,7 @@ function NOAH.get_factory_levels(episode)
         end
       end
 
-      ob_size = math.clamp(low, int(rand.irange(low, high) * result_skew), high)
+      ob_size = math.clamp(low, math.round(rand.irange(low, high) * result_skew), high)
       goto foundsize
     end
 
@@ -5209,7 +5209,7 @@ function NOAH.get_factory_levels(episode)
       local def_large = PARAM.float_level_upper_bound_wolf_3d - def_small or 42
 
       -- this basically ramps up
-      ob_size = int(def_small + along * def_large)
+      ob_size = math.round(def_small + along * def_large)
     end
 
     ::foundsize::
@@ -5364,8 +5364,8 @@ function NOAH.factory_setup()
         error("Prefab not a multiple of four: " .. tostring(P.name))
       end
 
-      P.long = int(f_long / 4)
-      P.deep = int(f_deep / 4)
+      P.long = math.round(f_long / 4)
+      P.deep = math.round(f_deep / 4)
     else
       error("Unsupported scale " .. tostring(P.scale) .. " in prefab: " .. tostring(P.name))
     end

diff --git a/games/obc/factory.lua b/games/obc/factory.lua
@@ -5128,7 +5128,7 @@ function OBC.get_factory_levels(episode)
         end
       end
 
-      ob_size = math.clamp(low, int(rand.irange(low, high) * result_skew), high)
+      ob_size = math.clamp(low, math.round(rand.irange(low, high) * result_skew), high)
       goto foundsize
     end
 
@@ -5166,7 +5166,7 @@ function OBC.get_factory_levels(episode)
       local def_large = PARAM.float_level_upper_bound_wolf_3d - def_small or 42
 
       -- this basically ramps up
-      ob_size = int(def_small + along * def_large)
+      ob_size = math.round(def_small + along * def_large)
     end
 
     ::foundsize::
@@ -5321,8 +5321,8 @@ function OBC.factory_setup()
         error("Prefab not a multiple of four: " .. tostring(P.name))
       end
 
-      P.long = int(f_long / 4)
-      P.deep = int(f_deep / 4)
+      P.long = math.round(f_long / 4)
+      P.deep = math.round(f_deep / 4)
     else
       error("Unsupported scale " .. tostring(P.scale) .. " in prefab: " .. tostring(P.name))
     end

diff --git a/games/wolf/factory.lua b/games/wolf/factory.lua
@@ -5580,7 +5580,7 @@ function WOLF.get_factory_levels(episode)
         end
       end
 
-      ob_size = math.clamp(low, int(rand.irange(low, high) * result_skew), high)
+      ob_size = math.clamp(low, math.round(rand.irange(low, high) * result_skew), high)
       goto foundsize
     end
 
@@ -5618,7 +5618,7 @@ function WOLF.get_factory_levels(episode)
       local def_large = PARAM.float_level_upper_bound_wolf_3d - def_small or 42
 
       -- this basically ramps up
-      ob_size = int(def_small + along * def_large)
+      ob_size = math.round(def_small + along * def_large)
     end
 
     ::foundsize::
@@ -5773,8 +5773,8 @@ function WOLF.factory_setup()
         error("Prefab not a multiple of four: " .. tostring(P.name))
       end
 
-      P.long = int(f_long / 4)
-      P.deep = int(f_deep / 4)
+      P.long = math.round(f_long / 4)
+      P.deep = math.round(f_deep / 4)
     else
       error("Unsupported scale " .. tostring(P.scale) .. " in prefab: " .. tostring(P.name))
     end

diff --git a/games/wolf/x_spear.lua b/games/wolf/x_spear.lua
@@ -306,7 +306,7 @@ function SPEAR.get_factory_levels(episode)
         end
       end
 
-      ob_size = math.clamp(low, int(rand.irange(low, high) * result_skew), high)
+      ob_size = math.clamp(low, math.round(rand.irange(low, high) * result_skew), high)
       goto foundsize
     end
 
@@ -344,7 +344,7 @@ function SPEAR.get_factory_levels(episode)
       local def_large = PARAM.float_level_upper_bound_wolf_3d - def_small or 42
 
       -- this basically ramps up
-      ob_size = int(def_small + along * def_large)
+      ob_size = math.round(def_small + along * def_large)
     end
 
     ::foundsize::

diff --git a/modules/export_map.lua b/modules/export_map.lua
@@ -136,7 +136,7 @@ function EXPORT_MAP.add_entity(ent, model)
   end
 
   if origin then
-    export_printf("\"origin\" \"%d %d %d\"\n", int(origin.x) or 0, int(origin.y) or 0, int(origin.z) or 0)
+    export_printf("\"origin\" \"%d %d %d\"\n", math.round(origin.x) or 0, math.round(origin.y) or 0, math.round(origin.z) or 0)
   end
 
   if light then

diff --git a/modules/modded_game_extras.lua b/modules/modded_game_extras.lua
@@ -1680,7 +1680,7 @@ function MODDED_GAME_EXTRAS.create_hn_info(self, LEVEL)
     end
 
     if R.lev_along and not R.is_start and #LEVEL.rooms > 2 then
-      goal_string = goal_string .. " (" .. int(R.lev_along * 100) .. "%%)"
+      goal_string = goal_string .. " (" .. math.round(R.lev_along * 100) .. "%%)"
     end      
 
     return goal_string
@@ -2028,7 +2028,7 @@ function MODDED_GAME_EXTRAS.generate_hn_decorate()
     local thing_chunk = MODDED_GAME_EXTRAS.HELLSCAPE_NAVIGATOR_TEMPLATE.COPIES
     thing_chunk = string.gsub(thing_chunk, "NUMNUMNUM", editor_num)
     thing_chunk = string.gsub(thing_chunk, "NAMENAMENAME", name)
-    thing_chunk = string.gsub(thing_chunk, "SIZESIZESIZE", int(radius))
+    thing_chunk = string.gsub(thing_chunk, "SIZESIZESIZE", math.round(radius))
 
     decorate_string = decorate_string .. thing_chunk
   end

diff --git a/modules/procedural_gotcha_zdoom.lua b/modules/procedural_gotcha_zdoom.lua
@@ -1429,7 +1429,7 @@ function PROCEDURAL_GOTCHA_FINE_TUNE_ZDOOM.grab_random_trait(btype, etraits)
         if einfo == info.name then
           stack = stack + 1
         if PARAM.boss_gen_tmult < 0 then
-          tprob = int(tprob * 0.25)
+          tprob = math.round(tprob * 0.25)
         elseif PARAM.boss_gen_tmult > 1 then
           tprob = tprob * 2
         end
@@ -1632,15 +1632,15 @@ function PROCEDURAL_GOTCHA_FINE_TUNE_ZDOOM.all_done()
       else mult=1.0 end
     end
 
-    hpcalc = int(rand.pick({5000,5200,5400,5600,5800,6000})*mult*PARAM.float_boss_gen_mult)
+    hpcalc = math.round(rand.pick({5000,5200,5400,5600,5800,6000})*mult*PARAM.float_boss_gen_mult)
 
     if batk == "hitscan" and PARAM.boss_gen_dmult<3.0 then hpcalc = hpcalc*0.75 end
 
     bhealth = PROCEDURAL_GOTCHA_FINE_TUNE_ZDOOM.syntaxize(bhealth,hpcalc)
 
     local sumcalc
 
-    sumcalc = int(rand.pick({400,450,500,550,600})*PARAM.boss_gen_rmult)
+    sumcalc = math.round(rand.pick({400,450,500,550,600})*PARAM.boss_gen_rmult)
     bsummon = PROCEDURAL_GOTCHA_FINE_TUNE_ZDOOM.syntaxize(bsummon,sumcalc)
 
   end

diff --git a/modules/zdoom_otex.lua b/modules/zdoom_otex.lua
@@ -795,12 +795,12 @@ function OTEX_PROC_MODULE.synthesize_procedural_themes()
   end
   local scenic_fence_tab = table.copy(OTEX_SPECIAL_RESOURCES.rail_scenic_fences)
   for fence,prob in pairs(scenic_fence_tab.tech) do
-    GAME.THEMES.tech.scenic_fences[fence] = int(prob * 0.75)
-    GAME.THEMES.urban.scenic_fences[fence] = int(prob * 0.75)
+    GAME.THEMES.tech.scenic_fences[fence] = math.round(prob * 0.75)
+    GAME.THEMES.urban.scenic_fences[fence] = math.round(prob * 0.75)
   end
   for fence,prob in pairs(scenic_fence_tab.gothic) do
-    GAME.THEMES.hell.scenic_fences[fence] = int(prob * 0.75)
-    GAME.THEMES.urban.scenic_fences[fence] = int(prob * 0.75)
+    GAME.THEMES.hell.scenic_fences[fence] = math.round(prob * 0.75)
+    GAME.THEMES.urban.scenic_fences[fence] = math.round(prob * 0.75)
   end
 
   -- create liquid attachments