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.

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

Костюмчик и катана для мя! #516

Merged
merged 13 commits into from
Sep 24, 2024
12 changes: 12 additions & 0 deletions Resources/Locale/ru-RU/ADT/personalization.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,22 @@ ent-ADTClothingOuterCoatMaki = Пальто Хонкоматери
.desc = Пальто дарованное самой Хонкоматерью одному из её лучших клоунов несущих веру Хонка. Оно такое же вычурное, как и сами клоуны, а жёлтые элементы выполнены из чистого бананиума. От пальто исходит лёгкий запах кремового пирога.
.suffix = Именное, Maki_gg.

ent-ADTZoroKatana = легендарная катана
.desc = Катана легендарного фехтовальщика...
.suffix = Именное, Rip_Zoro.

ent-ADTClothingBeltZoroSheath = ножны легендарной катаны
.desc = Ножны для катаны величайшего фехтовальщика...
.suffix = Именное, Rip_Zoro.

ent-ADTUrogCrowbarGold = Золотой лом Урог-Джаха
.desc = На ломе гравировка "Пиши заявку, сука!!!"
.suffix = { "Именное, Vladylya" }

ent-ADTOwlScimitar = Совиный клинок
.desc = Увесистый клинок, схожий со скимитарами давно ушедшей эпохи, с выжженой на рукояти совой. Побит временем, но всё так же рвётся в бой.
.suffix = Именное, Filo

ent-ADTClothingZoroJumpsuit = легендарный деловой костюм
.desc = Легендарный, поношенный костюм. Весь белый с позолотой. От него пахнет ванилью...
.suffix = Именное, Rip_Zoro.
Original file line number Diff line number Diff line change
Expand Up @@ -396,13 +396,13 @@
- type: Clothing
sprite: ADT/Personalization/bolper_gloves.rsi
- type: Insulated
- type: Armor
- type: Armor
modifiers:
coefficients:
Blunt: 0.95
Slash: 0.95
Piercing: 0.95
Heat: 0.95
Heat: 0.95

#Pangaari
- type: entity
Expand Down Expand Up @@ -432,6 +432,54 @@
- type: Item
size: Normal

- type: entity
parent: [ClothingBeltBase, ClothingSlotBase]
id: ADTClothingBeltZoroSheath
suffix: Rip_Zoro
name: The scabbard of the legendary katana
description: The scabbard of a legendary swordsman...
components:
- type: Sprite
sprite: ADT/Personalization/rip_zoro_sheats.rsi
state: sheath
- type: Clothing
sprite: ADT/Personalization/rip_zoro_sheats.rsi
quickEquip: false
slots:
- belt
- type: Item
size: Ginormous
- type: ItemSlots
slots:
item:
name: Katana
insertVerbText: sheath-insert-verb
ejectVerbText: sheath-eject-verb
insertSound: /Audio/Items/sheath.ogg
ejectSound: /Audio/Items/unsheath.ogg
whitelist:
tags:
- Katana
- type: ItemMapper
mapLayers:
sheath-sabre:
whitelist:
tags:
- Katana
- type: Appearance

- type: entity
parent: ClothingUniformBase
id: ADTClothingZoroJumpsuit
Copy link
Contributor

Choose a reason for hiding this comment

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

Uniform в id

suffix: Rip_Zoro
name: The legendary business suit
description: A legendary, worn-out suit. All white and gilded. He smells like vanilla...
components:
- type: Sprite
sprite: ADT/Personalization/rip_zoro_jumpsuit.rsi
- type: Clothing
sprite: ADT/Personalization/rip_zoro_jumpsuit.rsi

#PushnoY
- type: entity
parent: ClothingHandsButcherable
Expand Down Expand Up @@ -464,4 +512,4 @@
- type: Sprite
sprite: ADT/Personalization/maki_coat.rsi
- type: Clothing
sprite: ADT/Personalization/maki_coat.rsi
sprite: ADT/Personalization/maki_coat.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -951,6 +951,28 @@
- Katana
- type: DisarmMalus

#Rip_Zoro
- type: entity
name: The legendary katana
parent: BaseSword
id: ADTZoroKatana
description: The katana of a great swordsman...
suffix: Rip_Zoro
components:
- type: Sprite
sprite: ADT/Personalization/rip_zoro_katana.rsi
- type: MeleeWeapon
attackRate: 1.5
damage:
types:
Slash: 17
Copy link
Contributor

Choose a reason for hiding this comment

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

Ахерел, больше чем у меня дамаг

Copy link
Contributor Author

Choose a reason for hiding this comment

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

а чо...

Copy link
Contributor

Choose a reason for hiding this comment

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

Пон?

soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: Item
sprite: ADT/Personalization/rip_zoro_katana.rsi
- type: Tag
tags:
- Katana

# dedurog / Урог-Джаха
- type: entity
Expand Down
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by boctonskuitea(Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by boctonskuitea(Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by boctonskuitea(Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "equipped-BELT",
"directions": 4
},
{
"name": "sheath-sabre-equipped-BELT",
"directions": 4
},
{
"name": "sheath-sabre"
},
{
"name": "sheath"
}
]
}
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