]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Rock Anom effects (#23633)
authorbrainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Sun, 7 Jan 2024 06:44:04 +0000 (06:44 +0000)
committerGitHub <noreply@github.com>
Sun, 7 Jan 2024 06:44:04 +0000 (23:44 -0700)
* Rock Anom effects

* fix

* fix

14 files changed:
Resources/Prototypes/Entities/Effects/mobspawn.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Effects/wallspawn.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Markers/Spawners/Random/asteroidcrab.yml
Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
Resources/Prototypes/Entities/Structures/Decoration/crystals.yml
Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
Resources/Prototypes/ore.yml
Resources/Textures/Effects/mobspawn.rsi/crab_iron.png [new file with mode: 0644]
Resources/Textures/Effects/mobspawn.rsi/crab_quartz.png [new file with mode: 0644]
Resources/Textures/Effects/mobspawn.rsi/crab_silver.png [new file with mode: 0644]
Resources/Textures/Effects/mobspawn.rsi/crab_uranium.png [new file with mode: 0644]
Resources/Textures/Effects/mobspawn.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Effects/rockspawn.rsi/asteroid.png [new file with mode: 0644]
Resources/Textures/Effects/rockspawn.rsi/meta.json [new file with mode: 0644]

diff --git a/Resources/Prototypes/Entities/Effects/mobspawn.yml b/Resources/Prototypes/Entities/Effects/mobspawn.yml
new file mode 100644 (file)
index 0000000..c82adc7
--- /dev/null
@@ -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 (file)
index 0000000..2010b8e
--- /dev/null
@@ -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
index 190ee079e46d199ade8879115fdbbbe76b1c36d7..4c4b969335451bacc399ede8784b23f3513f0af9 100644 (file)
         - 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
index b794d5a4f91f3168c3a20baa9707785ff4dd3d99..214a19adff513e133d23e2408a72870d5dcf8893 100644 (file)
       sprite: Mobs/Elemental/orecrab.rsi
   - type: RandomSpawner
     prototypes:
-      - MobUraniumCrab
-      - MobIronCrab
-      - MobQuartzCrab
-      - MobSilverCrab
+      - MobSpawnCrabUranium
+      - MobSpawnCrabIron
+      - MobSpawnCrabQuartz
+      - MobSpawnCrabSilver
 
 - type: entity
   name: luminous person spawner
index 9bee6a0d4d88efe6583d5c9afabe53d29aea9a3e..c1a01c423b1e4d772675c0253eeb481fd60b524a 100644 (file)
@@ -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" ]
       thresholds:
         - trigger:
             !type:DamageTrigger
-            damage: 50
+            damage: 20
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
       thresholds:
         - trigger:
             !type:DamageTrigger
-            damage: 50
+            damage: 20
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
       thresholds:
         - trigger:
             !type:DamageTrigger
-            damage: 50
+            damage: 20
           behaviors:
             - !type:PlaySoundBehavior
               sound:
index 8ac5fb03e3c55d0e029cd08383b86ccacf1ad69e..fdda7ea0a4ad96b6629713d860594d4151ec46ed 100644 (file)
     maxSpawnAmount: 50
     spawnRange: 10
     spawns:
-    - AsteroidRock
-    - AsteroidCrabSpawner
+    - WallSpawnAsteroid
+    - RockAnomCrabSpawner
     - CrystalSpawner
     superCriticalSpawns:
-    - AsteroidRock
+    - WallSpawnAsteroid
     - SpawnMobOreCrab
 
 - type: entity
index c4c81e99cb871ace5460143934988d1004646e3d..19a1c4f765294ea7a77da6edbddf4be475b1688e 100644 (file)
 
 - 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 (file)
index 0000000..d450638
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 (file)
index 0000000..f8f4114
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 (file)
index 0000000..236d1fa
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 (file)
index 0000000..799c0fa
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 (file)
index 0000000..720bc8a
--- /dev/null
@@ -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 (file)
index 0000000..44a5f3e
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 (file)
index 0000000..6a2c5f6
--- /dev/null
@@ -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
+                ]
+            ]
+        }
+    ]
+}