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

Master <- Frozen #229

Merged
merged 11 commits into from
Feb 1, 2024
Merged
19 changes: 16 additions & 3 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
---------------------------------------------------------------------------------------------------
Version: 2.1.20
Date: 2024-2-2
Fixes:
- Prevented biofluid bots from being effected (affected?) by belts. https://github.com/pyanodon/pybugreports/issues/392
- Fixed crash with mounts. https://github.com/pyanodon/pybugreports/issues/389
- Allowed you to convert old unshiny units created from creature chamber turd path 3.
---------------------------------------------------------------------------------------------------
Version: 2.1.19
Date: 2024-2-1
Fixes:
- fixed a typo on the gene lab upgrade (thanks, Arch)
- moved limestone boring to chemical science as a peace offering to boldviking to stop breaking things
---------------------------------------------------------------------------------------------------
Version: 2.1.18
Date: 2014-1-24
Fixes:
Expand All @@ -8,18 +21,18 @@ Date: 2014-1-24
- fixed that the sponge path 2 recipe replacements did not allow productivity even though the original recipes allowed it. (https://github.com/pyanodon/pybugreports/issues/372)
---------------------------------------------------------------------------------------------------
Version: 2.1.17
Date: 2014-1-23
Date: 2024-1-23
Changes:
- Updated tech tree for recent changes
---------------------------------------------------------------------------------------------------
Version: 2.1.16
Date: 2014-1-23
Date: 2024-1-23
Changes:
- Added a color mask for ulric man
- Updated Russian locale (by Shadow_Man).
---------------------------------------------------------------------------------------------------
Version: 2.1.15
Date: 2014-1-19
Date: 2024-1-19
Changes:
- Reworked mounts. See the pycodex for more information.
- Buffed fawogae path 3. No longer replaces the fawogae -> raw coal recipe and instead lets you have both.
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.18",
"version": "2.1.20",
"factorio_version": "1.1",
"title": "Pyanodons AlienLife",
"author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple",
Expand Down
4 changes: 2 additions & 2 deletions locale/en/techs.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ bioreactor-upgrade=Bioreactor upgrade
cadaveric-arum-upgrade=Cadaveric arum upgrade
compost-upgrade=Compost upgrade
creature-chamber-upgrade=Creature chamber upgrade
genlab-upgrade=Genlab upgrade
genlab-upgrade=Gene lab upgrade
cridren-upgrade=Cridren upgrade
data-array-upgrade=Data-array upgrade
dhilmos-upgrade=Dhilmos upgrade
Expand Down Expand Up @@ -966,4 +966,4 @@ guarpulse=A nanobot-based technology that can monitor the health of individual g
aquaguar=A genetically engineered strain of guar that is resistant to drought and can grow in saline soil. This strain of guar would require less water and fertilizer to grow, making it more sustainable to cultivate.
hh=A drone-based system that uses advanced sensors and AI algorithms to identify the most productive areas of a guar plantation. The drones can then autonomously harvest the ripe guar pods, maximizing yield and minimizing costs.
turd-respec=Resets all T.U.R.D. selections.
turd-partial-respec=Allows you to reselect an option for one T.U.R.D.
turd-partial-respec=Allows you to reselect an option for one T.U.R.D.
1 change: 1 addition & 0 deletions prototypes/biofluid/chorkok.lua
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ data:extend{{
flags = {'placeable-player', 'placeable-off-grid', 'not-repairable', 'breaths-air', 'building-direction-8-way'},
minable = {mining_time = 0.2, result = 'chorkok'},
max_health = 250,
has_belt_immunity = true,
order = 'z',
subgroup = 'py-alienlife-biofluid-network',
healing_per_tick = 0.01,
Expand Down
1 change: 1 addition & 0 deletions prototypes/biofluid/gobachov.lua
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ data:extend{{
minable = {mining_time = 0.2, result = 'gobachov'},
max_health = 250,
order = 'z',
has_belt_immunity = true,
subgroup = 'py-alienlife-biofluid-network',
healing_per_tick = 0.01,
collision_box = {{0,0}, {0,0}},
Expand Down
1 change: 1 addition & 0 deletions prototypes/biofluid/huzu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ data:extend{{
minable = {mining_time = 0.2, result = 'huzu'},
max_health = 250,
order = 'z',
has_belt_immunity = true,
subgroup = 'py-alienlife-biofluid-network',
healing_per_tick = 0.01,
collision_box = {{0,0}, {0,0}},
Expand Down
2 changes: 2 additions & 0 deletions prototypes/updates/pypetroleumhandling-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ FUN.results_replacer("crude-from-manure", "ash", "soot")
FUN.results_replacer("guar-separation", "organics", "biomass")
FUN.results_replacer("bitumen-comb", "tar", "bitumen")

RECIPE("mining-limestone"):remove_unlock("excavation-2"):add_unlock("excavation-1")

----EXCLUSIVE RECIPES----

RECIPE {
Expand Down
15 changes: 14 additions & 1 deletion prototypes/upgrades/creature.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ local path_3_effects = {}
for _, unit_name in pairs(units) do
path_3_effects[#path_3_effects + 1] = {type = 'recipe-replacement', old = unit_name, new = unit_name .. '-turd'}
end
for _, unit_name in pairs(units) do
path_3_effects[#path_3_effects + 1] = {type = 'unlock-recipe', recipe = unit_name .. '-convert-from-base'}
end

if data and not yafc_turd_integration then
path_1_effects[#path_1_effects + 1] = path_1_module_effect
Expand Down Expand Up @@ -94,7 +97,17 @@ if data and not yafc_turd_integration then
}
item.icon = nil

data:extend{unit, recipe, item}
local convert_recipe = {
type = 'recipe',
name = unit_name .. '-convert-from-base',
enabled = false,
category = 'crafting',
energy_required = 0.5,
ingredients = {{type = 'item', name = unit_name, amount = 1}},
results = {{type = 'item', name = name, amount = 1}},
}

data:extend{unit, recipe, item, convert_recipe}
end
elseif script then
path_1_effects = function()
Expand Down
2 changes: 1 addition & 1 deletion scripts/mounts/mounts.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ local mounts = {

Mounts.events.on_built = function(event)
local entity = event.created_entity or event.entity
if not mounts[entity.name] then return end
if not entity.valid or not mounts[entity.name] then return end
entity.grid.put{
name = 'py-mount-generator',
position = {3, 0},
Expand Down
Loading