Crystal/ punk-update (#129)

* Crystalpunk-update * Crystalpunk-update * Update Resources/Prototypes/_CP14/SoundCollections/hit_impacts.yml Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> * Update Resources/Prototypes/_CP14/Entities/Structures/crystal.yml Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> * Update Resources/Prototypes/_CP14/Entities/Structures/crystal.yml Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> * clean up * Update crystal.yml --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Ed <edwardxperia2000@gmail.com>
2024-05-04 13:39:32 +03:00
parent 1d233226bb
commit ba009f34fa
7 changed files with 288 additions and 35 deletions
--- a/Resources/Audio/_CP14/Effects/crystal_ding.ogg
+++ b/Resources/Audio/_CP14/Effects/crystal_ding.ogg
--- a/Resources/Audio/_CP14/Effects/crystal_ding2.ogg
+++ b/Resources/Audio/_CP14/Effects/crystal_ding2.ogg
--- a/Resources/Audio/_CP14/Effects/crystal_shatter.ogg
+++ b/Resources/Audio/_CP14/Effects/crystal_shatter.ogg
--- a/Resources/Locale/en-US/_CP14/_PROTO/popup.ftl
+++ b/Resources/Locale/en-US/_CP14/_PROTO/popup.ftl
@@ -0,0 +1,3 @@
+# Crystal
+
+popup-cp14crystal-ding = *ding*
--- a/Resources/Locale/ru-RU/_CP14/_PROTO/popup.ftl
+++ b/Resources/Locale/ru-RU/_CP14/_PROTO/popup.ftl
@@ -0,0 +1,3 @@
+# Crystal
+
+popup-cp14crystal-ding = *дзынь*
--- a/Resources/Prototypes/_CP14/Entities/Structures/crystal.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/crystal.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: CP14CrystalBase
  abstract: true
-  parent: BaseStructure
+  parent: BaseRock
  components:
  - type: Sprite
    drawdepth: Mobs
@@ -9,14 +9,22 @@
    offset: 0, 0.25
    layers:
      - state: big
-        map: ["random"]
        shader: unshaded
-    noRot: true
-  - type: Physics
-    bodyType: Static
+    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:
@@ -33,7 +41,7 @@
      fix1:
        shape:
          !type:PhysShapeCircle
-          radius: 0.45
+          radius: 0.30
        density: 60
        mask:
          - MachineMask
@@ -42,78 +50,311 @@
          - LowImpassable
          - BulletImpassable
          - Opaque
-  - type: RandomSprite
-    available:
-    - random:
-        big: Inherit
-        medium: Inherit
-        small: Inherit
+  
  - type: PointLight
    radius: 2
    energy: 2

 - type: entity
-  id: CP14CrystalRubies
+  id: CP14CrystalRubiesSmall
  parent: CP14CrystalBase
  name: sparkling rubies
+  suffix: Small
  description: wawa
  components:
-  - type: RandomSprite
-    cP14InheritBaseColor: "#ff3d0b"
  - type: PointLight
    color: "#ff3d0b"
+    radius: 1.5
+    energy: 2
+  - type: Sprite
+    sprite: _CP14/Structures/crystal.rsi
+    layers:
+     - state: small
+    color: "#ff3d0b"

 - type: entity
-  id: CP14CrystalTopazes
+  id: CP14CrystalRubiesMedium
  parent: CP14CrystalBase
-  name: sparkling topazes
+  name: sparkling rubies
+  suffix: Medium
  description: wawa
  components:
-  - type: RandomSprite
-    cP14InheritBaseColor: "#ffe269"
  - 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
+  name: sparkling rubies
+  suffix: Big
+  description: wawa
+  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
+  name: sparkling topazes
+  suffix: Small
+  description: wawa
+  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: CP14CrystalEmeralds
+  id: CP14CrystalTopazesMedium
  parent: CP14CrystalBase
-  name: sparkling emeralds
+  name: sparkling topazes
+  suffix: Medium
  description: wawa
  components:
-  - type: RandomSprite
-    cP14InheritBaseColor: "#30be81"
  - 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
+  name: sparkling topazes
+  description: wawa
+  suffix: 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
+  name: sparkling emeralds
+  suffix: Small
+  description: wawa
+  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: CP14CrystalSapphires
+  id: CP14CrystalEmeraldsMedium
  parent: CP14CrystalBase
-  name: sparkling sapphires
+  name: sparkling emeralds
+  suffix: Medium
  description: wawa
  components:
-  - type: RandomSprite
-    cP14InheritBaseColor: "#5eabeb"
  - 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
+  name: sparkling emeralds
+  description: wawa
+  suffix: 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
+  name: sparkling sapphires
+  suffix: Small
+  description: wawa
+  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: CP14CrystalAmethysts
+  id: CP14CrystalSapphiresMedium
  parent: CP14CrystalBase
-  name: sparkling amethysts
+  name: sparkling sapphires
+  suffix: Medium
  description: wawa
  components:
-  - type: RandomSprite
-    cP14InheritBaseColor: "#a878d1"
  - 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
+  name: sparkling sapphires
+  suffix: Big
+  description: wawa
+  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
+  name: sparkling amethysts
+  suffix: Small
+  description: wawa
+  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: CP14CrystalDiamonds
+  id: CP14CrystalAmethystsMedium
+  parent: CP14CrystalBase
+  name: sparkling amethysts
+  suffix: Medium
+  description: wawa
+  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
+  name: sparkling amethysts
+  suffix: Big
+  description: wawa
+  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
  name: sparkling diamonds
  description: wawa
+  suffix: Small
  components:
-  - type: RandomSprite
-    cP14InheritBaseColor: "#f8f8f8"
  - type: PointLight
-    color: "#f8f8f8"
+    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
+  name: sparkling diamonds
+  suffix: Medium
+  description: wawa
+  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
+  name: sparkling diamonds
+  suffix: Big
+  description: wawa
+  components:
+  - type: PointLight
+    color: "#f8f8f8"
+  - type: Sprite
+    sprite: _CP14/Structures/crystal.rsi
+    layers:
+     - state: big
+    color: "#f8f8f8"
--- a/Resources/Prototypes/_CP14/SoundCollections/hit_impacts.yml
+++ b/Resources/Prototypes/_CP14/SoundCollections/hit_impacts.yml
@@ -0,0 +1,6 @@
+
+- type: soundCollection
+  id: CP14CrystalDings
+  files:
+  - /Audio/_CP14/Effects/crystal_ding.ogg
+  - /Audio/_CP14/Effects/crystal_ding2.ogg