Merge pull request #36 from jpanther/terrain

New traffic bollard, gravel and landscaping items

CHANGELOG.md

@@ -2,10 +2,21 @@
 
 The latest stable release is available at <https://github.com/jpanther/Dectorio/releases/latest>
 
+## v0.7.2 - Unreleased (coming soon)
+
+### Added
+* New gravel styles - Iron, Copper and Coal Gravel (placed using raw iron, copper and coal ores)
+* New _Traffic bollard_ decorative item (unlocked via _Plastics_ technology)
+* Landscaping technology now allows placement of decorative rock entities
+* Better handling for when third party mods that affect Dectorio are added or removed
+
+### Bugfixes
+* Added some additional locale strings to fix issues with Creative Mode mod
+
 ## v0.7.1 - 2017-10-21
 
 ### Bugfixes
-* Fixed migration error for existing saves without Alien Biomes
+* Fixed migration error for existing saves without Alien Biomes mod
 
 ## v0.7.0 - 2017-10-20
 

config.lua

@@ -92,6 +92,7 @@ DECT.ENABLED = {
 	["gravel"] = settings.startup["dectorio-flooring"].value,
 	["painted-concrete"] = settings.startup["dectorio-painted-concrete"].value,
 	["signs"] = settings.startup["dectorio-signs"].value,
+	["decoratives"] = settings.startup["dectorio-decoratives"].value,
 }
 
 DECT.CONFIG.SETTINGS = {

control.lua

@@ -163,6 +163,44 @@ local function on_configuration_changed(data)
 			incompability_detected()
 		end
 	end
+
+	-- Check if Alien Biomes was added
+   if data.mod_changes ~= nil and data.mod_changes["alien-biomes"] ~= nil and data.mod_changes["alien-biomes"].old_version == nil then
+		if DECT.ENABLED["landscaping"] then
+			for _,force in pairs(game.forces) do
+				local tech = force.technologies
+				local rec = force.recipes
+				if tech["dect-landscaping"].researched and rec["dect-alien-biomes-grass-red"] then
+					local alien_biomes = {
+						"grass-red","grass-orange","grass-yellow","grass-yellow-fade","grass-dry","grass-medium","grass","grass-blue-fade","grass-blue","grass-purple-fade","grass-purple",
+						"dirt-red","dirt-brown","dirt-tan","dirt","dirt-dull","dirt-grey","dirt-red-dark","dirt-brown-dark","dirt-tan-dark","dirt-dark","dirt-dull-dark","dirt-grey-dark",
+						"sand-red","sand-orange","sand-gold","sand","sand-dull","sand-grey","sand-red-dark","sand-orange-dark","sand-gold-dark","sand-dark","sand-dull-dark","sand-grey-dark",
+						"snow","volcanic-cool","volcanic-medium","volcanic-hot"
+					}
+					for _, tile in pairs(alien_biomes) do
+						rec["dect-alien-biomes-"..tile].enabled = true
+					end
+					notification({"dect-notify-supportedmod-added", {"dect-notify-dectorio"}, "Alien Biomes"})
+				end
+			end
+		end
+	end
+
+	-- Check if Alien Biomes was removed
+   if data.mod_changes ~= nil and data.mod_changes["alien-biomes"] ~= nil and data.mod_changes["alien-biomes"].new_version == nil then
+		if DECT.ENABLED["landscaping"] then
+			for _,force in pairs(game.forces) do
+				local tech = force.technologies
+				local rec = force.recipes
+				if tech["dect-landscaping"].researched then
+					for _, tile in pairs(DECT.CONFIG.BASE_TILES) do
+						rec["dect-base-"..tile].enabled = true
+					end
+					notification({"dect-notify-supportedmod-removed", {"dect-notify-dectorio"}, "Alien Biomes"})
+				end
+			end
+		end
+	end
 end
 
 local function on_built_entity(event)

data.lua

@@ -27,18 +27,21 @@ DECT = require("config")
 require("prototypes.entity.lamp")
 require("prototypes.entity.signs")
 require("prototypes.entity.walls")
+require("prototypes.entity.decoratives")
 
 require("prototypes.item.flooring")
 require("prototypes.item.lamp")
 require("prototypes.item.landscaping")
 require("prototypes.item.signs")
 require("prototypes.item.walls")
+require("prototypes.item.decoratives")
 
 require("prototypes.recipe.flooring")
 require("prototypes.recipe.lamp")
 require("prototypes.recipe.landscaping")
 require("prototypes.recipe.signs")
 require("prototypes.recipe.walls")
+require("prototypes.recipe.decoratives")
 
 require("prototypes.tile.tiles")
 
@@ -47,5 +50,6 @@ require("prototypes.technology.lamp")
 require("prototypes.technology.landscaping")
 require("prototypes.technology.signs")
 require("prototypes.technology.walls")
+require("prototypes.technology.decoratives")
 
 require("prototypes.signal.signals")

info.json

@@ -1,6 +1,6 @@
 {
     "name": "Dectorio",
-    "version": "0.7.1",
+    "version": "0.7.2",
     "title": "Dectorio",
     "author": "PantherX",
     "contact": "",

locale/de/de.cfg

@@ -46,13 +46,21 @@ dect-small-lamp-glow=Glühende Lampe
 
 [tile-name]
 hazard-concrete-left=Beton mit Gefahrenmarkierung
+hazard-concrete-right=Beton mit Gefahrenmarkierung
 dect-paint-emergency-left=Beton mit Notfallmarkierung
+dect-paint-emergency-right=Beton mit Notfallmarkierung
 dect-paint-radiation-left=Beton mit Strahlungswarnung
+dect-paint-radiation-right=Beton mit Strahlungswarnung
 dect-paint-safety-left=Beton mit Sicherheitsmarkierung
+dect-paint-safety-right=Beton mit Sicherheitsmarkierung
 dect-paint-caution-left=Beton mit Warnungsmarkierung
+dect-paint-caution-right=Beton mit Warnungsmarkierung
 dect-paint-danger-left=Beton mit Gefahrenmarkierung
+dect-paint-danger-right=Beton mit Gefahrenmarkierung
 dect-paint-defect-left=Beton mit Beschädigung
+dect-paint-defect-right=Beton mit Beschädigung
 dect-paint-operations-left=Beton mit Betriebsmarkierung
+dect-paint-operations-right=Beton mit Betriebsmarkierung
 dect-wood-floor=Holzboden
 dect-gravel=Kies
 

locale/en/en.cfg

@@ -43,18 +43,30 @@ dect-hazard-gate=Hazard gate
 dect-sign-wood=Wooden sign
 dect-sign-steel=Steel sign
 dect-small-lamp-glow=Glowing lamp
+dect-traffic-bollard=Traffic bollard
 
 [tile-name]
 hazard-concrete-left=Hazard concrete
+hazard-concrete-right=Hazard concrete
 dect-paint-emergency-left=Emergency concrete
+dect-paint-emergency-right=Emergency concrete
 dect-paint-radiation-left=Radiation hazard concrete
+dect-paint-radiation-right=Radiation hazard concrete
 dect-paint-safety-left=Safety concrete
+dect-paint-safety-right=Safety concrete
 dect-paint-caution-left=Caution concrete
+dect-paint-caution-right=Caution concrete
 dect-paint-danger-left=Danger concrete
+dect-paint-danger-right=Danger concrete
 dect-paint-defect-left=Defect concrete
+dect-paint-defect-right=Defect concrete
 dect-paint-operations-left=Operations concrete
+dect-paint-operations-right=Operations concrete
 dect-wood-floor=Wooden floorboards
 dect-gravel=Gravel
+dect-iron-gravel=Iron Gravel
+dect-copper-gravel=Copper Gravel
+dect-coal-gravel=Coal Gravel
 
 [technology-name]
 dect-landscaping=Landscaping

locale/en/notifications.cfg

@@ -5,4 +5,6 @@ dect-notify-incompatible=[__1__] Warning: An incompatible mod has been detected!
 dect-notify-reason-signals=[__1__] Reason: '__2__' overwrites signal data. It is recommended to disable '__2__'.
 dect-notify-reason-tech=[__1__] Reason: '__2__' duplicates technology that is already in Dectorio. It is recommended to disable '__2__'.
 dect-notify-reason-disable=[__1__] Reason: '__2__' disables functionality that is added by Dectorio. It is recommended to disable '__2__'.
-dect-notify-modportal=[__1__] Refer to the mod portal for further details.
+dect-notify-modportal=[__1__] Refer to the mod portal for further details.
+dect-notify-supportedmod-added=[__1__] Added support for __2__ mod.
+dect-notify-supportedmod-removed=[__1__] Removed support for __2__ mod.

locale/en/settings.cfg

@@ -5,6 +5,7 @@ dectorio-landscaping=Enable Landscaping
 dectorio-flooring=Enable Floorings
 dectorio-painted-concrete=Enable Painted Concrete
 dectorio-signs=Enable Signs
+dectorio-decoratives=Enable Decoratives
 dectorio-vanilla-hazard-concrete-style=Use default Factorio Hazard concrete style
 dectorio-landscaping-blueprintable=Landscaping items are blueprintable
 dectorio-decorative-removal-probability=Decoration removal probability
@@ -19,6 +20,7 @@ dectorio-landscaping=Enables the ability to craft sand, dirt, grass, red desert
 dectorio-flooring=Enables the ability to craft flooring types including wooden floorboards and gravel
 dectorio-painted-concrete=Enables painted concrete styles that replace the base Hazard concrete
 dectorio-signs=Enables the ability to place signs
+dectorio-decoratives=Enables the ability to craft decorative items for your factory
 dectorio-vanilla-hazard-concrete-style=When enabled, Painted Hazard concrete will look like the default Factorio Hazard concrete when placed (requires Painted Concrete to be enabled)
 dectorio-landscaping-blueprintable=When enabled, blueprints will include landscaping features as tiles
 dectorio-decorative-removal-probability=The probability that decorations, such as bushes and grasses, are removed when flooring tiles are placed (1 = 100% are removed (default), 0.5 = 50%, 0 = none are removed)

locale/pl/pl.cfg

@@ -46,13 +46,21 @@ dect-small-lamp-glow=Świecąca lampa
 
 [tile-name]
 hazard-concrete-left=Beton z pasami ostrzegawczymi
+hazard-concrete-right=Beton z pasami ostrzegawczymi
 dect-paint-emergency-left=Beton z przekazem awaryjnym
+dect-paint-emergency-right=Beton z przekazem awaryjnym
 dect-paint-radiation-left=Beton z przekazem o promieniowaniu
+dect-paint-radiation-right=Beton z przekazem o promieniowaniu
 dect-paint-safety-left=Beton z zabezpieczeniem
+dect-paint-safety-right=Beton z zabezpieczeniem
 dect-paint-caution-left=Betn z przekazem ostrzegawczym
+dect-paint-caution-right=Betn z przekazem ostrzegawczym
 dect-paint-danger-left=Beton z przekazem o niebezpieczeństwie
+dect-paint-danger-right=Beton z przekazem o niebezpieczeństwie
 dect-paint-defect-left=Uszkodzony beton
+dect-paint-defect-right=Uszkodzony beton
 dect-paint-operations-left=Beton operacyjny
+dect-paint-operations-right=Beton operacyjny
 dect-wood-floor=Drewniane podłoże
 dect-gravel=Żwir
 

migrations/0.7.2.lua

@@ -0,0 +1,22 @@
+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-decoratives"].value then
+		if tech["plastics"].researched then
+			rec["dect-traffic-bollard"].enabled = true
+		end
+	end
+	if settings.startup["dectorio-landscaping"].value then
+		if tech["dect-landscaping"].researched then
+			rec["dect-base-stone-rock"].enabled = true
+			rec["dect-base-red-desert-rock-big-01"].enabled = true
+			rec["dect-base-red-desert-rock-huge-01"].enabled = true
+			rec["dect-base-red-desert-rock-huge-02"].enabled = true
+		end
+	end
+end

prototypes/entity/decoratives.lua

@@ -0,0 +1,32 @@
+-- entity/decoratives
+
+if DECT.ENABLED["decoratives"] then
+
+	data:extend({
+		{
+			type = "simple-entity",
+			name = "dect-traffic-bollard",
+			icon = "__Dectorio__/graphics/icons/traffic-bollard.png",
+			flags = {"placeable-neutral"},
+			render_layer = "object",
+			minable = {mining_time = 1, result = "dect-traffic-bollard", count = 1},
+			max_health = 120,
+			collision_box = {{-0.15, -0.15}, {0.25, 0.15}},
+			selection_box = {{-0.25, -1.4}, {0.25, 0.16}},
+			drawing_box = {{-0.2, -1}, {0.2, 0.1}},
+			repair_sound = { filename = "__base__/sound/manual-repair-simple.ogg" },
+			mined_sound = { filename = "__core__/sound/deconstruct-small.ogg" },
+			vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.7},
+			pictures = {
+				{
+					filename = "__Dectorio__/graphics/decoratives/traffic-bollard/traffic-bollard.png",
+					priority = "extra-high",
+					width = 35,
+					height = 42,
+					shift = {0.4, -0.6}
+				}
+			}
+		}
+	})
+
+end

prototypes/item/decoratives.lua

@@ -0,0 +1,30 @@
+-- item/decoratives
+
+if DECT.ENABLED["decoratives"] then
+
+	-- -- Add subgroup for decoratives
+	-- data:extend({
+	-- 	{
+	-- 		type = "item-subgroup",
+	-- 		name = "decoratives",
+	-- 		group = "logistics",
+	-- 		order = "g-b"
+	-- 	}
+	-- })
+
+	data:extend({
+		{
+			type = "item",
+			name = "dect-traffic-bollard",
+			icon = "__Dectorio__/graphics/icons/traffic-bollard.png",
+			flags = {"goes-to-quickbar"},
+			-- subgroup = "decoratives",
+			-- order = "a[traffic-bollard]",
+			subgroup = "terrain",
+			order = "w[traffic-bollard]",
+			place_result = "dect-traffic-bollard",
+			stack_size = 50
+		}
+	})
+
+end

prototypes/item/flooring.lua

@@ -75,12 +75,33 @@ end
 
 if DECT.ENABLED["gravel"] then
 
-	-- Allow stone to be placed as gravel
+	-- Allow ores to be placed as gravel
 	local base_stone = data.raw["item"]["stone"]
 	base_stone.place_as_tile = {
 		result = "dect-gravel",
 		condition_size = 4,
 		condition = { "water-tile" }
 	}
 
+	local base_iron = data.raw["item"]["iron-ore"]
+	base_iron.place_as_tile = {
+		result = "dect-iron-gravel",
+		condition_size = 4,
+		condition = { "water-tile" }
+	}
+
+	local base_copper = data.raw["item"]["copper-ore"]
+	base_copper.place_as_tile = {
+		result = "dect-copper-gravel",
+		condition_size = 4,
+		condition = { "water-tile" }
+	}
+
+	local base_coal = data.raw["item"]["coal"]
+	base_coal.place_as_tile = {
+		result = "dect-coal-gravel",
+		condition_size = 4,
+		condition = { "water-tile" }
+	}
+
 end