Skip to content

Commit

Permalink
Added settings to allow all ores in the starting area
Browse files Browse the repository at this point in the history
  • Loading branch information
LovelySanta committed Feb 22, 2020
1 parent 303f087 commit d11b238
Show file tree
Hide file tree
Showing 4 changed files with 141 additions and 78 deletions.
1 change: 1 addition & 0 deletions angelsrefining/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Date: ??
Changes:
- Updated emission data, so it now shows in the ingame toolips (and activates)
- Changes the refinery ore product generation to be more flexible and dynamic
- Added settings to allow all ores in the starting area
Bugfixes:
- Fixed Electro Whinning Cell MK1 and MK2 had same crafting speed (changed MK1 1 --> 0.75)
---------------------------------------------------------------------------------------------------
Expand Down
28 changes: 24 additions & 4 deletions angelsrefining/locale/en/ore-refining.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -325,16 +325,36 @@ geode-crystallization=Geode Crystallization
angels-enable-auto-barreling=Enable Auto Barreling
angels-enable-hide-void=Disable Void Recipe Hiding
angels-tryptophobia-friendly-stiratite=Enable Tryptophobia Friendly Stiratite Graphics
angels-marathon-buildingmulti=Marathon: Buildings Material Multiplier
angels-marathon-buildingtime=Marathon: Buildings Buildtime Multiplier
angels-marathon-rawmulti=Marathon: Raw Materials Multiplier
angels-marathon-intermediatemulti=Marathon: Intermediate Materials Multiplier

angels-marathon-buildingmulti=[img=utility/time_editor_icon] Marathon: Buildings Material Multiplier
angels-marathon-buildingtime=[img=utility/time_editor_icon] Marathon: Buildings Buildtime Multiplier
angels-marathon-rawmulti=[img=utility/time_editor_icon] Marathon: Raw Materials Multiplier
angels-marathon-intermediatemulti=[img=utility/time_editor_icon] Marathon: Intermediate Materials Multiplier

angels-starting-resource-base=Starting resource base Multiplier
angels-starting-resource-ore1=Starting resource __ENTITY__angels-ore1__
angels-starting-resource-ore2=Starting resource __ENTITY__angels-ore2__
angels-starting-resource-ore3=Starting resource __ENTITY__angels-ore3__
angels-starting-resource-ore4=Starting resource __ENTITY__angels-ore4__
angels-starting-resource-ore5=Starting resource __ENTITY__angels-ore5__
angels-starting-resource-ore6=Starting resource __ENTITY__angels-ore6__

[mod-setting-description]
angels-enable-auto-barreling=If enabled hides all barreling recipes and converts the barreling pump to a furnace type
angels-tryptophobia-friendly-stiratite=If enabled replaces the new style hole-y graphics with the classic solid ones.

angels-marathon-buildingmulti=[img=utility/warning_icon] Marathon mode is requires expensive difficulty settings\nDefault: 2
angels-marathon-buildingtime=[img=utility/warning_icon] Marathon mode is requires expensive difficulty settings\nDefault: 2
angels-marathon-rawmulti=[img=utility/warning_icon] Marathon mode is requires expensive difficulty settings\nDefault: 1
angels-marathon-intermediatemulti=[img=utility/warning_icon] Marathon mode is requires expensive difficulty settings\nDefault: 1

angels-starting-resource-ore1=If enabled will spawn [img=item/angels-ore1] __ENTITY__angels-ore1__ in the starting area\nDefault: enabled
angels-starting-resource-ore2=If enabled will spawn [img=item/angels-ore2] __ENTITY__angels-ore2__ in the starting area\nDefault: disabled
angels-starting-resource-ore3=If enabled will spawn [img=item/angels-ore3] __ENTITY__angels-ore3__ in the starting area\nDefault: enabled
angels-starting-resource-ore4=If enabled will spawn [img=item/angels-ore4] __ENTITY__angels-ore4__ in the starting area\nDefault: disabled
angels-starting-resource-ore5=If enabled will spawn [img=item/angels-ore5] __ENTITY__angels-ore5__ in the starting area\nDefault: enabled
angels-starting-resource-ore6=If enabled will spawn [img=item/angels-ore6] __ENTITY__angels-ore6__ in the starting area\nDefault: disabled

[item-description]
burner-ore-crusher=Don't stick your fingers in. Crushes raw ores
ore-crusher=Don't stick your fingers in. Crushes raw ores
Expand Down
12 changes: 6 additions & 6 deletions angelsrefining/prototypes/generation/angels-ore.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ angelsmods.functions.add_resource(
output_max = 1,
icon = "__angelsrefining__/graphics/icons/angels-ore1.png",
autoplace = {
starting_area = true,
starting_area = settings.startup["angels-starting-resource-ore1"].value,
--resource_index = 21,
base_density = 10,
regular_rq_factor_multiplier = 1.0,
Expand All @@ -39,7 +39,7 @@ angelsmods.functions.add_resource(
output_max = 1,
icon = "__angelsrefining__/graphics/icons/angels-ore2.png",
autoplace = {
starting_area = false,
starting_area = settings.startup["angels-starting-resource-ore2"].value,
--resource_index = 22,
base_density = 7,
regular_rq_factor_multiplier = 0.9,
Expand Down Expand Up @@ -69,7 +69,7 @@ angelsmods.functions.add_resource(
output_max = 1,
icon = ore_3_icon,
autoplace = {
starting_area = true,
starting_area = settings.startup["angels-starting-resource-ore3"].value,
--resource_index = 23,
base_density = 10,
regular_rq_factor_multiplier = 1.0,
Expand All @@ -94,7 +94,7 @@ angelsmods.functions.add_resource(
output_max = 1,
icon = "__angelsrefining__/graphics/icons/angels-ore4.png",
autoplace = {
starting_area = false,
starting_area = settings.startup["angels-starting-resource-ore4"].value,
--resource_index = 24,
base_density = 7,
regular_rq_factor_multiplier = 0.9,
Expand All @@ -119,7 +119,7 @@ angelsmods.functions.add_resource(
output_max = 1,
icon = "__angelsrefining__/graphics/icons/angels-ore5.png",
autoplace = {
starting_area = true,
starting_area = settings.startup["angels-starting-resource-ore5"].value,
--resource_index = 25,
base_density = 8,
regular_rq_factor_multiplier = 1.0,
Expand All @@ -144,7 +144,7 @@ angelsmods.functions.add_resource(
output_max = 1,
icon = "__angelsrefining__/graphics/icons/angels-ore6.png",
autoplace = {
starting_area = true,
starting_area = settings.startup["angels-starting-resource-ore6"].value,
--resource_index = 26,
base_density = 8,
regular_rq_factor_multiplier = 1.0,
Expand Down
178 changes: 110 additions & 68 deletions angelsrefining/settings.lua
Original file line number Diff line number Diff line change
@@ -1,70 +1,112 @@
data:extend(
{
{
type = "bool-setting",
name = "angels-enable-auto-barreling",
setting_type = "startup",
default_value = false,
order = "aa"
},
{
type = "bool-setting",
name = "angels-enable-hide-void",
setting_type = "startup",
default_value = true,
order = "ab"
},
{
type = "bool-setting",
name = "angels-tryptophobia-friendly-stiratite",
setting_type = "startup",
default_value = false,
order = "ac"
},
{
type = "double-setting",
name = "angels-marathon-buildingmulti",
setting_type = "startup",
default_value = 2,
minimum_value = 1,
maximum_value = 10,
order = "b"
},
{
type = "double-setting",
name = "angels-marathon-buildingtime",
setting_type = "startup",
default_value = 2,
minimum_value = 1,
maximum_value = 10,
order = "c"
},
{
type = "double-setting",
name = "angels-marathon-rawmulti",
setting_type = "startup",
default_value = 1,
minimum_value = 1,
maximum_value = 10,
order = "d"
},
{
type = "double-setting",
name = "angels-marathon-intermediatemulti",
setting_type = "startup",
default_value = 1,
minimum_value = 1,
maximum_value = 10,
order = "d"
},
{
type = "double-setting",
name = "angels-starting-resource-base",
setting_type = "startup",
default_value = 40000,
minimum_value = 10000,
maximum_value = 1000000,
order = "d"
}
}
{
{
type = "bool-setting",
name = "angels-enable-auto-barreling",
setting_type = "startup",
default_value = false,
order = "aa"
},
{
type = "bool-setting",
name = "angels-enable-hide-void",
setting_type = "startup",
default_value = true,
order = "ab"
},
{
type = "bool-setting",
name = "angels-tryptophobia-friendly-stiratite",
setting_type = "startup",
default_value = false,
order = "ac"
},
{
type = "double-setting",
name = "angels-marathon-buildingmulti",
setting_type = "startup",
default_value = 2,
minimum_value = 1,
maximum_value = 10,
order = "ba"
},
{
type = "double-setting",
name = "angels-marathon-buildingtime",
setting_type = "startup",
default_value = 2,
minimum_value = 1,
maximum_value = 10,
order = "bb"
},
{
type = "double-setting",
name = "angels-marathon-rawmulti",
setting_type = "startup",
default_value = 1,
minimum_value = 1,
maximum_value = 10,
order = "bc"
},
{
type = "double-setting",
name = "angels-marathon-intermediatemulti",
setting_type = "startup",
default_value = 1,
minimum_value = 1,
maximum_value = 10,
order = "bd"
},
{
type = "bool-setting",
name = "angels-starting-resource-ore1",
setting_type = "startup",
default_value = true,
order = "caa"
},
{
type = "bool-setting",
name = "angels-starting-resource-ore2",
setting_type = "startup",
default_value = false,
order = "cab"
},
{
type = "bool-setting",
name = "angels-starting-resource-ore3",
setting_type = "startup",
default_value = true,
order = "cac"
},
{
type = "bool-setting",
name = "angels-starting-resource-ore4",
setting_type = "startup",
default_value = false,
order = "cad"
},
{
type = "bool-setting",
name = "angels-starting-resource-ore5",
setting_type = "startup",
default_value = true,
order = "cae"
},
{
type = "bool-setting",
name = "angels-starting-resource-ore6",
setting_type = "startup",
default_value = false,
order = "caf"
},
{
type = "double-setting",
name = "angels-starting-resource-base",
setting_type = "startup",
default_value = 40000,
minimum_value = 10000,
maximum_value = 1000000,
order = "cb"
},
}
)

0 comments on commit d11b238

Please sign in to comment.