Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Добавление неко арка #471

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Добавление неко арка #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e089532
Добавление неко арка
daniloedc4 Sep 13, 2024
f3a57ee
Update toys.yml
1Stepka1 Sep 13, 2024
d8974e0
Исправление ошибки, кода, и добавление локализации
daniloedc4 Sep 13, 2024
114e310
исправил недоочет
daniloedc4 Sep 14, 2024
cb32b81
починка опять
daniloedc4 Sep 14, 2024
e705278
Merge branch 'master' into NekoArc
Bolper Sep 15, 2024
3168f52
Merge branch 'master' into NekoArc
Schrodinger71 Sep 15, 2024
1edaaa7
Merge branch 'master' into NekoArc
Darkiich Sep 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Resources/Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/bibibi.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/buubuu.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/china.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/jan.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/kavooo.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/nya.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/nya2.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/nya3.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Resources/Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/nyanya.ogg
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/toys.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ ent-ADTPlushieUrs = плюшевый Урс
.desc = Милая плюшевая игрушка Урса.
ent-ADTBlackSharkPlushie = черная плюшевая акула
.desc = Всего лишь от одного взгляда на неё вам становится не по себе, то ли от желания пожамкать её, то ли от страха.
ent-ADTPlushieNekoArc = плюшевая Неко Арк
.desc = Всего лишь от одного взгляда на неё у вас появляется желание пожамкать её.
24 changes: 24 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,27 @@
tags:
- PlushieSharkBlack
- Payload

- type: entity
parent: BasePlushie
id: ADTPlushieNekoArc
name: Neko Arc
components:
- type: Sprite
sprite: ADT/Objects/Fun/nekoArc.rsi
state: PlushieArc
- type: EmitSoundOnUse
sound:
collection: ADTArk
- type: EmitSoundOnLand
sound:
collection: ADTArk
- type: EmitSoundOnActivate
sound:
collection: ADTArk
- type: MeleeWeapon
wideAnimationRotation: 180
soundHit:
collection: ADTArk
- type: UseDelay
delay: 2.0
12 changes: 12 additions & 0 deletions Resources/Prototypes/ADT/SoundCollections/nekoarc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: soundCollection
id: ADTArk
files:
- /Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/bibibi.ogg
- /Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/buubuu.ogg
- /Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/china.ogg
- /Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/jan.ogg
- /Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/kavooo.ogg
- /Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/nya.ogg
- /Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/nya2.ogg
- /Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/nya3.ogg
- /Audio/ADT/Entities/Objects/Fun/Toys/NekoArc/nyanya.ogg
Binary file added Resources/Textures/ADT/Objects/Fun/nekoArc.rsi/PlushieArc.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions Resources/Textures/ADT/Objects/Fun/nekoArc.rsi/meta.json
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

У нас игрушки находятся по другому пути,а именно Resources/Textures/ADT/Objects/Fun/toys.rsi
Поэтому туда перенеси спрайт и фрагмент из меты

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created ADT team",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "PlushieArc"
}
]
}
Loading