games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-14 02:34:09 +02:00
Code Issues Releases Activity

bugfixes

Browse Source
This commit is contained in:
danielmartin0 2024-10-16 21:08:59 +01:00
parent 4abebfbafa
commit 548e74b862
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maps/pirates/ai.lua
View File

@ -56,6 +56,11 @@ function Public.Tick_actions(tick_interval)
if destination.type ~= Surfaces.enum.ISLAND then
return
end
if destination.subtype and destination.subtype == IslandEnum.enum.FIRST then
return
end
if memory.boat.state ~= Boats.enum_state.LANDED and memory.boat.state ~= Boats.enum_state.RETREATING then
return
end
@ -74,7 +79,8 @@ function Public.Tick_actions(tick_interval)
if game.tick % (tick_interval * 2) == 0 and memory.boat.state == Boats.enum_state.LANDED then
local extra_evo = 2 * tick_interval / 60 * Balance.evolution_per_second()
Common.increment_evo(extra_evo)
destination.dynamic_data.evolution_accrued_time = destination.dynamic_data.evolution_accrued_time + extra_evo
destination.dynamic_data.evolution_accrued_time = (destination.dynamic_data.evolution_accrued_time or 0)
+ extra_evo
end
-- if destination.subtype == IslandEnum.enum.RED_DESERT then return end -- This was a hack to stop biter boats causing attacks, but, it has the even worse effect of stopping all floating_pollution gathering.

4
maps/pirates/api_events.lua
View File

@ -582,14 +582,14 @@ local function handle_damage_dealt_by_players(event)
end
end
if class and class == Classes.enum.SCOUT then
if event.entity.valid and class and class == Classes.enum.SCOUT then
-- event.entity.health = event.entity.health + (1 - Balance.scout_damage_dealt_multiplier) * event.final_damage_amount
Common.damage_hostile_entity(
event.entity,
-(1 - Balance.scout_damage_dealt_multiplier) * event.final_damage_amount
)
event.final_damage_amount = event.final_damage_amount * Balance.scout_damage_dealt_multiplier
elseif class and (class == Classes.enum.SAMURAI or class == Classes.enum.HATAMOTO) then
elseif event.entity.valid and class and (class == Classes.enum.SAMURAI or class == Classes.enum.HATAMOTO) then
local samurai = class == Classes.enum.SAMURAI
local hatamoto = class == Classes.enum.HATAMOTO