-
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
495 additions
and
398 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,45 @@ | ||
| -- entity/decoratives | ||
|
|
||
| if DECT.ENABLED["decoratives"] then | ||
| -- Pull in the base entity sounds | ||
| local sounds = require("__base__.prototypes.entity.demo-sounds") | ||
|
|
||
| data:extend({ | ||
| data:extend( | ||
| { | ||
| type = "simple-entity-with-force", | ||
| name = "dect-traffic-bollard", | ||
| icon = "__Dectorio__/graphics/icons/traffic-bollard.png", | ||
| icon_size = 32, | ||
| flags = {"placeable-neutral", "placeable-player", "player-creation"}, | ||
| render_layer = "object", | ||
| minable = {hardness = 0.2, mining_time = 0.3, result = "dect-traffic-bollard", count = 1}, | ||
| max_health = 120, | ||
| corpse = "small-remnants", | ||
| collision_box = {{-0.15, -0.15}, {0.25, 0.15}}, | ||
| selection_box = {{-0.25, -1.4}, {0.25, 0.16}}, | ||
| 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}, | ||
| hr_version = { | ||
| filename = "__Dectorio__/graphics/decoratives/traffic-bollard/hr-traffic-bollard.png", | ||
| { | ||
| type = "simple-entity-with-force", | ||
| name = "dect-traffic-bollard", | ||
| icon = "__Dectorio__/graphics/icons/traffic-bollard.png", | ||
| icon_size = 64, | ||
| icon_mipmaps = 1, | ||
| flags = {"placeable-neutral", "placeable-player", "player-creation"}, | ||
| render_layer = "object", | ||
| minable = {hardness = 0.2, mining_time = 0.3, result = "dect-traffic-bollard", count = 1}, | ||
| max_health = 120, | ||
| corpse = "small-remnants", | ||
| collision_box = {{-0.15, -0.15}, {0.25, 0.15}}, | ||
| selection_box = {{-0.25, -1.4}, {0.25, 0.16}}, | ||
| repair_sound = {filename = "__base__/sound/manual-repair-simple.ogg"}, | ||
| mined_sound = {filename = "__core__/sound/deconstruct-small.ogg"}, | ||
| vehicle_impact_sound = sounds.generic_impact, | ||
| pictures = { | ||
| { | ||
| filename = "__Dectorio__/graphics/decoratives/traffic-bollard/traffic-bollard.png", | ||
| priority = "extra-high", | ||
| width = 70, | ||
| height = 84, | ||
| width = 35, | ||
| height = 42, | ||
| shift = {0.4, -0.6}, | ||
| scale = 0.5 | ||
| hr_version = { | ||
| filename = "__Dectorio__/graphics/decoratives/traffic-bollard/hr-traffic-bollard.png", | ||
| priority = "extra-high", | ||
| width = 70, | ||
| height = 84, | ||
| shift = {0.4, -0.6}, | ||
| scale = 0.5 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }) | ||
|
|
||
| ) | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,79 @@ | ||
| -- entity/signs | ||
|
|
||
| if DECT.ENABLED["signs"] then | ||
| -- Pull in the base entity sounds | ||
| local sounds = require("__base__.prototypes.entity.demo-sounds") | ||
|
|
||
| data:extend({ | ||
| data:extend( | ||
| { | ||
| type = "simple-entity", | ||
| name = "dect-sign-wood", | ||
| icon = "__Dectorio__/graphics/icons/sign-wood.png", | ||
| icon_size = 32, | ||
| flags = {"placeable-neutral"}, | ||
| render_layer = "object", | ||
| minable = {mining_time = 0.2, result = "dect-sign-wood", count = 1}, | ||
| max_health = 40, | ||
| collision_box = {{-0.15, -0.15}, {0.15, 0.15}}, | ||
| selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, | ||
| drawing_box = {{-0.5, -1.6}, {0.5, 0.5}}, | ||
| repair_sound = { filename = "__base__/sound/manual-repair-simple.ogg" }, | ||
| mined_sound = { filename = "__Dectorio__/sound/deconstruct-wood.ogg" }, | ||
| vehicle_impact_sound = {filename = "__base__/sound/car-wood-impact.ogg", volume = 1.0}, | ||
| pictures = { | ||
| { | ||
| filename = "__Dectorio__/graphics/entity/sign-wood/sign-wood.png", | ||
| priority = "extra-high", | ||
| width = 85, | ||
| height = 65, | ||
| shift = {0.8, -0.45}, | ||
| hr_version = { | ||
| filename = "__Dectorio__/graphics/entity/sign-wood/hr-sign-wood.png", | ||
| { | ||
| type = "simple-entity", | ||
| name = "dect-sign-wood", | ||
| icon = "__Dectorio__/graphics/icons/sign-wood.png", | ||
| icon_size = 64, | ||
| icon_mipmaps = 1, | ||
| flags = {"placeable-neutral"}, | ||
| render_layer = "object", | ||
| minable = {mining_time = 0.2, result = "dect-sign-wood", count = 1}, | ||
| max_health = 40, | ||
| collision_box = {{-0.15, -0.15}, {0.15, 0.15}}, | ||
| selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, | ||
| drawing_box = {{-0.5, -1.6}, {0.5, 0.5}}, | ||
| repair_sound = {filename = "__base__/sound/manual-repair-simple.ogg"}, | ||
| mined_sound = {filename = "__Dectorio__/sound/deconstruct-wood.ogg"}, | ||
| vehicle_impact_sound = {filename = "__base__/sound/car-wood-impact.ogg", volume = 1.0}, | ||
| pictures = { | ||
| { | ||
| filename = "__Dectorio__/graphics/entity/sign-wood/sign-wood.png", | ||
| priority = "extra-high", | ||
| width = 170, | ||
| height = 130, | ||
| width = 85, | ||
| height = 65, | ||
| shift = {0.8, -0.45}, | ||
| scale = 0.5 | ||
| hr_version = { | ||
| filename = "__Dectorio__/graphics/entity/sign-wood/hr-sign-wood.png", | ||
| priority = "extra-high", | ||
| width = 170, | ||
| height = 130, | ||
| shift = {0.8, -0.45}, | ||
| scale = 0.5 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| type = "simple-entity", | ||
| name = "dect-sign-steel", | ||
| icon = "__Dectorio__/graphics/icons/sign-steel.png", | ||
| icon_size = 32, | ||
| flags = {"placeable-neutral"}, | ||
| render_layer = "object", | ||
| minable = {mining_time = 0.2, result = "dect-sign-steel", count = 1}, | ||
| max_health = 65, | ||
| collision_box = {{-0.15, -0.15}, {0.15, 0.15}}, | ||
| selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, | ||
| drawing_box = {{-0.5, -1.6}, {0.5, 0.5}}, | ||
| repair_sound = { filename = "__base__/sound/manual-repair-simple.ogg" }, | ||
| mined_sound = { filename = "__base__/sound/deconstruct-bricks.ogg" }, | ||
| vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 1.0}, | ||
| pictures = { | ||
| { | ||
| filename = "__Dectorio__/graphics/entity/sign-steel/sign-steel.png", | ||
| priority = "extra-high", | ||
| width = 85, | ||
| height = 65, | ||
| shift = {0.77, -0.45}, | ||
| hr_version = { | ||
| filename = "__Dectorio__/graphics/entity/sign-steel/hr-sign-steel.png", | ||
| }, | ||
| { | ||
| type = "simple-entity", | ||
| name = "dect-sign-steel", | ||
| icon = "__Dectorio__/graphics/icons/sign-steel.png", | ||
| icon_size = 64, | ||
| icon_mipmaps = 1, | ||
| flags = {"placeable-neutral"}, | ||
| render_layer = "object", | ||
| minable = {mining_time = 0.2, result = "dect-sign-steel", count = 1}, | ||
| max_health = 65, | ||
| collision_box = {{-0.15, -0.15}, {0.15, 0.15}}, | ||
| selection_box = {{-0.5, -0.5}, {0.5, 0.5}}, | ||
| drawing_box = {{-0.5, -1.6}, {0.5, 0.5}}, | ||
| repair_sound = {filename = "__base__/sound/manual-repair-simple.ogg"}, | ||
| mined_sound = {filename = "__base__/sound/deconstruct-bricks.ogg"}, | ||
| vehicle_impact_sound = sounds.generic_impact, | ||
| pictures = { | ||
| { | ||
| filename = "__Dectorio__/graphics/entity/sign-steel/sign-steel.png", | ||
| priority = "extra-high", | ||
| width = 170, | ||
| height = 130, | ||
| shift = {0.77, -0.43}, | ||
| scale = 0.5 | ||
| width = 85, | ||
| height = 65, | ||
| shift = {0.77, -0.45}, | ||
| hr_version = { | ||
| filename = "__Dectorio__/graphics/entity/sign-steel/hr-sign-steel.png", | ||
| priority = "extra-high", | ||
| width = 170, | ||
| height = 130, | ||
| shift = {0.77, -0.43}, | ||
| scale = 0.5 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }) | ||
|
|
||
| ) | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.