From 707dec71ab38beb5deb58a98bb8f6982cb991e2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=86=D0=B2=D0=B0=D0=BD=20=D0=9E=D0=BD=D1=96=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=BA=D0=BE?= Date: Fri, 13 Dec 2024 23:29:35 +0300 Subject: [PATCH 01/10] - added Adidas sport outfit --- .../Clothing/OuterClothing/adidascostume.yml | 13 +++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 1884 bytes .../Coats/adidascostume.rsi/icon.png | Bin 0 -> 464 bytes .../Coats/adidascostume.rsi/inhand-left.png | Bin 0 -> 328 bytes .../Coats/adidascostume.rsi/inhand-right.png | Bin 0 -> 331 bytes .../Coats/adidascostume.rsi/meta.json | 26 ++++++++++++++++++ 6 files changed, 39 insertions(+) create mode 100644 Resources/Prototypes/_White/Entities/Clothing/OuterClothing/adidascostume.yml create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/meta.json diff --git a/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/adidascostume.yml b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/adidascostume.yml new file mode 100644 index 0000000000..f9d2f20e08 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/adidascostume.yml @@ -0,0 +1,13 @@ +- type: entity + parent: ClothingOuterStorageBase + id: adidascostume + name: Серый спортивный костюм + description: Когда-то костюмы Абибаса были очень популярны. Сейчас же это больше культурное наследие. Странно, почему так хочется семечек? + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/adidascostume.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/adidascostume.rsi + - type: StorageFill + contents: + - id: FoodSnackSemki \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..1a9561f1b619eb46d78c0f674eaaef7955c4cf5f GIT binary patch literal 1884 zcmV-i2c!6jP)Px+7D+@wRCt{2n#*q+#~sH%q{v36ag9(1sWJ`P#v7aa16fy#jfi{v7(19QZZ?Yj3krXk-JM;a`m$Ng&oq-lDTC`}eJ{Sm z>&M>VAAkP~|NiF{A^p&DZi@GAbCF~Wy~qo@;>^!|yQyd6R>mi8v3}1F2!+C%qS1B? zy$F&_-^;t*snMG&W`d`mNhLUU_B1{5&Afi>9Y6inm)AIV_B5GPLRkNQ8W8W@=B`=S zjS`KKnaweL^*je&`4JICLF?$Gr)L9-5@q=6c`~y(lxPfK#Y|YLpPfkqP^nb7b7$PY z$9oL2Gij907libK^%9R99rVR>sRU)mCNrDk%ts%fC{gtMJc<(K%ts%PnaxplY;vgt zN;HO|Y8*K_=r&XNrTW>sQy|G?XVOe3Cdi}`{^3;~NhW)DN=U!10qZwxL5apNjRLOg zQg&?0j!iJ4a%uP?T1O|BhA$F~sQmI*zoqQhxUP$76i}iu)^FI-O#N&00UX-`NoL;A zDLQ5Um^XBgDM*j?c*nX;YwwJvSU$pY)X28r4l0l`ifT{3F`lfh0#zv>55+WWcd4Orx+Y{kjI+xON%SC}5U!0K%a#Cmy(}s9LoTP&EKf z96w1o6b8U7>6k`=8`my3Wx$PVm$6F*Az2p67m{V{lCdoPx}(73CKr1T9Olz=LjY(U zoi*PN4gC!OulKzr67^#kpQx6QPEHDqCR3v~1M%K%u9v?a%bEvxEV^z@v(oePDA9JH z+FTdiraJvccv8j7j$QYYvW!z8R&`kx&X4GP||g>Gj~_*-QcsuHF0r=~mf4}M*C5{{&bbs>GUjQ(jnBdCAPk_g-VJrvX zO!3}rF2Mf%KcuTW&cxV=pZ2tNi7Z|9-M({x>`a<3zPJR4FQN#&6^{3Ab9Zd-Cp$k& z{{9?>UaV;W)2V6q&gj2Z)r74tf3Kzm3|~FZ!a|uf>$>Uc{0@LCVuJ81u>-IC*gtz4 zCZ-b;qQx|gSNY6rt|lf?gjxW=x~`s@b2^n|`09B8B5G7P08t`p)USLxl_VHZABjnX zhF*$#+hDxS66svVH{oe8eDyr(T!vr&=6C)QnHQ5N!Yx2A=KZs&7br_Isum-i%V0II zHYbWzGDzn#1cPn7|K2GU9J?kaQG^W`9~;3m3XDJK{Z%bSNnhPH!H4mTR<#&~x!fZ$ zi6Ha{tnG@ENhP@d?F^Yzg6Z3%0jNHgPviObSgJRDdo-{#rnOyhp|XVgfX_esIFL?G z29}Qb$KDtuEXhx;6AVi-$KDvM8`E-WdSz&FvBKU1hnp=%n7s!Mv$$Akx*Q<`iupMP z_P^%O!ut0fa)ZIPrZ+=1!u8<`1cPn#?>*$lGqC?Px0s(3Do41<^zImN+dI}`m2{+t zLNM6orqPh%#iYX2Sb78ffxmPtg_DCXx#j*kfGHxz8|j)6xu1BnVZ%Sy%2P#@sv zMfx^xMU^A;ZQhEb7aJ+2DOM_mh73@(cJ}N$1i+qshfuZlhQym;rDAA!6o_x^t2sXl zRw9Ph28l*8mGmM*XFddA=*)+dozQ2u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e319fcb81c16a03441595f473a90d7ce609c75e8 GIT binary patch literal 464 zcmV;>0WbcEP)Px$ib+I4R9J=Wmbp&DKoEw1BP8rN2qH%)92SZYB?To-n)G=KI-Y@tqNkyu1PLSr zQ4~eyNRb6wiDOeOg*BFsjqJ5C4gM;x_n3cYXJ;0u`R^!2C+?YDu4y^|!1G+ZTjN4& zNl!XCJ>%OgL)d43F+AMe7T#1Y<3OrL zrN#;cBx&fI0DxY9fSc>9+(MS_JabGc2;j9wnIYXJ}x6cUgprRIUE zVx|B#n*s=wi&#|=lU0!5oQG>Bsr)?<-F4A-V@*v>rThRE;h2^Us{XbB0000GS)++&x1A!XfWt(@MuJrvYv2gLl9hWP81Nk15Se03=Uny?2p)!`g`t4kKtM`(+ z0=kxhG6&Y1f5@)?FAC8LBwv2`Tdwf)iIWB&U0t?jc`C$KO0`Y!vge$m^~wdHH27!#{t0{9X6xy^dXOgNHrGHyB2&}k#sBRSOjO^W z_U3lhW&#=q1P|`kY~0g+F5$4+`yD5jXw2HVob!NM{$jS6_2SPB6mL9{t(_eZ=l4AL zTWMX!w#u7Kvd<(~qy(%SGV1?}LregYXL;V*m@~^U(8& Date: Fri, 13 Dec 2024 23:39:10 +0300 Subject: [PATCH 02/10] - fix textures path --- .../Clothing/OuterClothing/adidascostume.yml | 7 ++++--- .../adidascostume.rsi/equipped-OUTERCLOTHING.png | Bin .../OuterClothing/Coats/adidascostume.rsi/icon.png | Bin .../Coats/adidascostume.rsi/inhand-left.png | Bin .../Coats/adidascostume.rsi/inhand-right.png | Bin .../OuterClothing/Coats/adidascostume.rsi/meta.json | 0 6 files changed, 4 insertions(+), 3 deletions(-) rename Resources/Textures/{ => White}/Clothing/OuterClothing/Coats/adidascostume.rsi/equipped-OUTERCLOTHING.png (100%) rename Resources/Textures/{ => White}/Clothing/OuterClothing/Coats/adidascostume.rsi/icon.png (100%) rename Resources/Textures/{ => White}/Clothing/OuterClothing/Coats/adidascostume.rsi/inhand-left.png (100%) rename Resources/Textures/{ => White}/Clothing/OuterClothing/Coats/adidascostume.rsi/inhand-right.png (100%) rename Resources/Textures/{ => White}/Clothing/OuterClothing/Coats/adidascostume.rsi/meta.json (100%) diff --git a/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/adidascostume.yml b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/adidascostume.yml index f9d2f20e08..54a728555c 100644 --- a/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/adidascostume.yml +++ b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/adidascostume.yml @@ -5,9 +5,10 @@ description: Когда-то костюмы Абибаса были очень популярны. Сейчас же это больше культурное наследие. Странно, почему так хочется семечек? components: - type: Sprite - sprite: Clothing/OuterClothing/Coats/adidascostume.rsi + sprite: White/Clothing/OuterClothing/Coats/adidascostume.rsi - type: Clothing - sprite: Clothing/OuterClothing/Coats/adidascostume.rsi + sprite: White/Clothing/OuterClothing/Coats/adidascostume.rsi - type: StorageFill contents: - - id: FoodSnackSemki \ No newline at end of file + - id: FoodSnackSemki + \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Clothing/OuterClothing/Coats/adidascostume.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/White/Clothing/OuterClothing/Coats/adidascostume.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/icon.png b/Resources/Textures/White/Clothing/OuterClothing/Coats/adidascostume.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/icon.png rename to Resources/Textures/White/Clothing/OuterClothing/Coats/adidascostume.rsi/icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/inhand-left.png b/Resources/Textures/White/Clothing/OuterClothing/Coats/adidascostume.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/inhand-left.png rename to Resources/Textures/White/Clothing/OuterClothing/Coats/adidascostume.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/inhand-right.png b/Resources/Textures/White/Clothing/OuterClothing/Coats/adidascostume.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/inhand-right.png rename to Resources/Textures/White/Clothing/OuterClothing/Coats/adidascostume.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/meta.json b/Resources/Textures/White/Clothing/OuterClothing/Coats/adidascostume.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/Coats/adidascostume.rsi/meta.json rename to Resources/Textures/White/Clothing/OuterClothing/Coats/adidascostume.rsi/meta.json From 11e94fc08a41eadace43245856f7348f754b3979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=86=D0=B2=D0=B0=D0=BD=20=D0=9E=D0=BD=D1=96=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=BA=D0=BE?= Date: Fri, 13 Dec 2024 23:56:14 +0300 Subject: [PATCH 03/10] =?UTF-8?q?-=20changed=20id=20to=20of=20Adidas=20cos?= =?UTF-8?q?tume:=20adidascostume=20->=20ClothingOuterCoat=D0=90didascostum?= =?UTF-8?q?e=20-=20added=20Adidas=20costume=20to=20Clothing=20vending=20ma?= =?UTF-8?q?chine.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Catalog/VendingMachines/Inventories/clothesmate.yml | 1 + .../_White/Entities/Clothing/OuterClothing/adidascostume.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 4c9966db91..eb608178d2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -65,6 +65,7 @@ ClothingUniformJumpsuitHawaiYellow: 2 ClothingUniformJumpsuitFlannel: 2 #WD edit start + ClothingOuterCoatАdidascostume: 1 ClothingUniformJumpsuitCossack: 1 ClothingOuterCoatBomber: 1 ClothingOuterWinterCoat: 1 diff --git a/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/adidascostume.yml b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/adidascostume.yml index 54a728555c..28b99e05da 100644 --- a/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/adidascostume.yml +++ b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/adidascostume.yml @@ -1,6 +1,6 @@ - type: entity parent: ClothingOuterStorageBase - id: adidascostume + id: ClothingOuterCoatАdidascostume name: Серый спортивный костюм description: Когда-то костюмы Абибаса были очень популярны. Сейчас же это больше культурное наследие. Странно, почему так хочется семечек? components: From 7eea717fe56c53d8dce619b7af6fc6ea64a4c715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=86=D0=B2=D0=B0=D0=BD=20=D0=9E=D0=BD=D1=96=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=BA=D0=BE?= Date: Sat, 14 Dec 2024 02:06:20 +0300 Subject: [PATCH 04/10] - added search box for vending machine ui. WARNING! needs refactoring. or not --- .../VendingMachineBoundUserInterface.cs | 26 ++++++++++++++++--- .../_White/Economy/Ui/VendingMenu.xaml | 8 +++++- .../_White/Economy/Ui/VendingMenu.xaml.cs | 13 +++++++--- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs index c3105c33a3..a4162593f9 100644 --- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs +++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs @@ -15,10 +15,11 @@ namespace Content.Client.VendingMachines [ViewVariables] private List _cachedFilteredIndex = new(); + private VendingMachineComponent component = new();//WD edit public VendingMachineBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } - + protected override void Open() { base.Open(); @@ -26,7 +27,7 @@ namespace Content.Client.VendingMachines var vendingMachineSys = EntMan.System(); // WD EDIT START - var component = EntMan.GetComponent(Owner); + component = EntMan.GetComponent(Owner); _cachedInventory = vendingMachineSys.GetAllInventory(Owner, component); _menu = new VendingMenu { Title = EntMan.GetComponent(Owner).EntityName }; @@ -34,6 +35,7 @@ namespace Content.Client.VendingMachines _menu.OnClose += Close; _menu.OnItemSelected += OnItemSelected; _menu.OnWithdraw += SendMessage; + _menu.SearchBar.OnTextChanged += UpdateFilter; // WD EDIT END _menu.Populate(_cachedInventory, component.PriceMultiplier, component.Credits); @@ -41,6 +43,24 @@ namespace Content.Client.VendingMachines _menu.OpenCenteredLeft(); } + // WD EDIT START + private void UpdateFilter(Robust.Client.UserInterface.Controls.LineEdit.LineEditEventArgs obj) + { + if (_menu != null) + { + _menu.filter = obj.Text; + _menu.Populate(_cachedInventory, component.PriceMultiplier, component.Credits); + } + } + // WD EDIT END + + + + + + + + protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); @@ -84,7 +104,7 @@ namespace Content.Client.VendingMachines private void OnSearchChanged(string? filter) { - //_menu?.Populate(_cachedInventory, out _cachedFilteredIndex, filter); + //_menu?.filter = (filter ?? ""); } } } diff --git a/Content.Client/_White/Economy/Ui/VendingMenu.xaml b/Content.Client/_White/Economy/Ui/VendingMenu.xaml index ed32cf30aa..bd6991b3b6 100644 --- a/Content.Client/_White/Economy/Ui/VendingMenu.xaml +++ b/Content.Client/_White/Economy/Ui/VendingMenu.xaml @@ -1,4 +1,7 @@ - + + + +