Skip to content

Commit

Permalink
Init
Browse files Browse the repository at this point in the history
Former-commit-id: c584a41
  • Loading branch information
Nexela committed Nov 2, 2017
1 parent 3d4dbf2 commit 2cc4aae
Show file tree
Hide file tree
Showing 268 changed files with 9,659 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.db
Thumbs.*
162 changes: 162 additions & 0 deletions LICENSE.md

Large diffs are not rendered by default.

Empty file added changelog.txt
Empty file.
7 changes: 7 additions & 0 deletions data-final-fixes.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
local Area = require('stdlib.area.area')

-- Make all storage-tanks fast replace with other other if they are the same size
for _, storage_tank in pairs(data.raw["storage-tank"]) do
local area = Area(storage_tank.collision_box):round_to_integer():size()
storage_tank.fast_replaceable_group = "storage-tank-"..area
end
Empty file added data-updates.lua
Empty file.
31 changes: 31 additions & 0 deletions data.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
require("prototypes.item-groups")

require("prototypes.technologies.storage-tanks")
require("prototypes.technologies.asphalt")
require("prototypes.technologies.warehouses")

--Tiles
require ("prototypes.tiles.py-asphalt")
require ("prototypes.tiles.py-limestone")
require ("prototypes.tiles.py-coal-tile")

--Walls
require("prototypes.wall.poorman-wood-fence")
require("prototypes.wall.wood-fence")
require("prototypes.wall.concrete-wall")

--Warehouses
require("prototypes.buildings.containers.shed")
require("prototypes.buildings.containers.storehouse")
require("prototypes.buildings.containers.warehouse")

--Storage Tanks
require("prototypes.buildings.fluid-tanks.tanks-1500")
require("prototypes.buildings.fluid-tanks.tanks-4000")
require("prototypes.buildings.fluid-tanks.tanks-5000")
require("prototypes.buildings.fluid-tanks.tanks-6500")
require("prototypes.buildings.fluid-tanks.tanks-8000")

require("prototypes.buildings.accumulator-mk01")

require("prototypes.pipes.niobium-pipes")
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2cf2462bbc83502efe5a0d9436bdf181ea257f0a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8236116701ba53ddf23394455a37bc2d90c0bfbb
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/entity/niobium-pipe/fluid-background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/entity/niobium-pipe/fluid-flow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/entity/niobium-pipe/hr-fluid-background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/entity/niobium-pipe/hr-pipe-cross.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/entity/niobium-pipe/hr-pipe-t-down.png
Binary file added graphics/entity/niobium-pipe/hr-pipe-t-left.png
Binary file added graphics/entity/niobium-pipe/hr-pipe-t-up.png
Binary file added graphics/entity/niobium-pipe/hr-steam.png
Binary file added graphics/entity/niobium-pipe/pipe-cover-east.png
Binary file added graphics/entity/niobium-pipe/pipe-cover-north.png
Binary file added graphics/entity/niobium-pipe/pipe-cover-south.png
Binary file added graphics/entity/niobium-pipe/pipe-cover-west.png
Binary file added graphics/entity/niobium-pipe/pipe-cross.png
Binary file added graphics/entity/niobium-pipe/pipe-ending-down.png
Binary file added graphics/entity/niobium-pipe/pipe-ending-left.png
Binary file added graphics/entity/niobium-pipe/pipe-ending-up.png
Binary file added graphics/entity/niobium-pipe/pipe-t-down.png
Binary file added graphics/entity/niobium-pipe/pipe-t-left.png
Binary file added graphics/entity/niobium-pipe/pipe-t-right.png
Binary file added graphics/entity/niobium-pipe/pipe-t-up.png
Binary file added graphics/entity/niobium-pipe/steam.png
Binary file added graphics/entity/py-tank-1500/py-tank-1500.png
Binary file added graphics/entity/py-tank-4000/py-tank-4000.png
Binary file added graphics/entity/py-tank-5000/py-tank-5000.png
Binary file added graphics/entity/py-tank-6500/py-tank-6500.png
Binary file added graphics/entity/py-tank-8000/py-tank-8000.png
Binary file added graphics/entity/shed/shed-active-provider.png
Binary file added graphics/entity/shed/shed-basic.png
Binary file added graphics/entity/shed/shed-buffer.png
Binary file added graphics/entity/shed/shed-passive-provider.png
Binary file added graphics/entity/shed/shed-requester.png
Binary file added graphics/entity/shed/shed-storage.png
Binary file added graphics/entity/storehouse/storehouse-basic.png
Binary file added graphics/entity/storehouse/storehouse-buffer.png
Binary file added graphics/entity/storehouse/storehouse-storage.png
Binary file added graphics/entity/warehouse/warehouse-basic.png
Binary file added graphics/entity/warehouse/warehouse-buffer.png
Binary file added graphics/entity/warehouse/warehouse-requester.png
Binary file added graphics/entity/warehouse/warehouse-storage.png
Binary file added graphics/icons/accumulator-mk01.png
Binary file added graphics/icons/concrete-wall.png
Binary file added graphics/icons/containers/shed-basic.png
Binary file added graphics/icons/containers/shed-buffer.png
Binary file added graphics/icons/containers/shed-requester.png
Binary file added graphics/icons/containers/shed-storage.png
Binary file added graphics/icons/containers/storehouse-basic.png
Binary file added graphics/icons/containers/storehouse-buffer.png
Binary file added graphics/icons/containers/storehouse-storage.png
Binary file added graphics/icons/containers/warehouse-basic.png
Binary file added graphics/icons/containers/warehouse-buffer.png
Binary file added graphics/icons/containers/warehouse-requester.png
Binary file added graphics/icons/containers/warehouse-storage.png
Binary file added graphics/icons/niobium-pipe-to-ground.png
Binary file added graphics/icons/niobium-pipe.png
Binary file added graphics/icons/poorman-wood-fence.png
Binary file added graphics/icons/py-asphalt-icon.png
Binary file added graphics/icons/py-coal-tile-icon.png
Binary file added graphics/icons/py-limestone-icon.png
Binary file added graphics/icons/py-tank-1500.png
Binary file added graphics/icons/py-tank-4000.png
Binary file added graphics/icons/py-tank-5000.png
Binary file added graphics/icons/py-tank-6500.png
Binary file added graphics/icons/py-tank-8000.png
Binary file added graphics/icons/wood-fence.png
Binary file added graphics/technology/py-asphalt.png
Binary file added graphics/technology/storage-tanks.png
Binary file added graphics/technology/warehouse-research.png
Binary file added graphics/tiles/py-asphalt/concrete-o.png
Binary file added graphics/tiles/py-asphalt/concrete-side.png
Binary file added graphics/tiles/py-asphalt/concrete-u.png
Binary file added graphics/tiles/py-asphalt/py-asphalt1.png
Binary file added graphics/tiles/py-asphalt/py-asphalt2.png
Binary file added graphics/tiles/py-asphalt/py-asphalt4.png
Binary file added graphics/tiles/py-coal/py-coal-tile.png
Binary file added graphics/tiles/py-limestone/py-limestone-o.png
Binary file added graphics/tiles/py-limestone/py-limestone-side.png
Binary file added graphics/tiles/py-limestone/py-limestone-u.png
Binary file added graphics/tiles/py-limestone/py-limestone1.png
Binary file added graphics/tiles/py-limestone/py-limestone2.png
Binary file added graphics/tiles/py-limestone/py-limestone4.png
Binary file added graphics/walls/concrete-wall/corner-left.png
Binary file added graphics/walls/concrete-wall/corner-right.png
Binary file added graphics/walls/concrete-wall/end-left.png
Binary file added graphics/walls/concrete-wall/end-right.png
Binary file added graphics/walls/concrete-wall/horizontal-1.png
Binary file added graphics/walls/concrete-wall/horizontal-2.png
Binary file added graphics/walls/concrete-wall/horizontal-3.png
Binary file added graphics/walls/concrete-wall/horizontal-4.png
Binary file added graphics/walls/concrete-wall/single.png
Binary file added graphics/walls/concrete-wall/t-down.png
Binary file added graphics/walls/concrete-wall/vertical.png
Binary file added graphics/walls/poorman-wood-fence/corner-left.png
Binary file added graphics/walls/poorman-wood-fence/end-left.png
Binary file added graphics/walls/poorman-wood-fence/end-right.png
Binary file added graphics/walls/poorman-wood-fence/single.png
Binary file added graphics/walls/poorman-wood-fence/t-down.png
Binary file added graphics/walls/poorman-wood-fence/vertical.png
Binary file added graphics/walls/wood-fence/corner-left.png
Binary file added graphics/walls/wood-fence/corner-right.png
Binary file added graphics/walls/wood-fence/end-left.png
Binary file added graphics/walls/wood-fence/end-right.png
Binary file added graphics/walls/wood-fence/horizontal.png
Binary file added graphics/walls/wood-fence/single.png
Binary file added graphics/walls/wood-fence/t-down.png
Binary file added graphics/walls/wood-fence/vertical.png
11 changes: 11 additions & 0 deletions info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "pyindustry",
"version": "1.0.0",
"factorio_version": "0.15",
"title": "Pyanodons Industry",
"author": "Pyanodon, Nexela",
"contact": "",
"homepage": "",
"description": "Adds industry based buildings to the game.",
"dependencies": ["base >= 0.15.37", "? pycoalprocessing >= 0.4.0", "? boblibrary"]
}
100 changes: 100 additions & 0 deletions locale/en/en.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
[item-group-name]
py-industry=Industry Items

[item-name]
py-asphalt=Asphalt
py-limestone=Limestone Tile
py-coal-tile=Coal Tile

[item-description]
py-asphalt=Good for boots
py-coal-tile=Dark and mysterious

[entity-name]
py-tank-1500=Tank 1500L
py-tank-4000=Tank 4000L
py-tank-5000=Tank 5000L
py-tank-6500=Tank 6500L
py-tank-8000=Tank 8000L

niobium-pipe=Niobum pipe
niobium-pipe-to-ground=Niobum underground pipe

poorman-wood-fence=Poor wood fence
wood-fence=Wooden fence
concrete-wall=Concrete wall

accumulator-mk01=Nexelit-powered Accumulator

py-warehouse-basic=Warehouse
py-warehouse-passive-provider=Passive Provider Warehouse
py-warehouse-storage=Storage Warehouse
py-warehouse-active-provider=Active Provider Warehouse
py-warehouse-requester=Requester Warehouse
py-warehouse-buffer=Buffer Warehouse

py-storehouse-basic=Storehouse
py-storehouse-passive-provider=Passive Provider Storehouse
py-storehouse-storage=Storage Storehouse
py-storehouse-active-provider=Active Provider Storehouse
py-storehouse-requester=Requester Storehouse
py-storehouse-buffer=Buffer Storehouse

py-shed-basic=Shed
py-shed-passive-provider=Passive Provider Shed
py-shed-storage=Storage Shed
py-shed-active-provider=Active Provider Shed
py-shed-requester=Requester Shed
py-shed-buffer=Buffer Shed

[entity-description]
py-tank-1500=Cheap low-capacity tank.
py-tank-4000=Medium capacity tank.
py-tank-5000=Medium capacity tank.
py-tank-6500=Good capacity tank.

poorman-wood-fence=At least you have something.
wood-fence=Made of pure wood.
concrete-wall=Hard and breakable.

accumulator-mk01=Nexelit-powered accumulator to store great amounts of energy.

py-warehouse-basic=Stores many many items
py-warehouse-passive-provider=Passive Provider Warehouse
py-warehouse-storage=Storage Warehouse
py-warehouse-active-provider=Active Provider Warehouse
py-warehouse-requester=Requester Warehouse
py-warehouse-buffer=Buffer Warehouse

py-storehouse-basic=Stores some items
py-storehouse-passive-provider=Passive Provider Storehouse
py-storehouse-storage=Storage Storehouse
py-storehouse-active-provider=Active Provider Storehouse
py-storehouse-requester=Requester Storehouse
py-storehouse-buffer=Buffer Storehouse

py-shed-basic=Stores some items
py-shed-passive-provider=Passive Provider Shed
py-shed-storage=Storage Shed
py-shed-active-provider=Active Provider Shed
py-shed-requester=Requester Shed
py-shed-buffer=Buffer Shed

[technology-name]
py-storage-tanks=Storage Tanks
py-asphalt=Asphalt
py-warehouse-research=Warehousing
py-warehouse-logistics-research=Logistics Warehousing


[technology-description]
py-storage-tanks=Add more types of storage tanks.
py-asphalt=Make new tiles.

[tile-name]
py-asphalt=Asphalt
py-coal-tile=Coal Tile
py-limestone=Limestone Tile

[wall-name]
poorman-wood-fence=Poor´s man wood fence
16 changes: 16 additions & 0 deletions locale/ru/entitys.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[entity-name]
py-tank-1500=Резервуар на 1500 л
py-tank-4000=Резервуар на 4000 л
py-tank-5000=Резервуар на 5000 л
py-tank-6500=Резервуар на 6500 л
py-tank-8000=Резервуар на 8000 л
accumulator-mk01=Аккумулятор усиленный некселитом
niobium-pipe=Ниобиевая труба
niobium-pipe-to-ground=Подземная ниобиевая труба

[entity-description]
py-tank-1500=Дешевый, небольшой резервуар.
py-tank-4000=Довольно вместительный резервуар.
py-tank-5000=Довольно вместительный резервуар.
py-tank-6500=В этот резервуар поместится целое озеро.
accumulator-mk01=Благодаря некселиту этот аккумулятор может хранить огромную энергию.
4 changes: 4 additions & 0 deletions locale/ru/locale.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[tile-name]
py-asphalt=Асфальт
py-coal-tile=Чёрное покрытие
py-limestone=Limestone Tile
8 changes: 8 additions & 0 deletions locale/ru/technologys.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[technology-name]
storage-tanks=Резервуары для хранения
py-asphalt=Асфальт

[technology-description]
storage-tanks=Добавляет разнообразные резервуары для хранения.
py-asphalt=Добавляет новое покрытие.

110 changes: 110 additions & 0 deletions makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
PACKAGE_NAME := $(shell cat info.json|jq -r .name)
VERSION_STRING := $(shell cat info.json|jq -r .version)
TOKEN := $(shell cat .token)
OUTPUT_NAME := $(PACKAGE_NAME)_$(VERSION_STRING)
BUILD_DIR := .build
OUTPUT_DIR := $(BUILD_DIR)/$(OUTPUT_NAME)
CONFIG = ./$(OUTPUT_DIR)/config.lua
MODS_DIRECTORY := ../.mods.15
##MOD_LINK := $(shell find $(MODS_DIRECTORY)/$(OUTPUT_NAME) -mindepth 1 -maxdepth 1 -type d)
PARSER := ". | map(select(.tag_name == \"$(VERSION_STRING)\"))[0].assets | map(select(.name == \"$(OUTPUT_NAME).zip\"))[0].id"

PKG_COPY := $(wildcard *.md) $(wildcard .*.md) $(wildcard graphics) $(wildcard locale) $(wildcard sounds)

SED_FILES := $(shell find . -iname '*.json' -type f -not -path "./.*/*") $(shell find . -iname '*.lua' -type f -not -path "./.*/*")
PNG_FILES := $(shell find ./graphics -iname '*.png' -type f)

OUT_FILES := $(SED_FILES:%=$(OUTPUT_DIR)/%)

SED_EXPRS := -e 's/{{MOD_NAME}}/$(PACKAGE_NAME)/g'
SED_EXPRS += -e 's/{{VERSION}}/$(VERSION_STRING)/g'

##@luac -p $@
##@luacheck $@

all: clean

release: clean check package

optimized-release: clean check optimize-package

git: tag
git checkout master
git merge develop master
git checkout develop
git push --all
git push --tags

github-release:
curl --data '{"tag_name": "v$(VERSION_STRING)","target_commitish": "master","name": "v$(VERSION_STRING)","body": "Release of version $(VERSION_STRING)","draft": false,"prerelease": false}' https://api.github.com/repos/pyanodon/pYCoalprocesing/releases?access_token=$(TOKEN);
#curl 'https://api.github.com/repos/pyanodon/pYCoalprocesing/releases/v$(VERSION_STRING)/assets?access_token=$(TOKEN)&name=$(OUTPUT_NAME).zip' --header 'Content-Type: application/zip' --upload-file $(BUILD_DIR)/$(OUTPUT_NAME).zip -X POST;

package-copy: $(PKG_DIRS) $(PKG_FILES)
@mkdir -p $(OUTPUT_DIR)
ifneq ($(PKG_COPY),)
@cp -r $(PKG_COPY) $(OUTPUT_DIR)
endif

$(OUTPUT_DIR)/%.lua: %.lua
@mkdir -p $(@D)
@sed $(SED_EXPRS) $< > $@


$(OUTPUT_DIR)/%: %
@mkdir -p $(@D)
@sed $(SED_EXPRS) $< > $@

link2:
([ -d "$(MODS_DIRECTORY)/$(OUTPUT_NAME)" ] && \
echo "Junction does not need updating.") || \
@[ -d "$(MODS_DIRECTORY)/$(PACKAGE_NAME)*" ] && \
echo "Updating Junction" && \
mv $(MODS_DIRCTORY)/$(PACKAGE_NAME)* $(MODS_DIRECTORY)/$(OUTPUT_NAME)

link:
if test -d $(MODS_DIRECTORY)/$(PACKAGE_NAME)*; then \
if test -d $(MODS_DIRECTORY)/$(OUTPUT_NAME); then \
echo "Dont Update"; \
else \
echo "DO STUFF"; \
fi \
else \
echo "No Target to Link"; \
fi

tag:
git tag -f v$(VERSION_STRING)

optimize1:
for name in $(PNG_FILES); do \
optipng -o8 $(OUTPUT_DIR)'/'$$name; \
done

optimize2:
@echo Please wait, Optimizing Graphics.
@for name in $(PNG_FILES); do \
pngquant --skip-if-larger -q --strip --ext .png --force $(OUTPUT_DIR)'/'$$name; \
done

nodebug:
@[ -e $(CONFIG) ] && \
echo Removing debug switches from config.lua && \
sed -i 's/^\(.*DEBUG.*=\).*/\1 false/' $(CONFIG) && \
sed -i 's/^\(.*LOGLEVEL.*=\).*/\1 0/' $(CONFIG) && \
sed -i 's/^\(.*loglevel.*=\).*/\1 0/' $(CONFIG) || \
echo No Config Files

check:
@luacheck . -q --codes

package: package-copy $(OUT_FILES) nodebug
@cd $(BUILD_DIR) && zip -rq $(OUTPUT_NAME).zip $(OUTPUT_NAME)
@echo $(OUTPUT_NAME).zip ready

optimize-package: package-copy $(OUT_FILES) nodebug optimize2
@cd $(BUILD_DIR) && zip -rq $(OUTPUT_NAME).zip $(OUTPUT_NAME)
@echo $(OUTPUT_NAME).zip ready

clean:
@rm -rf $(BUILD_DIR)
@echo Removing Build Directory.
Loading

0 comments on commit 2cc4aae

Please sign in to comment.