Vehicle auto refuel

.gitignore

@@ -2,3 +2,4 @@
 *.dat
 mod-list.json
 .idea/
+.vscode/

angelsaddons-cab/changelog.txt

@@ -1,4 +1,19 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.2.7
+Date:??
+  Changes:
+    - Changed and expanded locale strings and text descriptions (489)
+---------------------------------------------------------------------------------------------------
+Version: 0.2.6
+Date: 27.11.2020
+  Changes:
+    - Patched load-order issue when playing without angels
+---------------------------------------------------------------------------------------------------
+Version: 0.2.5
+Date: 26.11.2020
+  Changes:
+    - Update to Factorio version 1.1
+---------------------------------------------------------------------------------------------------
 Version: 0.2.4
 Date: 29.10.2020
   Changes:

angelsaddons-cab/info.json

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

angelsaddons-cab/locale/en/cab.cfg

@@ -2,7 +2,7 @@
 angels-cab=C.A.B.
 
 [entity-description]
-angels-cab=Crawler Autonomous Base
+angels-cab=Crawler Autonomous Base. Enter the vehicle and activate deployment charges to deploy the __ENTITY__angels-cab__. When deployed it will provide electric energy from its own grid to nearby buildings.
 
 [item-name]
 angels-cab-deploy=__ENTITY__angels-cab__ deploy

angelsaddons-cab/prototypes/entities/cab.lua

@@ -464,8 +464,8 @@ data:extend(
         }
       }
     },
-    subgroup = "angels-cab",
-    order = "d[cannon-shell]-a[basic]",
+    subgroup = mods["angelsindustries"] and "angels-vehicle-car" or "angels-cab",
+    order = mods["angelsindustries"] and "b[crawlers]-c" or "d[cannon-shell]-a[basic]",
     stack_size = 200
   },
   {
@@ -499,8 +499,8 @@ data:extend(
         }
       }
     },
-    subgroup = "angels-cab",
-    order = "d[cannon-shell]-a[basic]",
+    subgroup = mods["angelsindustries"] and "angels-vehicle-car" or "angels-cab",
+    order = mods["angelsindustries"] and "b[crawlers]-d" or "d[cannon-shell]-a[basic]",
     stack_size = 200
   },
   {

angelsaddons-cab/prototypes/entities/equipment.lua

@@ -54,8 +54,8 @@ data:extend{{
   icon = "__angelsaddons-cab__/graphics/icons/cab-energy-interface-mk1.png",
   icon_size = 32,
   placed_as_equipment_result = string.format(energyInterface.name, "-mk1"),
-  subgroup = "angels-cab",
-  order = "e[angels-cab-energy-interface]-a",
+  subgroup = mods["angelsindustries"] and "angels-vehicle-car" or "angels-cab",
+  order = mods["angelsindustries"] and "b[crawlers]-e" or "e[angels-cab-energy-interface]-a",
   stack_size = 50,
   default_request_amount = 10
 }}

angelsaddons-liquidrobot/info.json

@@ -1,7 +1,7 @@
 {
   "name": "angelsaddons-liquidrobot",
   "version": "0.2.1",
-  "factorio_version": "0.18",
+  "factorio_version": "1.1",
   "title": "Angel's Addons - Liquid Cargo Bot",
   "author": "Arch666Angel",
   "contact": "",

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

@@ -1,4 +1,4 @@
-local sounds = require("__base__/prototypes/entity/demo-sounds")
+local sounds = require("__base__/prototypes/entity/sounds")
 
 function make_fluid_robot()
   local result = {}

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

@@ -1,4 +1,4 @@
-local sounds = require("__base__/prototypes/entity/demo-sounds")
+local sounds = require("__base__/prototypes/entity/sounds")
 
 data:extend(
   {

angelsaddons-mobility/changelog.txt

@@ -1,4 +1,25 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.0.7
+Date: ??
+  Changes:
+    - Added HQ tier numbering icons
+    - Changed and expanded locale strings and text descriptions (489)
+---------------------------------------------------------------------------------------------------
+Version: 0.0.6
+Date: 20.01.2021
+  Bugfixes:
+    - Fixed that braking force was not increasing per tier
+---------------------------------------------------------------------------------------------------
+Version: 0.0.5
+Date: 27.11.2020
+  Bugfixes:
+    - Fixed bug on start-up load order introduced in last patch
+---------------------------------------------------------------------------------------------------
+Version: 0.0.4
+Date: 26.11.2020
+  Bugfixes:
+    - Updated to factorio version 1.1
+---------------------------------------------------------------------------------------------------
 Version: 0.0.3
 Date: 29.10.2020
   Changes:

angelsaddons-mobility/info.json

@@ -1,15 +1,15 @@
 {
   "name": "angelsaddons-mobility",
-  "version": "0.0.3",
-  "factorio_version": "1.0",
+  "version": "0.0.7",
+  "factorio_version": "1.1",
   "title": "Angel's Addons - Mass Transit",
   "author": "Arch666Angel, lovely_santa",
   "contact": "https://discord.gg/ff5p6KE",
   "homepage": "https://forums.factorio.com/viewforum.php?f=185",
   "description": "A combination mod of the various themed trains.",
   "dependencies": [
-    "base >= 1.0.0",
-
-    "? angelsindustries >= 0.4.5"
+    "base >= 1.1.0",
+    "(?) angelsrefining >= 0.11.20",
+    "? angelsindustries >= 0.4.9"
   ]
 }

angelsaddons-mobility/locale/en/crawlertrain.cfg

@@ -25,8 +25,21 @@ crawler-wagon=Crawler cargo wagon
 [technology-name]
 angels-crawler-train=Crawler train
 
+[entity-description]
+crawler-locomotive=Locomotive with the "Crawler" aesthetic.
+crawler-locomotive-wagon=Locomotive with the air resistance of a cargo wagon.
+crawler-bot-wagon=Can be equipped with a vehicle roboport for mobile construction works.
+
+crawler-locomotive-1-2=Locomotive with the "Crawler" aesthetic.
+crawler-locomotive-wagon-2=Locomotive with the air resistance of a cargo wagon.
+crawler-bot-wagon-2=Can be equipped with a vehicle roboport for mobile construction works.
+
+crawler-locomotive-1-3=Locomotive with the "Crawler" aesthetic.
+crawler-locomotive-wagon-3=Locomotive with the air resistance of a cargo wagon.
+crawler-bot-wagon-3=Can be equipped with a vehicle roboport for mobile construction works.
+
 [technology-description]
-angels-crawler-train=Crawler construction trains.
+angels-crawler-train=Trains with the "Crawler" aesthetic, come with robot wagons for mobile construction works.
 
 [mod-setting-name]
 angels-crawlertrain-tier-amount=Crawler train tiers (0 for off)

angelsaddons-mobility/locale/en/petrotrain.cfg

@@ -22,6 +22,22 @@ petro-tank2=PetroChem oil fluid wagon
 [technology-name]
 angels-petro-train=PetroChem trains
 
+[entity-description]
+petro-locomotive-1=Locomotive with the "Petrochemical" aesthetic.
+petro-tank1=High-capacity fluid wagon with an aesthetic suitable for gasses.
+petro-tank2=High-capacity fluid wagon with an aesthetic suitable for liquids.
+
+petro-locomotive-1-2=Locomotive with the "Petrochemical" aesthetic.
+petro-tank1-2=High-capacity fluid wagon with an aesthetic suitable for gasses.
+petro-tank2-2=High-capacity fluid wagon with an aesthetic suitable for liquids.
+
+petro-locomotive-1-3=Locomotive with the "Petrochemical" aesthetic.
+petro-tank1-3=High-capacity fluid wagon with an aesthetic suitable for gasses.
+petro-tank2-3=High-capacity fluid wagon with an aesthetic suitable for liquids.
+
+[technology-description]
+angels-petro-train=Trains with the "Petrochemical" aesthetic, come with high-capacity fluid wagons for liquids or gasses.
+
 [mod-setting-name]
 angels-petrotrain-tier-amount=Petrochem train tiers (0 for off)
 

angelsaddons-mobility/locale/en/smeltingtrain.cfg

@@ -22,6 +22,19 @@ smelting-wagon-1=Smelting cargo wagon
 [technology-name]
 angels-smelting-train=Smelting trains
 
+[entity-description]
+smelting-locomotive-1=Locomotive with the "Smelting" aesthetic.
+smelting-locomotive-tender=Locomotive with the air resistance of a cargo wagon.
+
+smelting-locomotive-1-2=Locomotive with the "Smelting" aesthetic.
+smelting-locomotive-tender-2=Locomotive with the air resistance of a cargo wagon.
+
+smelting-locomotive-1-3=Locomotive with the "Smelting" aesthetic.
+smelting-locomotive-tender-3=Locomotive with the air resistance of a cargo wagon.
+
+[technology-description]
+angels-smelting-train=Trains with the "Smelting" aesthetic, come with high-capacity cargo wagons.
+
 [mod-setting-name]
 angels-smeltingtrain-tier-amount=Smelting train tiers (0 for off)
 

angelsaddons-mobility/prototypes/train-functions.lua

@@ -163,6 +163,26 @@ local function generate_train_recipe(item, add_unlock)
   data:extend(entries)
 end
 
+local add_tier_number = mods["angelsrefining"] and
+  angelsmods.functions.add_number_icon_layer or
+  function(icon_layers, number_tier, number_tint)
+    local icon_size_scale = ((icon_layers[1] or {}).icon_size or 32) * ((icon_layers[1] or {}).scale or 1) / 32
+    local new_icon_layers = util.table.deepcopy(icon_layers)
+    table.insert(new_icon_layers, {
+      icon = "__angelsaddons-mobility__/graphics/icons/numerals/num-"..number_tier.."-outline.png",
+      icon_size = 64, icon_mipmaps = 2,
+      tint = {0, 0, 0, 255},
+      scale = 0.5 * icon_size_scale
+    })
+    table.insert(new_icon_layers, {
+      icon = "__angelsaddons-mobility__/graphics/icons/numerals/num-"..number_tier..".png",
+      icon_size = 64, icon_mipmaps = 2,
+      tint = number_tint,
+      scale = 0.5 * icon_size_scale
+    })
+    return new_icon_layers
+  end
+
 local function generate_train_items(item)
   local entries = {}
   local type = set_type(item.name)
@@ -179,19 +199,17 @@ local function generate_train_items(item)
       copy.localised_name = {"", {"item-name." .. item.name}, " MK" .. i}
       copy.localised_description = {"item-description." .. item.name}
       copy.place_result = name
-      copy.icons = {
+      copy.icons = item.icons or {
         {
           icon = item.icon,
-          icon_size = item.icon_size
-        },
-        {
-          icon = "__angelsaddons-mobility__/graphics/icons/num_" .. i .. ".png",
-          tint = angelsmods.addons.mobility[type].number_tint,
-          scale = 0.32,
-          shift = {12, -12}
+          icon_size = item.icon_size,
+          icon_mipmaps = item.icon_mipmaps
         }
       }
       copy.icon = nil
+      copy.icon_size = nil
+      copy.icon_mipmaps = nil
+      copy.icons = add_tier_number(copy.icons, i, angelsmods.addons.mobility[type].number_tint)
       table.insert(entries, copy)
     end
   else
@@ -219,25 +237,24 @@ local function generate_train_entities(item)
 
       copy.name = name
       copy.localised_name = {"", {"entity-name." .. item.name}, " MK" .. i}
-      copy.icons = {
+      copy.icons = item.icons or {
         {
           icon = item.icon,
-          icon_size = item.icon_size
-        },
-        {
-          icon = "__angelsaddons-mobility__/graphics/icons/num_" .. i .. ".png",
-          tint = angelsmods.addons.mobility[type].number_tint,
-          scale = 0.32,
-          shift = {12, -12}
+          icon_size = item.icon_size,
+          icon_mipmaps = item.icon_mipmaps
         }
       }
       copy.icon = nil
+      copy.icon_size = nil
+      copy.icon_mipmaps = nil
+      copy.icons = add_tier_number(copy.icons, i, angelsmods.addons.mobility[type].number_tint)
       copy.minable.result = name
       copy.max_health = item.max_health * multiplier
       copy.max_speed = item.max_speed * multiplier
       copy.friction_force = item.friction_force / multiplier
       copy.air_resistance = item.air_resistance / multiplier
       copy.weight = item.weight * multiplier
+      copy.braking_force = item.braking_force * (multiplier * 2 - 1)
       if item.type == "locomotive" then
         copy.max_power = (tonumber(item.max_power:match("%d[%d.]*")) * multiplier) .. "kW"
         copy.reversing_power_modifier = item.reversing_power_modifier * multiplier

angelsaddons-nilaus/changelog.txt

@@ -1,4 +1,14 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.3.12
+Date: 27.11.2020
+  Changes:
+    - Patched to work without angels (after oversight in last patch)
+---------------------------------------------------------------------------------------------------
+Version: 0.3.11
+Date: 26.11.2020
+  Changes:
+    - Updated to factorio version 1.1
+---------------------------------------------------------------------------------------------------
 Version: 0.3.10
 Date: 17.07.2020
   Changes:

angelsaddons-nilaus/info.json

@@ -1,13 +1,13 @@
 {
   "name": "angelsaddons-nilaus",
-  "version": "0.3.10",
-  "factorio_version": "0.18",
+  "version": "0.3.12",
+  "factorio_version": "1.1",
   "title": "Angel's Addons - Decorations - Nilaus",
   "author": "Arch666Angel",
   "contact": "",
   "homepage": "https://forums.factorio.com/viewtopic.php?f=185&t=30962",
   "description": "",
   "dependencies": [
-    "base >= 0.18.27"
+    "base >= 1.1.0"
   ]
-}
+}

angelsaddons-shred/changelog.txt

@@ -1,4 +1,24 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.2.7
+Date: 9.12.2020
+  Bugfixes:
+    - Fixed typo in changelog for version 2.6
+---------------------------------------------------------------------------------------------------
+Version: 0.2.6
+Date: 27.11.2020
+  Bugfixes:
+    - Fixed startup error related to the removeal of rocket silo launch stats window
+---------------------------------------------------------------------------------------------------
+Version: 0.2.5
+Date: 27.11.2020
+  Changes:
+    - Patched to work without angels (after oversight in last patch)
+---------------------------------------------------------------------------------------------------
+Version: 0.2.4
+Date: 26.11.2020
+  Changes:
+    - Updated to factorio version 1.1
+---------------------------------------------------------------------------------------------------
 Version: 0.2.3
 Date: 17.07.2020
   Changes:

angelsaddons-shred/control.lua

@@ -48,7 +48,7 @@ script.on_init(function()
       entity.minable = false
     end
   end
-
+--[[
   if remote.interfaces["silo_script"] and settings.startup["deco-shred-create-shrine-offer"].value then
     for _,decoName in pairs({
       "shred",
@@ -65,4 +65,5 @@ script.on_init(function()
       end
     end
   end
+  ]]--
 end)

angelsaddons-shred/info.json

@@ -1,13 +1,13 @@
 {
   "name": "angelsaddons-shred",
-  "version": "0.2.3",
-  "factorio_version": "0.18",
+  "version": "0.2.7",
+  "factorio_version": "1.1",
   "title": "Angel's Addons - Decorations - Shred",
   "author": "Arch666Angel",
   "contact": "",
   "homepage": "https://forums.factorio.com/viewtopic.php?f=185&t=30962",
   "description": "",
   "dependencies": [
-    "base >= 0.18.27"
+    "base >= 1.1.0"
   ]
-}
+}