From 1acc7a749ba371006dd82660d7684c6b992ee5b8 Mon Sep 17 00:00:00 2001 From: David Skrundz Date: Sat, 16 Jan 2021 16:02:04 -0700 Subject: [PATCH] Update for 1.1 --- changelog.txt | 5 +++++ info.json | 4 ++-- prototypes/constructors.lua | 2 ++ .../EntityWithHealth/Container/LogisticContainer.lua | 1 + .../Entity/EntityWithHealth/LinkedContainer.lua | 8 ++++++++ .../Entity/EntityWithHealth/SpiderLeg.lua | 2 ++ .../EntityWithHealth/TransportBeltConnectable.lua | 2 ++ .../TransportBeltConnectable/LinkedBelt.lua | 12 ++++++++++++ .../TransportBeltConnectable/Loader1x2.lua | 1 + .../TransportBeltConnectable/Splitter.lua | 1 + .../EntityWithHealth/Vehicle/SpiderVehicle.lua | 2 +- prototypes/entity.lua | 2 ++ prototypes/map-settings.lua | 3 +++ 13 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 prototypes/constructors/Entity/EntityWithHealth/LinkedContainer.lua create mode 100644 prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable/LinkedBelt.lua diff --git a/changelog.txt b/changelog.txt index 3efaaa0..db9e7c1 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.1.0 +Date: 16.01.2021 + Features: + - Update for 1.1 +--------------------------------------------------------------------------------------------------- Version: 1.0.0 Date: 14.08.2020 Features: diff --git a/info.json b/info.json index d8afe41..f346fce 100644 --- a/info.json +++ b/info.json @@ -1,11 +1,11 @@ { "name": "Baseless", - "version": "1.0.0", + "version": "1.1.0", "title": "Baseless", "description": "Defines missing prototypes required to launch the game.", "author": "David Skrundz", "contact": "david@skrundz.ca", "homepage": "https://github.com/DavidSkrundz/Baseless", - "factorio_version": "1.0", + "factorio_version": "1.1", "dependencies": [] } diff --git a/prototypes/constructors.lua b/prototypes/constructors.lua index 4271285..3d312ae 100644 --- a/prototypes/constructors.lua +++ b/prototypes/constructors.lua @@ -66,6 +66,7 @@ require("prototypes.constructors.Entity.EntityWithHealth.Inserter") require("prototypes.constructors.Entity.EntityWithHealth.Lab") require("prototypes.constructors.Entity.EntityWithHealth.Lamp") require("prototypes.constructors.Entity.EntityWithHealth.LandMine") +require("prototypes.constructors.Entity.EntityWithHealth.LinkedContainer") require("prototypes.constructors.Entity.EntityWithHealth.Market") require("prototypes.constructors.Entity.EntityWithHealth.MiningDrill") require("prototypes.constructors.Entity.EntityWithHealth.OffshorePump") @@ -109,6 +110,7 @@ require("prototypes.constructors.Entity.EntityWithHealth.Rail.CurvedRail") require("prototypes.constructors.Entity.EntityWithHealth.Rail.StraightRail") require("prototypes.constructors.Entity.EntityWithHealth.RailSignalBase.RailChainSignal") require("prototypes.constructors.Entity.EntityWithHealth.RailSignalBase.RailSignal") +require("prototypes.constructors.Entity.EntityWithHealth.TransportBeltConnectable.LinkedBelt") require("prototypes.constructors.Entity.EntityWithHealth.TransportBeltConnectable.Loader1x1") require("prototypes.constructors.Entity.EntityWithHealth.TransportBeltConnectable.Loader1x2") require("prototypes.constructors.Entity.EntityWithHealth.TransportBeltConnectable.Splitter") diff --git a/prototypes/constructors/Entity/EntityWithHealth/Container/LogisticContainer.lua b/prototypes/constructors/Entity/EntityWithHealth/Container/LogisticContainer.lua index 8cb5abe..53b2728 100644 --- a/prototypes/constructors/Entity/EntityWithHealth/Container/LogisticContainer.lua +++ b/prototypes/constructors/Entity/EntityWithHealth/Container/LogisticContainer.lua @@ -2,6 +2,7 @@ Baseless.Make.LogisticContainer = function (type, name, prototype, conditions) return Baseless.Make.Container(type or "logistic-container", name, Merge( { logistic_mode = "storage", + max_logistic_slots = 1, }, prototype ), conditions) diff --git a/prototypes/constructors/Entity/EntityWithHealth/LinkedContainer.lua b/prototypes/constructors/Entity/EntityWithHealth/LinkedContainer.lua new file mode 100644 index 0000000..e2812e0 --- /dev/null +++ b/prototypes/constructors/Entity/EntityWithHealth/LinkedContainer.lua @@ -0,0 +1,8 @@ +Baseless.Make.LinkedContainer = function (type, name, prototype, conditions) + return Baseless.Make.EntityWithHealth(type or "linked-container", name, Merge( + { + inventory_size = 1, + }, + prototype + ), conditions) +end diff --git a/prototypes/constructors/Entity/EntityWithHealth/SpiderLeg.lua b/prototypes/constructors/Entity/EntityWithHealth/SpiderLeg.lua index ccbb4cf..1f2d2ce 100644 --- a/prototypes/constructors/Entity/EntityWithHealth/SpiderLeg.lua +++ b/prototypes/constructors/Entity/EntityWithHealth/SpiderLeg.lua @@ -3,9 +3,11 @@ Baseless.Make.SpiderLeg = function (name, prototype) { graphics_set = {}, initial_movement_speed = 0, + minimal_step_size = 0, movement_acceleration = 0, movement_based_position_selection_distance = 0, part_length = 1, + target_position_randomisation_distance = 0, }, prototype )) diff --git a/prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable.lua b/prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable.lua index 15586af..41e4870 100644 --- a/prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable.lua +++ b/prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable.lua @@ -31,6 +31,8 @@ Baseless.Make.TransportBeltConnectable = function (type, name, prototype, condit speed = 0, belt_animation_set = AnimationSet, collision_box = Baseless.Data.BoundingBox, + tile_width = 1, + tile_height = 1, }, prototype ), conditions) diff --git a/prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable/LinkedBelt.lua b/prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable/LinkedBelt.lua new file mode 100644 index 0000000..8226030 --- /dev/null +++ b/prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable/LinkedBelt.lua @@ -0,0 +1,12 @@ +Baseless.Make.LinkedBelt = function (name, prototype) + return Baseless.Make.TransportBeltConnectable("linked-belt", name, Merge( + { + structure = + { + direction_in = Baseless.Graphics.Sprite4Way, + direction_out = Baseless.Graphics.Sprite4Way, + }, + }, + prototype + )) +end diff --git a/prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable/Loader1x2.lua b/prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable/Loader1x2.lua index 343bb5f..54af88d 100644 --- a/prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable/Loader1x2.lua +++ b/prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable/Loader1x2.lua @@ -7,6 +7,7 @@ Baseless.Make.Loader1x2 = function (name, prototype) direction_in = Baseless.Graphics.Sprite4Way, direction_out = Baseless.Graphics.Sprite4Way, }, + tile_height = 2, }, prototype )) diff --git a/prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable/Splitter.lua b/prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable/Splitter.lua index d91f4f3..d439dae 100644 --- a/prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable/Splitter.lua +++ b/prototypes/constructors/Entity/EntityWithHealth/TransportBeltConnectable/Splitter.lua @@ -2,6 +2,7 @@ Baseless.Make.Splitter = function (name, prototype) return Baseless.Make.TransportBeltConnectable("splitter", name, Merge( { structure = Baseless.Graphics.Animation4Way, + tile_width = 2, }, prototype )) diff --git a/prototypes/constructors/Entity/EntityWithHealth/Vehicle/SpiderVehicle.lua b/prototypes/constructors/Entity/EntityWithHealth/Vehicle/SpiderVehicle.lua index dde8100..586c15d 100644 --- a/prototypes/constructors/Entity/EntityWithHealth/Vehicle/SpiderVehicle.lua +++ b/prototypes/constructors/Entity/EntityWithHealth/Vehicle/SpiderVehicle.lua @@ -15,7 +15,7 @@ Baseless.Make.SpiderVehicle = function (name, prototype) leg = Baseless.Data.SpiderLeg, mount_position = Baseless.Data.Vector.Zero, ground_position = Baseless.Data.Vector.Zero, - blocking_legs = Baseless.Data.Vector.Zero, + blocking_legs = {}, }, }, }, diff --git a/prototypes/entity.lua b/prototypes/entity.lua index 2f37d63..cf709dd 100644 --- a/prototypes/entity.lua +++ b/prototypes/entity.lua @@ -50,6 +50,8 @@ Baseless.RegisterIfUnique { Baseless.Make.Lab(), Baseless.Make.Lamp(), Baseless.Make.LandMine(), + Baseless.Make.LinkedBelt(), + Baseless.Make.LinkedContainer(), Baseless.Make.Loader1x1(), Baseless.Make.Loader1x2(), Baseless.Make.Locomotive(), diff --git a/prototypes/map-settings.lua b/prototypes/map-settings.lua index 1dbd151..a8b619c 100644 --- a/prototypes/map-settings.lua +++ b/prototypes/map-settings.lua @@ -108,12 +108,15 @@ Baseless.RegisterIfUnique { start_to_goal_cost_multiplier_to_terminate_path_find = 2000.0, overload_levels = {0, 100, 500}, overload_multipliers = {2, 3, 4}, + negative_path_cache_delay_interval = 20, }, max_failed_behavior_count = 3, difficulty_settings = { recipe_difficulty = defines.difficulty_settings.recipe_difficulty.normal, technology_difficulty = defines.difficulty_settings.technology_difficulty.normal, + technology_price_multiplier = 1, + research_queue_setting = "after-victory", }, }, }