Skip to content

Commit

Permalink
refactor: Auto-reformat the whole project.
Browse files Browse the repository at this point in the history
  • Loading branch information
notnotmelon committed Dec 13, 2024
1 parent 4adc8a3 commit 953bb9b
Show file tree
Hide file tree
Showing 35 changed files with 60 additions and 60 deletions.
2 changes: 1 addition & 1 deletion compat/aai-industry.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ data:extend {{
table.insert(data.raw.technology["sand-processing"].effects, {
type = "unlock-recipe",
recipe = "maraxsis-aai-sand-conversion"
})
})
2 changes: 1 addition & 1 deletion compat/alien-biomes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ for _, tile in pairs(data.raw.tile) do
if tile.name:find("%-underwater") and tile.collision_mask.layers[maraxsis_collision_mask] then
tile.collision_mask.layers.item = nil
end
end
end
2 changes: 1 addition & 1 deletion compat/combat-mechanics-overhaul.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ for _, tile in pairs(data.raw.tile) do
if not tile.name:find("%-underwater") then goto continue end
tile.collision_mask.layers.item = nil
::continue::
end
end
2 changes: 1 addition & 1 deletion compat/ks-power.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

if not mods["KS_Power"] then return end

data.raw["electric-energy-interface"]["wind-turbine-2"].collision_mask.layers[maraxsis_dome_collision_mask] = true
data.raw["electric-energy-interface"]["wind-turbine-2"].collision_mask.layers[maraxsis_dome_collision_mask] = true
2 changes: 1 addition & 1 deletion compat/visible-planets-in-space.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if not mods["visible-planets"] then return end

vp_add_planets_to_blacklist{"maraxsis-trench"}
vp_add_planets_to_blacklist {"maraxsis-trench"}
4 changes: 2 additions & 2 deletions data-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ data.raw["electric-energy-interface"]["maraxsis-salt-reactor-energy-interface"].
}

data.raw.recipe["maraxsis-glass-panes-recycling"].results = {
{type = "item", name = "maraxsis-sand", amount = 3, probability = 0.25},
{type = "item", name = "maraxsis-salt", amount = 1, probability = 0.25},
{type = "item", name = "maraxsis-sand", amount = 3, probability = 0.25},
{type = "item", name = "maraxsis-salt", amount = 1, probability = 0.25},
{type = "item", name = "maraxsis-limestone", amount = 1, probability = 0.25},
}
2 changes: 1 addition & 1 deletion data.lua
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ require "prototypes.promethium-productivity"
require "prototypes.tips-and-tricks.tips-and-tricks"
require "prototypes.offshore-pump"
require "prototypes.planet.map-gen"
require "prototypes.conduit"
require "prototypes.conduit"
2 changes: 1 addition & 1 deletion graphics/entity/coral/1.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- Generated by spritter v1.2.0 - https://github.com/fgardt/factorio-spritter
return {
["spritter"] = { 1, 2, 0 },
["spritter"] = {1, 2, 0},
["file_count"] = 1,
["height"] = 209,
["line_length"] = 7,
Expand Down
2 changes: 1 addition & 1 deletion graphics/entity/coral/2.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- Generated by spritter v1.2.0 - https://github.com/fgardt/factorio-spritter
return {
["spritter"] = { 1, 2, 0 },
["spritter"] = {1, 2, 0},
["file_count"] = 1,
["height"] = 200,
["line_length"] = 7,
Expand Down
2 changes: 1 addition & 1 deletion graphics/entity/coral/3.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- Generated by spritter v1.2.0 - https://github.com/fgardt/factorio-spritter
return {
["spritter"] = { 1, 2, 0 },
["spritter"] = {1, 2, 0},
["file_count"] = 1,
["height"] = 194,
["line_length"] = 7,
Expand Down
2 changes: 1 addition & 1 deletion graphics/entity/coral/4.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- Generated by spritter v1.2.0 - https://github.com/fgardt/factorio-spritter
return {
["spritter"] = { 1, 2, 0 },
["spritter"] = {1, 2, 0},
["file_count"] = 1,
["height"] = 170,
["line_length"] = 7,
Expand Down
2 changes: 1 addition & 1 deletion graphics/entity/coral/5.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- Generated by spritter v1.2.0 - https://github.com/fgardt/factorio-spritter
return {
["spritter"] = { 1, 2, 0 },
["spritter"] = {1, 2, 0},
["file_count"] = 1,
["height"] = 197,
["line_length"] = 7,
Expand Down
2 changes: 1 addition & 1 deletion graphics/entity/coral/6.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- Generated by spritter v1.2.0 - https://github.com/fgardt/factorio-spritter
return {
["spritter"] = { 1, 2, 0 },
["spritter"] = {1, 2, 0},
["file_count"] = 1,
["height"] = 197,
["line_length"] = 7,
Expand Down
2 changes: 1 addition & 1 deletion graphics/entity/coral/7.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- Generated by spritter v1.2.0 - https://github.com/fgardt/factorio-spritter
return {
["spritter"] = { 1, 2, 0 },
["spritter"] = {1, 2, 0},
["file_count"] = 1,
["height"] = 189,
["line_length"] = 7,
Expand Down
2 changes: 1 addition & 1 deletion graphics/entity/coral/8.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- Generated by spritter v1.2.0 - https://github.com/fgardt/factorio-spritter
return {
["spritter"] = { 1, 2, 0 },
["spritter"] = {1, 2, 0},
["file_count"] = 1,
["height"] = 176,
["line_length"] = 7,
Expand Down
4 changes: 2 additions & 2 deletions prototypes/atmosphere.lua
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ data:extend {{
unit = {
count = 1000,
ingredients = {
{"hydraulic-science-pack", 1},
{"cryogenic-science-pack", 1},
{"hydraulic-science-pack", 1},
{"cryogenic-science-pack", 1},
},
time = 60
},
Expand Down
2 changes: 1 addition & 1 deletion prototypes/collision-mask.lua
Original file line number Diff line number Diff line change
Expand Up @@ -236,4 +236,4 @@ for _, ramp in pairs(data.raw["rail-ramp"]) do
::continue::
end

require "compat.ks-power"
require "compat.ks-power"
4 changes: 2 additions & 2 deletions prototypes/coral.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ data:extend {{
mining_particle = "stone-particle",
mining_time = 5,
results = {
{type = "item", name = "maraxsis-coral", amount = 1},
{type = "item", name = "maraxsis-coral", amount = 1},
}
},
walking_sound = sounds.ore,
Expand Down Expand Up @@ -136,6 +136,6 @@ maraxsis_polylplast.order = "j-c[maraxsis-polylplast]"
maraxsis_polylplast.autoplace = nil
maraxsis_polylplast.minable.results = {
{type = "item", name = "maraxsis-coral", amount_min = 20, amount_max = 25},
{type = "item", name = "stone", amount_min = 4, amount_max = 6},
{type = "item", name = "stone", amount_min = 4, amount_max = 6},
}
data:extend {maraxsis_polylplast}
2 changes: 1 addition & 1 deletion prototypes/fish.lua
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ data:extend {{
enabled = false,
energy_required = 2,
ingredients = {
{type = "item", name = "maraxsis-tropical-fish", amount = 1},
{type = "item", name = "maraxsis-tropical-fish", amount = 1},
},
results = {
{type = "item", name = "maraxsis-microplastics", amount = 10},
Expand Down
4 changes: 2 additions & 2 deletions prototypes/fishing-tower.lua
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ fishing_plant_animation = {
fishing_plant_animation.layers[2].draw_as_glow = true
fishing_plant_animation.type = "animation"
fishing_plant_animation.name = "maraxsis-fishing-plant-animation"
data:extend{fishing_plant_animation}
data:extend {fishing_plant_animation}

local result_units = {}
local probability = 1 / table_size(maraxsis.tropical_fish_names)
Expand Down Expand Up @@ -194,4 +194,4 @@ data:extend {{
localised_description = {"entity-description.maraxsis-fishing-tower"},
factoriopedia_alternative = "maraxsis-fishing-tower",
collision_mask = {layers = {}}
}}
}}
2 changes: 1 addition & 1 deletion prototypes/fluid-void.lua
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ for _, fluid in pairs(data.raw.fluid) do
allowed_module_categories = {"speed", "efficiency"},
}}
::continue::
end
end
2 changes: 1 addition & 1 deletion prototypes/hydraulic-science-pack.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ data:extend {{
energy_required = 30,
ingredients = {
{type = "item", name = "maraxsis-wyrm-specimen", amount = 1},
{type = "item", name = "maraxsis-salt", amount = 1},
{type = "item", name = "maraxsis-salt", amount = 1},
{type = "fluid", name = "maraxsis-saline-water", amount = 300},
},
results = {
Expand Down
8 changes: 4 additions & 4 deletions prototypes/hydro-plant.lua
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,10 @@ data:extend {{
enabled = false,
energy_required = 5,
ingredients = {
{type = "item", name = "tungsten-plate", amount = 20},
{type = "item", name = "pipe", amount = 10},
{type = "item", name = "processing-unit", amount = 10},
{type = "fluid", name = "maraxsis-saline-water", amount = 300},
{type = "item", name = "tungsten-plate", amount = 20},
{type = "item", name = "pipe", amount = 10},
{type = "item", name = "processing-unit", amount = 10},
{type = "fluid", name = "maraxsis-saline-water", amount = 300},
},
results = {
{type = "item", name = "maraxsis-hydro-plant", amount = 1},
Expand Down
2 changes: 1 addition & 1 deletion prototypes/planet/maraxsis-noise-expressions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -320,4 +320,4 @@ data.raw.tree["maraxsis-polylplast"].autoplace = {
random_1 = "random_penalty{x = x, y = y, seed = map_seed, source = 1, amplitude = 1} > 0.96",
random_2 = "random_penalty{x = x, y = y, seed = map_seed, source = 1, amplitude = 1} > 0.9996",
}
}
}
2 changes: 1 addition & 1 deletion prototypes/preservatives.lua
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ data:extend {{
energy_required = 0.5,
ingredients = {
{type = "item", name = "agricultural-science-pack", amount = 1},
{type = "item", name = "maraxsis-salt", amount = 1},
{type = "item", name = "maraxsis-salt", amount = 1},
},
results = {
{type = "item", name = "maraxsis-salted-science", amount = 1},
Expand Down
2 changes: 1 addition & 1 deletion prototypes/recipes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ data:extend {{
name = "maraxsis-petroleum-gas-cracking",
ingredients = {
{type = "fluid", name = "petroleum-gas", amount = 40},
{type = "fluid", name = "water", amount = 30},
{type = "fluid", name = "water", amount = 30},
},
results = {
{type = "fluid", name = "heavy-oil", amount = 10},
Expand Down
28 changes: 14 additions & 14 deletions prototypes/rocks.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,23 +62,23 @@ data:extend {maraxsis_chimney}
-- free glass forever!

data:extend {{
type = "simple-entity",
name = "maraxsis-mollusk-husk",
icon = "__maraxsis__/graphics/icons/mollusk-husk.png",
icon_size = 64,
flags = {"placeable-neutral", "placeable-off-grid"},
minable = {
type = "simple-entity",
name = "maraxsis-mollusk-husk",
icon = "__maraxsis__/graphics/icons/mollusk-husk.png",
icon_size = 64,
flags = {"placeable-neutral", "placeable-off-grid"},
minable = {
mining_time = 0.2,
results = {
{type = "item", name = "maraxsis-glass-panes", amount_min = 35, amount_max = 45},
{type = "item", name = "maraxsis-limestone", amount_min = 20, amount_max = 30},
{type = "item", name = "maraxsis-limestone", amount_min = 20, amount_max = 30},
},
},
max_health = 300,
collision_box = {{-0.4, -0.4}, {0.4, 0.4}},
selection_box = {{-0.9, -0.9}, {0.9, 0.9}},
map_generator_bounding_box = {{-2.9, -2.9}, {2.9, 2.9}},
pictures = {
max_health = 300,
collision_box = {{-0.4, -0.4}, {0.4, 0.4}},
selection_box = {{-0.9, -0.9}, {0.9, 0.9}},
map_generator_bounding_box = {{-2.9, -2.9}, {2.9, 2.9}},
pictures = {
{
filename = "__maraxsis__/graphics/entity/mollusk-husk/mollusk-husk-1.png",
width = 163,
Expand Down Expand Up @@ -110,5 +110,5 @@ data:extend {{
shift = {0.5, 0}
},
},
map_color = {149, 145, 108}
}}
map_color = {149, 145, 108}
}}
8 changes: 4 additions & 4 deletions prototypes/salt-reactor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ data:extend {{
enabled = false,
energy_required = 10,
ingredients = {
{type = "item", name = "maraxsis-glass-panes", amount = 100},
{type = "item", name = "tungsten-plate", amount = 100},
{type = "item", name = "processing-unit", amount = 100},
{type = "fluid", name = "maraxsis-brackish-water", amount = 300},
{type = "item", name = "maraxsis-glass-panes", amount = 100},
{type = "item", name = "tungsten-plate", amount = 100},
{type = "item", name = "processing-unit", amount = 100},
{type = "fluid", name = "maraxsis-brackish-water", amount = 300},
},
results = {
{type = "item", name = "maraxsis-salt-reactor", amount = 1},
Expand Down
4 changes: 2 additions & 2 deletions prototypes/submarine.lua
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ local recipes = {
{type = "item", name = "tungsten-plate", amount = 50},
{type = "item", name = "maraxsis-sonar", amount = 1},
{type = "item", name = "maraxsis-glass-panes", amount = 100},
{type = "item", name = "maraxsis-salt-reactor", amount = 1},
{type = "item", name = "maraxsis-salt-reactor", amount = 1},
{type = "item", name = "pump", amount = 8},
{type = "item", name = "processing-unit", amount = 50},
{type = "item", name = "maraxsis-super-sealant-substance", amount = 100},
Expand Down Expand Up @@ -431,4 +431,4 @@ data:extend {{
priority = 100,
filename = "__maraxsis__/sounds/submerge.ogg",
speed = 0.5
}}
}}
2 changes: 1 addition & 1 deletion prototypes/water-treatment.lua
Original file line number Diff line number Diff line change
Expand Up @@ -224,4 +224,4 @@ data:extend {{
subgroup = "fluid-recipes",
order = "d[other-recipes]-c[sublimation]",
}}
add_to_tech("maraxsis-sublimation")
add_to_tech("maraxsis-sublimation")
2 changes: 1 addition & 1 deletion scripts/pressure-dome.lua
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ local function check_can_build_dome(surface, position)
local tile_collision = tile.collides_with("object")
or tile.collides_with(maraxsis_lava_collision_mask)
or tile.collides_with(maraxsis_trench_entrance_collision_mask)

if tile_collision and is_point_in_polygon(xx - x + 0.5, yy - y) then
return false, colliding_entities, {"cant-build-reason.entity-in-the-way", tile.prototype.localised_name}, true
end
Expand Down
2 changes: 1 addition & 1 deletion scripts/remote.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ end

remote.add_interface("maraxsis", {
get_submarine_list = get_submarine_list,
})
})
2 changes: 1 addition & 1 deletion scripts/salt-reactor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ maraxsis.on_event(defines.events.on_trigger_created_entity, function(event)

local energy_interface = reactor_data.energy_interface
if not energy_interface or not energy_interface.valid then return end

if quality_level >= 5 and not script.active_mods["infinite-quality-tiers"] then quality_level = quality_level - 1 end
energy_interface.energy = energy_interface.energy + 10000000 * (2 ^ quality_level)
end)
Expand Down
4 changes: 2 additions & 2 deletions scripts/sand-extractor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ local function construct_sand_extractor(event)
if not player or not player.valid then return end

local cursor_stack = player.cursor_stack
local cursor_stack_valid = cursor_stack and cursor_stack.valid_for_read and cursor_stack.count > 0
local cursor_stack_valid = cursor_stack and cursor_stack.valid_for_read and cursor_stack.count > 0

local quality
local name
Expand All @@ -28,7 +28,7 @@ local function construct_sand_extractor(event)

if surface.entity_prototype_collides(name, position, false) then return end
local is_ghost = (not cursor_stack_valid) or event.input_name == "build-ghost" or event.input_name == "super-forced-build"

surface.create_entity {
name = is_ghost and "entity-ghost" or name,
inner_name = is_ghost and name or nil,
Expand Down
2 changes: 1 addition & 1 deletion scripts/submarine.lua
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ maraxsis.on_nth_tick(277, function()
end
else
for _, player in pairs(submarine.force.players) do
player.remove_alert{
player.remove_alert {
entity = submarine,
type = defines.alert_type.train_out_of_fuel
}
Expand Down

0 comments on commit 953bb9b

Please sign in to comment.