Skip to content

Commit

Permalink
Fix non-functional trigger check
Browse files Browse the repository at this point in the history
  • Loading branch information
kirazy committed Nov 26, 2020
1 parent 176aa5b commit 3865c53
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
4 changes: 3 additions & 1 deletion prototypes/entity/assembly/assembling-machine.lua
Original file line number Diff line number Diff line change
Expand Up @@ -492,8 +492,10 @@ for name, map in pairs(tier_map) do
-- Fix drawing box
entity.drawing_box = nil

local test = reskins.bobs.triggers.assembly.burner_assembling_machine_is_small

-- Rescale for electronics and burner assembling machines
if string.find(name, "electronics") or (reskins.bobs.triggers.burner_assembling_machine_is_small and name == "burner-assembling-machine") then
if string.find(name, "electronics") or (reskins.bobs.triggers.assembly.burner_assembling_machine_is_small and name == "burner-assembling-machine") then
reskins.lib.rescale_entity(entity.animation, 2/3)
reskins.lib.rescale_remnant(entity, 2/3)
end
Expand Down
7 changes: 7 additions & 0 deletions prototypes/entity/power/burner-electric-generator.lua
Original file line number Diff line number Diff line change
Expand Up @@ -200,5 +200,12 @@ entity.water_reflection = {
orientation_to_variation = false
}

-- Handle ambient-light
entity.energy_source.light_flicker = {
color = {0, 0, 0},
minimum_light_size = 0,
light_intensity_to_size_coefficient = 0,
}

-- Fix drawing box
entity.drawing_box = {{-1.5, -2.25}, {1.5, 1.5}}
6 changes: 5 additions & 1 deletion prototypes/functions/triggers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ local triggers = {}

-- Angel's Industries
triggers.assembly = {
burner_assembling_machine_is_small = (mods["aai-industry"] and mods["angelsrefining"]) and true
burner_assembling_machine_is_small = true
}

if mods["aai-industry"] and mods["angelsrefining"] then
triggers.assembly.burner_assembling_machine_is_small = false
end

return triggers

0 comments on commit 3865c53

Please sign in to comment.