Skip to content

Commit

Permalink
Перенесы слизне-котики, а также добавлены именные вещи Syrel (#515)
Browse files Browse the repository at this point in the history
## Описание PR
<!-- Что вы изменили в этом пулл реквесте? -->
Перенесы слизне-котики со старой сборки и улучшены по заказу
sadboiiiiiiiiiiiiiiiiiiiii
Добавлен именной боевой топор и чехол для него [Syrel]
## Почему / Баланс
<!-- Почему оно было изменено? Ссылайтесь на любые обсуждения или
вопросы здесь. Пожалуйста, обсудите, как это повлияет на игровой баланс.
-->
-
[Заказы-разработка](https://discord.com/channels/901772674865455115/1286745987796439050)
- [Перенос
контента](AdventureTimeSS14/space_station#688)

## Медиа
<!--
Пулл реквесты, которые вносят внутриигровые изменения (добавление
одежды, предметов, новых возможностей и т.д.), должны содержать медиа,
демонстрирующие изменения.
Небольшие исправления/рефакторы не требуют медиа.

Если Вы не уверены в том, что Ваш пулл реквест требует медиа, спросите
мейнтейнера.
-->
![2024-9-23_04 54
15](https://github.com/user-attachments/assets/5b53ca86-ced0-48bc-a8eb-a6fae813e9fa)
![2024-9-23_04 55
44](https://github.com/user-attachments/assets/a8c91bfb-0d71-4280-bdae-ac7411f9ab02)
## Требования
<!--
В связи с наплывом ПР'ов нам необходимо убедиться, что ПР'ы следуют
правильным рекомендациям.

Пожалуйста, уделите время прочтению, если делаете пулл реквест (ПР)
впервые.

Отметьте поля ниже, чтобы подтвердить, что Вы действительно видели их
(поставьте X в скобках, например [X]):
-->
- [x] Я прочитал(а) и следую [Руководство по созданию пулл
реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению
мейнтейнера.
- [x] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие
его изменения в игре, **или** этот пулл реквест не требует демонстрации
в игре

**Чейнджлог**
<!--
Здесь Вы можете заполнить журнал изменений, который будет автоматически
добавлен в игру при мердже Вашего пулл реквест.

Чтобы игроки узнали о новых возможностях и изменениях, которые могут
повлиять на их игру, добавьте запись в журнал изменений.

Не считайте суффикс типа записи (например, add) "частью" предложения:
плохо: - add: новый инструмент для инженеров
хорошо: - add: добавлен новый инструмент для инженеров

Помещение имени после символа 🆑 изменит имя, которое будет
отображаться в журнале изменений (в противном случае будет
использоваться ваше имя пользователя GitHub).
Например: 🆑 AruMoon
-->

🆑 Inconnu
- add: Добавлены слизне-котики. Мяу~

---------

Co-authored-by: Schrödinger <[email protected]>
Co-authored-by: Schrodinger71 <[email protected]>
  • Loading branch information
3 people authored Sep 25, 2024
1 parent 06834f7 commit b066863
Show file tree
Hide file tree
Showing 41 changed files with 457 additions and 0 deletions.
8 changes: 8 additions & 0 deletions Resources/Locale/ru-RU/ADT/personalization.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,14 @@ ent-ADTClothingNeckRipZoroMantle = Таинственная наплечная
.desc = Мантия, хранящая тайну...
.suffix = Именное, Rip_Zoro
ent-ADTSyrelBattleAxe = боевой топор капитана
.desc = Церемониальное оружие Вазеи-Амусса полученное по наследству. Надпись на рукояти не читаема, но точно ясно что она написана на языке Синта’Унати.
.suffix = { "Именное, Syrel" }
ent-ADTSyrelClothingBeltSheath = чехол боевого топора
.desc = Прочный кожанный чехол для боевого топора капитана.
.suffix = { "Именное, Syrel" }
ent-ADTClothingHandsPushnoYGloves = Беспалые кожаные перчатки
.desc = Перчатки без пальцев из прочной натуральной кожи, отлично сочетается с белой рубашкой и аквамариновой жилеткой.
.suffix = Именное, PushnoY.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
ent-ADTMobSlugCatCreek = слизне-кот
.desc = Удивительное существо, похожее одновременно на кота и слизня. Но это не слизень, если приглядеться можно понять что у него просто очень скользкая кожа. Очень ловкие и умные.
ent-ADTMobSlugCatHoly = { ent-ADTMobSlugCatCreek }
.desc = { ent-ADTMobSlugCatCreek.desc }
ent-ADTMobSlugCatMonk = { ent-ADTMobSlugCatCreek }
.desc = { ent-ADTMobSlugCatCreek.desc }
ent-ADTMobSlugCatSpearMaster = { ent-ADTMobSlugCatCreek }
.desc = { ent-ADTMobSlugCatCreek.desc }
ent-ADTMobSlugCatTechnician = { ent-ADTMobSlugCatCreek }
.desc = { ent-ADTMobSlugCatCreek.desc }
ent-ADTMobSlugCatSonfariel = { ent-ADTMobSlugCatCreek }
.desc = { ent-ADTMobSlugCatCreek.desc }
188 changes: 188 additions & 0 deletions Resources/Prototypes/ADT/Entities/Mobs/NPCs/slugcat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
- type: entity
name: Slug Cat
parent: SimpleMobBase
id: ADTMobSlugCatCreek
description: An amazing creature that looks like a cat and a slug at the same time. But it's not a slug, if you look closely you'll realize it just has very slippery skin. Very agile and clever.
components:
- type: Sprite
drawdepth: SmallMobs
sprite: ADT/Mobs/slug-cat.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: creek
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.35
density: 15
mask:
- SmallMobMask
layer:
- SmallMobLayer
- type: Tag
tags:
- DoorBumpOpener
- type: Appearance
- type: DamageStateVisuals
states:
Alive:
Base: creek
Critical:
Base: dead-creek
Dead:
Base: dead-creek
- type: Butcherable
spawned:
- id: FoodMeat
amount: 2
- type: InteractionPopup
successChance: 0.8
interactSuccessString: petting-success-cat
interactFailureString: petting-failure-generic
interactSuccessSpawn: EffectHearts
interactSuccessSound:
path: /Audio/Animals/cat_meow.ogg
interactFailureSound:
path: /Audio/Animals/cat_hiss.ogg
- type: Grammar
attributes:
gender: epicene
- type: MobPrice
price: 10000
- type: NpcFactionMember
factions:
- Passive
- type: MobThresholds
thresholds:
0: Alive
50: Critical
100: Dead
- type: Inventory
templateId: ADTSlugCat
- type: Body
prototype: Human
- type: Hands
showInHands: false
- type: Input
context: "human"
- type: Insulated
- type: InventorySlots
- type: Stripping
- type: Strippable
- type: ComplexInteraction
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
- type: StatusIcon
- type: InputMover
- type: MobMover
- type: Clickable
- type: MeleeWeapon
soundHit:
collection: AlienClaw
angle: 30
animation: WeaponArcClaw
damage:
types:
Slash: 0
- type: Muted
- type: NoSlip

- type: entity
name: Slug Cat
parent: ADTMobSlugCatCreek
id: ADTMobSlugCatHoly
description: cat
components:
- type: Sprite
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: holy
- type: DamageStateVisuals
states:
Alive:
Base: holy
Critical:
Base: dead-holy
Dead:
Base: dead-holy


- type: entity
name: Slug Cat
parent: ADTMobSlugCatCreek
id: ADTMobSlugCatMonk
description: cat
components:
- type: Sprite
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: monk
- type: DamageStateVisuals
states:
Alive:
Base: monk
Critical:
Base: dead-monk
Dead:
Base: dead-monk

- type: entity
name: Slug Cat
parent: ADTMobSlugCatCreek
id: ADTMobSlugCatSonfariel
description: cat
components:
- type: Sprite
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: sonfariel
- type: DamageStateVisuals
states:
Alive:
Base: sonfariel
Critical:
Base: dead-sonfariel
Dead:
Base: dead-sonfariel

- type: entity
name: Slug Cat
parent: ADTMobSlugCatCreek
id: ADTMobSlugCatSpearMaster
description: cat
components:
- type: Sprite
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: spear-master
- type: DamageStateVisuals
states:
Alive:
Base: spear-master
Critical:
Base: dead-spear-master
Dead:
Base: dead-spear-master

- type: entity
name: Slug Cat
parent: ADTMobSlugCatCreek
id: ADTMobSlugCatTechnician
description: cat
components:
- type: Sprite
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: technician
- type: DamageStateVisuals
states:
Alive:
Base: technician
Critical:
Base: dead-technician
Dead:
Base: dead-technician
Original file line number Diff line number Diff line change
Expand Up @@ -513,3 +513,36 @@
sprite: ADT/Personalization/maki_coat.rsi
- type: Clothing
sprite: ADT/Personalization/maki_coat.rsi

#Syrel
- type: entity
parent: [ClothingBeltBase, ClothingSlotBase, BaseCommandContraband]
id: ADTSyrelClothingBeltSheath
name: axe sheath
description: A sturdy leather sheath for the captain's battle axe.
components:
- type: Sprite
sprite: ADT/Personalization/syrel_sheath.rsi
state: sheath
- type: Clothing
sprite: ADT/Personalization/syrel_sheath.rsi
- type: Item
size: Ginormous
- type: ItemSlots
slots:
item:
name: Battle Axe
insertVerbText: sheath-insert-verb
ejectVerbText: sheath-eject-verb
insertSound: /Audio/Items/sheath.ogg
ejectSound: /Audio/Items/unsheath.ogg
whitelist:
tags:
- ADTSyrelBattleAxe
- type: ItemMapper
mapLayers:
sheath-sabre:
whitelist:
tags:
- ADTSyrelBattleAxe
- type: Appearance
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,32 @@
sprite: ADT/Personalization/toys.rsi
state: plushie_ayus

- type: entity
name: captain's battle axe
parent: [ BaseSword, BaseCommandContraband ]
id: ADTSyrelBattleAxe
description: A ceremonial weapon of Vazei-Amussa, inherited. The inscription on the hilt is illegible, but it is clearly written in the Sinta'Unathi language.
components:
- type: Sprite
sprite: ADT/Personalization/syrel_battleaxe.rsi
- type: MeleeWeapon
attackRate: 1.5
damage:
types:
Slash: 17 #cmon, it has to be at least BETTER than the rest.
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: Reflect
reflectProb: .1
spread: 90
- type: Item
sprite: ADT/Personalization/syrel_battleaxe.rsi
- type: Tag
tags:
- ADTSyrelBattleAxe
- type: DisarmMalus


# Pangaari
- type: entity
parent: BasePlushie
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
- type: inventoryTemplate
id: ADTSlugCat
slots:
- name: mask
slotTexture: mask
slotFlags: MASK
uiWindowPos: 1,0
strippingWindowPos: 1,1
displayName: Mask
whitelist:
tags:
- PetWearable

- name: suitstorage
slotTexture: suit_storage
slotFlags: SUITSTORAGE
slotGroup: SecondHotbar
stripTime: 3
uiWindowPos: 2,0
strippingWindowPos: 2,5
displayName: Suit Storage
whitelist:
components:
- GasTank

- name: back
slotTexture: back
slotFlags: BACK
slotGroup: SecondHotbar
stripTime: 6
uiWindowPos: 3,0
strippingWindowPos: 0,4
displayName: Back

- name: pocket1
slotTexture: pocket
fullTextureName: template_small
slotFlags: POCKET
slotGroup: MainHotbar
stripTime: 3
uiWindowPos: 0,3
strippingWindowPos: 0,4
displayName: Pocket 1
stripHidden: true


3 changes: 3 additions & 0 deletions Resources/Prototypes/ADT/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,6 @@

- type: Tag
id: ADTCardPlay

- type: Tag
id: ADTSyrelBattleAxe
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Mobs/slug-cat.rsi/holy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b066863

Please sign in to comment.