Merge branch 'develop'

jpanther · Jan 28, 2020 · 00c3224 · 00c3224
2 parents aa7d843 + 72625c9
commit 00c3224
Show file tree

Hide file tree

Showing 20 changed files with 107 additions and 32 deletions.
diff --git a/FAQ.md b/FAQ.md
@@ -112,11 +112,11 @@ While I can't possibly test every combination of mods available, usually Dectori
 
 That's a pity, but that's the nature of modding. If you have a valid concern about something Dectorio is changing that seems contrary to the way something should work, feel free to [raise a new issue on GitHub](https://github.com/jpanther/Dectorio/issues) outlining your concern. If it is something that makes sense to change, I'll definitely look to adjust the mod in a future update. However, please note that Dectorio is designed to make it easy to decorate your factory, and the technology and recipe choices try to be somewhat realistic. The mod settings allow you to toggle individual changes on and off so you can customise it to your own play style. If you still don't like that, then simply don't use the mod! Requests that just whinge about things you don't agree with, without being constructive, will be ignored.
 
-## How do I play with Dectorio on Factorio 0.16.x or 0.15.x?
+## How do I play with Dectorio on Factorio 0.17.x, 0.16.x or 0.15.x?
 
-The latest versions of Dectorio are designed to work with Factorio 0.17 and later. Due to the way the base game changes with each major release, there's no way to make the latest versions of Dectorio compatible with older versions of Factorio. However, old stable versions of Dectorio are kept available on the mod portal for each major Factorio release.
+The latest versions of Dectorio are designed to work with Factorio 0.18 and later. Due to the way the base game changes with each major release, there's no way to make the latest versions of Dectorio compatible with older versions of Factorio. However, old stable versions of Dectorio are kept available on the mod portal for each major Factorio release.
 
-For Factorio 0.16.x download Dectorio v0.8.11 and for Factorio 0.15.x download Dectorio v0.7.6.
+For Factorio 0.17.x download Dectorio v0.9.16; for Factorio 0.16.x download Dectorio v0.8.11; and for Factorio 0.15.x download Dectorio v0.7.6.
 
 Note that these old versions of Dectorio will not be updated with new features, but they will occasionally have bugfixes if it's appropriate. You'll need to upgrade your Factorio version to take advantage of the latest changes.
 

diff --git a/README.md b/README.md
@@ -104,14 +104,14 @@ Special thanks to the translators below (in no particular order).
 
 * Chinese Simplified (80%) - [jessefjxm](https://crowdin.com/profile/jessefjxm).
 * Chinese Traditional (34%) - [k98a](https://crowdin.com/profile/k98a).
-* Czech (64%) - [dereksp](https://crowdin.com/profile/dereksp), [Meritic](https://crowdin.com/profile/Meritic) and [Treij](https://crowdin.com/profile/Treij).
+* Czech (75%) - [dereksp](https://crowdin.com/profile/dereksp), [Meritic](https://crowdin.com/profile/Meritic) and [Treij](https://crowdin.com/profile/Treij).
 * French (89%) - [Taniotoshi](https://crowdin.com/profile/Taniotoshi) and [daikyraraga](https://crowdin.com/profile/daikyraraga).
 * German (92%) - [seeba8](https://github.com/seeba8), [ST-DDT](https://crowdin.com/profile/ST-DDT), [LastDawn](https://crowdin.com/profile/LastDawn), [lpzockerx](https://crowdin.com/profile/lpzockerx) and [Leridon](https://crowdin.com/profile/Leridon).
 * Hungarian (92%) - [mmnetworkteam](https://crowdin.com/profile/mmnetworkteam).
 * Korean (92%) - [GimoXagros](https://crowdin.com/profile/GimoXagros).
-* Polish (95%) - [Tomirad](https://github.com/Tomirad), [Requelfade](https://crowdin.com/profile/Requelfade), [no_desired_username](https://crowdin.com/profile/no_desired_username) and [tomplus](https://crowdin.com/profile/tomplus).
-* Portuguese, Brazilian (92%) - [celaquila](https://crowdin.com/profile/celaquila).
-* Russian (100%) - [nastyslave](https://crowdin.com/profile/nastyslave), [diraria](https://crowdin.com/profile/diraria), [scheugen86](https://crowdin.com/profile/scheugen86), [antonus777](https://crowdin.com/profile/antonus777), [schmarotzerltd](https://crowdin.com/profile/schmarotzerltd) and [1avek1](https://crowdin.com/profile/1avek1).
+* Polish (99%) - [Tomirad](https://github.com/Tomirad), [Requelfade](https://crowdin.com/profile/Requelfade), [no_desired_username](https://crowdin.com/profile/no_desired_username) and [tomplus](https://crowdin.com/profile/tomplus).
+* Portuguese, Brazilian (91%) - [celaquila](https://crowdin.com/profile/celaquila).
+* Russian (99%) - [nastyslave](https://crowdin.com/profile/nastyslave), [diraria](https://crowdin.com/profile/diraria), [scheugen86](https://crowdin.com/profile/scheugen86), [antonus777](https://crowdin.com/profile/antonus777), [schmarotzerltd](https://crowdin.com/profile/schmarotzerltd) and [1avek1](https://crowdin.com/profile/1avek1).
 * Spanish (92%) - [notallme](https://crowdin.com/profile/notallme).
 
 ### Mod Compatibility

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,15 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.10.3
+Date: 28. 01. 2020
+  Added:
+    - New recipe for upgrading Stone gates to Concrete gates
+    - Additional high resolution icons
+  Bugfixes:
+    - Fixed sprite size issue when playing with Normal resolution sprites (thanks to spandelk)
+  Locales:
+    - Updated Polish translation (thanks to tomplus)
+    - Updated Czech translation (thanks to Treij)
+---------------------------------------------------------------------------------------------------
 Version: 0.10.2
 Date: 25. 01. 2020
   Added:

diff --git a/graphics/icons/concrete-gate-from-stone-gate.png b/graphics/icons/concrete-gate-from-stone-gate.png
diff --git a/graphics/icons/concrete-wall-from-stone-wall.png b/graphics/icons/concrete-wall-from-stone-wall.png
diff --git a/graphics/icons/concrete-wall.png b/graphics/icons/concrete-wall.png
diff --git a/graphics/icons/small-lamp-glow.png b/graphics/icons/small-lamp-glow.png
diff --git a/graphics/icons/stone-brick-wall.png b/graphics/icons/stone-brick-wall.png
diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
   "name": "Dectorio",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "title": "Dectorio",
   "author": "PantherX",
   "contact": "",

diff --git a/locale/cs/dectorio.cfg b/locale/cs/dectorio.cfg
@@ -9,10 +9,16 @@ dectorio-signals=Povolit signál
 dectorio-walls=Povolit stěny a brány
 dectorio-landscaping=Povolit terénní úpravy
 dectorio-waterfill=Povolit vyplňování vodou
+dectorio-wood=Povolit dřevěné dlaždice
+dectorio-gravel=Povolit štěrkové dlaždice
+dectorio-concrete=Povolit betonové dlaždice
+dectorio-painted-concrete=Povolit barvné betonové dlaždice
 dectorio-signs=Povolit značky
 dectorio-decoratives=Povolit dekorace
 dectorio-item-group=Oddělit výrobní okno
 dectorio-vanilla-hazard-concrete-style=Použít výchozí Nebezpečí beton
+dectorio-landscaping-blueprintable=Zahrnout zeminu v plánech
+dectorio-painted-concrete-speed-modifier=Násobič rychlosti na barevném betonu
 dectorio-decorative-removal-probability=Pravděpodobnost odstranění dekorací
 dectorio-flooring-stack-size=Zaokroulování velikosti zásobníku
 dectorio-landscaping-stack-size=Zásobník věcí na teréní úpravy
@@ -23,13 +29,16 @@ dectorio-signals=Umožní další signály pro použití v lampách nebo obvodec
 dectorio-walls=Povolí další typy zdí a bran
 dectorio-landscaping=Umožní vytvářet písečné, prašné, zatravněné a pouštní bloky
 dectorio-waterfill=Umožní vytvářet vodu pro tvorbu nebo zvětšení jezer
+dectorio-wood=Povoluje výrobu dřevěných podlah
 dectorio-gravel=Umožní pokládat natěženeé materiály na zem jako štěrk
+dectorio-concrete=Povoluje výrobu betonových podlah, včetně mřížkového betonu
 dectorio-painted-concrete=Umožní barevné styly betonu místo původního nebezpečného
 dectorio-signs=Umožní umisťovat cedule
 dectorio-decoratives=Umožní vytvářet dekorativní věci pro tvou továrnu
 dectorio-item-group=Přesune všechny dekorativní věci do vlastního tabu v batohu
 dectorio-vanilla-hazard-concrete-style=Pokud je povoleno, malované nebezpečí betonu bude vypadat jako výchozí Factorio nebezpečí betonu při umístění (vyžaduje malované konkrétní být povolena)
 dectorio-landscaping-blueprintable=Pokud je povoleno, plány budou zahrnovat krajinné prvky jako dlaždice
+dectorio-painted-concrete-speed-modifier=Upravuje základní rychlost chůze a jízdy na barevném betonu (1 = nezměněná rychlost (výchozí), 0,75 = 75% rychlost, 0,5 = 50% rychlost)
 dectorio-decorative-removal-probability=Pravděpodobnost že ozdoby, keřů a trávy, jsou odstraněny, když podlahové dlaždice jsou umístěny (budou odebrány 1 = 100 % (výchozí hodnota), 0,5 = 50 %, 0 = nebyly odebrány žádné)
 dectorio-flooring-stack-size=Počet položek podlahy, které lze stohovat v jednom zásob patici (výchozí = 500)
 dectorio-landscaping-stack-size=Počet terénní úpravy položek, které lze stohovat v jednom zásob patici (výchozí = 500)
@@ -122,6 +131,8 @@ dect-sign-wood=Dřevěná cedule
 dect-sign-steel=Ocelová cedula
 dect-small-lamp-glow=Zářivá lampa
 dect-traffic-bollard=Dopravní stožár
+gate=Kamenná brána
+dect-concrete-gate=Betonová brána
 
 [tile-name]
 dect-concrete-grid=Mřížkový beton
@@ -156,6 +167,8 @@ dect-wood-floor=Dřevěné parkety
 dect-earthworks=Zemní práce
 dect-lawnmower=Sekačka
 dect-signs=Cedule
+gates=Základní brány
+dect-advanced-gates=Pokročilé brány
 
 [technology-description]
 dect-landscaping=Umožní pokládání přírodních povrchů.
@@ -165,6 +178,8 @@ dect-advanced-walls=Silnější zdi pro chranu vaší továrny.
 dect-wood-floor=Jednoduchá dřevěná podlaha, která umožňuje rychlejší pohyb.
 dect-earthworks=Umožňuje pokládání a ničení vodních polí.
 dect-signs=Cedule pro jednodušší označování továrny.
+gates=Základní část zdi která se v případě potřeby otevře. Možno připojit k ovládací síti.
+dect-advanced-gates=Silnější než základní brány. Tyto pokročilé části zdí se otevřou když je potřeba. Možno připojit k ovládací síti.
 
 [virtual-signal-name]
 signal-red=Červený signál

diff --git a/locale/en/dectorio.cfg b/locale/en/dectorio.cfg
@@ -149,6 +149,7 @@ dect-lawnmower=While holding, __CONTROL__select-for-blueprint__ and drag over an
 
 [recipe-name]
 dect-concrete-wall-from-stone-wall=Concrete wall from Stone wall
+dect-concrete-gate-from-stone-gate=Concrete gate from Stone gate
 
 [entity-name]
 dect-wood-wall=Wooden barricade

diff --git a/locale/pl/dectorio.cfg b/locale/pl/dectorio.cfg
@@ -159,6 +159,8 @@ dect-sign-steel=Stalowy znak
 dect-small-lamp-glow=Lampa oświetlająca
 dect-traffic-bollard=Słupek drogowy
 stone-wall=Kamienny mur
+gate=Kamienna brama
+dect-concrete-gate=Betonowa brama
 
 [tile-name]
 dect-concrete-grid=Siatka betonowa
@@ -209,6 +211,8 @@ dect-wood-floor=Drewniane podłoże
 dect-earthworks=Prace ziemne
 dect-lawnmower=Kosiarka
 dect-signs=Znaki
+gates=Bramy podstawowe
+dect-advanced-gates=Bramy zaawansowane
 
 [technology-description]
 dect-landscaping=Umożliwia umieszczenie naturalnych podłoży.
@@ -219,6 +223,8 @@ dect-wood-floor=Podstawowe drewniane deski służą do okrywania ziemnego podło
 dect-earthworks=Pozwala na dodanie lub usunięcie terenów z wodą.
 dect-lawnmower=Usuwa dekoracje z danego obszaru, pozostawiając całkowicie wyczyszczoną powierzchnię.
 dect-signs=Znaki informacyjne które można ustawiać z informacją w formie przedmiotu.
+gates=Podstawowe sekcje ścienne, które otwierają się w razie potrzeby. Mogą być sterowane za pomocą sieci obwodów.
+dect-advanced-gates=Silniejsze niż podstawowe bramy, zaawansowane sekcje ścienne otwierają się w razie potrzeby. Mogą być sterowane za pomocą sieci obwodów.
 
 [virtual-signal-name]
 signal-red=Czerwony kolor sygnału

diff --git a/makefile b/makefile
@@ -57,6 +57,7 @@ release:
 	git push
 	git checkout master
 	git merge --no-ff develop
+	git push
 	git tag -f v$(PACKAGE_VERSION)
 	git push --tags
 	git checkout develop
diff --git a/migrations/0.10.3.lua b/migrations/0.10.3.lua
@@ -0,0 +1,13 @@
+for index, force in pairs(game.forces) do
+	force.reset_recipes()
+	force.reset_technologies()
+
+	local tech = force.technologies
+	local rec = force.recipes
+
+	if settings.startup["dectorio-walls"].value then
+		if tech["dect-advanced-gates"].researched then
+			rec["dect-concrete-gate-from-stone-gate"].enabled = true
+		end
+	end
+end
diff --git a/prototypes/entity/lamp.lua b/prototypes/entity/lamp.lua
@@ -4,7 +4,7 @@
 local lamp = util.table.deepcopy(data.raw["lamp"]["small-lamp"])
 lamp.name = "dect-small-lamp-glow"
 lamp.icon = "__Dectorio__/graphics/icons/small-lamp-glow.png"
-lamp.icon_size = 32
+lamp.icon_size = 64
 lamp.icon_mipmaps = 1
 lamp.minable.result = "dect-small-lamp-glow"
 lamp.glow_size = 25

diff --git a/prototypes/entity/walls.lua b/prototypes/entity/walls.lua
@@ -10,8 +10,9 @@ if DECT.ENABLED["walls"] then
 			{
 				type = "wall",
 				name = "stone-wall",
-				icon = "__base__/graphics/icons/wall.png",
-				icon_size = 32,
+				icon = "__Dectorio__/graphics/icons/stone-brick-wall.png",
+				icon_size = 64,
+				icon_mipmaps = 1,
 				flags = {"placeable-neutral", "player-creation"},
 				collision_box = {{-0.29, -0.29}, {0.29, 0.29}},
 				selection_box = {{-0.5, -0.5}, {0.5, 0.5}},
@@ -500,8 +501,9 @@ if DECT.ENABLED["walls"] then
 			{
 				type = "wall",
 				name = "dect-concrete-wall",
-				icon = "__Dectorio__/graphics/icons/concrete-wall.png",
-				icon_size = 32,
+				icon = "__base__/graphics/icons/wall.png",
+				icon_size = 64,
+				icon_mipmaps = 4,
 				flags = {"placeable-neutral", "player-creation"},
 				collision_box = {{-0.29, -0.29}, {0.29, 0.29}},
 				selection_box = {{-0.5, -0.5}, {0.5, 0.5}},
@@ -565,6 +567,7 @@ if DECT.ENABLED["walls"] then
 				name = "dect-chain-wall",
 				icon = "__Dectorio__/graphics/icons/chain-wall.png",
 				icon_size = 32,
+				icon_mipmaps = 1,
 				flags = {"placeable-neutral", "player-creation"},
 				collision_box = {{-0.29, -0.29}, {0.29, 0.29}},
 				selection_box = {{-0.5, -0.5}, {0.5, 0.5}},
@@ -951,6 +954,7 @@ if DECT.ENABLED["walls"] then
 				name = "dect-wood-wall",
 				icon = "__Dectorio__/graphics/icons/wood-wall.png",
 				icon_size = 32,
+				icon_mipmaps = 1,
 				flags = {"placeable-neutral", "player-creation"},
 				collision_box = {{-0.29, -0.29}, {0.29, 0.29}},
 				selection_box = {{-0.5, -0.5}, {0.5, 0.5}},
@@ -1310,8 +1314,8 @@ if DECT.ENABLED["walls"] then
 						{
 							filename = "__Dectorio__/graphics/entity/stone-gate/gate-vertical.png",
 							line_length = 8,
-							width = 38,
-							height = 62,
+							width = 39,
+							height = 60,
 							frame_count = 16,
 							shift = util.by_pixel(0, -14),
 							hr_version = {
@@ -1350,8 +1354,8 @@ if DECT.ENABLED["walls"] then
 						{
 							filename = "__Dectorio__/graphics/entity/stone-gate/gate-horizontal.png",
 							line_length = 8,
-							width = 34,
-							height = 48,
+							width = 33,
+							height = 45,
 							frame_count = 16,
 							shift = util.by_pixel(0, -4),
 							hr_version = {
@@ -1390,8 +1394,8 @@ if DECT.ENABLED["walls"] then
 						{
 							filename = "__Dectorio__/graphics/entity/stone-gate/gate-rail-horizontal-left.png",
 							line_length = 8,
-							width = 34,
-							height = 40,
+							width = 33,
+							height = 37,
 							frame_count = 16,
 							shift = util.by_pixel(0, -8),
 							hr_version = {
@@ -1430,8 +1434,8 @@ if DECT.ENABLED["walls"] then
 						{
 							filename = "__Dectorio__/graphics/entity/stone-gate/gate-rail-horizontal-right.png",
 							line_length = 8,
-							width = 34,
-							height = 40,
+							width = 33,
+							height = 37,
 							frame_count = 16,
 							shift = util.by_pixel(0, -8),
 							hr_version = {
@@ -1470,8 +1474,8 @@ if DECT.ENABLED["walls"] then
 						{
 							filename = "__Dectorio__/graphics/entity/stone-gate/gate-rail-vertical-left.png",
 							line_length = 8,
-							width = 22,
-							height = 62,
+							width = 21,
+							height = 59,
 							frame_count = 16,
 							shift = util.by_pixel(0, -14),
 							hr_version = {
@@ -1510,8 +1514,8 @@ if DECT.ENABLED["walls"] then
 						{
 							filename = "__Dectorio__/graphics/entity/stone-gate/gate-rail-vertical-right.png",
 							line_length = 8,
-							width = 22,
-							height = 62,
+							width = 21,
+							height = 59,
 							frame_count = 16,
 							shift = util.by_pixel(0, -14),
 							hr_version = {
@@ -1584,8 +1588,8 @@ if DECT.ENABLED["walls"] then
 						{
 							filename = "__Dectorio__/graphics/entity/stone-gate/gate-wall-patch.png",
 							line_length = 8,
-							width = 34,
-							height = 48,
+							width = 35,
+							height = 47,
 							frame_count = 16,
 							shift = util.by_pixel(0, 12),
 							hr_version = {

diff --git a/prototypes/item/lamp.lua b/prototypes/item/lamp.lua
@@ -4,7 +4,7 @@
 local lamp = util.table.deepcopy(data.raw["item"]["small-lamp"])
 lamp.name = "dect-small-lamp-glow"
 lamp.icon = "__Dectorio__/graphics/icons/small-lamp-glow.png"
-lamp.icon_size = 32
+lamp.icon_size = 64
 lamp.icon_mipmaps = 1
 lamp.order = "a[light]-b[small-lamp-glow]"
 lamp.place_result = "dect-small-lamp-glow"

diff --git a/prototypes/item/walls.lua b/prototypes/item/walls.lua
@@ -6,8 +6,9 @@ if DECT.ENABLED["walls"] then
 			{
 				type = "item",
 				name = "dect-concrete-wall",
-				icon = "__Dectorio__/graphics/icons/concrete-wall.png",
-				icon_size = 32,
+				icon = "__base__/graphics/icons/wall.png",
+				icon_size = 64,
+				icon_mipmaps = 4,
 				subgroup = "defensive-structure",
 				order = "a[d-concrete-wall]",
 				stack_size = DECT.CONFIG.SETTINGS["walls_stack_size"],
@@ -18,6 +19,7 @@ if DECT.ENABLED["walls"] then
 				name = "dect-chain-wall",
 				icon = "__Dectorio__/graphics/icons/chain-wall.png",
 				icon_size = 32,
+				icon_mipmaps = 1,
 				subgroup = "defensive-structure",
 				order = "a[c-chain-wall]",
 				stack_size = DECT.CONFIG.SETTINGS["walls_stack_size"],
@@ -28,6 +30,7 @@ if DECT.ENABLED["walls"] then
 				name = "dect-wood-wall",
 				icon = "__Dectorio__/graphics/icons/wood-wall.png",
 				icon_size = 32,
+				icon_mipmaps = 1,
 				fuel_category = "chemical",
 				fuel_value = "12MJ",
 				subgroup = "defensive-structure",
@@ -52,7 +55,7 @@ if DECT.ENABLED["walls"] then
 	-- Change base stone wall
 	local base_stone_wall = data.raw["item"]["stone-wall"]
 	base_stone_wall.icon = "__Dectorio__/graphics/icons/stone-brick-wall.png"
-	base_stone_wall.icon_size = 32
+	base_stone_wall.icon_size = 64
 	base_stone_wall.icon_mipmaps = 1
 	base_stone_wall.stack_size = DECT.CONFIG.SETTINGS["walls_stack_size"]
 	base_stone_wall.order = "a[b-stone-wall]"

diff --git a/prototypes/recipe/walls.lua b/prototypes/recipe/walls.lua
@@ -19,7 +19,8 @@ if DECT.ENABLED["walls"] then
 				name = "dect-concrete-wall-from-stone-wall",
 				localised_name = {"recipe-name.dect-concrete-wall-from-stone-wall"},
 				icon = "__Dectorio__/graphics/icons/concrete-wall-from-stone-wall.png",
-				icon_size = 32,
+				icon_size = 64,
+				icon_mipmaps = 1,
 				energy_required = 1,
 				enabled = false,
 				ingredients = {
@@ -55,6 +56,22 @@ if DECT.ENABLED["walls"] then
 					{"electronic-circuit", 2}
 				},
 				result = "dect-concrete-gate"
+			},
+			{
+				type = "recipe",
+				name = "dect-concrete-gate-from-stone-gate",
+				localised_name = {"recipe-name.dect-concrete-gate-from-stone-gate"},
+				icon = "__Dectorio__/graphics/icons/concrete-gate-from-stone-gate.png",
+				icon_size = 64,
+				icon_mipmaps = 1,
+				energy_required = 1,
+				enabled = false,
+				ingredients = {
+					{"gate", 1},
+					{"concrete", 2},
+					{"electronic-circuit", 1}
+				},
+				result = "dect-concrete-gate"
 			}
 		}
 	)

diff --git a/prototypes/technology/walls.lua b/prototypes/technology/walls.lua
@@ -59,6 +59,10 @@ if DECT.ENABLED["walls"] then
 					{
 						type = "unlock-recipe",
 						recipe = "dect-concrete-gate"
+					},
+					{
+						type = "unlock-recipe",
+						recipe = "dect-concrete-gate-from-stone-gate"
 					}
 				},
 				order = "e-p-b-a"