Skip to content

Commit 94d8475

Browse files
authored
Merge pull request #1207 from grilledham/start_game
Start game
2 parents 90f5144 + 2e74960 commit 94d8475

39 files changed

+1227
-390
lines changed

control.lua

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
require 'resources.data_stages'
55
_LIFECYCLE = _STAGE.control -- Control stage
66

7+
-- Util libraries, omitting is a very bad idea
8+
require 'utils.math'
9+
require 'utils.string'
10+
711
-- Overrides the _G.print function
812
require 'utils.print_override'
913

10-
-- Omitting the math library is a very bad idea
11-
require 'utils.math'
12-
1314
-- Global Debug and make sure our version file is registered
1415
Debug = require 'utils.debug'
1516
require 'resources.version'

features/gui/camera.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ local function create_camera(args, player)
3939
local mainframeid = 'mainframe_' .. player_index
4040
local mainframe = mainframeflow[mainframeid]
4141

42-
local target = game.players[args.target]
42+
local target = game.get_player(args.target)
4343
if not target then
4444
player.print('Not a valid target')
4545
return

features/gui/poll.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ local function send_poll_result_to_discord(poll)
132132
if next(edited_by_players) then
133133
insert(result, ' Edited by ')
134134
for pi, _ in pairs(edited_by_players) do
135-
local p = game.players[pi]
135+
local p = game.get_player(pi)
136136
if p and p.valid then
137137
insert(result, p.name)
138138
insert(result, ', ')

features/gui/popup.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ end
130130
-- Creates a popup dialog for the specifically targetted player
131131
local function popup_player(args)
132132
local target_name = args.player
133-
local target = game.players[target_name]
133+
local target = game.get_player(target_name)
134134
if not target then
135135
Game.player_print('Player ' .. target_name .. ' not found.')
136136
return

features/gui/tag_group.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ Event.add(
785785
Event.add(defines.events.on_player_created, player_created)
786786

787787
local function tag_command(args)
788-
local target_player = game.players[args.player]
788+
local target_player = game.get_player(args.player)
789789

790790
if not target_player then
791791
Game.player_print({'common.fail_no_target', target_player})

features/gui/toast.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ Command.add(
277277
},
278278
function(args)
279279
local target_name = args.player
280-
local target = game.players[target_name]
280+
local target = game.get_player(target_name)
281281
if target then
282282
Public.toast_player(target, 15, args.msg)
283283
Utils.print_admins({'command_description.sent_player_toast', Utils.get_actor(), target_name})

features/player_colors.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ local color_callback = Token.register(function(data)
2020
return
2121
end
2222

23-
local player = game.players[key]
23+
local player = game.get_player(key)
2424
if not player then
2525
return
2626
end

features/rank_system.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ end
149149
-- purposes of sorting.
150150
-- Is the only place player.admin should be checked.
151151
function Public.get_player_rank(player_name)
152-
local player = game.players[player_name]
152+
local player = game.get_player(player_name)
153153
if player and player.valid and player.admin then
154154
return Ranks.admin
155155
elseif everyone_is_regular then
@@ -319,7 +319,7 @@ function Public.set_player_rank(player_name, rank)
319319
player_ranks[player_name] = nil
320320
Server.set_data(ranking_data_set, player_name, nil)
321321
-- If we're dropping someone back down the guest, put them on the guests list
322-
local player = game.players[player_name]
322+
local player = game.get_player(player_name)
323323
if player and player.valid then
324324
guests[player.index] = player
325325
end
@@ -343,7 +343,7 @@ function Public.reset_player_rank(player_name)
343343
if Public.equal(player_name, guest_rank) then
344344
return false, get_rank_name(guest_rank)
345345
else
346-
local player = game.players[player_name]
346+
local player = game.get_player(player_name)
347347
local rank
348348
if player and player.valid and (player.online_time > trust_time) then
349349
rank = auto_trusted

features/redmew_qol.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ end)
4949
--- Selects a name from the entity backer name, game.players, and regulars
5050
local function pick_name()
5151
-- Create a weight table comprised of the backer name, a player's name, and a regular's name
52-
local random_player = game.players[random(#game.players)]
52+
local random_player = game.get_player(random(#game.players))
5353
if not random_player then
5454
return
5555
end

features/report.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ end)
4444

4545
local function report_command(args, player)
4646
local reported_player_name = args.player
47-
local reported_player = game.players[reported_player_name]
47+
local reported_player = game.get_player(reported_player_name)
4848

4949
if not reported_player then
5050
Game.player_print(reported_player_name .. ' does not exist.')
@@ -482,12 +482,12 @@ end)
482482

483483
Gui.on_click(jail_offender_button_name, function(event)
484484
local target_name = string.sub(event.element.caption, 6)
485-
local target = game.players[target_name]
485+
local target = game.get_player(target_name)
486486
if target then
487487
Module.jail(target, event.player)
488488
else
489489
target_name = string.sub(event.element.caption, 8)
490-
target = game.players[target_name]
490+
target = game.get_player(target_name)
491491
if target then
492492
Module.unjail(target, event.player)
493493
end

0 commit comments

Comments
 (0)