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

[НЕ ДОДЕЛАНО] кошелек #750

Closed
wants to merge 16 commits into from
Closed
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
10 changes: 8 additions & 2 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1889,10 +1889,16 @@ Entries:
- { message: "Добавлена фигурка Офицера Синего Щита.", type: Add}
id: 55760 #костыль отображения в Обновлениях
time: '2024-06-09T18:59:00.0000000+00:00'

- author: Torgovec
changes:
- {message: Добавлено 4 новых плаката, type: Add}
- {message: Теперь нианы могут сьесть берет СИ, type: Fix}
id: 55761 #костыль отображения в Обновлениях
time: '2024-06-23T04:19:00.0000000+00:00'
time: '2024-06-23T04:19:00.0000000+00:00'

- author: Дубик :3
changes:
- { message: "НТ решили выдать кошельки для удобства хранения денег", type: Add}
id: 55763 #костыль отображения в Обновлениях
time: '2024-06-24T14:23:00.0000000+00:00'
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ent-ADTWalletEmpty = кошелек
.desc = Легкий и удобный кожаный кошелек.
ent-ADTWalletFilled500 = { ent-ADTWalletEmpty }
.desc = { ent-ADTWalletEmpty.desc}
ent-ADTWalletFilled1000 = { ent-ADTWalletEmpty }
.desc = { ent-ADTWalletEmpty.desc}
ent-ADTWalletFilled2000 = { ent-ADTWalletEmpty }
.desc = { ent-ADTWalletEmpty.desc}
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
contents:
- id: BoxSurvivalMedical
- id: JawsOfLife
- id: SpaceCash500
- id: ADTWalletFilled500

#Blueshield
- type: entity
Expand Down Expand Up @@ -186,7 +186,7 @@
amount: 1
- id: ADTBookInvestigator
- id: ADTRubberStampinvestigator
- id: SpaceCash500
- id: ADTWalletFilled500

- type: entity
#noSpawn: true
Expand All @@ -209,7 +209,7 @@
amount: 1
- id: ADTBookInvestigator
- id: ADTRubberStampinvestigator
- id: SpaceCash500
- id: ADTWalletFilled500

- type: entity
noSpawn: true
Expand All @@ -221,7 +221,7 @@
- id: BoxSurvivalMedical
- id: BodyBag_Folded
- id: ADTFootTag
- id: SpaceCash500
- id: ADTWalletFilled500

- type: entity
parent: ClothingBackpackERTSecurity
Expand All @@ -240,8 +240,8 @@
- id: WeaponDisabler
- id: Stunbaton
- id: BoxSurvivalSecurity
- id: BlueshieldSuit
- id: SpaceCash1000
#- id: BlueShieldsuit
- id: ADTWalletFilled1000
- id: OxygenTankFilled
- type: Sprite
sprite: ADT/Clothing/Back/blueshield_backpack.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
contents:
- id: BoxSurvivalMedical
- id: JawsOfLife # Парамед теперь без МЩ и может быть антагом
- id: SpaceCash500
- id: ADTWalletFilled500

- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
Expand Down Expand Up @@ -129,7 +129,7 @@
- id: BoxSurvivalMedical
- id: BodyBag_Folded
- id: ADTFootTag
- id: SpaceCash500
- id: ADTWalletFilled500

- type: entity
noSpawn: true
Expand All @@ -141,7 +141,7 @@
- id: BoxSurvival
- id: RubberStampTrader
- id: AppraisalTool
- id: SpaceCash500
- id: ADTWalletFilled500
- id: ADTClothingOuterCoatTrader

#Blueshield
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
contents:
- id: BoxSurvivalMedical
- id: JawsOfLife
- id: SpaceCash500
- id: ADTWalletFilled500

- type: entity
noSpawn: true
Expand Down Expand Up @@ -44,7 +44,7 @@
amount: 1
- id: ADTBookInvestigator
- id: ADTRubberStampinvestigator
- id: SpaceCash500
- id: ADTWalletFilled500

- type: entity
noSpawn: true
Expand All @@ -56,7 +56,7 @@
- id: BoxSurvivalMedical
- id: BodyBag_Folded
- id: ADTFootTag
- id: SpaceCash500
- id: ADTWalletFilled500

- type: entity
parent: ClothingBackpackSatchelSecurity
Expand Down
91 changes: 91 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
- type: entity
id: BaseADTWallet
parent: [ BaseStorageItem, BaseBagOpenClose ]
name: wallet
description: Soft and comfortable leather wallet
noSpawn: true
suffix: ADT
components:
- type: Sprite
sprite: ADT/Objects/Device/wallet.rsi
layers:
- state: wallet_closed
- state: wallet_open
map: ["openLayer"]
- state: wallet_cash1
map: ["wallet_cash1"]
- state: wallet_cash2
map: ["wallet_cash2"]
- type: SwitchableWeapon
openSound: "/Audio/Items/flashlight_on.ogg"
closeSound: "/Audio/Items/flashlight_off.ogg"
sizeOpened: Tiny
sizeClosed: Tiny
- type: Item
sprite: ADT/Objects/Device/wallet.rsi
size: Tiny
- type: UseDelay
delay: 1.0
- type: Storage
maxItemSize: Small
whitelist:
tags:
- ADTSpaceCash
grid:
- 0,0,3,1
- type: ItemCounter
count:
tags: [ADTSpaceCash]
composite: true
layerStates:
- wallet_cash1
- wallet_cash2 # я не ебу, почему я не могу досчитать до одного. это костыль. простите меня, потомки
- type: Appearance

- type: entity
id: ADTWalletEmpty
parent: BaseADTWallet
name: wallet empty
description: Soft and comfortable leather wallet
suffix: ADT, Empty
components:
- type: Sprite
sprite: ADT/Objects/Device/wallet.rsi
layers:
- state: wallet_closed
- state: wallet_open
map: ["openLayer"]

- type: entity
id: ADTWalletFilled500
parent: BaseADTWallet
name: wallet filled
description: Soft and comfortable leather wallet
suffix: 500, Filled
components:
- type: StorageFill
contents:
- id: SpaceCash500

- type: entity
id: ADTWalletFilled1000
parent: BaseADTWallet
name: wallet filled
description: Soft and comfortable leather wallet
suffix: 1000, Filled
components:
- type: StorageFill
contents:
- id: SpaceCash1000

- type: entity
id: ADTWalletFilled2000
parent: BaseADTWallet
name: wallet filled
description: Soft and comfortable leather wallet
suffix: 2000, Filled
components:
- type: StorageFill
contents:
- id: SpaceCash1000
- id: SpaceCash1000
Loading
Loading