mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-11-25 03:51:05 +01:00
Fix incorrect usages of math.random (#4621)
random() does not support float arguments Reviewed-on: https://git.minetest.land/VoxeLibre/VoxeLibre/pulls/4621 Reviewed-by: Mikita Wiśniewski <rudzik8@protonmail.com> Co-authored-by: kno10 <erich.schubert@gmail.com> Co-committed-by: kno10 <erich.schubert@gmail.com>
This commit is contained in:
parent
593a095a5f
commit
ebee85db7e
9 changed files with 26 additions and 27 deletions
|
@ -362,7 +362,7 @@ function mob_class:env_danger_movement_checks(player_in_active_range)
|
||||||
self.state = "stand"
|
self.state = "stand"
|
||||||
self:set_animation( "stand")
|
self:set_animation( "stand")
|
||||||
end
|
end
|
||||||
yaw = yaw + math.random(-0.5, 0.5)
|
yaw = yaw + math.random() - 0.5
|
||||||
yaw = self:set_yaw( yaw, 8)
|
yaw = self:set_yaw( yaw, 8)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
@ -788,9 +788,9 @@ function mob_class:flop()
|
||||||
if self.object:get_velocity().y < 0.1 then
|
if self.object:get_velocity().y < 0.1 then
|
||||||
self:mob_sound("flop")
|
self:mob_sound("flop")
|
||||||
self.object:set_velocity({
|
self.object:set_velocity({
|
||||||
x = math.random(-FLOP_HOR_SPEED, FLOP_HOR_SPEED),
|
x = (math.random()-0.5) * 2 * FLOP_HOR_SPEED,
|
||||||
y = FLOP_HEIGHT,
|
y = FLOP_HEIGHT,
|
||||||
z = math.random(-FLOP_HOR_SPEED, FLOP_HOR_SPEED),
|
z = (math.random()-0.5) * 2 * FLOP_HOR_SPEED,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -920,7 +920,7 @@ function mob_class:do_states_walk()
|
||||||
|
|
||||||
-- Randomly turn
|
-- Randomly turn
|
||||||
if math.random(1, 100) <= 30 then
|
if math.random(1, 100) <= 30 then
|
||||||
yaw = yaw + math.random(-0.5, 0.5)
|
yaw = yaw + math.random() - 0.5
|
||||||
yaw = self:set_yaw( yaw, 8)
|
yaw = self:set_yaw( yaw, 8)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -929,7 +929,7 @@ function mob_class:do_states_walk()
|
||||||
|
|
||||||
-- otherwise randomly turn
|
-- otherwise randomly turn
|
||||||
elseif math.random(1, 100) <= 30 then
|
elseif math.random(1, 100) <= 30 then
|
||||||
yaw = yaw + math.random(-0.5, 0.5)
|
yaw = yaw + math.random() - 0.5
|
||||||
yaw = self:set_yaw( yaw, 8)
|
yaw = self:set_yaw( yaw, 8)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -989,7 +989,7 @@ function mob_class:do_states_stand(player_in_active_range)
|
||||||
|
|
||||||
if lp.x > s.x then yaw = yaw +math.pi end
|
if lp.x > s.x then yaw = yaw +math.pi end
|
||||||
else
|
else
|
||||||
yaw = yaw + math.random(-0.5, 0.5)
|
yaw = yaw + math.random() - 0.5
|
||||||
end
|
end
|
||||||
|
|
||||||
yaw = self:set_yaw( yaw, 8)
|
yaw = self:set_yaw( yaw, 8)
|
||||||
|
|
|
@ -95,8 +95,8 @@ mcl_mobs.register_mob("mobs_mc:blaze", {
|
||||||
end
|
end
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
minetest.add_particle({
|
minetest.add_particle({
|
||||||
pos = {x=pos.x+math.random(-0.7,0.7)*math.random()/2,y=pos.y+math.random(0.7,1.2),z=pos.z+math.random(-0.7,0.7)*math.random()/2},
|
pos = {x=pos.x+(math.random()*0.7-0.35)*math.random(),y=pos.y+0.7+math.random()*0.5,z=pos.z+(math.random()*0.7-0.35)*math.random()},
|
||||||
velocity = {x=0, y=math.random(1,1), z=0},
|
velocity = {x=0, y=1, z=0},
|
||||||
expirationtime = math.random(),
|
expirationtime = math.random(),
|
||||||
size = math.random(1, 4),
|
size = math.random(1, 4),
|
||||||
collisiondetection = true,
|
collisiondetection = true,
|
||||||
|
@ -110,8 +110,8 @@ mcl_mobs.register_mob("mobs_mc:blaze", {
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
minetest.add_particle({
|
minetest.add_particle({
|
||||||
pos = {x=pos.x+math.random(-0.7,0.7)*math.random()/2,y=pos.y+math.random(0.7,1.2),z=pos.z+math.random(-0.7,0.7)*math.random()/2},
|
pos = {x=pos.x+(math.random()*0.7-0.35)*math.random(),y=pos.y+0.7+math.random()*0.5,z=pos.z+(math.random()*0.7-0.35)*math.random()},
|
||||||
velocity = {x=0, y=math.random(1,1), z=0},
|
velocity = {x=0, y=1, z=0},
|
||||||
expirationtime = math.random(),
|
expirationtime = math.random(),
|
||||||
size = math.random(1, 4),
|
size = math.random(1, 4),
|
||||||
collisiondetection = true,
|
collisiondetection = true,
|
||||||
|
@ -125,8 +125,8 @@ mcl_mobs.register_mob("mobs_mc:blaze", {
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
minetest.add_particle({
|
minetest.add_particle({
|
||||||
pos = {x=pos.x+math.random(-0.7,0.7)*math.random()/2,y=pos.y+math.random(0.7,1.2),z=pos.z+math.random(-0.7,0.7)*math.random()/2},
|
pos = {x=pos.x+(math.random()*0.7-0.35)*math.random(),y=pos.y+0.7+math.random()*0.5,z=pos.z+(math.random()*0.7-0.35)*math.random()},
|
||||||
velocity = {x=0, y=math.random(1,1), z=0},
|
velocity = {x=0, y=1, z=0},
|
||||||
expirationtime = math.random(),
|
expirationtime = math.random(),
|
||||||
size = math.random(1, 4),
|
size = math.random(1, 4),
|
||||||
collisiondetection = true,
|
collisiondetection = true,
|
||||||
|
|
|
@ -84,7 +84,7 @@ local cod = {
|
||||||
self.object:set_bone_position("body", vector.new(0,1,0), vector.new(degrees(dir_to_pitch(self.object:get_velocity())) * -1 + 90,0,0))
|
self.object:set_bone_position("body", vector.new(0,1,0), vector.new(degrees(dir_to_pitch(self.object:get_velocity())) * -1 + 90,0,0))
|
||||||
if minetest.get_item_group(self.standing_in, "water") ~= 0 then
|
if minetest.get_item_group(self.standing_in, "water") ~= 0 then
|
||||||
if self.object:get_velocity().y < 5 then
|
if self.object:get_velocity().y < 5 then
|
||||||
self.object:add_velocity({ x = 0 , y = math.random(-.007, .007), z = 0 })
|
self.object:add_velocity({ x = 0 , y = math.random()*.014-.007, z = 0 })
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
--]]
|
--]]
|
||||||
|
|
|
@ -81,16 +81,16 @@ local dolphin = {
|
||||||
reach = 2,
|
reach = 2,
|
||||||
damage = 2.5,
|
damage = 2.5,
|
||||||
attack_type = "dogfight",
|
attack_type = "dogfight",
|
||||||
|
--[[ this is supposed to make them jump out the water but doesn't appear to work very well
|
||||||
do_custom = function(self,dtime)
|
do_custom = function(self,dtime)
|
||||||
--[[ this is supposed to make them jump out the water but doesn't appear to work very well
|
|
||||||
self.object:set_bone_position("body", vector.new(0,1,0), vector.new(degrees(dir_to_pitch(self.object:get_velocity())) * -1 + 90,0,0))
|
self.object:set_bone_position("body", vector.new(0,1,0), vector.new(degrees(dir_to_pitch(self.object:get_velocity())) * -1 + 90,0,0))
|
||||||
if minetest.get_item_group(self.standing_in, "water") ~= 0 then
|
if minetest.get_item_group(self.standing_in, "water") ~= 0 then
|
||||||
if self.object:get_velocity().y < 5 then
|
if self.object:get_velocity().y < 5 then
|
||||||
self.object:add_velocity({ x = 0 , y = math.random(-.007, .007), z = 0 })
|
self.object:add_velocity({ x = 0 , y = math.random()*.014-.007, z = 0 })
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
--]]
|
|
||||||
end,
|
end,
|
||||||
|
--]]
|
||||||
}
|
}
|
||||||
|
|
||||||
mcl_mobs.register_mob("mobs_mc:dolphin", dolphin)
|
mcl_mobs.register_mob("mobs_mc:dolphin", dolphin)
|
||||||
|
|
|
@ -122,7 +122,7 @@ local spawn_children_on_die = function(child_mob, spawn_distance, eject_speed)
|
||||||
end
|
end
|
||||||
local mndef = minetest.registered_nodes[minetest.get_node(pos).name]
|
local mndef = minetest.registered_nodes[minetest.get_node(pos).name]
|
||||||
local mother_stuck = mndef and mndef.walkable
|
local mother_stuck = mndef and mndef.walkable
|
||||||
local angle = math.random(0, math.pi*2)
|
local angle = math.random() * math.pi * 2
|
||||||
local children = {}
|
local children = {}
|
||||||
local spawn_count = math.random(2, 4)
|
local spawn_count = math.random(2, 4)
|
||||||
for i = 1, spawn_count do
|
for i = 1, spawn_count do
|
||||||
|
|
|
@ -177,7 +177,7 @@ function lightning.strike_func(pos, pos2, objects)
|
||||||
add_entity(pos2, "mobs_mc:skeleton_horse")
|
add_entity(pos2, "mobs_mc:skeleton_horse")
|
||||||
|
|
||||||
local angle, posadd
|
local angle, posadd
|
||||||
angle = math.random(0, math.pi*2)
|
angle = math.random() * math.pi * 2
|
||||||
for i=1,3 do
|
for i=1,3 do
|
||||||
posadd = { x=math.cos(angle),y=0,z=math.sin(angle) }
|
posadd = { x=math.cos(angle),y=0,z=math.sin(angle) }
|
||||||
posadd = vector.normalize(posadd)
|
posadd = vector.normalize(posadd)
|
||||||
|
|
|
@ -30,7 +30,7 @@ minetest.register_abm({
|
||||||
local cherry_particle = {
|
local cherry_particle = {
|
||||||
velocity = vector.zero(),
|
velocity = vector.zero(),
|
||||||
acceleration = vector.new(0,-1,0),
|
acceleration = vector.new(0,-1,0),
|
||||||
size = math.random(1.3,2.5),
|
size = 1.3 + math.random() * 1.2,
|
||||||
texture = "mcl_cherry_blossom_particle_" .. math.random(1, 12) .. ".png",
|
texture = "mcl_cherry_blossom_particle_" .. math.random(1, 12) .. ".png",
|
||||||
animation = {
|
animation = {
|
||||||
type = "vertical_frames",
|
type = "vertical_frames",
|
||||||
|
@ -45,8 +45,8 @@ local cherry_particle = {
|
||||||
local wind_direction -- vector
|
local wind_direction -- vector
|
||||||
local time_changed -- 0 - afternoon; 1 - evening; 2 - morning
|
local time_changed -- 0 - afternoon; 1 - evening; 2 - morning
|
||||||
local function change_wind_direction()
|
local function change_wind_direction()
|
||||||
local east_west = math.random(-0.5,0.5)
|
local east_west = math.random() - 0.5
|
||||||
local north_south = math.random(-0.5,0.5)
|
local north_south = math.random() - 0.5
|
||||||
wind_direction = vector.new(east_west, 0, north_south)
|
wind_direction = vector.new(east_west, 0, north_south)
|
||||||
end
|
end
|
||||||
change_wind_direction()
|
change_wind_direction()
|
||||||
|
@ -57,10 +57,10 @@ minetest.register_abm({
|
||||||
interval = 5,
|
interval = 5,
|
||||||
chance = 10,
|
chance = 10,
|
||||||
action = function(pos, node)
|
action = function(pos, node)
|
||||||
minetest.after(math.random(0.1,1.5),function()
|
minetest.after(0.1 + math.random() * 1.4,function()
|
||||||
local pt = table.copy(cherry_particle)
|
local pt = table.copy(cherry_particle)
|
||||||
pt.pos = vector.offset(pos,math.random(-0.5,0.5),-0.51,math.random(-0.5,0.5))
|
pt.pos = vector.offset(pos,math.random()-0.5,-0.51,math.random()-0.5)
|
||||||
pt.expirationtime = math.random(1.2,4.5)
|
pt.expirationtime = 1.2 + math.random() * 3.3
|
||||||
pt.texture = "mcl_cherry_blossom_particle_" .. math.random(1, 12) .. ".png"
|
pt.texture = "mcl_cherry_blossom_particle_" .. math.random(1, 12) .. ".png"
|
||||||
local time = minetest.get_timeofday()
|
local time = minetest.get_timeofday()
|
||||||
if time_changed ~= 0 and time > 0.6 and time < 0.605 then
|
if time_changed ~= 0 and time > 0.6 and time < 0.605 then
|
||||||
|
|
|
@ -259,8 +259,7 @@ local function spawn_mobs(pos, elapsed)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Spawn attempt done. Next spawn attempt much later
|
-- Spawn attempt done. Next spawn attempt much later
|
||||||
timer:start(math.random(10, 39.95))
|
timer:start(math.random() * 29.95 + 10)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- The mob spawner node.
|
-- The mob spawner node.
|
||||||
|
|
|
@ -280,7 +280,7 @@ minetest.register_globalstep(function(dtime)
|
||||||
pos = fly_pos,
|
pos = fly_pos,
|
||||||
velocity = vector.zero(),
|
velocity = vector.zero(),
|
||||||
acceleration = vector.zero(),
|
acceleration = vector.zero(),
|
||||||
expirationtime = math.random(0.3, 0.5),
|
expirationtime = 0.3 + math.random() * 0.2,
|
||||||
size = math.random(1, 2),
|
size = math.random(1, 2),
|
||||||
collisiondetection = false,
|
collisiondetection = false,
|
||||||
vertical = false,
|
vertical = false,
|
||||||
|
|
Loading…
Reference in a new issue