New vests (#862)

* Sprites&Meta

* Add_Vests

* Belt

* Loadouts&Fixes

* Rem_RedVest_FromGuildmaster
This commit is contained in:
Арт
2025-02-10 17:47:40 +03:00
committed by GitHub
parent 469aa2a6a4
commit c678e96fbc
51 changed files with 289 additions and 154 deletions

View File

@@ -1,5 +1,6 @@
# General
cp14-loadout-general-outer = Outer Clothes
cp14-loadout-general-cloak = Cloak
cp14-loadout-general-eyes = Goggles
cp14-loadout-general-gloves = Gloves
@@ -52,6 +53,7 @@ cp14-loadout-merchant-shoes = Merchant's shoes
# Guildmaster
cp14-loadout-guildmaster-outer = Guildmaster outer clothes
cp14-loadout-guildmaster-cloak = Guildmaster cloak
cp14-loadout-guildmaster-shirt = Guildmaster shirt
cp14-loadout-guildmaster-pants = Guildmaster pants

View File

@@ -656,6 +656,24 @@ ent-CP14ClothingRingFlashLight = проводящее кольцо вспышк
.desc = Стандартное манапроводящее кольцо, позволяющее вызвать яркую ослепляющую вспышку света.
.suffix = Вспышка света
ent-CP14ClothingBeltBrown = коричневый пояс
.desc = Простой коричневый пояс. Он поможет рубашке не развеваться на ветру.
ent-CP14ClothingOuterClothingGreenVest = зелёная жилетка
.desc = Стильный зеленый жилет с золотыми пуговицами.
ent-CP14ClothingOuterClothingRedVest = красная жилетка
.desc = Стильный красный жилет с золотыми крапинками.
ent-CP14ClothingOuterClothingBrownVest1 = коричневый жилет
.desc = Простой, приличный кожаный жилет. Довольно стильно.
ent-CP14ClothingOuterClothingBrownVest2 = коричневый жилет с застежками
.desc = Тот же простой коричневый кожаный жилет, но с застежками.
ent-CP14ClothingOuterClothingBrownVest3 = лёгкий кожаный жилет
.desc = Два кожаных лоскута, соединенных ремнем снизу.
ent-CP14ClothingShirtBase = рубашка
.desc = Приятный на ощупь материал, удобная свободная форма рубашки.
@@ -692,21 +710,6 @@ ent-CP14ClothingShirtCottonRed = холщовая красная рубашка
ent-CP14ClothingShirtCottonWhite = холщовая белая рубашка
.desc = { ent-CP14ClothingShirtBase.desc }
ent-CP14ClothingShirtCottonWhiteBelt = холщовая опоясанная белая рубашка
.desc = { ent-CP14ClothingShirtBase.desc }
ent-CP14ClothingShirtCottonWhiteBrownVest = холщовая опоясанная бело-коричневая рубашка
.desc = { ent-CP14ClothingShirtBase.desc }
ent-CP14ClothingShirtCottonWhiteBrownVest2 = { ent-CP14ClothingShirtCottonWhiteBrownVest }
.desc = { ent-CP14ClothingShirtCottonWhiteBrownVest.desc }
ent-CP14ClothingShirtCottonWhiteBrownVest3 = { ent-CP14ClothingShirtCottonWhiteBrownVest }
.desc = { ent-CP14ClothingShirtCottonWhiteBrownVest.desc }
ent-CP14ClothingShirtCottonWhiteCollar = холщовая белая рубашка с воротником
.desc = { ent-CP14ClothingShirtBase.desc }
ent-CP14ClothingShirtCottonYellow = холщовая желтая рубашка
.desc = { ent-CP14ClothingShirtBase.desc }

View File

@@ -1,5 +1,6 @@
# General
cp14-loadout-general-outer = Верхняя одежда
cp14-loadout-general-cloak = Накидка
cp14-loadout-general-eyes = Очки
cp14-loadout-general-gloves = Перчатки
@@ -52,6 +53,7 @@ cp14-loadout-merchant-shoes = Ботинки торговца
# Guildmaster
cp14-loadout-guildmaster-outer = Верхняя одежда гильдмастера
cp14-loadout-guildmaster-cloak = Накидка гильдмастера
cp14-loadout-guildmaster-shirt = Рубашка гильдмастера
cp14-loadout-guildmaster-pants = Штаны гильдмастера

View File

@@ -105,7 +105,7 @@
contents:
- id: CP14ClothingCloakGuildmasterCape
prob: 1
- id: CP14ClothingShirtGuildmasterVest
prob: 0.6
- id: CP14ClothingShirtGuildmasterVest2
- id: CP14ClothingShirtCottonWhite
prob: 1
- id: CP14ClothingOuterClothingGreenVest
prob: 0.6

View File

@@ -0,0 +1,19 @@
- type: entity
parent: ClothingBeltBase
id: CP14ClothingBeltBrown
name: brown belt
description: A simple brown belt. It will help the shirt not to flutter in the wind.
categories: [ ForkFiltered ]
components:
- type: Sprite
sprite: _CP14/Clothing/Belt/brown.rsi
state: icon
- type: Clothing
slots:
- belt
equipSound:
path: /Audio/Effects/rustle1.ogg
quickEquip: false
breakOnMove: false
equipDelay: 0.45
unequipDelay: 0.45

View File

@@ -0,0 +1,65 @@
- type: entity
parent:
- ClothingSlotBase
- CP14ClothingOuterFoldableBase
id: CP14ClothingOuterClothingGreenVest
name: green vest
description: Stylish green vest with gold buttons.
components:
- type: Sprite
sprite: _CP14/Clothing/OuterClothing/Roles/General/green.rsi
- type: Clothing
sprite: _CP14/Clothing/OuterClothing/Roles/General/green.rsi
- type: entity
parent:
- ClothingSlotBase
- CP14ClothingOuterFoldableBase
id: CP14ClothingOuterClothingRedVest
name: red vest
description: Stylish red vest with gold flecks.
components:
- type: Sprite
sprite: _CP14/Clothing/OuterClothing/Roles/General/red.rsi
- type: Clothing
sprite: _CP14/Clothing/OuterClothing/Roles/General/red.rsi
- type: entity
parent:
- ClothingSlotBase
- CP14ClothingOuterFoldableBase
id: CP14ClothingOuterClothingBrownVest1
name: brown vest
description: A simple, decent leather vest. It's kind of stylish.
components:
- type: Sprite
sprite: _CP14/Clothing/OuterClothing/Roles/General/brown.rsi
- type: Clothing
sprite: _CP14/Clothing/OuterClothing/Roles/General/brown.rsi
- type: entity
parent:
- ClothingSlotBase
- CP14ClothingOuterClothingBase
id: CP14ClothingOuterClothingBrownVest2
name: brown vest with clasps
description: The same plain brown leather vest, but with clasps.
components:
- type: Sprite
sprite: _CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi
- type: Clothing
sprite: _CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi
- type: entity
parent:
- ClothingSlotBase
- CP14ClothingOuterClothingBase
id: CP14ClothingOuterClothingBrownVest3
name: lightweight leather vest
description: Two flaps of leather connected by a belt from below.
components:
- type: Sprite
sprite: _CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi
- type: Clothing
sprite: _CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi

View File

@@ -1,7 +1,7 @@
- type: entity
parent:
- ClothingSlotBase
- CP14ClothingOuterClothingBase
- CP14ClothingOuterFoldableBase
id: CP14ClothingOuterClothingMerchantWaistCoat
name: "merchant's waistcoat"
description: Stylish waistcoat made of expensive leather. A special uniform for merchants that makes customers feel like beggars.
@@ -9,14 +9,4 @@
- type: Sprite
sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi
- type: Clothing
sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi
- type: entity
parent: CP14ClothingOuterClothingMerchantWaistCoat
id: CP14ClothingOuterClothingMerchantWaistCoatOpen
name: "open merchant's waistcoat"
components:
- type: Sprite
sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi
- type: Clothing
sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi
sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi

View File

@@ -10,4 +10,25 @@
slots:
- outerClothing
- type: Sprite
state: icon
state: icon
- type: entity
abstract: true
parent: [ CP14ClothingOuterClothingBase, BaseFoldable ]
id: CP14ClothingOuterFoldableBase
components:
- type: Appearance
- type: Foldable
canFoldInsideContainer: true
unfoldVerbText: fold-zip-verb
foldVerbText: fold-unzip-verb
- type: FoldableClothing
foldedEquippedPrefix: open
foldedHeldPrefix: open
- type: Sprite
layers:
- state: icon
map: [ "unfoldedLayer" ]
- state: icon-open
map: ["foldedLayer"]
visible: false

View File

@@ -99,54 +99,6 @@
- type: Clothing
sprite: _CP14/Clothing/Shirt/Roles/General/white.rsi
- type: entity
parent: CP14ClothingShirtBase
id: CP14ClothingShirtCottonWhiteBelt
name: cotton white belt shirt
components:
- type: Sprite
sprite: _CP14/Clothing/Shirt/Roles/General/white_belt.rsi
- type: Clothing
sprite: _CP14/Clothing/Shirt/Roles/General/white_belt.rsi
- type: entity
parent: CP14ClothingShirtBase
id: CP14ClothingShirtCottonWhiteBrownVest
name: cotton white brown vest shirt
components:
- type: Sprite
sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest.rsi
- type: Clothing
sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest.rsi
- type: entity
parent: CP14ClothingShirtCottonWhiteBrownVest
id: CP14ClothingShirtCottonWhiteBrownVest2
components:
- type: Sprite
sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest2.rsi
- type: Clothing
sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest2.rsi
- type: entity
parent: CP14ClothingShirtCottonWhiteBrownVest
id: CP14ClothingShirtCottonWhiteBrownVest3
components:
- type: Sprite
sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest3.rsi
- type: Clothing
sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest3.rsi
- type: entity
parent: CP14ClothingShirtBase
id: CP14ClothingShirtCottonWhiteCollar
name: cotton white collar shirt
components:
- type: Sprite
sprite: _CP14/Clothing/Shirt/Roles/General/white_collar.rsi
- type: Clothing
sprite: _CP14/Clothing/Shirt/Roles/General/white_collar.rsi
- type: entity
parent: CP14ClothingShirtBase
id: CP14ClothingShirtCottonYellow

View File

@@ -1,18 +0,0 @@
- type: entity
parent: CP14ClothingShirtBase
id: CP14ClothingShirtGuildmasterVest
name: cotton white green vest shirt
components:
- type: Sprite
sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi
- type: Clothing
sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi
- type: entity
parent: CP14ClothingShirtGuildmasterVest
id: CP14ClothingShirtGuildmasterVest2
components:
- type: Sprite
sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi
- type: Clothing
sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi

View File

@@ -54,6 +54,38 @@
equipment:
cloak: CP14ClothingCloakFurCoat
# OuterClothing
- type: loadoutGroup
id: CP14GeneralOuterClothing
name: cp14-loadout-general-outer
minLimit: 0
loadouts:
- CP14ClothingOuterClothingBrownVest1
- CP14ClothingOuterClothingBrownVest2
- CP14ClothingOuterClothingBrownVest3
- CP14ClothingOuterClothingRedVest
- type: loadout
id: CP14ClothingOuterClothingBrownVest1
equipment:
cloak: CP14ClothingOuterClothingBrownVest1
- type: loadout
id: CP14ClothingOuterClothingBrownVest2
equipment:
cloak: CP14ClothingOuterClothingBrownVest2
- type: loadout
id: CP14ClothingOuterClothingBrownVest3
equipment:
cloak: CP14ClothingOuterClothingBrownVest3
- type: loadout
id: CP14ClothingOuterClothingRedVest
equipment:
cloak: CP14ClothingOuterClothingRedVest
# Eyes
- type: loadoutGroup
@@ -276,11 +308,6 @@
- CP14ClothingShirtCottonPurple
- CP14ClothingShirtCottonRed
- CP14ClothingShirtCottonWhite
- CP14ClothingShirtCottonWhiteBelt
- CP14ClothingShirtCottonWhiteBrownVest
- CP14ClothingShirtCottonWhiteBrownVest2
- CP14ClothingShirtCottonWhiteBrownVest3
- CP14ClothingShirtCottonWhiteCollar
- CP14ClothingShirtCottonYellow
- CP14ClothingShirtCottonYellowCollar
@@ -329,31 +356,6 @@
equipment:
shirt: CP14ClothingShirtCottonWhite
- type: loadout
id: CP14ClothingShirtCottonWhiteBelt
equipment:
shirt: CP14ClothingShirtCottonWhiteBelt
- type: loadout
id: CP14ClothingShirtCottonWhiteBrownVest
equipment:
shirt: CP14ClothingShirtCottonWhiteBrownVest
- type: loadout
id: CP14ClothingShirtCottonWhiteBrownVest2
equipment:
shirt: CP14ClothingShirtCottonWhiteBrownVest2
- type: loadout
id: CP14ClothingShirtCottonWhiteBrownVest3
equipment:
shirt: CP14ClothingShirtCottonWhiteBrownVest3
- type: loadout
id: CP14ClothingShirtCottonWhiteCollar
equipment:
shirt: CP14ClothingShirtCottonWhiteCollar
- type: loadout
id: CP14ClothingShirtCottonYellow
equipment:
@@ -431,6 +433,7 @@
- CP14FluteInstrument
- CP14LyraInstrument
- CP14ClothingBeltQuiver
- CP14ClothingBeltBrown
- type: loadout
id: CP14ManaOperationGlove
@@ -522,6 +525,12 @@
back:
- CP14ClothingBeltQuiver
- type: loadout
id: CP14ClothingBeltBrown
storage:
back:
- CP14ClothingBeltBrown
# Keys
- type: loadoutGroup

View File

@@ -14,24 +14,26 @@
equipment:
cloak: CP14ClothingCloakGuildmasterCape
# OuterClothing
- type: loadoutGroup
id: CP14GuildmasterOuterClothing
name: cp14-loadout-guildmaster-outer
loadouts:
- CP14ClothingOuterClothingGreenVest
- type: loadout
id: CP14ClothingOuterClothingGreenVest
equipment:
cloak: CP14ClothingOuterClothingGreenVest
# Shirt
- type: loadoutGroup
id: CP14GuildmasterShirt
name: cp14-loadout-guildmaster-shirt
loadouts:
- CP14ClothingShirtGuildmasterVest
- CP14ClothingShirtGuildmasterVest2
- type: loadout
id: CP14ClothingShirtGuildmasterVest
equipment:
shirt: CP14ClothingShirtGuildmasterVest
- type: loadout
id: CP14ClothingShirtGuildmasterVest2
equipment:
shirt: CP14ClothingShirtGuildmasterVest2
- CP14ClothingShirtCottonWhite
# Pants

View File

@@ -21,18 +21,12 @@
minLimit: 0
loadouts:
- CP14ClothingOuterClothingMerchantWaistCoat
- CP14ClothingOuterClothingMerchantWaistCoatOpen
- type: loadout
id: CP14ClothingOuterClothingMerchantWaistCoat
equipment:
outerClothing: CP14ClothingOuterClothingMerchantWaistCoat
- type: loadout
id: CP14ClothingOuterClothingMerchantWaistCoatOpen
equipment:
outerClothing: CP14ClothingOuterClothingMerchantWaistCoatOpen
# Shirt
- type: loadoutGroup

View File

@@ -3,6 +3,7 @@
groups:
- CP14GeneralSpells
- CP14GeneralHead
- CP14GeneralOuterClothing
- CP14GeneralEyes
- CP14GeneralMask
- CP14GeneralCloak
@@ -19,6 +20,7 @@
groups:
- CP14GeneralSpells
- CP14GeneralHead
- CP14GeneralOuterClothing
- CP14GeneralEyes
- CP14GeneralGloves
- CP14GeneralShirt
@@ -34,6 +36,7 @@
groups:
- CP14GeneralSpells
- CP14AlchemistHead #
- CP14GeneralOuterClothing
- CP14AlchemistEyes #
- CP14AlchemistCloak #
- CP14GeneralGloves
@@ -48,6 +51,7 @@
groups:
- CP14GeneralSpells
- CP14GeneralHead
- CP14GeneralOuterClothing
- CP14GeneralEyes
- CP14GeneralCloak
- CP14GeneralGloves
@@ -62,6 +66,7 @@
groups:
- CP14GeneralSpells
- CP14GeneralHead
- CP14GeneralOuterClothing
- CP14GeneralEyes
- CP14BlacksmithCloak
- CP14GeneralGloves
@@ -76,6 +81,7 @@
groups:
- CP14GeneralSpells
- CP14GuardHead
- CP14GeneralOuterClothing
- CP14GeneralEyes
- CP14GuardCommanderCloak #
- CP14GeneralGloves
@@ -91,6 +97,7 @@
groups:
- CP14GeneralSpells
- CP14GuardHead
- CP14GeneralOuterClothing
- CP14GeneralEyes
- CP14GuardCloak #
- CP14GeneralGloves
@@ -106,9 +113,9 @@
groups:
- CP14GeneralSpells
- CP14CommandantHead
- CP14MerchantOuterClothing
- CP14GeneralEyes
- CP14CommandantCloak
- CP14MerchantOuterClothing
- CP14MerchantShirt
- CP14MerchantPants
- CP14MerchantShoes
@@ -119,6 +126,7 @@
id: JobCP14Guildmaster
groups:
- CP14GeneralSpells
- CP14GuildmasterOuterClothing
- CP14GeneralEyes
- CP14GuildmasterCloak
- CP14GuildmasterShirt

Binary file not shown.

After

Width:  |  Height:  |  Size: 445 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 445 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 255 B

View File

@@ -0,0 +1,22 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "Created by omsoyk (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-BELT1",
"directions": 4
},
{
"name": "equipped-BELT2",
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 740 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 275 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 283 B

View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "All right reserved",
"copyright": "Created by dinazewwr",
"license": "CC-BY-SA-4.0",
"copyright": "Created by omsoyk (Discord)",
"size": {
"x": 32,
"y": 32
@@ -15,11 +15,10 @@
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
"name": "icon-open"
},
{
"name": "inhand-right",
"name": "open-equipped-OUTERCLOTHING",
"directions": 4
}
]

Binary file not shown.

After

Width:  |  Height:  |  Size: 718 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 932 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 366 B

View File

@@ -11,7 +11,7 @@
"name": "icon"
},
{
"name": "equipped-SHIRT",
"name": "equipped-OUTERCLOTHING",
"directions": 4
}
]

Binary file not shown.

After

Width:  |  Height:  |  Size: 871 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 378 B

View File

@@ -11,7 +11,7 @@
"name": "icon"
},
{
"name": "equipped-SHIRT",
"name": "equipped-OUTERCLOTHING",
"directions": 4
}
]

Binary file not shown.

After

Width:  |  Height:  |  Size: 733 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 253 B

View File

@@ -0,0 +1,25 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "Created by omsoyk (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "icon-open"
},
{
"name": "open-equipped-OUTERCLOTHING",
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 726 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 882 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 306 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 344 B

View File

@@ -0,0 +1,25 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "Created by omsoyk (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "icon-open"
},
{
"name": "open-equipped-OUTERCLOTHING",
"directions": 4
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 851 B

View File

@@ -21,6 +21,21 @@
{
"name": "inhand-right",
"directions": 4
},
{
"name": "icon-open"
},
{
"name": "open-equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "open-inhand-left",
"directions": 4
},
{
"name": "open-inhand-right",
"directions": 4
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 864 B

After

Width:  |  Height:  |  Size: 883 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 419 B

After

Width:  |  Height:  |  Size: 427 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 532 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 541 B

View File

@@ -243,7 +243,7 @@ CP14Nail10: CP14Nail20
#2025-07-02
CP14SpawnPointBanker: CP14SpawnPointMerchant
CP14ClothingOuterClothingBankerWaistCoat: CP14ClothingOuterClothingMerchantWaistCoat
CP14ClothingOuterClothingBankerWaistCoatOpen: CP14ClothingOuterClothingMerchantWaistCoatOpen
CP14ClothingOuterClothingBankerWaistCoatOpen: null
CP14ClothingShirtBanker: CP14ClothingShirtMerchant
CP14KeyRingBanker: CP14KeyRingMerchant
CP14WoodenCabinetBanker: CP14WoodenCabinetMerchant