Vehicle auto refuel (part 2)

.gitignore

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

angelsaddons-cab/changelog.txt

@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.2.7
+Date:??
+  Changes:
+    - Changed and expanded locale strings and text descriptions (489)
+---------------------------------------------------------------------------------------------------
 Version: 0.2.6
 Date: 27.11.2020
   Changes:

angelsaddons-cab/info.json

@@ -1,6 +1,6 @@
 {
   "name": "angelsaddons-cab",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "factorio_version": "1.1",
   "title": "Angel's Addons - C.A.B.",
   "author": "Arch666Angel, lovely_santa",

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-mobility/changelog.txt

@@ -1,4 +1,15 @@
 ---------------------------------------------------------------------------------------------------
+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:

angelsaddons-mobility/info.json

@@ -1,6 +1,6 @@
 {
   "name": "angelsaddons-mobility",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "factorio_version": "1.1",
   "title": "Angel's Addons - Mass Transit",
   "author": "Arch666Angel, lovely_santa",
@@ -9,6 +9,7 @@
   "description": "A combination mod of the various themed trains.",
   "dependencies": [
     "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-storage/changelog.txt

@@ -8,6 +8,9 @@ Date: ??
     - Changed recipes of ore silos when playing with angels refining (340)
     - Changed some recipes of logistics silos when playing with angels industries (340)
     - Changed some recipes of logistics warehouses when playing with angels industries (340)
+    - Changed slot count for active providers to match the storage variant
+    - Changed ore silo pick-up result to be just the regular silo (541)
+    - Changed and expanded locale strings and text descriptions (489)
 ---------------------------------------------------------------------------------------------------
 Version: 0.0.4
 Date: 27.11.2020

angelsaddons-storage/locale/en/storage.cfg

@@ -61,10 +61,40 @@ pressure-tanks=Pressure tanks
 
 [mod-setting-name]
 angels-enable-storage-icon-scaling=Enable icon scaling on silos and warehouses
-angels-enable-silos=Enable Angel's logistic silos
+angels-enable-silos=Enable Angel's silos
 angels-enable-oresilos=Enable Angel's ore themed silos
-angels-enable-warehouses=Enable Angel's logistic warehouses
+angels-enable-warehouses=Enable Angel's warehouses
 angels-enable-pressure-tank=Enable pressure fluid tanks
 
 [mod-setting-description]
 angels-enable-storage-icon-scaling=Icons on silos and warehouses scale to size of the silos and warehouses, instead of being small.
+
+[technology-description]
+ore-silos=Large containers for long-term storage.
+logistic-silos=Silos for the logistic network.
+
+angels-warehouses=Huge containers for long-term storage.
+angels-logistic-warehouses=Warehouses for the logistic network.
+
+pressure-tanks=Pressurized storage tank with high capacity for liquids or gasses.
+
+[entity-description]
+silo-ore1=Silo with a "Saphirite" aesthetic.
+silo-ore2=Silo with a "Jivolite" aesthetic.
+silo-ore3=Silo with a "Stiratite" aesthetic.
+silo-ore4=Silo with a "Crotinnium" aesthetic.
+silo-ore5=Silo with a "Rubyte" aesthetic.
+silo-ore6=Silo with a "Bobmonium" aesthetic.
+silo-coal=Silo with a "Coal" aesthetic.
+
+silo-active-provider=Sends its content to the logistic network.
+silo-passive-provider=Makes its content available to the logistic network.
+silo-requester=Requests specified items from the logistic network.
+silo-storage=Long-term storage for the logistic network.
+silo-buffer=Requests specified items to be available for personal logistics and automated construction.
+
+angels-warehouse-passive-provider=Sends its content to the logistic network.
+angels-warehouse-active-provider=Makes its content available to the logistic network.
+angels-warehouse-storage=Long-term storage for the logistic network.
+angels-warehouse-requester=Requests specified items from the logistic network.
+angels-warehouse-buffer=Requests specified items to be available for personal logistics and automated construction.

angelsaddons-storage/prototypes/buildings/silos.lua

@@ -65,7 +65,7 @@ if angelsmods.addons.storage.oresilos then
     cont_add.name = "silo-"..name
     cont_add.icon = "__angelsaddons-storage__/graphics/icons/silo-"..name..".png"
     cont_add.picture.filename = "__angelsaddons-storage__/graphics/entity/silo-"..name..".png"
-    cont_add.minable.result = "silo-"..name
+    --cont_add.minable.result = "silo-"..name --want to actually return the silo
 
     item_add = table.deepcopy(data.raw.item.silo)
     item_add.name = "silo-"..name
@@ -85,11 +85,11 @@ if angelsmods.addons.storage.silos then
   -- LOGISTIC SILOS -----------------------------------------------------------
   -----------------------------------------------------------------------------
   local log_names = {
-    ["aprovider"] = {order = "i", stacks = 209, mode = "active-provider"},
+    ["aprovider"] = {order = "i", stacks = 384, mode = "active-provider"},
     ["pprovider"] = {order = "j", stacks = 256, mode = "passive-provider"},
     ["storage"]   = {order = "k", stacks = 384, mode = "storage", slots = 1},
-    ["buffer"]    = {order = "l", stacks = 256, mode = "buffer", slots = 12},
-    ["requester"] = {order = "m", stacks = 209, mode = "requester", slots = 12}
+    ["buffer"]    = {order = "l", stacks = 256, mode = "buffer"},
+    ["requester"] = {order = "m", stacks = 209, mode = "requester"}
   }
   local silo_add = {}
   for name,stat in pairs(log_names) do
@@ -116,4 +116,4 @@ if angelsmods.addons.storage.silos then
     silo_add[#silo_add+1] = item_add
   end
   data:extend(silo_add)
-end
+end

angelsaddons-storage/prototypes/buildings/warehouses.lua

@@ -56,11 +56,11 @@ if angelsmods.addons.storage.warehouses then
   -- LOGISTIC WAREHOUSES ------------------------------------------------------
   -----------------------------------------------------------------------------
   local log_names = {
-    ["aprovider"] = {order = "i", stacks = 418, mode = "active-provider"},
+    ["aprovider"] = {order = "i", stacks = 768, mode = "active-provider"},
     ["pprovider"] = {order = "j", stacks = 512, mode = "passive-provider"},
     ["storage"]   = {order = "k", stacks = 768, mode = "storage", slots = 1},
-    ["buffer"]    = {order = "l", stacks = 512, mode = "buffer", slots = 20},
-    ["requester"] = {order = "m", stacks = 418, mode = "requester", slots = 20}
+    ["buffer"]    = {order = "l", stacks = 512, mode = "buffer"},
+    ["requester"] = {order = "m", stacks = 418, mode = "requester"}
   }
   local warehouse_add = {}
   for name,stat in pairs(log_names) do
@@ -87,4 +87,4 @@ if angelsmods.addons.storage.warehouses then
     warehouse_add[#warehouse_add+1] = item_add
   end
   data:extend(warehouse_add)
-end
+end

angelsaddons-storage/settings-updates.lua

@@ -1,12 +1,3 @@
-local function hide_setting(setting_type, setting_name, setting_default)
-  if data.raw[setting_type] and data.raw[setting_type][setting_name] then
-    data.raw[setting_type][setting_name].hidden = true
-    if setting_default ~= nil then
-      data.raw[setting_type][setting_name].default_value = setting_default
-    end
-  end
-end
-
 if mods["angelspetrochem"] then
-  hide_setting("bool-setting", "angels-enable-inline-tank")
+  angelsmods.settings.hide_setting("bool-setting", "angels-enable-inline-tank")
 end

angelsbioprocessing/changelog.txt

@@ -14,13 +14,18 @@ Date: ??
     - Moved algae farms 2 and 3 deeper into the tech tree (503)
     - In component mode, decreased the cost of algae farm 2 from tier 3 to tier 2 blocks (503)
     - Split plant and fish pressing in two techs to account for the ceramic filter (428)
+    - Hide unused items (plant milk and bio wooden board) (523)
+    - Changed and expanded locale strings and text descriptions (489)
   Bugfixes:
     - Fixed bob modules category icon did not fit the category box size (483)
     - Fixed bob modules tech icons did not fit the tech box (483)
     - Fixed that agrecultural modules could be inserted in labs and mining drills (479)
     - Fixed agricultural modules would not upgrade correctly
     - Fixed agricultural modules all used the same tech icon (493)
     - Fixed angels fishes were not set as consumable items (490)
+    - Fixed with bobs modules that the module 2 and 3 technologies would have wrong icon_size (508)
+    - Added bio-tile to this mod from industries
+      - Still needs recipe and tech-unlock
 ---------------------------------------------------------------------------------------------------
 Version: 0.7.17
 Date: 26.11.2020

angelsbioprocessing/control.lua

@@ -108,9 +108,9 @@ end)
 script.on_event(defines.events.on_player_cursor_stack_changed, function(event)
   local player = game.get_player(event.player_index)
   local opened_entity = player.opened
-  if not (opened_entity and opened_entity.valid and
+  if not (opened_entity and opened_entity.valid and opened_entity.object_name ~= 'LuaEquipmentGrid' and
         (opened_entity.type == "lab" or opened_entity.type == "mining-drill")) then return end
-  
+
   local player_cursor_stack = player.cursor_stack
   if not player_cursor_stack then return end
 
@@ -157,9 +157,9 @@ end)
 script.on_event(defines.events.on_player_main_inventory_changed, function(event)
   local player = game.get_player(event.player_index)
   local opened_entity = player.opened
-  if not (opened_entity and opened_entity.valid and
+  if not (opened_entity and opened_entity.valid and opened_entity.object_name ~= 'LuaEquipmentGrid' and
          (opened_entity.type == "lab" or opened_entity.type == "mining-drill")) then return end
-  
+
   local module_inventory = opened_entity.get_module_inventory()
   if not module_inventory then return end
 
@@ -182,4 +182,4 @@ script.on_event(defines.events.on_player_main_inventory_changed, function(event)
       end
     end
   end
-end)
+end)