From 3fa0091971e3a6cf2278b29c05d1f7b4837d1567 Mon Sep 17 00:00:00 2001 From: Matthew Heguy Date: Sun, 25 Nov 2018 23:17:12 -0500 Subject: [PATCH] Change existing code to use new utility functions --- features/fish_market.lua | 3 +-- features/gui/player_list.lua | 2 +- features/train_station_names.lua | 2 +- map_gen/Diggy/Feature/DiggyCaveCollapse.lua | 2 +- map_gen/misc/car_body.lua | 3 ++- map_gen/misc/wreck_items.lua | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/features/fish_market.lua b/features/fish_market.lua index f8fefeb2..fbd9d319 100644 --- a/features/fish_market.lua +++ b/features/fish_market.lua @@ -26,7 +26,6 @@ local Utils = require 'utils.core' local Market_items = require 'resources.market_items' local market_item = Market_items.market_item local fish_market_bonus_message = require 'resources.fish_messages' -local total_fish_market_bonus_messages = #fish_market_bonus_message local function spawn_market(cmd) local player = game.player @@ -77,7 +76,7 @@ local function fish_earned(event, amount) if fish % 70 == 0 then if player and player.valid then - local message = fish_market_bonus_message[math.random(total_fish_market_bonus_messages)] + local message = table.get_random(fish_market_bonus_message, true) player.print(message) end end diff --git a/features/gui/player_list.lua b/features/gui/player_list.lua index 002c2ae8..3f1ebb5c 100644 --- a/features/gui/player_list.lua +++ b/features/gui/player_list.lua @@ -715,7 +715,7 @@ Gui.on_click( local count = (player_pokes[poke_player_index] or 0) + 1 player_pokes[poke_player_index] = count - local poke_str = poke_messages[math.random(#poke_messages)] + local poke_str = table.get_random(poke_messages, true) local message = table.concat({'>> ', player.name, ' has poked ', poke_player.name, ' with ', poke_str, ' <<'}) for _, p in ipairs(game.connected_players) do diff --git a/features/train_station_names.lua b/features/train_station_names.lua index 1ac14994..8e035591 100644 --- a/features/train_station_names.lua +++ b/features/train_station_names.lua @@ -10,7 +10,7 @@ local function player_built_entity(event) if entity.name == 'train-stop' then local y = math.random(1, 3) if y ~= 1 then - local x = math.random(1, #game.players) + local x = table.get_random(game.players, true) local player = Game.get_player_by_index(x) event.created_entity.backer_name = player.name end diff --git a/map_gen/Diggy/Feature/DiggyCaveCollapse.lua b/map_gen/Diggy/Feature/DiggyCaveCollapse.lua index cf05315e..18ae2caf 100644 --- a/map_gen/Diggy/Feature/DiggyCaveCollapse.lua +++ b/map_gen/Diggy/Feature/DiggyCaveCollapse.lua @@ -149,7 +149,7 @@ end local on_collapse_timeout_finished = Token.register(collapse) local function spawn_cracking_sound_text(surface, position) - local text = config.cracking_sounds[random(1, #config.cracking_sounds)] + local text = table.get_random(config.cracking_sounds, true) local color = { r = 1, diff --git a/map_gen/misc/car_body.lua b/map_gen/misc/car_body.lua index 9ff5c02e..e7f51307 100644 --- a/map_gen/misc/car_body.lua +++ b/map_gen/misc/car_body.lua @@ -2,6 +2,7 @@ local Event = require 'utils.event' local Game = require 'utils.game' local drivers_group = 'Drivers' +local directions = defines.direction local function transfer_body(player) -- Remove the player from their character and place them in a car. @@ -10,7 +11,7 @@ local function transfer_body(player) local pos = force.get_spawn_position(surface) -- Choose a random direction for the car to face - local dir = math.random(0, 7) + local dir = table.get_random(directions, true) -- Remove the players' character if player.character then diff --git a/map_gen/misc/wreck_items.lua b/map_gen/misc/wreck_items.lua index 06aa61dc..2137dd4b 100644 --- a/map_gen/misc/wreck_items.lua +++ b/map_gen/misc/wreck_items.lua @@ -44,14 +44,14 @@ local callback = function(entity) entity.health = math.random(entity.health) - entity.insert(wreck_item_pool[math.random(#wreck_item_pool)]) - entity.insert(wreck_item_pool[math.random(#wreck_item_pool)]) - entity.insert(wreck_item_pool[math.random(#wreck_item_pool)]) + entity.insert(wreck_item_pool[table.get_random(wreck_item_pool, true)]) + entity.insert(wreck_item_pool[table.get_random(wreck_item_pool, true)]) + entity.insert(wreck_item_pool[table.get_random(wreck_item_pool, true)]) end ) return function(x, y, world) - local ship = entity_list[math.random(#entity_list)] + local ship = table.get_random(entity_list, true) if math.random(ship.chance) ~= 1 then return nil