aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-31 04:51:40 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/5.4.3' into dev

Browse Source
This commit is contained in:
Cooldude2606
2019-05-02 16:51:36 +01:00
parent 5dd3b1f5bb f8136aea5f
commit 82cbfc8076
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/roles.lua
View File

@@ -217,7 +217,7 @@ Roles.override_player_roles{
Drahc_pro={'Administrator','Moderator','Member'}, Drahc_pro={'Administrator','Moderator','Member'},
aldldl={'Sponsor','Administrator','Moderator','Member'}, aldldl={'Sponsor','Administrator','Moderator','Member'},
LoicB={'Sponsor','Trainee','Member'}, LoicB={'Sponsor','Trainee','Member'},
Ookl={'Sponsor','Moderator','Member'}, ookl={'Sponsor','Moderator','Member'},
cydes={'Pay to Win','Moderator','Member'}, cydes={'Pay to Win','Moderator','Member'},
darklich14={'Pay to Win','Moderator','Member'}, darklich14={'Pay to Win','Moderator','Member'},
porelos={'Pay to Win','Moderator','Member'}, porelos={'Pay to Win','Moderator','Member'},
@@ -232,7 +232,7 @@ Roles.override_player_roles{
['7h3w1z4rd']={'Moderator','Member'}, ['7h3w1z4rd']={'Moderator','Member'},
AssemblyStorm={'Moderator','Member'}, AssemblyStorm={'Moderator','Member'},
bombershark={'Moderator','Member'}, bombershark={'Moderator','Member'},
CmonMate467={'Moderator','Member'}, CmonMate497={'Moderator','Member'},
facere={'Moderator','Member'}, facere={'Moderator','Member'},
FlipHalfling90={'Moderator','Member'}, FlipHalfling90={'Moderator','Member'},
Gizan={'Pay to Win','Moderator','Member'}, Gizan={'Pay to Win','Moderator','Member'},

4
modules/addons/damage-popups.lua
View File

@@ -21,9 +21,9 @@ Event.add(defines.events.on_entity_damaged, function(event)
-- Sets the message -- Sets the message
local message local message
if entity.name == 'player' and config.show_player_health then if entity.name == 'character' and config.show_player_health then
message = {'damage-popup.player-health',health} message = {'damage-popup.player-health',health}
elseif entity.name ~= 'player' and cause and cause.name == 'player' and config.show_player_damage then elseif entity.name ~= 'character' and cause and cause.name == 'character' and config.show_player_damage then
message = {'damage-popup.player-damage',damage} message = {'damage-popup.player-damage',damage}
end end

2
modules/addons/spawn-area.lua
View File

@@ -89,7 +89,7 @@ local function spawn_base(surface,position)
table.insert(tiles_to_make,{name=dtile,position=p}) table.insert(tiles_to_make,{name=dtile,position=p})
local entities_to_remove = surface.find_entities_filtered{area={{p.x-1,p.y-1},{p.x,p.y}}} local entities_to_remove = surface.find_entities_filtered{area={{p.x-1,p.y-1},{p.x,p.y}}}
for _,entity in pairs(entities_to_remove) do for _,entity in pairs(entities_to_remove) do
if entity.name ~= 'player' then entity.destroy() end if entity.name ~= 'character' then entity.destroy() end
end end
elseif prod < pr2 then elseif prod < pr2 then
-- if it is inside the pattern radius -- if it is inside the pattern radius

2
modules/commands/roles.lua
View File

@@ -24,7 +24,7 @@ Commands.new_command('unassign-role','Unassigns a role from a player')
:add_param('player',false,'player-role') :add_param('player',false,'player-role')
:add_param('role',false,'role') :add_param('role',false,'role')
:set_flag('admin-only',true) :set_flag('admin-only',true)
:add_alias('rdemote','unassign','remove-role') :add_alias('rdemote','unassign','rerole','remove-role')
:register(function(player,action_player,role,raw) :register(function(player,action_player,role,raw)
local player_highest = Roles.get_player_highest_role(player) local player_highest = Roles.get_player_highest_role(player)
if player_highest.index < role.index then if player_highest.index < role.index then

2
modules/commands/spawn.lua
View File

@@ -4,7 +4,7 @@ local Roles = require 'expcore.roles'
local function teleport(player) local function teleport(player)
local surface = player.surface local surface = player.surface
local spawn = player.force.get_spawn_position(surface) local spawn = player.force.get_spawn_position(surface)
local position = surface.find_non_colliding_position('player',spawn,32,1) local position = surface.find_non_colliding_position('character',spawn,32,1)
if not position then return false end if not position then return false end
if player.driving then player.driving = false end -- kicks a player out a vehicle if in one if player.driving then player.driving = false end -- kicks a player out a vehicle if in one
player.teleport(position,surface) player.teleport(position,surface)

2
modules/commands/teleport.lua
View File

@@ -3,7 +3,7 @@ require 'config.command_parse_general'
local function teleport(from_player,to_player) local function teleport(from_player,to_player)
local surface = to_player.surface local surface = to_player.surface
local position = surface.find_non_colliding_position('player',to_player.position,32,1) local position = surface.find_non_colliding_position('character',to_player.position,32,1)
if not position then return false end -- return false if no new position if not position then return false end -- return false if no new position
if from_player.driving then from_player.driving = false end -- kicks a player out a vehicle if in one if from_player.driving then from_player.driving = false end -- kicks a player out a vehicle if in one
from_player.teleport(position,surface) from_player.teleport(position,surface)