diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_counter_spell.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_counter_spell.yml index 6fd4dc5a73..dca91d654e 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_counter_spell.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_counter_spell.yml @@ -26,6 +26,7 @@ - CP14MagicEnergyContainer itemIconStyle: BigAction interactOnMiss: false + range: 60 sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: @@ -33,7 +34,7 @@ state: counter_spell event: !type:CP14DelayedEntityTargetActionEvent cooldown: 10 - castDelay: 0.75 + castDelay: 0.25 breakOnMove: false - type: entity diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml index 6d6c560cba..b2db0dbd76 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -96,6 +96,92 @@ graph: CP14WallDirt node: WallDirt +- type: entity + id: CP14WallLeaf + parent: + - CP14BaseFlammableSpreading + - CP14BaseWall + name: leaf wall + description: Dense, marginal bushes. You can climb through them, but watch out for thorny branches! + components: + - type: Sprite + sprite: _CP14/Structures/Walls/Natural/leaf.rsi + - type: Icon + sprite: _CP14/Structures/Walls/Natural/leaf.rsi + - type: IconSmooth + key: CP14wallLeaf + base: wall + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: MeleeSound + soundGroups: + Brute: + collection: CP14GrassGathering + params: + variation: 0.05 + - type: Fixtures + fixtures: + fix1: + hard: false + shape: + !type:PhysShapeAabb + bounds: "-0.45,-0.45,0.45,0.45" + density: 1000 + mask: + - FullTileMask + layer: + - WallLayer + fix2: #For melee or laser + hard: true + shape: + !type:PhysShapeAabb + bounds: "-0.35,-0.35,0.35,0.35" + mask: + - FullTileMask + layer: + - Opaque + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: CP14GrassGathering + params: + volume: 5 + variation: 0.05 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + CP14FloraMaterial1: + min: 1 + max: 3 + - type: SpeedModifierContacts + walkSpeedModifier: 0.25 + sprintSpeedModifier: 0.25 + - type: EmitSoundOnTrigger + sound: + params: + volume: -8 + collection: CP14GrassGathering + - type: TriggerOnCollide + fixtureID: fix1 + - type: DamageContacts + damage: + types: + Slash: 0.2 + Piercing: 0.2 + - type: entity id: CP14WallSnow name: snow wall diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/full.png new file mode 100644 index 0000000000..86f9894f52 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/meta.json new file mode 100644 index 0000000000..4157403052 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 64 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by omsoyk (Discord)", + "states": [ + { + "name": "wall0", + "directions": 4 + }, + { + "name": "wall1", + "directions": 4 + }, + { + "name": "wall2", + "directions": 4 + }, + { + "name": "wall3", + "directions": 4 + }, + { + "name": "wall4", + "directions": 4 + }, + { + "name": "wall5", + "directions": 4 + }, + { + "name": "wall6", + "directions": 4 + }, + { + "name": "wall7", + "directions": 4 + }, + { + "name": "full" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall0.png b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall0.png new file mode 100644 index 0000000000..58b0b1490a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall1.png b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall1.png new file mode 100644 index 0000000000..66d9c4c782 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall2.png b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall2.png new file mode 100644 index 0000000000..44568f4459 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall3.png b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall3.png new file mode 100644 index 0000000000..bc58085305 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall4.png b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall4.png new file mode 100644 index 0000000000..d145c7ebc6 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall5.png b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall5.png new file mode 100644 index 0000000000..1e3954f460 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall6.png b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall6.png new file mode 100644 index 0000000000..950ca70d50 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall7.png b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall7.png new file mode 100644 index 0000000000..3fa20ae6bb Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/leaf.rsi/wall7.png differ