diff --git a/CHANGELOG.md b/CHANGELOG.md index e35c640..5acf5a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,11 @@ The latest stable release is available at -## v0.5.3 - Unreleased +## v0.5.3 - 2017-05-14 ### Added -* New config.lua file that allows more customisation over how the mod behaves +* Landscaping now allows placement of dark sand, dry grass, red desert and dark red desert tiles +* New config.lua file that allows even more customisation over how the mod behaves * Item descriptions for painted concrete ### Changed diff --git a/README.md b/README.md index a46b76d..de7dff9 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,6 @@ When you launch the game, the new mod will be enabled by default. ![Wooden floorboards](https://cl.ly/1C3v32423043/woodenfloorboards.png) -* Adds items for placing dirt, sand and grass tiles * Adds painted concrete tiles - Hazard (black/yellow), Emergency (white/red), Radiation hazard (yellow/pink) and Safety (white/green) ![Painted concrete](https://cl.ly/322O0k052k1M/paintedconcrete.png) @@ -32,6 +31,10 @@ When you launch the game, the new mod will be enabled by default. * Painted Hazard concrete replaces default Hazard concrete * Default concrete recipe no longer uses iron ore and instead requires iron sticks +### Landscaping + +* Adds items for placing dirt, sand, dark sand, grass, dry grass, red desert and dark red desert tiles + ### Walls * Adds items for stone and concrete walls @@ -55,14 +58,22 @@ When you launch the game, the new mod will be enabled by default. ![Mod options](https://cl.ly/363i1h1A4110/settings.png) -## Bugs & Suggestions +* Config.lua file that allows additional customisation + +## Development + +### Bugs & Suggestions Feel free to get in touch with any issues or suggestions for new features you'd like to see. You can get in contact via the 'Discussion' tab on the [Factorio mod portal](https://mods.factorio.com/mods/PantherX/Dectorio/discussion), the [Factorio Forums](https://forums.factorio.com/memberlist.php?mode=viewprofile&u=28042) or you can also view and log issues directly to the GitHub repo. -## Mod Compatibility +### Language Support + +Currently the mod is only available in English. If you are able to translate the mod into an additional language, please let me know and I'll package it into the bundle for distribution (with credit to you). + +### Mod Compatibility Limited testing has been completed with other mods. If you come across a specific compatibility issue, please let me know and I'll see what I can do to fix it. -## Changelog +### Changelog Refer to the [CHANGELOG](CHANGELOG.md) for a detailed list of changes in each version. \ No newline at end of file diff --git a/graphics/icons/base-grass-dry.png b/graphics/icons/base-grass-dry.png new file mode 100644 index 0000000..7a0a049 Binary files /dev/null and b/graphics/icons/base-grass-dry.png differ diff --git a/graphics/icons/base-red-desert-dark.png b/graphics/icons/base-red-desert-dark.png new file mode 100644 index 0000000..cc11062 Binary files /dev/null and b/graphics/icons/base-red-desert-dark.png differ diff --git a/graphics/icons/base-red-desert.png b/graphics/icons/base-red-desert.png new file mode 100644 index 0000000..a2c418a Binary files /dev/null and b/graphics/icons/base-red-desert.png differ diff --git a/graphics/icons/base-sand-dark.png b/graphics/icons/base-sand-dark.png new file mode 100644 index 0000000..dbfe134 Binary files /dev/null and b/graphics/icons/base-sand-dark.png differ diff --git a/locale/en/en.cfg b/locale/en/en.cfg index c6eaca1..e741bde 100644 --- a/locale/en/en.cfg +++ b/locale/en/en.cfg @@ -1,7 +1,11 @@ [item-name] dect-base-dirt=Dirt dect-base-sand=Sand +dect-base-sand-dark=Dark sand dect-base-grass=Grass +dect-base-grass-dry=Dry grass +dect-base-red-desert=Red desert +dect-base-red-desert-dark=Dark red desert dect-paint-hazard=Hazard concrete dect-paint-emergency=Emergency concrete dect-paint-radiation=Radiation hazard concrete diff --git a/migrations/0.5.3.lua b/migrations/0.5.3.lua index 614ea1d..fed3d94 100644 --- a/migrations/0.5.3.lua +++ b/migrations/0.5.3.lua @@ -22,7 +22,11 @@ for index, force in pairs(game.forces) do if tech["dect-landscaping"].researched then rec["dect-base-dirt"].enabled = true rec["dect-base-sand"].enabled = true + rec["dect-base-sand-dark"].enabled = true rec["dect-base-grass"].enabled = true + rec["dect-base-grass-dry"].enabled = true + rec["dect-base-red-desert"].enabled = true + rec["dect-base-red-desert-dark"].enabled = true end if tech["dect-wood-floor"].researched then rec["dect-wood-floor"].enabled = true diff --git a/prototypes/item/items.lua b/prototypes/item/items.lua index ee3d23e..d45255b 100644 --- a/prototypes/item/items.lua +++ b/prototypes/item/items.lua @@ -38,19 +38,75 @@ if DECT.ENABLED["landscaping"] then condition = { "water-tile" } } }, + { + type = "item", + name = "dect-base-sand-dark", + icon = "__Dectorio__/graphics/icons/base-sand-dark.png", + flags = {"goes-to-main-inventory"}, + subgroup = "landscaping", + order = "a[base-dirt]-b[base-sand]-c[base-sand-dark]", + stack_size = 100, + place_as_tile = { + result = "sand-dark", + condition_size = 4, + condition = { "water-tile" } + } + }, { type = "item", name = "dect-base-grass", icon = "__Dectorio__/graphics/icons/base-grass.png", flags = {"goes-to-main-inventory"}, subgroup = "landscaping", - order = "a[base-dirt]-b[base-sand]-c[base-grass]", + order = "a[base-dirt]-b[base-sand]-c[base-sand-dark]-d[base-grass]", stack_size = 100, place_as_tile = { result = "grass", condition_size = 4, condition = { "water-tile" } } + }, + { + type = "item", + name = "dect-base-grass-dry", + icon = "__Dectorio__/graphics/icons/base-grass-dry.png", + flags = {"goes-to-main-inventory"}, + subgroup = "landscaping", + order = "a[base-dirt]-b[base-sand]-c[base-sand-dark]-d[base-grass]-e[base-grass-dry]", + stack_size = 100, + place_as_tile = { + result = "grass-dry", + condition_size = 4, + condition = { "water-tile" } + } + }, + { + type = "item", + name = "dect-base-red-desert", + icon = "__Dectorio__/graphics/icons/base-red-desert.png", + flags = {"goes-to-main-inventory"}, + subgroup = "landscaping", + order = "a[base-dirt]-b[base-sand]-c[base-sand-dark]-d[base-grass]-e[base-grass-dry]-f[red-desert]", + stack_size = 100, + place_as_tile = { + result = "red-desert", + condition_size = 4, + condition = { "water-tile" } + } + }, + { + type = "item", + name = "dect-base-red-desert-dark", + icon = "__Dectorio__/graphics/icons/base-red-desert-dark.png", + flags = {"goes-to-main-inventory"}, + subgroup = "landscaping", + order = "a[base-dirt]-b[base-sand]-c[base-sand-dark]-d[base-grass]-e[base-grass-dry]-f[red-desert]-g[red-desert-dark]", + stack_size = 100, + place_as_tile = { + result = "red-desert-dark", + condition_size = 4, + condition = { "water-tile" } + } } }) diff --git a/prototypes/recipe/recipes.lua b/prototypes/recipe/recipes.lua index 97b346e..b09d173 100644 --- a/prototypes/recipe/recipes.lua +++ b/prototypes/recipe/recipes.lua @@ -39,6 +39,18 @@ if DECT.ENABLED["landscaping"] then result = "dect-base-sand", result_count = 10 }, + { + type = "recipe", + name = "dect-base-sand-dark", + energy_required = 5, + enabled = false, + category = "crafting", + ingredients = { + {"stone", 2} + }, + result = "dect-base-sand-dark", + result_count = 10 + }, { type = "recipe", name = "dect-base-grass", @@ -50,6 +62,42 @@ if DECT.ENABLED["landscaping"] then }, result = "dect-base-grass", result_count = 10 + }, + { + type = "recipe", + name = "dect-base-grass-dry", + energy_required = 5, + enabled = false, + category = "crafting", + ingredients = { + {"raw-wood", 2} + }, + result = "dect-base-grass-dry", + result_count = 10 + }, + { + type = "recipe", + name = "dect-base-red-desert", + energy_required = 5, + enabled = false, + category = "crafting", + ingredients = { + {"stone", 2} + }, + result = "dect-base-red-desert", + result_count = 10 + }, + { + type = "recipe", + name = "dect-base-red-desert-dark", + energy_required = 5, + enabled = false, + category = "crafting", + ingredients = { + {"stone", 2} + }, + result = "dect-base-red-desert-dark", + result_count = 10 } }) diff --git a/prototypes/technology/technology.lua b/prototypes/technology/technology.lua index 48e74bb..e9c9ad4 100644 --- a/prototypes/technology/technology.lua +++ b/prototypes/technology/technology.lua @@ -24,9 +24,25 @@ if DECT.ENABLED["landscaping"] then type = "unlock-recipe", recipe = "dect-base-sand" }, + { + type = "unlock-recipe", + recipe = "dect-base-sand-dark" + }, { type = "unlock-recipe", recipe = "dect-base-grass" + }, + { + type = "unlock-recipe", + recipe = "dect-base-grass-dry" + }, + { + type = "unlock-recipe", + recipe = "dect-base-red-desert" + }, + { + type = "unlock-recipe", + recipe = "dect-base-red-desert-dark" } }, order = "a"