1
0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-04-11 11:21:54 +02:00

Merge pull request #326 from blubFisch/develop-blub

Bunch of small adjustments
This commit is contained in:
hanakocz 2022-10-07 11:32:42 +02:00 committed by GitHub
commit 3fbbda99f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 5 deletions

View File

@ -49,7 +49,7 @@ function Public.remove_zone(zone)
remove_drawn_borders(zone)
this.exclusion_zones[zone.force.name] = nil
zone.force.print("Your protection zone has expired")
zone.force.print("Your PvP Shield has expired", {r = 1, g = 0, b = 0})
end
local function vector_norm(vector)

View File

@ -58,6 +58,10 @@ local function on_chunk_charted(event)
local health_text = town_center.health_text
update_forces(health_text)
add_force(health_text, force.name)
-- protection text
local zone_text = town_center.zone_text
update_forces(zone_text)
add_force(zone_text, force.name)
end
end

View File

@ -131,7 +131,7 @@ local function set_offers(town_center)
special_offers[5] = {{}, 'Maximum Crafting Speed upgrades reached!'}
end
local laser_turret = 'Laser Turret Slot [#' .. tostring(town_center.upgrades.laser_turret.slots + 1) .. ']'
special_offers[6] = {{{'coin', 2000 + (town_center.upgrades.laser_turret.slots * 200)}}, laser_turret}
special_offers[6] = {{{'coin', (town_center.upgrades.laser_turret.slots * 150)}}, laser_turret}
local spawn_point = 'Set Spawn Point'
special_offers[7] = {{}, spawn_point}
for _, v in pairs(special_offers) do

View File

@ -374,7 +374,7 @@ local function update_protection_display()
local zone = this.exclusion_zones[town_center.market.force.name]
local info
if zone then
info = 'Protection: ' .. string.format("%.0f", (zone.lifetime_end - game.tick) / 60 / 60) .. ' minutes'
info = 'PvP Shield: ' .. string.format("%.0f", (zone.lifetime_end - game.tick) / 60 / 60) .. ' minutes'
else
info = ''
end
@ -478,7 +478,7 @@ local function found_town(event)
town_center.upgrades.mining_speed = 0
town_center.upgrades.crafting_speed = 0
town_center.upgrades.laser_turret = {}
town_center.upgrades.laser_turret.slots = 4
town_center.upgrades.laser_turret.slots = 20
town_center.upgrades.laser_turret.locations = 0
town_center.evolution = {}
town_center.evolution.biters = 0
@ -529,7 +529,7 @@ local function found_town(event)
}
town_center.zone_text = rendering.draw_text {
text = 'Town protection: (..)',
text = 'PvP Shield: (..)',
surface = surface,
forces = {force_name},
target = town_center.market,