diff --git a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl index 450e5d0903..2f2a96d3e9 100644 --- a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl +++ b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl @@ -2,7 +2,6 @@ cp14-modifier-gold-ore = gold ore cp14-modifier-iron-ore = iron ore cp14-modifier-copper-ore = copper ore cp14-modifier-mithril-ore = mithril ore -cp14-modifier-quartz-crystal = quartz crystals cp14-modifier-dayflin = dayflins cp14-modifier-fly-agaric = fly agaric cp14-modifier-blue-amanita = azure amanita diff --git a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl index 827b185e4a..70e2d4c52a 100644 --- a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl +++ b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl @@ -2,7 +2,6 @@ cp14-modifier-gold-ore = золотой руды cp14-modifier-iron-ore = железной руды cp14-modifier-copper-ore = медной руды cp14-modifier-mithril-ore = мифриловой руды -cp14-modifier-quartz-crystal = кварцевых кристаллов cp14-modifier-dayflin = днецветов cp14-modifier-fly-agaric = мухоморов cp14-modifier-blue-amanita = лазурной аманиты diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml index 8d90fbc1bf..700835e577 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml @@ -139,36 +139,6 @@ - ReagentId: CP14WildSageSap Quantity: 15 -- type: entity - id: CP14QuartzShard - parent: BaseItem - name: rough quartz - description: a natural crystal that is a natural storage of magical energy. Its color reflects the quality of the crystal - the higher the emission spectrum, the higher the level of energy leakage. - categories: [ ForkFiltered ] - components: - - type: Tag - tags: - - CP14FitInMortar - - type: Item - size: Tiny - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: shard - map: ["random"] - - type: RandomSprite - available: - - random: - shard: "" - shard2: "" - shard3: "" - shard4: "" - - type: Extractable - juiceSolution: - reagents: - - ReagentId: CP14GroundQuartz - Quantity: 7 - - type: entity id: CP14LumiMushroom parent: CP14WildProduceBase diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/garland.yml b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/garland.yml index fc2f1fd3b8..5694ba8efb 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Decorations/garland.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Decorations/garland.yml @@ -21,11 +21,6 @@ - !type:PlaySoundBehavior sound: collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14QuartzShard: - min: 0 - max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] - type: PointLight diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/base.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/base.yml new file mode 100644 index 0000000000..08d19b81be --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/base.yml @@ -0,0 +1,129 @@ +- type: entity + id: CP14CrystalBase + abstract: true + parent: BaseRock + name: sparkling quartz + description: Natural quartz crystals that can absorb the magical energy of the world around them. + categories: [ ForkFiltered ] + components: + - type: Sprite + drawdepth: Mobs + offset: 0, 0.25 + noRot: true + - type: InteractionPopup + interactSuccessString: popup-cp14crystal-ding + messagePerceivedByOthers: popup-cp14crystal-ding + interactSuccessSound: + collection: CP14CrystalDings + params: + variation: 0.03 + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Glass + - type: MeleeSound + soundGroups: + Brute: + collection: GlassSmash + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.30 + density: 60 + mask: + - MachineMask + layer: + - MidImpassable + - LowImpassable + - BulletImpassable + - Opaque + - type: PointLight + netSync: false + +- type: entity + parent: CP14CrystalBase + id: CP14CrystalBigBase + abstract: true + components: + - type: Sprite + sprite: _CP14/Structures/Flora/Crystal/crystal_big.rsi + layers: + - state: big1 + shader: unshaded + map: ["random"] + - type: InteractionPopup + interactSuccessSound: + collection: CP14CrystalDings + params: + pitch: 0.5 + variation: 0.03 + - type: PointLight + radius: 2 + energy: 2.5 + - type: RandomSprite + available: + - random: + big0: Inherit + big1: Inherit + big2: Inherit + +- type: entity + parent: CP14CrystalBase + id: CP14CrystalMediumBase + abstract: true + components: + - type: Sprite + sprite: _CP14/Structures/Flora/Crystal/crystal_medium.rsi + layers: + - state: medium4 + shader: unshaded + map: ["random"] + - type: InteractionPopup + interactSuccessSound: + collection: CP14CrystalDings + params: + pitch: 1 + variation: 0.03 + - type: PointLight + radius: 1.5 + energy: 2 + - type: RandomSprite + available: + - random: + medium0: Inherit + medium1: Inherit + medium2: Inherit + medium3: Inherit + medium4: Inherit + +- type: entity + parent: CP14CrystalBase + id: CP14CrystalSmallBase + abstract: true + components: + - type: Sprite + sprite: _CP14/Structures/Flora/Crystal/crystal_small.rsi + layers: + - state: small1 + shader: unshaded + map: ["random"] + - type: InteractionPopup + interactSuccessSound: + collection: CP14CrystalDings + params: + pitch: 1.5 + variation: 0.03 + - type: PointLight + radius: 1.1 + energy: 2 + - type: RandomSprite + available: + - random: + small0: Inherit + small1: Inherit + small2: Inherit + small3: Inherit + small4: Inherit + small5: Inherit + - type: Appearance \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml new file mode 100644 index 0000000000..399013bc3a --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml @@ -0,0 +1,636 @@ +# Water + +- type: entity + id: CP14CrystalWaterBase + abstract: true + description: Natural quartz crystals that can absorb the magical energy of the world around them. This crystal seems to have absorbed the energy of cold and water. + components: + - type: PointLight + color: "#5eabeb" + - type: Sprite + color: "#5eabeb" + +- type: entity + id: CP14CrystalElementalWaterSmall + suffix: Water, Small + parent: + - CP14CrystalSmallBase + - CP14CrystalWaterBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardWater: + min: 0 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14CrystalElementalWaterMedium + suffix: Water, Medium + parent: + - CP14CrystalMediumBase + - CP14CrystalWaterBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardWater: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14CrystalElementalWaterBig + suffix: Water, Big + parent: + - CP14CrystalBigBase + - CP14CrystalWaterBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardWater: + min: 2 + max: 3 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +# Healing + +- type: entity + id: CP14CrystalHealingBase + abstract: true + description: Natural quartz crystals that can absorb the magical energy of the world around them. This crystal seems to have absorbed the energy of life. + components: + - type: PointLight + color: "#3de063" + - type: Sprite + color: "#3de063" + +- type: entity + id: CP14CrystalElementalHealingSmall + suffix: Healing, Small + parent: + - CP14CrystalSmallBase + - CP14CrystalHealingBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardHealing: + min: 0 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14CrystalElementalHealingMedium + suffix: Healing, Medium + parent: + - CP14CrystalMediumBase + - CP14CrystalHealingBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardHealing: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14CrystalElementalHealingBig + suffix: Healing, Big + parent: + - CP14CrystalBigBase + - CP14CrystalHealingBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardHealing: + min: 2 + max: 3 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +# Fire + +- type: entity + id: CP14CrystalFireBase + abstract: true + description: Natural quartz crystals that can absorb the magical energy of the world around them. This crystal seems to have absorbed the energy of fire. + components: + - type: PointLight + color: "#ed731c" + - type: Sprite + color: "#ed731c" + +- type: entity + id: CP14CrystalElementalFireSmall + suffix: Fire, Small + parent: + - CP14CrystalSmallBase + - CP14CrystalFireBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardFire: + min: 0 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14CrystalElementalFireMedium + suffix: Fire, Medium + parent: + - CP14CrystalMediumBase + - CP14CrystalFireBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardFire: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14CrystalElementalFireBig + suffix: Fire, Big + parent: + - CP14CrystalBigBase + - CP14CrystalFireBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardFire: + min: 2 + max: 3 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +# Light + +- type: entity + id: CP14CrystalLightBase + abstract: true + description: Natural quartz crystals that can absorb the magical energy of the world around them. This crystal seems to have absorbed the energy of light. + components: + - type: PointLight + color: "#f1c7ff" + - type: Sprite + color: "#f1c7ff" + +- type: entity + id: CP14CrystalElementalLightSmall + suffix: Light, Small + parent: + - CP14CrystalSmallBase + - CP14CrystalLightBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardLight: + min: 0 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14CrystalElementalLightMedium + suffix: Light, Medium + parent: + - CP14CrystalMediumBase + - CP14CrystalLightBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardLight: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: CP14CrystalElementalLightBig + suffix: Light, Big + parent: + - CP14CrystalBigBase + - CP14CrystalLightBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardLight: + min: 2 + max: 3 + - !type:DoActsBehavior + acts: [ "Destruction" ] + +# Electric + +- type: entity + id: CP14CrystalElectricBase + abstract: true + description: Natural quartz crystals that can absorb the magical energy of the world around them. This crystal seems to have absorbed the energy of electricity. + components: + - type: PointLight + color: "#e6ff6b" + - type: Sprite + color: "#e6ff6b" + - type: Electrified + requirePower: false + shockTime: 8 + +- type: entity + id: CP14CrystalElementalElectricSmall + suffix: Electric, Small + parent: + - CP14CrystalSmallBase + - CP14CrystalElectricBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardElectric: + min: 0 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Electrified + shockTime: 2 + +- type: entity + id: CP14CrystalElementalElectricMedium + suffix: Electric, Medium + parent: + - CP14CrystalMediumBase + - CP14CrystalElectricBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardElectric: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Electrified + shockTime: 4 + +- type: entity + id: CP14CrystalElementalElectricBig + suffix: Electric, Big + parent: + - CP14CrystalBigBase + - CP14CrystalElectricBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardElectric: + min: 2 + max: 3 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Electrified + shockTime: 6 + +# Darkness + +- type: entity + id: CP14CrystalDarknessBase + abstract: true + description: Natural quartz crystals that can absorb the magical energy of the world around them. This crystal seems to have absorbed the energy of darkness. + components: + - type: PointLight + color: "#e8ffb5" + - type: Sprite + color: "#391c57" + +- type: entity + id: CP14CrystalElementalDarknessSmall + suffix: Darkness, Small + parent: + - CP14CrystalSmallBase + - CP14CrystalDarknessBase + components: + - type: Sprite + sprite: _CP14/Structures/Flora/Crystal/crystal_small.rsi + layers: + - state: small1 + map: ["random"] + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardDarkness: + min: 0 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: PointLight + energy: -2 + +- type: entity + id: CP14CrystalElementalDarknessMedium + suffix: Darkness, Medium + parent: + - CP14CrystalMediumBase + - CP14CrystalDarknessBase + components: + - type: Sprite + sprite: _CP14/Structures/Flora/Crystal/crystal_medium.rsi + layers: + - state: medium4 + map: ["random"] + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardDarkness: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: PointLight + energy: -2 + +- type: entity + id: CP14CrystalElementalDarknessBig + suffix: Darkness, Big + parent: + - CP14CrystalBigBase + - CP14CrystalDarknessBase + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardDarkness: + min: 2 + max: 3 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: PointLight + energy: -2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/shards.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/shards.yml new file mode 100644 index 0000000000..d26e7eb6ff --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/shards.yml @@ -0,0 +1,81 @@ +- type: entity + id: CP14CrystalShardBase + parent: BaseItem + abstract: true + name: quartz shard + description: Natural quartz crystals that can absorb the magical energy of the world around them. + categories: [ ForkFiltered ] + components: + - type: Tag + tags: + - CP14FitInMortar + - type: Item + size: Tiny + - type: Sprite + sprite: _CP14/Structures/Flora/Crystal/crystal_shard.rsi + layers: + - state: shard0 + map: ["random"] + - type: RandomSprite + available: + - random: + shard0: "" + shard1: "" + shard2: "" + shard3: "" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14GroundQuartz + Quantity: 7 + +- type: entity + parent: CP14CrystalShardBase + id: CP14CrystalShardWater + suffix: Water + components: + - type: Sprite + color: "#5eabeb" + +- type: entity + parent: CP14CrystalShardBase + id: CP14CrystalShardHealing + suffix: Healing + components: + - type: Sprite + color: "#3de063" + +- type: entity + parent: CP14CrystalShardBase + id: CP14CrystalShardFire + suffix: Fire + components: + - type: Sprite + color: "#ed731c" + +- type: entity + parent: CP14CrystalShardBase + id: CP14CrystalShardLight + suffix: Light + components: + - type: Sprite + color: "#f1c7ff" + +- type: entity + parent: CP14CrystalShardBase + id: CP14CrystalShardElectric + suffix: Electric + components: + - type: Sprite + color: "#e6ff6b" + - type: Electrified + requirePower: false + shockTime: 1 + +- type: entity + parent: CP14CrystalShardBase + id: CP14CrystalShardDarkness + suffix: Darkness + components: + - type: Sprite + color: "#391c57" \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/wild.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/wild.yml index e2c5bf92ea..78389d84ad 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/wild.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/wild.yml @@ -205,82 +205,6 @@ loot: All: CP14GatherLumiMushroom -- type: entity - parent: BaseRock - id: CP14QuartzCrystal - name: quartz - description: Quartz is an essential mineral capable of interacting with magical energy. It is highly sought after by alchemists for extracting beneficial properties from liquids - categories: [ ForkFiltered ] - components: - - type: Transform - anchored: true - - type: Sprite - drawdepth: Mobs - sprite: _CP14/Structures/crystal.rsi - offset: 0, 0.25 - noRot: true - layers: - - state: big - map: ["random"] - - type: InteractionPopup - interactSuccessString: popup-cp14crystal-ding - messagePerceivedByOthers: popup-cp14crystal-ding - interactSuccessSound: - collection: CP14CrystalDings - params: - variation: 0.03 - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Glass - - type: MeleeSound - soundGroups: - Brute: - collection: GlassSmash - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:SpawnEntitiesBehavior - spawn: - CP14QuartzShard: - min: 1 - max: 3 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: RandomSprite - available: - - random: - big: "" - medium: "" - small: "" - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.30 - density: 60 - mask: - - MachineMask - layer: - - MidImpassable - - LowImpassable - - BulletImpassable - - Opaque - # Blue amanita - type: entityLootTable diff --git a/Resources/Prototypes/_CP14/Entities/Structures/crystal.yml b/Resources/Prototypes/_CP14/Entities/Structures/crystal.yml index 3092319400..2430025711 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/crystal.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/crystal.yml @@ -38,11 +38,6 @@ - !type:PlaySoundBehavior sound: collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14QuartzShard: - min: 0 - max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] - type: Fixtures @@ -72,6 +67,8 @@ parent: CP14WallmountCrystalBase suffix: Red components: + - type: Sprite + color: "#ff3d0b" - type: RandomSprite cP14InheritBaseColor: "#ff3d0b" - type: PointLight @@ -82,6 +79,8 @@ parent: CP14WallmountCrystalBase suffix: Yellow components: + - type: Sprite + color: "#ffe269" - type: RandomSprite cP14InheritBaseColor: "#ffe269" - type: PointLight @@ -92,6 +91,8 @@ parent: CP14WallmountCrystalBase suffix: Green components: + - type: Sprite + color: "#30be81" - type: RandomSprite cP14InheritBaseColor: "#30be81" - type: PointLight @@ -102,6 +103,8 @@ parent: CP14WallmountCrystalBase suffix: Cyan components: + - type: Sprite + color: "#5eabeb" - type: RandomSprite cP14InheritBaseColor: "#5eabeb" - type: PointLight @@ -112,6 +115,8 @@ parent: CP14WallmountCrystalBase suffix: Purple components: + - type: Sprite + color: "#a878d1" - type: RandomSprite cP14InheritBaseColor: "#a878d1" - type: PointLight @@ -122,348 +127,9 @@ parent: CP14WallmountCrystalBase suffix: White components: + - type: Sprite + color: "#f8f8f8" - type: RandomSprite cP14InheritBaseColor: "#f8f8f8" - type: PointLight - color: "#f8f8f8" - -# Floor Crystal - -- type: entity - id: CP14CrystalBase - abstract: true - parent: BaseRock - name: sparkling quartz - description: bioluminescent quartz crystals that can take on any color - a very handy light source in a deep caves. Unfortunately, the luminous properties are very hard to preserve. - categories: [ ForkFiltered ] - components: - - type: Sprite - drawdepth: Mobs - sprite: _CP14/Structures/crystal.rsi - offset: 0, 0.25 - layers: - - state: big - shader: unshaded - noRot: true - - type: InteractionPopup - interactSuccessString: popup-cp14crystal-ding - messagePerceivedByOthers: popup-cp14crystal-ding - interactSuccessSound: - collection: CP14CrystalDings - params: - variation: 0.03 - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Glass - - type: MeleeSound - soundGroups: - Brute: - collection: GlassSmash - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 80 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14QuartzShard: - min: 1 - max: 3 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.30 - density: 60 - mask: - - MachineMask - layer: - - MidImpassable - - LowImpassable - - BulletImpassable - - Opaque - - - type: PointLight - radius: 2 - energy: 2 - -- type: entity - id: CP14CrystalRubiesSmall - parent: CP14CrystalBase - suffix: Red, Small - components: - - type: PointLight - color: "#ff3d0b" - radius: 1.5 - energy: 2 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: small - color: "#ff3d0b" - -- type: entity - id: CP14CrystalRubiesMedium - parent: CP14CrystalBase - suffix: Red, Medium - components: - - type: PointLight - color: "#ff3d0b" - radius: 2 - energy: 2.5 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: medium - color: "#ff3d0b" - -- type: entity - id: CP14CrystalRubiesBig - parent: CP14CrystalBase - suffix: Red, Big - components: - - type: PointLight - color: "#ff3d0b" - radius: 2.5 - energy: 3 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: big - color: "#ff3d0b" - -- type: entity - id: CP14CrystalTopazesSmall - parent: CP14CrystalBase - suffix: Yellow, Small - components: - - type: PointLight - color: "#ffe269" - radius: 1.5 - energy: 2 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: small - color: "#ffe269" - -- type: entity - id: CP14CrystalTopazesMedium - parent: CP14CrystalBase - suffix: Yellow, Medium - components: - - type: PointLight - color: "#ffe269" - radius: 2 - energy: 2.5 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: medium - color: "#ffe269" - -- type: entity - id: CP14CrystalTopazesBig - parent: CP14CrystalBase - suffix: Yellow, Big - components: - - type: PointLight - color: "#ffe269" - radius: 2.5 - energy: 3 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: big - color: "#ffe269" - -- type: entity - id: CP14CrystalEmeraldsSmall - parent: CP14CrystalBase - suffix: Green, Small - components: - - type: PointLight - color: "#30be81" - radius: 1.5 - energy: 2 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: small - color: "#30be81" - -- type: entity - id: CP14CrystalEmeraldsMedium - parent: CP14CrystalBase - suffix: Green, Medium - components: - - type: PointLight - color: "#30be81" - radius: 2 - energy: 2.5 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: medium - color: "#30be81" - -- type: entity - id: CP14CrystalEmeraldsBig - parent: CP14CrystalBase - suffix: Green, Big - components: - - type: PointLight - color: "#30be81" - radius: 2.5 - energy: 3 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: big - color: "#30be81" - -- type: entity - id: CP14CrystalSapphiresSmall - parent: CP14CrystalBase - suffix: Cyan, Small - components: - - type: PointLight - color: "#5eabeb" - radius: 1.5 - energy: 2 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: small - color: "#5eabeb" - -- type: entity - id: CP14CrystalSapphiresMedium - parent: CP14CrystalBase - suffix: Cyan, Medium - components: - - type: PointLight - color: "#5eabeb" - radius: 2 - energy: 2.5 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: medium - color: "#5eabeb" - -- type: entity - id: CP14CrystalSapphiresBig - parent: CP14CrystalBase - suffix: Cyan, Big - components: - - type: PointLight - color: "#5eabeb" - radius: 2.5 - energy: 3 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: big - color: "#5eabeb" - -- type: entity - id: CP14CrystalAmethystsSmall - parent: CP14CrystalBase - suffix: Purple, Small - components: - - type: PointLight - color: "#a878d1" - radius: 1.5 - energy: 2 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: small - color: "#a878d1" - -- type: entity - id: CP14CrystalAmethystsMedium - parent: CP14CrystalBase - suffix: Purple, Medium - components: - - type: PointLight - color: "#a878d1" - radius: 2 - energy: 2.5 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: medium - color: "#a878d1" - -- type: entity - id: CP14CrystalAmethystsBig - parent: CP14CrystalBase - suffix: Purple, Big - components: - - type: PointLight - color: "#a878d1" - radius: 2.5 - energy: 3 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: big - color: "#a878d1" - -- type: entity - id: CP14CrystalDiamondsSmall - parent: CP14CrystalBase - suffix: White, Small - components: - - type: PointLight - color: "#f8f8f8" - radius: 1.5 - energy: 2 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: small - color: "#f8f8f8" - -- type: entity - id: CP14CrystalDiamondsMedium - parent: CP14CrystalBase - suffix: White, Medium - components: - - type: PointLight - color: "#f8f8f8" - radius: 2 - energy: 2.5 - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: medium - color: "#f8f8f8" - -- type: entity - id: CP14CrystalDiamondsBig - parent: CP14CrystalBase - suffix: White, Big - components: - - type: PointLight - color: "#f8f8f8" - - type: Sprite - sprite: _CP14/Structures/crystal.rsi - layers: - - state: big - color: "#f8f8f8" + color: "#f8f8f8" \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/kudzu.yml b/Resources/Prototypes/_CP14/Entities/Structures/kudzu.yml index fc878adaba..021c5bed9a 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/kudzu.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/kudzu.yml @@ -54,12 +54,12 @@ offset: 0.05 chance: 0.5 prototypes: - - CP14CrystalAmethystsSmall - - CP14CrystalAmethystsSmall - - CP14CrystalAmethystsSmall - - CP14CrystalAmethystsMedium - - CP14CrystalAmethystsMedium - - CP14CrystalAmethystsBig + - CP14CrystalElementalDarknessSmall + - CP14CrystalElementalDarknessSmall + - CP14CrystalElementalDarknessSmall + - CP14CrystalElementalDarknessMedium + - CP14CrystalElementalDarknessMedium + - CP14CrystalElementalDarknessBig rareChance: 0.05 #rarePrototypes: # - MobCatShadow diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml index 803e7809b2..873f115e5a 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml @@ -1,158 +1,207 @@ -# TIER 1 - type: cp14DemiplaneModifier - id: QuartzCrystal - tiers: - - 1 - name: cp14-modifier-quartz-crystal - categories: - Reward: 0.1 - requiredTags: - - CP14DemiplaneOres - layers: - - !type:OreDunGen - tileMask: - - CP14FloorBase - entity: CP14QuartzCrystal - count: 30 - minGroupSize: 1 - maxGroupSize: 2 - -# TIER 2 - -- type: cp14DemiplaneModifier - id: QuartzCrystalRubies + id: CrystalFire tiers: - 1 - 2 - 3 - name: cp14-modifier-quartz-crystal generationWeight: 0.1 categories: Reward: 0.1 - requiredTags: + requiredTags: #TODO: Hot places - CP14DemiplaneOres - CP14DemiplaneUnderground layers: - !type:OreDunGen tileMask: - CP14FloorBase - entity: CP14CrystalRubiesMedium + entity: CP14CrystalElementalFireSmall count: 30 minGroupSize: 1 + maxGroupSize: 3 + - !type:OreDunGen + tileMask: + - CP14FloorBase + entity: CP14CrystalElementalFireMedium + count: 20 + minGroupSize: 1 maxGroupSize: 2 + - !type:OreDunGen + tileMask: + - CP14FloorBase + entity: CP14CrystalElementalFireBig + count: 10 + minGroupSize: 1 + maxGroupSize: 1 - type: cp14DemiplaneModifier - id: QuartzCrystalTopazes + id: CrystalElectric tiers: - 1 - 2 - 3 - name: cp14-modifier-quartz-crystal generationWeight: 0.1 categories: Reward: 0.1 - requiredTags: - - CP14DemiplaneOres layers: - !type:OreDunGen tileMask: - CP14FloorBase - CP14FloorSand - entity: CP14CrystalTopazesMedium + entity: CP14CrystalElementalElectricSmall count: 30 minGroupSize: 1 - maxGroupSize: 2 - -- type: cp14DemiplaneModifier - id: QuartzCrystalEmeralds - tiers: - - 1 - - 2 - - 3 - name: cp14-modifier-quartz-crystal - generationWeight: 0.1 - categories: - Reward: 0.1 - requiredTags: - - CP14DemiplaneOres - layers: - - !type:OreDunGen - tileMask: - - CP14FloorBase - - CP14FloorGrass - - CP14FloorGrassLight - - CP14FloorGrassTall - entity: CP14CrystalEmeraldsMedium - count: 30 - minGroupSize: 1 - maxGroupSize: 2 - -- type: cp14DemiplaneModifier - id: QuartzCrystalSapphires - tiers: - - 1 - - 2 - - 3 - name: cp14-modifier-quartz-crystal - generationWeight: 0.1 - categories: - Reward: 0.1 - requiredTags: - - CP14DemiplaneOres - layers: - - !type:OreDunGen - tileMask: - - CP14FloorBase - - CP14FloorGrass - - CP14FloorGrassLight - - CP14FloorGrassTall - entity: CP14CrystalSapphiresMedium - count: 30 - minGroupSize: 1 - maxGroupSize: 2 - -- type: cp14DemiplaneModifier - id: QuartzCrystalAmethysts - tiers: - - 1 - - 2 - - 3 - name: cp14-modifier-quartz-crystal - generationWeight: 0.1 - categories: - Reward: 0.1 - requiredTags: - - CP14DemiplaneOres - - CP14DemiplaneUnderground - layers: - - !type:OreDunGen - tileMask: - - CP14FloorBase - entity: CP14CrystalAmethystsMedium - count: 30 - minGroupSize: 1 - maxGroupSize: 2 - -- type: cp14DemiplaneModifier - id: QuartzCrystalDiamonds - tiers: - - 1 - - 2 - - 3 - name: cp14-modifier-quartz-crystal - generationWeight: 0.1 - categories: - Reward: 0.1 - requiredTags: - - CP14DemiplaneOres - - CP14DemiplaneUnderground - layers: + maxGroupSize: 3 - !type:OreDunGen tileMask: - CP14FloorBase - CP14FloorSand - entity: CP14CrystalDiamondsMedium + entity: CP14CrystalElementalElectricMedium + count: 20 + minGroupSize: 1 + maxGroupSize: 2 + - !type:OreDunGen + tileMask: + - CP14FloorBase + - CP14FloorSand + entity: CP14CrystalElementalElectricBig + count: 10 + minGroupSize: 1 + maxGroupSize: 1 + +- type: cp14DemiplaneModifier + id: CrystalHealing + tiers: + - 1 + - 2 + - 3 + generationWeight: 0.1 + categories: + Reward: 0.1 + requiredTags: + - CP14DemiplaneHerbals + layers: + - !type:OreDunGen + tileMask: + - CP14FloorGrass + - CP14FloorGrassLight + - CP14FloorGrassTall + entity: CP14CrystalElementalElectricSmall count: 30 minGroupSize: 1 - maxGroupSize: 2 \ No newline at end of file + maxGroupSize: 3 + - !type:OreDunGen + tileMask: + - CP14FloorGrass + - CP14FloorGrassLight + - CP14FloorGrassTall + entity: CP14CrystalElementalElectricMedium + count: 20 + minGroupSize: 1 + maxGroupSize: 2 + - !type:OreDunGen + tileMask: + - CP14FloorGrass + - CP14FloorGrassLight + - CP14FloorGrassTall + entity: CP14CrystalElementalElectricBig + count: 10 + minGroupSize: 1 + maxGroupSize: 1 + +- type: cp14DemiplaneModifier + id: CrystalWater + tiers: + - 1 + - 2 + - 3 + generationWeight: 0.1 + categories: + Reward: 0.1 + requiredTags: + - CP14DemiplaneWater + #TODO Cold places filter + layers: + - !type:OreDunGen + tileMask: + - CP14FloorGrass + - CP14FloorGrassLight + - CP14FloorGrassTall + entity: CP14CrystalElementalWaterSmall + count: 30 + minGroupSize: 1 + maxGroupSize: 3 + - !type:OreDunGen + tileMask: + - CP14FloorGrass + - CP14FloorGrassLight + - CP14FloorGrassTall + entity: CP14CrystalElementalWaterMedium + count: 20 + minGroupSize: 1 + maxGroupSize: 2 + - !type:OreDunGen + tileMask: + - CP14FloorGrass + - CP14FloorGrassLight + - CP14FloorGrassTall + entity: CP14CrystalElementalWaterBig + count: 10 + minGroupSize: 1 + maxGroupSize: 1 + +- type: cp14DemiplaneModifier + id: CrystalDarkness + tiers: + - 1 + - 2 + - 3 + generationWeight: 0.1 + categories: + Reward: 0.1 + requiredTags: + - CP14DemiplaneUnderground + layers: + - !type:OreDunGen + entity: CP14CrystalElementalDarknessSmall + count: 30 + minGroupSize: 1 + maxGroupSize: 3 + - !type:OreDunGen + entity: CP14CrystalElementalDarknessMedium + count: 20 + minGroupSize: 1 + maxGroupSize: 2 + - !type:OreDunGen + entity: CP14CrystalElementalDarknessBig + count: 10 + minGroupSize: 1 + maxGroupSize: 1 + +- type: cp14DemiplaneModifier + id: CrystalLight + tiers: + - 1 + - 2 + - 3 + generationWeight: 0.1 + categories: + Reward: 0.1 + requiredTags: + - CP14DemiplaneOpenSky + layers: + - !type:OreDunGen + entity: CP14CrystalElementalLightSmall + count: 30 + minGroupSize: 1 + maxGroupSize: 3 + - !type:OreDunGen + entity: CP14CrystalElementalLightMedium + count: 20 + minGroupSize: 1 + maxGroupSize: 2 + - !type:OreDunGen + entity: CP14CrystalElementalLightBig + count: 10 + minGroupSize: 1 + maxGroupSize: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml index 996b7d91f5..79680065e4 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml @@ -34,14 +34,14 @@ result: CP14MithrilBar1 knowledgeRequired: MetallMelting -- type: CP14Recipe - id: CP14GlassSheet1 - tag: CP14RecipeMeltingFurnace - craftTime: 4 - entities: - CP14QuartzShard: 1 - result: CP14GlassSheet1 - knowledgeRequired: Glasswork +#- type: CP14Recipe +# id: CP14GlassSheet1 +# tag: CP14RecipeMeltingFurnace +# craftTime: 4 +# entities: +# CP14QuartzShard: 1 +# result: CP14GlassSheet1 +# knowledgeRequired: Glasswork - type: CP14Recipe id: CP14GlassSheetShard1 diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/big0.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/big0.png new file mode 100644 index 0000000000..f70a0a71d6 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/big0.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/big1.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/big1.png new file mode 100644 index 0000000000..58694f9359 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/big1.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/big2.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/big2.png new file mode 100644 index 0000000000..bec4fd67ae Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/big2.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/meta.json new file mode 100644 index 0000000000..853152af1e --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "by vladimir.s", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "big0" + }, + { + "name": "big1" + }, + { + "name": "big2" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium0.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium0.png new file mode 100644 index 0000000000..90c5900163 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium0.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium1.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium1.png new file mode 100644 index 0000000000..259cba324c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium1.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium2.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium2.png new file mode 100644 index 0000000000..17a164ad82 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium2.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium3.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium3.png new file mode 100644 index 0000000000..168690e594 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium3.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium4.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium4.png new file mode 100644 index 0000000000..42f9ab511a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium4.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/meta.json new file mode 100644 index 0000000000..185872767d --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "by vladimir.s", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "medium0" + }, + { + "name": "medium1" + }, + { + "name": "medium2" + }, + { + "name": "medium3" + }, + { + "name": "medium4" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_shard.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_shard.rsi/meta.json new file mode 100644 index 0000000000..5b8440bbb2 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_shard.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "by vladimir.s", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "shard0" + }, + { + "name": "shard1" + }, + { + "name": "shard2" + }, + { + "name": "shard3" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_shard.rsi/shard0.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_shard.rsi/shard0.png new file mode 100644 index 0000000000..f3b5d4adaf Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_shard.rsi/shard0.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_shard.rsi/shard1.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_shard.rsi/shard1.png new file mode 100644 index 0000000000..b6da0de4ce Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_shard.rsi/shard1.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_shard.rsi/shard2.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_shard.rsi/shard2.png new file mode 100644 index 0000000000..6ec3472c7b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_shard.rsi/shard2.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_shard.rsi/shard3.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_shard.rsi/shard3.png new file mode 100644 index 0000000000..ab20a8a456 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_shard.rsi/shard3.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/meta.json new file mode 100644 index 0000000000..1c39c69adc --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "by vladimir.s", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "small0" + }, + { + "name": "small1" + }, + { + "name": "small2" + }, + { + "name": "small3" + }, + { + "name": "small4" + }, + { + "name": "small5" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small0.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small0.png new file mode 100644 index 0000000000..797a9dc59d Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small0.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small1.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small1.png new file mode 100644 index 0000000000..c04e03af78 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small1.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small2.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small2.png new file mode 100644 index 0000000000..8a52f4d0c6 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small2.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small3.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small3.png new file mode 100644 index 0000000000..760c4af104 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small3.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small4.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small4.png new file mode 100644 index 0000000000..5de43ed95d Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small4.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small5.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small5.png new file mode 100644 index 0000000000..b71e1cd021 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small5.png differ diff --git a/Resources/Textures/_CP14/Structures/crystal.rsi/big.png b/Resources/Textures/_CP14/Structures/crystal.rsi/big.png deleted file mode 100644 index 91bbe51fb3..0000000000 Binary files a/Resources/Textures/_CP14/Structures/crystal.rsi/big.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/crystal.rsi/big_R.png b/Resources/Textures/_CP14/Structures/crystal.rsi/big_R.png deleted file mode 100644 index e4aab1891d..0000000000 Binary files a/Resources/Textures/_CP14/Structures/crystal.rsi/big_R.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/crystal.rsi/medium.png b/Resources/Textures/_CP14/Structures/crystal.rsi/medium.png deleted file mode 100644 index c7614278c6..0000000000 Binary files a/Resources/Textures/_CP14/Structures/crystal.rsi/medium.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/crystal.rsi/medium_R.png b/Resources/Textures/_CP14/Structures/crystal.rsi/medium_R.png deleted file mode 100644 index 31edb77ef6..0000000000 Binary files a/Resources/Textures/_CP14/Structures/crystal.rsi/medium_R.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/crystal.rsi/meta.json b/Resources/Textures/_CP14/Structures/crystal.rsi/meta.json deleted file mode 100644 index effa94642e..0000000000 --- a/Resources/Textures/_CP14/Structures/crystal.rsi/meta.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "by malanisa (discord)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "big" - }, - { - "name": "medium" - }, - { - "name": "small" - }, - { - "name": "big_R" - }, - { - "name": "medium_R" - }, - { - "name": "small_R" - }, - { - "name": "shard" - }, - { - "name": "shard2" - }, - { - "name": "shard3" - }, - { - "name": "shard4" - } - ] -} diff --git a/Resources/Textures/_CP14/Structures/crystal.rsi/shard.png b/Resources/Textures/_CP14/Structures/crystal.rsi/shard.png deleted file mode 100644 index 8472dc5d82..0000000000 Binary files a/Resources/Textures/_CP14/Structures/crystal.rsi/shard.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/crystal.rsi/shard2.png b/Resources/Textures/_CP14/Structures/crystal.rsi/shard2.png deleted file mode 100644 index ec69c6d2ae..0000000000 Binary files a/Resources/Textures/_CP14/Structures/crystal.rsi/shard2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/crystal.rsi/shard3.png b/Resources/Textures/_CP14/Structures/crystal.rsi/shard3.png deleted file mode 100644 index d81d12c97b..0000000000 Binary files a/Resources/Textures/_CP14/Structures/crystal.rsi/shard3.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/crystal.rsi/shard4.png b/Resources/Textures/_CP14/Structures/crystal.rsi/shard4.png deleted file mode 100644 index e6f12b26a0..0000000000 Binary files a/Resources/Textures/_CP14/Structures/crystal.rsi/shard4.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/crystal.rsi/small.png b/Resources/Textures/_CP14/Structures/crystal.rsi/small.png deleted file mode 100644 index 47ed9451b5..0000000000 Binary files a/Resources/Textures/_CP14/Structures/crystal.rsi/small.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Structures/crystal.rsi/small_R.png b/Resources/Textures/_CP14/Structures/crystal.rsi/small_R.png deleted file mode 100644 index 486b32659d..0000000000 Binary files a/Resources/Textures/_CP14/Structures/crystal.rsi/small_R.png and /dev/null differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 3b8d24e655..7990532420 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -215,10 +215,28 @@ CP14PlateIron: CP14Plate CP14BaseLightHammer: CP14ModularIronHammer CP14BaseBattleHammer: CP14ModularIronHammer +#2025-28-01 +CP14CrystalRubiesSmall: CP14CrystalElementalFireSmall +CP14CrystalRubiesMedium: CP14CrystalElementalFireMedium +CP14CrystalRubiesBig: CP14CrystalElementalFireBig +CP14CrystalTopazesSmall: CP14CrystalElementalElectricSmall +CP14CrystalTopazesMedium: CP14CrystalElementalElectricMedium +CP14CrystalTopazesBig: CP14CrystalElementalElectricBig +CP14CrystalEmeraldsSmall: CP14CrystalElementalHealingSmall +CP14CrystalEmeraldsMedium: CP14CrystalElementalHealingMedium +CP14CrystalEmeraldsBig: CP14CrystalElementalHealingBig +CP14CrystalSapphiresSmall: CP14CrystalElementalWaterSmall +CP14CrystalSapphiresMedium: CP14CrystalElementalWaterMedium +CP14CrystalSapphiresBig: CP14CrystalElementalWaterBig +CP14CrystalAmethystsSmall: CP14CrystalElementalDarknessSmall +CP14CrystalAmethystsMedium: CP14CrystalElementalDarknessMedium +CP14CrystalAmethystsBig: CP14CrystalElementalDarknessBig +CP14CrystalDiamondsSmall: CP14CrystalElementalLightSmall +CP14CrystalDiamondsMedium: CP14CrystalElementalLightMedium +CP14CrystalDiamondsBig: CP14CrystalElementalLightBig - - - +CP14QuartzCrystal: null +CP14QuartzShard: null # <---> CrystallEdge migration zone end