games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-02-13 13:49:33 +02:00
Code Issues Releases Activity

Merge pull request #329 from blubFisch/develop-blub

Browse Source 
Small stuff
This commit is contained in:
Gerkiz 2022-10-09 17:05:21 +02:00 committed by GitHub
commit aac4408433
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maps/scrap_towny_ffa/player.lua
View File

@ -82,8 +82,7 @@ end
function Public.requests(player)
local this = ScenarioTable.get()
if this.requests[player.index] and this.requests[player.index] == 'kill-character' then
if player.character then
if player.character.valid then
if player.character and player.character.valid then
-- Clear inventories to avoid people easily getting back their stuff after a town dies offline
local inventories = {
player.get_inventory(defines.inventory.character_main),
@ -99,7 +98,6 @@ function Public.requests(player)
player.character.die()
end
end
this.requests[player.index] = nil
end
end

31
maps/scrap_towny_ffa/pvp_shield.lua
View File

@ -63,7 +63,13 @@ function Public.add_shield(surface, force, center, lifetime_ticks, time_to_full_
if is_pause_mode then
-- Freeze players to avoid AFK abuse
shield.force.character_running_speed_modifier = -1
game.print("Your AFK PvP shield is now rolling out. You will be frozen until it expires in " ..
-- Kick players out of vehicles if needed
for _, player in pairs(force.connected_players) do
if player.character.driving then
player.character.driving = false
end
end
shield.force.print("Your AFK PvP shield is now rolling out. You will be frozen until it expires in " ..
string.format("%.0f", (Public.remaining_lifetime(shield)) / 60 / 60) .. ' minutes')
end
@ -123,7 +129,7 @@ function Public.push_enemies_out(player)
center_diff.y = center_diff.y / vector_norm(center_diff)
player.teleport({ player.position.x + center_diff.x, player.position.y + center_diff.y}, player.surface)
-- Kick players out of vehicles if they try to drive in
-- Kick players out of vehicles if needed
if player.character.driving then
player.character.driving = false
end
@ -150,6 +156,27 @@ local function on_player_changed_position(event)
Public.push_enemies_out(player)
end
local function on_player_driving_changed_state(event)
local player = game.players[event.player_index]
if not player or not player.valid then
return
end
local this = ScenarioTable.get_table()
for _, shield in pairs(this.pvp_shields) do
if shield.force == player.force and shield.is_pause_mode then
local vehicle = player.vehicle
if vehicle and vehicle.valid then
-- Kick players out of vehicles if needed
if player.character.driving then
player.character.driving = false
player.print("Can't drive around while AFK PvP Shield is active")
end
end
end
end
end
Event.add(defines.events.on_player_driving_changed_state, on_player_driving_changed_state)
Event.add(defines.events.on_player_changed_position, on_player_changed_position)
Event.on_nth_tick(60, update_shield_lifetime)