From 9513dc1a43d6d9ae02c6a9edd4fd37e0bce9062a Mon Sep 17 00:00:00 2001
From: David Skrundz <david@skrundz.ca>
Date: Fri, 14 Aug 2020 20:12:30 -0600
Subject: [PATCH] Update for 1.0

---
 Baseless/Data.lua                             | 14 ++++++-----
 changelog.txt                                 |  5 ++++
 info.json                                     |  4 ++--
 prototypes/conditional.lua                    | 10 ++++----
 prototypes/constructors.lua                   |  4 +++-
 prototypes/constructors/Entity/FlyingText.lua |  9 -------
 prototypes/constructors/Entity/SpiderLeg.lua  | 12 ++++++++++
 .../constructors/Entity/SpiderVehicle.lua     | 24 +++++++++++++++++++
 .../constructors/Item/SpidertronRemote.lua    |  8 +++++++
 prototypes/entity.lua                         |  5 ++--
 prototypes/item.lua                           |  1 +
 prototypes/required.lua                       |  6 ++---
 12 files changed, 74 insertions(+), 28 deletions(-)
 delete mode 100644 prototypes/constructors/Entity/FlyingText.lua
 create mode 100644 prototypes/constructors/Entity/SpiderLeg.lua
 create mode 100644 prototypes/constructors/Entity/SpiderVehicle.lua
 create mode 100644 prototypes/constructors/Item/SpidertronRemote.lua

diff --git a/Baseless/Data.lua b/Baseless/Data.lua
index 517d4f2..a96bdd5 100644
--- a/Baseless/Data.lua
+++ b/Baseless/Data.lua
@@ -8,24 +8,26 @@ Baseless.Data.Effect = {}
 Baseless.Data.Energy = "1W"
 Baseless.Data.FluidBox = {pipe_connections = {}}
 Baseless.Data.ModuleSpecification = {}
-Baseless.Data.SelectionType = "not-allowed"
 Baseless.Data.SelectionMode = {"nothing"}
+Baseless.Data.SelectionType = "not-allowed"
 Baseless.Data.SpeechBubbleStyle = "compilatron_speech_bubble"
 
 Baseless.Data.AmmoType = {category = "dummy-ammo-category"}
+Baseless.Data.CurvedRailEntity = "dummy-curved-rail"
 Baseless.Data.EquipmentType = "dummy-equipment-category"
+Baseless.Data.Fluid = "dummy-fluid"
 Baseless.Data.FuelType = "dummy-fuel-category"
+Baseless.Data.Group = "other"
+Baseless.Data.GunItem = "dummy-gun"
 Baseless.Data.ModuleType = "dummy-module-category"
+Baseless.Data.Particle = "dummy-optimized-particle"
 Baseless.Data.RecipeType = "dummy-recipe-category"
 Baseless.Data.ResourceType = "dummy-resource-category"
-Baseless.Data.Fluid = "dummy-fluid"
-Baseless.Data.Group = "other"
-Baseless.Data.CurvedRailEntity = "dummy-curved-rail"
 Baseless.Data.RocketEntity = "dummy-rocket-silo-rocket"
+Baseless.Data.SimpleEntityWithForce = "dummy-simple-entity-with-force"
+Baseless.Data.SpiderLeg = "dummy-spider-leg"
 Baseless.Data.StraightRailEntity = "dummy-straight-rail"
 Baseless.Data.UnitEntity = "dummy-unit"
-Baseless.Data.GunItem = "dummy-gun"
-Baseless.Data.Particle = "dummy-optimized-particle"
 
 Baseless.Data.AttackParameters =
 {
diff --git a/changelog.txt b/changelog.txt
index e0e6d6b..3efaaa0 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.0.0
+Date: 14.08.2020
+  Features:
+    - Update for 1.0
+---------------------------------------------------------------------------------------------------
 Version: 0.0.2
 Date: 11.08.2020
   Features:
diff --git a/info.json b/info.json
index c53aae2..d8afe41 100644
--- a/info.json
+++ b/info.json
@@ -1,11 +1,11 @@
 {
 	"name": "Baseless",
-	"version": "0.0.2",
+	"version": "1.0.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": "0.18",
+	"factorio_version": "1.0",
 	"dependencies": []
 }
diff --git a/prototypes/conditional.lua b/prototypes/conditional.lua
index 1d8a162..a8b3b74 100644
--- a/prototypes/conditional.lua
+++ b/prototypes/conditional.lua
@@ -9,14 +9,14 @@ end
 RegisterConditionals {
   AmmoType = Baseless.Make.AmmoCategory(),
   EquipmentType = Baseless.Make.EquipmentCategory(),
+  Fluid = Baseless.Make.Fluid(),
   FuelType = Baseless.Make.FuelCategory(),
-  ModuleType = Baseless.Make.ModuleCategory(),
-  ResourceType = Baseless.Make.ResourceCategory(),
-  RecipeType = Baseless.Make.RecipeCategory(),
   GunItem = Baseless.Make.Gun(),
+  ModuleType = Baseless.Make.ModuleCategory(),
+  Particle = Baseless.Make.Particle(),
   RailEntity = { Baseless.Make.CurvedRail(), Baseless.Make.StraightRail()} ,
+  RecipeType = Baseless.Make.RecipeCategory(),
+  ResourceType = Baseless.Make.ResourceCategory(),
   RocketEntity = Baseless.Make.RocketSiloRocket(),
   UnitEntity = Baseless.Make.Unit(),
-  Fluid = Baseless.Make.Fluid(),
-  Particle = Baseless.Make.Particle(),
 }
diff --git a/prototypes/constructors.lua b/prototypes/constructors.lua
index a0b81a2..1d6af57 100644
--- a/prototypes/constructors.lua
+++ b/prototypes/constructors.lua
@@ -30,7 +30,6 @@ require("prototypes.constructors.Entity.EntityWithHealth")
 require("prototypes.constructors.Entity.Explosion")
 require("prototypes.constructors.Entity.FireFlame")
 require("prototypes.constructors.Entity.FluidStream")
-require("prototypes.constructors.Entity.FlyingText")
 require("prototypes.constructors.Entity.HighlightBoxEntity")
 require("prototypes.constructors.Entity.ItemEntity")
 require("prototypes.constructors.Entity.ItemRequestProxy")
@@ -41,6 +40,8 @@ require("prototypes.constructors.Entity.RocketSiloRocket")
 require("prototypes.constructors.Entity.RocketSiloRocketShadow")
 require("prototypes.constructors.Entity.Smoke")
 require("prototypes.constructors.Entity.SpeechBubble")
+require("prototypes.constructors.Entity.SpiderLeg")
+require("prototypes.constructors.Entity.SpiderVehicle")
 require("prototypes.constructors.Entity.Sticker")
 require("prototypes.constructors.Entity.TileGhost")
 require("prototypes.constructors.Entity.Corpse.RailRemnants")
@@ -141,6 +142,7 @@ require("prototypes.constructors.Item.ItemWithEntityData")
 require("prototypes.constructors.Item.ItemWithLabel")
 require("prototypes.constructors.Item.Module")
 require("prototypes.constructors.Item.RailPlanner")
+require("prototypes.constructors.Item.SpidertronRemote")
 require("prototypes.constructors.Item.Tool")
 require("prototypes.constructors.Item.ItemWithLabel.ItemWithInventory")
 require("prototypes.constructors.Item.ItemWithLabel.ItemWithTags")
diff --git a/prototypes/constructors/Entity/FlyingText.lua b/prototypes/constructors/Entity/FlyingText.lua
deleted file mode 100644
index 0435ec3..0000000
--- a/prototypes/constructors/Entity/FlyingText.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-Baseless.Make.FlyingText = function (name, prototype)
-  return Baseless.Make.Entity("flying-text", name, Merge(
-    {
-      speed = 0,
-      time_to_live = 0,
-    },
-    prototype
-  ))
-end
diff --git a/prototypes/constructors/Entity/SpiderLeg.lua b/prototypes/constructors/Entity/SpiderLeg.lua
new file mode 100644
index 0000000..94fae60
--- /dev/null
+++ b/prototypes/constructors/Entity/SpiderLeg.lua
@@ -0,0 +1,12 @@
+Baseless.Make.SpiderLeg = function (name, prototype)
+  return Baseless.Make.Entity("spider-leg", name, Merge(
+    {
+      part_length = 1,
+      initial_movement_speed = 0,
+      movement_acceleration = 0,
+      movement_based_position_selection_distance = 0,
+      graphics_set = {},
+    },
+    prototype
+  ))
+end
diff --git a/prototypes/constructors/Entity/SpiderVehicle.lua b/prototypes/constructors/Entity/SpiderVehicle.lua
new file mode 100644
index 0000000..d476b54
--- /dev/null
+++ b/prototypes/constructors/Entity/SpiderVehicle.lua
@@ -0,0 +1,24 @@
+Baseless.Make.SpiderVehicle = function (name, prototype)
+  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,
+      chain_shooting_cooldown_modifier = 1,
+      graphics_set = {},
+      spider_engine = {
+        military_target = Baseless.Data.SimpleEntityWithForce,
+        legs = {
+          leg = Baseless.Data.SpiderLeg,
+          mount_position = Baseless.Data.Vector.Zero,
+          ground_position = Baseless.Data.Vector.Zero,
+          blocking_legs = Baseless.Data.Vector.Zero,
+        },
+      },
+    },
+    prototype
+  ), {"FuelType"})
+end
diff --git a/prototypes/constructors/Item/SpidertronRemote.lua b/prototypes/constructors/Item/SpidertronRemote.lua
new file mode 100644
index 0000000..f77bcf0
--- /dev/null
+++ b/prototypes/constructors/Item/SpidertronRemote.lua
@@ -0,0 +1,8 @@
+Baseless.Make.SpidertronRemote = function (name, prototype)
+  return Baseless.Make.Item("spidertron-remote", name, Merge(
+    {
+      icon_color_indicator_mask = Baseless.Graphics.Image1,
+    },
+    prototype
+  ))
+end
diff --git a/prototypes/entity.lua b/prototypes/entity.lua
index 3618b32..2f37d63 100644
--- a/prototypes/entity.lua
+++ b/prototypes/entity.lua
@@ -36,7 +36,6 @@ Baseless.RegisterIfUnique {
   Baseless.Make.FluidStream(),
   Baseless.Make.FluidTurret(),
   Baseless.Make.FluidWagon(),
-  Baseless.Make.FlyingText(),
   Baseless.Make.Furnace(),
   Baseless.Make.Gate(),
   Baseless.Make.Generator(),
@@ -68,8 +67,8 @@ Baseless.RegisterIfUnique {
   Baseless.Make.Projectile(),
   Baseless.Make.Pump(),
   Baseless.Make.Radar(),
-  Baseless.Make.RailRemnants(),
   Baseless.Make.RailChainSignal(),
+  Baseless.Make.RailRemnants(),
   Baseless.Make.RailSignal(),
   Baseless.Make.Reactor(),
   Baseless.Make.ResourceEntity(),
@@ -82,6 +81,8 @@ Baseless.RegisterIfUnique {
   Baseless.Make.SmokeWithTrigger(),
   Baseless.Make.SolarPanel(),
   Baseless.Make.SpeechBubble(),
+  Baseless.Make.SpiderLeg(),
+  Baseless.Make.SpiderVehicle(),
   Baseless.Make.Splitter(),
   Baseless.Make.Sticker(),
   Baseless.Make.StorageTank(),
diff --git a/prototypes/item.lua b/prototypes/item.lua
index 2f4cd64..0541def 100644
--- a/prototypes/item.lua
+++ b/prototypes/item.lua
@@ -14,6 +14,7 @@ Baseless.RegisterIfUnique {
   Baseless.Make.RailPlanner(),
   Baseless.Make.RepairTool(),
   Baseless.Make.SelectionTool(),
+  Baseless.Make.SpidertronRemote(),
   Baseless.Make.Tool(),
   Baseless.Make.UpgradeItem(),
 }
diff --git a/prototypes/required.lua b/prototypes/required.lua
index 0d790d0..ee65667 100644
--- a/prototypes/required.lua
+++ b/prototypes/required.lua
@@ -1,17 +1,17 @@
 Baseless.RegisterIfNew {
   Baseless.Make.Base("trigger-target-type", "ground-unit", {}),
-  Baseless.Make.DamageType("physical", {}),
   Baseless.Make.DamageType("impact", {}),
+  Baseless.Make.DamageType("physical", {}),
   Baseless.Make.EquipmentGrid("small-equipment-grid", {}),
   Baseless.Make.Item(nil, "copper-cable", {}),
-  Baseless.Make.Item(nil, "red-wire", {}),
   Baseless.Make.Item(nil, "green-wire", {}),
+  Baseless.Make.Item(nil, "red-wire", {}),
   Baseless.Make.RecipeCategory("crafting", {}),
   Baseless.Make.ResourceCategory("basic-solid", {}),
   Baseless.Make.TrivialSmoke("smoke-building", {}),
-  Baseless.Make.VirtualSignal("signal-everything", {}),
   Baseless.Make.VirtualSignal("signal-anything", {}),
   Baseless.Make.VirtualSignal("signal-each", {}),
+  Baseless.Make.VirtualSignal("signal-everything", {}),
 }
 
 if Baseless.RegisterIfNew(