Release refining update

.gitignore

@@ -1,5 +1,10 @@
+# Factorio files
 *.zip
 *.dat
 mod-list.json
+# Python
+__pycache__/
+# IDE config
 .idea/
 .vscode/
+run_unit_tests_PWJ.bat

Config_Testing_Regime.txt

@@ -0,0 +1,86 @@
+-------------------------------
+-- Special Vanilla ------------
+-------------------------------
+Refining
+Petrochem
+Smelting
+Bioprocessing
+Industries (no overhaul)
+-------------------------------
+-- Special VanillaBobs --------
+-- This is with NO bobplates
+-- Quite likely to break things
+--[[ Add each in isolation:
+== boblogistics
+== bobassembly
+== bobelectronics
+== bobmodules
+== bobpower
+== bobmining
+== bobrevamp
+== bobwarfare ]]
+-- Run full bobs (minus plates)
+-------------------------------
+Refining
+Petrochem
+Smelting
+Bioprocessing
+Industries (no overhaul)
+-------------------------------
+-- Full Angels ----------------
+-------------------------------
+Industries (overhaul)
+Industries (components)
+Industries (tech)
+Exploration (no comp/tech)
+-------------------------------
+-- ANGELBOBS ------------------
+-- This is with bobplates/ores
+-- considered standard set
+-- default bob settings
+--[[ Add each in isolation:
+== boblogistics
+== bobassembly
+== bobelectronics
+== bobmodules
+== bobpower
+== bobmining
+== bobrevamp
+== bobwarfare ]]
+-- Run full bobs
+-------------------------------
+Refining
+Petrochem
+Smelting
+Bioprocessing
+Industries (no overhaul)
+Industries (overhaul)
+Industries (components)
+Industries (tech)
+Exploration (no comp/tech)
+-------------------------------
+-- BOB Configs ----------------
+-- Run with Industries (Overhaul)
+-- Each mod in isolation
+-- with and without plates
+-------------------------------
+-- Assembly: Burner/steam assembling machines
+-- Assembly: IF CHANGED ANY OF THE OTHER UNITS
+--== those settings
+-- Logistics: Belt overhaul (not the speed overhaul)
+-- Logistics: Inserterter overhaul
+-- Plates: New Steel (should be forced and hidden with smelting?)
+-- Plates: Nuclear fuel update
+-- Mining: Large area Mining
+-- Mining: Steam mining drills
+-- Mining: Water mining pumpjacks
+-- Ores: Enable water ores
+-- Ores: Enable infinite (should be off and hidden with refining?)
+-- Power: New nuclear generators
+-- Power: Fluid burning generators
+-- Power: Burner and fluid powered heat sources
+-- Power: New steam power related entities
+-- Revamp: Extra Chemistry
+-- Revamp: Nuclear power overhaul
+-- Revamp: RTG
+-- Tech: Burner phase

angelsaddons-cab/changelog.txt

@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.2.8
+Date: ##.##.202#
+  Changes:
+    - Added tips and tricks for the CAB
+---------------------------------------------------------------------------------------------------
 Version: 0.2.7
 Date: 26.05.2021
   Changes:

angelsaddons-cab/data-updates.lua

@@ -1,5 +1,6 @@
 require("prototypes.recipes.cab-updates")
-require "prototypes.entities.cab-updates"
+require("prototypes.entities.cab-updates")
+require("prototypes.tips-and-tricks.tips-and-tricks")
 
 if angelsmods.industries then
   local OV = angelsmods.functions.OV

angelsaddons-cab/info.json

@@ -1,14 +1,14 @@
 {
   "name": "angelsaddons-cab",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "factorio_version": "1.1",
   "title": "Angel's Addons - C.A.B.",
   "author": "Arch666Angel, lovely_santa",
   "contact": "",
   "homepage": "",
   "description": "Adds another type of Crawler.",
   "dependencies": [
-     "? angelsindustries >= 0.4.9",
+     "? angelsindustries >= 0.4.14",
      "base >= 1.1.33"
   ]
 }

angelsaddons-cab/locale/en/cab.cfg

@@ -58,3 +58,11 @@ angels-cab-energy-transfer-rate=__1__ power transfer
 
 [mod-setting-description]
 angels-cab-energy-transfer-rate=The power transfer this transfer port can deliver, in watts.\nDefault: __1__ W
+
+
+[tips-and-tricks-name]
+angelsaddons-cab=Crawler Autonomous Base (C.A.B.)
+
+[tips-and-tricks-description]
+angelsaddons-cab=The highly experimental crawler is an drivable vehicle that can draw and provide power to a network. This can allow for a temporary mobile crafting site while out exploring the map. More features are planned.
+angelsaddons-cab-notes=\n\n[font=default-bold]NOTES[/font]: To operate simply set the vehicle in deployed mode to provide the power to the network the vehicle is residing in.\nPower may be supplied by mobile generators or specialised charged batteries.

angelsaddons-cab/prototypes/entities/cab.lua

@@ -655,7 +655,7 @@ data:extend(
     icon = "__angelsaddons-cab__/graphics/icons/cab-icon.png",
     icon_size = 32,
     flags = {"not-blueprintable", "not-deconstructable", "not-on-map", "hide-alt-info"},
-    --minable = {hardness = 0.2, mining_time = 0.5, result = "medium-electric-pole"},
+    --minable = {mining_time = 0.5, result = "medium-electric-pole"},
     max_health = 200,
     corpse = "small-remnants",
     track_coverage_during_build_by_moving = false,

angelsaddons-cab/prototypes/entities/equipment.lua

@@ -116,7 +116,7 @@ data:extend{{
   flags = {"not-blueprintable", "not-deconstructable", "not-on-map", "hide-alt-info"},
   enable_gui = false,
   allow_copy_paste = false,
-  --minable = {hardness = 0.2, mining_time = 1, result = energyInterfaceItem.name},
+  --minable = {mining_time = 1, result = energyInterfaceItem.name},
   max_health = 50,
   corpse = "small-remnants",
   collision_box = {{-0.35, -0.35}, {0.35, 0.35}},
@@ -238,7 +238,7 @@ data:extend{{
   flags = {"not-blueprintable", "not-deconstructable", "not-on-map", "hide-alt-info"},
   enable_gui = false,
   allow_copy_paste = false,
-  --minable = {hardness = 0.2, mining_time = 1, result = energyInterfaceItem.name},
+  --minable = {mining_time = 1, result = energyInterfaceItem.name},
   max_health = 50,
   corpse = "small-remnants",
   collision_box = {{-0.35, -0.35}, {0.35, 0.35}},

angelsaddons-cab/prototypes/tips-and-tricks/1-angelsaddons-cab/1-angelsaddons-cab-description.lua

@@ -0,0 +1,5 @@
+return {
+  "",
+  {"tips-and-tricks-description.angelsaddons-cab"},
+  {"tips-and-tricks-description.angelsaddons-cab-notes"}
+}

angelsaddons-cab/prototypes/tips-and-tricks/1-angelsaddons-cab/1-angelsaddons-cab.lua

@@ -0,0 +1,33 @@
+data:extend(
+  {
+    {
+      type = "tips-and-tricks-item-category",
+      name = "angelsaddons-cab",
+      order = "c-aa[angesaddons-cab]"
+    },
+
+    {
+      type = "tips-and-tricks-item",
+      name = "angelsaddons-cab",
+
+      is_title = true,
+      tag = "[entity=angels-cab]",
+      localised_name = {"tips-and-tricks-name.angelsaddons-cab"},
+      localised_description = require "prototypes.tips-and-tricks.1-angelsaddons-cab.1-angelsaddons-cab-description",
+
+      category = "angelsaddons-cab",
+      order = "aa-[cab]",
+      indent = 0,
+
+      starting_status = "locked",
+      dependencies = nil,
+      trigger =
+      {
+        type = "research",
+        technology = "angels-cab"
+      },
+
+      --simulation = require "prototypes.tips-and-tricks.1-angelsaddons-cab.1-angelsaddons-cab-simulation",
+    }
+  }
+)

angelsaddons-cab/prototypes/tips-and-tricks/tips-and-tricks.lua

@@ -0,0 +1 @@
+require("prototypes.tips-and-tricks.1-angelsaddons-cab.1-angelsaddons-cab")

angelsaddons-liquidrobot/prototypes/entities/liquid-robot-generator.lua

@@ -52,13 +52,12 @@ function make_fluid_robot()
       icons = bot_icon,
       icon_size = 32,
       flags = {"placeable-player", "player-creation", "placeable-off-grid", "not-on-map"},
-      minable = {hardness = 0.1, mining_time = 0.1, result = bot_name},
+      minable = {mining_time = 0.1, result = bot_name},
       max_health = 100,
       collision_box = {{0, 0}, {0, 0}},
       selection_box = {{-0.5, -1.5}, {0.5, -0.5}},
       max_payload_size = 1,
       speed = 0.02,
-      transfer_distance = 0.5,
       max_energy = "300kJ",
       energy_per_tick = "0.005kJ",
       speed_multiplier_when_out_of_energy = 0.8,

angelsaddons-liquidrobot/prototypes/entities/liquid-robot.lua

@@ -19,13 +19,12 @@ data:extend(
       icon = "__angelsaddons-liquidrobot__/graphics/icons/bot-ico.png",
       icon_size = 32,
       flags = {"placeable-player", "player-creation", "placeable-off-grid", "not-on-map"},
-      minable = {hardness = 0.1, mining_time = 0.1, result = "empty-liquid-bot"},
+      minable = {mining_time = 0.1, result = "empty-liquid-bot"},
       max_health = 100,
       collision_box = {{0, 0}, {0, 0}},
       selection_box = {{-0.5, -1.5}, {0.5, -0.5}},
       max_payload_size = 1,
       speed = 0.02,
-      transfer_distance = 0.5,
       max_energy = "300kJ",
       energy_per_tick = "0.005kJ",
       speed_multiplier_when_out_of_energy = 0.8,

angelsaddons-liquidrobot/prototypes/liquidbot-category.lua

@@ -4,7 +4,6 @@ data:extend(
       type = "item-group",
       name = "liquid-bot",
       order = "ld",
-      inventory_order = "ld",
       icon = "__angelsaddons-liquidrobot__/graphics/technology/bot-tech.png",
       scale = 0.5,
       icon_size = 128

angelsaddons-mobility/changelog.txt

@@ -1,8 +1,10 @@
 ---------------------------------------------------------------------------------------------------
 Version: 0.0.9
-Date: 03.08.2021
+Date: 10.08.2021
   Features:
     - Added compatibility for grid equipment from "Power Armor MK3" & "Portable Power" mods
+    - Added some basic tips and tricks for the trains
+    - Superfluous property clean-up
 ---------------------------------------------------------------------------------------------------
 Version: 0.0.8
 Date: 26.05.2021

angelsaddons-mobility/data-final-fixes.lua

@@ -1,4 +1,5 @@
-local funcs = require("prototypes/train-functions")
+local funcs = require("prototypes.train-functions")
+require("prototypes.tips-and-tricks.tips-and-tricks")
 
 local wagons = {
   angelsmods.addons.mobility.petrotrain.tier_amount >= 1 and "petro-tank1" or nil,

angelsaddons-mobility/locale/en/tips-and-tricks.cfg

@@ -0,0 +1,6 @@
+[tips-and-tricks-name]
+angelsaddons-mobility=Angel's Addons (Mass Transit) Mobility
+
+[tips-and-tricks-description]
+angelsaddons-mobility=This mod adds a variety of angels themed trains independantly of angels modset.\nThe three themed trains include [img=item/crawler-locomotive]Crawler, [img=item/smelting-locomotive-1]Smelting, and [img=item/petro-locomotive-1]Petrochem.\nEach train theme has different working values such as mass, power, capacity, braking, and max speed.\n\n[font=default-bold]NOTES[/font]: Each train (with some small exceptions) has compatible copy/paste information including schedule, color, and these are also blueprint compatible.
+angelsaddons-mobility-notes=\n[font=default-bold]NOTES[/font]:Tenders are locomotives with high air resistance, but high power, good as a secondary locomotive for larger trains.\n[font=default-bold]NOTES[/font]:Bot wagons are cargo wagons which can use roboport equipment.

angelsaddons-mobility/prototypes/entities/crawler-bot-wagon.lua

@@ -102,7 +102,6 @@ funcs.generate_train_entities(
       shift = {0, -0.75}
     },
     wheels = standard_train_wheels,
-    rail_category = "regular",
     drive_over_tie_trigger = drive_over_tie(),
     tie_distance = 50,
     working_sound = {

angelsaddons-mobility/prototypes/entities/crawler-locomotive-wagon.lua

@@ -165,7 +165,6 @@ funcs.generate_train_entities(
       shift = {0.0, -0.75}
     },
     wheels = standard_train_wheels,
-    rail_category = "regular",
     stop_trigger = {
       -- front left side
       {

angelsaddons-mobility/prototypes/entities/crawler-locomotive.lua

@@ -153,7 +153,6 @@ funcs.generate_train_entities(
       shift = {0.0, -0.75}
     },
     wheels = standard_train_wheels,
-    rail_category = "regular",
     stop_trigger = {
       -- left side
       {

angelsaddons-mobility/prototypes/entities/crawler-wagon.lua

@@ -101,7 +101,6 @@ funcs.generate_train_entities(
       shift = {0, -0.75}
     },
     wheels = standard_train_wheels,
-    rail_category = "regular",
     drive_over_tie_trigger = drive_over_tie(),
     tie_distance = 50,
     working_sound = {

angelsaddons-mobility/prototypes/entities/petro-locomotive.lua

@@ -206,7 +206,6 @@ funcs.generate_train_entities(
       }
     },
     wheels = standard_train_wheels,
-    rail_category = "regular",
     stop_trigger = {
       -- left side
       {

angelsaddons-mobility/prototypes/entities/petro-tank1.lua

@@ -47,48 +47,6 @@ funcs.generate_train_entities(
     collision_box = {{-0.6, -2.4}, {0.6, 2.4}},
     selection_box = {{-1, -2.703125}, {1, 3.296875}},
     color = tintable_tint,
-    gui_front_tank = {
-      filename = "__base__/graphics/entity/fluid-wagon/gui/front-tank.png",
-      width = 64,
-      height = 64,
-      flags = {"icon"}
-    },
-    gui_center_tank = {
-      filename = "__base__/graphics/entity/fluid-wagon/gui/center-tank.png",
-      width = 64,
-      height = 64,
-      flags = {"icon"}
-    },
-    gui_back_tank = {
-      filename = "__base__/graphics/entity/fluid-wagon/gui/back-tank.png",
-      width = 64,
-      height = 64,
-      flags = {"icon"}
-    },
-    gui_connect_front_center_tank = {
-      filename = "__base__/graphics/entity/fluid-wagon/gui/connector-front-center.png",
-      width = 64,
-      height = 64,
-      flags = {"icon"}
-    },
-    gui_connect_center_back_tank = {
-      filename = "__base__/graphics/entity/fluid-wagon/gui/connector-center-back.png",
-      width = 64,
-      height = 64,
-      flags = {"icon"}
-    },
-    gui_front_center_tank_indiciation = {
-      filename = "__base__/graphics/entity/fluid-wagon/gui/1.png",
-      width = 32,
-      height = 32,
-      flags = {"icon"}
-    },
-    gui_center_back_tank_indiciation = {
-      filename = "__base__/graphics/entity/fluid-wagon/gui/2.png",
-      width = 32,
-      height = 32,
-      flags = {"icon"}
-    },
     vertical_selection_shift = -0.796875,
     weight = 1000,
     max_speed = 1.5,
@@ -188,7 +146,6 @@ funcs.generate_train_entities(
       }
     },
     wheels = standard_train_wheels,
-    rail_category = "regular",
     drive_over_tie_trigger = drive_over_tie(),
     tie_distance = 50,
     working_sound = {