Lua formatting

This commit is contained in:
David Skrundz 2021-01-16 15:18:36 -07:00
parent 9513dc1a43
commit 8786ce9f00
No known key found for this signature in database
GPG Key ID: 9A0FA0614CE9422E
5 changed files with 38 additions and 11 deletions

26
.vscode/.lua-format vendored Normal file
View File

@ -0,0 +1,26 @@
column_limit: 100
indent_width: 2
use_tab: false
tab_width: 4
continuation_indent_width: 4
spaces_before_call: 1
keep_simple_control_block_one_line: false
keep_simple_function_one_line: false
align_args: true
break_after_functioncall_lp: true
break_before_functioncall_rp: true
align_parameter: true
chop_down_parameter: true
break_after_functiondef_lp: true
break_before_functiondef_rp: true
align_table_field: true
break_after_table_lb: true
break_before_table_rb: true
chop_down_table: true
chop_down_kv_table: true
table_sep: ","
column_table_limit: column_limit
extra_sep_at_table_end: true
break_after_operator: true
double_quote_to_single_quote: false
single_quote_to_double_quote: false

View File

@ -6,5 +6,6 @@
"editor.detectIndentation": false, "editor.detectIndentation": false,
"editor.tabSize": 2, "editor.tabSize": 2,
"editor.insertSpaces": true, "editor.insertSpaces": true,
} },
"vscode-lua-format.configPath": ".vscode/.lua-format"
} }

View File

@ -40,8 +40,6 @@ require("prototypes.constructors.Entity.RocketSiloRocket")
require("prototypes.constructors.Entity.RocketSiloRocketShadow") require("prototypes.constructors.Entity.RocketSiloRocketShadow")
require("prototypes.constructors.Entity.Smoke") require("prototypes.constructors.Entity.Smoke")
require("prototypes.constructors.Entity.SpeechBubble") require("prototypes.constructors.Entity.SpeechBubble")
require("prototypes.constructors.Entity.SpiderLeg")
require("prototypes.constructors.Entity.SpiderVehicle")
require("prototypes.constructors.Entity.Sticker") require("prototypes.constructors.Entity.Sticker")
require("prototypes.constructors.Entity.TileGhost") require("prototypes.constructors.Entity.TileGhost")
require("prototypes.constructors.Entity.Corpse.RailRemnants") require("prototypes.constructors.Entity.Corpse.RailRemnants")
@ -86,6 +84,7 @@ require("prototypes.constructors.Entity.EntityWithHealth.SimpleEntity")
require("prototypes.constructors.Entity.EntityWithHealth.SimpleEntityWithForce") require("prototypes.constructors.Entity.EntityWithHealth.SimpleEntityWithForce")
require("prototypes.constructors.Entity.EntityWithHealth.SimpleEntityWithOwner") require("prototypes.constructors.Entity.EntityWithHealth.SimpleEntityWithOwner")
require("prototypes.constructors.Entity.EntityWithHealth.SolarPanel") require("prototypes.constructors.Entity.EntityWithHealth.SolarPanel")
require("prototypes.constructors.Entity.EntityWithHealth.SpiderLeg")
require("prototypes.constructors.Entity.EntityWithHealth.StorageTank") require("prototypes.constructors.Entity.EntityWithHealth.StorageTank")
require("prototypes.constructors.Entity.EntityWithHealth.TrainStop") require("prototypes.constructors.Entity.EntityWithHealth.TrainStop")
require("prototypes.constructors.Entity.EntityWithHealth.TransportBeltConnectable") require("prototypes.constructors.Entity.EntityWithHealth.TransportBeltConnectable")
@ -120,6 +119,7 @@ require("prototypes.constructors.Entity.EntityWithHealth.Turret.ElectricTurret")
require("prototypes.constructors.Entity.EntityWithHealth.Turret.FluidTurret") require("prototypes.constructors.Entity.EntityWithHealth.Turret.FluidTurret")
require("prototypes.constructors.Entity.EntityWithHealth.Vehicle.Car") require("prototypes.constructors.Entity.EntityWithHealth.Vehicle.Car")
require("prototypes.constructors.Entity.EntityWithHealth.Vehicle.RollingStock") require("prototypes.constructors.Entity.EntityWithHealth.Vehicle.RollingStock")
require("prototypes.constructors.Entity.EntityWithHealth.Vehicle.SpiderVehicle")
require("prototypes.constructors.Entity.EntityWithHealth.Vehicle.RollingStock.ArtilleryWagon") require("prototypes.constructors.Entity.EntityWithHealth.Vehicle.RollingStock.ArtilleryWagon")
require("prototypes.constructors.Entity.EntityWithHealth.Vehicle.RollingStock.CargoWagon") require("prototypes.constructors.Entity.EntityWithHealth.Vehicle.RollingStock.CargoWagon")
require("prototypes.constructors.Entity.EntityWithHealth.Vehicle.RollingStock.FluidWagon") require("prototypes.constructors.Entity.EntityWithHealth.Vehicle.RollingStock.FluidWagon")

View File

@ -1,11 +1,11 @@
Baseless.Make.SpiderLeg = function (name, prototype) Baseless.Make.SpiderLeg = function (name, prototype)
return Baseless.Make.Entity("spider-leg", name, Merge( return Baseless.Make.EntityWithHealth("spider-leg", name, Merge(
{ {
part_length = 1, graphics_set = {},
initial_movement_speed = 0, initial_movement_speed = 0,
movement_acceleration = 0, movement_acceleration = 0,
movement_based_position_selection_distance = 0, movement_based_position_selection_distance = 0,
graphics_set = {}, part_length = 1,
}, },
prototype prototype
)) ))

View File

@ -1,14 +1,14 @@
Baseless.Make.SpiderVehicle = function (name, prototype) Baseless.Make.SpiderVehicle = function (name, prototype)
return Baseless.Make.Vehicle("spider-vehicle", name, Merge( return Baseless.Make.Vehicle("spider-vehicle", name, Merge(
{ {
energy_source = Baseless.Data.EnergySource.Burner,
inventory_size = 0,
height = 1,
chunk_exploration_radius = 1,
movement_energy_consumption = Baseless.Data.Energy,
automatic_weapon_cycling = false, automatic_weapon_cycling = false,
energy_source = Baseless.Data.EnergySource.Burner,
chain_shooting_cooldown_modifier = 1, chain_shooting_cooldown_modifier = 1,
chunk_exploration_radius = 1,
graphics_set = {}, graphics_set = {},
height = 1,
inventory_size = 0,
movement_energy_consumption = Baseless.Data.Energy,
spider_engine = { spider_engine = {
military_target = Baseless.Data.SimpleEntityWithForce, military_target = Baseless.Data.SimpleEntityWithForce,
legs = { legs = {