-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Перенесы слизне-котики, а также добавлены именные вещи Syrel (#515)
## Описание 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
1 parent
06834f7
commit b066863
Showing
41 changed files
with
457 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/NPCs/slugcat.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
188
Resources/Prototypes/ADT/Entities/Mobs/NPCs/slugcat.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
Resources/Prototypes/ADT/InventoryTemplates/slugcat_inventory_template.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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.
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.
Oops, something went wrong.