-
Notifications
You must be signed in to change notification settings - Fork 55
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.
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
Перенесы слизне-котики, а также добавлены именные вещи Syrel #515
Merged
Inconnu1337
merged 15 commits into
AdventureTimeSS14:master
from
Inconnu1337:ADTSlugCat
Sep 25, 2024
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
8d0255d
Добавлены Слизне-Котики
Inconnu1337 b68c64f
Добавлены именные вещи Syrel, допилен слизне-кот
Inconnu1337 6edb000
Исправлен перевод
Inconnu1337 4a22749
на всякий
Inconnu1337 9425ab4
Merge branch 'master' into ADTSlugCat
Inconnu1337 3738289
Update slugcat.ftl
Inconnu1337 a477a29
Merge branch 'master' into ADTSlugCat
Inconnu1337 75325dd
Фикс чехла для топора
Inconnu1337 364ffb5
перенос в другие папочки
Inconnu1337 48edaab
Merge branch 'master' into ADTSlugCat
Schrodinger71 c34c403
хм
Schrodinger71 bd2081a
Merge branch 'ADTSlugCat' of https://github.com/Inconnu1337/space_sta…
Schrodinger71 84c6583
Update personalization.ftl
Inconnu1337 8903fcb
add axe sheath
Inconnu1337 65f854f
Merge branch 'ADTSlugCat' of https://github.com/Inconnu1337/space_sta…
Inconnu1337 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
В целом всё ок, но у тебя слизне-коты разного цвета, наверн можно было бы и имя каждому прописать, красный, синий, зелёный и т.д.
крит. ошибок не заметил