From 764f05baeb216cbfa62d07a305a203a63270cb1d Mon Sep 17 00:00:00 2001 From: Darki255 Date: Wed, 12 Jun 2024 23:09:41 +0300 Subject: [PATCH 01/13] =?UTF-8?q?=D0=BA=D0=BE=D1=88=D0=B5=D0=BB=D0=B5?= =?UTF-8?q?=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities/objects/devices/wallet.ftl | 8 ++ .../ADT/Entities/Objects/Device/wallet.yml | 81 ++++++++++++++++++ .../Inventories/clothesmate.yml | 1 + .../Entities/Objects/Misc/space_cash.yml | 3 + Resources/Prototypes/tags.yml | 3 + .../ADT/Objects/Device/wallet.rsi/icon.png | Bin 0 -> 347 bytes .../ADT/Objects/Device/wallet.rsi/meta.json | 20 +++++ .../Device/wallet.rsi/wallet_closed.png | Bin 0 -> 347 bytes .../Objects/Device/wallet.rsi/wallet_open.png | Bin 0 -> 420 bytes 9 files changed, 116 insertions(+) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/wallet.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml create mode 100644 Resources/Textures/ADT/Objects/Device/wallet.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Device/wallet.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_closed.png create mode 100644 Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_open.png diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/wallet.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/wallet.ftl new file mode 100644 index 00000000000..c66893f7463 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/wallet.ftl @@ -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} \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml new file mode 100644 index 00000000000..2f34432bae3 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml @@ -0,0 +1,81 @@ +- 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"] + - 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 + storedRotation: 90 + - 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 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index d19c1e56933..bae1d0c46c0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -22,6 +22,7 @@ ADTClothingBackpackBlackLadySatchel: 2 ADTClothingBackpackLeatherLadySatchel: 2 # ADT сумки конец + ADTWalletEmpty: 5 ClothingHeadHatBeret: 2 ADTClothingHeadHatBeretBlackCivilian: 2 # ADT Кастомный чёрный берет ClothingHeadBandBlack: 1 diff --git a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml index 57dfb400984..f37cfcc5108 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml @@ -13,6 +13,9 @@ - type: PhysicalComposition materialComposition: Credit: 1 + - type: Tag + tags: + - ADTSpaceCash - type: StaticPrice price: 0 - type: Stack diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 84ab2c0e451..15a6017e2a4 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1305,3 +1305,6 @@ - type: Tag id: Microreactor + +- type: Tag + id: ADTSpaceCash \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Device/wallet.rsi/icon.png b/Resources/Textures/ADT/Objects/Device/wallet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..49ad4f5b54f00621b16b34f2ec8cd3f607123547 GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TEDn4#?y*WRVR3T?5*>Vu%$)E3KM{)(kE=PF$sfoU@F?-`|EI_Ei{7R`c$kp7 zDgz@rpzPYIuwLi80$}o7j z7$mGZ&AUxzipE4|ws@w68Y~H!3{$2~U_23cCnm;4_0042b^+6P9bYn7ia2Z&%C_{- zJ<7+>%2cJNaO!n{>-l>%sTE(@t6z7oC}McR@I^!6DC2^lDN5`OI?YR2gLK+f9!<6M kn72Ye;doHeSA^FY&OJ?0yshXh4Gb*?Pgg&ebxsLQ01h34!TEDn4#?y*WRVR3T?5*>Vu%$)E3KM{)(kE=PF$sfoU@F?-`|EI_Ei{7R`c$kp7 zDgz@rpzPYIuwLi80$}o7j z7$mGZ&AUxzipE4|ws@w68Y~H!3{$2~U_23cCnm;4_0042b^+6P9bYn7ia2Z&%C_{- zJ<7+>%2cJNaO!n{>-l>%sTE(@t6z7oC}McR@I^!6DC2^lDN5`OI?YR2gLK+f9!<6M kn72Ye;doHeSA^FY&OJ?0yshXh4Gb*?Pgg&ebxsLQ01h34!TPx$UP(kjR9HvtmcL2^K@i4ggOQk9f@nBn8bL@Yq%d#bL)iKVsq#2!eF+p%*tqd%=J=o;JrP*!vU}u=$eBa#O3EJ}#d#+Coz$xGqa0(a|s8_rw ziwo*`7>XFcrOZdc_iq;UNfz?)n-Ja4gP%+QO7hSQaCRyw`1+%8v9Jd5ibWOsKKi6{ z|5!aI+G)`~&Eoqx;&$i8_26ht>eqvPS?%9`={lDJ5A6>A8kLaS+|!UDJKL zr#eUj0Oh#5Br733!wL*tvvs37?LR)zLua-#02DDTR!LdlA5aAO8dn~52O*`kKv%#D z0EB>GQuu=*f)$&*j+}?VgQfZ~uB*Uj*p2r9PcZ^)mp=Ka0N4`S!s~Ic5JQHYp-c)O z25(tR0RTYGZ5M2_%}1>9TcFRxwjefnqb0?^1vZJhjB)=1P64NYQ(y%~ExFat!^v#` O0000 Date: Wed, 12 Jun 2024 23:39:16 +0300 Subject: [PATCH 02/13] Update wallet.yml --- Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml index 2f34432bae3..0e1e7720b93 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml @@ -29,7 +29,6 @@ - ADTSpaceCash grid: - 0,0,3,1 - storedRotation: 90 - type: Appearance - type: entity From 12b3bd2efd6c22d98a39c4f0e890eda3e482e331 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Thu, 13 Jun 2024 14:27:46 +0300 Subject: [PATCH 03/13] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B2=D0=BE=20=D0=B2=D1=81=D0=B5=20=D1=80=D1=8E=D0=BA?= =?UTF-8?q?=D0=B7=D0=B0=D0=BA=D0=B8=20=D0=BA=D0=BE=D1=88=D0=B5=D0=BB=D0=B5?= =?UTF-8?q?=D0=BA,=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=8B=D1=87=D0=BD=D1=8B=D1=85=20=D0=BA=D1=83=D0=BF=D1=8E=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Fills/Backpacks/StarterGear/backpack.yml | 10 ++-- .../Fills/Backpacks/StarterGear/duffelbag.yml | 6 +- .../Fills/Backpacks/StarterGear/satchel.yml | 6 +- .../Fills/Backpacks/StarterGear/backpack.yml | 55 +++++++++---------- .../Fills/Backpacks/StarterGear/duffelbag.yml | 55 +++++++++---------- .../Fills/Backpacks/StarterGear/satchel.yml | 55 +++++++++---------- .../Fills/Backpacks/StarterGear/backpack.yml | 4 +- .../Fills/Backpacks/StarterGear/duffelbag.yml | 4 +- .../Fills/Backpacks/StarterGear/satchel.yml | 4 +- 9 files changed, 98 insertions(+), 101 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 94e942b4762..fe6f0c1d480 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -52,7 +52,7 @@ contents: - id: BoxSurvivalMedical - id: JawsOfLife - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpack @@ -174,7 +174,7 @@ amount: 1 - id: ADTBookInvestigator - id: ADTRubberStampinvestigator - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity #noSpawn: true @@ -197,7 +197,7 @@ amount: 1 - id: ADTBookInvestigator - id: ADTRubberStampinvestigator - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -209,7 +209,7 @@ - id: BoxSurvivalMedical - id: BodyBag_Folded - id: ADTFootTag - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackERTSecurity @@ -229,7 +229,7 @@ - id: Stunbaton - id: BoxSurvivalSecurity - id: BlueShieldsuit - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - id: OxygenTankFilled - type: Sprite sprite: ADT/Clothing/Back/blueshield_backpack.rsi diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index a2945d69bb4..eef7ae18581 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -7,7 +7,7 @@ contents: - id: BoxSurvivalMedical - id: JawsOfLife # Парамед теперь без МЩ и может быть антагом - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackDuffelSyndicateBundle @@ -129,7 +129,7 @@ - id: BoxSurvivalMedical - id: BodyBag_Folded - id: ADTFootTag - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -141,5 +141,5 @@ - id: BoxSurvival - id: RubberStampTrader - id: AppraisalTool - - id: SpaceCash500 + - id: ADTWalletFilled500 - id: ADTClothingOuterCoatTrader diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml index f3604d15244..90e305f7e51 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -7,7 +7,7 @@ contents: - id: BoxSurvivalMedical - id: JawsOfLife - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity #noSpawn: true @@ -32,7 +32,7 @@ amount: 1 - id: ADTBookInvestigator - id: ADTRubberStampinvestigator - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -44,7 +44,7 @@ - id: BoxSurvivalMedical - id: BodyBag_Folded - id: ADTFootTag - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackSatchelSecurity diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 95e343b3da7..bb1779ac8c3 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -6,7 +6,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -18,7 +18,7 @@ - id: BoxHug - id: RubberStampClown - id: CrayonRainbow - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -31,7 +31,7 @@ - id: Flash - id: MagazinePistol - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -44,7 +44,7 @@ - id: Flash - id: BoxForensicPad - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -57,7 +57,7 @@ - id: Flash - id: MagazinePistol - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -67,7 +67,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -78,7 +78,7 @@ contents: - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -90,8 +90,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 - - id: SpaceCash1000 + - id: ADTWalletFilled2000 - type: entity noSpawn: true @@ -103,7 +102,7 @@ - id: BoxSurvivalEngineering - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -115,7 +114,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -127,7 +126,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -139,7 +138,7 @@ - id: BoxSurvivalMedical - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -151,7 +150,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -163,7 +162,7 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -173,7 +172,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -183,7 +182,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -193,7 +192,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -203,7 +202,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -214,7 +213,7 @@ contents: - id: BoxSurvival - id: RubberStampMime - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -224,7 +223,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -236,7 +235,7 @@ - id: BoxSurvival - id: Bible - id: RubberStampChaplain - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -258,7 +257,7 @@ - id: BoxSurvival - id: AcousticGuitarInstrument - id: SaxophoneInstrument - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -269,7 +268,7 @@ contents: - id: BoxSurvival - id: BookRandom - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -283,7 +282,7 @@ - id: CigPackBlack - id: HandLabeler - id: BoxForensicPad - - id: SpaceCash500 + - id: ADTWalletFilled500 # ERT @@ -518,7 +517,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -528,7 +527,7 @@ - type: StorageFill contents: - id: NesBoxSurvivalSalvager - - id: SpaceCash500 + - id: ADTWalletFilled500 # Pirate @@ -559,4 +558,4 @@ - id: SpeedLoaderMagnum - id: SmokeGrenade - id: SmokeGrenade - - id: SpaceCash500 + - id: ADTWalletFilled500 diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 8f076c3b74c..8eec415ad93 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -6,7 +6,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -17,7 +17,7 @@ contents: - id: BoxHug - id: RubberStampClown - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -30,7 +30,7 @@ - id: Flash - id: MagazinePistol - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -43,7 +43,7 @@ - id: Flash - id: BoxForensicPad - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -56,7 +56,7 @@ - id: Flash - id: MagazinePistol - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -66,7 +66,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -77,7 +77,7 @@ contents: - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -89,8 +89,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 - - id: SpaceCash1000 + - id: ADTWalletFilled2000 - type: entity noSpawn: true @@ -102,7 +101,7 @@ - id: BoxSurvivalEngineering - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -114,7 +113,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -126,7 +125,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -138,7 +137,7 @@ - id: BoxSurvivalMedical - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -150,7 +149,7 @@ - id: BoxSurvival - id: Flash - id: ADTtelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -162,7 +161,7 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -172,7 +171,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -182,7 +181,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity @@ -193,7 +192,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -203,7 +202,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -214,7 +213,7 @@ contents: - id: BoxSurvival - id: RubberStampMime - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -224,7 +223,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -236,7 +235,7 @@ - id: BoxSurvival - id: Bible - id: RubberStampChaplain - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -258,7 +257,7 @@ - id: BoxSurvival - id: AcousticGuitarInstrument - id: SaxophoneInstrument - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -269,7 +268,7 @@ contents: - id: BoxSurvival - id: BookRandom - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -283,7 +282,7 @@ - id: CigPackBlack - id: BoxForensicPad - id: HandLabeler - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -293,7 +292,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -303,7 +302,7 @@ - type: StorageFill contents: - id: NesBoxSurvivalSalvager - - id: SpaceCash500 + - id: ADTWalletFilled500 #ADT - type: entity @@ -320,4 +319,4 @@ - id: SpeedLoaderMagnum - id: SmokeGrenade - id: SmokeGrenade - - id: SpaceCash500 + - id: ADTWalletFilled500 diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index ceb82574222..74f95044a27 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -5,7 +5,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackSatchel @@ -29,7 +29,7 @@ contents: - id: BoxHug - id: RubberStampClown - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackSatchelSecurity @@ -41,7 +41,7 @@ - id: Flash - id: MagazinePistol - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackSatchelSecurity @@ -53,7 +53,7 @@ - id: BoxForensicPad - id: ADTSpaceLaw - id: Flash - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackSatchelBrigmedic @@ -65,7 +65,7 @@ - id: Flash - id: MagazinePistol - id: ADTSpaceLaw - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity parent: ClothingBackpackSatchelMedical @@ -74,7 +74,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -85,7 +85,7 @@ contents: - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -96,8 +96,7 @@ contents: - id: BoxSurvival - id: Flash - - id: SpaceCash1000 - - id: SpaceCash1000 + - id: ADTWalletFilled2000 - type: entity noSpawn: true @@ -109,7 +108,7 @@ - id: BoxSurvivalEngineering - id: Flash #- id: TelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -121,7 +120,7 @@ - id: BoxSurvival - id: Flash #- id: TelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -133,7 +132,7 @@ - id: BoxSurvival - id: Flash #- id: TelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -145,7 +144,7 @@ - id: BoxSurvivalMedical - id: Flash #- id: TelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -157,7 +156,7 @@ - id: BoxSurvival - id: Flash #- id: TelescopicBaton - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -169,7 +168,7 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -179,7 +178,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -189,7 +188,7 @@ - type: StorageFill contents: - id: BoxSurvivalEngineering - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -199,7 +198,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -209,7 +208,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -219,7 +218,7 @@ - type: StorageFill contents: - id: BoxSurvivalMedical - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -231,7 +230,7 @@ - id: BoxSurvival - id: Bible - id: RubberStampChaplain - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -253,7 +252,7 @@ - id: BoxSurvival - id: AcousticGuitarInstrument - id: SaxophoneInstrument - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -264,7 +263,7 @@ contents: - id: BoxSurvival - id: BookRandom - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -278,7 +277,7 @@ - id: Lighter - id: CigPackBlack - id: HandLabeler - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -288,7 +287,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -298,7 +297,7 @@ - type: StorageFill contents: - id: NesBoxSurvivalSalvager - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true @@ -309,7 +308,7 @@ contents: - id: BoxSurvival - id: RubberStampMime - - id: SpaceCash500 + - id: ADTWalletFilled500 #ADT - type: entity @@ -326,7 +325,7 @@ - id: SpeedLoaderMagnum - id: SmokeGrenade - id: SmokeGrenade - - id: SpaceCash500 + - id: ADTWalletFilled500 - type: entity noSpawn: true diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml index da923b53488..0a842c02974 100644 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -9,7 +9,7 @@ - type: StorageFill contents: - id: BoxSurvival - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -20,4 +20,4 @@ contents: - id: BoxSurvivalMedical - id: RubberStampPsychologist - - id: SpaceCash500 + - id: ADTWalletFilled1000 diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 3abf09eeff5..39955a49864 100644 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -11,7 +11,7 @@ contents: - id: BoxSurvival #- id: BriefcaseIAAFilled - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -22,4 +22,4 @@ contents: - id: BoxSurvivalMedical - id: RubberStampPsychologist - - id: SpaceCash500 + - id: ADTWalletFilled500 diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 0d1715461aa..9675fd440a3 100644 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -10,7 +10,7 @@ contents: - id: BoxSurvival #- id: BriefcaseIAAFilled - - id: SpaceCash1000 + - id: ADTWalletFilled1000 - type: entity noSpawn: true @@ -24,4 +24,4 @@ contents: - id: BoxSurvivalMedical - id: RubberStampPsychologist - - id: SpaceCash500 + - id: ADTWalletFilled500 From 2a66fcbb513d827155db0fd9efcd1711c17ceaf8 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Thu, 13 Jun 2024 14:34:22 +0300 Subject: [PATCH 04/13] Update backpack.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Пофиксил фикс --- .../ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml index b02edcbcb62..a497516739d 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -242,7 +242,6 @@ - id: BoxSurvivalSecurity - id: BlueShieldsuit - id: ADTWalletFilled1000 - - id: BlueshieldSuit - id: OxygenTankFilled - type: Sprite sprite: ADT/Clothing/Back/blueshield_backpack.rsi From 015f2a31bd2db5c3401631b68c54653f51cf6456 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Thu, 13 Jun 2024 14:44:15 +0300 Subject: [PATCH 05/13] Update backpack.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ямл сказал, что нету прототипа с BlueShieldsuit, ну а я что, терпила?! Видимо да.... --- .../ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml index a497516739d..78acbdf17aa 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -242,6 +242,7 @@ - id: BoxSurvivalSecurity - id: BlueShieldsuit - id: ADTWalletFilled1000 + - id: BlueShieldsuit - id: OxygenTankFilled - type: Sprite sprite: ADT/Clothing/Back/blueshield_backpack.rsi From 0373851c0c40c03331169caf4c3b0b0085e2be36 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Thu, 13 Jun 2024 15:12:43 +0300 Subject: [PATCH 06/13] =?UTF-8?q?=D0=BE=D1=81=D1=89=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=BD=D1=83=D0=B6=D0=BD=D0=BE=20=D0=B4=D0=B2=D0=B0=20=D1=81?= =?UTF-8?q?=D0=BA=D0=B0=D1=84=D0=B0=D0=BD=D0=B4=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 78acbdf17aa..a497516739d 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -242,7 +242,6 @@ - id: BoxSurvivalSecurity - id: BlueShieldsuit - id: ADTWalletFilled1000 - - id: BlueShieldsuit - id: OxygenTankFilled - type: Sprite sprite: ADT/Clothing/Back/blueshield_backpack.rsi From 6e68e510da48d6f743f3480cfea1f6edcc1ddeff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Sun, 16 Jun 2024 23:21:26 +0300 Subject: [PATCH 07/13] Update backpack.yml --- .../ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml index a497516739d..25b95b20c4b 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -240,7 +240,7 @@ - id: WeaponDisabler - id: Stunbaton - id: BoxSurvivalSecurity - - id: BlueShieldsuit + #- id: BlueShieldsuit - id: ADTWalletFilled1000 - id: OxygenTankFilled - type: Sprite From e1ba5d91e769bae89ce226dc09b31a31997ff49e Mon Sep 17 00:00:00 2001 From: Darki255 Date: Fri, 21 Jun 2024 13:57:56 +0300 Subject: [PATCH 08/13] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=81=D0=BF=D1=80=D0=B0=D0=B9=D1=82=D1=8B=20?= =?UTF-8?q?=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B9=D1=82=20=D0=BA=D1=83=D0=BF=D1=8E=D1=80?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Objects/Device/wallet.yml | 89 ++++++++++++++++++ .../ADT/Objects/Device/wallet.rsi/meta.json | 23 +++++ .../Objects/Device/wallet.rsi/wallet_cash.png | Bin 0 -> 146 bytes 3 files changed, 112 insertions(+) create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml create mode 100644 Resources/Textures/ADT/Objects/Device/wallet.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash.png diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml new file mode 100644 index 00000000000..352ddde4585 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml @@ -0,0 +1,89 @@ +- 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_cash + map: ["wallet_cash"] + - 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 + storedRotation: 90 + #- type: ItemMapper + # mapLayers: + #folder-overlay-wallet: + # whitelist: + #tags: + # - ADTSpaceCash + - 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 diff --git a/Resources/Textures/ADT/Objects/Device/wallet.rsi/meta.json b/Resources/Textures/ADT/Objects/Device/wallet.rsi/meta.json new file mode 100644 index 00000000000..eef8210fd91 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Device/wallet.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by prazat for Adventure Time Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "wallet_open" + }, + { + "name": "wallet_closed" + }, + { + "name": "wallet_cash" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash.png b/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash.png new file mode 100644 index 0000000000000000000000000000000000000000..e386644cb27227c15f17104ed99eafb8870ef97f GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}KAtX)ArY-_ z&urv8pdjG((7s4{31146_4oB}jT#@wuopH4H|5?7-}lIq;X}E*i0gTe~DWM4fc&agF literal 0 HcmV?d00001 From 556cb0a9a0674998f69adf52c81193155734c148 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Fri, 21 Jun 2024 14:07:11 +0300 Subject: [PATCH 09/13] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BA=20=D1=81=D0=BF=D1=80=D0=B0=D0=B9=D1=82=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml index 0e1e7720b93..de63c838d7c 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml @@ -12,6 +12,8 @@ - state: wallet_closed - state: wallet_open map: ["openLayer"] + - state: wallet_cash + map: ["wallet_cash"] - type: SwitchableWeapon openSound: "/Audio/Items/flashlight_on.ogg" closeSound: "/Audio/Items/flashlight_off.ogg" From 6ad4ffecf3113062107561616ba5754e11405580 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Fri, 21 Jun 2024 14:33:53 +0300 Subject: [PATCH 10/13] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BB=20=D1=81=D0=BF=D1=80=D0=B0=D0=B9=D1=82?= =?UTF-8?q?=20=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20=D0=BF=D1=80=D0=B8=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=B1=D1=8B?= =?UTF-8?q?=D0=BB=D0=BE=20=D0=B2=D1=81=D0=B5=20=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Objects/Device/wallet.rsi/icon.png | Bin 347 -> 344 bytes .../Objects/Device/wallet.rsi/wallet_closed.png | Bin 347 -> 344 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/ADT/Objects/Device/wallet.rsi/icon.png b/Resources/Textures/ADT/Objects/Device/wallet.rsi/icon.png index 49ad4f5b54f00621b16b34f2ec8cd3f607123547..82a1ef54f4f0f84345cd55ed9446635c67f64c0e 100644 GIT binary patch delta 304 zcmV-00nh&10@wnOF@F+CL_t(oh3%BjY63A3#y`uhh&y<2!4wY)g7j2qg-z{PC&6i|m0FTGxxpyk2&6meWO9iK^)Tn7~ zphuzRVkrr5xG%YRPs1p}=Bda+4MK`JJ( zq2GAOFQ^vc^+`d+1QiqBCqt;1oNpyI004ZrfDadp#sdIAr!8&>D+<-xqfqCI@a;Lm z$1KH;Pu6v@-m+6G76MxVG;sZjJPoQMs@JUqm&vER4U;n}x32)eI=O^W8}czL&4P5l zw-$6AV#YbJ<0+Gq$X_u2)pspONX}+WkH_Qrw|oJ~R!41w!_k8P0000a!oPk6KA0sp8yZ=wbqQv8Bj%M-) z@&!Cf{QLju@%*B<=?@+zr0)3s)I4l=M-jt`@ALQlQM%1oW0S+P!>KWYy@UJngtraT z^Y>49&tNFVR&d9=vtY4Bg9v-z6NZ34t50zs)cxLRkaT0yqk0+U69GxGjvJX(j+mpPygZ$6ZmLD?Pwl@l3|=k<39C-?Zj+g!G0~YVo@t>5OF|~Yl&KRKPXykHiE&Xq z^L)Ksz%*XRmkgF74%>vXEj@IP@-ehBRp}|5dL7_;{$5RL#aH&~*WD|M7@jbE(NH+b zxFBeX5_^MA^HSCzoi?47M^i05=B*G=I3ASr72$b?b5BzgZ!3CBGXR07tDnm{r-UW| D?}2^| diff --git a/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_closed.png b/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_closed.png index 49ad4f5b54f00621b16b34f2ec8cd3f607123547..82a1ef54f4f0f84345cd55ed9446635c67f64c0e 100644 GIT binary patch delta 304 zcmV-00nh&10@wnOF@F+CL_t(oh3%BjY63A3#y`uhh&y<2!4wY)g7j2qg-z{PC&6i|m0FTGxxpyk2&6meWO9iK^)Tn7~ zphuzRVkrr5xG%YRPs1p}=Bda+4MK`JJ( zq2GAOFQ^vc^+`d+1QiqBCqt;1oNpyI004ZrfDadp#sdIAr!8&>D+<-xqfqCI@a;Lm z$1KH;Pu6v@-m+6G76MxVG;sZjJPoQMs@JUqm&vER4U;n}x32)eI=O^W8}czL&4P5l zw-$6AV#YbJ<0+Gq$X_u2)pspONX}+WkH_Qrw|oJ~R!41w!_k8P0000a!oPk6KA0sp8yZ=wbqQv8Bj%M-) z@&!Cf{QLju@%*B<=?@+zr0)3s)I4l=M-jt`@ALQlQM%1oW0S+P!>KWYy@UJngtraT z^Y>49&tNFVR&d9=vtY4Bg9v-z6NZ34t50zs)cxLRkaT0yqk0+U69GxGjvJX(j+mpPygZ$6ZmLD?Pwl@l3|=k<39C-?Zj+g!G0~YVo@t>5OF|~Yl&KRKPXykHiE&Xq z^L)Ksz%*XRmkgF74%>vXEj@IP@-ehBRp}|5dL7_;{$5RL#aH&~*WD|M7@jbE(NH+b zxFBeX5_^MA^HSCzoi?47M^i05=B*G=I3ASr72$b?b5BzgZ!3CBGXR07tDnm{r-UW| D?}2^| From 77f83a4905c3a3f13300fca70045a68e9883efc5 Mon Sep 17 00:00:00 2001 From: Darki255 Date: Mon, 24 Jun 2024 14:01:04 +0300 Subject: [PATCH 11/13] =?UTF-8?q?=D1=84=D0=B8=D0=BD=D0=B0=D0=BB(=D0=BD?= =?UTF-8?q?=D0=B0=D0=B2=D0=B5=D1=80=D0=BD=D0=BE=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Objects/Device/wallet.yml | 13 +++++++++++-- .../ADT/Objects/Device/wallet.rsi/meta.json | 5 ++++- .../{wallet_cash.png => wallet_cash1.png} | Bin .../Objects/Device/wallet.rsi/wallet_cash2.png | Bin 0 -> 146 bytes 4 files changed, 15 insertions(+), 3 deletions(-) rename Resources/Textures/ADT/Objects/Device/wallet.rsi/{wallet_cash.png => wallet_cash1.png} (100%) create mode 100644 Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash2.png diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml index de63c838d7c..b5acbd3b7ed 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/wallet.yml @@ -12,8 +12,10 @@ - state: wallet_closed - state: wallet_open map: ["openLayer"] - - state: wallet_cash - map: ["wallet_cash"] + - 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" @@ -31,6 +33,13 @@ - ADTSpaceCash grid: - 0,0,3,1 + - type: ItemCounter + count: + tags: [ADTSpaceCash] + composite: true + layerStates: + - wallet_cash1 + - wallet_cash2 # я не ебу, почему я не могу досчитать до одного. это костыль. простите меня, потомки - type: Appearance - type: entity diff --git a/Resources/Textures/ADT/Objects/Device/wallet.rsi/meta.json b/Resources/Textures/ADT/Objects/Device/wallet.rsi/meta.json index eef8210fd91..0f6c2181143 100644 --- a/Resources/Textures/ADT/Objects/Device/wallet.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Device/wallet.rsi/meta.json @@ -17,7 +17,10 @@ "name": "wallet_closed" }, { - "name": "wallet_cash" + "name": "wallet_cash1" + }, + { + "name": "wallet_cash2" } ] } diff --git a/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash.png b/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash1.png similarity index 100% rename from Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash.png rename to Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash1.png diff --git a/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash2.png b/Resources/Textures/ADT/Objects/Device/wallet.rsi/wallet_cash2.png new file mode 100644 index 0000000000000000000000000000000000000000..e386644cb27227c15f17104ed99eafb8870ef97f GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}KAtX)ArY-_ z&urv8pdjG((7s4{31146_4oB}jT#@wuopH4H|5?7-}lIq;X}E*i0gTe~DWM4fc&agF literal 0 HcmV?d00001 From 92eb7ec5122ec31eaf3d3368339067a7b13a3ada Mon Sep 17 00:00:00 2001 From: Darki255 Date: Mon, 24 Jun 2024 14:23:41 +0300 Subject: [PATCH 12/13] =?UTF-8?q?=D1=87=D0=B5=D0=B9=D0=BD=D0=B4=D0=B6?= =?UTF-8?q?=D0=BB=D0=BE=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogADT.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 248fd131976..e9923c5c002 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1889,3 +1889,9 @@ Entries: - { message: "Добавлена фигурка Офицера Синего Щита.", type: Add} id: 55760 #костыль отображения в Обновлениях time: '2024-06-09T18:59:00.0000000+00:00' + +- author: Дубик :3 + changes: + - { message: "НТ решили выдать кошельки для удобства хранения денег", type: Add} + id: 55762 #костыль отображения в Обновлениях + time: '2024-06-24T14:23:00.0000000+00:00' \ No newline at end of file From 57e733871774800a58529b906fb89bc6da747611 Mon Sep 17 00:00:00 2001 From: Darki255 <87230164+Darki255@users.noreply.github.com> Date: Mon, 24 Jun 2024 14:31:43 +0300 Subject: [PATCH 13/13] Update ChangelogADT.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit мой последний ПР был исправлен на id:55762, поэтому этот ПР изменен на id:55763 --- Resources/Changelog/ChangelogADT.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index c6b91f54d1b..09760994297 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1900,5 +1900,5 @@ Entries: - author: Дубик :3 changes: - { message: "НТ решили выдать кошельки для удобства хранения денег", type: Add} - id: 55762 #костыль отображения в Обновлениях + id: 55763 #костыль отображения в Обновлениях time: '2024-06-24T14:23:00.0000000+00:00'