Skip to content

Commit

Permalink
In marathon mode (expensive), you get the garden back when trying to …
Browse files Browse the repository at this point in the history 
…obtain alien life samples
  • Loading branch information
@LovelySanta
LovelySanta committed Feb 22, 2020
1 parent a79b500 commit 0cacc03
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 26 deletions.
3 changes: 3 additions & 0 deletions angelsbioprocessing/changelog.txt
View file
Expand Up @@ -4,10 +4,13 @@ Date: ??
Changes:
- Bio tokens always gets added to labs now, trigger option added for mods to exclude the lab
- Pastes requires 2 powder instead of 1 ore
- Changed the tech icon of Farming and Garden Mutations
- In marathon mode (expensive), you get the garden back when trying to obtain alien life samples
Bugfixes:
- Fixed petri-dish requiring the wrong glass item (when playing with bob)
- Updated emission data, so it now shows in the ingame toolips (and activates)
- Fixed that there where no temperate gardens generating under any circumstances
- Fixed garden duplication recipes did not have the garden marked as a catalyst ingredient (production stats)
---------------------------------------------------------------------------------------------------
Version: 0.7.2
Date: 12.02.2020
Expand Down
Binary file modified angelsbioprocessing/graphics/technology/base-farm-tech.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added angelsbioprocessing/graphics/technology/farm-mutation-tech.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
103 changes: 82 additions & 21 deletions angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua
View file
@@ -1,3 +1,4 @@
local intermediatemulti = angelsmods.marathon.intermediatemulti
local seed_icon_shift = 12

data:extend(
Expand Down Expand Up @@ -64,13 +65,33 @@ data:extend(
name = "temperate-garden-cultivating-a",
category = "seed-extractor",
subgroup = "farming-temperate-seed",
enabled = "false",
energy_required = 300,
ingredients = {
{type = "item", name = "temperate-garden", amount = 1}
normal =
{
enabled = "false",
energy_required = 300,
ingredients =
{
{type = "item", name = "temperate-garden", amount = 1}
},
results =
{
{type = "item", name = "token-bio", amount = 32}
},
},
results = {
{type = "item", name = "token-bio", amount = 32}
expensive =
{
enabled = "false",
energy_required = 300,
ingredients =
{
{type = "item", name = "temperate-garden", amount = 1}
},
results =
{
{type = "item", name = "token-bio", amount = 1, probability = 1 / (2 * intermediatemulti) },
{type = "item", name = "temperate-garden", amount = 1, catalyst_amount = 1}
},
main_product = "token-bio",
},
--icon = "__angelsbioprocessing__/graphics/icons/temperate-garden.png",
--icon_size = 32,
Expand Down Expand Up @@ -140,7 +161,7 @@ data:extend(
},
results = {
{type = "item", name = "token-bio", amount = 8, probability = 0.25},
{type = "item", name = "temperate-garden", amount = 1},
{type = "item", name = "temperate-garden", amount = 1, catalyst_amount = 1},
{type = "item", name = "temperate-garden", amount = 1, probability = 0.05}
},
main_product = "temperate-garden",
Expand Down Expand Up @@ -210,13 +231,33 @@ data:extend(
name = "desert-garden-cultivating-a",
category = "seed-extractor",
subgroup = "bio-processor-temperate",
enabled = "false",
energy_required = 300,
ingredients = {
{type = "item", name = "desert-garden", amount = 1}
normal =
{
enabled = "false",
energy_required = 300,
ingredients =
{
{type = "item", name = "desert-garden", amount = 1}
},
results =
{
{type = "item", name = "token-bio", amount = 32}
},
},
results = {
{type = "item", name = "token-bio", amount = 32}
expensive =
{
enabled = "false",
energy_required = 300,
ingredients =
{
{type = "item", name = "desert-garden", amount = 1}
},
results =
{
{type = "item", name = "token-bio", amount = 1, probability = 1 / (2 * intermediatemulti) },
{type = "item", name = "desert-garden", amount = 1, catalyst_amount = 1}
},
main_product = "token-bio",
},
--icon = "__angelsbioprocessing__/graphics/icons/desert-garden.png",
--icon_size = 32,
Expand Down Expand Up @@ -286,7 +327,7 @@ data:extend(
},
results = {
{type = "item", name = "token-bio", amount = 8, probability = 0.25},
{type = "item", name = "desert-garden", amount = 1},
{type = "item", name = "desert-garden", amount = 1, catalyst_amount = 1},
{type = "item", name = "desert-garden", amount = 1, probability = 0.05}
},
main_product = "desert-garden",
Expand Down Expand Up @@ -356,13 +397,33 @@ data:extend(
name = "swamp-garden-cultivating-a",
category = "seed-extractor",
subgroup = "farming-temperate",
enabled = "false",
energy_required = 300,
ingredients = {
{type = "item", name = "swamp-garden", amount = 1}
normal =
{
enabled = "false",
energy_required = 300,
ingredients =
{
{type = "item", name = "swamp-garden", amount = 1}
},
results =
{
{type = "item", name = "token-bio", amount = 32}
},
},
results = {
{type = "item", name = "token-bio", amount = 32}
expensive =
{
enabled = "false",
energy_required = 300,
ingredients =
{
{type = "item", name = "swamp-garden", amount = 1}
},
results =
{
{type = "item", name = "token-bio", amount = 1, probability = 1 / (2 * intermediatemulti) },
{type = "item", name = "swamp-garden", amount = 1, catalyst_amount = 1}
},
main_product = "token-bio",
},
--icon = "__angelsbioprocessing__/graphics/icons/swamp-garden.png",
--icon_size = 32,
Expand Down Expand Up @@ -432,7 +493,7 @@ data:extend(
},
results = {
{type = "item", name = "token-bio", amount = 8, probability = 0.25},
{type = "item", name = "swamp-garden", amount = 1},
{type = "item", name = "swamp-garden", amount = 1, catalyst_amount = 1},
{type = "item", name = "swamp-garden", amount = 1, probability = 0.05}
},
main_product = "swamp-garden",
Expand Down
6 changes: 1 addition & 5 deletions angelsbioprocessing/prototypes/technology/crop-farming.lua
View file
Expand Up @@ -704,11 +704,7 @@ data:extend(
type = "technology",
name = "angels-garden-mutations",
icons={
{icon = "__angelsbioprocessing__/graphics/technology/seed-extractor-tech.png",icon_size=128},
{icon = "__angelsbioprocessing__/graphics/technology/swamp-farm-tech.png",icon_size = 128,scale=0.4,shift={-40,-50}},
{icon = "__angelsbioprocessing__/graphics/technology/temperate-farm-tech.png",icon_size = 128,scale=0.4,shift={40,-50}},
{icon = "__angelsbioprocessing__/graphics/technology/desert-farm-tech.png",icon_size = 128,scale=0.4,shift={40,50}},
{icon = "__base__/graphics/icons/uranium-235.png",icon_size=64,scale=0.6,shift={-40,50}},
{icon = "__angelsbioprocessing__/graphics/technology/farm-mutation-tech.png",icon_size=128},
},
icon_size = 128,
order = "c-a",
Expand Down

0 comments on commit 0cacc03

Please sign in to comment.