From: brainfood1183 <113240905+brainfood1183@users.noreply.github.com> Date: Sun, 7 Jan 2024 06:44:04 +0000 (+0000) Subject: Rock Anom effects (#23633) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=bb294a7aa2464c4d051b020a02c47d0b497cf756;p=space-station-14.git Rock Anom effects (#23633) * Rock Anom effects * fix * fix --- diff --git a/Resources/Prototypes/Entities/Effects/mobspawn.yml b/Resources/Prototypes/Entities/Effects/mobspawn.yml new file mode 100644 index 0000000000..c82adc7ba0 --- /dev/null +++ b/Resources/Prototypes/Entities/Effects/mobspawn.yml @@ -0,0 +1,60 @@ +- type: entity + id: MobSpawnCrabQuartz + name: mobspawner quartzcrab + components: + - type: Transform + anchored: True + - type: InteractionOutline + - type: Physics + bodyType: Static + - type: Sprite + sprite: /Textures/Effects/mobspawn.rsi + state: crab_quartz + - type: Fixtures + fixtures: + portalFixture: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.48,0.25,0.48" + mask: + - FullTileMask + layer: + - WallLayer + hard: false + - type: TimedDespawn + lifetime: 2.1 + - type: SpawnOnDespawn + prototype: MobQuartzCrab + +- type: entity + id: MobSpawnCrabIron + parent: MobSpawnCrabQuartz + name: mobspawner ironcrab + components: + - type: Sprite + sprite: /Textures/Effects/mobspawn.rsi + state: crab_iron + - type: SpawnOnDespawn + prototype: MobIronCrab + +- type: entity + id: MobSpawnCrabSilver + parent: MobSpawnCrabQuartz + name: mobspawner silvercrab + components: + - type: Sprite + sprite: /Textures/Effects/mobspawn.rsi + state: crab_silver + - type: SpawnOnDespawn + prototype: MobSilverCrab + +- type: entity + id: MobSpawnCrabUranium + parent: MobSpawnCrabQuartz + name: mobspawner uraniumcrab + components: + - type: Sprite + sprite: /Textures/Effects/mobspawn.rsi + state: crab_uranium + - type: SpawnOnDespawn + prototype: MobUraniumCrab \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Effects/wallspawn.yml b/Resources/Prototypes/Entities/Effects/wallspawn.yml new file mode 100644 index 0000000000..2010b8e73e --- /dev/null +++ b/Resources/Prototypes/Entities/Effects/wallspawn.yml @@ -0,0 +1,40 @@ +- type: entity + id: WallSpawnAsteroid + components: + - type: Transform + anchored: True + - type: InteractionOutline + - type: Physics + bodyType: Static + - type: Sprite + sprite: /Textures/Effects/rockspawn.rsi + state: asteroid + - type: Fixtures + fixtures: + portalFixture: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.48,0.25,0.48" + mask: + - FullTileMask + layer: + - WallLayer + hard: false + - type: TimedDespawn + lifetime: 2.4 + - type: SpawnOnDespawn + prototype: AsteroidRock + +- type: entity + id: WallSpawnAsteroidCrab + parent: WallSpawnAsteroid + components: + - type: SpawnOnDespawn + prototype: AsteroidRockCrab + +- type: entity + id: WallSpawnAsteroidCrab1 + parent: WallSpawnAsteroid + components: + - type: SpawnOnDespawn + prototype: AsteroidRockCrab1 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/asteroidcrab.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/asteroidcrab.yml index 190ee079e4..4c4b969335 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/asteroidcrab.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/asteroidcrab.yml @@ -13,3 +13,19 @@ - AsteroidRockCrab - AsteroidRockCrab1 chance: 1 + +- type: entity + name: Rock Anom Crab Spawner + id: RockAnomCrabSpawner + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Structures/Walls/rock.rsi + state: rock_asteroid_ore + - type: RandomSpawner + prototypes: + - WallSpawnAsteroidCrab + - WallSpawnAsteroidCrab1 + chance: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml index b794d5a4f9..214a19adff 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml @@ -806,10 +806,10 @@ sprite: Mobs/Elemental/orecrab.rsi - type: RandomSpawner prototypes: - - MobUraniumCrab - - MobIronCrab - - MobQuartzCrab - - MobSilverCrab + - MobSpawnCrabUranium + - MobSpawnCrabIron + - MobSpawnCrabQuartz + - MobSpawnCrabSilver - type: entity name: luminous person spawner diff --git a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml index 9bee6a0d4d..c1a01c423b 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml @@ -44,7 +44,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 50 + damage: 20 behaviors: - !type:PlaySoundBehavior sound: @@ -72,7 +72,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 50 + damage: 20 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -99,7 +99,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 50 + damage: 20 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -127,7 +127,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 50 + damage: 20 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -155,7 +155,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 50 + damage: 20 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -183,7 +183,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 50 + damage: 20 behaviors: - !type:PlaySoundBehavior sound: diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml index 8ac5fb03e3..fdda7ea0a4 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml @@ -283,11 +283,11 @@ maxSpawnAmount: 50 spawnRange: 10 spawns: - - AsteroidRock - - AsteroidCrabSpawner + - WallSpawnAsteroid + - RockAnomCrabSpawner - CrystalSpawner superCriticalSpawns: - - AsteroidRock + - WallSpawnAsteroid - SpawnMobOreCrab - type: entity diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml index c4c81e99cb..19a1c4f765 100644 --- a/Resources/Prototypes/ore.yml +++ b/Resources/Prototypes/ore.yml @@ -42,19 +42,19 @@ - type: ore id: OreQuartzCrab - oreEntity: MobQuartzCrab + oreEntity: MobSpawnCrabQuartz - type: ore id: OreIronCrab - oreEntity: MobIronCrab + oreEntity: MobSpawnCrabIron - type: ore id: OreSilverCrab - oreEntity: MobSilverCrab + oreEntity: MobSpawnCrabSilver - type: ore id: OreUraniumCrab - oreEntity: MobUraniumCrab + oreEntity: MobSpawnCrabUranium - type: ore id: OreArtifactFragment diff --git a/Resources/Textures/Effects/mobspawn.rsi/crab_iron.png b/Resources/Textures/Effects/mobspawn.rsi/crab_iron.png new file mode 100644 index 0000000000..d450638e91 Binary files /dev/null and b/Resources/Textures/Effects/mobspawn.rsi/crab_iron.png differ diff --git a/Resources/Textures/Effects/mobspawn.rsi/crab_quartz.png b/Resources/Textures/Effects/mobspawn.rsi/crab_quartz.png new file mode 100644 index 0000000000..f8f4114d57 Binary files /dev/null and b/Resources/Textures/Effects/mobspawn.rsi/crab_quartz.png differ diff --git a/Resources/Textures/Effects/mobspawn.rsi/crab_silver.png b/Resources/Textures/Effects/mobspawn.rsi/crab_silver.png new file mode 100644 index 0000000000..236d1fa363 Binary files /dev/null and b/Resources/Textures/Effects/mobspawn.rsi/crab_silver.png differ diff --git a/Resources/Textures/Effects/mobspawn.rsi/crab_uranium.png b/Resources/Textures/Effects/mobspawn.rsi/crab_uranium.png new file mode 100644 index 0000000000..799c0fa5ea Binary files /dev/null and b/Resources/Textures/Effects/mobspawn.rsi/crab_uranium.png differ diff --git a/Resources/Textures/Effects/mobspawn.rsi/meta.json b/Resources/Textures/Effects/mobspawn.rsi/meta.json new file mode 100644 index 0000000000..720bc8a321 --- /dev/null +++ b/Resources/Textures/Effects/mobspawn.rsi/meta.json @@ -0,0 +1,67 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by brainfood1183 (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "crab_quartz", + "directions": 1, + "delays": [ + [ + 0.6, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "crab_silver", + "directions": 1, + "delays": [ + [ + 0.6, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "crab_uranium", + "directions": 1, + "delays": [ + [ + 0.6, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "crab_iron", + "directions": 1, + "delays": [ + [ + 0.6, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + } + ] +} diff --git a/Resources/Textures/Effects/rockspawn.rsi/asteroid.png b/Resources/Textures/Effects/rockspawn.rsi/asteroid.png new file mode 100644 index 0000000000..44a5f3e51a Binary files /dev/null and b/Resources/Textures/Effects/rockspawn.rsi/asteroid.png differ diff --git a/Resources/Textures/Effects/rockspawn.rsi/meta.json b/Resources/Textures/Effects/rockspawn.rsi/meta.json new file mode 100644 index 0000000000..6a2c5f6009 --- /dev/null +++ b/Resources/Textures/Effects/rockspawn.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by brainfood1183 (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "asteroid", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] +}