Skip to content

Commit

Permalink
Merge pull request #107 from pyanodon/master-with-stdlib-removed
Browse files Browse the repository at this point in the history
Remove stdlib
  • Loading branch information
notnotmelon authored May 28, 2024
2 parents 9b0809d + f51339b commit 3f398cf
Show file tree
Hide file tree
Showing 87 changed files with 1,111 additions and 1,318 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
*.db
Thumbs.*
.build/
.vscode/
stdlib_repo/
.vscode/
5 changes: 5 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 2.4.16
Date: 2024-??-??
Changes:
- Changed the name of lead dust to silver-lead dust.
---------------------------------------------------------------------------------------------------
Version: 2.4.15
Date: 2024-3-24
Changes:
Expand Down
6 changes: 5 additions & 1 deletion control.lua
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
require 'scripts/wiki/text-pages'
require '__pypostprocessing__.lib'

require 'scripts/wiki/text-pages'

py.finalize_events()
29 changes: 9 additions & 20 deletions data-updates.lua
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
require("__stdlib__/stdlib/data/data").Util.create_data_globals()
local FUN = require("__pycoalprocessing__/prototypes/functions/functions")

require("prototypes/updates/base-updates")
require("prototypes/updates/pycoalprocessing-updates")
require("prototypes/updates/pyindustry-updates")
require 'prototypes/updates/base-updates'
require 'prototypes/updates/pycoalprocessing-updates'
require 'prototypes/updates/pyindustry-updates'

if mods["pyfusionenergy"] then
require("prototypes/updates/pyfusionenergy-updates")
require 'prototypes/updates/pyfusionenergy-updates'
end

if mods["pyhightech"] then
require("prototypes/updates/pyhightech-updates")
require 'prototypes/updates/pyhightech-updates'
end

if mods["pypetroleumhandling"] then
require("prototypes/updates/pypetroleumhandling-updates")
require 'prototypes/updates/pypetroleumhandling-updates'
end

if mods["pyalienlife"] then
require("prototypes/updates/pyalienlife-updates")
require 'prototypes/updates/pyalienlife-updates'
end

--ADAPTATIONS
Expand All @@ -38,7 +35,7 @@ ITEM("copper-cable"):set("icon_mipmaps", nil)
RECIPE("iron-plate"):remove_ingredient("iron-ore"):add_ingredient({type = "item", name = "iron-ore", amount = 8}):set_fields {energy_required = 10}
RECIPE("copper-plate"):remove_ingredient("copper-ore"):add_ingredient({type = "item", name = "copper-ore", amount = 8}):set_fields {energy_required = 10}

RECIPE("steel-plate"):remove_ingredient("iron-plate"):add_ingredient({type = "item", name = "coke",amount = 5}):add_ingredient({type = "item", name = "iron-ore",amount = 20}):add_ingredient({type = "item", name = "limestone",amount = 5}):change_category('advanced-foundry'):set_fields {energy_required = 15}
RECIPE("steel-plate"):remove_ingredient("iron-plate"):add_ingredient({type = "item", name = "coke",amount = 5}):add_ingredient({type = "item", name = "iron-ore",amount = 20}):add_ingredient({type = "item", name = "limestone",amount = 5}):set_fields{energy_required = 15}.category = 'advanced-foundry'
RECIPE("electronic-circuit"):set_fields {energy_required = 4}
--RECIPE("electronic-circuit"):add_ingredient({type = "item", name = "solder", amount = 2})
RECIPE("advanced-circuit"):add_ingredient({type = "item", name = "solder", amount = 4})
Expand Down Expand Up @@ -160,17 +157,9 @@ TECHNOLOGY("oil-processing"):remove_prereq("steel-processing")
TECHNOLOGY("desulfurization"):remove_prereq("sulfur-processing")
TECHNOLOGY("sulfur-processing"):remove_prereq("oil-processing")


ITEM("sulfur").stack_size = 100
ITEM("landfill").stack_size = 1000

for _, player in DATA:pairs('character') do
player.crafting_categories = player.String_Array(player.crafting_categories or {}) + 'handcrafting'
end
for _, controller in DATA:pairs('god-controller') do
controller.crafting_categories = controller.String_Array(controller.crafting_categories or {}) + 'handcrafting'
end

local recipes_list =
{
"acid-solvent",
Expand Down Expand Up @@ -219,7 +208,7 @@ local recipes_list =
}

--adding to module limitation list
FUN.productivity(recipes_list)
py.allow_productivity(recipes_list)

if register_cache_file ~= nil then
register_cache_file({"pycoalprocessing","pyindustry","pyrawores"}, "__pyrawores__/cached-configs/pycoalprocessing+pyindustry+pyrawores.lua")
Expand Down
Loading

0 comments on commit 3f398cf

Please sign in to comment.