Update to 0.15.0

ZwerOxotnik · Oct 28, 2023 · ac6382a · ac6382a
1 parent e7014ce
commit ac6382a
Show file tree

Hide file tree

Showing 108 changed files with 517 additions and 53 deletions.
diff --git a/README.md b/README.md
@@ -180,7 +180,8 @@ This project contains work from multiple sources + [addons](#overview).
 * [zk-factorio-static-lib](https://github.com/ZwerOxotnik/zk-factorio-static-lib)
 * [Sounds from other authors](/sound/README.txt)
 
-Also, this project used [Mod generator](https://github.com/ZwerOxotnik/Mod-generator)
+Also, this project used [Mod generator](https://github.com/ZwerOxotnik/Mod-generator).\
+Some images were copied from the game "Factorio" and changed, please, read terms of service: https://www.factorio.com/terms-of-service.
 
 Artwork
 -------

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,10 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.15.0
+Date: 28. 10. 2023
+  Scripting:
+    - Updated /static-libs
+    - Added new icons, styles
+---------------------------------------------------------------------------------------------------
 Version: 0.14.0
 Date: 27. 10. 2023
   Scripting:

diff --git a/data-updates.lua b/data-updates.lua
@@ -6,7 +6,10 @@ local add_tags = lazyAPI.base.add_tags
 local recipes = data.raw.recipe
 local items = data.raw.item
 for _, v in pairs(lazyAPI.materials) do
-	local name = v .. "-gear-wheel"
+	local name = v .. "-wire"
+	add_tags(recipes[name], "wire")
+	add_tags(items[name],   "wire")
+	name = v .. "-gear-wheel"
 	add_tags(recipes[name], "gear")
 	add_tags(items[name],   "gear")
 	name = v .. "-plate"

diff --git a/data.lua b/data.lua
@@ -16,7 +16,7 @@ compat = require("__zk-lib__/lualib/Penlight/lua/pl/compat")
 warn "@on"
 
 
-require("prototypes/utility-sprites")
+require("prototypes/sprites")
 require("prototypes/styles")
 
 
@@ -28,42 +28,6 @@ lazyAPI.attach_custom_input_event("mine")
 lazyAPI.attach_custom_input_event("toggle-map")
 
 
-local GRAPHICS_PATH = "__zk-lib__/graphics/"
-data:extend{
-	{
-		type = "sprite", name = "plus_white",
-		filename = GRAPHICS_PATH .. "plus_white.png",
-		priority = "extra-high-no-scale",
-		width = 32, height = 32,
-		scale = 0.5,
-		flags = {"gui-icon"}
-	}, {
-		type = "sprite", name = "plus",
-		filename = GRAPHICS_PATH .. "plus.png",
-		priority = "extra-high-no-scale",
-		width = 32, height = 32,
-		scale = 0.5,
-		flags = {"gui-icon"}
-	}, {
-		type = "sprite", name = "lua_snippet_tool_icon_white",
-		filename = GRAPHICS_PATH .. "run-snippet-tool-white.png",
-		priority = "medium",
-		width = 64, height = 64,
-		mipmap_count = 3,
-		flags = {"gui-icon"},
-		scale = 0.5
-	}, {
-		type = "sprite", name = "map_exchange_string_white",
-		filename = GRAPHICS_PATH .. "map-exchange-string-white.png",
-		priority = "extra-high-no-scale",
-		width = 32, height = 32,
-		mipmap_count = 3,
-		flags = {"gui-icon"},
-		scale = 0.5
-	}
-}
-
-
 -- TODO: create special scripts
 -- lazyAPI.create_trigger_capsule({
 --   name = "zk-select", -- this is fake cursor to find cursor position via https://lua-api.factorio.com/latest/events.html#on_script_trigger_effect

diff --git a/graphics/add-icon-white.png b/graphics/add-icon-white.png
diff --git a/graphics/bookmark-white.png b/graphics/bookmark-white.png
diff --git a/graphics/brush-circle-shape-white.png b/graphics/brush-circle-shape-white.png
diff --git a/graphics/brush-icon-white.png b/graphics/brush-icon-white.png
diff --git a/graphics/brush-square-shape-white.png b/graphics/brush-square-shape-white.png
diff --git a/graphics/center-white.png b/graphics/center-white.png
diff --git a/graphics/change-recipe-white.png b/graphics/change-recipe-white.png
diff --git a/graphics/clone-icon-white.png b/graphics/clone-icon-white.png
diff --git a/graphics/close-fat-white.png b/graphics/close-fat-white.png
diff --git a/graphics/close-map-preview-white.png b/graphics/close-map-preview-white.png
diff --git a/graphics/color-picker-white.png b/graphics/color-picker-white.png
diff --git a/graphics/confirm-white.png b/graphics/confirm-white.png
diff --git a/graphics/controller/joycon/A-white.png b/graphics/controller/joycon/A-white.png
diff --git a/graphics/controller/joycon/B-white.png b/graphics/controller/joycon/B-white.png
diff --git a/graphics/controller/joycon/L-stick-press-white.png b/graphics/controller/joycon/L-stick-press-white.png
diff --git a/graphics/controller/joycon/L-stick-white.png b/graphics/controller/joycon/L-stick-white.png
diff --git a/graphics/controller/joycon/L-white.png b/graphics/controller/joycon/L-white.png
diff --git a/graphics/controller/joycon/R-stick-press-white.png b/graphics/controller/joycon/R-stick-press-white.png
diff --git a/graphics/controller/joycon/R-stick-white.png b/graphics/controller/joycon/R-stick-white.png
diff --git a/graphics/controller/joycon/R-white.png b/graphics/controller/joycon/R-white.png
diff --git a/graphics/controller/joycon/SL-white.png b/graphics/controller/joycon/SL-white.png
diff --git a/graphics/controller/joycon/SR-white.png b/graphics/controller/joycon/SR-white.png
diff --git a/graphics/controller/joycon/X-white.png b/graphics/controller/joycon/X-white.png
diff --git a/graphics/controller/joycon/Y-white.png b/graphics/controller/joycon/Y-white.png
diff --git a/graphics/controller/joycon/ZL-white.png b/graphics/controller/joycon/ZL-white.png
diff --git a/graphics/controller/joycon/ZR-white.png b/graphics/controller/joycon/ZR-white.png
diff --git a/graphics/controller/joycon/dpad-down-white.png b/graphics/controller/joycon/dpad-down-white.png
diff --git a/graphics/controller/joycon/dpad-left-white.png b/graphics/controller/joycon/dpad-left-white.png
diff --git a/graphics/controller/joycon/dpad-right-white.png b/graphics/controller/joycon/dpad-right-white.png
diff --git a/graphics/controller/joycon/dpad-up-white.png b/graphics/controller/joycon/dpad-up-white.png
diff --git a/graphics/controller/joycon/minus-white.png b/graphics/controller/joycon/minus-white.png
diff --git a/graphics/controller/joycon/plus-white.png b/graphics/controller/joycon/plus-white.png
diff --git a/graphics/controller/ps/L1-white.png b/graphics/controller/ps/L1-white.png
diff --git a/graphics/controller/ps/L2-white.png b/graphics/controller/ps/L2-white.png
diff --git a/graphics/controller/ps/R1-white.png b/graphics/controller/ps/R1-white.png
diff --git a/graphics/controller/ps/R2-white.png b/graphics/controller/ps/R2-white.png
diff --git a/graphics/controller/ps/circle-white.png b/graphics/controller/ps/circle-white.png
diff --git a/graphics/controller/ps/cross-white.png b/graphics/controller/ps/cross-white.png
diff --git a/graphics/controller/ps/dpad-down-white.png b/graphics/controller/ps/dpad-down-white.png
diff --git a/graphics/controller/ps/dpad-left-white.png b/graphics/controller/ps/dpad-left-white.png
diff --git a/graphics/controller/ps/dpad-right-white.png b/graphics/controller/ps/dpad-right-white.png
diff --git a/graphics/controller/ps/dpad-up-white.png b/graphics/controller/ps/dpad-up-white.png
diff --git a/graphics/controller/ps/options-white.png b/graphics/controller/ps/options-white.png
diff --git a/graphics/controller/ps/share-white.png b/graphics/controller/ps/share-white.png
diff --git a/graphics/controller/ps/square-white.png b/graphics/controller/ps/square-white.png
diff --git a/graphics/controller/ps/touch-pad-white.png b/graphics/controller/ps/touch-pad-white.png
diff --git a/graphics/controller/ps/triangle-white.png b/graphics/controller/ps/triangle-white.png
diff --git a/graphics/controller/steam-deck/L1-white.png b/graphics/controller/steam-deck/L1-white.png
diff --git a/graphics/controller/steam-deck/L2-white.png b/graphics/controller/steam-deck/L2-white.png
diff --git a/graphics/controller/steam-deck/L4-white.png b/graphics/controller/steam-deck/L4-white.png
diff --git a/graphics/controller/steam-deck/L5-white.png b/graphics/controller/steam-deck/L5-white.png
diff --git a/graphics/controller/steam-deck/R1-white.png b/graphics/controller/steam-deck/R1-white.png
diff --git a/graphics/controller/steam-deck/R2-white.png b/graphics/controller/steam-deck/R2-white.png
diff --git a/graphics/controller/steam-deck/R4-white.png b/graphics/controller/steam-deck/R4-white.png
diff --git a/graphics/controller/steam-deck/R5-white.png b/graphics/controller/steam-deck/R5-white.png
diff --git a/graphics/controller/steam-deck/menu-white.png b/graphics/controller/steam-deck/menu-white.png
diff --git a/graphics/controller/steam-deck/square-white.png b/graphics/controller/steam-deck/square-white.png
diff --git a/graphics/controller/xbox/LB-white.png b/graphics/controller/xbox/LB-white.png
diff --git a/graphics/controller/xbox/LT-white.png b/graphics/controller/xbox/LT-white.png
diff --git a/graphics/controller/xbox/RB-white.png b/graphics/controller/xbox/RB-white.png
diff --git a/graphics/controller/xbox/RT-white.png b/graphics/controller/xbox/RT-white.png
diff --git a/graphics/controller/xbox/windows-white.png b/graphics/controller/xbox/windows-white.png
diff --git a/graphics/copy-white.png b/graphics/copy-white.png
diff --git a/graphics/cursor-icon-white.png b/graphics/cursor-icon-white.png
diff --git a/graphics/dropdown-white.png b/graphics/dropdown-white.png
diff --git a/graphics/editor-tick-custom-icon-white.png b/graphics/editor-tick-custom-icon-white.png
diff --git a/graphics/editor-tick-once-icon-white.png b/graphics/editor-tick-once-icon-white.png
diff --git a/graphics/editor-tick-sixty-icon-white.png b/graphics/editor-tick-sixty-icon-white.png
diff --git a/graphics/enter-icon-white.png b/graphics/enter-icon-white.png
diff --git a/graphics/export-slot-white.png b/graphics/export-slot-white.png
diff --git a/graphics/export-white.png b/graphics/export-white.png
diff --git a/graphics/go-to-minibutton-arrow-white.png b/graphics/go-to-minibutton-arrow-white.png
diff --git a/graphics/goto-icon-white.png b/graphics/goto-icon-white.png
diff --git a/graphics/grid-view-white.png b/graphics/grid-view-white.png
diff --git a/graphics/import-white.png b/graphics/import-white.png
diff --git a/graphics/import2-white.png b/graphics/import2-white.png
diff --git a/graphics/left-arrow-white.png b/graphics/left-arrow-white.png
diff --git a/graphics/line-icon-white.png b/graphics/line-icon-white.png
diff --git a/graphics/list-view-white.png b/graphics/list-view-white.png
diff --git a/graphics/map-white.png b/graphics/map-white.png
diff --git a/graphics/paint-bucket-icon-white.png b/graphics/paint-bucket-icon-white.png
diff --git a/graphics/pause-white.png b/graphics/pause-white.png
diff --git a/graphics/play-white.png b/graphics/play-white.png
diff --git a/graphics/preset-white.png b/graphics/preset-white.png
diff --git a/graphics/questionmark-white.png b/graphics/questionmark-white.png
diff --git a/graphics/refresh-white.png b/graphics/refresh-white.png
diff --git a/graphics/rename-normal-white.png b/graphics/rename-normal-white.png
diff --git a/graphics/rename-small-black-white.png b/graphics/rename-small-black-white.png
diff --git a/graphics/right-arrow-white.png b/graphics/right-arrow-white.png
diff --git a/graphics/select-area-white.png b/graphics/select-area-white.png
diff --git a/graphics/shuffle-white.png b/graphics/shuffle-white.png
diff --git a/graphics/slot-item-in-hand-white.png b/graphics/slot-item-in-hand-white.png
diff --git a/graphics/speed-down-white.png b/graphics/speed-down-white.png
diff --git a/graphics/speed-up-white.png b/graphics/speed-up-white.png
diff --git a/graphics/spray-icon-white.png b/graphics/spray-icon-white.png
diff --git a/graphics/station-name-white.png b/graphics/station-name-white.png
diff --git a/graphics/stop-white.png b/graphics/stop-white.png
diff --git a/graphics/sync-mods-white.png b/graphics/sync-mods-white.png
diff --git a/graphics/variations-white.png b/graphics/variations-white.png
diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "zk-lib",
-    "version": "0.14.0",
+    "version": "0.15.0",
     "factorio_version": "1.1",
     "title": "ZwerOxotnik's extendable mod with 8 addons",
     "author": "ZwerOxotnik",