Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

a #241

Merged
merged 3 commits into from
Apr 14, 2024
Merged

a #241

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,32 @@
---------------------------------------------------------------------------------------------------
Version: 2.1.26
Date: ?
Fixes:
- Fixed that you could generate infinite landfill by spam placing and replacing the smart farm
- Fixed that the collector check area introduced in 2.1.25 was not big enough (https://github.com/pyanodon/pybugreports/issues/461)
- Smart farms now properly clean up any wood fences when they are destroyed.
- Guano explosives can now be buffed by productivity to match the vanilla recipe. (https://github.com/pyanodon/pybugreports/issues/458)
- Fixed that subcritical-water-01 was not localised when pyAE is missing. (https://github.com/pyanodon/pybugreports/issues/445)
- Fixed that the alpha dingrits from dingrit turd path 1 could not be used as modules inside the reproductive complex. (https://github.com/pyanodon/pybugreports/issues/452)
- Fixed several bugs involved with biofluid vessel underground pipes (https://github.com/pyanodon/pybugreports/issues/437) (https://github.com/pyanodon/pybugreports/issues/409)
- Trees now gives 2 logs when broken instead of 1.
Energy drinks:
- The energy drink now gives you a linearly decreasing speed instead of a linearly increasing speed. Should be much easier to control.
- Removed damage per second from energy drinks.
- Removed fire spread from energy drinks.
- Max speedup of energy drinks reduced from 40X to 20X.
TURD:
- Nerfed kickalk turd path 1. Amount of non-dryed kickalk reduced from floor(75%) -> ceil(35%)
- Nerfed scrondrix turd path 3 from giving 24x brains to 16x. Also returns 1 less basic circuit.
- NOTE: If you already picked kickalk or scrondrix turd, you will have a 5 hour grace period to change them to a diffrent option.
---------------------------------------------------------------------------------------------------
Version: 2.1.25
Date: 2024-3-25
Fixes:
- Fixed that collector mk02-mk04 were not getting reset properly in the smart farm
---------------------------------------------------------------------------------------------------
Version: 2.1.24
Date: 2024-?-??
Date: 2024-3-24
Fixes:
- Buffed simik scale -> uranium ore atomizer recipe by 5X
- Fixed typos in arqad turd descriptions
Expand All @@ -18,6 +44,7 @@ Date: 2024-?-??
- Fixed that zipir cubs had no uses (https://github.com/pyanodon/pybugreports/issues/432)
- Fixed misspelling of genes as "gens" (https://github.com/pyanodon/pybugreports/issues/431)
- Fixed yaedols turd path 2 did not return barrels
- removed generic sample from bioreserve smart farm recipes
---------------------------------------------------------------------------------------------------
Version: 2.1.23
Date: 2024-3-14
Expand Down
1 change: 1 addition & 0 deletions control.lua
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ script.on_event(on_destroyed, function(event)
Vatbrain.events.on_destroyed(event)
Biofluid.events.on_destroyed(event)
Mounts.events.on_destroyed(event)
Smart_Farm.events.on_destroyed(event)
end)

script.on_event(defines.events.on_player_removed_equipment, function(event)
Expand Down
1 change: 1 addition & 0 deletions data-final-fixes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ local recipes_list = {
"fdtd",
"milfe",
"mirror-mk04",
'guano-explosives'
}

--adding to module limitation list
Expand Down
5 changes: 0 additions & 5 deletions data-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ for food, value in pairs(Digosaurus.favorite_foods) do
}
end

--RECIPE('digosaurus-helmod-recipe-guts'):add_unlock('nexelit-mk01')
--RECIPE('digosaurus-helmod-recipe-meat'):add_unlock('nexelit-mk01')
--RECIPE('digosaurus-helmod-recipe-workers-food'):add_unlock('nexelit-mk01')
--RECIPE('digosaurus-helmod-recipe-workers-food-02'):add_unlock('nexelit-mk03')

----------------------------------------------------------------------------------------------------
-- crafting_categories
----------------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pyalienlife",
"version": "2.1.23",
"version": "2.1.25",
"factorio_version": "1.1",
"title": "Pyanodons AlienLife",
"author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple",
Expand Down
6 changes: 3 additions & 3 deletions locale/en/items.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -1111,10 +1111,10 @@ dingrits-alpha=Only the oldest and strongest dingrits can become the alpha.
auog-pup=Auog pup.
auog-food-01=Basic auog food.
auog-food-02=Oak chilli tart with crispy fawogae and bitter seaweed salad.
fish=Bloop bloop.
fish=Bloop.
fish-mk02=Bloop bloop.
fish-mk03=Bloop bloop.
fish-mk04=Bloop bloop.
fish-mk03=Bloop bloop bloop.
fish-mk04=Bloop bloop bloop bloop.
fish-food-01=Basic fish food.
fish-food-02=Premium fish food for better care. Made from fish, for fish.
yaedols-spores=These spores had issues, must be complemented.
Expand Down
4 changes: 4 additions & 0 deletions locale/en/recipes.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ lard-combustion=Lard to combustion mixture (__1__°C)
bio-oil-combustion=Bio oil to combustion mixture (__1__°C)
oleochemical-combustion=Oleochemicals to combustion mixture (__1__°C)

subcritical-water-01=Subcritical water MK 01
subcritical-water-02=Subcritical water MK 02
subcritical-water-03=Subcritical water MK 03

ulric-sex-01=Breed new ulrics
ulric-full-rendering=Render ulric
ulric-manure-01=Basic farming
Expand Down
1 change: 0 additions & 1 deletion migrations/2.1.14.lua

This file was deleted.

9 changes: 9 additions & 0 deletions migrations/2.1.26.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
local turd_migrate = require('__pyalienlife__/scripts/turd/turd-migration')

turd_migrate('kicalk-upgrade', 'wire-netting')
turd_migrate('kicalk-upgrade', 'extra-water')
turd_migrate('kicalk-upgrade', 'crop-rotation')

turd_migrate('scrondrix-upgrade', 'boronb')
turd_migrate('scrondrix-upgrade', 'hspa')
turd_migrate('scrondrix-upgrade', 'neuron')
2 changes: 1 addition & 1 deletion prototypes/buildings/rc-mk01.lua
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ENTITY {
module_info_icon_shift = util.by_pixel(160, 230),
module_slots = 2,
},
allowed_effects = {"speed",'consumption','pollution'},
allowed_effects = {"speed",'consumption','pollution','productivity'},
crafting_categories = {'rc'},
crafting_speed = .333, -- 2 modules + 1 building = target speed of 1
energy_source = {
Expand Down
2 changes: 1 addition & 1 deletion prototypes/buildings/rc-mk02.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ENTITY {
module_info_icon_shift = util.by_pixel(160, 230),
module_slots = 4,
},
allowed_effects = {"speed",'consumption','pollution'},
allowed_effects = {"speed",'consumption','pollution','productivity'},
crafting_categories = {'rc'},
crafting_speed = .4, -- 4 modules + 1 building = target speed of 2
energy_source = {
Expand Down
2 changes: 1 addition & 1 deletion prototypes/buildings/rc-mk03.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ENTITY {
module_info_icon_shift = util.by_pixel(160, 230),
module_slots = 6,
},
allowed_effects = {"speed",'consumption','pollution'},
allowed_effects = {"speed",'consumption','pollution','productivity'},
crafting_categories = {'rc'},
crafting_speed = .428, -- 6 modules + 1 building = target speed of 3
energy_source = {
Expand Down
2 changes: 1 addition & 1 deletion prototypes/buildings/rc-mk04.lua
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ENTITY {
module_info_icon_shift = util.by_pixel(160, 230),
module_slots = 8,
},
allowed_effects = {"speed",'consumption','pollution'},
allowed_effects = {"speed",'consumption','pollution','productivity'},
crafting_categories = {'rc'},
crafting_speed = .444, -- 8 modules + 1 building = target speed of 4
energy_source = {
Expand Down
11 changes: 2 additions & 9 deletions prototypes/items/energy-drink.lua
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,7 @@ ITEM {

local speedup_sticker = table.deepcopy(data.raw['sticker']['slowdown-sticker'])
speedup_sticker.name = 'speedup-sticker'
speedup_sticker.spread_fire_entity = 'fire-flame-on-tree'
speedup_sticker.fire_spread_radius = 3
speedup_sticker.duration_in_ticks = 60 * 60
speedup_sticker.damage_interval = 70
speedup_sticker.damage_per_tick = {
amount = 8,
type = 'fire'
}
speedup_sticker.target_movement_modifier_from = 1
speedup_sticker.target_movement_modifier_to = 40
speedup_sticker.target_movement_modifier_from = 20
speedup_sticker.target_movement_modifier_to = 1
data:extend{speedup_sticker}
1 change: 1 addition & 0 deletions prototypes/recipes/arthurian/recipes-arthurian-modules.lua
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ RECIPE {
{type = 'item', name = 'arthurian-egg-mk02', amount = 1, probability = 0.005},
{type = 'item', name = 'arthurian-egg', amount = 1, probability = 0.5},
{type = 'item', name = 'empty-barrel', amount = 4},
{type = 'item', name = 'cage', amount = 1},
},
--main_product = "arthurian-mk02",
icons =
Expand Down
Loading
Loading