Fix #5; Improve Upgrade Planner

LsHallo · Apr 16, 2021 · 0cb3ef0 · 0cb3ef0
1 parent dc005f6
commit 0cb3ef0
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 1 deletion.
diff --git a/Advanced-Electric-Revamped-v16/changelog.txt b/Advanced-Electric-Revamped-v16/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.6.6
+  Changes:
+    - Improve default upgrade for use with upgrade planner (Thanks Stever1388)
+---------------------------------------------------------------------------------------------------
 Version: 0.6.5
   Changes:
     - Fix changelog

diff --git a/Advanced-Electric-Revamped-v16/data.lua b/Advanced-Electric-Revamped-v16/data.lua
@@ -48,6 +48,8 @@ end
 
 data.raw["accumulator"]["accumulator"].fast_replaceable_group = "accumulator"
 data.raw["solar-panel"]["solar-panel"].fast_replaceable_group = "solar-panel"
+data.raw["accumulator"]["accumulator"].next_upgrade = "advanced-accumulator"
+data.raw["solar-panel"]["solar-panel"].next_upgrade = "advanced-solar"
 
 if mods["5dim_core"] then
 	require("prototypes.item-group-5dim")

diff --git a/Advanced-Electric-Revamped-v16/info.json b/Advanced-Electric-Revamped-v16/info.json
@@ -1,6 +1,6 @@
 {
  "name": "Advanced-Electric-Revamped-v16",
- "version": "0.6.5",
+ "version": "0.6.6",
  "title": "Advanced Solar High Resolution",
  "contact": "https://twitter.com/xlshallox",
  "author": "LsHallo",

diff --git a/Advanced-Electric-Revamped-v16/prototypes/entity/advanced-accumulator.lua b/Advanced-Electric-Revamped-v16/prototypes/entity/advanced-accumulator.lua
@@ -1,4 +1,5 @@
 mul = settings.startup["advanced-electric-multiplier-advanced-accumulator"].value
+tier = settings.startup["advanced-electric-enabled-tiers"].value
 
 function advanced_accumulator_picture(tint, repeat_count)
   return
@@ -130,4 +131,7 @@ advanced_accumulator.charge_light = {intensity = 0.3, size = 7, color = {r = 0.1
 advanced_accumulator.discharge_animation = advanced_accumulator_discharge()
 advanced_accumulator.discharge_light = {intensity = 0.7, size = 7, color = {r = 0.15, g = 0.27, b = 0.12}}
 advanced_accumulator.fast_replaceable_group = "accumulator"
+if tier == "elite" or tier == "ultimate" then
+	advanced_accumulator.next_upgrade = "elite-accumulator"
+end
 data:extend({advanced_accumulator})
diff --git a/Advanced-Electric-Revamped-v16/prototypes/entity/advanced-solar.lua b/Advanced-Electric-Revamped-v16/prototypes/entity/advanced-solar.lua
@@ -1,4 +1,5 @@
 mul = settings.startup["advanced-electric-multiplier-advanced-solar"].value
+tier = settings.startup["advanced-electric-enabled-tiers"].value
 
 local advanced_solar = util.table.deepcopy(data.raw["solar-panel"]["solar-panel"])
 advanced_solar.name = "advanced-solar"
@@ -46,4 +47,7 @@ advanced_solar.picture =
 }
 advanced_solar.production = .06 * mul .. "MW"
 advanced_solar.fast_replaceable_group = "solar-panel"
+if tier == "elite" or tier == "ultimate" then
+	advanced_solar.next_upgrade = "elite-solar"
+end
 data:extend({advanced_solar})
diff --git a/Advanced-Electric-Revamped-v16/prototypes/entity/elite-accumulator.lua b/Advanced-Electric-Revamped-v16/prototypes/entity/elite-accumulator.lua
@@ -1,4 +1,5 @@
 mul = settings.startup["advanced-electric-multiplier-elite-accumulator"].value
+tier = settings.startup["advanced-electric-enabled-tiers"].value
 
 function elite_accumulator_picture(tint, repeat_count)
   return
@@ -130,4 +131,7 @@ elite_accumulator.charge_light = {intensity = 0.3, size = 7, color = {r = 0.1, g
 elite_accumulator.discharge_animation = elite_accumulator_discharge()
 elite_accumulator.discharge_light = {intensity = 0.7, size = 7, color = {r = 0.1, g = 0.13, b = 0.28}}
 elite_accumulator.fast_replaceable_group = "accumulator"
+if tier == "ultimate" then
+	elite_accumulator.next_upgrade = "ultimate-accumulator"
+end
 data:extend({elite_accumulator})
diff --git a/Advanced-Electric-Revamped-v16/prototypes/entity/elite-solar.lua b/Advanced-Electric-Revamped-v16/prototypes/entity/elite-solar.lua
@@ -1,4 +1,5 @@
 mul = settings.startup["advanced-electric-multiplier-elite-solar"].value
+tier = settings.startup["advanced-electric-enabled-tiers"].value
 
 local elite_solar = util.table.deepcopy(data.raw["solar-panel"]["solar-panel"])
 elite_solar.name = "elite-solar"
@@ -46,4 +47,7 @@ elite_solar.picture =
 }
 elite_solar.production = .06 * mul .. "MW"
 elite_solar.fast_replaceable_group = "solar-panel"
+if tier == "ultimate" then
+	elite_solar.next_upgrade = "ultimate-solar"
+end
 data:extend({elite_solar})