Balloons now float and slide smoothly. (#41102)

* The balloons became airy

* Attributions + Sound

* Add BaseBalloon

* Proto fixes

---------

Co-authored-by: ReWAFFlution <239567049+brokendot@users.noreply.github.com>

diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml
index efac498a3bd5a8a24d669b2fb6ba8656c4f4a27b..c7b55bf39ef4091622c058c5f7bd8f90a53a2c24 100644 (file)
--- a/Resources/Audio/Effects/attributions.yml
+++ b/Resources/Audio/Effects/attributions.yml
@@ -261,3 +261,8 @@
   copyright: 'created by Tao7891; perryprog (GitHub) downmixed to mono'
   license: CC0-1.0
   source: https://github.com/space-wizards/space-station-14/pull/37363
+
+- files: ["balloon_hits.ogg"]
+  copyright: "by brokendot(github)"
+  license: "CC0-1.0"
+  source: https://github.com/space-wizards/space-station-14/pull/41102

diff --git a/Resources/Audio/Effects/balloon_hits.ogg b/Resources/Audio/Effects/balloon_hits.ogg
new file mode 100644 (file)
index 0000000..a94da00
Binary files /dev/null and b/Resources/Audio/Effects/balloon_hits.ogg differ

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 5e6f64a50f719d34dd205cffb0d99c69b81635a5..e56a431f752b94f1b59b0a1a3a410340cdd1946f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -386,6 +386,69 @@
     sprite: Objects/Fun/Foam/foam_blade.rsi
   - type: UseDelay
 
+# Balloons
+
+- type: entity
+  parent: BaseItem
+  id: BaseBalloon
+  abstract: true
+  components:
+  - type: Sprite
+    noRot: true
+  - type: Item
+    size: Small
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Effects/balloon_hits.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Effects/balloon_hits.ogg
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: TileFrictionModifier
+    modifier: 0.3
+  - type: Tag
+    tags:
+    - Balloon
+
+- type: entity
+  parent: BaseBalloon
+  id: BalloonSyn
+  name: syndie balloon
+  description: Handed out to the bravest souls who survived the "atomic twister" ride at Syndieland.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Balloons/syndicate.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Fun/Balloons/syndicate.rsi
+  - type: StaticPrice
+    price: 5000 # Entertainment.
+
+- type: entity
+  parent: BaseBalloon
+  id: BalloonNT
+  name: nanotrasen balloon
+  description: Specially designed to inflict maximum psychological damage to Syndicate operatives.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Balloons/nanotrasen.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Fun/Balloons/nanotrasen.rsi
+
+- type: entity
+  parent: BaseBalloon
+  id: BalloonCorgi
+  name: corgi balloon
+  description: Just like owning a real dog - but a lot floatier.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Balloons/corgi.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Fun/Balloons/corgi.rsi
+
 # MISC
 
 - type: entity
@@ -563,62 +626,6 @@
       - OnCollide
     targetUser: true
 
-- type: entity
-  parent: BaseItem
-  id: BalloonSyn
-  name: syndie balloon
-  description: Handed out to the bravest souls who survived the "atomic twister" ride at Syndieland.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/Balloons/syndicate.rsi
-    state: icon
-  - type: Item
-    size: Small
-    sprite: Objects/Fun/Balloons/syndicate.rsi
-  - type: Damageable
-    damageContainer: Inorganic
-  - type: Tag
-    tags:
-    - Balloon
-  - type: StaticPrice
-    price: 5000 # Entertainment.
-
-- type: entity
-  parent: BaseItem
-  id: BalloonNT
-  name: nanotrasen balloon
-  description: Specially designed to inflict maximum psychological damage to Syndicate operatives.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/Balloons/nanotrasen.rsi
-    state: icon
-  - type: Item
-    size: Small
-    sprite: Objects/Fun/Balloons/nanotrasen.rsi
-  - type: Damageable
-    damageContainer: Inorganic
-  - type: Tag
-    tags:
-    - Balloon
-
-- type: entity
-  parent: BaseItem
-  id: BalloonCorgi
-  name: corgi balloon
-  description: Just like owning a real dog - but a lot floatier.
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/Balloons/corgi.rsi
-    state: icon
-  - type: Item
-    size: Small
-    sprite: Objects/Fun/Balloons/corgi.rsi
-  - type: Damageable
-    damageContainer: Inorganic
-  - type: Tag
-    tags:
-    - Balloon
-
 - type: entity
   parent: BaseItem
   id: SingularityToy