Add color customization options #5
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,5 +1,11 @@ | ||
| local battery = {} | ||
|
|
||
| local COLOR_CYAN = "00ffff" | ||
| local COLOR_FOREST_GREEN = "228b22" | ||
| local COLOR_LIGHT_GOLDENROD_YELLOW = "fafad2" | ||
| local COLOR_LIME = "00ff00" | ||
| local COLOR_ORANGE_RED = "ff4500" | ||
|
Comment on lines
+3
to
+7
Member
There was a problem hiding this comment. you don't need to redefine these XNA colors, they are available in you may import the constants and use them as follows local xna_colors = require "consts.xna_colors"
xna_colors.Cyan
xna_colors.ForestGreen
-- etc.. |
||
|
|
||
| battery.name = "batteries/battery" | ||
| battery.depth = 100 | ||
|
|
||
|
|
@@ -12,7 +18,12 @@ battery.placements = { | |
| dischargeRate = 80, | ||
| oneUse = false, | ||
| onlyFits = -1, | ||
| ignoreBarriers = false, | ||
| particleColorInfinite = COLOR_CYAN, | ||
| particleColorFull = COLOR_LIME, | ||
| particleColorHalf = COLOR_LIGHT_GOLDENROD_YELLOW, | ||
| particleColorLow = COLOR_ORANGE_RED, | ||
| deathEffectColor = COLOR_FOREST_GREEN | ||
| } | ||
| }, | ||
| { | ||
|
|
@@ -23,17 +34,39 @@ battery.placements = { | |
| dischargeRate = 0, | ||
| oneUse = false, | ||
| onlyFits = -1, | ||
| ignoreBarriers = false, | ||
| particleColorInfinite = COLOR_CYAN, | ||
| particleColorFull = COLOR_LIME, | ||
| particleColorHalf = COLOR_LIGHT_GOLDENROD_YELLOW, | ||
| particleColorLow = COLOR_ORANGE_RED, | ||
| deathEffectColor = COLOR_FOREST_GREEN | ||
| } | ||
| } | ||
| } | ||
|
|
||
| battery.fieldInformation = { | ||
| onlyFits = { | ||
| fieldType = "integer" | ||
| }, | ||
| particleColorInfinite = { | ||
| fieldType = "color" | ||
| }, | ||
| particleColorFull = { | ||
| fieldType = "color" | ||
| }, | ||
| particleColorHalf = { | ||
| fieldType = "color" | ||
| }, | ||
| particleColorLow = { | ||
| fieldType = "color" | ||
| }, | ||
| deathEffectColor = { | ||
| fieldType = "color" | ||
| } | ||
| } | ||
|
|
||
| battery.fieldOrder = {"x", "y", "maxCharge", "initalCharge", "dischargeRate", "onlyFits", "particleColorInfinite", "particleColorFull", "particleColorHalf", "particleColorLow", "deathEffectColor", "ignoreBarriers", "oneUse"} | ||
|
|
||
| battery.texture = "batteries/battery/full0" | ||
| battery.justification = {0.5, 1} | ||
|
|
||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -3,6 +3,10 @@ local utils = require("utils") | |
|
|
||
| local battery_switch = {} | ||
|
|
||
| local COLOR_AQUA = "00ffff" | ||
| local COLOR_LIME = "00ff00" | ||
| local COLOR_WHITE = "ffffff" | ||
|
Comment on lines
+6
to
+8
Member
There was a problem hiding this comment. same comment about XNA colors here. |
||
|
|
||
| battery_switch.name = "batteries/battery_switch" | ||
|
|
||
| battery_switch.placements = { | ||
|
|
@@ -14,6 +18,9 @@ battery_switch.placements = { | |
| ceiling = false, | ||
| rightSide = false, | ||
| horizontal = false, | ||
| particleColorA = COLOR_AQUA, | ||
| particleColorB = COLOR_WHITE, | ||
| glowColor = COLOR_LIME | ||
| } | ||
| }, | ||
| { | ||
|
|
@@ -24,6 +31,9 @@ battery_switch.placements = { | |
| ceiling = true, | ||
| rightSide = false, | ||
| horizontal = false, | ||
| particleColorA = COLOR_AQUA, | ||
| particleColorB = COLOR_WHITE, | ||
| glowColor = COLOR_LIME | ||
| } | ||
| }, | ||
| { | ||
|
|
@@ -34,6 +44,9 @@ battery_switch.placements = { | |
| ceiling = false, | ||
| rightSide = false, | ||
| horizontal = true, | ||
| particleColorA = COLOR_LIME, | ||
| particleColorB = COLOR_WHITE, | ||
| glowColor = COLOR_AQUA | ||
| } | ||
| }, | ||
| { | ||
|
|
@@ -44,11 +57,26 @@ battery_switch.placements = { | |
| ceiling = false, | ||
| rightSide = true, | ||
| horizontal = true, | ||
| particleColorA = COLOR_LIME, | ||
| particleColorB = COLOR_WHITE, | ||
| glowColor = COLOR_AQUA | ||
| } | ||
| }, | ||
| } | ||
|
|
||
| battery_switch.fieldOrder = {"x", "y", "particleColorA", "particleColorB", "glowColor", "horizontal", "rightSide", "ceiling", "persistent", "alwaysFlag"} | ||
|
|
||
| battery_switch.fieldInformation = { | ||
| particleColorA = { | ||
| fieldType = "color" | ||
| }, | ||
| particleColorB = { | ||
| fieldType = "color" | ||
| }, | ||
| glowColor = { | ||
| fieldType = "color" | ||
| } | ||
| } | ||
|
|
||
| function battery_switch.sprite(room, entity) | ||
| local texture = "batteries/battery_switch/insert8" | ||
|
|
||
This file contains hidden or 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,29 +1,38 @@ | ||
| mods.batteries.name=Batteries | ||
|
|
||
| # Battery Switch | ||
| entities.batteries/battery_switch.placements.name.up=Battery Switch (Up) | ||
| entities.batteries/battery_switch.placements.name.down=Battery Switch (Down) | ||
| entities.batteries/battery_switch.placements.name.left=Battery Switch (Left) | ||
| entities.batteries/battery_switch.placements.name.right=Battery Switch (Right) | ||
| entities.batteries/battery_switch.attributes.name.particleColorA=Particle Color 1 | ||
| entities.batteries/battery_switch.attributes.name.particleColorB=Particle Color 2 | ||
|
Member
There was a problem hiding this comment. (nit.) more precise description would be appreciated. |
||
| entities.batteries/battery_switch.attributes.description.horizontal=Whether the switch is horizontally aligned. Vertical if not ticked. | ||
| entities.batteries/battery_switch.attributes.description.alwaysFlag=If this is enabled, the switch will always set the flag "batterySwitch_(room name):(id)" when activated. Otherwise, it will only set the flag if persistent. | ||
| entities.batteries/battery_switch.attributes.description.rightSide=Whether the switch should be attached to the right side of the block as opposed to the left. Has no effect on vertical switches. | ||
| entities.batteries/battery_switch.attributes.description.persistent=If this is enabled, the switch will stay activated when the room is reset. | ||
| entities.batteries/battery_switch.attributes.description.ceiling=Whether the switch should be attached to the bottom side of the block as opposed to the top. Has no effect on horizontal switches. | ||
|
|
||
| # Battery | ||
| entities.batteries/battery.placements.name.default=Battery | ||
| entities.batteries/battery.placements.name.permanent=Battery (Permanent) | ||
| entities.batteries/battery.attributes.name.initalCharge=Initial Charge | ||
| entities.batteries/battery.attributes.name.particleColorInfinite=Particle Color (Infinite Charge) | ||
| entities.batteries/battery.attributes.name.particleColorFull=Particle Color (Full Charge) | ||
| entities.batteries/battery.attributes.name.particleColorHalf=Particle Color (Half Charge) | ||
| entities.batteries/battery.attributes.name.particleColorLow=Particle Color (Low Charge) | ||
| entities.batteries/battery.attributes.description.oneUse=If this is enabled, the battery will not respawn after it is used to activate a switch. | ||
| entities.batteries/battery.attributes.description.onlyFits=The entity id of the switch that this battery fits into. If unset or below 0, this battery will be able to fit into any switch. | ||
| entities.batteries/battery.attributes.description.ignoreBarriers=If this is enabled, this battery will be able to pass through seeker barriers without being destroyed. | ||
| entities.batteries/battery.attributes.description.maxCharge=The maximum charge that the battery can hold. | ||
| entities.batteries/battery.attributes.description.initalCharge=The charge that the battery starts with. | ||
| entities.batteries/battery.attributes.description.dischargeRate=The rate at which the battery loses charge (in units/second). | ||
| entities.batteries/battery.attributes.description.particleColorInfinite=The particle color of the battery when it has infinite charge. | ||
| entities.batteries/battery.attributes.description.particleColorFull=The particle color of the battery when it is at full charge. | ||
| entities.batteries/battery.attributes.description.particleColorHalf=The particle color of the battery when it has half charge. | ||
| entities.batteries/battery.attributes.description.particleColorLow=The particle color of the battery when it has low charge. | ||
|
|
||
| # Battery Power Refill | ||
| entities.batteries/power_refill.placements.name.default=Power Refill | ||
| entities.batteries/power_refill.attributes.description.oneUse=If this is enabled, the refill will not respawn after being used. | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
since particles are now customizable for each BatterySwitch entity, these fields should be marked as
static.