Consistency: trigger vs triggers #969

angelsbioprocessing/changelog.txt

@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.7.27
+Date: ???
+  Changes:
+    - Renamed triggers table from angelsmods.triggers to angelsmods.trigger to match other Angel's mods (969)
+---------------------------------------------------------------------------------------------------
 Version: 0.7.26
 Date: 04.01.2024
   Changes:

angelsbioprocessing/data.lua

@@ -4,66 +4,67 @@ angelsmods.bioprocessing = angelsmods.bioprocessing or {}
 angelsmods.bioprocessing.number_tint = { r = 0.2, g = 1, b = 0.2, a = 1 }
 
 --TRIGGER CHECKS
-angelsmods.triggers = angelsmods.triggers or {}
+angelsmods.trigger = angelsmods.trigger or {}
+angelsmods.triggers = angelsmods.trigger
 --BIO TOKEN
-angelsmods.triggers.lab_ignore_token = angelsmods.triggers.lab_ignore_token or {}
-angelsmods.triggers.lab_ignore_token["lab-alien"] = true
-angelsmods.triggers.lab_ignore_token["lab-module"] = true
+angelsmods.trigger.lab_ignore_token = angelsmods.trigger.lab_ignore_token or {}
+angelsmods.trigger.lab_ignore_token["lab-alien"] = true
+angelsmods.trigger.lab_ignore_token["lab-module"] = true
 --ARTIFACTS
-angelsmods.triggers.artifacts = angelsmods.triggers.artifacts or {}
+angelsmods.trigger.artifacts = angelsmods.trigger.artifacts or {}
 if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then
-  angelsmods.triggers.artifacts["red"] = true
-  angelsmods.triggers.artifacts["yellow"] = true
-  angelsmods.triggers.artifacts["orange"] = true
-  angelsmods.triggers.artifacts["blue"] = true
-  angelsmods.triggers.artifacts["purple"] = true
-  angelsmods.triggers.artifacts["green"] = true
-  angelsmods.triggers.artifacts["base"] = true -- pink
+  angelsmods.trigger.artifacts["red"] = true
+  angelsmods.trigger.artifacts["yellow"] = true
+  angelsmods.trigger.artifacts["orange"] = true
+  angelsmods.trigger.artifacts["blue"] = true
+  angelsmods.trigger.artifacts["purple"] = true
+  angelsmods.trigger.artifacts["green"] = true
+  angelsmods.trigger.artifacts["base"] = true -- pink
   bobmods.enemies.small_alien_artifacts = true
 end
 --BIO PASTES
-angelsmods.triggers.bio_pastes = angelsmods.triggers.bio_pastes or {}
-angelsmods.triggers.bio_pastes["cellulose"] = true -- required for petri dish
+angelsmods.trigger.bio_pastes = angelsmods.trigger.bio_pastes or {}
+angelsmods.trigger.bio_pastes["cellulose"] = true -- required for petri dish
 
 if angelsmods.functions.is_special_vanilla() then
 else
-  if angelsmods.triggers.artifacts["red"] then
-    angelsmods.triggers.bio_pastes["copper"] = true
+  if angelsmods.trigger.artifacts["red"] then
+    angelsmods.trigger.bio_pastes["copper"] = true
   end
-  if angelsmods.triggers.artifacts["yellow"] then
-    angelsmods.triggers.bio_pastes["gold"] = true
+  if angelsmods.trigger.artifacts["yellow"] then
+    angelsmods.trigger.bio_pastes["gold"] = true
   end
-  if angelsmods.triggers.artifacts["orange"] then
-    angelsmods.triggers.bio_pastes["tungsten"] = true
+  if angelsmods.trigger.artifacts["orange"] then
+    angelsmods.trigger.bio_pastes["tungsten"] = true
   end
-  if angelsmods.triggers.artifacts["blue"] then
-    angelsmods.triggers.bio_pastes["cobalt"] = true
+  if angelsmods.trigger.artifacts["blue"] then
+    angelsmods.trigger.bio_pastes["cobalt"] = true
   end
-  if angelsmods.triggers.artifacts["purple"] then
-    angelsmods.triggers.bio_pastes["titanium"] = true
+  if angelsmods.trigger.artifacts["purple"] then
+    angelsmods.trigger.bio_pastes["titanium"] = true
   end
-  if angelsmods.triggers.artifacts["green"] then
-    angelsmods.triggers.bio_pastes["zinc"] = true
+  if angelsmods.trigger.artifacts["green"] then
+    angelsmods.trigger.bio_pastes["zinc"] = true
   end
-  if angelsmods.triggers.artifacts["base"] then
-    angelsmods.triggers.bio_pastes["iron"] = true
+  if angelsmods.trigger.artifacts["base"] then
+    angelsmods.trigger.bio_pastes["iron"] = true
   end
-  --angelsmods.triggers.bio_pastes["silver"] = true --unused
+  --angelsmods.trigger.bio_pastes["silver"] = true --unused
 end
 --BIO ALTERNATIVES FOR PETRO
-angelsmods.triggers.bio_rubber = angelsmods.triggers.bio_rubber or angelsmods.trigger.rubber or false
-angelsmods.triggers.bio_resin = angelsmods.triggers.bio_resin or angelsmods.trigger.resin or false
-angelsmods.triggers.bio_plastic = angelsmods.triggers.bio_plastic
-  or (angelsmods.trigger.plastic and (angelsmods.triggers.bio_resin or angelsmods.triggers.bio_rubber))
+angelsmods.trigger.bio_rubber = angelsmods.trigger.bio_rubber or angelsmods.trigger.rubber or false
+angelsmods.trigger.bio_resin = angelsmods.trigger.bio_resin or angelsmods.trigger.resin or false
+angelsmods.trigger.bio_plastic = angelsmods.trigger.bio_plastic
+  or (angelsmods.trigger.plastic and (angelsmods.trigger.bio_resin or angelsmods.trigger.bio_rubber))
   or false
 
-angelsmods.triggers.paper = (not angelsmods.functions.is_special_vanilla())
+angelsmods.trigger.paper = (not angelsmods.functions.is_special_vanilla())
   or (mods["bobelectronics"] and true or false)
-if angelsmods.triggers.paper then
+if angelsmods.trigger.paper then
   angelsmods.trigger.water_red_waste = true
   angelsmods.trigger.early_chemical_furnace = true
 end
-angelsmods.triggers.crystals_full = (not angelsmods.functions.is_special_vanilla())
+angelsmods.trigger.crystals_full = (not angelsmods.functions.is_special_vanilla())
   or (mods["bobmodules"] and true or false)
 
 -- set triggers for other angel mods

angelsbioprocessing/info.json

@@ -1,6 +1,6 @@
 {
   "name": "angelsbioprocessing",
-  "version": "0.7.26",
+  "version": "0.7.27",
   "factorio_version": "1.1",
   "title": "Angel's Bioprocessing",
   "author": "Arch666Angel",

angelsbioprocessing/prototypes/bio-processing-override.lua

@@ -10,7 +10,7 @@ require("prototypes.overrides.bio-processing-override-angel")
 
 -- body
 local OV = angelsmods.functions.OV
-local lab_ignore = angelsmods.triggers.lab_ignore_token
+local lab_ignore = angelsmods.trigger.lab_ignore_token
 
 --OVERRIDE FOR BASE
 require("prototypes.overrides.bio-processing-override-base-game")

angelsbioprocessing/prototypes/bio-processing-triggers.lua

@@ -1,44 +1,44 @@
 -- set triggers for the other angels mods
 
-if angelsmods.triggers.bio_pastes["cobalt"] then
+if angelsmods.trigger.bio_pastes["cobalt"] then
   angelsmods.trigger.ores["cobalt"] = true
   if mods["bobores"] then
     bobmods.ores.cobalt.enabled = true
   end
   angelsmods.trigger.smelting_products["cobalt"].powder = true
 end
 
-if angelsmods.triggers.bio_pastes["copper"] then
+if angelsmods.trigger.bio_pastes["copper"] then
   angelsmods.trigger.ores["copper"] = true
   angelsmods.trigger.smelting_products["copper"].powder = true
 end
 
-if angelsmods.triggers.bio_pastes["gold"] then
+if angelsmods.trigger.bio_pastes["gold"] then
   angelsmods.trigger.ores["gold"] = true
   angelsmods.trigger.smelting_products["gold"].powder = true
 end
 
-if angelsmods.triggers.bio_pastes["iron"] then
+if angelsmods.trigger.bio_pastes["iron"] then
   angelsmods.trigger.ores["iron"] = true
   angelsmods.trigger.smelting_products["iron"].powder = true
 end
 
-if angelsmods.triggers.bio_pastes["silver"] then
+if angelsmods.trigger.bio_pastes["silver"] then
   angelsmods.trigger.ores["silver"] = true
   angelsmods.trigger.smelting_products["silver"].powder = true
 end
 
-if angelsmods.triggers.bio_pastes["titanium"] then
+if angelsmods.trigger.bio_pastes["titanium"] then
   angelsmods.trigger.ores["titanium"] = true
   angelsmods.trigger.smelting_products["titanium"].powder = true
 end
 
-if angelsmods.triggers.bio_pastes["tungsten"] then
+if angelsmods.trigger.bio_pastes["tungsten"] then
   angelsmods.trigger.ores["tungsten"] = true
   angelsmods.trigger.smelting_products["tungsten"].powder = true
 end
 
-if angelsmods.triggers.bio_pastes["zinc"] then
+if angelsmods.trigger.bio_pastes["zinc"] then
   angelsmods.trigger.ores["zinc"] = true
   angelsmods.trigger.smelting_products["zinc"].powder = true
 end

angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua

@@ -83,7 +83,7 @@ end
 -- Puffer nests cannot be created
 angelsmods.functions.add_flag("puffer-nest", "hidden")
 
-if angelsmods.triggers.crystals_full == true then
+if angelsmods.trigger.crystals_full == true then
 else
   OV.disable_recipe({
     "crystal-full-harmonic",

angelsbioprocessing/prototypes/overrides/bio-processing-override-arboretum.lua

@@ -1,6 +1,6 @@
 local OV = angelsmods.functions.OV
 
-if angelsmods.triggers.bio_rubber then
+if angelsmods.trigger.bio_rubber then
   OV.remove_prereq("rubbers", "rubber")
   OV.add_prereq("rubbers", "automation-2")
   OV.add_prereq("rubber", "rubbers")
@@ -25,7 +25,7 @@ else
   })
 end
 
-if angelsmods.triggers.bio_resin then
+if angelsmods.trigger.bio_resin then
   OV.remove_prereq("resins", "resin-1")
   OV.add_prereq("resins", "basic-chemistry-3")
   OV.add_prereq("resin-1", "resins")
@@ -52,7 +52,7 @@ else
   OV.remove_prereq("bio-wood-processing-2", "bio-farm-1")
 end
 
-if angelsmods.triggers.bio_plastic then
+if angelsmods.trigger.bio_plastic then
   OV.remove_prereq("plastics", "plastic-1")
   OV.add_prereq("plastics", "angels-advanced-chemistry-1")
   OV.add_prereq("plastic-1", "plastics")
@@ -76,7 +76,7 @@ else
   })
 end
 
-if angelsmods.triggers.paper then
+if angelsmods.trigger.paper then
   OV.add_unlock("sodium-processing-1", "solid-sodium-hypochlorite-decomposition")
   OV.remove_unlock("chlorine-processing-3", "solid-salt-separation")
   OV.add_unlock("sodium-processing-1", "solid-salt-separation")

angelsbioprocessing/prototypes/overrides/bio-processing-override-artifacts.lua

@@ -5,8 +5,8 @@ local contais_artifact_creation = false
 -------------------------------------------------------------------------------
 -- RED ARTIFACTS --------------------------------------------------------------
 -------------------------------------------------------------------------------
-if angelsmods.triggers.artifacts["red"] then
-  if angelsmods.triggers.bio_pastes["copper"] then
+if angelsmods.trigger.artifacts["red"] then
+  if angelsmods.trigger.bio_pastes["copper"] then
     contais_artifact_creation = true
 
     data:extend({
@@ -69,7 +69,7 @@ if angelsmods.triggers.artifacts["red"] then
   end
 
   if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-red"] then
-    if angelsmods.triggers.bio_pastes["copper"] or angelsmods.exploration then
+    if angelsmods.trigger.bio_pastes["copper"] or angelsmods.exploration then
       angelsmods.functions.move_item("small-alien-artifact-red", "bio-processing-alien-small", "a[red]")
     end
     angelsmods.functions.move_item("alien-artifact-red", "bio-processing-alien-large", "a[red]")
@@ -153,8 +153,8 @@ end
 -------------------------------------------------------------------------------
 -- YELLOW ARTIFACTS -----------------------------------------------------------
 -------------------------------------------------------------------------------
-if angelsmods.triggers.artifacts["yellow"] then
-  if angelsmods.triggers.bio_pastes["gold"] then
+if angelsmods.trigger.artifacts["yellow"] then
+  if angelsmods.trigger.bio_pastes["gold"] then
     contais_artifact_creation = true
 
     data:extend({
@@ -217,7 +217,7 @@ if angelsmods.triggers.artifacts["yellow"] then
   end
 
   if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-yellow"] then
-    if angelsmods.triggers.bio_pastes["gold"] or angelsmods.exploration then
+    if angelsmods.trigger.bio_pastes["gold"] or angelsmods.exploration then
       angelsmods.functions.move_item("small-alien-artifact-yellow", "bio-processing-alien-small", "b[yellow]")
     end
     angelsmods.functions.move_item("alien-artifact-yellow", "bio-processing-alien-large", "b[yellow]")
@@ -301,8 +301,8 @@ end
 -------------------------------------------------------------------------------
 -- ORANGE ARTIFACTS -----------------------------------------------------------
 -------------------------------------------------------------------------------
-if angelsmods.triggers.artifacts["orange"] then
-  if angelsmods.triggers.bio_pastes["tungsten"] then
+if angelsmods.trigger.artifacts["orange"] then
+  if angelsmods.trigger.bio_pastes["tungsten"] then
     contais_artifact_creation = true
 
     data:extend({
@@ -365,7 +365,7 @@ if angelsmods.triggers.artifacts["orange"] then
   end
 
   if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-orange"] then
-    if angelsmods.triggers.bio_pastes["tungsten"] or angelsmods.exploration then
+    if angelsmods.trigger.bio_pastes["tungsten"] or angelsmods.exploration then
       angelsmods.functions.move_item("small-alien-artifact-orange", "bio-processing-alien-small", "c[orange]")
     end
     angelsmods.functions.move_item("alien-artifact-orange", "bio-processing-alien-large", "c[orange]")
@@ -449,8 +449,8 @@ end
 -------------------------------------------------------------------------------
 -- BLUE ARTIFACTS -------------------------------------------------------------
 -------------------------------------------------------------------------------
-if angelsmods.triggers.artifacts["blue"] then
-  if angelsmods.triggers.bio_pastes["cobalt"] then
+if angelsmods.trigger.artifacts["blue"] then
+  if angelsmods.trigger.bio_pastes["cobalt"] then
     contais_artifact_creation = true
 
     data:extend({
@@ -513,7 +513,7 @@ if angelsmods.triggers.artifacts["blue"] then
   end
 
   if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then
-    if angelsmods.triggers.bio_pastes["cobalt"] or angelsmods.exploration then
+    if angelsmods.trigger.bio_pastes["cobalt"] or angelsmods.exploration then
       angelsmods.functions.move_item("small-alien-artifact-blue", "bio-processing-alien-small", "d[blue]")
     end
     angelsmods.functions.move_item("alien-artifact-blue", "bio-processing-alien-large", "d[blue]")
@@ -597,8 +597,8 @@ end
 -------------------------------------------------------------------------------
 -- PURPLE ARTIFACTS -----------------------------------------------------------
 -------------------------------------------------------------------------------
-if angelsmods.triggers.artifacts["purple"] then
-  if angelsmods.triggers.bio_pastes["titanium"] then
+if angelsmods.trigger.artifacts["purple"] then
+  if angelsmods.trigger.bio_pastes["titanium"] then
     contais_artifact_creation = true
 
     data:extend({
@@ -661,7 +661,7 @@ if angelsmods.triggers.artifacts["purple"] then
   end
 
   if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-purple"] then
-    if angelsmods.triggers.bio_pastes["titanium"] or angelsmods.exploration then
+    if angelsmods.trigger.bio_pastes["titanium"] or angelsmods.exploration then
       angelsmods.functions.move_item("small-alien-artifact-purple", "bio-processing-alien-small", "e[purple]")
     end
     angelsmods.functions.move_item("alien-artifact-purple", "bio-processing-alien-large", "e[purple]")
@@ -745,8 +745,8 @@ end
 -------------------------------------------------------------------------------
 -- GREEN ARTIFACTS ------------------------------------------------------------
 -------------------------------------------------------------------------------
-if angelsmods.triggers.artifacts["green"] then
-  if angelsmods.triggers.bio_pastes["zinc"] then
+if angelsmods.trigger.artifacts["green"] then
+  if angelsmods.trigger.bio_pastes["zinc"] then
     contais_artifact_creation = true
 
     data:extend({
@@ -809,7 +809,7 @@ if angelsmods.triggers.artifacts["green"] then
   end
 
   if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-green"] then
-    if angelsmods.triggers.bio_pastes["zinc"] or angelsmods.exploration then
+    if angelsmods.trigger.bio_pastes["zinc"] or angelsmods.exploration then
       angelsmods.functions.move_item("small-alien-artifact-green", "bio-processing-alien-small", "f[green]")
     end
     angelsmods.functions.move_item("alien-artifact-green", "bio-processing-alien-large", "f[green]")
@@ -893,8 +893,8 @@ end
 -------------------------------------------------------------------------------
 -- BASE ARTIFACTS (pink) ------------------------------------------------------
 -------------------------------------------------------------------------------
-if angelsmods.triggers.artifacts["base"] then -- pink
-  if angelsmods.triggers.bio_pastes["iron"] then
+if angelsmods.trigger.artifacts["base"] then -- pink
+  if angelsmods.trigger.bio_pastes["iron"] then
     contais_artifact_creation = true
 
     data:extend({
@@ -951,7 +951,7 @@ if angelsmods.triggers.artifacts["base"] then -- pink
   end
 
   if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] then
-    if angelsmods.triggers.bio_pastes["iron"] or angelsmods.exploration then
+    if angelsmods.trigger.bio_pastes["iron"] or angelsmods.exploration then
       angelsmods.functions.move_item("small-alien-artifact", "bio-processing-alien-small", "g[base]")
     end
     angelsmods.functions.move_item("alien-artifact", "bio-processing-alien-large", "g[base]")