From fc30c365761550594072830a6000e5da0fe18c42 Mon Sep 17 00:00:00 2001 From: Red <96445749+TheShuEd@users.noreply.github.com> Date: Sun, 27 Jul 2025 18:54:22 +0300 Subject: [PATCH] Candles & Candelabras (#1585) * Refactor food holder visual update logic Simplified UpdateVisuals method in CP14ClientCookingSystem by consolidating parameters and using component fields directly. Also ensured FoodData field is dirtied after updating visuals in CP14SharedCookingSystem to trigger proper synchronization. * add sprites * candles redo * candles and candelabras * mapping --- Resources/Maps/_CP14/comoss.yml | 206 ++++--- .../Prototypes/_CP14/Catalog/Fills/crates.yml | 13 - .../_CP14/Entities/Objects/Misc/candles.yml | 542 +++--------------- .../_CP14/Trading/BuyPositions/cozy_house.yml | 23 +- .../Objects/Misc/candelabra.rsi/meta.json | 25 + .../Objects/Misc/candelabra.rsi/triple.png | Bin 0 -> 988 bytes .../Misc/candelabra.rsi/triple_fire.png | Bin 0 -> 2321 bytes .../_CP14/Objects/Misc/candles.rsi/meta.json | 31 + .../_CP14/Objects/Misc/candles.rsi/small1.png | Bin 0 -> 236 bytes .../_CP14/Objects/Misc/candles.rsi/small2.png | Bin 0 -> 231 bytes .../_CP14/Objects/Misc/candles.rsi/small3.png | Bin 0 -> 231 bytes .../Objects/Misc/candles.rsi/small_fire.png | Bin 0 -> 1163 bytes Resources/migration.yml | 24 + 13 files changed, 307 insertions(+), 557 deletions(-) create mode 100644 Resources/Textures/_CP14/Objects/Misc/candelabra.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Misc/candelabra.rsi/triple.png create mode 100644 Resources/Textures/_CP14/Objects/Misc/candelabra.rsi/triple_fire.png create mode 100644 Resources/Textures/_CP14/Objects/Misc/candles.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Misc/candles.rsi/small1.png create mode 100644 Resources/Textures/_CP14/Objects/Misc/candles.rsi/small2.png create mode 100644 Resources/Textures/_CP14/Objects/Misc/candles.rsi/small3.png create mode 100644 Resources/Textures/_CP14/Objects/Misc/candles.rsi/small_fire.png diff --git a/Resources/Maps/_CP14/comoss.yml b/Resources/Maps/_CP14/comoss.yml index 8a4cec0790..8b642dab45 100644 --- a/Resources/Maps/_CP14/comoss.yml +++ b/Resources/Maps/_CP14/comoss.yml @@ -4,8 +4,8 @@ meta: engineVersion: 264.0.0 forkId: "" forkVersion: "" - time: 07/17/2025 14:19:23 - entityCount: 14827 + time: 07/27/2025 15:35:46 + entityCount: 14840 maps: - 1 grids: @@ -37792,13 +37792,129 @@ entities: - type: Transform pos: -17.264824,5.8419228 parent: 1 -- proto: CP14CandleGreen +- proto: CP14Candelabra + entities: + - uid: 4598 + components: + - type: Transform + pos: 5.3142414,13.013713 + parent: 1 + - uid: 9690 + components: + - type: Transform + pos: -2.6830807,12.822558 + parent: 1 + - uid: 9691 + components: + - type: Transform + pos: 9.56452,13.80245 + parent: 1 + - uid: 9692 + components: + - type: Transform + pos: 16.045486,0.87002456 + parent: 1 +- proto: CP14CandelabraIgnited + entities: + - uid: 8758 + components: + - type: Transform + pos: -14.652183,-20.246315 + parent: 1 + - uid: 9684 + components: + - type: Transform + pos: -7.6333275,-23.65467 + parent: 1 + - uid: 9685 + components: + - type: Transform + pos: -6.4670506,-17.461117 + parent: 1 + - uid: 9687 + components: + - type: Transform + pos: 17.511665,-15.392809 + parent: 1 +- proto: CP14Candle entities: - uid: 7165 components: - type: Transform pos: -24.611235,9.864569 parent: 1 + - uid: 9693 + components: + - type: Transform + pos: 8.733924,1.7367586 + parent: 1 + - uid: 9694 + components: + - type: Transform + pos: 8.385236,2.2652442 + parent: 1 + - uid: 9695 + components: + - type: Transform + pos: 8.036548,1.8941797 + parent: 1 +- proto: CP14CandleIgnited + entities: + - uid: 7134 + components: + - type: Transform + pos: -4.8100815,-22.125435 + parent: 1 + - uid: 9678 + components: + - type: Transform + pos: -15.791612,-17.261002 + parent: 1 + - uid: 9679 + components: + - type: Transform + pos: -4.157698,-23.193651 + parent: 1 + - uid: 9680 + components: + - type: Transform + pos: -14.464349,-16.080341 + parent: 1 + - uid: 9681 + components: + - type: Transform + pos: -14.858027,-17.148558 + parent: 1 + - uid: 9682 + components: + - type: Transform + pos: -4.3939056,-23.373562 + parent: 1 + - uid: 9683 + components: + - type: Transform + pos: -10.186622,-23.238628 + parent: 1 + - uid: 9686 + components: + - type: Transform + pos: -5.268656,-14.371141 + parent: 1 + - uid: 9688 + components: + - type: Transform + pos: 16.195648,-16.292358 + parent: 1 + - uid: 9689 + components: + - type: Transform + pos: 16.341873,-16.371069 + parent: 1 + - uid: 9696 + components: + - type: Transform + pos: 35.824474,0.78094435 + parent: 1 - proto: CP14CarpetBlue entities: - uid: 7176 @@ -39116,6 +39232,13 @@ entities: - type: Transform pos: -17.41455,-27.582659 parent: 1 +- proto: CP14ClothingBackLeatherSatchel + entities: + - uid: 7478 + components: + - type: Transform + pos: -74.87262,-71.99824 + parent: 1 - proto: CP14ClothingBeltQuiver entities: - uid: 7438 @@ -39178,13 +39301,6 @@ entities: parent: 7467 - type: Physics canCollide: False -- proto: CP14ClothingSatchelLeather - entities: - - uid: 7478 - components: - - type: Transform - pos: -74.87262,-71.99824 - parent: 1 - proto: CP14CopperCoin1 entities: - uid: 7482 @@ -45822,13 +45938,6 @@ entities: - type: Transform pos: -17.282326,-21.007586 parent: 1 -- proto: CP14FoodPieApple - entities: - - uid: 8758 - components: - - type: Transform - pos: -17.327341,-20.09679 - parent: 1 - proto: CP14FoodPotatoHot entities: - uid: 7230 @@ -66704,14 +66813,6 @@ entities: parent: 1 - type: Fixtures fixtures: {} - - uid: 4598 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 37.5,4.5 - parent: 1 - - type: Fixtures - fixtures: {} - uid: 4723 components: - type: Transform @@ -66719,14 +66820,6 @@ entities: parent: 1 - type: Fixtures fixtures: {} - - uid: 7134 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-15.5 - parent: 1 - - type: Fixtures - fixtures: {} - uid: 7226 components: - type: Transform @@ -66816,14 +66909,6 @@ entities: parent: 1 - type: Fixtures fixtures: {} - - uid: 11886 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-20.5 - parent: 1 - - type: Fixtures - fixtures: {} - uid: 11891 components: - type: Transform @@ -66855,45 +66940,6 @@ entities: parent: 1 - type: Fixtures fixtures: {} - - uid: 11900 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-17.5 - parent: 1 - - type: Fixtures - fixtures: {} - - uid: 11901 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-17.5 - parent: 1 - - type: Fixtures - fixtures: {} - - uid: 11903 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-23.5 - parent: 1 - - type: Fixtures - fixtures: {} - - uid: 11904 - components: - - type: Transform - pos: -15.5,-14.5 - parent: 1 - - type: Fixtures - fixtures: {} - - uid: 11905 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,-22.5 - parent: 1 - - type: Fixtures - fixtures: {} - uid: 11906 components: - type: Transform diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index 773e301d9b..9c6dadf503 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -66,20 +66,7 @@ - id: CP14FluteInstrument - id: CP14LyraInstrument - id: CP14LuteInstrument - - !type:GroupSelector - children: - id: CP14Candle - - id: CP14CandleRed - - id: CP14CandleBlue - - id: CP14CandleBlack - - id: CP14CandleGreen - - id: CP14CandlePurple - - id: CP14CandleSmall - - id: CP14CandleRedSmall - - id: CP14CandleBlueSmall - - id: CP14CandleBlackSmall - - id: CP14CandleGreenSmall - - id: CP14CandlePurpleSmall - !type:GroupSelector children: - id: CP14CrystalLampBlueEmpty diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/candles.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/candles.yml index a5db860f04..6c07fe1867 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Misc/candles.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/candles.yml @@ -1,21 +1,12 @@ - type: entity - name: candle parent: BaseItem - id: CP14Candle - description: A thin wick threaded through fat. + abstract: true + id: CP14CandleBase categories: [ ForkFiltered ] components: - type: Tag tags: - Candle - - type: Sprite - noRot: true - sprite: Objects/Misc/candles.rsi - layers: - - state: candle-big - color: "#decb8e" - - type: Item - size: Small - type: Appearance - type: Reactive groups: @@ -37,465 +28,122 @@ canResistFire: false alwaysCombustible: true canExtinguish: true - firestacksOnIgnite: 3.0 - firestackFade: -0.01 + firestacksOnIgnite: 15.0 + firestackFade: -0 damage: types: - Heat: 0.1 + Heat: 0 + - type: StaticPrice + price: 3 + +- type: entity + id: CP14Candle + parent: CP14CandleBase + name: candle + description: A thin wick threaded through fat. + components: + - type: Sprite + noRot: true + drawdepth: Mobs + sprite: _CP14/Objects/Misc/candles.rsi + layers: + - state: small1 + map: ["random"] + - type: RandomSprite + available: + - random: + small1: "" + small2: "" + small3: "" + - type: Item + size: Small - type: FireVisuals - sprite: Objects/Misc/candles.rsi - normalState: fire-big - - type: ToggleableLightVisuals - spriteLayer: null - inhandVisuals: - left: - - state: inhand-left-flame - shader: unshaded - right: - - state: inhand-right-flame - shader: unshaded + sprite: _CP14/Objects/Misc/candles.rsi + normalState: small_fire + #- type: ToggleableLightVisuals #TODO inhands + # spriteLayer: null + # inhandVisuals: + # left: + # - state: inhand-left-flame + # shader: unshaded + # right: + # - state: inhand-right-flame + # shader: unshaded - type: Damageable damageModifierSet: Wood - type: Destructible thresholds: - trigger: !type:DamageTrigger - damage: 100 + damage: 20 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Flammable + firestacksOnIgnite: 2 - type: entity - name: red candle parent: CP14Candle - id: CP14CandleRed + id: CP14CandleIgnited + suffix: Ignited components: - - type: Sprite - layers: - - state: candle-big - color: "#a12349" - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#a12349" - - state: inhand-left-flame - right: - - state: inhand-right - color: "#a12349" - - type: StaticPrice - price: 3 + - type: CP14AutoIgnite + startStack: 2 + +#Candelabra - type: entity - name: blue candle - parent: CP14Candle - id: CP14CandleBlue - components: - - type: Sprite - layers: - - state: candle-big - color: "#425d7d" - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#425d7d" - right: - - state: inhand-right - color: "#425d7d" - -- type: entity - name: black candle - parent: CP14Candle - id: CP14CandleBlack - components: - - type: Sprite - layers: - - state: candle-big - color: "#1b1724" - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#1b1724" - right: - - state: inhand-right - color: "#1b1724" - -- type: entity - name: green candle - parent: CP14Candle - id: CP14CandleGreen - components: - - type: Sprite - layers: - - state: candle-big - color: "#5d997e" - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#5d997e" - right: - - state: inhand-right - color: "#5d997e" - -- type: entity - name: purple candle - parent: CP14Candle - id: CP14CandlePurple - components: - - type: Sprite - layers: - - state: candle-big - color: "#984aa1" - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#984aa1" - right: - - state: inhand-right - color: "#984aa1" - - -- type: entity - name: small candle - parent: CP14Candle - id: CP14CandleSmall - components: - - type: Item - size: Tiny - - type: Sprite - layers: - - state: candle-small - color: "#e2ca90" - - type: FireVisuals - normalState: fire-small - - type: Flammable - firestacksOnIgnite: 2.0 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 60 - behaviors: - - !type:SpawnEntitiesBehavior - - !type:DoActsBehavior - acts: [ "Destruction" ] - -- type: entity - name: small red candle - parent: CP14CandleSmall - id: CP14CandleRedSmall - components: - - type: Sprite - layers: - - state: candle-small - color: "#a12349" - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#a12349" - right: - - state: inhand-right - color: "#a12349" - -- type: entity - name: small blue candle - parent: CP14CandleSmall - id: CP14CandleBlueSmall - components: - - type: Sprite - layers: - - state: candle-small - color: "#425d7d" - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#425d7d" - right: - - state: inhand-right - color: "#425d7d" - -- type: entity - name: small black candle - parent: CP14CandleSmall - id: CP14CandleBlackSmall - components: - - type: Sprite - layers: - - state: candle-small - color: "#1b1724" - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#1b1724" - right: - - state: inhand-right - color: "#1b1724" - -- type: entity - name: small green candle - parent: CP14CandleSmall - id: CP14CandleGreenSmall - components: - - type: Sprite - layers: - - state: candle-small - color: "#5d997e" - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#5d997e" - right: - - state: inhand-right - color: "#5d997e" - -- type: entity - name: small purple candle - parent: CP14CandleSmall - id: CP14CandlePurpleSmall - components: - - type: Sprite - layers: - - state: candle-small - color: "#984aa1" - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#984aa1" - right: - - state: inhand-right - color: "#984aa1" - -#Purely decorative candles for mappers. Do not have any functionality. - -- type: entity - parent: BaseItem - id: CP14CandleInfinite - name: magic candle - description: A magically created candle that never goes out, the flame seems cold and dead, but still burning. - suffix: Decorative + id: CP14Candelabra + parent: CP14CandleBase + name: candelabra + description: several candles, beautifully placed on a metal support categories: [ ForkFiltered ] components: - - type: CP14DelayedIgnitionSource - - type: CP14IgnitionModifier - hideCaution: true - type: Sprite noRot: true - sprite: Objects/Misc/candles.rsi + offset: 0,0.2 + sprite: _CP14/Objects/Misc/candelabra.rsi layers: - - state: candle-big - color: "#decb8e" - - state: fire-big - shader: unshaded - - type: PointLight - color: "#e39c40" - radius: 2.5 - power: 10 + - state: triple + - type: Item + size: Normal + - type: FireVisuals + sprite: _CP14/Objects/Misc/candelabra.rsi + normalState: triple_fire + - type: Damageable + damageModifierSet: CP14Metallic + #- type: ToggleableLightVisuals #TODO inhands + # spriteLayer: null + # inhandVisuals: + # left: + # - state: inhand-left-flame + # shader: unshaded + # right: + # - state: inhand-right-flame + # shader: unshaded + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + CP14ScrapIron: + min: 1 + max: 1 + - type: PhysicalComposition + materialComposition: + CP14Iron: 10 # 1 iron bar + - type: Flammable + firestacksOnIgnite: 4 - type: entity - name: magic red candle - parent: CP14CandleInfinite - id: CP14CandleRedInfinite + parent: CP14Candelabra + id: CP14CandelabraIgnited + suffix: Ignited components: - - type: Sprite - layers: - - state: candle-big - color: "#a12349" - - state: fire-big - shader: unshaded - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#a12349" - right: - - state: inhand-right - color: "#a12349" - -- type: entity - name: magic blue candle - parent: CP14CandleInfinite - id: CP14CandleBlueInfinite - components: - - type: Sprite - layers: - - state: candle-big - color: "#425d7d" - - state: fire-big - shader: unshaded - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#425d7d" - right: - - state: inhand-right - color: "#425d7d" - -- type: entity - name: magic black candle - parent: CP14CandleInfinite - id: CP14CandleBlackInfinite - components: - - type: Sprite - layers: - - state: candle-big - color: "#1b1724" - - state: fire-big - shader: unshaded - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#1b1724" - right: - - state: inhand-right - color: "#1b1724" - -- type: entity - name: magic green candle - parent: CP14CandleInfinite - id: CP14CandleGreenInfinite - components: - - type: Sprite - layers: - - state: candle-big - color: "#5d997e" - - state: fire-big - shader: unshaded - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#5d997e" - right: - - state: inhand-right - color: "#5d997e" - -- type: entity - name: magic purple candle - parent: CP14CandleInfinite - id: CP14CandlePurpleInfinite - components: - - type: Sprite - layers: - - state: candle-big - color: "#984aa1" - - state: fire-big - shader: unshaded - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#984aa1" - right: - - state: inhand-right - color: "#984aa1" - -- type: entity - name: small magic red candle - parent: CP14CandleInfinite - id: CP14CandleRedSmallInfinite - components: - - type: Sprite - layers: - - state: candle-small - color: "#a12349" - - state: fire-small - shader: unshaded - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#a12349" - right: - - state: inhand-right - color: "#a12349" - -- type: entity - name: small magic blue candle - parent: CP14CandleInfinite - id: CP14CandleBlueSmallInfinite - components: - - type: Sprite - layers: - - state: candle-small - color: "#425d7d" - - state: fire-small - shader: unshaded - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#425d7d" - right: - - state: inhand-right - color: "#425d7d" - -- type: entity - name: small magic black candle - parent: CP14CandleInfinite - id: CP14CandleBlackSmallInfinite - components: - - type: Sprite - layers: - - state: candle-small - color: "#1b1724" - - state: fire-small - shader: unshaded - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#1b1724" - right: - - state: inhand-right - color: "#1b1724" - -- type: entity - name: small magic green candle - parent: CP14CandleInfinite - id: CP14CandleGreenSmallInfinite - components: - - type: Sprite - layers: - - state: candle-small - color: "#5d997e" - - state: fire-small - shader: unshaded - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#5d997e" - right: - - state: inhand-right - color: "#5d997e" - -- type: entity - name: small magic purple candle - parent: CP14CandleInfinite - id: CP14CandlePurpleSmallInfinite - components: - - type: Sprite - layers: - - state: candle-small - color: "#984aa1" - - state: fire-small - shader: unshaded - - type: Item - inhandVisuals: - left: - - state: inhand-left - color: "#984aa1" - right: - - state: inhand-right - color: "#984aa1" + - type: CP14AutoIgnite + startStack: 4 diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/cozy_house.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/cozy_house.yml index 3ceca414e8..0bb9c6fc40 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/cozy_house.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/cozy_house.yml @@ -6,8 +6,8 @@ faction: HomeDecor uiPosition: 0 icon: - sprite: Objects/Misc/candles.rsi - state: candle-big + sprite: _CP14/Objects/Misc/candles.rsi + state: small1 service: !type:CP14BuyItemsService product: CP14Candle @@ -122,26 +122,15 @@ # Rep 1 - type: cp14TradingPosition - id: CP14CandleRed + id: CP14Candelabra faction: HomeDecor reputationLevel: 1 uiPosition: 0 icon: - sprite: Objects/Misc/candles.rsi - state: candle-big + sprite: _CP14/Objects/Misc/candelabra.rsi + state: triple service: !type:CP14BuyItemsService - product: CP14CandleRed - -- type: cp14TradingPosition - id: CP14CandleBlack - faction: HomeDecor - reputationLevel: 1 - uiPosition: 1 - icon: - sprite: Objects/Misc/candles.rsi - state: candle-big - service: !type:CP14BuyItemsService - product: CP14CandleBlack + product: CP14Candelabra - type: cp14TradingPosition id: CP14KeyIronBlank diff --git a/Resources/Textures/_CP14/Objects/Misc/candelabra.rsi/meta.json b/Resources/Textures/_CP14/Objects/Misc/candelabra.rsi/meta.json new file mode 100644 index 0000000000..e69499f7ee --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Misc/candelabra.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by vladimir.s", + "size": { + "x": 32, + "y": 40 + }, + "states": [ + { + "name": "triple" + }, + { + "name": "triple_fire", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Misc/candelabra.rsi/triple.png b/Resources/Textures/_CP14/Objects/Misc/candelabra.rsi/triple.png new file mode 100644 index 0000000000000000000000000000000000000000..0e5eb653806effbf4a09e231b5e9b824ae07e134 GIT binary patch literal 988 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Misc/candles.rsi/meta.json b/Resources/Textures/_CP14/Objects/Misc/candles.rsi/meta.json new file mode 100644 index 0000000000..cc3446d0dd --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Misc/candles.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by vladimir.s", + "size": { + "x": 20, + "y": 20 + }, + "states": [ + { + "name": "small1" + }, + { + "name": "small2" + }, + { + "name": "small3" + }, + { + "name": "small_fire", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Misc/candles.rsi/small1.png b/Resources/Textures/_CP14/Objects/Misc/candles.rsi/small1.png new file mode 100644 index 0000000000000000000000000000000000000000..99338c7388568506b88dfc439fa653cef7a8a956 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1IgWu7jMAr`&K z2@VB7>x$K6+`X4rJ@k(7hZp++`%y7Tqz{bYbRw>%& zB6;ip5H$G*1xC$#`0V0ZogM1pHuQwhj)^5=gt4(=i?JPygj@OSia0Tw31){MnKZHdZ0x8jBH7X4u8AF b2?C4^o>PqS-#XNRoX_Ct>gTe~DWM4f&}mw3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Misc/candles.rsi/small2.png b/Resources/Textures/_CP14/Objects/Misc/candles.rsi/small2.png new file mode 100644 index 0000000000000000000000000000000000000000..ea61f1e8b6d4d434289b88a7b00a800b345005eb GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1Igg`O^sAr`&K z2@VB7>x$K6+`X4rJ@k(7hZp++`%y7Tqz{bYbRw>%& zB6;ip5Onw#xoweY-qiJ}zRt0(E!}^f;hu_rO@_%Yl~2Wba2?1_c+Tjyr)CoGp8sDI ztw?{6hQ0nYTd4GI+ZBxvXVB7>x$K6+`X4rJ@k(7hZp++`%y7Tqz{bYbRw>%& zB6;ip5H$G*1xC$#`0V0ZoU*!M)udl;_+Su6g z^77iIE^Yh&5u&-nJIT58=6~_?@d+K?9$p44U*;TI*{@(>s@U*C#hA+t=#gD)YN8ug S+z16amci52&t;ucLK6T((^%~Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Misc/candles.rsi/small_fire.png b/Resources/Textures/_CP14/Objects/Misc/candles.rsi/small_fire.png new file mode 100644 index 0000000000000000000000000000000000000000..64d4c275ab7147e2ac1efbc777f72e9e95bbc303 GIT binary patch literal 1163 zcmV;61a$j}P)Px(MM*?KR9J=Wn7xY~RT##f_nev8JMrG#HOXcZla;s-+kjXs*e@uEU?EsoiC`=K z0XBkFYDL*fNh^woY%H{kjo>OOCQ(U3-0bK5n4LK@=bZPkh@|n(;sosOuN*kf{qdf; zob!yJ1r9$IP%Xd|3+iVgQ@M^fG9fKphcB4d@%Nit^<9 zoVG4$4Q&3hkSvGf^FW*fLj?T<8jb|g#qFQKkOCNhaS>z>pa(DnFb1FirV5&A595tD zgyl}ka(9vL@PZ_RTdYSH*-VxYj&hQn4H>JPS}rkG7tve&5&rJ4Bp}18#b|3ux-3T-xx-w z#r17WwzdImz$`8i#t<>-E?C!rJ~(4GQCz=+{@Tii_1)q*F)${#odpT1XVg)DZRH<9 zAdW`|5L2^Cw5y<26Q|Da*SCuoCR^KI0)ScQm0~1Hmbb2(DroXl8Ce-%r`XzFd+hSr z6QPQwvGp!QO44=~^gF{!t7g~l7cswd`q@|q&xsp~F?F)o>o!5LM#YMwkzEKTAX891 zl}j2Sa#%=mA#9)i4o#Xx!q?0gD{ z0jP*$54s@BZ+AM2o1fn8rBAE|Fl3114C(}02AEz0vHrNcsb?_&FjgtG8c^LbwLVX6 zmPtRLhLm^S>U5)Kj38r1#s!k+2&@qHEMW$ONqKO!+l?9k5Jo-t!_%w}o|5$BFRX{F zY$j(ObQ0UXZkk|yL^elrY|4`|cj0GgZvDWRtWwi6&@5+gt$FPe40Xn)eB9`tUju;A zo7dF&GwPVrr=0}Bnp*74X|Z?8-~0Ye%&)@?p8iV9@oBAwJ-YqYy!P5z*U*5(EEp7< z8|bgUj(FqSfrw<1NH;-WAnrE_i4(o^_@LO_K!0roaX6QYF^Qx}=PN&A>4LggxC)Na;w|AV@U-G+!(=zP){p$8Z z>Cxywtf`rG>m*u~)Fw8J92)arSbpMPv~jd2iE(JM*1T51=HA$A9fw*pCSC4dZVnyo z2_3_l&Ygr_l|EJs+-WNROm?=P#BnvD_xqBV%4E`A(EWZGCAFnkiPoAStO7B52r^ty}yEUkDzJ(I?LfgPK@+Q5O))hK$s6?|e7wBQs{q dm@(sj CrystallEdge migration zone end