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

добавление именных вещичек #377

Merged
merged 6 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 27 additions & 0 deletions Resources/Locale/ru-RU/ADT/personalization.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -283,3 +283,30 @@ ent-ADTClothingOuterBolperCoat = плащ Волпера
.desc = +5 процентов к крутости.
.suffix = Именное, Bolper.

ent-ADTBolperKatana = Катана Волпера
.desc = +5 процентов к урону.
.suffix = Именное, Bolper.

ent-ADTClothingShoesBolperBoots = Кроссовки Волпера
.desc = +5 процентов к скорости.
.suffix = Именное, Bolper.

ent-ADTClothingNeckBolperCloak = Плащ Волпера
.desc = +5 процентов к крутости.
.suffix = Именное, Bolper.

ent-ADTClothingUniformBolperJumpsuit = Костюм Волпера
.desc = +5 процентов к свежести.
.suffix = Именное, Bolper.

ent-ADTClothingBackBolperSheath = Ножны Волпера
.desc = Я готов к бойне.
.suffix = Именное, Bolper.

ent-ADTClothingUniformPangaariAmericanSleeveless = Американка без рукавов
.desc = Простой образ, состоящий из штанов и чёрной водолазки без рукавов.
.suffix = Именное, Pangaari.

ent-ADTClothingNeckRipZoroMantle = Таинственная наплечная мантия
.desc = Мантия, хранящая тайну...
.suffix = Именное, Rip_Zoro
Original file line number Diff line number Diff line change
Expand Up @@ -304,3 +304,110 @@
- type: ExplosionResistance
damageCoefficient: 0.9

- type: entity
parent: ClothingShoesBaseButcherable
id: ADTClothingShoesBolperBoots
suffix: Bolper
name: Bolper`s boots
description: Plus five percent speed.
components:
- type: Sprite
sprite: ADT/Personalization/bolper_boots.rsi
- type: Clothing
sprite: ADT/Personalization/bolper_boots.rsi
- type: Matchbox

- type: entity
parent: ClothingNeckBase
id: ADTClothingNeckBolperCloak
suffix: Bolper
name: Bolper`s cloak
description: Plus five percent coolness.
components:
- type: Sprite
sprite: ADT/Personalization/bolper_cloak.rsi

- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformBolperJumpsuit
suffix: Bolper
name: Bolper`s jumpsuit
description: Plus five percent freshness.
components:
- type: Sprite
sprite: ADT/Personalization/bolper_jumpsuit.rsi
- type: Clothing
sprite: ADT/Personalization/bolper_jumpsuit.rsi

- type: entity
parent: [Clothing, ClothingSlotBase]
id: ADTClothingBackBolperSheath
suffix: Bolper
name: Bolper`s katana sheath
description: I`m ready to fight.
components:
- type: Sprite
sprite: ADT/Personalization/bolper_sheaths.rsi
state: sheath
- type: Clothing
sprite: ADT/Personalization/bolper_sheaths.rsi
quickEquip: false
slots:
- back
- 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: PhysicalComposition
materialComposition:
Cloth: 50
- type: StaticPrice
price: 20
# - type: Clothing
# quickEquip: false
# slots:
# - back

#Pangaari
- type: entity
parent: ClothingUniformBase
id: ADTClothingUniformPangaariAmericanSleeveless
suffix: Pangaari
name: American sleeveless.
components:
- type: Sprite
sprite: ADT/Personalization/pangaari_american_sleeveless.rsi
- type: Clothing
sprite: ADT/Personalization/pangaari_american_sleeveless.rsi

#Rip_Zoro
- type: entity
parent: ClothingNeckBase
id: ADTClothingNeckRipZoroMantle
suffix: Rip_Zoro
name: Mysterious shoulder mantle
description: A mantle that holds a secret...
components:
- type: Sprite
sprite: ADT/Personalization/rip_zoro_mantle.rsi
state: icon
- type: Clothing
sprite: ADT/Personalization/rip_zoro_mantle.rsi
- type: Item
size: Normal
Original file line number Diff line number Diff line change
Expand Up @@ -925,4 +925,28 @@
components:
- type: Sprite
sprite: ADT/Personalization/toys.rsi
state: plushie_liexer
state: plushie_liexer

#Bolper
- type: entity
name: Bolper's katana
parent: BaseSword
id: ADTBolperKatana
description: Plus five percent to damage.
suffix: Bolper
components:
- type: Sprite
sprite: ADT/Personalization/bolper_katana.rsi
- type: MeleeWeapon
attackRate: 1.5
damage:
types:
Slash: 15
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: Item
sprite: ADT/Personalization/bolper_katana.rsi
- type: Tag
tags:
- Katana
- type: DisarmMalus
3 changes: 2 additions & 1 deletion Resources/Prototypes/ADT/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,5 @@
id: ADTCartridgeBibis

- type: Tag
id: ADTMagazineRifleBibis
id: ADTMagazineRifleBibis

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.
18 changes: 18 additions & 0 deletions Resources/Textures/ADT/Personalization/bolper_boots.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by boctonskuitea(Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-FEET",
"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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Resources/Textures/ADT/Personalization/bolper_cloak.rsi/meta.json
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-NECK",
"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.
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.
22 changes: 22 additions & 0 deletions Resources/Textures/ADT/Personalization/bolper_katana.rsi/meta.json
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-BACKPACK",
"directions": 4
},
{
"name": "sheath-sabre-equipped-BACKPACK",
"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
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 pangaari(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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by boctonskuitea(discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-NECK",
"directions": 4
}
]
}
Loading