1
0
mirror of https://github.com/Refactorio/RedMew.git synced 2025-01-20 03:29:26 +02:00

Minor changes to fix join team bug

This commit is contained in:
SimonFlapse 2019-11-03 15:14:21 +01:00
parent 0d3c93bad0
commit 69d3fd64d1
2 changed files with 8 additions and 3 deletions

View File

@ -77,7 +77,6 @@ local function random_tech(tier, force, group_name)
local items = Retailer.get_items(group_name)
items[tier_name].price = math.ceil(items[tier_name].price * 1.05)
elseif tech_unlocked then
game.print(technology.name)
techs_left = true
break
end
@ -265,6 +264,11 @@ local function spill_coins(event)
return
end
local force = event.cause.force or event.force
if not force or entity.force == force then
return
end
local bounds = entity_drop_amount[entity.name]
if not bounds then
return
@ -364,7 +368,8 @@ local function on_player_died(event)
if cause and cause.valid and cause.type == 'character' then
local cause_force = cause.force
if not (game.get_player(event.player_index).force == cause_force) then
cause.insert({name = 'coin', count = player_kill_reward})
local coins_inserted = cause.insert({name = 'coin', count = player_kill_reward})
ScoreTracker.change_for_player(cause.index, 'coins-earned', coins_inserted)
update_unlock_progress(cause_force, unlock_reasons.player_killed)
end
end

View File

@ -494,7 +494,7 @@ function Public.join_usa(_, player)
return false
end
if allow_switching_team then
if allow_switching_team and player.character then
local empty_inventory =
player.get_inventory(defines.inventory.character_main).is_empty() and
player.get_inventory(defines.inventory.character_trash).is_empty() and