diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml index 8bb9ffe943..7432a014a4 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml @@ -84,4 +84,4 @@ tags: - CP14HerbalGathering components: - - Sharp \ No newline at end of file + - Sharp diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/wild.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/wild.yml index 33beec46d3..1b9c958580 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/wild.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/wild.yml @@ -14,7 +14,7 @@ name: blood rose description: Scarlet flowers growing where blood has been spilled. suffix: Gatherable - components: + components: - type: Sprite drawdepth: FloorTiles sprite: _CP14/Structures/Flora/Flowers/red_rose.rsi @@ -132,7 +132,7 @@ - type: Gatherable loot: All: CP14GatherWildSage - + # LumiMushroom - type: entityLootTable @@ -184,7 +184,7 @@ drawdepth: Mobs sprite: _CP14/Structures/crystal.rsi offset: 0, 0.25 - noRot: true + noRot: true layers: - state: big map: ["random"] @@ -204,6 +204,12 @@ collection: GlassSmash - type: Destructible thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] - trigger: !type:DamageTrigger damage: 20 @@ -218,6 +224,8 @@ CP14QuartzShard: min: 1 max: 3 + - !type:DoActsBehavior + acts: [ "Destruction" ] - type: RandomSprite available: - random: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/rocks.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/rocks.yml index 172e153cd5..38606ebeec 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/rocks.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/rocks.yml @@ -5,7 +5,7 @@ categories: [ ForkFiltered ] abstract: true placement: - mode: SnapgridCenter + mode: SnapgridCenter components: - type: Transform anchored: True @@ -55,10 +55,14 @@ thresholds: - trigger: !type:DamageTrigger - damage: 75 + damage: 150 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 75 + behaviors: - !type:PlaySoundBehavior sound: path: /Audio/Effects/break_stone.ogg @@ -69,6 +73,8 @@ CP14StoneBlock1: min: 2 max: 3 + - !type:DoActsBehavior + acts: [ "Destruction" ] - type: entity id: CP14RockBig @@ -102,10 +108,14 @@ thresholds: - trigger: !type:DamageTrigger - damage: 150 + damage: 300 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: - !type:PlaySoundBehavior sound: path: /Audio/Effects/break_stone.ogg @@ -115,4 +125,6 @@ spawn: CP14StoneBlock1: min: 5 - max: 8 \ No newline at end of file + max: 8 + - !type:DoActsBehavior + acts: [ "Destruction" ] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml index 4af315ef2f..5296df8dd2 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -17,10 +17,14 @@ thresholds: - trigger: !type:DamageTrigger - damage: 100 + damage: 350 behaviors: - !type:DoActsBehavior acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: - !type:PlaySoundBehavior sound: path: /Audio/Effects/break_stone.ogg @@ -31,6 +35,9 @@ CP14StoneBlock1: min: 2 max: 3 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: entity id: CP14WallStoneIndestructable @@ -65,10 +72,14 @@ thresholds: - trigger: !type:DamageTrigger - damage: 50 + damage: 150 behaviors: - !type:DoActsBehavior acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: - !type:PlaySoundBehavior sound: path: /Audio/Effects/break_stone.ogg #TODO @@ -79,6 +90,8 @@ CP14DirtBlock1: min: 2 max: 3 + - !type:DoActsBehavior + acts: ["Destruction"] - type: Construction graph: CP14WallDirt node: WallDirt @@ -97,10 +110,14 @@ thresholds: - trigger: !type:DamageTrigger - damage: 100 + damage: 250 behaviors: - !type:DoActsBehavior acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: - !type:PlaySoundBehavior sound: path: /Audio/Effects/break_stone.ogg @@ -111,6 +128,8 @@ CP14OreCopper: min: 1 max: 3 + - !type:DoActsBehavior + acts: ["Destruction"] - type: entity id: CP14WallStoneIronOre @@ -126,10 +145,14 @@ thresholds: - trigger: !type:DamageTrigger - damage: 100 + damage: 300 behaviors: - !type:DoActsBehavior acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: - !type:PlaySoundBehavior sound: path: /Audio/Effects/break_stone.ogg @@ -140,6 +163,8 @@ CP14OreIron: min: 1 max: 3 + - !type:DoActsBehavior + acts: ["Destruction"] - type: entity id: CP14WallStoneGoldOre @@ -155,10 +180,14 @@ thresholds: - trigger: !type:DamageTrigger - damage: 100 + damage: 300 behaviors: - !type:DoActsBehavior acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: - !type:PlaySoundBehavior sound: path: /Audio/Effects/break_stone.ogg @@ -169,12 +198,14 @@ CP14OreGold: min: 1 max: 3 + - !type:DoActsBehavior + acts: ["Destruction"] - type: IconSmooth base: wall # We dont have silver now -#- type: entity +#- type: entity # id: CP14WallStoneSilverOre # suffix: silver ore # parent: CP14WallStone @@ -206,4 +237,4 @@ # min: 2 # max: 3 # - type: IconSmooth -# base: wall \ No newline at end of file +# base: wall diff --git a/Resources/Prototypes/_CP14/Entities/Structures/crystal.yml b/Resources/Prototypes/_CP14/Entities/Structures/crystal.yml index 14cc19f25c..67c991b149 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/crystal.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/crystal.yml @@ -2,7 +2,7 @@ - type: entity id: CP14WallmountCrystalBase - parent: + parent: - CP14BaseWallmount abstract: true name: sparkling quartz @@ -23,18 +23,24 @@ thresholds: - trigger: !type:DamageTrigger - damage: 20 + damage: 80 + 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: 0 max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] - type: Fixtures fixtures: fix1: @@ -134,7 +140,7 @@ layers: - state: big shader: unshaded - noRot: true + noRot: true - type: InteractionPopup interactSuccessString: popup-cp14crystal-ding messagePerceivedByOthers: popup-cp14crystal-ding @@ -153,18 +159,24 @@ thresholds: - trigger: !type:DamageTrigger - damage: 20 + damage: 80 + 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: Fixtures fixtures: fix1: @@ -179,7 +191,7 @@ - LowImpassable - BulletImpassable - Opaque - + - type: PointLight radius: 2 energy: 2 @@ -212,7 +224,7 @@ sprite: _CP14/Structures/crystal.rsi layers: - state: medium - color: "#ff3d0b" + color: "#ff3d0b" - type: entity id: CP14CrystalRubiesBig @@ -257,7 +269,7 @@ sprite: _CP14/Structures/crystal.rsi layers: - state: medium - color: "#ffe269" + color: "#ffe269" - type: entity id: CP14CrystalTopazesBig @@ -302,7 +314,7 @@ sprite: _CP14/Structures/crystal.rsi layers: - state: medium - color: "#30be81" + color: "#30be81" - type: entity id: CP14CrystalEmeraldsBig @@ -347,7 +359,7 @@ sprite: _CP14/Structures/crystal.rsi layers: - state: medium - color: "#5eabeb" + color: "#5eabeb" - type: entity id: CP14CrystalSapphiresBig