From b8ee4581885e51897e2b4f0b7171c6926f6b7576 Mon Sep 17 00:00:00 2001 From: deepdarkdepths <155149356+deepdarkdepths@users.noreply.github.com> Date: Fri, 19 Jul 2024 05:04:43 -0400 Subject: [PATCH 001/108] Remove geras description in Slime Person guidebook page (#30140) remove entry --- Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml b/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml index 2c11508749..976ab472a9 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml @@ -10,16 +10,8 @@ They exhale nitrous oxide and are unaffected by it. Their body can process 6 reagents at the same time instead of just 2. - Slimepeople can morph into a [bold]"geras"[/bold] (an archaic slimefolk term), which is a smaller slime form that can [bold]pass through grilles[/bold], - but forces them to drop their inventory and held items. It's handy for a quick getaway. A geras is small enough to pick up (with two hands) - and fits in a duffelbag. - - - - - Slimepeople have an [bold]internal 2x3 storage inventory[/bold] inside of their slime membrane. Anyone can see what's inside and take it out of you without asking, - so be careful. They [bold]don't drop their internal storage when they morph into a geras, however![/bold] + so be careful. Slimepeople have slight accelerated regeneration compared to other humanoids. They're also capable of hardening their fists, and as such have stronger punches, although they punch a little slower. From c4b6917cfcc315d4bcfb365fd615a487c2d28283 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 19 Jul 2024 09:05:50 +0000 Subject: [PATCH 002/108] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 74a116880f..88915109f5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: cooldolphin - changes: - - message: Three variants of glasses are now available in the loadout menu. - type: Add - id: 6435 - time: '2024-04-25T23:18:39.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27286 - author: EmoGarbage404 changes: - message: Traitors now have the correct number of objectives. @@ -3805,3 +3798,10 @@ id: 6934 time: '2024-07-19T01:08:52.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30115 +- author: deepdarkdepths + changes: + - message: Removed the description about geras in the Slime guidebook section. + type: Remove + id: 6935 + time: '2024-07-19T09:04:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30140 From 93dc22b67da22267c4e60600ea68a6b5deae6b0c Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Fri, 19 Jul 2024 04:38:26 -0500 Subject: [PATCH 003/108] Add the Syndicate Raid Suit (#29845) * Syndicate Raid Suit * Raid suit speed and whitelist * Fix copyright for the syndicate raid helmet --- .../Locale/en-US/store/uplink-catalog.ftl | 3 + .../Catalog/Fills/Backpacks/duffelbag.yml | 13 ++++ .../Prototypes/Catalog/uplink_catalog.yml | 16 ++++ .../Entities/Clothing/Head/helmets.yml | 18 +++++ .../Entities/Clothing/OuterClothing/armor.yml | 72 ++++++++++++++++++ .../syndie-raid.rsi/equipped-HELMET-vox.png | Bin 0 -> 464 bytes .../syndie-raid.rsi/equipped-HELMET.png | Bin 0 -> 439 bytes .../Head/Helmets/syndie-raid.rsi/icon.png | Bin 0 -> 289 bytes .../Helmets/syndie-raid.rsi/inhand-left.png | Bin 0 -> 388 bytes .../Helmets/syndie-raid.rsi/inhand-right.png | Bin 0 -> 376 bytes .../Head/Helmets/syndie-raid.rsi/meta.json | 30 ++++++++ .../equipped-OUTERCLOTHING-light-vox.png | Bin 0 -> 264 bytes .../equipped-OUTERCLOTHING-light.png | Bin 0 -> 268 bytes .../equipped-OUTERCLOTHING-vox.png | Bin 0 -> 743 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 740 bytes .../Armor/syndie-raid.rsi/icon.png | Bin 0 -> 349 bytes .../Armor/syndie-raid.rsi/inhand-left.png | Bin 0 -> 422 bytes .../Armor/syndie-raid.rsi/inhand-right.png | Bin 0 -> 412 bytes .../Armor/syndie-raid.rsi/light-overlay.png | Bin 0 -> 199 bytes .../Armor/syndie-raid.rsi/meta.json | 41 ++++++++++ 20 files changed, 193 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light-vox.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/light-overlay.png create mode 100644 Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 2598970cef..8edbde9bdc 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -318,6 +318,9 @@ uplink-hardsuit-carp-desc = Looks like an ordinary carp suit, except fully space uplink-hardsuit-syndie-name = Syndicate Hardsuit uplink-hardsuit-syndie-desc = The Syndicate's well known armored blood red hardsuit, capable of space walks and bullet resistant. +uplink-syndie-raid-name = Syndicate Raid Suit +uplink-syndie-raid-desc = A very durable and reasonably flexible suit of blood-red armor, reinforced against all common forms of damage but not capable of space walks. Comes with a sick helmet. + uplink-hardsuit-syndieelite-name = Syndicate Elite Hardsuit uplink-hardsuit-syndieelite-desc = An elite version of the blood-red hardsuit, with improved mobility and fireproofing. Property of Gorlex Marauders. diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index ae57ea6342..71d3f00df3 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -247,6 +247,19 @@ - id: DoubleEmergencyOxygenTankFilled - id: DoubleEmergencyNitrogenTankFilled +- type: entity + parent: ClothingBackpackDuffelSyndicateBundle + id: ClothingBackpackDuffelSyndicateRaidBundle + name: syndicate raid suit bundle + description: "Contains the Syndicate's durable raid armor suit." + components: + - type: StorageFill + contents: + - id: ClothingOuterArmorRaid + - id: ClothingHeadHelmetRaid + - id: ClothingMaskGasSyndicate + - id: ClothingHandsGlovesCombat + - type: entity parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicateHardsuitBundle diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index c9dc048cd3..420982dcae 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1298,6 +1298,22 @@ categories: - UplinkWearables +- type: listing + id: UplinkClothingOuterArmorRaid + name: uplink-syndie-raid-name + description: uplink-syndie-raid-desc + icon: { sprite: /Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi, state: icon } + productEntity: ClothingBackpackDuffelSyndicateRaidBundle + cost: + Telecrystal: 8 + categories: + - UplinkWearables + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - type: listing id: UplinkHardsuitSyndieElite name: uplink-hardsuit-syndieelite-name diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index a01d6fae51..b44508d4a3 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -357,6 +357,24 @@ - type: Clothing sprite: Clothing/Head/Helmets/ert_janitor.rsi +- type: entity + parent: ClothingHeadHelmetBasic + id: ClothingHeadHelmetRaid + name: syndicate raid helmet + description: An armored helmet for use with the syndicate raid suit. Very stylish. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/syndie-raid.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/syndie-raid.rsi + - type: Armor + modifiers: #There's gotta be SOME reason to use this over other helmets. + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.85 + Heat: 0.85 + #Bone Helmet - type: entity parent: ClothingHeadHelmetBasic diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 606af0b127..6de0c78220 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -99,6 +99,78 @@ reflects: - Energy +- type: entity + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + id: ClothingOuterArmorRaid + name: syndicate raid suit + description: A somewhat flexible and well-armored suit with a powerful shoulder mounted flashlight manufactured in the Gorlex Marauder's iconic blood-red color scheme, it does not protect it's wearer from space. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi + layers: + - state: icon + - state: light-overlay + visible: false + shader: unshaded + - type: Clothing + sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.35 + Slash: 0.35 + Piercing: 0.35 + Heat: 0.35 + Caustic: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.35 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + #Shoulder mounted flashlight + - type: ToggleableLightVisuals + spriteLayer: light + clothingVisuals: + outerClothing: + - state: equipped-OUTERCLOTHING-light + shader: unshaded + - type: Appearance + - type: HandheldLight + addPrefix: false + blinkingBehaviourId: blinking + radiatingBehaviourId: radiating + - type: PointLight + enabled: false + color: "#80ff80" + radius: 5 + energy: 2 + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + netsync: false + - type: LightBehaviour + behaviours: + - !type:FadeBehaviour + id: radiating + interpolate: Linear + maxDuration: 2.0 + startValue: 3.0 + endValue: 2.0 + isLooped: true + reverseWhenFinished: true + - !type:PulseBehaviour + id: blinking + interpolate: Nearest + maxDuration: 1.0 + minValue: 0.1 + maxValue: 2.0 + isLooped: true + - type: Battery + maxCharge: 600 + startingCharge: 600 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 2 + - type: entity parent: ClothingOuterBaseLarge id: ClothingOuterArmorCult diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..c7ab17e261db024cc28cc4bd39ccd9b5c96b9e2c GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~u2Ka=ydOBK|D5)edGlyE*WV*T^^$qqgFsxVCZusA@-rNePDzB9}XD2{24z1g*gj6B8wRq_>O=u<5X=vX`rQwo-U3d5$KYp zo1ahp)c&2EIj1>9HZ?vtR&m=uQ~n`y)x$JBlT(?8f81hY)r)t=;*IBdW1O3>m)3D1K|TW(6Tw5}F070Fl7`&Bbh>b$(8 z!l7TUpR=4Ut$MT~Do_0lqmk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~u2Ka=ydOBK|D5)edGlyE*WV*T^^$qqgFsxVCZusA@-rNePDzB9}XD2{24z1g*gj6B8wRq_zr?F*gaY|`gSWBu+v0fK#xHIwTw0HJA9&^9ExzxN|qQxZc_WQbyUk7uTqjob2MX5H| TzhwLcw4K4z)z4*}Q$iB}x@KnK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/syndie-raid.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e8db961b7709cc1d13fba055e3128a3caa51f270 GIT binary patch literal 388 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}zdOBK|D5)edGlyE*9Q6(MFfgoF*KYXV0F;*(J!=G{I7@>3g8xGS zL$H5^5J<4VBeIx*f$snaGiF`ulFziEw{A?KIzE1s;~l)=&TAW6Um`I_5oP zMUekIXO3+%UFMi=kuPlIZs3k#Sks`XZ+Do*@Z5F%=TlbB6L9p3ICs3gAy)1^ci03k zt6xD&6sP`kxa!1W`Yr$HDweJP|G%|gp}&D6V3stm;1cEMH9fOu^xV3Wu_j?!Npp{H z1pC&l`%Evmacn!2m5{x!8)!q!1EvQ}`?*hi32r>e$IohJUC=mZ!k0Gk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}zdOBK|D5)edGlyE*9Q6(MFfgoF*KYXV0F;*(J!=G{I7@>3g8xGS zL$H5^5J<4VBeIx*f$snaGiF`uVFq{;NbRCFAJD{u<7Ts+qlFrREavMK94z3&HQ23@(aD*ce`Jke-+62SM_CGP3a1t zfg%kI9ZVnO4@iB!`!-)FG+x3?U*4l4*S99W|N`g~UXwE0V; zL~L4A#JFaiIk0I`^NUSSHu*6yxF3?5S9x>mwPL%XH2+muJq1VgW)$BG$(`~^`xkHO1>s-RwWNGrB=3e_GPZzmMvTy?$^1B+LS|ih_pf4;%)4?`V&Qj9jjvm;SU%sg@>jsA zeu?uE-c^FnKAhYeHM=n2c^-4upN%5k@7e#)oVHP_b3V{s5K#Yfc-Naxt2eHf4lp~m z*#F?luN7;p3QjrSmArB3PQxM}2cB{^w`X-=wbPA!^A&?kn+1*Z7JvjiUHx3vIVCg! E0L}ztoB#j- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..1ab6e6cfefe51dee46c988f49638bdb6991abdd1 GIT binary patch literal 743 zcmV?P)Px#1ZP1_K>z@;j|==^1poj5Ay7MMqCTIaN74 zNH8$~006-buL}SG01I?dPE-H?|NsC0|NsC007_2*@&Et;32;bRa{vGi!2kdb!2!6D zYwZ940ys%TK~z{r?N-~8>>volRiozrKX@A?33%Dm);SORFrCV%w01xph0cG(N8lsC z_@4r=T0u+K^QqGpMXAKt%Mq77Qe1vEP)yvSl=Dg<=A77vkTTuA7y-&DQeZ$Rn@=c& zKR_Rze*_}N7X}opkBS|C*9uWMj-%iWL`AI+m@gH4g@WN9DM(j+$~?aFMIOgLA;5wA zp+yK3TCJs(TASss8l`kQP(zaSun@krR`5Fh7Qhre0&b-RM3FtH@`m`hpcP_EX!>Z| zgTQwW!V~x{An4lw8$sJ6mb}#}*o1gcs>K6#rnBd*K!yUQr!4j%W6e8(gxx}AwUHTX z-qd+<2-AlJQ;P=(<#z%+{iYm&>2qa=6{wXNEoNX9h3~}$D}YZ2{apdd7|PpeBft{Z z&k{YhAwnnchSdjtC9uLr;3L5Ja{}{W{02XO;@6wPm_4}u5qH*$z?41M{x~&Ll#^c# z1B8lcd#G{>aOD7MaS(!&19$J)x*Xb^Bpho2W`cB53&RTVH;#iZ*JTWW?_G#{|C|8C zabj|UpausaY8~d;g@Y>tXEwW_76&0(+g~hbME2lE0eIkZ2iw5CPwc|xV&EGC4j=+c zJ2i$Zw$=wMsYw7KZf#_S002ovPDHLkV1h+HHWUB= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..e6a0733e3e7a11c8d9eb3f1203348634d169174b GIT binary patch literal 740 zcmVPx#1ZP1_K>z@;j|==^1poj5Ay7vPg zlxW}gf=8;>dZP2S)QLZ8g@|i~L#<3yto4NO=v|=U_*1GBu2#ymKX_)yOJN@Pw?HYG z_oL*CgzyakHiXzl{w+W`9RXBMmswQ4wN~&r{t!r*f}^;VRuDD`BB=UcD_jLo;bx_q z69{~dfRA3l=t$Tmf@|lFB|jR4@`kcl!;V5iZ=QD%KmnVqgb}QGC$M3+P}xF(74HSG zI(Us(V8M?D%SVDJ!*fB`W?CR8APZ=}OR(~ub^`d0`p+8J2jJyrfD@3x@q_}a0sIT0 zZ`d8M0nF;~0#8^B@H>G8J^~*B!G8BzMr{AQFH)Nq$fx0p;K`@}q!A;K0KDZ{`Ff2sqHD zH}nx?s+u2I!vv)&`Q*X94yLE+^==IllxmpjXbv_eT8j_yT+hQ~EHu z-(?2^O(7g6^X6_==mqZJ1?2L761csc*t~X0000B9}XD2{24z1g*gj6B8wRq_zr_Go-U3d7XEK11o9nL;BlVI%Jldj z`@GA`RM%YnW}C^kBEeR{^qBbH##qjVBS{xoJ~UVW-hB4pr}agAMMoY}hL&`rDUtLY2t7Di867xAXpqHaJ8kuCuk- zE79KnL5!itljSH!%T^|y)e(ZnQa-zj9e8YFcUbV4^?@xmdfTLab36R3{K;Y=#C=_M e!wdEX!#IO?%1Re@d_4_xIfJLGpUXO@geCxweu13; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..64d25308ab68dab7296df91bbd2c646a2ef7698b GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}zCNVQN{BNjN*EUg7*(%59?`WCn>K8JN?v*SZ zX&$$@MDMfTFJ5eH{Gh02z?jG+ETB`7l6k0vTmQ}qH3~CuF-aCJgyYjbohQ0ZG{kWivL!KKf_g!Ntwcwsq92n5LU%8{3=eky@ z1?P*kul_eWiR!Vg*>k9g$NolHKc|nwi~}r3;yFdGuBct7?d+6UF2Xqf_tFPbx$=tl zKNUIC&XTv>;qX`CM?2-27b`X%Z?X_CiFsL**4Ne&=*{t}c)#k_&%F*@mza52zxRJ| zb?iA&yg&JZ2ve@df-*hUt8A$rJ97QY*L=u!T6l{an^LB{Ts5 D1;C-U literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..fd3c44d4ad09e49a525fcb1f0e7f0ddd22400859 GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}zCNVQN{BNjN*EUg7*(%59?`WCn>KB*Ojew1a#t3Op{mLmU79Pl|SMv67hF zd-L$ON`YlhDnA?u_$4I1!=bQ|TSS}T)b8~&Bx@@!nj1gg%dlv2pu=mg+uNodHF;&g z^h}^ca0Y*4ua%FJNV1QnTb8oG+#4C4UsqN$y6`GQIMr1(_DXpK>?;$TvEpNsLtpwU zJ?2Hs3K#y{{woj&P4N0w-?+k{bN*u{aSgqK#!ux;1ybAz!V?ZJ&`4m+VOpvo(>;eH zf?+m;9+!tgE!lvI6;>1s;*b3=DjSK$uZf!>a)(7~|>U7!u+B_EI8Og91<6!<#4fM7~bDcP7o} zgL}(F!K=Ry{5WDi+nMo$)GX6qg)2^eHjHKd@%piBG{?N%v)WYCS0B}y%FVm$X=poh qNGWqzX2|2qcE33p85sWgrLaa6iMXCUbW#Fn4}+(xpUXO@geCyZ)kISO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json new file mode 100644 index 0000000000..ff590848da --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by alzore_(Discord) for SS14 using the colors of the blood-red hardsuit", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "light-overlay" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-light", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-light-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From e7911c3720bc6feb0c5ca5313645300b2b03f3e3 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 19 Jul 2024 09:39:32 +0000 Subject: [PATCH 004/108] Automatic changelog update --- Resources/Changelog/Changelog.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 88915109f5..762d5d942d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,16 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Traitors now have the correct number of objectives. - type: Fix - - message: Declaring war now gives TC again. - type: Fix - - message: Latejoining antagonists will now properly exclude command and security - staff. - type: Fix - id: 6436 - time: '2024-04-26T00:25:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27319 - author: Tayrtahn changes: - message: Fixed Bibles not healing. @@ -3805,3 +3793,11 @@ id: 6935 time: '2024-07-19T09:04:43.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30140 +- author: Blackern5000 + changes: + - message: Nuclear operatives are now able to purchase durable armor which is NOT + space-proof. + type: Add + id: 6936 + time: '2024-07-19T09:38:26.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29845 From eaace152aeb30622849826572f2aab62f5575d3a Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Fri, 19 Jul 2024 11:42:58 +0200 Subject: [PATCH 005/108] Fix EmbeddableProjectileComponent and ThrowingAngleComponent interaction (#30112) * fix embeddable offset with throwing angle * number --- Content.Shared/Projectiles/SharedProjectileSystem.cs | 5 ++++- .../Prototypes/Entities/Objects/Weapons/Melee/spear.yml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs index b718c3a690..1f6f2b6918 100644 --- a/Content.Shared/Projectiles/SharedProjectileSystem.cs +++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs @@ -120,7 +120,10 @@ public abstract partial class SharedProjectileSystem : EntitySystem if (component.Offset != Vector2.Zero) { - _transform.SetLocalPosition(uid, xform.LocalPosition + xform.LocalRotation.RotateVec(component.Offset), + var rotation = xform.LocalRotation; + if (TryComp(uid, out var throwingAngleComp)) + rotation += throwingAngleComp.Angle; + _transform.SetLocalPosition(uid, xform.LocalPosition + rotation.RotateVec(component.Offset), xform); } diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index ea2e73ac15..608fb2544a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -5,7 +5,7 @@ description: Definition of a Classic. Keeping murder affordable since 200,000 BCE. components: - type: EmbeddableProjectile - offset: 0.15,0.15 + offset: -0.15,0.0 - type: ThrowingAngle angle: 225 - type: LandAtCursor From 58e5a7a6686c508578a547dd02f97ed4a9056d61 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 19 Jul 2024 09:44:04 +0000 Subject: [PATCH 006/108] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 762d5d942d..bf3d66cace 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: Tayrtahn - changes: - - message: Fixed Bibles not healing. - type: Fix - - message: Fixed quick insert and area insert not working on ore/plant/trash bags. - type: Fix - id: 6437 - time: '2024-04-26T02:25:52.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27234 - author: SkaldetSkaeg changes: - message: The handheld radio no longer plays a message spoken into it. @@ -3801,3 +3792,10 @@ id: 6936 time: '2024-07-19T09:38:26.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29845 +- author: Plykiya, slarticodefast + changes: + - message: Explosive pens now correctly embed into their target. + type: Fix + id: 6937 + time: '2024-07-19T09:42:58.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30112 From f2b9cd7a2536d75f52a4e5554524884d603a1c64 Mon Sep 17 00:00:00 2001 From: DakotaGay Date: Fri, 19 Jul 2024 16:18:39 +0200 Subject: [PATCH 007/108] Fix Markup Tags in Station News (#30169) * Fix (hopefully) * Fixed Spelling Mistake and minor Code Cleanup * Revert "Fixed Spelling Mistake and minor Code Cleanup" due to Pull Request Guidelines This reverts commit cee3e0226b349187bd8fd8b639e161fb877e8bdb. --- .../CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs index f3b2d373d7..2d4d192ea8 100644 --- a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs +++ b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs @@ -31,7 +31,7 @@ public sealed partial class NewsReaderUiFragment : BoxContainer Author.Visible = true; PageName.Text = article.Title; - PageText.SetMarkup(article.Content); + PageText.SetMarkupPermissive(article.Content); PageNum.Text = $"{targetNum}/{totalNum}"; From 3c7d14ad50b06341366d411f4727fa92e3339d4d Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 19 Jul 2024 14:19:45 +0000 Subject: [PATCH 008/108] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index bf3d66cace..dc929e08dc 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: SkaldetSkaeg - changes: - - message: The handheld radio no longer plays a message spoken into it. - type: Tweak - id: 6438 - time: '2024-04-26T07:34:20.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27046 - author: FungiFellow changes: - message: Added SecBelt whitelist to Sec webbing @@ -3799,3 +3792,11 @@ id: 6937 time: '2024-07-19T09:42:58.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30112 +- author: ThatOneEnby1337 + changes: + - message: News Reporters are now able to use markup tags in their reports without + bricking the PDAs of readers + type: Fix + id: 6938 + time: '2024-07-19T14:18:39.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30169 From 5dfca4c2dce672b629a08e026f6763fd38f0ca99 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Fri, 19 Jul 2024 22:31:26 -0400 Subject: [PATCH 009/108] Fix mailing unit UI (#30174) --- Content.Client/Disposal/UI/MailingUnitWindow.xaml.cs | 9 +++++++-- Content.Server/Disposal/Mailing/MailingUnitSystem.cs | 5 +++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Content.Client/Disposal/UI/MailingUnitWindow.xaml.cs b/Content.Client/Disposal/UI/MailingUnitWindow.xaml.cs index 797e20ae7d..489d749a0c 100644 --- a/Content.Client/Disposal/UI/MailingUnitWindow.xaml.cs +++ b/Content.Client/Disposal/UI/MailingUnitWindow.xaml.cs @@ -2,6 +2,7 @@ using Content.Shared.Disposal; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; +using Robust.Shared.Timing; namespace Content.Client.Disposal.UI { @@ -11,6 +12,8 @@ namespace Content.Client.Disposal.UI [GenerateTypedNameReferences] public sealed partial class MailingUnitWindow : DefaultWindow { + public TimeSpan FullPressure; + public MailingUnitWindow() { RobustXamlLoader.Load(this); @@ -26,6 +29,7 @@ namespace Content.Client.Disposal.UI Title = Loc.GetString("ui-mailing-unit-window-title", ("tag", state.Tag ?? " ")); UnitState.Text = disposalState.UnitState; + FullPressure = disposalState.FullPressureTime; var pressureReached = PressureBar.UpdatePressure(disposalState.FullPressureTime); Power.Pressed = disposalState.Powered; Engage.Pressed = disposalState.Engaged; @@ -42,9 +46,10 @@ namespace Content.Client.Disposal.UI return !disposalState.Powered || pressureReached; } - public bool UpdatePressure(TimeSpan stateFullPressureTime) + protected override void FrameUpdate(FrameEventArgs args) { - return PressureBar.UpdatePressure(stateFullPressureTime); + base.FrameUpdate(args); + PressureBar.UpdatePressure(FullPressure); } } } diff --git a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs index e1fbdbf089..6249b9497d 100644 --- a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs +++ b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs @@ -9,6 +9,7 @@ using Content.Shared.Disposal; using Content.Shared.Interaction; using Robust.Server.GameObjects; using Robust.Shared.Player; +using Robust.Shared.Utility; namespace Content.Server.Disposal.Mailing; @@ -35,7 +36,7 @@ public sealed class MailingUnitSystem : EntitySystem SubscribeLocalEvent(OnPacketReceived); SubscribeLocalEvent(OnBeforeFlush); SubscribeLocalEvent(OnConfigurationUpdated); - SubscribeLocalEvent(HandleActivate); + SubscribeLocalEvent(HandleActivate, before: new[] { typeof(DisposalUnitSystem) }); SubscribeLocalEvent(OnDisposalUnitUIStateChange); SubscribeLocalEvent(OnTargetSelected); } @@ -179,7 +180,7 @@ public sealed class MailingUnitSystem : EntitySystem if (component.DisposalUnitInterfaceState == null) return; - var state = new MailingUnitBoundUserInterfaceState(component.DisposalUnitInterfaceState, component.Target, component.TargetList, component.Tag); + var state = new MailingUnitBoundUserInterfaceState(component.DisposalUnitInterfaceState, component.Target, component.TargetList.ShallowClone(), component.Tag); _userInterfaceSystem.SetUiState(uid, MailingUnitUiKey.Key, state); } From 93eeab2d10f3320aaf5e6533a3ae8a78320582ff Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 20 Jul 2024 02:32:34 +0000 Subject: [PATCH 010/108] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index dc929e08dc..fcbbd0bc20 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: FungiFellow - changes: - - message: Added SecBelt whitelist to Sec webbing - type: Tweak - - message: Added more Ammo holders to SecBelt whitelist - type: Tweak - id: 6439 - time: '2024-04-26T07:44:41.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27303 - author: IlyaElDunaev changes: - message: Ammonia heal blood loss in the Rat King @@ -3800,3 +3791,10 @@ id: 6938 time: '2024-07-19T14:18:39.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30169 +- author: themias + changes: + - message: Mailing units are functional again + type: Fix + id: 6939 + time: '2024-07-20T02:31:26.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30174 From e6b171645c2f880a36ff23ca87933e91ba53ebcc Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Fri, 19 Jul 2024 22:59:31 -0400 Subject: [PATCH 011/108] Give NukeOps Reinforcements an ID Card (in a PDA) (#28088) * Give NukeOps Reinforcements an ID Card (in a PDA) * add warning comment * create syndicateoperativegeatreinforcementnukeops in traitor.yml * revert fun/misc_startinggear.yml --- Resources/Prototypes/Entities/Mobs/Player/human.yml | 2 ++ Resources/Prototypes/Roles/Antags/traitor.yml | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index 0b26668e10..cb0203ebe0 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -38,6 +38,8 @@ id: MobHumanSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink suffix: Human, NukeOps components: + - type: Loadout + prototypes: [SyndicateOperativeGearReinforcementNukeOps] - type: NukeOperative # Nuclear Operative diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml index 205f04b05e..59390d2b10 100644 --- a/Resources/Prototypes/Roles/Antags/traitor.yml +++ b/Resources/Prototypes/Roles/Antags/traitor.yml @@ -36,6 +36,13 @@ - PinpointerSyndicateNuclear - DeathAcidifierImplanter +# Syndicate Reinforcement NukeOps +- type: startingGear + id: SyndicateOperativeGearReinforcementNukeOps + parent: SyndicateOperativeGearExtremelyBasic + equipment: + id: SyndiPDA #Do not give a PDA to the normal Reinforcement - it will spawn with a 20TC uplink + #Syndicate Operative Outfit - Basic - type: startingGear id: SyndicateOperativeGearBasic From aedf52f8ecc6bcce00a04580a26fdf0baf7d0155 Mon Sep 17 00:00:00 2001 From: JIPDawg <51352440+JIPDawg@users.noreply.github.com> Date: Fri, 19 Jul 2024 22:00:00 -0500 Subject: [PATCH 012/108] Removed references to pipestacking and changed example setup in Guidebook (#30181) Removed references to pipestacking and changed example setup Co-authored-by: JIP --- Resources/ServerInfo/Guidebook/Engineering/TEG.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/ServerInfo/Guidebook/Engineering/TEG.xml b/Resources/ServerInfo/Guidebook/Engineering/TEG.xml index 63a62fecf8..786990c92f 100644 --- a/Resources/ServerInfo/Guidebook/Engineering/TEG.xml +++ b/Resources/ServerInfo/Guidebook/Engineering/TEG.xml @@ -70,7 +70,7 @@ - The Space Vent - The Scrubber Array - Here is one layer of an example setup: (pipes can and do need to be layered under the scrubbers below to connect them!) + Here is one layer of an example setup: @@ -81,15 +81,15 @@ - - + + - - + + From 7683acab5e112a2674ce14d4cdd55a1c8c7f8a1e Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Fri, 19 Jul 2024 20:00:28 -0700 Subject: [PATCH 013/108] Fix Chameleon Scarf menu being blank (#30156) fixa the scarfa Co-authored-by: plykiya --- .../Prototypes/Entities/Clothing/Neck/base_clothingneck.yml | 1 + Resources/Prototypes/Entities/Clothing/Neck/specific.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml index d7f04f49bc..608f061dd8 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml @@ -39,3 +39,4 @@ tags: - Scarf - ClothMade + - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Clothing/Neck/specific.yml b/Resources/Prototypes/Entities/Clothing/Neck/specific.yml index 56fddceaad..b98cdd02e0 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/specific.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: ClothingNeckBase id: ClothingNeckChameleon name: striped red scarf @@ -12,7 +12,7 @@ - type: Clothing sprite: Clothing/Neck/Scarfs/red.rsi - type: ChameleonClothing - slot: [neck] + slot: [NECK] default: ClothingNeckScarfStripedRed - type: UserInterface interfaces: From a2b021dffb89bdd2754832f860d117ec27ca9fcc Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 20 Jul 2024 03:01:35 +0000 Subject: [PATCH 014/108] Automatic changelog update --- Resources/Changelog/Changelog.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index fcbbd0bc20..09ab407edd 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,18 +1,4 @@ Entries: -- author: IlyaElDunaev - changes: - - message: Ammonia heal blood loss in the Rat King - type: Add - id: 6440 - time: '2024-04-26T07:47:02.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26887 -- author: FungiFellow - changes: - - message: Added Quiver Recipe, go wild Robin Hood. - type: Add - id: 6441 - time: '2024-04-26T07:48:15.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27198 - author: Boaz1111 changes: - message: Refactored Cluster's medbay, including cryo in the bottom left room @@ -3798,3 +3784,17 @@ id: 6939 time: '2024-07-20T02:31:26.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30174 +- author: Ghagliiarghii + changes: + - message: Nuclear Operatives' Reinforcements now have a PDA! + type: Tweak + id: 6940 + time: '2024-07-20T02:59:31.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28088 +- author: Plykiya + changes: + - message: Chameleon scarves now work again. + type: Fix + id: 6941 + time: '2024-07-20T03:00:28.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30156 From 78f3ffc2a45a4b74449478cd9dde4f319610b0df Mon Sep 17 00:00:00 2001 From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Date: Fri, 19 Jul 2024 20:03:43 -0700 Subject: [PATCH 015/108] Make ActionsSystem.UpdateAction public (#30056) --- Content.Client/Actions/ActionsSystem.cs | 2 +- Content.Shared/Actions/SharedActionsSystem.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs index aff6c1ff7b..7f261f5df2 100644 --- a/Content.Client/Actions/ActionsSystem.cs +++ b/Content.Client/Actions/ActionsSystem.cs @@ -107,7 +107,7 @@ namespace Content.Client.Actions UpdateAction(uid, component); } - protected override void UpdateAction(EntityUid? actionId, BaseActionComponent? action = null) + public override void UpdateAction(EntityUid? actionId, BaseActionComponent? action = null) { if (!ResolveActionData(actionId, ref action)) return; diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs index ca6bd1dcc2..0033078b1b 100644 --- a/Content.Shared/Actions/SharedActionsSystem.cs +++ b/Content.Shared/Actions/SharedActionsSystem.cs @@ -237,7 +237,7 @@ public abstract class SharedActionsSystem : EntitySystem } #region ComponentStateManagement - protected virtual void UpdateAction(EntityUid? actionId, BaseActionComponent? action = null) + public virtual void UpdateAction(EntityUid? actionId, BaseActionComponent? action = null) { // See client-side code. } From 6972bc26a703954921b32dd190db69192103ce10 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Sat, 20 Jul 2024 05:18:34 +0200 Subject: [PATCH 016/108] Directional Fans (#27772) * Initial commit * Description update * Updated texture --- .../Piping/Atmospherics/special.yml | 29 ++++++++++++++++++ .../Atmospherics/directionalfan.rsi/icon.png | Bin 0 -> 16522 bytes .../Atmospherics/directionalfan.rsi/meta.json | 29 ++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi/icon.png create mode 100644 Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml index 4eec014f11..eff831fa9e 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml @@ -25,3 +25,32 @@ - type: Tag tags: - SpreaderIgnore + +- type: entity + id: AtmosDeviceFanDirectional + name: directional fan + description: A thin fan, stopping the movement of gases across it. + placement: + mode: SnapgridCenter + components: + - type: Transform + anchored: true + - type: Physics + bodyType: Static + - type: Sprite + sprite: Structures/Piping/Atmospherics/directionalfan.rsi + state: icon + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.48,-0.48,0.48,-0.40" + - type: Airtight + noAirWhenFullyAirBlocked: false + airBlockedDirection: + - South + - type: Clickable + - type: Tag + tags: + - SpreaderIgnore diff --git a/Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi/icon.png b/Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..577175edcd281daf52757d9005f3b4be3bc4794c GIT binary patch literal 16522 zcmeI4e{j>*9l#Y}nVSJ)Sv%-p;5sl^!ItFT7Pdng2a+qM88IbrkVKK?L=ao9C1WQW zNk&I0U4b5D3#F_b9lNF+bjOVXWn`h0(k*mZDWM%SgpH1L%lJ`XSs*3Jo@^&}UYvL7 z+PmF)vd)&i@B6;r?|Yx`(^t|T^2Yo{3&y2=I}O9Iae29p#b946eHE$T_f0!}3heIj z=Pna4Z2Sr7oAT4y<0oU7mEl~4Vxe;(#qeGY?dD5aP1x%Py@4(>?5CO4tf(wy%Q&A+ zb^W)EDkbN(sg@d?gwvnRmUFpP0k)uOk&CHX%~;&3OnaI&OaTX8R-~0-Z-q~w!ZuaJ zF9nXJW?ZF=bP-qER9R9$WuY@)nau}Sr9op>HeimQM3VblYusLhMR5FsyUgSLSFlQdDY$Wn-A z$O`64Wd~SV>{-kDXr;59|=8SAK?6P(;_`0 zFNu8<{J0s)!w0;yXy?3i8H@XUWmY`in9y@zRZ-b|1s?#zV(mIBo~${km4j!3(z4F- zF{}WRAtWRTq$+aaK17!dZtYi8aCVRsjhk~*jMhMyXb+<{)1*%AaqCI7nIz3>nkm&< zbe2*E99VJbbOlE7kw~5*t%GAEP5?DRDe+DxmFE*g8cZP15g88$#-nFJKqG5W8wfX{ z_GtBHwb@LwU{&aeQjd`_(PnpKH4HY7k1Xc8KYGmd$fp_|S%Ucx*N+4^P_pTYgg&2* zW;8?+H$y_@a#C(9A@EW*3fRX6x5jfDDXxAxAh1&Du&MfM$3Qg(T?anaNC~27Mk>p8 zMmn=u0C-Sqd|0p|iu4-ZiNJfr5FKE%%D_1@lA;y$ zI@k<$pZvT4j3Q@W1@}1;A<%0+UmEn5QkpdDb!s=Q*Q*&F_$hUhMzzUgwivWV3(1hi z{xtu$X)q9!&e&gE|95GSfJdV<<+QJib=&d&ne{jPUuAAY6)-yC&ziZUm&GqZ=Avif z;F{Qfl^9w>tlPZL5ngjG#^MSN(#p6XAZSs>h2{fkWn2&tv?$|3 z^MSN7E(i!(lyRZ?Kw23W1OzS0xX^qct&9r-f)-_5Xg-iu#svXEi!v@WA4n_Xf`Fh! zB(Ajho5QRRye=F9?*-q=^KJs~6f2qB#ZC;XngQNTejLN@^nv|9Ff2%5SVswlQQI+W zBEPlxt@#)>dRLw!%N0I<<>&i-yNP>qF6N#oymr@CuzT0`)ST1R?W^uRoqzbbb=P-g zYtDH#DNb*_e2$s_rp4Jh9X~m<^^N_1tempoM;`^+)0NoBx1)Qp_s_3*K6O#k^}daPv*q;_Z7o+P9IrpDU=&#$-Pxc~^^$Kg1sQ4Y3K7)`soAN ziap(rVLCgW5<-nRUe+5w4}#ed;hiCJ>54x zEx3-Y?#cZ18Pph^-RSkM7Eo0&#Zp1@YbY% zb&;F9GfVb4t9H!N-gjl~TwjCY#{K5E7w$Y*-TX?4x3AdqU|}{m8fSTVoq@RT9T!pX z#=@^;-f?}BQFiLUv==tJUVLueJZz-f7;Mn?`%`!8pS7)No!ZcQxBkV;o39HSoByaUVF*5Z~FQvZ(rU` zWUeZ!T>gjGTd>_z>$Xx@pRl4Sr;&a*>X5Eb%$1JjXMh%&5IrXW%Ji_iWo&Q#8K!hj?EAuiV%?trD-fQggSfa%1?P*?1D>VvO8@bquK*7$JWM@7BqosAb#4vz08#-78EH}4PE rckfNJn-#U-p9N|$|H9s}*t_3+K)CStye-nd1?1%{a=iLb$-4gl(nVV- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi/meta.json new file mode 100644 index 0000000000..217a9f3d78 --- /dev/null +++ b/Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by SlamBamActionman", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 4, + "delays":[ + [ + 0.01,0.01,0.01,0.01 + ], + [ + 0.01,0.01,0.01,0.01 + ], + [ + 0.01,0.01,0.01,0.01 + ], + [ + 0.01,0.01,0.01,0.01 + ] + ] + } + ] +} From 8be13bf4955b43221c6537986dd4a72b4b87ebdb Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sat, 20 Jul 2024 03:23:46 +0000 Subject: [PATCH 017/108] fix fish petting misprediction (#30175) * make fish petting ignore use delay * m * troll --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Friends/Systems/PettableFriendSystem.cs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Content.Shared/Friends/Systems/PettableFriendSystem.cs b/Content.Shared/Friends/Systems/PettableFriendSystem.cs index 00a4ddd155..6e41f4bdea 100644 --- a/Content.Shared/Friends/Systems/PettableFriendSystem.cs +++ b/Content.Shared/Friends/Systems/PettableFriendSystem.cs @@ -32,23 +32,23 @@ public sealed class PettableFriendSystem : EntitySystem { var (uid, comp) = ent; var user = args.User; - if (args.Handled || !_exceptionQuery.TryGetComponent(uid, out var exceptionComp)) - return; - - if (_useDelayQuery.TryGetComponent(uid, out var useDelay) && !_useDelay.TryResetDelay((uid, useDelay), true)) + if (args.Handled || !_exceptionQuery.TryComp(uid, out var exceptionComp)) return; var exception = (uid, exceptionComp); - if (_factionException.IsIgnored(exception, user)) + if (!_factionException.IsIgnored(exception, user)) { - _popup.PopupClient(Loc.GetString(comp.FailureString, ("target", uid)), user, user); + // you have made a new friend :) + _popup.PopupClient(Loc.GetString(comp.SuccessString, ("target", uid)), user, user); + _factionException.IgnoreEntity(exception, user); + args.Handled = true; return; } - // you have made a new friend :) - _popup.PopupClient(Loc.GetString(comp.SuccessString, ("target", uid)), user, user); - _factionException.IgnoreEntity(exception, user); - args.Handled = true; + if (_useDelayQuery.TryComp(uid, out var useDelay) && !_useDelay.TryResetDelay((uid, useDelay), true)) + return; + + _popup.PopupClient(Loc.GetString(comp.FailureString, ("target", uid)), user, user); } private void OnRehydrated(Entity ent, ref GotRehydratedEvent args) From b04f98513c498c9994caaa7c8412e67a19dc6c3e Mon Sep 17 00:00:00 2001 From: CaasGit <87243814+CaasGit@users.noreply.github.com> Date: Fri, 19 Jul 2024 20:36:22 -0700 Subject: [PATCH 018/108] fix(FaxVisualsSystem): Fax can Play() when a anim key has been added. (#30013) Adds a check to see if a faxecute animation is being played before playing another animation. The old code can thrown an exception which I've seen on live while ghosting. --- Content.Client/Fax/System/FaxVisualsSystem.cs | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/Content.Client/Fax/System/FaxVisualsSystem.cs b/Content.Client/Fax/System/FaxVisualsSystem.cs index 892aec1d95..e752fbf48e 100644 --- a/Content.Client/Fax/System/FaxVisualsSystem.cs +++ b/Content.Client/Fax/System/FaxVisualsSystem.cs @@ -25,24 +25,30 @@ public sealed class FaxVisualsSystem : EntitySystem if (args.Sprite == null) return; - if (_appearance.TryGetData(uid, FaxMachineVisuals.VisualState, out FaxMachineVisualState visuals) && visuals == FaxMachineVisualState.Inserting) + if (_player.HasRunningAnimation(uid, "faxecute")) + return; + + if (_appearance.TryGetData(uid, FaxMachineVisuals.VisualState, out FaxMachineVisualState visuals) && + visuals == FaxMachineVisualState.Inserting) { - _player.Play(uid, new Animation() - { - Length = TimeSpan.FromSeconds(2.4), - AnimationTracks = + _player.Play(uid, + new Animation() { - new AnimationTrackSpriteFlick() + Length = TimeSpan.FromSeconds(2.4), + AnimationTracks = { - LayerKey = FaxMachineVisuals.VisualState, - KeyFrames = + new AnimationTrackSpriteFlick() { - new AnimationTrackSpriteFlick.KeyFrame(component.InsertingState, 0f), - new AnimationTrackSpriteFlick.KeyFrame("icon", 2.4f), - } - } - } - }, "faxecute"); + LayerKey = FaxMachineVisuals.VisualState, + KeyFrames = + { + new AnimationTrackSpriteFlick.KeyFrame(component.InsertingState, 0f), + new AnimationTrackSpriteFlick.KeyFrame("icon", 2.4f), + }, + }, + }, + }, + "faxecute"); } } } From 1783e0e4c2dc9e376c4fc1da91628e90d72e0c8a Mon Sep 17 00:00:00 2001 From: eoineoineoin Date: Sat, 20 Jul 2024 04:54:36 +0100 Subject: [PATCH 019/108] Add a background for OptionsButton popup (#29792) Add a reasonable background for OptionsButton popup Co-authored-by: Eoin Mcloughlin Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> --- Content.Client/Stylesheets/StyleNano.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs index b9a4e63f31..dba48a119d 100644 --- a/Content.Client/Stylesheets/StyleNano.cs +++ b/Content.Client/Stylesheets/StyleNano.cs @@ -1343,6 +1343,9 @@ namespace Content.Client.Stylesheets new StyleProperty(Label.StylePropertyAlignMode, Label.AlignMode.Center), }), + Element().Class(OptionButton.StyleClassOptionsBackground) + .Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat(Color.FromHex("#25252A"))), + new StyleRule(new SelectorElement(typeof(PanelContainer), new []{ ClassHighDivider}, null, null), new [] { new StyleProperty(PanelContainer.StylePropertyPanel, new StyleBoxFlat { BackgroundColor = NanoGold, ContentMarginBottomOverride = 2, ContentMarginLeftOverride = 2}), From 4aba9ec131a0fc716f985cff6476b6755df49e8c Mon Sep 17 00:00:00 2001 From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Date: Fri, 19 Jul 2024 20:58:33 -0700 Subject: [PATCH 020/108] Fix NPC line of sight not working if trying to ranged target a blocking entity (#30055) --- Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs index 10ec54c895..d7196ea73c 100644 --- a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs +++ b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs @@ -1,7 +1,6 @@ using Content.Server.NPC.Components; using Content.Shared.CombatMode; using Content.Shared.Interaction; -using Content.Shared.Physics; using Content.Shared.Weapons.Ranged.Components; using Content.Shared.Weapons.Ranged.Events; using Robust.Shared.Map; @@ -134,7 +133,7 @@ public sealed partial class NPCCombatSystem { comp.LOSAccumulator += UnoccludedCooldown; // For consistency with NPC steering. - comp.TargetInLOS = _interaction.InRangeUnobstructed(uid, Transform(comp.Target).Coordinates, distance + 0.1f); + comp.TargetInLOS = _interaction.InRangeUnobstructed(uid, comp.Target, distance + 0.1f); } if (!comp.TargetInLOS) From cbf329a82d77eed2bb5e51666dab5d8a21fd3fff Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sat, 20 Jul 2024 15:40:16 +1000 Subject: [PATCH 021/108] Remove some BUI boilerplate (#28399) * Remove some BUI boilerplate - The disposals overrides got removed due to the helper method handling it. - Replace window creation with CreateWindow helper. - Fixed some stinky code which would cause exceptions. * More * moar * weh * done * More BUIs * More updates * weh * moar * look who it is * weh * merge * weh * fixes --- .../UI/AccessOverriderBoundUserInterface.cs | 45 +++-- .../Access/UI/AccessOverriderWindow.xaml.cs | 41 ++--- .../UI/AgentIDCardBoundUserInterface.cs | 19 +- .../Access/UI/AgentIDCardWindow.xaml.cs | 10 +- .../Ame/UI/AmeControllerBoundUserInterface.cs | 16 +- Content.Client/Ame/UI/AmeWindow.xaml.cs | 19 +- .../Ui/AnomalyGeneratorBoundUserInterface.cs | 20 +- .../Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs | 8 +- Content.Client/Arcade/BlockGameMenu.cs | 45 +++-- .../Arcade/SpaceVillainArcadeMenu.cs | 45 ++--- .../Arcade/UI/BlockGameBoundUserInterface.cs | 5 +- .../SpaceVillainArcadeBoundUserInterface.cs | 16 +- .../Monitor/UI/AirAlarmBoundUserInterface.cs | 12 +- .../Atmos/Monitor/UI/AirAlarmWindow.xaml.cs | 7 +- .../Atmos/UI/GasCanisterBoundUserInterface.cs | 9 +- .../Atmos/UI/GasFilterBoundUserInterface.cs | 11 +- .../Atmos/UI/GasFilterWindow.xaml.cs | 7 +- .../Atmos/UI/GasMixerBoundUserInteface.cs | 18 +- .../UI/GasPressurePumpBoundUserInterface.cs | 17 +- .../UI/GasThermomachineBoundUserInterface.cs | 17 +- .../UI/GasVolumePumpBoundUserInterface.cs | 19 +- .../Atmos/UI/SpaceHeaterBoundUserInterface.cs | 10 +- .../Jukebox/JukeboxBoundUserInterface.cs | 21 +-- .../CryostorageBoundUserInterface.cs | 15 +- .../CargoBountyConsoleBoundUserInterface.cs | 17 +- .../CargoPalletConsoleBoundUserInterface.cs | 15 +- .../CargoShuttleConsoleBoundUserInterface.cs | 24 +-- .../Cargo/UI/CargoShuttleMenu.xaml.cs | 13 +- .../UI/ChemMasterBoundUserInterface.cs | 20 +- .../UI/ReagentDispenserBoundUserInterface.cs | 27 +-- .../UI/TransferAmountBoundUserInterface.cs | 12 +- .../UI/CloningConsoleBoundUserInterface.cs | 25 +-- .../UI/ChameleonBoundUserInterface.cs | 16 +- ...CommunicationsConsoleBoundUserInterface.cs | 72 +++----- .../UI/CommunicationsConsoleMenu.xaml.cs | 79 ++++---- .../Computer/ComputerBoundUserInterface.cs | 15 +- .../UI/ConfigurationBoundUserInterface.cs | 28 +-- .../Configurable/UI/ConfigurationMenu.cs | 18 +- .../UI/FlatpackCreatorBoundUserInterface.cs | 14 +- .../UI/FlatpackCreatorMenu.xaml.cs | 13 +- .../Crayon/UI/CrayonBoundUserInterface.cs | 40 ++-- Content.Client/Crayon/UI/CrayonWindow.xaml.cs | 18 +- .../UI/DisposalRouterBoundUserInterface.cs | 22 +-- .../UI/DisposalTaggerBoundUserInterface.cs | 23 +-- .../DoorElectronicsBoundUserInterface.cs | 31 ++-- .../DoorElectronicsConfigurationMenu.xaml.cs | 21 ++- Content.Client/Fax/UI/FaxBoundUi.cs | 12 +- .../ForensicScannerBoundUserInterface.cs | 15 +- .../Gateway/UI/GatewayBoundUserInterface.cs | 16 +- .../Gateway/UI/GatewayWindow.xaml.cs | 10 +- .../UI/GravityGeneratorBoundUserInterface.cs | 23 +-- .../Gravity/UI/GravityGeneratorWindow.xaml.cs | 15 +- .../UI/HealthAnalyzerBoundUserInterface.cs | 23 +-- ...manoidMarkingModifierBoundUserInterface.cs | 4 +- .../Instruments/UI/BandMenu.xaml.cs | 6 +- .../Instruments/UI/ChannelsMenu.xaml.cs | 5 +- .../UI/InstrumentBoundUserInterface.cs | 36 +++- .../Instruments/UI/InstrumentMenu.xaml.cs | 171 ++++++++++-------- .../Inventory/StrippableBoundUserInterface.cs | 25 ++- Content.Client/Kitchen/UI/GrinderMenu.xaml.cs | 42 ++--- .../Kitchen/UI/MicrowaveBoundUserInterface.cs | 43 +---- .../Kitchen/UI/MicrowaveMenu.xaml.cs | 24 ++- .../UI/ReagentGrinderBoundUserInterface.cs | 34 ++-- .../UI/HandLabelerBoundUserInterface.cs | 16 +- .../Lathe/UI/LatheBoundUserInterface.cs | 17 +- Content.Client/Lathe/UI/LatheMenu.xaml.cs | 29 +-- .../UI/SignalTimerBoundUserInterface.cs | 24 +-- .../UI/SignalTimerWindow.xaml.cs | 24 +-- .../MagicMirrorBoundUserInterface.cs | 15 +- .../Ui/NewsWriterBoundUserInterface.cs | 18 +- .../MassMedia/Ui/NewsWriterMenu.xaml.cs | 6 +- .../Mech/Ui/MechBoundUserInterface.cs | 16 +- Content.Client/Mech/Ui/MechMenu.xaml.cs | 9 +- .../CrewMonitoringBoundUserInterface.cs | 18 +- .../CrewMonitoringWindow.xaml.cs | 17 +- .../NetworkConfiguratorBoundUserInterface.cs | 39 ++-- ...tworkConfiguratorConfigurationMenu.xaml.cs | 8 +- .../NetworkConfiguratorDeviceList.xaml.cs | 12 +- .../NetworkConfiguratorLinkMenu.xaml.cs | 16 +- .../NetworkConfiguratorListMenu.xaml.cs | 13 +- Content.Client/Nuke/NukeBoundUserInterface.cs | 17 +- .../WarDeclaratorBoundUserInterface.cs | 18 +- .../NukeOps/WarDeclaratorWindow.xaml.cs | 9 +- Content.Client/PDA/PdaBoundUserInterface.cs | 17 +- .../PDA/Ringer/RingerBoundUserInterface.cs | 4 +- .../Paper/UI/PaperBoundUserInterface.cs | 17 +- Content.Client/Paper/UI/PaperWindow.xaml.cs | 6 +- .../ParticleAcceleratorBoundUserInterface.cs | 16 +- .../UI/ParticleAcceleratorControlMenu.cs | 30 +-- .../UI/NavMapBeaconBoundUserInterface.cs | 16 +- .../Pinpointer/UI/NavMapBeaconWindow.xaml.cs | 25 ++- .../UI/StationMapBoundUserInterface.cs | 15 +- .../Pinpointer/UI/StationMapWindow.xaml.cs | 11 +- .../UI/UntrackedMapBoundUserInterface.cs | 15 +- .../Power/APC/ApcBoundUserInterface.cs | 16 +- Content.Client/Power/APC/UI/ApcMenu.xaml.cs | 12 +- .../Power/Generator/GeneratorWindow.xaml.cs | 52 +++--- .../PortableGeneratorBoundUserInterface.cs | 25 ++- ...owerMonitoringConsoleBoundUserInterface.cs | 19 +- .../PowerMonitoringWindow.xaml.Widgets.cs | 6 +- .../Power/PowerMonitoringWindow.xaml.cs | 86 +++++---- Content.Client/RCD/RCDMenu.xaml.cs | 35 ++-- .../RCD/RCDMenuBoundUserInterface.cs | 16 +- .../Radio/Ui/IntercomBoundUserInterface.cs | 20 +- Content.Client/Radio/Ui/IntercomMenu.xaml.cs | 4 +- .../UI/DiskConsoleBoundUserInterface.cs | 15 +- .../UI/ResearchClientBoundUserInterface.cs | 16 +- .../ResearchClientServerSelectionMenu.xaml.cs | 11 +- .../UI/ResearchConsoleBoundUserInterface.cs | 28 +-- .../Research/UI/ResearchConsoleMenu.xaml.cs | 31 ++-- .../UI/RoboticsConsoleBoundUserInterface.cs | 18 +- .../Robotics/UI/RoboticsConsoleWindow.xaml.cs | 25 ++- ...vageExpeditionConsoleBoundUserInterface.cs | 12 +- .../UI/SalvageMagnetBoundUserInterface.cs | 21 +-- .../BUI/IFFConsoleBoundUserInterface.cs | 4 +- .../BUI/RadarConsoleBoundUserInterface.cs | 14 +- .../BUI/ShuttleConsoleBoundUserInterface.cs | 5 +- .../Silicons/Borgs/BorgBoundUserInterface.cs | 18 +- Content.Client/Silicons/Borgs/BorgMenu.xaml | 2 +- .../Silicons/Borgs/BorgMenu.xaml.cs | 51 +++--- .../Laws/Ui/SiliconLawBoundUserInterface.cs | 14 +- .../UI/SprayPainterBoundUserInterface.cs | 27 +-- ...lStationRecordConsoleBoundUserInterface.cs | 13 +- .../Store/Ui/StoreBoundUserInterface.cs | 15 +- Content.Client/Strip/StrippingMenu.cs | 11 +- .../UI/SurveillanceCameraMonitorBoundUi.cs | 11 +- .../Thief/ThiefBackpackBoundUserInterface.cs | 19 +- .../Thief/ThiefBackpackMenu.xaml.cs | 28 ++- .../GasTank/GasTankBoundUserInterface.cs | 11 +- .../Systems/Atmos/GasTank/GasTankWindow.cs | 43 +++-- .../VendingMachineBoundUserInterface.cs | 8 +- .../VoiceMask/VoiceMaskBoundUserInterface.cs | 8 +- .../VoiceMaskNameChangeWindow.xaml.cs | 6 +- .../Melee/UI/MeleeSpeechBoundUserInterface.cs | 10 +- .../Wires/UI/WiresBoundUserInterface.cs | 7 +- Content.Client/Wires/UI/WiresMenu.cs | 16 +- .../Ui/AnalysisConsoleBoundUserInterface.cs | 6 +- 137 files changed, 1094 insertions(+), 1753 deletions(-) diff --git a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs index c1b63dc4d0..d80c600c03 100644 --- a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs +++ b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Access; using Content.Shared.Access.Components; using Content.Shared.Access.Systems; using Content.Shared.Containers.ItemSlots; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; using static Content.Shared.Access.Components.AccessOverriderComponent; @@ -23,6 +24,28 @@ namespace Content.Client.Access.UI { base.Open(); + _window = this.CreateWindow(); + RefreshAccess(); + _window.Title = EntMan.GetComponent(Owner).EntityName; + _window.OnSubmit += SubmitData; + + _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId)); + } + + public override void OnProtoReload(PrototypesReloadedEventArgs args) + { + base.OnProtoReload(args); + if (!args.WasModified()) + return; + + RefreshAccess(); + + if (State != null) + _window?.UpdateState(_prototypeManager, (AccessOverriderBoundUserInterfaceState) State); + } + + private void RefreshAccess() + { List> accessLevels; if (EntMan.TryGetComponent(Owner, out var accessOverrider)) @@ -30,38 +53,20 @@ namespace Content.Client.Access.UI accessLevels = accessOverrider.AccessLevels; accessLevels.Sort(); } - else { accessLevels = new List>(); _accessOverriderSystem.Log.Error($"No AccessOverrider component found for {EntMan.ToPrettyString(Owner)}!"); } - _window = new AccessOverriderWindow(this, _prototypeManager, accessLevels) - { - Title = EntMan.GetComponent(Owner).EntityName - }; - - _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId)); - - _window.OnClose += Close; - _window.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _window?.Dispose(); + _window?.SetAccessLevels(_prototypeManager, accessLevels); } protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); var castState = (AccessOverriderBoundUserInterfaceState) state; - _window?.UpdateState(castState); + _window?.UpdateState(_prototypeManager, castState); } public void SubmitData(List> newAccessList) diff --git a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs index 6025c3b551..ba08771858 100644 --- a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs +++ b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs @@ -13,26 +13,24 @@ namespace Content.Client.Access.UI [GenerateTypedNameReferences] public sealed partial class AccessOverriderWindow : DefaultWindow { - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - - private readonly AccessOverriderBoundUserInterface _owner; private readonly Dictionary _accessButtons = new(); - public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototypeManager prototypeManager, - List> accessLevels) + public event Action>>? OnSubmit; + + public AccessOverriderWindow() { RobustXamlLoader.Load(this); - IoCManager.InjectDependencies(this); - var logMill = _logManager.GetSawmill(SharedAccessOverriderSystem.Sawmill); + } - _owner = owner; + public void SetAccessLevels(IPrototypeManager protoManager, List> accessLevels) + { + _accessButtons.Clear(); + AccessLevelGrid.DisposeAllChildren(); foreach (var access in accessLevels) { - if (!prototypeManager.TryIndex(access, out var accessLevel)) + if (!protoManager.TryIndex(access, out var accessLevel)) { - logMill.Error($"Unable to find accesslevel for {access}"); continue; } @@ -44,11 +42,16 @@ namespace Content.Client.Access.UI AccessLevelGrid.AddChild(newButton); _accessButtons.Add(accessLevel.ID, newButton); - newButton.OnPressed += _ => SubmitData(); + newButton.OnPressed += _ => + { + OnSubmit?.Invoke( + // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair + _accessButtons.Where(x => x.Value.Pressed).Select(x => new ProtoId(x.Key)).ToList()); + }; } } - public void UpdateState(AccessOverriderBoundUserInterfaceState state) + public void UpdateState(IPrototypeManager protoManager, AccessOverriderBoundUserInterfaceState state) { PrivilegedIdLabel.Text = state.PrivilegedIdName; PrivilegedIdButton.Text = state.IsPrivilegedIdPresent @@ -66,11 +69,11 @@ namespace Content.Client.Access.UI if (state.MissingPrivilegesList != null && state.MissingPrivilegesList.Any()) { - List missingPrivileges = new List(); + var missingPrivileges = new List(); foreach (string tag in state.MissingPrivilegesList) { - string privilege = Loc.GetString(_prototypeManager.Index(tag)?.Name ?? "generic-unknown"); + var privilege = Loc.GetString(protoManager.Index(tag)?.Name ?? "generic-unknown"); missingPrivileges.Add(privilege); } @@ -90,13 +93,5 @@ namespace Content.Client.Access.UI } } } - - private void SubmitData() - { - _owner.SubmitData( - - // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair - _accessButtons.Where(x => x.Value.Pressed).Select(x => new ProtoId(x.Key)).ToList()); - } } } diff --git a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs index 761f52988a..50add43dc9 100644 --- a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs +++ b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Access.Systems; using Content.Shared.StatusIcon; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.Access.UI @@ -20,16 +21,11 @@ namespace Content.Client.Access.UI { base.Open(); - _window?.Dispose(); - _window = new AgentIDCardWindow(this); - if (State != null) - UpdateState(State); + _window = this.CreateWindow(); - _window.OpenCentered(); - - _window.OnClose += Close; _window.OnNameChanged += OnNameChanged; _window.OnJobChanged += OnJobChanged; + _window.OnJobIconChanged += OnJobIconChanged; } private void OnNameChanged(string newName) @@ -61,14 +57,5 @@ namespace Content.Client.Access.UI _window.SetCurrentJob(cast.CurrentJob); _window.SetAllowedIcons(cast.Icons, cast.CurrentJobIconId); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _window?.Dispose(); - } } } diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs index 6d0b2a184f..071ce41a06 100644 --- a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs +++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs @@ -17,19 +17,19 @@ namespace Content.Client.Access.UI [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IEntitySystemManager _entitySystem = default!; private readonly SpriteSystem _spriteSystem; - private readonly AgentIDCardBoundUserInterface _bui; private const int JobIconColumnCount = 10; public event Action? OnNameChanged; public event Action? OnJobChanged; - public AgentIDCardWindow(AgentIDCardBoundUserInterface bui) + public event Action>? OnJobIconChanged; + + public AgentIDCardWindow() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); _spriteSystem = _entitySystem.GetEntitySystem(); - _bui = bui; NameLineEdit.OnTextEntered += e => OnNameChanged?.Invoke(e.Text); NameLineEdit.OnFocusExit += e => OnNameChanged?.Invoke(e.Text); @@ -67,7 +67,7 @@ namespace Content.Client.Access.UI }; // Generate buttons textures - TextureRect jobIconTexture = new TextureRect + var jobIconTexture = new TextureRect { Texture = _spriteSystem.Frame0(jobIcon.Icon), TextureScale = new Vector2(2.5f, 2.5f), @@ -75,7 +75,7 @@ namespace Content.Client.Access.UI }; jobIconButton.AddChild(jobIconTexture); - jobIconButton.OnPressed += _ => _bui.OnJobIconChanged(jobIconId); + jobIconButton.OnPressed += _ => OnJobIconChanged?.Invoke(jobIcon.ID); IconGrid.AddChild(jobIconButton); if (jobIconId.Equals(currentJobIconId)) diff --git a/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs b/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs index e84cf5d34d..3d65f75189 100644 --- a/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs +++ b/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Ame.Components; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Ame.UI { @@ -16,9 +17,8 @@ namespace Content.Client.Ame.UI { base.Open(); - _window = new AmeWindow(this); - _window.OnClose += Close; - _window.OpenCentered(); + _window = this.CreateWindow(); + _window.OnAmeButton += ButtonPressed; } /// @@ -40,15 +40,5 @@ namespace Content.Client.Ame.UI { SendMessage(new UiButtonPressedMessage(button)); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _window?.Dispose(); - } - } } } diff --git a/Content.Client/Ame/UI/AmeWindow.xaml.cs b/Content.Client/Ame/UI/AmeWindow.xaml.cs index 8b91ec5966..d6d580bcda 100644 --- a/Content.Client/Ame/UI/AmeWindow.xaml.cs +++ b/Content.Client/Ame/UI/AmeWindow.xaml.cs @@ -1,3 +1,4 @@ +using System.Linq; using Content.Client.UserInterface; using Content.Shared.Ame.Components; using Robust.Client.AutoGenerated; @@ -9,15 +10,17 @@ namespace Content.Client.Ame.UI [GenerateTypedNameReferences] public sealed partial class AmeWindow : DefaultWindow { - public AmeWindow(AmeControllerBoundUserInterface ui) + public event Action? OnAmeButton; + + public AmeWindow() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - EjectButton.OnPressed += _ => ui.ButtonPressed(UiButton.Eject); - ToggleInjection.OnPressed += _ => ui.ButtonPressed(UiButton.ToggleInjection); - IncreaseFuelButton.OnPressed += _ => ui.ButtonPressed(UiButton.IncreaseFuel); - DecreaseFuelButton.OnPressed += _ => ui.ButtonPressed(UiButton.DecreaseFuel); + EjectButton.OnPressed += _ => OnAmeButton?.Invoke(UiButton.Eject); + ToggleInjection.OnPressed += _ => OnAmeButton?.Invoke(UiButton.ToggleInjection); + IncreaseFuelButton.OnPressed += _ => OnAmeButton?.Invoke(UiButton.IncreaseFuel); + DecreaseFuelButton.OnPressed += _ => OnAmeButton?.Invoke(UiButton.DecreaseFuel); } /// @@ -29,7 +32,7 @@ namespace Content.Client.Ame.UI var castState = (AmeControllerBoundUserInterfaceState) state; // Disable all buttons if not powered - if (Contents.Children != null) + if (Contents.Children.Any()) { ButtonHelpers.SetButtonDisabledRecursive(Contents, !castState.HasPower); EjectButton.Disabled = false; @@ -65,8 +68,8 @@ namespace Content.Client.Ame.UI CoreCount.Text = $"{castState.CoreCount}"; InjectionAmount.Text = $"{castState.InjectionAmount}"; // format power statistics to pretty numbers - CurrentPowerSupply.Text = $"{castState.CurrentPowerSupply.ToString("N1")}"; - TargetedPowerSupply.Text = $"{castState.TargetedPowerSupply.ToString("N1")}"; + CurrentPowerSupply.Text = $"{castState.CurrentPowerSupply:N1}"; + TargetedPowerSupply.Text = $"{castState.TargetedPowerSupply:N1}"; } } } diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs index 5764d0a097..5d1985485c 100644 --- a/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs +++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Anomaly; using Content.Shared.Gravity; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Anomaly.Ui; @@ -18,10 +19,8 @@ public sealed class AnomalyGeneratorBoundUserInterface : BoundUserInterface { base.Open(); - _window = new(Owner); - - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); + _window.SetEntity(Owner); _window.OnGenerateButtonPressed += () => { @@ -37,18 +36,5 @@ public sealed class AnomalyGeneratorBoundUserInterface : BoundUserInterface return; _window?.UpdateState(msg); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - - _window?.Dispose(); - } - - public void SetPowerSwitch(bool on) - { - SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(on)); - } } diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs index 08438e2a1b..82d41192dd 100644 --- a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs +++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs @@ -18,17 +18,21 @@ public sealed partial class AnomalyGeneratorWindow : FancyWindow public Action? OnGenerateButtonPressed; - public AnomalyGeneratorWindow(EntityUid gen) + public AnomalyGeneratorWindow() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - EntityView.SetEntity(gen); EntityView.SpriteOffset = false; GenerateButton.OnPressed += _ => OnGenerateButtonPressed?.Invoke(); } + public void SetEntity(EntityUid uid) + { + EntityView.SetEntity(uid); + } + public void UpdateState(AnomalyGeneratorUserInterfaceState state) { _cooldownEnd = state.CooldownEndTime; diff --git a/Content.Client/Arcade/BlockGameMenu.cs b/Content.Client/Arcade/BlockGameMenu.cs index eeda2a3102..4a579fc4bf 100644 --- a/Content.Client/Arcade/BlockGameMenu.cs +++ b/Content.Client/Arcade/BlockGameMenu.cs @@ -28,8 +28,6 @@ namespace Content.Client.Arcade private static readonly Vector2 BlockSize = new(15, 15); - private readonly BlockGameBoundUserInterface _owner; - private readonly PanelContainer _mainPanel; private readonly BoxContainer _gameRootContainer; @@ -58,10 +56,11 @@ namespace Content.Client.Arcade private bool _isPlayer = false; private bool _gameOver = false; - public BlockGameMenu(BlockGameBoundUserInterface owner) + public event Action? OnAction; + + public BlockGameMenu() { Title = Loc.GetString("blockgame-menu-title"); - _owner = owner; MinSize = SetSize = new Vector2(410, 490); @@ -176,7 +175,7 @@ namespace Content.Client.Arcade }; _newGameButton.OnPressed += (e) => { - _owner.SendAction(BlockGamePlayerAction.NewGame); + OnAction?.Invoke(BlockGamePlayerAction.NewGame); }; pauseMenuContainer.AddChild(_newGameButton); pauseMenuContainer.AddChild(new Control { MinSize = new Vector2(1, 10) }); @@ -186,7 +185,10 @@ namespace Content.Client.Arcade Text = Loc.GetString("blockgame-menu-button-scoreboard"), TextAlign = Label.AlignMode.Center }; - _scoreBoardButton.OnPressed += (e) => _owner.SendAction(BlockGamePlayerAction.ShowHighscores); + _scoreBoardButton.OnPressed += (e) => + { + OnAction?.Invoke(BlockGamePlayerAction.ShowHighscores); + }; pauseMenuContainer.AddChild(_scoreBoardButton); _unpauseButtonMargin = new Control { MinSize = new Vector2(1, 10), Visible = false }; pauseMenuContainer.AddChild(_unpauseButtonMargin); @@ -199,7 +201,7 @@ namespace Content.Client.Arcade }; _unpauseButton.OnPressed += (e) => { - _owner.SendAction(BlockGamePlayerAction.Unpause); + OnAction?.Invoke(BlockGamePlayerAction.Unpause); }; pauseMenuContainer.AddChild(_unpauseButton); @@ -257,7 +259,7 @@ namespace Content.Client.Arcade }; _finalNewGameButton.OnPressed += (e) => { - _owner.SendAction(BlockGamePlayerAction.NewGame); + OnAction?.Invoke(BlockGamePlayerAction.NewGame); }; gameOverMenuContainer.AddChild(_finalNewGameButton); @@ -327,7 +329,10 @@ namespace Content.Client.Arcade Text = Loc.GetString("blockgame-menu-button-back"), TextAlign = Label.AlignMode.Center }; - _highscoreBackButton.OnPressed += (e) => _owner.SendAction(BlockGamePlayerAction.Pause); + _highscoreBackButton.OnPressed += (e) => + { + OnAction?.Invoke(BlockGamePlayerAction.Pause); + }; menuContainer.AddChild(_highscoreBackButton); menuInnerPanel.AddChild(menuContainer); @@ -473,7 +478,7 @@ namespace Content.Client.Arcade private void TryPause() { - _owner.SendAction(BlockGamePlayerAction.Pause); + OnAction?.Invoke(BlockGamePlayerAction.Pause); } public void SetStarted() @@ -576,19 +581,19 @@ namespace Content.Client.Arcade return; else if (args.Function == ContentKeyFunctions.ArcadeLeft) - _owner.SendAction(BlockGamePlayerAction.StartLeft); + OnAction?.Invoke(BlockGamePlayerAction.StartLeft); else if (args.Function == ContentKeyFunctions.ArcadeRight) - _owner.SendAction(BlockGamePlayerAction.StartRight); + OnAction?.Invoke(BlockGamePlayerAction.StartRight); else if (args.Function == ContentKeyFunctions.ArcadeUp) - _owner.SendAction(BlockGamePlayerAction.Rotate); + OnAction?.Invoke(BlockGamePlayerAction.Rotate); else if (args.Function == ContentKeyFunctions.Arcade3) - _owner.SendAction(BlockGamePlayerAction.CounterRotate); + OnAction?.Invoke(BlockGamePlayerAction.CounterRotate); else if (args.Function == ContentKeyFunctions.ArcadeDown) - _owner.SendAction(BlockGamePlayerAction.SoftdropStart); + OnAction?.Invoke(BlockGamePlayerAction.SoftdropStart); else if (args.Function == ContentKeyFunctions.Arcade2) - _owner.SendAction(BlockGamePlayerAction.Hold); + OnAction?.Invoke(BlockGamePlayerAction.Hold); else if (args.Function == ContentKeyFunctions.Arcade1) - _owner.SendAction(BlockGamePlayerAction.Harddrop); + OnAction?.Invoke(BlockGamePlayerAction.Harddrop); } protected override void KeyBindUp(GUIBoundKeyEventArgs args) @@ -599,11 +604,11 @@ namespace Content.Client.Arcade return; else if (args.Function == ContentKeyFunctions.ArcadeLeft) - _owner.SendAction(BlockGamePlayerAction.EndLeft); + OnAction?.Invoke(BlockGamePlayerAction.EndLeft); else if (args.Function == ContentKeyFunctions.ArcadeRight) - _owner.SendAction(BlockGamePlayerAction.EndRight); + OnAction?.Invoke(BlockGamePlayerAction.EndRight); else if (args.Function == ContentKeyFunctions.ArcadeDown) - _owner.SendAction(BlockGamePlayerAction.SoftdropEnd); + OnAction?.Invoke(BlockGamePlayerAction.SoftdropEnd); } public void UpdateNextBlock(BlockGameBlock[] blocks) diff --git a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs index e5542a5848..1ee4c26818 100644 --- a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs +++ b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs @@ -8,8 +8,6 @@ namespace Content.Client.Arcade { public sealed class SpaceVillainArcadeMenu : DefaultWindow { - public SpaceVillainArcadeBoundUserInterface Owner { get; set; } - private readonly Label _enemyNameLabel; private readonly Label _playerInfoLabel; private readonly Label _enemyInfoLabel; @@ -17,11 +15,13 @@ namespace Content.Client.Arcade private readonly Label _enemyActionLabel; private readonly Button[] _gameButtons = new Button[3]; //used to disable/enable all game buttons - public SpaceVillainArcadeMenu(SpaceVillainArcadeBoundUserInterface owner) + + public event Action? OnPlayerAction; + + public SpaceVillainArcadeMenu() { MinSize = SetSize = new Vector2(300, 225); Title = Loc.GetString("spacevillain-menu-title"); - Owner = owner; var grid = new GridContainer { Columns = 1 }; @@ -47,32 +47,43 @@ namespace Content.Client.Arcade grid.AddChild(_enemyActionLabel); var buttonGrid = new GridContainer { Columns = 3 }; - _gameButtons[0] = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.Attack) + _gameButtons[0] = new Button() { Text = Loc.GetString("spacevillain-menu-button-attack") }; + + _gameButtons[0].OnPressed += + _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.Attack); buttonGrid.AddChild(_gameButtons[0]); - _gameButtons[1] = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.Heal) + _gameButtons[1] = new Button() { Text = Loc.GetString("spacevillain-menu-button-heal") }; + + _gameButtons[1].OnPressed += + _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.Heal); buttonGrid.AddChild(_gameButtons[1]); - _gameButtons[2] = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.Recharge) + _gameButtons[2] = new Button() { Text = Loc.GetString("spacevillain-menu-button-recharge") }; + + _gameButtons[2].OnPressed += + _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.Recharge); buttonGrid.AddChild(_gameButtons[2]); centerContainer = new CenterContainer(); centerContainer.AddChild(buttonGrid); grid.AddChild(centerContainer); - var newGame = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.NewGame) + var newGame = new Button() { Text = Loc.GetString("spacevillain-menu-button-new-game") }; + + newGame.OnPressed += _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.NewGame); grid.AddChild(newGame); Contents.AddChild(grid); @@ -99,23 +110,5 @@ namespace Content.Client.Arcade _playerActionLabel.Text = message.PlayerActionMessage; _enemyActionLabel.Text = message.EnemyActionMessage; } - - private sealed class ActionButton : Button - { - private readonly SpaceVillainArcadeBoundUserInterface _owner; - private readonly SharedSpaceVillainArcadeComponent.PlayerAction _playerAction; - - public ActionButton(SpaceVillainArcadeBoundUserInterface owner, SharedSpaceVillainArcadeComponent.PlayerAction playerAction) - { - _owner = owner; - _playerAction = playerAction; - OnPressed += Clicked; - } - - private void Clicked(ButtonEventArgs e) - { - _owner.SendAction(_playerAction); - } - } } } diff --git a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs index 1a3422dec0..8fa8035afd 100644 --- a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs +++ b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Arcade; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Arcade.UI; @@ -15,9 +16,7 @@ public sealed class BlockGameBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new BlockGameMenu(this); - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); } protected override void ReceiveMessage(BoundUserInterfaceMessage message) diff --git a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs index 40bbe8b2d8..c0704530de 100644 --- a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs +++ b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs @@ -1,4 +1,5 @@ using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; using static Content.Shared.Arcade.SharedSpaceVillainArcadeComponent; @@ -9,8 +10,6 @@ public sealed class SpaceVillainArcadeBoundUserInterface : BoundUserInterface { [ViewVariables] private SpaceVillainArcadeMenu? _menu; - //public SharedSpaceVillainArcadeComponent SpaceVillainArcade; - public SpaceVillainArcadeBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { SendAction(PlayerAction.RequestData); @@ -25,10 +24,7 @@ public sealed class SpaceVillainArcadeBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new SpaceVillainArcadeMenu(this); - - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); } protected override void ReceiveMessage(BoundUserInterfaceMessage message) @@ -36,12 +32,4 @@ public sealed class SpaceVillainArcadeBoundUserInterface : BoundUserInterface if (message is SpaceVillainArcadeDataUpdateMessage msg) _menu?.UpdateInfo(msg); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - _menu?.Dispose(); - } } diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs index 8f3b507c80..2ae1518835 100644 --- a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs +++ b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Atmos; using Content.Shared.Atmos.Monitor; using Content.Shared.Atmos.Monitor.Components; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; @@ -20,16 +21,9 @@ public sealed class AirAlarmBoundUserInterface : BoundUserInterface { base.Open(); - _window = new AirAlarmWindow(this); + _window = this.CreateWindow(); + _window.SetEntity(Owner); - if (State != null) - { - UpdateState(State); - } - - _window.OpenCentered(); - - _window.OnClose += Close; _window.AtmosDeviceDataChanged += OnDeviceDataChanged; _window.AtmosDeviceDataCopied += OnDeviceDataCopied; _window.AtmosAlarmThresholdChanged += OnThresholdChanged; diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs index 43be67c9d6..eeec11c766 100644 --- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs +++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs @@ -47,7 +47,7 @@ public sealed partial class AirAlarmWindow : FancyWindow private CheckBox _autoMode => AutoModeCheckBox; - public AirAlarmWindow(BoundUserInterface owner) + public AirAlarmWindow() { RobustXamlLoader.Load(this); @@ -95,8 +95,11 @@ public sealed partial class AirAlarmWindow : FancyWindow _sensors.Clear(); ResyncAllRequested!.Invoke(); }; + } - EntityView.SetEntity(owner.Owner); + public void SetEntity(EntityUid uid) + { + EntityView.SetEntity(uid); } public void UpdateState(AirAlarmUIState state) diff --git a/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs b/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs index a5e316a8de..7bf9b396d5 100644 --- a/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Atmos.Piping.Binary.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -21,14 +22,8 @@ namespace Content.Client.Atmos.UI { base.Open(); - _window = new GasCanisterWindow(); + _window = this.CreateWindow(); - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; _window.ReleaseValveCloseButtonPressed += OnReleaseValveClosePressed; _window.ReleaseValveOpenButtonPressed += OnReleaseValveOpenPressed; _window.ReleasePressureSet += OnReleasePressureSet; diff --git a/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs b/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs index 1904e2b340..2b8020924c 100644 --- a/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Atmos; using Content.Shared.Atmos.Piping.Trinary.Components; using Content.Shared.Localizations; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -28,14 +29,8 @@ namespace Content.Client.Atmos.UI var atmosSystem = EntMan.System(); - _window = new GasFilterWindow(atmosSystem.Gases); - - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); + _window.PopulateGasList(atmosSystem.Gases); _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed; _window.FilterTransferRateChanged += OnFilterTransferRatePressed; diff --git a/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs b/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs index 28766c688a..62748b5259 100644 --- a/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs +++ b/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs @@ -26,10 +26,9 @@ namespace Content.Client.Atmos.UI public event Action? FilterTransferRateChanged; public event Action? SelectGasPressed; - public GasFilterWindow(IEnumerable gases) + public GasFilterWindow() { RobustXamlLoader.Load(this); - PopulateGasList(gases); ToggleStatusButton.OnPressed += _ => SetFilterStatus(!FilterStatus); ToggleStatusButton.OnPressed += _ => ToggleStatusButtonPressed?.Invoke(); @@ -73,7 +72,7 @@ namespace Content.Client.Atmos.UI SelectGasButton.Disabled = true; } - private void PopulateGasList(IEnumerable gases) + public void PopulateGasList(IEnumerable gases) { GasList.Add(new ItemList.Item(GasList) { @@ -81,7 +80,7 @@ namespace Content.Client.Atmos.UI Text = Loc.GetString("comp-gas-filter-ui-filter-gas-none") }); - foreach (GasPrototype gas in gases) + foreach (var gas in gases) { var gasName = Loc.GetString(gas.Name); GasList.Add(GetGasItem(gas.ID, gasName, GasList)); diff --git a/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs b/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs index 709c06517c..392fbf1cd9 100644 --- a/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs +++ b/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs @@ -2,7 +2,7 @@ using Content.Shared.Atmos; using Content.Shared.Atmos.Piping.Trinary.Components; using Content.Shared.Localizations; using JetBrains.Annotations; -using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -26,14 +26,7 @@ namespace Content.Client.Atmos.UI { base.Open(); - _window = new GasMixerWindow(); - - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed; _window.MixerOutputPressureChanged += OnMixerOutputPressurePressed; @@ -83,12 +76,5 @@ namespace Content.Client.Atmos.UI _window.SetOutputPressure(cast.OutputPressure); _window.SetNodePercentages(cast.NodeOne); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); - } } } diff --git a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs index 6eba2e0d21..220fdbe875 100644 --- a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Atmos.Piping.Binary.Components; using Content.Shared.Localizations; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -26,14 +27,7 @@ namespace Content.Client.Atmos.UI { base.Open(); - _window = new GasPressurePumpWindow(); - - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed; _window.PumpOutputPressureChanged += OnPumpOutputPressurePressed; @@ -67,12 +61,5 @@ namespace Content.Client.Atmos.UI _window.SetPumpStatus(cast.Enabled); _window.SetOutputPressure(cast.OutputPressure); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); - } } } diff --git a/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs b/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs index 1664c8b9d7..d62be8f4bb 100644 --- a/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Atmos.Piping.Unary.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -31,14 +32,7 @@ namespace Content.Client.Atmos.UI { base.Open(); - _window = new GasThermomachineWindow(); - - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.ToggleStatusButton.OnPressed += _ => OnToggleStatusButtonPressed(); _window.TemperatureSpinbox.OnValueChanged += _ => OnTemperatureChanged(_window.TemperatureSpinbox.Value); @@ -91,12 +85,5 @@ namespace Content.Client.Atmos.UI true => Loc.GetString("comp-gas-thermomachine-ui-title-heater") }; } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); - } } } diff --git a/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs b/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs index 1b39306181..642f34c2f9 100644 --- a/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Atmos.Piping.Binary.Components; using Content.Shared.Localizations; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -26,14 +27,7 @@ namespace Content.Client.Atmos.UI { base.Open(); - _window = new GasVolumePumpWindow(); - - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed; _window.PumpTransferRateChanged += OnPumpTransferRatePressed; @@ -64,16 +58,9 @@ namespace Content.Client.Atmos.UI if (_window == null || state is not GasVolumePumpBoundUserInterfaceState cast) return; - _window.Title = (cast.PumpLabel); + _window.Title = cast.PumpLabel; _window.SetPumpStatus(cast.Enabled); _window.SetTransferRate(cast.TransferRate); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); - } } } diff --git a/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs b/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs index 4d8d1191e9..e70426575d 100644 --- a/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Atmos.Piping.Portable.Components; using JetBrains.Annotations; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; namespace Content.Client.Atmos.UI; @@ -21,14 +22,7 @@ public sealed class SpaceHeaterBoundUserInterface : BoundUserInterface { base.Open(); - _window = new SpaceHeaterWindow(); - - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.ToggleStatusButton.OnPressed += _ => OnToggleStatusButtonPressed(); _window.IncreaseTempRange.OnPressed += _ => OnTemperatureRangeChanged(_window.TemperatureChangeDelta); diff --git a/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs b/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs index 60fe339069..865dfc478d 100644 --- a/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs +++ b/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs @@ -1,8 +1,7 @@ using Content.Shared.Audio.Jukebox; using Robust.Client.Audio; -using Robust.Client.Player; +using Robust.Client.UserInterface; using Robust.Shared.Audio.Components; -using Robust.Shared.Player; using Robust.Shared.Prototypes; namespace Content.Client.Audio.Jukebox; @@ -23,9 +22,7 @@ public sealed class JukeboxBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new JukeboxMenu(); - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); _menu.OnPlayPressed += args => { @@ -100,19 +97,5 @@ public sealed class JukeboxBoundUserInterface : BoundUserInterface SendMessage(new JukeboxSetTimeMessage(sentTime)); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - if (_menu == null) - return; - - _menu.OnClose -= Close; - _menu.Dispose(); - _menu = null; - } } diff --git a/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs b/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs index ffab162548..09f3cec8fb 100644 --- a/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs +++ b/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Bed.Cryostorage; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Bed.Cryostorage; @@ -17,9 +18,7 @@ public sealed class CryostorageBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new(); - - _menu.OnClose += Close; + _menu = this.CreateWindow(); _menu.SlotRemoveButtonPressed += (ent, slot) => { @@ -30,8 +29,6 @@ public sealed class CryostorageBoundUserInterface : BoundUserInterface { SendMessage(new CryostorageRemoveItemBuiMessage(ent, hand, CryostorageRemoveItemBuiMessage.RemovalType.Hand)); }; - - _menu.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -45,12 +42,4 @@ public sealed class CryostorageBoundUserInterface : BoundUserInterface break; } } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _menu?.Dispose(); - } } diff --git a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs index d3365702bc..44c40143d8 100644 --- a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs +++ b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Client.Cargo.UI; using Content.Shared.Cargo.Components; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Cargo.BUI; @@ -18,9 +19,7 @@ public sealed class CargoBountyConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new(); - - _menu.OnClose += Close; + _menu = this.CreateWindow(); _menu.OnLabelButtonPressed += id => { @@ -31,8 +30,6 @@ public sealed class CargoBountyConsoleBoundUserInterface : BoundUserInterface { SendMessage(new BountySkipMessage(id)); }; - - _menu.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState message) @@ -44,14 +41,4 @@ public sealed class CargoBountyConsoleBoundUserInterface : BoundUserInterface _menu?.UpdateEntries(state.Bounties, state.UntilNextSkip); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (!disposing) - return; - - _menu?.Dispose(); - } } diff --git a/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs index 20c23a48a0..2461dafb5f 100644 --- a/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs +++ b/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Client.Cargo.UI; using Content.Shared.Cargo.BUI; using Content.Shared.Cargo.Events; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Cargo.BUI; @@ -18,21 +19,9 @@ public sealed class CargoPalletConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new CargoPalletMenu(); + _menu = this.CreateWindow(); _menu.AppraiseRequested += OnAppraisal; _menu.SellRequested += OnSell; - _menu.OnClose += Close; - - _menu.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (disposing) - { - _menu?.Dispose(); - } } private void OnAppraisal() diff --git a/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs index 422d03707a..02b721b902 100644 --- a/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs +++ b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Client.Cargo.UI; using Content.Shared.Cargo.BUI; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.Cargo.BUI; @@ -9,6 +10,8 @@ namespace Content.Client.Cargo.BUI; [UsedImplicitly] public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface { + [Dependency] private readonly IPrototypeManager _protoManager = default!; + [ViewVariables] private CargoShuttleMenu? _menu; @@ -19,24 +22,7 @@ public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - var collection = IoCManager.Instance; - - if (collection == null) - return; - - _menu = new CargoShuttleMenu(collection.Resolve(), collection.Resolve().GetEntitySystem()); - _menu.OnClose += Close; - - _menu.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (disposing) - { - _menu?.Dispose(); - } + _menu = this.CreateWindow(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -45,6 +31,6 @@ public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface if (state is not CargoShuttleConsoleBoundUserInterfaceState cargoState) return; _menu?.SetAccountName(cargoState.AccountName); _menu?.SetShuttleName(cargoState.ShuttleName); - _menu?.SetOrders(cargoState.Orders); + _menu?.SetOrders(EntMan.System(), _protoManager, cargoState.Orders); } } diff --git a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs index c591f917da..43b00089e1 100644 --- a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs +++ b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs @@ -12,14 +12,9 @@ namespace Content.Client.Cargo.UI [GenerateTypedNameReferences] public sealed partial class CargoShuttleMenu : FancyWindow { - private readonly IPrototypeManager _protoManager; - private readonly SpriteSystem _spriteSystem; - - public CargoShuttleMenu(IPrototypeManager protoManager, SpriteSystem spriteSystem) + public CargoShuttleMenu() { RobustXamlLoader.Load(this); - _protoManager = protoManager; - _spriteSystem = spriteSystem; Title = Loc.GetString("cargo-shuttle-console-menu-title"); } @@ -33,19 +28,19 @@ namespace Content.Client.Cargo.UI ShuttleNameLabel.Text = name; } - public void SetOrders(List orders) + public void SetOrders(SpriteSystem sprites, IPrototypeManager protoManager, List orders) { Orders.DisposeAllChildren(); foreach (var order in orders) { - var product = _protoManager.Index(order.ProductId); + var product = protoManager.Index(order.ProductId); var productName = product.Name; var row = new CargoOrderRow { Order = order, - Icon = { Texture = _spriteSystem.Frame0(product) }, + Icon = { Texture = sprites.Frame0(product) }, ProductName = { Text = Loc.GetString( diff --git a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs index 988fea7978..3ef7f0ae73 100644 --- a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs +++ b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Chemistry; using Content.Shared.Containers.ItemSlots; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Chemistry.UI { @@ -27,13 +28,8 @@ namespace Content.Client.Chemistry.UI base.Open(); // Setup window layout/elements - _window = new ChemMasterWindow - { - Title = EntMan.GetComponent(Owner).EntityName, - }; - - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); + _window.Title = EntMan.GetComponent(Owner).EntityName; // Setup static button actions. _window.InputEjectButton.OnPressed += _ => SendMessage( @@ -75,15 +71,5 @@ namespace Content.Client.Chemistry.UI _window?.UpdateState(castState); // Update window state } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _window?.Dispose(); - } - } } } diff --git a/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs b/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs index 99e5a3d395..2ad1b71888 100644 --- a/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs +++ b/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Chemistry; using Content.Shared.Containers.ItemSlots; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Chemistry.UI { @@ -15,9 +16,6 @@ namespace Content.Client.Chemistry.UI [ViewVariables] private ReagentDispenserWindow? _window; - [ViewVariables] - private ReagentDispenserBoundUserInterfaceState? _lastState; - public ReagentDispenserBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } @@ -32,14 +30,9 @@ namespace Content.Client.Chemistry.UI base.Open(); // Setup window layout/elements - _window = new() - { - Title = EntMan.GetComponent(Owner).EntityName, - HelpGuidebookIds = EntMan.GetComponent(Owner).Guides - }; - - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); + _window.Title = EntMan.GetComponent(Owner).EntityName; + _window.HelpGuidebookIds = EntMan.GetComponent(Owner).Guides; // Setup static button actions. _window.EjectButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(SharedReagentDispenser.OutputSlotName)); @@ -63,19 +56,7 @@ namespace Content.Client.Chemistry.UI base.UpdateState(state); var castState = (ReagentDispenserBoundUserInterfaceState) state; - _lastState = castState; - _window?.UpdateState(castState); //Update window state } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _window?.Dispose(); - } - } } } diff --git a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs index 35df131312..f1cb27a62a 100644 --- a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs +++ b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Chemistry; using Content.Shared.FixedPoint; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Chemistry.UI { @@ -18,7 +19,7 @@ namespace Content.Client.Chemistry.UI protected override void Open() { base.Open(); - _window = new TransferAmountWindow(); + _window = this.CreateWindow(); _window.ApplyButton.OnPressed += _ => { @@ -28,15 +29,6 @@ namespace Content.Client.Chemistry.UI _window.Close(); } }; - _window.OnClose += Close; - _window.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); } } } diff --git a/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs b/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs index 26f0994701..62a02f3718 100644 --- a/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs +++ b/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs @@ -1,6 +1,7 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; using Content.Shared.Cloning.CloningConsole; +using Robust.Client.UserInterface; namespace Content.Client.CloningConsole.UI { @@ -17,13 +18,11 @@ namespace Content.Client.CloningConsole.UI protected override void Open() { base.Open(); - _window = new CloningConsoleWindow - { - Title = Loc.GetString("cloning-console-window-title") - }; - _window.OnClose += Close; + + _window = this.CreateWindow(); + _window.Title = Loc.GetString("cloning-console-window-title"); + _window.CloneButton.OnPressed += _ => SendMessage(new UiButtonPressedMessage(UiButton.Clone)); - _window.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -32,19 +31,5 @@ namespace Content.Client.CloningConsole.UI _window?.Populate((CloningConsoleBoundUserInterfaceState) state); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - if (_window != null) - { - _window.OnClose -= Close; - _window.CloneButton.OnPressed -= _ => SendMessage(new UiButtonPressedMessage(UiButton.Clone)); - } - _window?.Dispose(); - } } } diff --git a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs index 5b0d5fcf21..83f6ba1566 100644 --- a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs +++ b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Clothing.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Clothing.UI; @@ -22,10 +23,8 @@ public sealed class ChameleonBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new ChameleonMenu(); - _menu.OnClose += Close; + _menu = this.CreateWindow(); _menu.OnIdSelected += OnIdSelected; - _menu.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -42,15 +41,4 @@ public sealed class ChameleonBoundUserInterface : BoundUserInterface { SendMessage(new ChameleonPrototypeSelectedMessage(selectedId)); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _menu?.Close(); - _menu = null; - } - } } diff --git a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs index 1c94d32bf8..0310e91eeb 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.CCVar; using Content.Shared.Chat; using Content.Shared.Communications; +using Robust.Client.UserInterface; using Robust.Shared.Configuration; using Robust.Shared.Timing; @@ -8,34 +9,11 @@ namespace Content.Client.Communications.UI { public sealed class CommunicationsConsoleBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [ViewVariables] private CommunicationsConsoleMenu? _menu; - [ViewVariables] - public bool CanAnnounce { get; private set; } - [ViewVariables] - public bool CanBroadcast { get; private set; } - - [ViewVariables] - public bool CanCall { get; private set; } - - [ViewVariables] - public bool CountdownStarted { get; private set; } - - [ViewVariables] - public bool AlertLevelSelectable { get; private set; } - - [ViewVariables] - public string CurrentLevel { get; private set; } = default!; - - [ViewVariables] - private TimeSpan? _expectedCountdownTime; - - public int Countdown => _expectedCountdownTime == null ? 0 : Math.Max((int) _expectedCountdownTime.Value.Subtract(_gameTiming.CurTime).TotalSeconds, 0); - public CommunicationsConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } @@ -44,23 +22,25 @@ namespace Content.Client.Communications.UI { base.Open(); - _menu = new CommunicationsConsoleMenu(this); - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); + _menu.OnAnnounce += AnnounceButtonPressed; + _menu.OnBroadcast += BroadcastButtonPressed; + _menu.OnAlertLevel += AlertLevelSelected; + _menu.OnEmergencyLevel += EmergencyShuttleButtonPressed; } public void AlertLevelSelected(string level) { - if (AlertLevelSelectable) + if (_menu!.AlertLevelSelectable) { - CurrentLevel = level; + _menu.CurrentLevel = level; SendMessage(new CommunicationsConsoleSelectAlertLevelMessage(level)); } } public void EmergencyShuttleButtonPressed() { - if (CountdownStarted) + if (_menu!.CountdownStarted) RecallShuttle(); else CallShuttle(); @@ -95,31 +75,23 @@ namespace Content.Client.Communications.UI if (state is not CommunicationsConsoleInterfaceState commsState) return; - CanAnnounce = commsState.CanAnnounce; - CanBroadcast = commsState.CanBroadcast; - CanCall = commsState.CanCall; - _expectedCountdownTime = commsState.ExpectedCountdownEnd; - CountdownStarted = commsState.CountdownStarted; - AlertLevelSelectable = commsState.AlertLevels != null && !float.IsNaN(commsState.CurrentAlertDelay) && commsState.CurrentAlertDelay <= 0; - CurrentLevel = commsState.CurrentAlert; - if (_menu != null) { + _menu.CanAnnounce = commsState.CanAnnounce; + _menu.CanBroadcast = commsState.CanBroadcast; + _menu.CanCall = commsState.CanCall; + _menu.CountdownStarted = commsState.CountdownStarted; + _menu.AlertLevelSelectable = commsState.AlertLevels != null && !float.IsNaN(commsState.CurrentAlertDelay) && commsState.CurrentAlertDelay <= 0; + _menu.CurrentLevel = commsState.CurrentAlert; + _menu.CountdownEnd = commsState.ExpectedCountdownEnd; + _menu.UpdateCountdown(); - _menu.UpdateAlertLevels(commsState.AlertLevels, CurrentLevel); - _menu.AlertLevelButton.Disabled = !AlertLevelSelectable; - _menu.EmergencyShuttleButton.Disabled = !CanCall; - _menu.AnnounceButton.Disabled = !CanAnnounce; - _menu.BroadcastButton.Disabled = !CanBroadcast; + _menu.UpdateAlertLevels(commsState.AlertLevels, _menu.CurrentLevel); + _menu.AlertLevelButton.Disabled = !_menu.AlertLevelSelectable; + _menu.EmergencyShuttleButton.Disabled = !_menu.CanCall; + _menu.AnnounceButton.Disabled = !_menu.CanAnnounce; + _menu.BroadcastButton.Disabled = !_menu.CanBroadcast; } } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - - _menu?.Dispose(); - } } } diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs index bbca06f519..cef68efd1f 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs @@ -1,31 +1,40 @@ -using Content.Client.UserInterface.Controls; -using System.Threading; +using System.Globalization; +using Content.Client.UserInterface.Controls; using Content.Shared.CCVar; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.XAML; using Robust.Shared.Configuration; +using Robust.Shared.Timing; using Robust.Shared.Utility; -using Timer = Robust.Shared.Timing.Timer; namespace Content.Client.Communications.UI { [GenerateTypedNameReferences] public sealed partial class CommunicationsConsoleMenu : FancyWindow { - private CommunicationsConsoleBoundUserInterface Owner { get; set; } - private readonly CancellationTokenSource _timerCancelTokenSource = new(); - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly ILocalizationManager _loc = default!; - public CommunicationsConsoleMenu(CommunicationsConsoleBoundUserInterface owner) + public bool CanAnnounce; + public bool CanBroadcast; + public bool CanCall; + public bool AlertLevelSelectable; + public bool CountdownStarted; + public string CurrentLevel = string.Empty; + public TimeSpan? CountdownEnd; + + public event Action? OnEmergencyLevel; + public event Action? OnAlertLevel; + public event Action? OnAnnounce; + public event Action? OnBroadcast; + + public CommunicationsConsoleMenu() { IoCManager.InjectDependencies(this); RobustXamlLoader.Load(this); - Owner = owner; - - var loc = IoCManager.Resolve(); - MessageInput.Placeholder = new Rope.Leaf(loc.GetString("comms-console-menu-announcement-placeholder")); + MessageInput.Placeholder = new Rope.Leaf(_loc.GetString("comms-console-menu-announcement-placeholder")); var maxAnnounceLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength); MessageInput.OnTextChanged += (args) => @@ -37,33 +46,38 @@ namespace Content.Client.Communications.UI } else { - AnnounceButton.Disabled = !owner.CanAnnounce; + AnnounceButton.Disabled = !CanAnnounce; AnnounceButton.ToolTip = null; } }; - AnnounceButton.OnPressed += (_) => Owner.AnnounceButtonPressed(Rope.Collapse(MessageInput.TextRope)); - AnnounceButton.Disabled = !owner.CanAnnounce; + AnnounceButton.OnPressed += _ => OnAnnounce?.Invoke(Rope.Collapse(MessageInput.TextRope)); + AnnounceButton.Disabled = !CanAnnounce; - BroadcastButton.OnPressed += (_) => Owner.BroadcastButtonPressed(Rope.Collapse(MessageInput.TextRope)); - BroadcastButton.Disabled = !owner.CanBroadcast; + BroadcastButton.OnPressed += _ => OnBroadcast?.Invoke(Rope.Collapse(MessageInput.TextRope)); + BroadcastButton.Disabled = !CanBroadcast; AlertLevelButton.OnItemSelected += args => { var metadata = AlertLevelButton.GetItemMetadata(args.Id); if (metadata != null && metadata is string cast) { - Owner.AlertLevelSelected(cast); + OnAlertLevel?.Invoke(cast); } }; - AlertLevelButton.Disabled = !owner.AlertLevelSelectable; - EmergencyShuttleButton.OnPressed += (_) => Owner.EmergencyShuttleButtonPressed(); - EmergencyShuttleButton.Disabled = !owner.CanCall; + AlertLevelButton.Disabled = !AlertLevelSelectable; + + EmergencyShuttleButton.OnPressed += _ => OnEmergencyLevel?.Invoke(); + EmergencyShuttleButton.Disabled = !CanCall; + } + + protected override void FrameUpdate(FrameEventArgs args) + { + base.FrameUpdate(args); UpdateCountdown(); - Timer.SpawnRepeating(1000, UpdateCountdown, _timerCancelTokenSource.Token); } // The current alert could make levels unselectable, so we need to ensure that the UI reacts properly. @@ -105,32 +119,19 @@ namespace Content.Client.Communications.UI public void UpdateCountdown() { - if (!Owner.CountdownStarted) + if (!CountdownStarted) { - CountdownLabel.SetMessage(""); + CountdownLabel.SetMessage(string.Empty); EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-call-shuttle"); return; } + var diff = (CountdownEnd - _timing.CurTime) ?? TimeSpan.Zero; + EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-recall-shuttle"); var infoText = Loc.GetString($"comms-console-menu-time-remaining", - ("time", Owner.Countdown.ToString())); + ("time", diff.TotalSeconds.ToString(CultureInfo.CurrentCulture))); CountdownLabel.SetMessage(infoText); } - - public override void Close() - { - base.Close(); - - _timerCancelTokenSource.Cancel(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - _timerCancelTokenSource.Cancel(); - } } } diff --git a/Content.Client/Computer/ComputerBoundUserInterface.cs b/Content.Client/Computer/ComputerBoundUserInterface.cs index bdbfe03fa1..11c26b252e 100644 --- a/Content.Client/Computer/ComputerBoundUserInterface.cs +++ b/Content.Client/Computer/ComputerBoundUserInterface.cs @@ -1,4 +1,5 @@ using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.CustomControls; namespace Content.Client.Computer @@ -19,10 +20,8 @@ namespace Content.Client.Computer { base.Open(); - _window = (TWindow) _dynamicTypeFactory.CreateInstance(typeof(TWindow)); + _window = this.CreateWindow(); _window.SetupComputerWindow(this); - _window.OnClose += Close; - _window.OpenCentered(); } // Alas, this constructor has to be copied to the subclass. :( @@ -42,16 +41,6 @@ namespace Content.Client.Computer _window.UpdateState((TState) state); } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _window?.Dispose(); - } - } - protected override void ReceiveMessage(BoundUserInterfaceMessage message) { _window?.ReceiveMessage(message); diff --git a/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs index 4fea44f225..e4966f1ec4 100644 --- a/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs +++ b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs @@ -1,5 +1,6 @@ using System.Text.RegularExpressions; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using static Content.Shared.Configurable.ConfigurationComponent; namespace Content.Client.Configurable.UI @@ -9,9 +10,6 @@ namespace Content.Client.Configurable.UI [ViewVariables] private ConfigurationMenu? _menu; - [ViewVariables] - public Regex? Validation { get; internal set; } - public ConfigurationBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } @@ -19,10 +17,8 @@ namespace Content.Client.Configurable.UI protected override void Open() { base.Open(); - _menu = new ConfigurationMenu(this); - - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); + _menu.OnConfiguration += SendConfiguration; } protected override void UpdateState(BoundUserInterfaceState state) @@ -30,9 +26,7 @@ namespace Content.Client.Configurable.UI base.UpdateState(state); if (state is not ConfigurationBoundUserInterfaceState configurationState) - { return; - } _menu?.Populate(configurationState); } @@ -41,9 +35,12 @@ namespace Content.Client.Configurable.UI { base.ReceiveMessage(message); + if (_menu == null) + return; + if (message is ValidationUpdateMessage msg) { - Validation = new Regex(msg.ValidationString, RegexOptions.Compiled); + _menu.Validation = new Regex(msg.ValidationString, RegexOptions.Compiled); } } @@ -51,16 +48,5 @@ namespace Content.Client.Configurable.UI { SendMessage(new ConfigurationUpdatedMessage(config)); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing && _menu != null) - { - _menu.OnClose -= Close; - _menu.Close(); - } - } } } diff --git a/Content.Client/Configurable/UI/ConfigurationMenu.cs b/Content.Client/Configurable/UI/ConfigurationMenu.cs index cc24af2869..29217eef7b 100644 --- a/Content.Client/Configurable/UI/ConfigurationMenu.cs +++ b/Content.Client/Configurable/UI/ConfigurationMenu.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Numerics; +using System.Text.RegularExpressions; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; @@ -13,23 +14,25 @@ namespace Content.Client.Configurable.UI { public sealed class ConfigurationMenu : DefaultWindow { - public ConfigurationBoundUserInterface Owner { get; } - private readonly BoxContainer _column; private readonly BoxContainer _row; private readonly List<(string name, LineEdit input)> _inputs; - public ConfigurationMenu(ConfigurationBoundUserInterface owner) + [ViewVariables] + public Regex? Validation { get; internal set; } + + public event Action>? OnConfiguration; + + public ConfigurationMenu() { MinSize = SetSize = new Vector2(300, 250); - Owner = owner; _inputs = new List<(string name, LineEdit input)>(); Title = Loc.GetString("configuration-menu-device-title"); - BoxContainer baseContainer = new BoxContainer + var baseContainer = new BoxContainer { Orientation = LayoutOrientation.Vertical, VerticalExpand = true, @@ -116,14 +119,13 @@ namespace Content.Client.Configurable.UI private void OnConfirm(ButtonEventArgs args) { var config = GenerateDictionary(_inputs, "Text"); - - Owner.SendConfiguration(config); + OnConfiguration?.Invoke(config); Close(); } private bool Validate(string value) { - return Owner.Validation == null || Owner.Validation.IsMatch(value); + return Validation?.IsMatch(value) != false; } private Dictionary GenerateDictionary(IEnumerable<(string name, LineEdit input)> inputs, string propertyName) diff --git a/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs b/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs index 86f1b8b83c..887492955e 100644 --- a/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs +++ b/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Construction.Components; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Construction.UI { @@ -17,8 +18,8 @@ namespace Content.Client.Construction.UI { base.Open(); - _menu = new FlatpackCreatorMenu(Owner); - _menu.OnClose += Close; + _menu = this.CreateWindow(); + _menu.SetEntity(Owner); _menu.PackButtonPressed += () => { @@ -27,14 +28,5 @@ namespace Content.Client.Construction.UI _menu.OpenCentered(); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _menu?.Dispose(); - } } } diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs index 9f3d5695bb..269694ebf9 100644 --- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs +++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs @@ -24,7 +24,7 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow private readonly FlatpackSystem _flatpack; private readonly MaterialStorageSystem _materialStorage; - private readonly EntityUid _owner; + private EntityUid _owner; [ValidatePrototypeId] public const string NoBoardEffectId = "FlatpackerNoBoardEffect"; @@ -33,7 +33,7 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow public event Action? PackButtonPressed; - public FlatpackCreatorMenu(EntityUid uid) + public FlatpackCreatorMenu() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); @@ -42,14 +42,17 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow _flatpack = _entityManager.System(); _materialStorage = _entityManager.System(); - _owner = uid; - PackButton.OnPressed += _ => PackButtonPressed?.Invoke(); - MaterialStorageControl.SetOwner(uid); InsertLabel.SetMarkup(Loc.GetString("flatpacker-ui-insert-board")); } + public void SetEntity(EntityUid uid) + { + _owner = uid; + MaterialStorageControl.SetOwner(uid); + } + protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); diff --git a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs index e2c4d51ecd..e5be0b1811 100644 --- a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs +++ b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs @@ -2,12 +2,15 @@ using Content.Shared.Crayon; using Content.Shared.Decals; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.Crayon.UI { public sealed class CrayonBoundUserInterface : BoundUserInterface { + [Dependency] private readonly IPrototypeManager _protoManager = default!; + [ViewVariables] private CrayonWindow? _menu; @@ -18,15 +21,29 @@ namespace Content.Client.Crayon.UI protected override void Open() { base.Open(); - _menu = new CrayonWindow(this); - - _menu.OnClose += Close; - var prototypeManager = IoCManager.Resolve(); - var crayonDecals = prototypeManager.EnumeratePrototypes().Where(x => x.Tags.Contains("crayon")); - _menu.Populate(crayonDecals); + _menu = this.CreateWindow(); + _menu.OnColorSelected += SelectColor; + _menu.OnSelected += Select; + PopulateCrayons(); _menu.OpenCenteredLeft(); } + private void PopulateCrayons() + { + var crayonDecals = _protoManager.EnumeratePrototypes().Where(x => x.Tags.Contains("crayon")); + _menu?.Populate(crayonDecals); + } + + public override void OnProtoReload(PrototypesReloadedEventArgs args) + { + base.OnProtoReload(args); + + if (!args.WasModified()) + return; + + PopulateCrayons(); + } + protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); @@ -43,16 +60,5 @@ namespace Content.Client.Crayon.UI { SendMessage(new CrayonColorMessage(color)); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _menu?.Close(); - _menu = null; - } - } } } diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs index 2a5801ccf2..b97786cd41 100644 --- a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs +++ b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs @@ -18,18 +18,17 @@ namespace Content.Client.Crayon.UI [GenerateTypedNameReferences] public sealed partial class CrayonWindow : DefaultWindow { - public CrayonBoundUserInterface Owner { get; } - private Dictionary? _decals; private string? _selected; private Color _color; - public CrayonWindow(CrayonBoundUserInterface owner) + public event Action? OnColorSelected; + public event Action? OnSelected; + + public CrayonWindow() { RobustXamlLoader.Load(this); - Owner = owner; - Search.OnTextChanged += _ => RefreshList(); ColorSelector.OnColorChanged += SelectColor; } @@ -38,16 +37,16 @@ namespace Content.Client.Crayon.UI { _color = color; - Owner.SelectColor(color); - + OnColorSelected?.Invoke(color); RefreshList(); } private void RefreshList() { // Clear - Grid.RemoveAllChildren(); - if (_decals == null) return; + Grid.DisposeAllChildren(); + if (_decals == null) + return; var filter = Search.Text; foreach (var (decal, tex) in _decals) @@ -89,7 +88,6 @@ namespace Content.Client.Crayon.UI { if (obj.Button.Name == null) return; - Owner.Select(obj.Button.Name); _selected = obj.Button.Name; RefreshList(); } diff --git a/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs index e8e77217ea..296e71d3a9 100644 --- a/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs +++ b/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs @@ -1,5 +1,6 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using static Content.Shared.Disposal.Components.SharedDisposalRouterComponent; namespace Content.Client.Disposal.UI @@ -21,20 +22,16 @@ namespace Content.Client.Disposal.UI { base.Open(); - _window = new DisposalRouterWindow(); - - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); _window.Confirm.OnPressed += _ => ButtonPressed(UiAction.Ok, _window.TagInput.Text); _window.TagInput.OnTextEntered += args => ButtonPressed(UiAction.Ok, args.Text); - } private void ButtonPressed(UiAction action, string tag) { SendMessage(new UiActionMessage(action, tag)); - _window?.Close(); + Close(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -48,18 +45,5 @@ namespace Content.Client.Disposal.UI _window?.UpdateState(cast); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _window?.Dispose(); - } - } - - } - } diff --git a/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs index 3aeed8dc80..7fc0eb8540 100644 --- a/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs +++ b/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs @@ -1,5 +1,6 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using static Content.Shared.Disposal.Components.SharedDisposalTaggerComponent; namespace Content.Client.Disposal.UI @@ -21,20 +22,17 @@ namespace Content.Client.Disposal.UI { base.Open(); - _window = new DisposalTaggerWindow(); - - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); _window.Confirm.OnPressed += _ => ButtonPressed(UiAction.Ok, _window.TagInput.Text); _window.TagInput.OnTextEntered += args => ButtonPressed(UiAction.Ok, args.Text); - } private void ButtonPressed(UiAction action, string tag) { + // TODO: This looks copy-pasted with the other mailing stuff... SendMessage(new UiActionMessage(action, tag)); - _window?.Close(); + Close(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -48,18 +46,5 @@ namespace Content.Client.Disposal.UI _window?.UpdateState(cast); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _window?.Dispose(); - } - } - - } - } diff --git a/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs index cd7ea717ce..9b7e23c03a 100644 --- a/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs +++ b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Access; using Content.Shared.Doors.Electronics; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.Doors.Electronics; @@ -18,6 +19,23 @@ public sealed class DoorElectronicsBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); + _window = this.CreateWindow(); + _window.OnAccessChanged += UpdateConfiguration; + Reset(); + } + + public override void OnProtoReload(PrototypesReloadedEventArgs args) + { + base.OnProtoReload(args); + + if (!args.WasModified()) + return; + + Reset(); + } + + private void Reset() + { List> accessLevels = new(); foreach (var accessLevel in _prototypeManager.EnumeratePrototypes()) @@ -29,10 +47,7 @@ public sealed class DoorElectronicsBoundUserInterface : BoundUserInterface } accessLevels.Sort(); - - _window = new DoorElectronicsConfigurationMenu(this, accessLevels, _prototypeManager); - _window.OnClose += Close; - _window.OpenCentered(); + _window?.Reset(_prototypeManager, accessLevels); } protected override void UpdateState(BoundUserInterfaceState state) @@ -44,14 +59,6 @@ public sealed class DoorElectronicsBoundUserInterface : BoundUserInterface _window?.UpdateState(castState); } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - - _window?.Dispose(); - } - public void UpdateConfiguration(List> newAccessList) { SendMessage(new DoorElectronicsUpdateConfigurationMessage(newAccessList)); diff --git a/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs index c01f13a462..2112a56297 100644 --- a/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs +++ b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs @@ -15,22 +15,23 @@ namespace Content.Client.Doors.Electronics; [GenerateTypedNameReferences] public sealed partial class DoorElectronicsConfigurationMenu : FancyWindow { - private readonly DoorElectronicsBoundUserInterface _owner; - private AccessLevelControl _buttonsList = new(); + private readonly AccessLevelControl _buttonsList = new(); - public DoorElectronicsConfigurationMenu(DoorElectronicsBoundUserInterface ui, List> accessLevels, IPrototypeManager prototypeManager) + public event Action>>? OnAccessChanged; + + public DoorElectronicsConfigurationMenu() { RobustXamlLoader.Load(this); - - _owner = ui; - - _buttonsList.Populate(accessLevels, prototypeManager); AccessLevelControlContainer.AddChild(_buttonsList); + } - foreach (var (id, button) in _buttonsList.ButtonsList) + public void Reset(IPrototypeManager protoManager, List> accessLevels) + { + _buttonsList.Populate(accessLevels, protoManager); + + foreach (var button in _buttonsList.ButtonsList.Values) { - button.OnPressed += _ => _owner.UpdateConfiguration( - _buttonsList.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList()); + button.OnPressed += _ => OnAccessChanged?.Invoke(_buttonsList.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList()); } } diff --git a/Content.Client/Fax/UI/FaxBoundUi.cs b/Content.Client/Fax/UI/FaxBoundUi.cs index a95066a3b5..ca2e834b4f 100644 --- a/Content.Client/Fax/UI/FaxBoundUi.cs +++ b/Content.Client/Fax/UI/FaxBoundUi.cs @@ -25,10 +25,7 @@ public sealed class FaxBoundUi : BoundUserInterface { base.Open(); - _window = new FaxWindow(); - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.FileButtonPressed += OnFileButtonPressed; _window.CopyButtonPressed += OnCopyButtonPressed; _window.SendButtonPressed += OnSendButtonPressed; @@ -104,11 +101,4 @@ public sealed class FaxBoundUi : BoundUserInterface _window.UpdateState(cast); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (disposing) - _window?.Dispose(); - } } diff --git a/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs b/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs index ba49f11ea0..08596b04e6 100644 --- a/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs +++ b/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs @@ -1,6 +1,7 @@ using Robust.Client.GameObjects; using Robust.Shared.Timing; using Content.Shared.Forensics; +using Robust.Client.UserInterface; namespace Content.Client.Forensics { @@ -21,11 +22,9 @@ namespace Content.Client.Forensics protected override void Open() { base.Open(); - _window = new ForensicScannerMenu(); - _window.OnClose += Close; + _window = this.CreateWindow(); _window.Print.OnPressed += _ => Print(); _window.Clear.OnPressed += _ => Clear(); - _window.OpenCentered(); } private void Print() @@ -62,6 +61,7 @@ namespace Content.Client.Forensics _printCooldown = cast.PrintCooldown; + // TODO: Fix this if (cast.PrintReadyAt > _gameTiming.CurTime) Timer.Spawn(cast.PrintReadyAt - _gameTiming.CurTime, () => { @@ -71,14 +71,5 @@ namespace Content.Client.Forensics _window.UpdateState(cast); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _window?.Dispose(); - } } } diff --git a/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs b/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs index fdb3cdbc01..457b70ca7c 100644 --- a/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs +++ b/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Gateway; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Gateway.UI; @@ -17,24 +18,13 @@ public sealed class GatewayBoundUserInterface : BoundUserInterface { base.Open(); - _window = new GatewayWindow(EntMan.GetNetEntity(Owner)); + _window = this.CreateWindow(); + _window.SetEntity(EntMan.GetNetEntity(Owner)); _window.OpenPortal += destination => { SendMessage(new GatewayOpenPortalMessage(destination)); }; - _window.OnClose += Close; - _window?.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (disposing) - { - _window?.Dispose(); - _window = null; - } } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Gateway/UI/GatewayWindow.xaml.cs b/Content.Client/Gateway/UI/GatewayWindow.xaml.cs index 889dd6e175..1c779b2b35 100644 --- a/Content.Client/Gateway/UI/GatewayWindow.xaml.cs +++ b/Content.Client/Gateway/UI/GatewayWindow.xaml.cs @@ -22,7 +22,7 @@ public sealed partial class GatewayWindow : FancyWindow, public event Action? OpenPortal; private List _destinations = new(); - public readonly NetEntity Owner; + public NetEntity Owner; private NetEntity? _current; private TimeSpan _nextReady; @@ -46,16 +46,20 @@ public sealed partial class GatewayWindow : FancyWindow, /// private bool _isCooldownPending = true; - public GatewayWindow(NetEntity netEntity) + public GatewayWindow() { RobustXamlLoader.Load(this); var dependencies = IoCManager.Instance!; _timing = dependencies.Resolve(); - Owner = netEntity; NextUnlockBar.ForegroundStyleBoxOverride = new StyleBoxFlat(Color.FromHex("#C74EBD")); } + public void SetEntity(NetEntity entity) + { + + } + public void UpdateState(GatewayBoundUserInterfaceState state) { _destinations = state.Destinations; diff --git a/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs b/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs index d72da3e812..32b40747d5 100644 --- a/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs +++ b/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs @@ -1,6 +1,6 @@ using Content.Shared.Gravity; using JetBrains.Annotations; -using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Gravity.UI { @@ -18,17 +18,8 @@ namespace Content.Client.Gravity.UI { base.Open(); - _window = new GravityGeneratorWindow(this); - - /* - _window.Switch.OnPressed += _ => - { - SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(!IsOn)); - }; - */ - - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); + _window.SetEntity(Owner); } protected override void UpdateState(BoundUserInterfaceState state) @@ -39,14 +30,6 @@ namespace Content.Client.Gravity.UI _window?.UpdateState(castState); } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - - _window?.Dispose(); - } - public void SetPowerSwitch(bool on) { SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(on)); diff --git a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs index 75f8eb479b..6f04133b59 100644 --- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs +++ b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs @@ -12,22 +12,23 @@ namespace Content.Client.Gravity.UI { private readonly ButtonGroup _buttonGroup = new(); - private readonly GravityGeneratorBoundUserInterface _owner; + public event Action? OnPowerSwitch; - public GravityGeneratorWindow(GravityGeneratorBoundUserInterface owner) + public GravityGeneratorWindow() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - _owner = owner; - OnButton.Group = _buttonGroup; OffButton.Group = _buttonGroup; - OnButton.OnPressed += _ => _owner.SetPowerSwitch(true); - OffButton.OnPressed += _ => _owner.SetPowerSwitch(false); + OnButton.OnPressed += _ => OnPowerSwitch?.Invoke(true); + OffButton.OnPressed += _ => OnPowerSwitch?.Invoke(false); + } - EntityView.SetEntity(owner.Owner); + public void SetEntity(EntityUid uid) + { + EntityView.SetEntity(uid); } public void UpdateState(SharedGravityGeneratorComponent.GeneratorState state) diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs index dc0a3e9fcc..38760f4aa3 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs @@ -1,6 +1,6 @@ using Content.Shared.MedicalScanner; using JetBrains.Annotations; -using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.HealthAnalyzer.UI { @@ -17,12 +17,9 @@ namespace Content.Client.HealthAnalyzer.UI protected override void Open() { base.Open(); - _window = new HealthAnalyzerWindow - { - Title = EntMan.GetComponent(Owner).EntityName, - }; - _window.OnClose += Close; - _window.OpenCentered(); + _window = this.CreateWindow(); + + _window.Title = EntMan.GetComponent(Owner).EntityName; } protected override void ReceiveMessage(BoundUserInterfaceMessage message) @@ -35,17 +32,5 @@ namespace Content.Client.HealthAnalyzer.UI _window.Populate(cast); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - if (_window != null) - _window.OnClose -= Close; - - _window?.Dispose(); - } } } diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs b/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs index a8872604a4..53977eb636 100644 --- a/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs +++ b/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Humanoid; using Content.Shared.Humanoid.Markings; +using Robust.Client.UserInterface; namespace Content.Client.Humanoid; @@ -20,8 +21,7 @@ public sealed class HumanoidMarkingModifierBoundUserInterface : BoundUserInterfa { base.Open(); - _window = new(); - _window.OnClose += Close; + _window = this.CreateWindow(); _window.OnMarkingAdded += SendMarkingSet; _window.OnMarkingRemoved += SendMarkingSet; _window.OnMarkingColorChange += SendMarkingSetNoResend; diff --git a/Content.Client/Instruments/UI/BandMenu.xaml.cs b/Content.Client/Instruments/UI/BandMenu.xaml.cs index 5fb293a194..26cd1369e5 100644 --- a/Content.Client/Instruments/UI/BandMenu.xaml.cs +++ b/Content.Client/Instruments/UI/BandMenu.xaml.cs @@ -11,7 +11,9 @@ public sealed partial class BandMenu : DefaultWindow { private readonly InstrumentBoundUserInterface _owner; - public BandMenu(InstrumentBoundUserInterface owner) : base() + public EntityUid? Master; + + public BandMenu(InstrumentBoundUserInterface owner) { RobustXamlLoader.Load(this); @@ -40,7 +42,7 @@ public sealed partial class BandMenu : DefaultWindow { var uid = entManager.GetEntity(nent); var item = BandList.AddItem(name, null, true, uid); - item.Selected = _owner.Instrument?.Master == uid; + item.Selected = Master == uid; } } } diff --git a/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs b/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs index 2814d41536..c175e67842 100644 --- a/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs +++ b/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs @@ -51,7 +51,7 @@ public sealed partial class ChannelsMenu : DefaultWindow } } - public void Populate() + public void Populate(InstrumentComponent? instrument) { ChannelList.Clear(); @@ -60,7 +60,8 @@ public sealed partial class ChannelsMenu : DefaultWindow var item = ChannelList.AddItem(_owner.Loc.GetString("instrument-component-channel-name", ("number", i)), null, true, i); - item.Selected = !_owner.Instrument?.FilteredChannels[i] ?? false; + + item.Selected = !instrument?.FilteredChannels[i] ?? false; } } } diff --git a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs index 0f5729f55b..4816ce8c36 100644 --- a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs +++ b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs @@ -24,8 +24,6 @@ namespace Content.Client.Instruments.UI [ViewVariables] private BandMenu? _bandMenu; [ViewVariables] private ChannelsMenu? _channelsMenu; - [ViewVariables] public InstrumentComponent? Instrument { get; private set; } - public InstrumentBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { IoCManager.InjectDependencies(this); @@ -43,14 +41,20 @@ namespace Content.Client.Instruments.UI protected override void Open() { - if (!EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument)) - return; + _instrumentMenu = this.CreateWindow(); + _instrumentMenu.Title = EntMan.GetComponent(Owner).EntityName; - Instrument = instrument; - _instrumentMenu = new InstrumentMenu(this); - _instrumentMenu.OnClose += Close; + _instrumentMenu.OnOpenBand += OpenBandMenu; + _instrumentMenu.OnOpenChannels += OpenChannelsMenu; + _instrumentMenu.OnCloseChannels += CloseChannelsMenu; + _instrumentMenu.OnCloseBands += CloseBandMenu; - _instrumentMenu.OpenCentered(); + _instrumentMenu.SetMIDI(MidiManager.IsAvailable); + + if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument)) + { + _instrumentMenu.SetInstrument((Owner, instrument)); + } } protected override void Dispose(bool disposing) @@ -58,7 +62,12 @@ namespace Content.Client.Instruments.UI base.Dispose(disposing); if (!disposing) return; - _instrumentMenu?.Dispose(); + + if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument)) + { + _instrumentMenu?.RemoveInstrument(instrument); + } + _bandMenu?.Dispose(); _channelsMenu?.Dispose(); } @@ -72,6 +81,11 @@ namespace Content.Client.Instruments.UI { _bandMenu ??= new BandMenu(this); + if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument)) + { + _bandMenu.Master = instrument.Master; + } + // Refresh cache... RefreshBands(); @@ -87,7 +101,9 @@ namespace Content.Client.Instruments.UI public void OpenChannelsMenu() { _channelsMenu ??= new ChannelsMenu(this); - _channelsMenu.Populate(); + EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument); + + _channelsMenu.Populate(instrument); _channelsMenu.OpenCenteredRight(); } diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs index da443e3fb5..fc863648d7 100644 --- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs +++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs @@ -1,7 +1,10 @@ using System.IO; using System.Numerics; using System.Threading.Tasks; +using Content.Client.Interactable; +using Content.Shared.ActionBlocker; using Robust.Client.AutoGenerated; +using Robust.Client.Player; using Robust.Client.UserInterface; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; @@ -16,33 +19,23 @@ namespace Content.Client.Instruments.UI [GenerateTypedNameReferences] public sealed partial class InstrumentMenu : DefaultWindow { - private readonly InstrumentBoundUserInterface _owner; + [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private readonly IFileDialogManager _dialogs = default!; + [Dependency] private readonly IPlayerManager _player = default!; private bool _isMidiFileDialogueWindowOpen; - public InstrumentMenu(InstrumentBoundUserInterface owner) + public event Action? OnOpenBand; + public event Action? OnOpenChannels; + public event Action? OnCloseBands; + public event Action? OnCloseChannels; + + public EntityUid Entity; + + public InstrumentMenu() { RobustXamlLoader.Load(this); - - _owner = owner; - - if (_owner.Instrument != null) - { - _owner.Instrument.OnMidiPlaybackEnded += InstrumentOnMidiPlaybackEnded; - Title = _owner.Entities.GetComponent(_owner.Owner).EntityName; - LoopButton.Disabled = !_owner.Instrument.IsMidiOpen; - LoopButton.Pressed = _owner.Instrument.LoopMidi; - ChannelsButton.Disabled = !_owner.Instrument.IsRendererAlive; - StopButton.Disabled = !_owner.Instrument.IsMidiOpen; - PlaybackSlider.MouseFilter = _owner.Instrument.IsMidiOpen ? MouseFilterMode.Pass : MouseFilterMode.Ignore; - } - - if (!_owner.MidiManager.IsAvailable) - { - UnavailableOverlay.Visible = true; - // We return early as to not give the buttons behavior. - return; - } + IoCManager.InjectDependencies(this); InputButton.OnToggled += MidiInputButtonOnOnToggled; BandButton.OnPressed += BandButtonOnPressed; @@ -57,12 +50,34 @@ namespace Content.Client.Instruments.UI MinSize = SetSize = new Vector2(400, 150); } + public void SetInstrument(Entity entity) + { + Entity = entity; + var component = entity.Comp; + component.OnMidiPlaybackEnded += InstrumentOnMidiPlaybackEnded; + LoopButton.Disabled = !component.IsMidiOpen; + LoopButton.Pressed = component.LoopMidi; + ChannelsButton.Disabled = !component.IsRendererAlive; + StopButton.Disabled = !component.IsMidiOpen; + PlaybackSlider.MouseFilter = component.IsMidiOpen ? MouseFilterMode.Pass : MouseFilterMode.Ignore; + } + + public void RemoveInstrument(InstrumentComponent component) + { + component.OnMidiPlaybackEnded -= InstrumentOnMidiPlaybackEnded; + } + + public void SetMIDI(bool available) + { + UnavailableOverlay.Visible = !available; + } + private void BandButtonOnPressed(ButtonEventArgs obj) { if (!PlayCheck()) return; - _owner.OpenBandMenu(); + OnOpenBand?.Invoke(); } private void BandButtonOnToggled(ButtonToggledEventArgs obj) @@ -70,12 +85,15 @@ namespace Content.Client.Instruments.UI if (obj.Pressed) return; - _owner.Instruments.SetMaster(_owner.Owner, null); + if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument)) + { + _entManager.System().SetMaster(Entity, instrument.Master); + } } private void ChannelsButtonOnPressed(ButtonEventArgs obj) { - _owner.OpenChannelsMenu(); + OnOpenChannels?.Invoke(); } private void InstrumentOnMidiPlaybackEnded() @@ -85,8 +103,10 @@ namespace Content.Client.Instruments.UI public void MidiPlaybackSetButtonsDisabled(bool disabled) { - if(disabled) - _owner.CloseChannelsMenu(); + if (disabled) + { + OnCloseChannels?.Invoke(); + } LoopButton.Disabled = disabled; StopButton.Disabled = disabled; @@ -100,7 +120,7 @@ namespace Content.Client.Instruments.UI if (_isMidiFileDialogueWindowOpen) return; - _owner.CloseBandMenu(); + OnCloseBands?.Invoke(); var filters = new FileDialogFilters(new FileDialogFilters.Group("mid", "midi")); @@ -108,7 +128,7 @@ namespace Content.Client.Instruments.UI // or focus the previously-opened window. _isMidiFileDialogueWindowOpen = true; - await using var file = await _owner.FileDialogManager.OpenFile(filters); + await using var file = await _dialogs.OpenFile(filters); _isMidiFileDialogueWindowOpen = false; @@ -129,9 +149,18 @@ namespace Content.Client.Instruments.UI await file.CopyToAsync(memStream); - if (_owner.Instrument is not {} instrument - || !_owner.Instruments.OpenMidi(_owner.Owner, memStream.GetBuffer().AsSpan(0, (int) memStream.Length), instrument)) + if (!_entManager.TryGetComponent(Entity, out var instrument)) + { return; + } + + if (!_entManager.System() + .OpenMidi(Entity, + memStream.GetBuffer().AsSpan(0, (int) memStream.Length), + instrument)) + { + return; + } MidiPlaybackSetButtonsDisabled(false); if (InputButton.Pressed) @@ -140,7 +169,7 @@ namespace Content.Client.Instruments.UI private void MidiInputButtonOnOnToggled(ButtonToggledEventArgs obj) { - _owner.CloseBandMenu(); + OnCloseBands?.Invoke(); if (obj.Pressed) { @@ -148,109 +177,99 @@ namespace Content.Client.Instruments.UI return; MidiStopButtonOnPressed(null); - if(_owner.Instrument is {} instrument) - _owner.Instruments.OpenInput(_owner.Owner, instrument); + + if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument)) + _entManager.System().OpenInput(Entity, instrument); } - else if (_owner.Instrument is { } instrument) + else { - _owner.Instruments.CloseInput(_owner.Owner, false, instrument); - _owner.CloseChannelsMenu(); + _entManager.System().CloseInput(Entity, false); + OnCloseChannels?.Invoke(); } } private bool PlayCheck() { // TODO all of these checks should also be done server-side. - - var instrumentEnt = _owner.Owner; - var instrument = _owner.Instrument; - - if (instrument == null) + if (!_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument)) return false; - var localEntity = _owner.PlayerManager.LocalEntity; + var localEntity = _player.LocalEntity; // If we don't have a player or controlled entity, we return. if (localEntity == null) return false; // By default, allow an instrument to play itself and skip all other checks - if (localEntity == instrumentEnt) + if (localEntity == Entity) return true; - var container = _owner.Entities.System(); + var container = _entManager.System(); // If we're a handheld instrument, we might be in a container. Get it just in case. - container.TryGetContainingContainer(instrumentEnt, out var conMan); + container.TryGetContainingContainer(Entity, out var conMan); // If the instrument is handheld and we're not holding it, we return. - if ((instrument.Handheld && (conMan == null || conMan.Owner != localEntity))) + if (instrument.Handheld && (conMan == null || conMan.Owner != localEntity)) return false; - if (!_owner.ActionBlocker.CanInteract(localEntity.Value, instrumentEnt)) + if (!_entManager.System().CanInteract(localEntity.Value, Entity)) return false; // We check that we're in range unobstructed just in case. - return _owner.Interactions.InRangeUnobstructed(localEntity.Value, instrumentEnt); + return _entManager.System().InRangeUnobstructed(localEntity.Value, Entity); } private void MidiStopButtonOnPressed(ButtonEventArgs? obj) { MidiPlaybackSetButtonsDisabled(true); - if (_owner.Instrument is not {} instrument) - return; - - _owner.Instruments.CloseMidi(_owner.Owner, false, instrument); - _owner.CloseChannelsMenu(); + _entManager.System().CloseMidi(Entity, false); + OnCloseChannels?.Invoke(); } private void MidiLoopButtonOnOnToggled(ButtonToggledEventArgs obj) { - if (_owner.Instrument == null) - return; + var instrument = _entManager.System(); - _owner.Instrument.LoopMidi = obj.Pressed; - _owner.Instruments.UpdateRenderer(_owner.Owner, _owner.Instrument); + if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrumentComp)) + { + instrumentComp.LoopMidi = obj.Pressed; + } + + instrument.UpdateRenderer(Entity); } private void PlaybackSliderSeek(Range _) { // Do not seek while still grabbing. - if (PlaybackSlider.Grabbed || _owner.Instrument is not {} instrument) + if (PlaybackSlider.Grabbed) return; - _owner.Instruments.SetPlayerTick(_owner.Owner, (int)Math.Ceiling(PlaybackSlider.Value), instrument); + _entManager.System().SetPlayerTick(Entity, (int)Math.Ceiling(PlaybackSlider.Value)); } private void PlaybackSliderKeyUp(GUIBoundKeyEventArgs args) { - if (args.Function != EngineKeyFunctions.UIClick || _owner.Instrument is not {} instrument) + if (args.Function != EngineKeyFunctions.UIClick) return; - _owner.Instruments.SetPlayerTick(_owner.Owner, (int)Math.Ceiling(PlaybackSlider.Value), instrument); - } - - public override void Close() - { - base.Close(); - _owner.CloseBandMenu(); - _owner.CloseChannelsMenu(); + _entManager.System().SetPlayerTick(Entity, (int)Math.Ceiling(PlaybackSlider.Value)); } protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); - if (_owner.Instrument == null) + if (!_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument)) return; - var hasMaster = _owner.Instrument.Master != null; + var hasMaster = instrument.Master != null; BandButton.ToggleMode = hasMaster; BandButton.Pressed = hasMaster; - BandButton.Disabled = _owner.Instrument.IsMidiOpen || _owner.Instrument.IsInputOpen; - ChannelsButton.Disabled = !_owner.Instrument.IsRendererAlive; + BandButton.Disabled = instrument.IsMidiOpen || instrument.IsInputOpen; + ChannelsButton.Disabled = !instrument.IsRendererAlive; - if (!_owner.Instrument.IsMidiOpen) + if (!instrument.IsMidiOpen) { PlaybackSlider.MaxValue = 1; PlaybackSlider.SetValueWithoutEvent(0); @@ -260,8 +279,8 @@ namespace Content.Client.Instruments.UI if (PlaybackSlider.Grabbed) return; - PlaybackSlider.MaxValue = _owner.Instrument.PlayerTotalTick; - PlaybackSlider.SetValueWithoutEvent(_owner.Instrument.PlayerTick); + PlaybackSlider.MaxValue = instrument.PlayerTotalTick; + PlaybackSlider.SetValueWithoutEvent(instrument.PlayerTick); } } } diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs index 7e50eb1c68..132c5ed654 100644 --- a/Content.Client/Inventory/StrippableBoundUserInterface.cs +++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs @@ -41,7 +41,7 @@ namespace Content.Client.Inventory public const string HiddenPocketEntityId = "StrippingHiddenEntity"; [ViewVariables] - private readonly StrippingMenu? _strippingMenu; + private StrippingMenu? _strippingMenu; [ViewVariables] private readonly EntityUid _virtualHiddenEntity; @@ -51,33 +51,30 @@ namespace Content.Client.Inventory _examine = EntMan.System(); _inv = EntMan.System(); _cuffable = EntMan.System(); - - // TODO update name when identity changes - var title = Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner, EntMan))); - _strippingMenu = new StrippingMenu(title, this); - _strippingMenu.OnClose += Close; - - // TODO use global entity - // BUIs are opened and closed while applying comp sates, so spawning entities here is probably not the best idea. _virtualHiddenEntity = EntMan.SpawnEntity(HiddenPocketEntityId, MapCoordinates.Nullspace); } protected override void Open() { base.Open(); + + _strippingMenu = this.CreateWindow(); + _strippingMenu.OnDirty += UpdateMenu; + _strippingMenu.Title = Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner, EntMan))); + _strippingMenu?.OpenCenteredLeft(); } protected override void Dispose(bool disposing) { - base.Dispose(disposing); - - EntMan.DeleteEntity(_virtualHiddenEntity); - if (!disposing) return; - _strippingMenu?.Dispose(); + if (_strippingMenu != null) + _strippingMenu.OnDirty -= UpdateMenu; + + EntMan.DeleteEntity(_virtualHiddenEntity); + base.Dispose(disposing); } public void DirtyMenu() diff --git a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs index f97d8a7330..7884268c42 100644 --- a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs +++ b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs @@ -12,42 +12,34 @@ namespace Content.Client.Kitchen.UI [GenerateTypedNameReferences] public sealed partial class GrinderMenu : FancyWindow { - private readonly IEntityManager _entityManager; - private readonly IPrototypeManager _prototypeManager; - private readonly ReagentGrinderBoundUserInterface _owner; + [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; private readonly Dictionary _chamberVisualContents = new(); - public GrinderMenu(ReagentGrinderBoundUserInterface owner, IEntityManager entityManager, IPrototypeManager prototypeManager) + public event Action? OnToggleAuto; + public event Action? OnGrind; + public event Action? OnJuice; + public event Action? OnEjectAll; + public event Action? OnEjectBeaker; + public event Action? OnEjectChamber; + + public GrinderMenu() { RobustXamlLoader.Load(this); - _entityManager = entityManager; - _prototypeManager = prototypeManager; - _owner = owner; - AutoModeButton.OnPressed += owner.ToggleAutoMode; - GrindButton.OnPressed += owner.StartGrinding; - JuiceButton.OnPressed += owner.StartJuicing; - ChamberContentBox.EjectButton.OnPressed += owner.EjectAll; - BeakerContentBox.EjectButton.OnPressed += owner.EjectBeaker; + IoCManager.InjectDependencies(this); + AutoModeButton.OnPressed += _ => OnToggleAuto?.Invoke(); + GrindButton.OnPressed += _ => OnGrind?.Invoke(); + JuiceButton.OnPressed += _ => OnJuice?.Invoke(); + ChamberContentBox.EjectButton.OnPressed += _ => OnEjectAll?.Invoke(); + BeakerContentBox.EjectButton.OnPressed += _ => OnEjectBeaker?.Invoke(); ChamberContentBox.BoxContents.OnItemSelected += OnChamberBoxContentsItemSelected; BeakerContentBox.BoxContents.SelectMode = ItemList.ItemListSelectMode.None; } private void OnChamberBoxContentsItemSelected(ItemList.ItemListSelectedEventArgs args) { - _owner.EjectChamberContent(_chamberVisualContents[args.ItemIndex]); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - _chamberVisualContents.Clear(); - GrindButton.OnPressed -= _owner.StartGrinding; - JuiceButton.OnPressed -= _owner.StartJuicing; - ChamberContentBox.EjectButton.OnPressed -= _owner.EjectAll; - BeakerContentBox.EjectButton.OnPressed -= _owner.EjectBeaker; - ChamberContentBox.BoxContents.OnItemSelected -= OnChamberBoxContentsItemSelected; + OnEjectChamber?.Invoke(_chamberVisualContents[args.ItemIndex]); } public void UpdateState(ReagentGrinderInterfaceState state) diff --git a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs index 7e7dd2d693..643ac47054 100644 --- a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs +++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Kitchen.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Client.Graphics; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Timing; @@ -19,28 +20,15 @@ namespace Content.Client.Kitchen.UI [ViewVariables] private readonly Dictionary _reagents = new(); - [Dependency] private readonly IGameTiming _gameTiming = default!; - - public MicrowaveUpdateUserInterfaceState currentState = default!; - - private IEntityManager _entManager; public MicrowaveBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { - _entManager = IoCManager.Resolve(); - } - - public TimeSpan GetCurrentTime() - { - return _gameTiming.CurTime; } protected override void Open() { base.Open(); - _menu = new MicrowaveMenu(this); - _menu.OpenCentered(); - _menu.OnClose += Close; + _menu = this.CreateWindow(); _menu.StartButton.OnPressed += _ => SendPredictedMessage(new MicrowaveStartCookMessage()); _menu.EjectButton.OnPressed += _ => SendPredictedMessage(new MicrowaveEjectMessage()); _menu.IngredientsList.OnItemSelected += args => @@ -74,38 +62,23 @@ namespace Content.Client.Kitchen.UI }; } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (!disposing) - { - return; - } - - _solids.Clear(); - _menu?.Dispose(); - } - protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); - if (state is not MicrowaveUpdateUserInterfaceState cState) + if (state is not MicrowaveUpdateUserInterfaceState cState || _menu == null) { return; } + _menu.IsBusy = cState.IsMicrowaveBusy; + _menu.CurrentCooktimeEnd = cState.CurrentCookTimeEnd; - _menu?.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0); - currentState = cState; - + _menu.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0); // TODO move this to a component state and ensure the net ids. - RefreshContentsDisplay(_entManager.GetEntityArray(cState.ContainedSolids)); - - if (_menu == null) return; + RefreshContentsDisplay(EntMan.GetEntityArray(cState.ContainedSolids)); //Set the cook time info label - var cookTime = cState.ActiveButtonIndex == 0 + var cookTime = cState.ActiveButtonIndex == 0 ? Loc.GetString("microwave-menu-instant-button") : cState.CurrentCookTime.ToString(); diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs index b292e9f146..7565075f86 100644 --- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs +++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs @@ -9,22 +9,20 @@ namespace Content.Client.Kitchen.UI [GenerateTypedNameReferences] public sealed partial class MicrowaveMenu : FancyWindow { - public sealed class MicrowaveCookTimeButton : Button - { - public uint CookTime; - } + [Dependency] private readonly IGameTiming _timing = default!; public event Action? OnCookTimeSelected; public ButtonGroup CookTimeButtonGroup { get; } - private readonly MicrowaveBoundUserInterface _owner; - public MicrowaveMenu(MicrowaveBoundUserInterface owner) + public bool IsBusy; + public TimeSpan CurrentCooktimeEnd; + + public MicrowaveMenu() { RobustXamlLoader.Load(this); CookTimeButtonGroup = new ButtonGroup(); InstantCookButton.Group = CookTimeButtonGroup; - _owner = owner; InstantCookButton.OnPressed += args => { OnCookTimeSelected?.Invoke(args, 0); @@ -65,14 +63,20 @@ namespace Content.Client.Kitchen.UI protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); - if(!_owner.currentState.IsMicrowaveBusy) + + if (!IsBusy) return; - if(_owner.currentState.CurrentCookTimeEnd > _owner.GetCurrentTime()) + if (CurrentCooktimeEnd > _timing.CurTime) { CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label", - ("time",_owner.currentState.CurrentCookTimeEnd.Subtract(_owner.GetCurrentTime()).Seconds)); + ("time", CurrentCooktimeEnd.Subtract(_timing.CurTime).Seconds)); } } + + public sealed class MicrowaveCookTimeButton : Button + { + public uint CookTime; + } } } diff --git a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs index e6f108b305..bc4cc75b4d 100644 --- a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs +++ b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Containers.ItemSlots; using Content.Shared.Kitchen; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Prototypes; @@ -8,8 +9,6 @@ namespace Content.Client.Kitchen.UI { public sealed class ReagentGrinderBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [ViewVariables] private GrinderMenu? _menu; @@ -21,20 +20,13 @@ namespace Content.Client.Kitchen.UI { base.Open(); - _menu = new GrinderMenu(this, EntMan, _prototypeManager); - _menu.OpenCentered(); - _menu.OnClose += Close; - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - { - return; - } - - _menu?.Dispose(); + _menu = this.CreateWindow(); + _menu.OnToggleAuto += ToggleAutoMode; + _menu.OnGrind += StartGrinding; + _menu.OnJuice += StartJuicing; + _menu.OnEjectAll += EjectAll; + _menu.OnEjectBeaker += EjectBeaker; + _menu.OnEjectChamber += EjectChamberContent; } protected override void UpdateState(BoundUserInterfaceState state) @@ -52,27 +44,27 @@ namespace Content.Client.Kitchen.UI _menu?.HandleMessage(message); } - public void ToggleAutoMode(BaseButton.ButtonEventArgs args) + public void ToggleAutoMode() { SendMessage(new ReagentGrinderToggleAutoModeMessage()); } - public void StartGrinding(BaseButton.ButtonEventArgs? _ = null) + public void StartGrinding() { SendMessage(new ReagentGrinderStartMessage(GrinderProgram.Grind)); } - public void StartJuicing(BaseButton.ButtonEventArgs? _ = null) + public void StartJuicing() { SendMessage(new ReagentGrinderStartMessage(GrinderProgram.Juice)); } - public void EjectAll(BaseButton.ButtonEventArgs? _ = null) + public void EjectAll() { SendMessage(new ReagentGrinderEjectChamberAllMessage()); } - public void EjectBeaker(BaseButton.ButtonEventArgs? _ = null) + public void EjectBeaker() { SendMessage(new ItemSlotButtonPressedEvent(SharedReagentGrinder.BeakerSlotId)); } diff --git a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs index 555f1ff09e..6b65612341 100644 --- a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs +++ b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Labels; using Content.Shared.Labels.Components; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Labels.UI { @@ -23,13 +24,8 @@ namespace Content.Client.Labels.UI { base.Open(); - _window = new HandLabelerWindow(); - if (State != null) - UpdateState(State); + _window = this.CreateWindow(); - _window.OpenCentered(); - - _window.OnClose += Close; _window.OnLabelChanged += OnLabelChanged; Reload(); } @@ -51,13 +47,5 @@ namespace Content.Client.Labels.UI _window.SetCurrentLabel(component.AssignedLabel); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); - } } - } diff --git a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs index 6e6d1b9176..a599f79152 100644 --- a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs +++ b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Lathe; using Content.Shared.Research.Components; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Lathe.UI { @@ -17,9 +18,9 @@ namespace Content.Client.Lathe.UI { base.Open(); - _menu = new LatheMenu(this); - _menu.OnClose += Close; - + _menu = this.CreateWindow(); + _menu.SetEntity(Owner); + _menu.OpenCenteredRight(); _menu.OnServerListButtonPressed += _ => { @@ -30,8 +31,6 @@ namespace Content.Client.Lathe.UI { SendMessage(new LatheQueueRecipeMessage(recipe, amount)); }; - - _menu.OpenCenteredRight(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -50,13 +49,5 @@ namespace Content.Client.Lathe.UI break; } } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _menu?.Dispose(); - } } } diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs index f2f52b67b5..6f530b76c7 100644 --- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs +++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs @@ -1,3 +1,4 @@ +using System.Buffers; using System.Linq; using System.Text; using Content.Client.Materials; @@ -22,7 +23,6 @@ public sealed partial class LatheMenu : DefaultWindow [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - private EntityUid _owner; private readonly SpriteSystem _spriteSystem; private readonly LatheSystem _lathe; private readonly MaterialStorageSystem _materialStorage; @@ -36,9 +36,10 @@ public sealed partial class LatheMenu : DefaultWindow public ProtoId? CurrentCategory; - public LatheMenu(LatheBoundUserInterface owner) + public EntityUid Entity; + + public LatheMenu() { - _owner = owner.Owner; RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); @@ -46,8 +47,6 @@ public sealed partial class LatheMenu : DefaultWindow _lathe = _entityManager.System(); _materialStorage = _entityManager.System(); - Title = _entityManager.GetComponent(owner.Owner).EntityName; - SearchBar.OnTextChanged += _ => { PopulateRecipes(); @@ -60,8 +59,13 @@ public sealed partial class LatheMenu : DefaultWindow FilterOption.OnItemSelected += OnItemSelected; ServerListButton.OnPressed += a => OnServerListButtonPressed?.Invoke(a); + } - if (_entityManager.TryGetComponent(owner.Owner, out var latheComponent)) + public void SetEntity(EntityUid uid) + { + Entity = uid; + + if (_entityManager.TryGetComponent(Entity, out var latheComponent)) { if (!latheComponent.DynamicRecipes.Any()) { @@ -69,7 +73,7 @@ public sealed partial class LatheMenu : DefaultWindow } } - MaterialsList.SetOwner(owner.Owner); + MaterialsList.SetOwner(Entity); } /// @@ -102,13 +106,15 @@ public sealed partial class LatheMenu : DefaultWindow var sortedRecipesToShow = recipesToShow.OrderBy(p => p.Name); RecipeList.Children.Clear(); + _entityManager.TryGetComponent(Entity, out LatheComponent? lathe); + foreach (var prototype in sortedRecipesToShow) { EntityPrototype? recipeProto = null; - if (_prototypeManager.TryIndex(prototype.Result, out EntityPrototype? entityProto) && entityProto != null) + if (_prototypeManager.TryIndex(prototype.Result, out EntityPrototype? entityProto)) recipeProto = entityProto; - var canProduce = _lathe.CanProduce(_owner, prototype, quantity); + var canProduce = _lathe.CanProduce(Entity, prototype, quantity, component: lathe); var control = new RecipeControl(prototype, () => GenerateTooltipText(prototype), canProduce, recipeProto); control.OnButtonPressed += s => @@ -124,19 +130,20 @@ public sealed partial class LatheMenu : DefaultWindow private string GenerateTooltipText(LatheRecipePrototype prototype) { StringBuilder sb = new(); + var multiplier = _entityManager.GetComponent(Entity).MaterialUseMultiplier; foreach (var (id, amount) in prototype.RequiredMaterials) { if (!_prototypeManager.TryIndex(id, out var proto)) continue; - var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, _entityManager.GetComponent(_owner).MaterialUseMultiplier); + var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, multiplier); var sheetVolume = _materialStorage.GetSheetVolume(proto); var unit = Loc.GetString(proto.Unit); var sheets = adjustedAmount / (float) sheetVolume; - var availableAmount = _materialStorage.GetMaterialAmount(_owner, id); + var availableAmount = _materialStorage.GetMaterialAmount(Entity, id); var missingAmount = Math.Max(0, adjustedAmount - availableAmount); var missingSheets = missingAmount / (float) sheetVolume; diff --git a/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs b/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs index 09bdedfd94..11abe8c245 100644 --- a/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs +++ b/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.MachineLinking; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.Timing; namespace Content.Client.MachineLinking.UI; @@ -19,19 +20,14 @@ public sealed class SignalTimerBoundUserInterface : BoundUserInterface { base.Open(); - _window = new SignalTimerWindow(this); - - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); + _window.OnStartTimer += StartTimer; _window.OnCurrentTextChanged += OnTextChanged; _window.OnCurrentDelayMinutesChanged += OnDelayChanged; _window.OnCurrentDelaySecondsChanged += OnDelayChanged; } - public void OnStartTimer() + public void StartTimer() { SendMessage(new SignalTimerStartMessage()); } @@ -48,11 +44,6 @@ public sealed class SignalTimerBoundUserInterface : BoundUserInterface SendMessage(new SignalTimerDelayChangedMessage(_window.GetDelay())); } - public TimeSpan GetCurrentTime() - { - return _gameTiming.CurTime; - } - /// /// Update the UI state based on server-sent info /// @@ -72,11 +63,4 @@ public sealed class SignalTimerBoundUserInterface : BoundUserInterface _window.SetTimerStarted(cast.TimerStarted); _window.SetHasAccess(cast.HasAccess); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); - } } diff --git a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs index b62595595e..6133abfcb7 100644 --- a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs +++ b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs @@ -9,42 +9,44 @@ namespace Content.Client.MachineLinking.UI; [GenerateTypedNameReferences] public sealed partial class SignalTimerWindow : DefaultWindow { + [Dependency] private readonly IGameTiming _timing = default!; + private const int MaxTextLength = 5; public event Action? OnCurrentTextChanged; public event Action? OnCurrentDelayMinutesChanged; public event Action? OnCurrentDelaySecondsChanged; - private readonly SignalTimerBoundUserInterface _owner; - private TimeSpan? _triggerTime; private bool _timerStarted; - public SignalTimerWindow(SignalTimerBoundUserInterface owner) + public event Action? OnStartTimer; + + public SignalTimerWindow() { RobustXamlLoader.Load(this); - - _owner = owner; + IoCManager.InjectDependencies(this); CurrentTextEdit.OnTextChanged += e => OnCurrentTextChange(e.Text); CurrentDelayEditMinutes.OnTextChanged += e => OnCurrentDelayMinutesChange(e.Text); CurrentDelayEditSeconds.OnTextChanged += e => OnCurrentDelaySecondsChange(e.Text); - StartTimer.OnPressed += _ => OnStartTimer(); + StartTimer.OnPressed += _ => StartTimerWeh(); } - public void OnStartTimer() + private void StartTimerWeh() { if (!_timerStarted) { _timerStarted = true; - _triggerTime = _owner.GetCurrentTime() + GetDelay(); + _triggerTime = _timing.CurTime + GetDelay(); } else { SetTimerStarted(false); } - _owner.OnStartTimer(); + + OnStartTimer?.Invoke(); } protected override void FrameUpdate(FrameEventArgs args) @@ -54,9 +56,9 @@ public sealed partial class SignalTimerWindow : DefaultWindow if (!_timerStarted || _triggerTime == null) return; - if (_owner.GetCurrentTime() < _triggerTime.Value) + if (_timing.CurTime < _triggerTime.Value) { - StartTimer.Text = TextScreenSystem.TimeToString(_triggerTime.Value - _owner.GetCurrentTime()); + StartTimer.Text = TextScreenSystem.TimeToString(_triggerTime.Value - _timing.CurTime); } else { diff --git a/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs b/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs index f6979bf8d7..0a87948ff6 100644 --- a/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs +++ b/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Humanoid.Markings; using Content.Shared.MagicMirror; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.MagicMirror; @@ -17,7 +18,7 @@ public sealed class MagicMirrorBoundUserInterface : BoundUserInterface { base.Open(); - _window = new(); + _window = this.CreateWindow(); _window.OnHairSelected += tuple => SelectHair(MagicMirrorCategory.Hair, tuple.id, tuple.slot); _window.OnHairColorChanged += args => ChangeColor(MagicMirrorCategory.Hair, args.marking, args.slot); @@ -29,9 +30,6 @@ public sealed class MagicMirrorBoundUserInterface : BoundUserInterface args => ChangeColor(MagicMirrorCategory.FacialHair, args.marking, args.slot); _window.OnFacialHairSlotAdded += delegate () { AddSlot(MagicMirrorCategory.FacialHair); }; _window.OnFacialHairSlotRemoved += args => RemoveSlot(MagicMirrorCategory.FacialHair, args); - - _window.OnClose += Close; - _window.OpenCentered(); } private void SelectHair(MagicMirrorCategory category, string marking, int slot) @@ -65,14 +63,5 @@ public sealed class MagicMirrorBoundUserInterface : BoundUserInterface _window.UpdateState(data); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _window?.Dispose(); - } } diff --git a/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs b/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs index 80eca82e32..22e5bc452a 100644 --- a/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs +++ b/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs @@ -1,6 +1,7 @@ using JetBrains.Annotations; using Content.Shared.MassMedia.Systems; using Content.Shared.MassMedia.Components; +using Robust.Client.UserInterface; using Robust.Shared.Timing; using Robust.Shared.Utility; @@ -9,8 +10,6 @@ namespace Content.Client.MassMedia.Ui; [UsedImplicitly] public sealed class NewsWriterBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [ViewVariables] private NewsWriterMenu? _menu; @@ -21,10 +20,7 @@ public sealed class NewsWriterBoundUserInterface : BoundUserInterface protected override void Open() { - _menu = new NewsWriterMenu(_gameTiming); - - _menu.OpenCentered(); - _menu.OnClose += Close; + _menu = this.CreateWindow(); _menu.ArticleEditorPanel.PublishButtonPressed += OnPublishButtonPressed; _menu.DeleteButtonPressed += OnDeleteButtonPressed; @@ -32,16 +28,6 @@ public sealed class NewsWriterBoundUserInterface : BoundUserInterface SendMessage(new NewsWriterArticlesRequestMessage()); } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _menu?.Close(); - _menu?.Dispose(); - } - protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); diff --git a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs index e2d57935e3..c059ce785a 100644 --- a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs +++ b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs @@ -10,17 +10,17 @@ namespace Content.Client.MassMedia.Ui; [GenerateTypedNameReferences] public sealed partial class NewsWriterMenu : FancyWindow { - private readonly IGameTiming _gameTiming; + [Dependency] private readonly IGameTiming _gameTiming = default!; private TimeSpan? _nextPublish; public event Action? DeleteButtonPressed; - public NewsWriterMenu(IGameTiming gameTiming) + public NewsWriterMenu() { RobustXamlLoader.Load(this); + IoCManager.InjectDependencies(this); - _gameTiming = gameTiming; ContentsContainer.RectClipContent = false; // Customize scrollbar width and margin. This is not possible in xaml diff --git a/Content.Client/Mech/Ui/MechBoundUserInterface.cs b/Content.Client/Mech/Ui/MechBoundUserInterface.cs index 4172bdc90f..2130a8c609 100644 --- a/Content.Client/Mech/Ui/MechBoundUserInterface.cs +++ b/Content.Client/Mech/Ui/MechBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Mech; using Content.Shared.Mech.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Mech.Ui; @@ -20,9 +21,8 @@ public sealed class MechBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new(Owner); - - _menu.OnClose += Close; + _menu = this.CreateWindow(); + _menu.SetEntity(Owner); _menu.OpenCenteredLeft(); _menu.OnRemoveButtonPressed += uid => @@ -60,16 +60,6 @@ public sealed class MechBoundUserInterface : BoundUserInterface } } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (!disposing) - return; - - _menu?.Close(); - } - public UIFragment? GetEquipmentUi(EntityUid? uid) { var component = EntMan.GetComponentOrNull(uid); diff --git a/Content.Client/Mech/Ui/MechMenu.xaml.cs b/Content.Client/Mech/Ui/MechMenu.xaml.cs index fad7648808..6f39bc386e 100644 --- a/Content.Client/Mech/Ui/MechMenu.xaml.cs +++ b/Content.Client/Mech/Ui/MechMenu.xaml.cs @@ -16,14 +16,15 @@ public sealed partial class MechMenu : FancyWindow public event Action? OnRemoveButtonPressed; - public MechMenu(EntityUid mech) + public MechMenu() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); + } - _mech = mech; - - MechView.SetEntity(mech); + public void SetEntity(EntityUid uid) + { + MechView.SetEntity(uid); } public void UpdateMechStats() diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs index 3978880987..b1f239cd78 100644 --- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs +++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs @@ -1,4 +1,5 @@ using Content.Shared.Medical.CrewMonitoring; +using Robust.Client.UserInterface; namespace Content.Client.Medical.CrewMonitoring; @@ -14,7 +15,7 @@ public sealed class CrewMonitoringBoundUserInterface : BoundUserInterface protected override void Open() { EntityUid? gridUid = null; - string stationName = string.Empty; + var stationName = string.Empty; if (EntMan.TryGetComponent(Owner, out var xform)) { @@ -26,10 +27,8 @@ public sealed class CrewMonitoringBoundUserInterface : BoundUserInterface } } - _menu = new CrewMonitoringWindow(stationName, gridUid); - - _menu.OpenCentered(); - _menu.OnClose += Close; + _menu = this.CreateWindow(); + _menu.Set(stationName, gridUid); } protected override void UpdateState(BoundUserInterfaceState state) @@ -44,13 +43,4 @@ public sealed class CrewMonitoringBoundUserInterface : BoundUserInterface break; } } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _menu?.Dispose(); - } } diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs index 863412e553..e861864c14 100644 --- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs +++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs @@ -23,22 +23,27 @@ namespace Content.Client.Medical.CrewMonitoring; [GenerateTypedNameReferences] public sealed partial class CrewMonitoringWindow : FancyWindow { - private readonly IEntityManager _entManager; - private readonly IPrototypeManager _prototypeManager; + [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; private readonly SpriteSystem _spriteSystem; private NetEntity? _trackedEntity; private bool _tryToScrollToListFocus; private Texture? _blipTexture; - public CrewMonitoringWindow(string stationName, EntityUid? mapUid) + public CrewMonitoringWindow() { RobustXamlLoader.Load(this); + IoCManager.InjectDependencies(this); - _entManager = IoCManager.Resolve(); - _prototypeManager = IoCManager.Resolve(); _spriteSystem = _entManager.System(); + NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap; + + } + + public void Set(string stationName, EntityUid? mapUid) + { _blipTexture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png"))); if (_entManager.TryGetComponent(mapUid, out var xform)) @@ -49,8 +54,6 @@ public sealed partial class CrewMonitoringWindow : FancyWindow StationName.AddStyleClass("LabelBig"); StationName.Text = stationName; - - NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap; NavMap.ForceNavMapUpdate(); } diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs index 80c98f143b..f85220a926 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Client.NetworkConfigurator.Systems; using Content.Shared.DeviceNetwork; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; namespace Content.Client.NetworkConfigurator; @@ -35,14 +36,12 @@ public sealed class NetworkConfiguratorBoundUserInterface : BoundUserInterface switch (UiKey) { case NetworkConfiguratorUiKey.List: - _listMenu = new NetworkConfiguratorListMenu(this); - _listMenu.OnClose += Close; + _listMenu = this.CreateWindow(); _listMenu.ClearButton.OnPressed += _ => OnClearButtonPressed(); - _listMenu.OpenCenteredRight(); + _listMenu.OnRemoveAddress += OnRemoveButtonPressed; break; case NetworkConfiguratorUiKey.Configure: - _configurationMenu = new NetworkConfiguratorConfigurationMenu(); - _configurationMenu.OnClose += Close; + _configurationMenu = this.CreateWindow(); _configurationMenu.Set.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Set); _configurationMenu.Add.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Add); //_configurationMenu.Edit.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Edit); @@ -50,12 +49,24 @@ public sealed class NetworkConfiguratorBoundUserInterface : BoundUserInterface _configurationMenu.Copy.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Copy); _configurationMenu.Show.OnPressed += OnShowPressed; _configurationMenu.Show.Pressed = _netConfig.ConfiguredListIsTracked(Owner); - _configurationMenu.OpenCentered(); + _configurationMenu.OnRemoveAddress += OnRemoveButtonPressed; break; case NetworkConfiguratorUiKey.Link: - _linkMenu = new NetworkConfiguratorLinkMenu(this); - _linkMenu.OnClose += Close; - _linkMenu.OpenCentered(); + _linkMenu = this.CreateWindow(); + _linkMenu.OnLinkDefaults += args => + { + SendMessage(new NetworkConfiguratorLinksSaveMessage(args)); + }; + + _linkMenu.OnToggleLink += (left, right) => + { + SendMessage(new NetworkConfiguratorToggleLinkMessage(left, right)); + }; + + _linkMenu.OnClearLinks += () => + { + SendMessage(new NetworkConfiguratorClearLinksMessage()); + }; break; } } @@ -83,16 +94,6 @@ public sealed class NetworkConfiguratorBoundUserInterface : BoundUserInterface } } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - - _linkMenu?.Dispose(); - _listMenu?.Dispose(); - _configurationMenu?.Dispose(); - } - private void OnClearButtonPressed() { SendMessage(new NetworkConfiguratorClearDevicesMessage()); diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs index 19d04cd346..fcd2f75918 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs @@ -9,17 +9,23 @@ namespace Content.Client.NetworkConfigurator; [GenerateTypedNameReferences] public sealed partial class NetworkConfiguratorConfigurationMenu : FancyWindow { + public event Action? OnRemoveAddress; + public NetworkConfiguratorConfigurationMenu() { RobustXamlLoader.Load(this); Clear.StyleClasses.Add(StyleBase.ButtonOpenLeft); Clear.StyleClasses.Add(StyleNano.StyleClassButtonColorRed); + DeviceList.OnRemoveAddress += args => + { + OnRemoveAddress?.Invoke(args); + }; } public void UpdateState(DeviceListUserInterfaceState state) { - DeviceList.UpdateState(null, state.DeviceList); + DeviceList.UpdateState(state.DeviceList, false); Count.Text = Loc.GetString("network-configurator-ui-count-label", ("count", state.DeviceList.Count)); } diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs index 8cfa97dc6c..e75c60058c 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs @@ -7,17 +7,19 @@ namespace Content.Client.NetworkConfigurator; [GenerateTypedNameReferences] public sealed partial class NetworkConfiguratorDeviceList : ScrollContainer { - public void UpdateState(NetworkConfiguratorBoundUserInterface? ui, HashSet<(string address, string name)> devices) + public event Action? OnRemoveAddress; + + public void UpdateState(HashSet<(string address, string name)> devices, bool ui) { DeviceList.RemoveAllChildren(); foreach (var device in devices) { - DeviceList.AddChild(BuildDeviceListRow(ui, device)); + DeviceList.AddChild(BuildDeviceListRow(device, ui)); } } - private static BoxContainer BuildDeviceListRow(NetworkConfiguratorBoundUserInterface? ui, (string address, string name) savedDevice) + private BoxContainer BuildDeviceListRow((string address, string name) savedDevice, bool ui) { var row = new BoxContainer() { @@ -48,10 +50,10 @@ public sealed partial class NetworkConfiguratorDeviceList : ScrollContainer row.AddChild(name); row.AddChild(address); - if (ui != null) + if (ui) { row.AddChild(removeButton); - removeButton.OnPressed += _ => ui.OnRemoveButtonPressed(savedDevice.address); + removeButton.OnPressed += _ => OnRemoveAddress?.Invoke(savedDevice.address); } return row; diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs index c04b42f249..8cdffd16af 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs @@ -18,20 +18,20 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow private readonly LinksRender _links; - private readonly List _sources = new(); private readonly List _sinks = new(); - private readonly NetworkConfiguratorBoundUserInterface _userInterface; - private (ButtonPosition position, string id, int index)? _selectedButton; private List<(string left, string right)>? _defaults; - public NetworkConfiguratorLinkMenu(NetworkConfiguratorBoundUserInterface userInterface) + public event Action? OnClearLinks; + public event Action? OnToggleLink; + public event Action>? OnLinkDefaults; + + public NetworkConfiguratorLinkMenu() { - _userInterface = userInterface; RobustXamlLoader.Load(this); var footerStyleBox = new StyleBoxFlat() @@ -52,7 +52,7 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow ButtonOk.OnPressed += _ => Close(); ButtonLinkDefault.OnPressed += _ => LinkDefaults(); - ButtonClear.OnPressed += _ => _userInterface.SendMessage(new NetworkConfiguratorClearLinksMessage()); + ButtonClear.OnPressed += _ => OnClearLinks?.Invoke(); } public void UpdateState(DeviceLinkUserInterfaceState linkState) @@ -98,7 +98,7 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow if (_defaults == default) return; - _userInterface.SendMessage(new NetworkConfiguratorLinksSaveMessage(_defaults)); + OnLinkDefaults?.Invoke(_defaults); } private Button CreateButton(ButtonPosition position, string name, string description, string id, int index) @@ -138,7 +138,7 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow var left = _selectedButton.Value.position == ButtonPosition.Left ? _selectedButton.Value.id : id; var right = _selectedButton.Value.position == ButtonPosition.Left ? id : _selectedButton.Value.id; - _userInterface.SendMessage(new NetworkConfiguratorToggleLinkMessage(left, right)); + OnToggleLink?.Invoke(left, right); args.Button.Pressed = false; diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs index fb4aec1974..6294facaee 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs @@ -9,17 +9,20 @@ namespace Content.Client.NetworkConfigurator; [GenerateTypedNameReferences] public sealed partial class NetworkConfiguratorListMenu : FancyWindow { - private readonly NetworkConfiguratorBoundUserInterface _ui; - public NetworkConfiguratorListMenu(NetworkConfiguratorBoundUserInterface ui) + public event Action? OnRemoveAddress; + + public NetworkConfiguratorListMenu() { RobustXamlLoader.Load(this); - - _ui = ui; + DeviceList.OnRemoveAddress += args => + { + OnRemoveAddress?.Invoke(args); + }; } public void UpdateState(NetworkConfiguratorUserInterfaceState state) { DeviceCountLabel.Text = Loc.GetString("network-configurator-ui-count-label", ("count", state.DeviceList.Count)); - DeviceList.UpdateState(_ui, state.DeviceList); + DeviceList.UpdateState(state.DeviceList, true); } } diff --git a/Content.Client/Nuke/NukeBoundUserInterface.cs b/Content.Client/Nuke/NukeBoundUserInterface.cs index 59fbc5b319..2e15042373 100644 --- a/Content.Client/Nuke/NukeBoundUserInterface.cs +++ b/Content.Client/Nuke/NukeBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Containers.ItemSlots; using Content.Shared.Nuke; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Nuke { @@ -11,15 +12,13 @@ namespace Content.Client.Nuke [ViewVariables] private NukeMenu? _menu; - public NukeBoundUserInterface([NotNull] EntityUid owner, [NotNull] Enum uiKey) : base(owner, uiKey) + public NukeBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } protected override void Open() { - _menu = new NukeMenu(); - _menu.OpenCentered(); - _menu.OnClose += Close; + _menu = this.CreateWindow(); _menu.OnKeypadButtonPressed += i => { @@ -62,15 +61,5 @@ namespace Content.Client.Nuke break; } } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _menu?.Close(); - _menu?.Dispose(); - } } } diff --git a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs index ec055b3240..ad4f1a75d4 100644 --- a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs +++ b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Chat; using Content.Shared.NukeOps; using JetBrains.Annotations; +using Robust.Client.UserInterface; using Robust.Shared.Configuration; using Robust.Shared.Timing; @@ -11,8 +12,6 @@ namespace Content.Client.NukeOps; public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface { [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ILocalizationManager _localizationManager = default!; [ViewVariables] private WarDeclaratorWindow? _window; @@ -23,13 +22,7 @@ public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface { base.Open(); - _window = new WarDeclaratorWindow(_gameTiming, _localizationManager); - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.OnActivated += OnWarDeclaratorActivated; } @@ -42,13 +35,6 @@ public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface _window?.UpdateState(cast); } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (disposing) - _window?.Dispose(); - } - private void OnWarDeclaratorActivated(string message) { var maxLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength); diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs index b4a3f1c7fa..aeceae1327 100644 --- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs +++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs @@ -11,7 +11,8 @@ namespace Content.Client.NukeOps; [GenerateTypedNameReferences] public sealed partial class WarDeclaratorWindow : FancyWindow { - private readonly IGameTiming _gameTiming; + [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly ILocalizationManager _localizationManager = default!; public event Action? OnActivated; @@ -19,15 +20,13 @@ public sealed partial class WarDeclaratorWindow : FancyWindow private TimeSpan _shuttleDisabledTime; private WarConditionStatus _status; - public WarDeclaratorWindow(IGameTiming gameTiming, ILocalizationManager localizationManager) + public WarDeclaratorWindow() { RobustXamlLoader.Load(this); - _gameTiming = gameTiming; - WarButton.OnPressed += (_) => OnActivated?.Invoke(Rope.Collapse(MessageEdit.TextRope)); - MessageEdit.Placeholder = new Rope.Leaf(localizationManager.GetString("war-declarator-message-placeholder")); + MessageEdit.Placeholder = new Rope.Leaf(_localizationManager.GetString("war-declarator-message-placeholder")); } protected override void FrameUpdate(FrameEventArgs args) diff --git a/Content.Client/PDA/PdaBoundUserInterface.cs b/Content.Client/PDA/PdaBoundUserInterface.cs index f8f4c67076..37ce9c4280 100644 --- a/Content.Client/PDA/PdaBoundUserInterface.cs +++ b/Content.Client/PDA/PdaBoundUserInterface.cs @@ -24,14 +24,13 @@ namespace Content.Client.PDA if (_menu == null) CreateMenu(); - - _menu?.OpenCenteredLeft(); } private void CreateMenu() { - _menu = new PdaMenu(); - _menu.OnClose += Close; + _menu = this.CreateWindow(); + _menu.OpenCenteredLeft(); + _menu.FlashLightToggleButton.OnToggled += _ => { SendMessage(new PdaToggleFlashlightMessage()); @@ -96,7 +95,6 @@ namespace Content.Client.PDA _menu?.UpdateState(updateState); } - protected override void AttachCartridgeUI(Control cartridgeUIFragment, string? title) { _menu?.ProgramView.AddChild(cartridgeUIFragment); @@ -118,15 +116,6 @@ namespace Content.Client.PDA _menu?.UpdateAvailablePrograms(programs); } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _menu?.Dispose(); - } - private PdaBorderColorComponent? GetBorderColorComponent() { return EntMan.GetComponentOrNull(Owner); diff --git a/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs b/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs index a0688523f1..170a296ac2 100644 --- a/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs +++ b/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.PDA; using Content.Shared.PDA.Ringer; using JetBrains.Annotations; +using Robust.Client.UserInterface; using Robust.Shared.Timing; namespace Content.Client.PDA.Ringer @@ -18,9 +19,8 @@ namespace Content.Client.PDA.Ringer protected override void Open() { base.Open(); - _menu = new RingtoneMenu(); + _menu = this.CreateWindow(); _menu.OpenToLeft(); - _menu.OnClose += Close; _menu.TestRingerButton.OnPressed += _ => { diff --git a/Content.Client/Paper/UI/PaperBoundUserInterface.cs b/Content.Client/Paper/UI/PaperBoundUserInterface.cs index 4b0ac868f0..f3ad1e347e 100644 --- a/Content.Client/Paper/UI/PaperBoundUserInterface.cs +++ b/Content.Client/Paper/UI/PaperBoundUserInterface.cs @@ -1,4 +1,5 @@ using JetBrains.Annotations; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Utility; using static Content.Shared.Paper.SharedPaperComponent; @@ -19,16 +20,13 @@ public sealed class PaperBoundUserInterface : BoundUserInterface { base.Open(); - _window = new PaperWindow(); - _window.OnClose += Close; - _window.OnSaved += Input_OnTextEntered; + _window = this.CreateWindow(); + _window.OnSaved += InputOnTextEntered; if (EntMan.TryGetComponent(Owner, out var visuals)) { _window.InitVisuals(Owner, visuals); } - - _window.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -37,7 +35,7 @@ public sealed class PaperBoundUserInterface : BoundUserInterface _window?.Populate((PaperBoundUserInterfaceState) state); } - private void Input_OnTextEntered(string text) + private void InputOnTextEntered(string text) { SendMessage(new PaperInputTextMessage(text)); @@ -47,11 +45,4 @@ public sealed class PaperBoundUserInterface : BoundUserInterface _window.Input.CursorPosition = new TextEdit.CursorPos(0, TextEdit.LineBreakBias.Top); } } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); - } } diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs index 7a5fd65264..f7cace642c 100644 --- a/Content.Client/Paper/UI/PaperWindow.xaml.cs +++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs @@ -17,6 +17,7 @@ namespace Content.Client.Paper.UI public sealed partial class PaperWindow : BaseWindow { [Dependency] private readonly IInputManager _inputManager = default!; + [Dependency] private readonly IResourceCache _resCache = default!; private static Color DefaultTextColor = new(25, 25, 25); @@ -85,11 +86,10 @@ namespace Content.Client.Paper.UI // Randomize the placement of any stamps based on the entity UID // so that there's some variety in different papers. StampDisplay.PlacementSeed = (int)entity; - var resCache = IoCManager.Resolve(); // Initialize the background: PaperBackground.ModulateSelfOverride = visuals.BackgroundModulate; - var backgroundImage = visuals.BackgroundImagePath != null? resCache.GetResource(visuals.BackgroundImagePath) : null; + var backgroundImage = visuals.BackgroundImagePath != null? _resCache.GetResource(visuals.BackgroundImagePath) : null; if (backgroundImage != null) { var backgroundImageMode = visuals.BackgroundImageTile ? StyleBoxTexture.StretchMode.Tile : StyleBoxTexture.StretchMode.Stretch; @@ -127,7 +127,7 @@ namespace Content.Client.Paper.UI PaperContent.ModulateSelfOverride = visuals.ContentImageModulate; WrittenTextLabel.ModulateSelfOverride = visuals.FontAccentColor; - var contentImage = visuals.ContentImagePath != null ? resCache.GetResource(visuals.ContentImagePath) : null; + var contentImage = visuals.ContentImagePath != null ? _resCache.GetResource(visuals.ContentImagePath) : null; if (contentImage != null) { // Setup the paper content texture, but keep a reference to it, as we can't set diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs index cde5ba9ef7..ff1eae36f5 100644 --- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs +++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Singularity.Components; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.ParticleAccelerator.UI { @@ -16,9 +17,10 @@ namespace Content.Client.ParticleAccelerator.UI { base.Open(); - _menu = new ParticleAcceleratorControlMenu(this); - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); + _menu.OnOverallState += SendEnableMessage; + _menu.OnPowerState += SendPowerStateMessage; + _menu.OnScanPartsRequested += SendScanPartsMessage; } public void SendEnableMessage(bool enable) @@ -40,13 +42,5 @@ namespace Content.Client.ParticleAccelerator.UI { _menu?.DataUpdate((ParticleAcceleratorUIState) state); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - _menu?.Dispose(); - _menu = null; - } } } diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs index c69e027137..85a5f47629 100644 --- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs +++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs @@ -18,9 +18,10 @@ namespace Content.Client.ParticleAccelerator.UI { public sealed class ParticleAcceleratorControlMenu : BaseWindow { - private readonly ShaderInstance _greyScaleShader; + [Dependency] private readonly IPrototypeManager _protoManager = default!; + [Dependency] private readonly IResourceCache _cache = default!; - private readonly ParticleAcceleratorBoundUserInterface _owner; + private readonly ShaderInstance _greyScaleShader; private readonly Label _drawLabel; private readonly FastNoiseLite _drawNoiseGenerator; @@ -50,19 +51,21 @@ namespace Content.Client.ParticleAccelerator.UI private bool _shouldContinueAnimating; private int _maxStrength = 3; - public ParticleAcceleratorControlMenu(ParticleAcceleratorBoundUserInterface owner) + public event Action? OnOverallState; + public event Action? OnPowerState; + public event Action? OnScanPartsRequested; + + public ParticleAcceleratorControlMenu() { SetSize = new Vector2(400, 320); - _greyScaleShader = IoCManager.Resolve().Index("Greyscale").Instance(); + _greyScaleShader = _protoManager.Index("Greyscale").Instance(); - _owner = owner; _drawNoiseGenerator = new(); _drawNoiseGenerator.SetFractalType(FastNoiseLite.FractalType.FBm); _drawNoiseGenerator.SetFrequency(0.5f); - var resourceCache = IoCManager.Resolve(); - var font = resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13); - var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); + var font = _cache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13); + var panelTex = _cache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); MouseFilter = MouseFilterMode.Stop; @@ -112,7 +115,8 @@ namespace Content.Client.ParticleAccelerator.UI Text = Loc.GetString("particle-accelerator-control-menu-off-button"), StyleClasses = { StyleBase.ButtonOpenRight }, }; - _offButton.OnPressed += args => owner.SendEnableMessage(false); + + _offButton.OnPressed += args => OnOverallState?.Invoke(false); _onButton = new Button { @@ -120,7 +124,7 @@ namespace Content.Client.ParticleAccelerator.UI Text = Loc.GetString("particle-accelerator-control-menu-on-button"), StyleClasses = { StyleBase.ButtonOpenLeft }, }; - _onButton.OnPressed += args => owner.SendEnableMessage(true); + _onButton.OnPressed += args => OnOverallState?.Invoke(true); var closeButton = new TextureButton { @@ -316,7 +320,7 @@ namespace Content.Client.ParticleAccelerator.UI } }); - _scanButton.OnPressed += args => _owner.SendScanPartsMessage(); + _scanButton.OnPressed += args => OnScanPartsRequested?.Invoke(); _alarmControl.AnimationCompleted += s => { @@ -332,7 +336,7 @@ namespace Content.Client.ParticleAccelerator.UI PASegmentControl Segment(string name) { - return new(this, resourceCache, name); + return new(this, _cache, name); } UpdateUI(false, false, false, false); @@ -368,7 +372,7 @@ namespace Content.Client.ParticleAccelerator.UI } _stateSpinBox.SetButtonDisabled(true); - _owner.SendPowerStateMessage(newState); + OnPowerState?.Invoke(newState); } protected override DragMode GetDragModeFor(Vector2 relativeMousePos) diff --git a/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs b/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs index 3ebcf7cbce..0df6787170 100644 --- a/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs +++ b/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Pinpointer; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Pinpointer.UI; @@ -16,19 +17,16 @@ public sealed class NavMapBeaconBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _window = new NavMapBeaconWindow(Owner); - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); + + if (EntMan.TryGetComponent(Owner, out NavMapBeaconComponent? beacon)) + { + _window.SetEntity(Owner, beacon); + } _window.OnApplyButtonPressed += (label, enabled, color) => { SendMessage(new NavMapBeaconConfigureBuiMessage(label, enabled, color)); }; } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - _window?.Dispose(); - } } diff --git a/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs b/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs index 968fe188f7..b77f1af047 100644 --- a/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs +++ b/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs @@ -10,36 +10,35 @@ namespace Content.Client.Pinpointer.UI; [GenerateTypedNameReferences] public sealed partial class NavMapBeaconWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; - private string? _defaultLabel; private bool _defaultEnabled; private Color _defaultColor; public event Action? OnApplyButtonPressed; - public NavMapBeaconWindow(EntityUid beaconEntity) + public NavMapBeaconWindow() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - if (!_entityManager.TryGetComponent(beaconEntity, out var navMap)) - return; + + VisibleButton.OnPressed += args => UpdateVisibleButton(args.Button.Pressed); + LabelLineEdit.OnTextChanged += OnTextChanged; + ColorSelector.OnColorChanged += _ => TryEnableApplyButton(); + + TryEnableApplyButton(); + ApplyButton.OnPressed += OnApplyPressed; + } + + public void SetEntity(EntityUid uid, NavMapBeaconComponent navMap) + { _defaultLabel = navMap.Text; _defaultEnabled = navMap.Enabled; _defaultColor = navMap.Color; UpdateVisibleButton(navMap.Enabled); - VisibleButton.OnPressed += args => UpdateVisibleButton(args.Button.Pressed); - LabelLineEdit.Text = navMap.Text ?? string.Empty; - LabelLineEdit.OnTextChanged += OnTextChanged; - ColorSelector.Color = navMap.Color; - ColorSelector.OnColorChanged += _ => TryEnableApplyButton(); - - TryEnableApplyButton(); - ApplyButton.OnPressed += OnApplyPressed; } private void UpdateVisibleButton(bool value) diff --git a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs index 1483e75e73..7417fafede 100644 --- a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs +++ b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs @@ -1,4 +1,4 @@ -using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Pinpointer.UI; @@ -14,7 +14,6 @@ public sealed class StationMapBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _window?.Close(); EntityUid? gridUid = null; if (EntMan.TryGetComponent(Owner, out var xform)) @@ -22,14 +21,8 @@ public sealed class StationMapBoundUserInterface : BoundUserInterface gridUid = xform.GridUid; } - _window = new StationMapWindow(gridUid, Owner); - _window.OpenCentered(); - _window.OnClose += Close; - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - _window?.Dispose(); + _window = this.CreateWindow(); + _window.Title = EntMan.GetComponent(Owner).EntityName; + _window.Set(gridUid, Owner); } } diff --git a/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs b/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs index 1b01fe4e30..7cbb8b7d0d 100644 --- a/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs +++ b/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs @@ -9,19 +9,18 @@ namespace Content.Client.Pinpointer.UI; [GenerateTypedNameReferences] public sealed partial class StationMapWindow : FancyWindow { - public StationMapWindow(EntityUid? mapUid, EntityUid? trackedEntity) + public StationMapWindow() { RobustXamlLoader.Load(this); + } + + public void Set(EntityUid? mapUid, EntityUid? trackedEntity) + { NavMapScreen.MapUid = mapUid; if (trackedEntity != null) NavMapScreen.TrackedCoordinates.Add(new EntityCoordinates(trackedEntity.Value, Vector2.Zero), (true, Color.Cyan)); - if (IoCManager.Resolve().TryGetComponent(mapUid, out var metadata)) - { - Title = metadata.EntityName; - } - NavMapScreen.ForceNavMapUpdate(); } } diff --git a/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs index 57965b030a..a3ca6f65da 100644 --- a/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs +++ b/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs @@ -1,4 +1,4 @@ -using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Pinpointer.UI; @@ -14,22 +14,15 @@ public sealed class UntrackedStationMapBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _window?.Close(); EntityUid? gridUid = null; + // TODO: What this just looks like it's been copy-pasted wholesale from StationMapBoundUserInterface? if (EntMan.TryGetComponent(Owner, out var xform)) { gridUid = xform.GridUid; } - _window = new StationMapWindow(gridUid, null); - _window.OpenCentered(); - _window.OnClose += Close; - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - _window?.Dispose(); + _window = this.CreateWindow(); + _window.Set(gridUid, Owner); } } diff --git a/Content.Client/Power/APC/ApcBoundUserInterface.cs b/Content.Client/Power/APC/ApcBoundUserInterface.cs index fbcbf01156..759a5949ba 100644 --- a/Content.Client/Power/APC/ApcBoundUserInterface.cs +++ b/Content.Client/Power/APC/ApcBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.APC; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Power.APC { @@ -19,9 +20,8 @@ namespace Content.Client.Power.APC { base.Open(); - _menu = new ApcMenu(this); - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); + _menu.OnBreaker += BreakerPressed; } protected override void UpdateState(BoundUserInterfaceState state) @@ -36,15 +36,5 @@ namespace Content.Client.Power.APC { SendMessage(new ApcToggleMainBreakerMessage()); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _menu?.Dispose(); - } - } } } diff --git a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs index dbf68ea07b..2f61ea63a8 100644 --- a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs +++ b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs @@ -17,13 +17,19 @@ namespace Content.Client.Power.APC.UI [GenerateTypedNameReferences] public sealed partial class ApcMenu : FancyWindow { - public ApcMenu(ApcBoundUserInterface owner) + public event Action? OnBreaker; + + public ApcMenu() { IoCManager.InjectDependencies(this); RobustXamlLoader.Load(this); - EntityView.SetEntity(owner.Owner); - BreakerButton.OnPressed += _ => owner.BreakerPressed(); + BreakerButton.OnPressed += _ => OnBreaker?.Invoke(); + } + + public void SetEntity(EntityUid entity) + { + EntityView.SetEntity(entity); } public void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs index bd5b75de1d..e975e5d466 100644 --- a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs +++ b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs @@ -9,35 +9,39 @@ namespace Content.Client.Power.Generator; [GenerateTypedNameReferences] public sealed partial class GeneratorWindow : FancyWindow { - private readonly EntityUid _entity; - [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly ILocalizationManager _loc = default!; - private readonly SharedPowerSwitchableSystem _switchable; - private readonly FuelGeneratorComponent? _component; - private PortableGeneratorComponentBuiState? _lastState; + private EntityUid _entity; - public GeneratorWindow(PortableGeneratorBoundUserInterface bui, EntityUid entity) + public float? MaximumPower; + + public event Action? OnPower; + public event Action? OnState; + public event Action? OnSwitchOutput; + public event Action? OnEjectFuel; + + public GeneratorWindow() { - _entity = entity; RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - _entityManager.TryGetComponent(entity, out _component); - _switchable = _entityManager.System(); - - EntityView.SetEntity(entity); TargetPower.IsValid += IsValid; TargetPower.ValueChanged += (args) => { - bui.SetTargetPower(args.Value); + OnPower?.Invoke(args.Value); }; - StartButton.OnPressed += _ => bui.Start(); - StopButton.OnPressed += _ => bui.Stop(); - OutputSwitchButton.OnPressed += _ => bui.SwitchOutput(); - FuelEject.OnPressed += _ => bui.EjectFuel(); + StartButton.OnPressed += _ => OnState?.Invoke(true); + StopButton.OnPressed += _ => OnState?.Invoke(false); + OutputSwitchButton.OnPressed += _ => OnSwitchOutput?.Invoke(); + FuelEject.OnPressed += _ => OnEjectFuel?.Invoke(); + } + + public void SetEntity(EntityUid entity) + { + _entity = entity; + EntityView.SetEntity(entity); } private bool IsValid(int arg) @@ -45,7 +49,7 @@ public sealed partial class GeneratorWindow : FancyWindow if (arg < 0) return false; - if (arg > (_lastState?.MaximumPower / 1000.0f ?? 0)) + if (arg > (MaximumPower / 1000.0f ?? 0)) return false; return true; @@ -53,16 +57,17 @@ public sealed partial class GeneratorWindow : FancyWindow public void Update(PortableGeneratorComponentBuiState state) { - if (_component == null) + MaximumPower = state.MaximumPower; + + if (!_entityManager.TryGetComponent(_entity, out FuelGeneratorComponent? component)) return; - _lastState = state; if (!TargetPower.LineEditControl.HasKeyboardFocus()) TargetPower.OverrideValue((int)(state.TargetPower / 1000.0f)); - var efficiency = SharedGeneratorSystem.CalcFuelEfficiency(state.TargetPower, state.OptimalPower, _component); + var efficiency = SharedGeneratorSystem.CalcFuelEfficiency(state.TargetPower, state.OptimalPower, component); Efficiency.Text = efficiency.ToString("P1"); - var burnRate = _component.OptimalBurnRate / efficiency; + var burnRate = component.OptimalBurnRate / efficiency; var left = state.RemainingFuel / burnRate; Eta.Text = Loc.GetString( @@ -102,14 +107,15 @@ public sealed partial class GeneratorWindow : FancyWindow } var canSwitch = _entityManager.TryGetComponent(_entity, out PowerSwitchableComponent? switchable); + var switcher = _entityManager.System(); OutputSwitchLabel.Visible = canSwitch; OutputSwitchButton.Visible = canSwitch; if (switchable != null) { - var voltage = _switchable.VoltageString(_switchable.GetVoltage(_entity, switchable)); + var voltage = switcher.VoltageString(switcher.GetVoltage(_entity, switchable)); OutputSwitchLabel.Text = Loc.GetString("portable-generator-ui-current-output", ("voltage", voltage)); - var nextVoltage = _switchable.VoltageString(_switchable.GetNextVoltage(_entity, switchable)); + var nextVoltage = switcher.VoltageString(switcher.GetNextVoltage(_entity, switchable)); OutputSwitchButton.Text = Loc.GetString("power-switchable-switch-voltage", ("voltage", nextVoltage)); OutputSwitchButton.Disabled = state.On; } diff --git a/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs b/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs index 30679d71fd..550e1041b6 100644 --- a/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs +++ b/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Power.Generator; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Power.Generator; @@ -16,10 +17,25 @@ public sealed class PortableGeneratorBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _window = new GeneratorWindow(this, Owner); + _window = this.CreateWindow(); + _window.SetEntity(Owner); + _window.OnState += args => + { + if (args) + { + Start(); + } + else + { + Stop(); + } + }; + + _window.OnPower += SetTargetPower; + _window.OnEjectFuel += EjectFuel; + _window.OnSwitchOutput += SwitchOutput; _window.OpenCenteredLeft(); - _window.OnClose += Close; } protected override void UpdateState(BoundUserInterfaceState state) @@ -30,11 +46,6 @@ public sealed class PortableGeneratorBoundUserInterface : BoundUserInterface _window?.Update(msg); } - protected override void Dispose(bool disposing) - { - _window?.Dispose(); - } - public void SetTargetPower(int target) { SendMessage(new PortableGeneratorSetTargetPowerMessage(target)); diff --git a/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs b/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs index dc1dcd03ef..cbc343c06c 100644 --- a/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs +++ b/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs @@ -1,4 +1,5 @@ using Content.Shared.Power; +using Robust.Client.UserInterface; namespace Content.Client.Power; @@ -11,9 +12,9 @@ public sealed class PowerMonitoringConsoleBoundUserInterface : BoundUserInterfac protected override void Open() { - _menu = new PowerMonitoringWindow(this, Owner); - _menu.OpenCentered(); - _menu.OnClose += Close; + _menu = this.CreateWindow(); + _menu.SetEntity(Owner); + _menu.SendPowerMonitoringConsoleMessageAction += SendPowerMonitoringConsoleMessage; } protected override void UpdateState(BoundUserInterfaceState state) @@ -22,9 +23,6 @@ public sealed class PowerMonitoringConsoleBoundUserInterface : BoundUserInterfac var castState = (PowerMonitoringConsoleBoundInterfaceState) state; - if (castState == null) - return; - EntMan.TryGetComponent(Owner, out var xform); _menu?.ShowEntites (castState.TotalSources, @@ -40,13 +38,4 @@ public sealed class PowerMonitoringConsoleBoundUserInterface : BoundUserInterfac { SendMessage(new PowerMonitoringConsoleMessage(netEntity, group)); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _menu?.Dispose(); - } } diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs index 74752ddc53..d995299207 100644 --- a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs +++ b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs @@ -32,7 +32,7 @@ public sealed partial class PowerMonitoringWindow if (windowEntry == null) return; - // Update sources and loads + // Update sources and loads UpdateEntrySourcesOrLoads(masterContainer, windowEntry.SourcesContainer, focusSources, _sourceIcon); UpdateEntrySourcesOrLoads(masterContainer, windowEntry.LoadsContainer, focusLoads, _loadIconPath); @@ -134,7 +134,7 @@ public sealed partial class PowerMonitoringWindow subEntry.Button.OnButtonUp += args => { ButtonAction(subEntry, masterContainer); }; } - if (!_entManager.TryGetComponent(_owner, out var console)) + if (!_entManager.TryGetComponent(Entity, out var console)) return; // Update all children @@ -379,7 +379,7 @@ public sealed class PowerMonitoringWindowEntry : PowerMonitoringWindowBaseEntry AddChild(MainContainer); - // Grid container to hold the list of sources when selected + // Grid container to hold the list of sources when selected SourcesContainer = new BoxContainer() { Orientation = LayoutOrientation.Vertical, diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.cs index 81fe1f4d04..e304325248 100644 --- a/Content.Client/Power/PowerMonitoringWindow.xaml.cs +++ b/Content.Client/Power/PowerMonitoringWindow.xaml.cs @@ -15,13 +15,12 @@ namespace Content.Client.Power; [GenerateTypedNameReferences] public sealed partial class PowerMonitoringWindow : FancyWindow { - private readonly IEntityManager _entManager; + [Dependency] private IEntityManager _entManager = default!; private readonly SpriteSystem _spriteSystem; - private readonly IGameTiming _gameTiming; + [Dependency] private IGameTiming _gameTiming = default!; private const float BlinkFrequency = 1f; - private EntityUid? _owner; private NetEntity? _focusEntity; public event Action? SendPowerMonitoringConsoleMessageAction; @@ -34,40 +33,14 @@ public sealed partial class PowerMonitoringWindow : FancyWindow { PowerMonitoringConsoleGroup.APC, (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_triangle.png")), Color.LimeGreen) }, }; - public PowerMonitoringWindow(PowerMonitoringConsoleBoundUserInterface userInterface, EntityUid? owner) + public EntityUid Entity; + + public PowerMonitoringWindow() { RobustXamlLoader.Load(this); - _entManager = IoCManager.Resolve(); - _gameTiming = IoCManager.Resolve(); + IoCManager.InjectDependencies(this); _spriteSystem = _entManager.System(); - _owner = owner; - - // Pass owner to nav map - NavMap.Owner = _owner; - - // Set nav map grid uid - var stationName = Loc.GetString("power-monitoring-window-unknown-location"); - - if (_entManager.TryGetComponent(owner, out var xform)) - { - NavMap.MapUid = xform.GridUid; - - // Assign station name - if (_entManager.TryGetComponent(xform.GridUid, out var stationMetaData)) - stationName = stationMetaData.EntityName; - - var msg = new FormattedMessage(); - msg.AddMarkup(Loc.GetString("power-monitoring-window-station-name", ("stationName", stationName))); - - StationName.SetMessage(msg); - } - - else - { - StationName.SetMessage(stationName); - NavMap.Visible = false; - } // Set trackable entity selected action NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap; @@ -88,9 +61,37 @@ public sealed partial class PowerMonitoringWindow : FancyWindow ShowHVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.HighVoltage); ShowMVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.MediumVoltage); ShowLVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.Apc); + } - // Set power monitoring message action - SendPowerMonitoringConsoleMessageAction += userInterface.SendPowerMonitoringConsoleMessage; + public void SetEntity(EntityUid uid) + { + Entity = uid; + + // Pass owner to nav map + NavMap.Owner = uid; + + // Set nav map grid uid + var stationName = Loc.GetString("power-monitoring-window-unknown-location"); + + if (_entManager.TryGetComponent(uid, out var xform)) + { + NavMap.MapUid = xform.GridUid; + + // Assign station name + if (_entManager.TryGetComponent(xform.GridUid, out var stationMetaData)) + stationName = stationMetaData.EntityName; + + var msg = new FormattedMessage(); + msg.AddMarkupOrThrow(Loc.GetString("power-monitoring-window-station-name", ("stationName", stationName))); + + StationName.SetMessage(msg); + } + + else + { + StationName.SetMessage(stationName); + NavMap.Visible = false; + } } private void OnTabChanged(int tab) @@ -113,10 +114,7 @@ public sealed partial class PowerMonitoringWindow : FancyWindow PowerMonitoringConsoleEntry[] focusLoads, EntityCoordinates? monitorCoords) { - if (_owner == null) - return; - - if (!_entManager.TryGetComponent(_owner.Value, out var console)) + if (!_entManager.TryGetComponent(Entity, out var console)) return; // Update power status text @@ -161,13 +159,13 @@ public sealed partial class PowerMonitoringWindow : FancyWindow } // Show monitor location - var mon = _entManager.GetNetEntity(_owner); + var mon = _entManager.GetNetEntity(Entity); - if (monitorCoords != null && mon != null) + if (monitorCoords != null && mon.IsValid()) { var texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png"))); var blip = new NavMapBlip(monitorCoords.Value, texture, Color.Cyan, true, false); - NavMap.TrackedEntities[mon.Value] = blip; + NavMap.TrackedEntities[mon] = blip; } // If the entry group doesn't match the current tab, the data is out dated, do not use it @@ -239,7 +237,7 @@ public sealed partial class PowerMonitoringWindow : FancyWindow if (netEntity == null) return; - if (!_entManager.TryGetComponent(_owner, out var console)) + if (!_entManager.TryGetComponent(Entity, out var console)) return; if (!console.PowerMonitoringDeviceMetaData.TryGetValue(netEntity.Value, out var metaData)) @@ -266,7 +264,7 @@ public sealed partial class PowerMonitoringWindow : FancyWindow { AutoScrollToFocus(); - // Warning sign pulse + // Warning sign pulse var lit = _gameTiming.RealTime.TotalSeconds % BlinkFrequency > BlinkFrequency / 2f; SystemWarningPanel.Modulate = lit ? Color.White : new Color(178, 178, 178); } diff --git a/Content.Client/RCD/RCDMenu.xaml.cs b/Content.Client/RCD/RCDMenu.xaml.cs index 3eb0397a69..aefb319181 100644 --- a/Content.Client/RCD/RCDMenu.xaml.cs +++ b/Content.Client/RCD/RCDMenu.xaml.cs @@ -20,31 +20,36 @@ public sealed partial class RCDMenu : RadialMenu [Dependency] private readonly IPrototypeManager _protoManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; - private readonly SpriteSystem _spriteSystem; - private readonly SharedPopupSystem _popup; + private SharedPopupSystem _popup; + private SpriteSystem _sprites; public event Action>? SendRCDSystemMessageAction; private EntityUid _owner; - public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui) + public RCDMenu() { IoCManager.InjectDependencies(this); RobustXamlLoader.Load(this); - _spriteSystem = _entManager.System(); _popup = _entManager.System(); + _sprites = _entManager.System(); - _owner = owner; + OnChildAdded += AddRCDMenuButtonOnClickActions; + } + public void SetEntity(EntityUid uid) + { + _owner = uid; + } + + public void Refresh() + { // Find the main radial container var main = FindControl("Main"); - if (main == null) - return; - // Populate secondary radial containers - if (!_entManager.TryGetComponent(owner, out var rcd)) + if (!_entManager.TryGetComponent(_owner, out var rcd)) return; foreach (var protoId in rcd.AvailablePrototypes) @@ -56,10 +61,6 @@ public sealed partial class RCDMenu : RadialMenu continue; var parent = FindControl(proto.Category); - - if (parent == null) - continue; - var tooltip = Loc.GetString(proto.SetName); if ((proto.Mode == RcdMode.ConstructTile || proto.Mode == RcdMode.ConstructObject) && @@ -84,7 +85,7 @@ public sealed partial class RCDMenu : RadialMenu { VerticalAlignment = VAlignment.Center, HorizontalAlignment = HAlignment.Center, - Texture = _spriteSystem.Frame0(proto.Sprite), + Texture = _sprites.Frame0(proto.Sprite), TextureScale = new Vector2(2f, 2f), }; @@ -112,11 +113,9 @@ public sealed partial class RCDMenu : RadialMenu // Set up menu actions foreach (var child in Children) + { AddRCDMenuButtonOnClickActions(child); - - OnChildAdded += AddRCDMenuButtonOnClickActions; - - SendRCDSystemMessageAction += bui.SendRCDSystemMessage; + } } private static string OopsConcat(string a, string b) diff --git a/Content.Client/RCD/RCDMenuBoundUserInterface.cs b/Content.Client/RCD/RCDMenuBoundUserInterface.cs index a37dbcecf8..1dd03626ae 100644 --- a/Content.Client/RCD/RCDMenuBoundUserInterface.cs +++ b/Content.Client/RCD/RCDMenuBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.RCD.Components; using JetBrains.Annotations; using Robust.Client.Graphics; using Robust.Client.Input; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.RCD; @@ -24,8 +25,9 @@ public sealed class RCDMenuBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new(Owner, this); - _menu.OnClose += Close; + _menu = this.CreateWindow(); + _menu.SetEntity(Owner); + _menu.SendRCDSystemMessageAction += SendRCDSystemMessage; // Open the menu, centered on the mouse var vpSize = _displayManager.ScreenSize; @@ -34,16 +36,8 @@ public sealed class RCDMenuBoundUserInterface : BoundUserInterface public void SendRCDSystemMessage(ProtoId protoId) { - // A predicted message cannot be used here as the RCD UI is closed immediately + // A predicted message cannot be used here as the RCD UI is closed immediately // after this message is sent, which will stop the server from receiving it SendMessage(new RCDSystemMessage(protoId)); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - - _menu?.Dispose(); - } } diff --git a/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs b/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs index 7b3e39aa08..401e7edd44 100644 --- a/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs +++ b/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs @@ -1,6 +1,8 @@ using Content.Shared.Radio; using Content.Shared.Radio.Components; using JetBrains.Annotations; +using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Radio.Ui; @@ -19,9 +21,12 @@ public sealed class IntercomBoundUserInterface : BoundUserInterface { base.Open(); - var comp = EntMan.GetComponent(Owner); + _menu = this.CreateWindow(); - _menu = new((Owner, comp)); + if (EntMan.TryGetComponent(Owner, out IntercomComponent? intercom)) + { + _menu.Update((Owner, intercom)); + } _menu.OnMicPressed += enabled => { @@ -35,17 +40,6 @@ public sealed class IntercomBoundUserInterface : BoundUserInterface { SendMessage(new SelectIntercomChannelMessage(channel)); }; - - _menu.OnClose += Close; - _menu.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _menu?.Close(); } public void Update(Entity ent) diff --git a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs index 2e08913051..20d2e4a3e5 100644 --- a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs +++ b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs @@ -18,15 +18,13 @@ public sealed partial class IntercomMenu : FancyWindow private readonly List _channels = new(); - public IntercomMenu(Entity entity) + public IntercomMenu() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); MicButton.OnPressed += args => OnMicPressed?.Invoke(args.Button.Pressed); SpeakerButton.OnPressed += args => OnSpeakerPressed?.Invoke(args.Button.Pressed); - - Update(entity); } public void Update(Entity entity) diff --git a/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs b/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs index c14a8c5bd0..9641adb5b2 100644 --- a/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs +++ b/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs @@ -1,5 +1,7 @@ using Content.Shared.Research; using Content.Shared.Research.Components; +using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Research.UI { @@ -16,10 +18,7 @@ namespace Content.Client.Research.UI { base.Open(); - _menu = new(); - - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); _menu.OnServerButtonPressed += () => { @@ -31,14 +30,6 @@ namespace Content.Client.Research.UI }; } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _menu?.Close(); - } - protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); diff --git a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs index a0a2b58e88..288445e4de 100644 --- a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs +++ b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs @@ -1,4 +1,6 @@ using Content.Shared.Research.Components; +using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Research.UI { @@ -15,10 +17,9 @@ namespace Content.Client.Research.UI protected override void Open() { base.Open(); - - _menu = new ResearchClientServerSelectionMenu(this); - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); + _menu.OnServerSelected += SelectServer; + _menu.OnServerDeselected += DeselectServer; } public void SelectServer(int serverId) @@ -37,12 +38,5 @@ namespace Content.Client.Research.UI if (state is not ResearchClientBoundInterfaceState rState) return; _menu?.Populate(rState.ServerCount, rState.ServerNames, rState.ServerIds, rState.SelectedServerId); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _menu?.Dispose(); - } } } diff --git a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs index ceaa965e59..d10f8b39f4 100644 --- a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs +++ b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs @@ -13,27 +13,26 @@ namespace Content.Client.Research.UI private int[] _serverIds = Array.Empty(); private int _selectedServerId = -1; - private ResearchClientBoundUserInterface Owner { get; } + public event Action? OnServerSelected; + public event Action? OnServerDeselected; - public ResearchClientServerSelectionMenu(ResearchClientBoundUserInterface owner) + public ResearchClientServerSelectionMenu() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - Owner = owner; - Servers.OnItemSelected += OnItemSelected; Servers.OnItemDeselected += OnItemDeselected; } public void OnItemSelected(ItemList.ItemListSelectedEventArgs itemListSelectedEventArgs) { - Owner.SelectServer(_serverIds[itemListSelectedEventArgs.ItemIndex]); + OnServerSelected?.Invoke(_serverIds[itemListSelectedEventArgs.ItemIndex]); } public void OnItemDeselected(ItemList.ItemListDeselectedEventArgs itemListDeselectedEventArgs) { - Owner.DeselectServer(); + OnServerDeselected?.Invoke(); } public void Populate(int serverCount, string[] serverNames, int[] serverIds, int selectedServerId) diff --git a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs index 2a9782045b..2895ada61f 100644 --- a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs +++ b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs @@ -1,5 +1,8 @@ using Content.Shared.Research.Components; +using Content.Shared.Research.Prototypes; using JetBrains.Annotations; +using Robust.Client.UserInterface; +using Robust.Shared.Prototypes; namespace Content.Client.Research.UI; @@ -19,7 +22,8 @@ public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface var owner = Owner; - _consoleMenu = new ResearchConsoleMenu(owner); + _consoleMenu = this.CreateWindow(); + _consoleMenu.SetEntity(owner); _consoleMenu.OnTechnologyCardPressed += id => { @@ -30,10 +34,20 @@ public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface { SendMessage(new ConsoleServerSelectionMessage()); }; + } - _consoleMenu.OnClose += Close; + public override void OnProtoReload(PrototypesReloadedEventArgs args) + { + base.OnProtoReload(args); - _consoleMenu.OpenCentered(); + if (!args.WasModified()) + return; + + if (State is not ResearchConsoleBoundInterfaceState rState) + return; + + _consoleMenu?.UpdatePanels(rState); + _consoleMenu?.UpdateInformationPanel(rState); } protected override void UpdateState(BoundUserInterfaceState state) @@ -45,12 +59,4 @@ public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface _consoleMenu?.UpdatePanels(castState); _consoleMenu?.UpdateInformationPanel(castState); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _consoleMenu?.Dispose(); - } } diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs index 77ebe6740c..eafbe75fbb 100644 --- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs +++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs @@ -25,14 +25,13 @@ public sealed partial class ResearchConsoleMenu : FancyWindow [Dependency] private readonly IEntityManager _entity = default!; [Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] private readonly IPlayerManager _player = default!; - private readonly TechnologyDatabaseComponent? _technologyDatabase; private readonly ResearchSystem _research; private readonly SpriteSystem _sprite; private readonly AccessReaderSystem _accessReader; - public readonly EntityUid Entity; + public EntityUid Entity; - public ResearchConsoleMenu(EntityUid entity) + public ResearchConsoleMenu() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); @@ -40,21 +39,23 @@ public sealed partial class ResearchConsoleMenu : FancyWindow _research = _entity.System(); _sprite = _entity.System(); _accessReader = _entity.System(); - Entity = entity; ServerButton.OnPressed += _ => OnServerButtonPressed?.Invoke(); - - _entity.TryGetComponent(entity, out _technologyDatabase); } - public void UpdatePanels(ResearchConsoleBoundInterfaceState state) + public void SetEntity(EntityUid entity) + { + Entity = entity; + } + + public void UpdatePanels(ResearchConsoleBoundInterfaceState state) { TechnologyCardsContainer.Children.Clear(); var availableTech = _research.GetAvailableTechnologies(Entity); SyncTechnologyList(AvailableCardsContainer, availableTech); - if (_technologyDatabase == null) + if (!_entity.TryGetComponent(Entity, out TechnologyDatabaseComponent? database)) return; // i can't figure out the spacing so here you go @@ -66,7 +67,7 @@ public sealed partial class ResearchConsoleMenu : FancyWindow var hasAccess = _player.LocalEntity is not { } local || !_entity.TryGetComponent(Entity, out var access) || _accessReader.IsAllowed(local, Entity, access); - foreach (var techId in _technologyDatabase.CurrentTechnologyCards) + foreach (var techId in database.CurrentTechnologyCards) { var tech = _prototype.Index(techId); var cardControl = new TechnologyCardControl(tech, _prototype, _sprite, _research.GetTechnologyDescription(tech, includeTier: false), state.Points, hasAccess); @@ -74,7 +75,7 @@ public sealed partial class ResearchConsoleMenu : FancyWindow TechnologyCardsContainer.AddChild(cardControl); } - var unlockedTech = _technologyDatabase.UnlockedTechnologies.Select(x => _prototype.Index(x)); + var unlockedTech = database.UnlockedTechnologies.Select(x => _prototype.Index(x)); SyncTechnologyList(UnlockedCardsContainer, unlockedTech); } @@ -85,14 +86,14 @@ public sealed partial class ResearchConsoleMenu : FancyWindow ("points", state.Points))); ResearchAmountLabel.SetMessage(amountMsg); - if (_technologyDatabase == null) + if (!_entity.TryGetComponent(Entity, out TechnologyDatabaseComponent? database)) return; var disciplineText = Loc.GetString("research-discipline-none"); var disciplineColor = Color.Gray; - if (_technologyDatabase.MainDiscipline != null) + if (database.MainDiscipline != null) { - var discipline = _prototype.Index(_technologyDatabase.MainDiscipline); + var discipline = _prototype.Index(database.MainDiscipline); disciplineText = Loc.GetString(discipline.Name); disciplineColor = discipline.Color; } @@ -103,10 +104,10 @@ public sealed partial class ResearchConsoleMenu : FancyWindow MainDisciplineLabel.SetMessage(msg); TierDisplayContainer.Children.Clear(); - foreach (var disciplineId in _technologyDatabase.SupportedDisciplines) + foreach (var disciplineId in database.SupportedDisciplines) { var discipline = _prototype.Index(disciplineId); - var tier = _research.GetHighestDisciplineTier(_technologyDatabase, discipline); + var tier = _research.GetHighestDisciplineTier(database, discipline); // don't show tiers with no available tech if (tier == 0) diff --git a/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs b/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs index 6185979eee..9a5159880f 100644 --- a/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs +++ b/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Robotics; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Robotics.UI; @@ -16,7 +17,9 @@ public sealed class RoboticsConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _window = new RoboticsConsoleWindow(Owner); + _window = this.CreateWindow(); + _window.SetEntity(Owner); + _window.OnDisablePressed += address => { SendMessage(new RoboticsConsoleDisableMessage(address)); @@ -25,9 +28,6 @@ public sealed class RoboticsConsoleBoundUserInterface : BoundUserInterface { SendMessage(new RoboticsConsoleDestroyMessage(address)); }; - _window.OnClose += Close; - - _window.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -37,14 +37,6 @@ public sealed class RoboticsConsoleBoundUserInterface : BoundUserInterface if (state is not RoboticsConsoleState cast) return; - _window?.UpdateState(cast); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - _window?.Dispose(); + _window.UpdateState(cast); } } diff --git a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs index fc7b234bcc..87d7e62c39 100644 --- a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs +++ b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs @@ -23,11 +23,12 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow public Action? OnDisablePressed; public Action? OnDestroyPressed; - private Entity _console; private string? _selected; private Dictionary _cyborgs = new(); - public RoboticsConsoleWindow(EntityUid console) + public EntityUid Entity; + + public RoboticsConsoleWindow() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); @@ -35,9 +36,6 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow _lock = _entMan.System(); _sprite = _entMan.System(); - _console = (console, _entMan.GetComponent(console), null); - _entMan.TryGetComponent(_console, out _console.Comp2); - Cyborgs.OnItemSelected += args => { if (Cyborgs[args.ItemIndex].Metadata is not string address) @@ -66,6 +64,11 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow DestroyButton.StyleClasses.Add(StyleBase.ButtonCaution); } + public void SetEntity(EntityUid uid) + { + Entity = uid; + } + public void UpdateState(RoboticsConsoleState state) { _cyborgs = state.Cyborgs; @@ -81,7 +84,7 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow PopulateData(); - var locked = _lock.IsLocked((_console, _console.Comp2)); + var locked = _lock.IsLocked(Entity); DangerZone.Visible = !locked; LockedMessage.Visible = locked; } @@ -135,13 +138,19 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow // how the turntables DisableButton.Disabled = !(data.HasBrain && data.CanDisable); - DestroyButton.Disabled = _timing.CurTime < _console.Comp1.NextDestroy; } protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); - DestroyButton.Disabled = _timing.CurTime < _console.Comp1.NextDestroy; + if (_entMan.TryGetComponent(Entity, out RoboticsConsoleComponent? console)) + { + DestroyButton.Disabled = _timing.CurTime < console.NextDestroy; + } + else + { + DestroyButton.Disabled = true; + } } } diff --git a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs index 8f1723d1f2..663bde15b0 100644 --- a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs +++ b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs @@ -30,17 +30,9 @@ public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterf protected override void Open() { base.Open(); - _window = new OfferingWindow(); + _window = this.CreateWindow(); _window.Title = Loc.GetString("salvage-expedition-window-title"); - _window.OnClose += Close; - _window?.OpenCenteredLeft(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - _window?.Dispose(); - _window = null; + _window.OpenCenteredLeft(); } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs index eafb692733..a248126a85 100644 --- a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs +++ b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs @@ -21,13 +21,9 @@ public sealed class SalvageMagnetBoundUserInterface : BoundUserInterface { base.Open(); - if (_window is null) - { - _window = new OfferingWindow(); - _window.Title = Loc.GetString("salvage-magnet-window-title"); - _window.OnClose += Close; - _window.OpenCenteredLeft(); - } + _window = this.CreateWindow(); + _window.Title = Loc.GetString("salvage-magnet-window-title"); + _window.OpenCenteredLeft(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -112,15 +108,4 @@ public sealed class SalvageMagnetBoundUserInterface : BoundUserInterface _window.AddOption(option); } } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _window?.Close(); - _window?.Dispose(); - } - } } diff --git a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs index 086369aa26..b8b4fb8a74 100644 --- a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs +++ b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Shuttles.BUIStates; using Content.Shared.Shuttles.Events; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Shuttles.BUI; @@ -20,8 +21,7 @@ public sealed class IFFConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _window = new IFFConsoleWindow(); - _window.OnClose += Close; + _window = this.CreateWindow(); _window.ShowIFF += SendIFFMessage; _window.ShowVessel += SendVesselMessage; _window.OpenCenteredLeft(); diff --git a/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs index 4bd44a47a8..f75759b042 100644 --- a/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs +++ b/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Client.Shuttles.UI; using Content.Shared.Shuttles.BUIStates; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using RadarConsoleWindow = Content.Client.Shuttles.UI.RadarConsoleWindow; namespace Content.Client.Shuttles.BUI; @@ -20,18 +21,7 @@ public sealed class RadarConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _window = new RadarConsoleWindow(); - _window.OnClose += Close; - _window.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (disposing) - { - _window?.Dispose(); - } + _window = this.CreateWindow(); } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs index af7b6055c8..e677181419 100644 --- a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs +++ b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Client.Shuttles.UI; using Content.Shared.Shuttles.BUIStates; using Content.Shared.Shuttles.Events; using JetBrains.Annotations; +using Robust.Client.UserInterface; using Robust.Shared.Map; namespace Content.Client.Shuttles.BUI; @@ -19,9 +20,7 @@ public sealed class ShuttleConsoleBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _window = new ShuttleConsoleWindow(); - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); _window.RequestFTL += OnFTLRequest; _window.RequestBeaconFTL += OnFTLBeaconRequest; diff --git a/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs b/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs index 3cc2a35d79..ed9bf40a48 100644 --- a/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs +++ b/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Silicons.Borgs; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Silicons.Borgs; @@ -18,9 +19,8 @@ public sealed class BorgBoundUserInterface : BoundUserInterface { base.Open(); - var owner = Owner; - - _menu = new BorgMenu(owner); + _menu = this.CreateWindow(); + _menu.SetEntity(Owner); _menu.BrainButtonPressed += () => { @@ -41,10 +41,6 @@ public sealed class BorgBoundUserInterface : BoundUserInterface { SendMessage(new BorgRemoveModuleBuiMessage(EntMan.GetNetEntity(module))); }; - - _menu.OnClose += Close; - - _menu.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -55,12 +51,4 @@ public sealed class BorgBoundUserInterface : BoundUserInterface return; _menu?.UpdateState(msg); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _menu?.Dispose(); - } } diff --git a/Content.Client/Silicons/Borgs/BorgMenu.xaml b/Content.Client/Silicons/Borgs/BorgMenu.xaml index 7d8fd9fe57..4cc2e41a8f 100644 --- a/Content.Client/Silicons/Borgs/BorgMenu.xaml +++ b/Content.Client/Silicons/Borgs/BorgMenu.xaml @@ -10,7 +10,7 @@ VerticalExpand="True"> - + diff --git a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs index 474a83b453..f6a861aa05 100644 --- a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs +++ b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs @@ -21,25 +21,33 @@ public sealed partial class BorgMenu : FancyWindow public Action? NameChanged; public Action? RemoveModuleButtonPressed; - private readonly BorgChassisComponent? _chassis; - public readonly EntityUid Entity; public float AccumulatedTime; private string _lastValidName; private List _modules = new(); - public BorgMenu(EntityUid entity) + public EntityUid Entity; + + public BorgMenu() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); + _lastValidName = NameLineEdit.Text; + + EjectBatteryButton.OnPressed += _ => EjectBatteryButtonPressed?.Invoke(); + BrainButton.OnPressed += _ => BrainButtonPressed?.Invoke(); + + NameLineEdit.OnTextChanged += OnNameChanged; + NameLineEdit.OnTextEntered += OnNameEntered; + NameLineEdit.OnFocusExit += OnNameFocusExit; + + UpdateBrainButton(); + } + + public void SetEntity(EntityUid entity) + { Entity = entity; - - if (_entity.TryGetComponent(Entity, out var chassis)) - _chassis = chassis; - BorgSprite.SetEntity(entity); - ChargeBar.MaxValue = 1f; - ChargeBar.Value = 1f; if (_entity.TryGetComponent(Entity, out var nameIdentifierComponent)) { @@ -55,17 +63,6 @@ public sealed partial class BorgMenu : FancyWindow NameIdentifierLabel.Visible = false; NameLineEdit.Text = _entity.GetComponent(Entity).EntityName; } - - _lastValidName = NameLineEdit.Text; - - EjectBatteryButton.OnPressed += _ => EjectBatteryButtonPressed?.Invoke(); - BrainButton.OnPressed += _ => BrainButtonPressed?.Invoke(); - - NameLineEdit.OnTextChanged += OnNameChanged; - NameLineEdit.OnTextEntered += OnNameEntered; - NameLineEdit.OnFocusExit += OnNameFocusExit; - - UpdateBrainButton(); } protected override void FrameUpdate(FrameEventArgs args) @@ -89,7 +86,7 @@ public sealed partial class BorgMenu : FancyWindow private void UpdateBrainButton() { - if (_chassis?.BrainEntity is { } brain) + if (_entity.TryGetComponent(Entity, out BorgChassisComponent? chassis) && chassis.BrainEntity is { } brain) { BrainButton.Text = _entity.GetComponent(brain).EntityName; BrainView.Visible = true; @@ -108,17 +105,17 @@ public sealed partial class BorgMenu : FancyWindow private void UpdateModulePanel() { - if (_chassis == null) + if (!_entity.TryGetComponent(Entity, out BorgChassisComponent? chassis)) return; ModuleCounter.Text = Loc.GetString("borg-ui-module-counter", - ("actual", _chassis.ModuleCount), - ("max", _chassis.MaxModules)); + ("actual", chassis.ModuleCount), + ("max", chassis.MaxModules)); - if (_chassis.ModuleContainer.Count == _modules.Count) + if (chassis.ModuleContainer.Count == _modules.Count) { var isSame = true; - foreach (var module in _chassis.ModuleContainer.ContainedEntities) + foreach (var module in chassis.ModuleContainer.ContainedEntities) { if (_modules.Contains(module)) continue; @@ -132,7 +129,7 @@ public sealed partial class BorgMenu : FancyWindow ModuleContainer.Children.Clear(); _modules.Clear(); - foreach (var module in _chassis.ModuleContainer.ContainedEntities) + foreach (var module in chassis.ModuleContainer.ContainedEntities) { var control = new BorgModuleControl(module, _entity); control.RemoveButtonPressed += () => diff --git a/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs b/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs index d150735fa1..56216b9184 100644 --- a/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs +++ b/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs @@ -2,6 +2,7 @@ using System.Linq; using Content.Shared.Silicons.Laws; using Content.Shared.Silicons.Laws.Components; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Silicons.Laws.Ui; @@ -22,18 +23,7 @@ public sealed class SiliconLawBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new(); - - _menu.OnClose += Close; - _menu.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _menu?.Close(); + _menu = this.CreateWindow(); } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs b/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs index e8442d2390..7d6a6cf2a5 100644 --- a/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs +++ b/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs @@ -1,6 +1,6 @@ using Content.Shared.SprayPainter; using Content.Shared.SprayPainter.Components; -using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; namespace Content.Client.SprayPainter.UI; @@ -10,9 +10,6 @@ public sealed class SprayPainterBoundUserInterface : BoundUserInterface [ViewVariables] private SprayPainterWindow? _window; - [ViewVariables] - private SprayPainterSystem? _painter; - public SprayPainterBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } @@ -21,27 +18,15 @@ public sealed class SprayPainterBoundUserInterface : BoundUserInterface { base.Open(); - if (!EntMan.TryGetComponent(Owner, out var comp)) - return; + _window = this.CreateWindow(); - _window = new SprayPainterWindow(); - - _painter = EntMan.System(); - - _window.OnClose += Close; _window.OnSpritePicked = OnSpritePicked; _window.OnColorPicked = OnColorPicked; - _window.Populate(_painter.Entries, comp.Index, comp.PickedColor, comp.ColorPalette); - - _window.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - _window?.Dispose(); + if (EntMan.TryGetComponent(Owner, out SprayPainterComponent? comp)) + { + _window.Populate(EntMan.System().Entries, comp.Index, comp.PickedColor, comp.ColorPalette); + } } private void OnSpritePicked(ItemList.ItemListSelectedEventArgs args) diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs index 720a2efb9d..e7bab71e38 100644 --- a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs +++ b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs @@ -1,4 +1,5 @@ using Content.Shared.StationRecords; +using Robust.Client.UserInterface; namespace Content.Client.StationRecords; @@ -15,15 +16,12 @@ public sealed class GeneralStationRecordConsoleBoundUserInterface : BoundUserInt { base.Open(); - _window = new(); + _window = this.CreateWindow(); _window.OnKeySelected += key => SendMessage(new SelectStationRecord(key)); _window.OnFiltersChanged += (type, filterValue) => SendMessage(new SetStationRecordFilter(type, filterValue)); _window.OnDeleted += id => SendMessage(new DeleteStationRecord(id)); - _window.OnClose += Close; - - _window.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -35,11 +33,4 @@ public sealed class GeneralStationRecordConsoleBoundUserInterface : BoundUserInt _window?.UpdateState(cast); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - _window?.Close(); - } } diff --git a/Content.Client/Store/Ui/StoreBoundUserInterface.cs b/Content.Client/Store/Ui/StoreBoundUserInterface.cs index 0010aedd96..7ed67f7b5d 100644 --- a/Content.Client/Store/Ui/StoreBoundUserInterface.cs +++ b/Content.Client/Store/Ui/StoreBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Store; using JetBrains.Annotations; using System.Linq; using Content.Shared.Store.Components; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.Store.Ui; @@ -26,13 +27,10 @@ public sealed class StoreBoundUserInterface : BoundUserInterface protected override void Open() { - _menu = new StoreMenu(); + _menu = this.CreateWindow(); if (EntMan.TryGetComponent(Owner, out var store)) _menu.Title = Loc.GetString(store.Name); - _menu.OpenCentered(); - _menu.OnClose += Close; - _menu.OnListingButtonPressed += (_, listing) => { SendMessage(new StoreBuyListingMessage(listing)); @@ -77,15 +75,6 @@ public sealed class StoreBoundUserInterface : BoundUserInterface } } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _menu?.Close(); - _menu?.Dispose(); - } - private void UpdateListingsWithSearchFilter() { if (_menu == null) diff --git a/Content.Client/Strip/StrippingMenu.cs b/Content.Client/Strip/StrippingMenu.cs index eea867b794..1c46b4be35 100644 --- a/Content.Client/Strip/StrippingMenu.cs +++ b/Content.Client/Strip/StrippingMenu.cs @@ -1,4 +1,3 @@ -using Content.Client.Inventory; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Timing; @@ -11,14 +10,12 @@ namespace Content.Client.Strip public LayoutContainer InventoryContainer = new(); public BoxContainer HandsContainer = new() { Orientation = LayoutOrientation.Horizontal }; public BoxContainer SnareContainer = new(); - private StrippableBoundUserInterface _bui; public bool Dirty = true; - public StrippingMenu(string title, StrippableBoundUserInterface bui) - { - Title = title; - _bui = bui; + public event Action? OnDirty; + public StrippingMenu() + { var box = new BoxContainer() { Orientation = LayoutOrientation.Vertical, Margin = new Thickness(0, 8) }; Contents.AddChild(box); box.AddChild(SnareContainer); @@ -39,7 +36,7 @@ namespace Content.Client.Strip return; Dirty = false; - _bui.UpdateMenu(); + OnDirty?.Invoke(); } } } diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs index 9132dd6ed5..e3646c00cc 100644 --- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs +++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs @@ -1,6 +1,7 @@ using Content.Client.Eye; using Content.Shared.SurveillanceCamera; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.SurveillanceCamera.UI; @@ -25,20 +26,12 @@ public sealed class SurveillanceCameraMonitorBoundUserInterface : BoundUserInter { base.Open(); - _window = new SurveillanceCameraMonitorWindow(); - - if (State != null) - { - UpdateState(State); - } - - _window.OpenCentered(); + _window = this.CreateWindow(); _window.CameraSelected += OnCameraSelected; _window.SubnetOpened += OnSubnetRequest; _window.CameraRefresh += OnCameraRefresh; _window.SubnetRefresh += OnSubnetRefresh; - _window.OnClose += Close; _window.CameraSwitchTimer += OnCameraSwitchTimer; _window.CameraDisconnect += OnCameraDisconnect; } diff --git a/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs b/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs index 37384daafe..0631d98993 100644 --- a/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs +++ b/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Thief; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Thief; @@ -15,21 +16,9 @@ public sealed class ThiefBackpackBoundUserInterface : BoundUserInterface { base.Open(); - _window = new ThiefBackpackMenu(this); - _window.OnClose += Close; - _window.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - if (_window != null) - _window.OnClose -= Close; - - _window?.Dispose(); + _window = this.CreateWindow(); + _window.OnApprove += SendApprove; + _window.OnSetChange += SendChangeSelected; } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Thief/ThiefBackpackMenu.xaml.cs b/Content.Client/Thief/ThiefBackpackMenu.xaml.cs index 543772c704..aaee357617 100644 --- a/Content.Client/Thief/ThiefBackpackMenu.xaml.cs +++ b/Content.Client/Thief/ThiefBackpackMenu.xaml.cs @@ -12,46 +12,42 @@ public sealed partial class ThiefBackpackMenu : FancyWindow [Dependency] private readonly IEntitySystemManager _sysMan = default!; private readonly SpriteSystem _spriteSystem; - private readonly ThiefBackpackBoundUserInterface _owner; + public event Action? OnApprove; + public event Action? OnSetChange; - public ThiefBackpackMenu(ThiefBackpackBoundUserInterface owner) + public ThiefBackpackMenu() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); _spriteSystem = _sysMan.GetEntitySystem(); - _owner = owner; - - ApproveButton.OnButtonDown += (args) => + ApproveButton.OnPressed += args => { - _owner.SendApprove(); + OnApprove?.Invoke(); }; } public void UpdateState(ThiefBackpackBoundUserInterfaceState state) { - SetsGrid.RemoveAllChildren(); - int count = 0; - int selectedNumber = 0; - foreach (var set in state.Sets) + SetsGrid.DisposeAllChildren(); + var selectedNumber = 0; + foreach (var (set, info) in state.Sets) { - var child = new ThiefBackpackSet(set.Value, _spriteSystem); + var child = new ThiefBackpackSet(info, _spriteSystem); child.SetButton.OnButtonDown += (args) => { - _owner.SendChangeSelected(set.Key); + OnSetChange?.Invoke(set); }; SetsGrid.AddChild(child); - count++; - - if (set.Value.Selected) + if (info.Selected) selectedNumber++; } Description.Text = Loc.GetString("thief-backpack-window-description", ("maxCount", state.MaxSelectedSets)); SelectedSets.Text = Loc.GetString("thief-backpack-window-selected", ("selectedCount", selectedNumber), ("maxCount", state.MaxSelectedSets)); - ApproveButton.Disabled = selectedNumber == state.MaxSelectedSets ? false : true; + ApproveButton.Disabled = selectedNumber != state.MaxSelectedSets; } } diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs index 4702f8f365..4ae74a5d65 100644 --- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs +++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs @@ -1,5 +1,7 @@ using Content.Shared.Atmos.Components; using JetBrains.Annotations; +using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.UserInterface.Systems.Atmos.GasTank { @@ -13,7 +15,7 @@ namespace Content.Client.UserInterface.Systems.Atmos.GasTank { } - public void SetOutputPressure(in float value) + public void SetOutputPressure(float value) { SendMessage(new GasTankSetPressureMessage { @@ -29,9 +31,10 @@ namespace Content.Client.UserInterface.Systems.Atmos.GasTank protected override void Open() { base.Open(); - _window = new GasTankWindow(this, EntMan.GetComponent(Owner).EntityName); - _window.OnClose += Close; - _window.OpenCentered(); + _window = this.CreateWindow(); + _window.SetTitle(EntMan.GetComponent(Owner).EntityName); + _window.OnOutputPressure += SetOutputPressure; + _window.OnToggleInternals += ToggleInternals; } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs index c23850a650..12eeaa55de 100644 --- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs +++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs @@ -15,23 +15,28 @@ namespace Content.Client.UserInterface.Systems.Atmos.GasTank; public sealed class GasTankWindow : BaseWindow { + [Dependency] private readonly IResourceCache _cache = default!; + private readonly RichTextLabel _lblPressure; private readonly FloatSpinBox _spbPressure; private readonly RichTextLabel _lblInternals; private readonly Button _btnInternals; + private readonly Label _topLabel; - public GasTankWindow(GasTankBoundUserInterface owner, string uidName) + public event Action? OnOutputPressure; + public event Action? OnToggleInternals; + + public GasTankWindow() { Control contentContainer; BoxContainer topContainer; TextureButton btnClose; - var resourceCache = IoCManager.Resolve(); var rootContainer = new LayoutContainer { Name = "GasTankRoot" }; AddChild(rootContainer); MouseFilter = MouseFilterMode.Stop; - var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); + var panelTex = _cache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); var back = new StyleBoxTexture { Texture = panelTex, @@ -78,7 +83,17 @@ public sealed class GasTankWindow LayoutContainer.SetAnchorPreset(topContainerWrap, LayoutContainer.LayoutPreset.Wide); - var font = resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13); + var font = _cache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13); + + _topLabel = new Label + { + FontOverride = font, + FontColorOverride = StyleNano.NanoGold, + VerticalAlignment = VAlignment.Center, + HorizontalExpand = true, + HorizontalAlignment = HAlignment.Left, + Margin = new Thickness(0, 0, 20, 0), + }; var topRow = new BoxContainer { @@ -86,16 +101,7 @@ public sealed class GasTankWindow Margin = new Thickness(4, 2, 12, 2), Children = { - (new Label - { - Text = uidName, - FontOverride = font, - FontColorOverride = StyleNano.NanoGold, - VerticalAlignment = VAlignment.Center, - HorizontalExpand = true, - HorizontalAlignment = HAlignment.Left, - Margin = new Thickness(0, 0, 20, 0), - }), + _topLabel, (btnClose = new TextureButton { StyleClasses = {DefaultWindow.StyleClassWindowCloseButton}, @@ -168,17 +174,22 @@ public sealed class GasTankWindow // Handlers _spbPressure.OnValueChanged += args => { - owner.SetOutputPressure(args.Value); + OnOutputPressure?.Invoke(args.Value); }; _btnInternals.OnPressed += args => { - owner.ToggleInternals(); + OnToggleInternals?.Invoke(); }; btnClose.OnPressed += _ => Close(); } + public void SetTitle(string name) + { + _topLabel.Text = name; + } + public void UpdateState(GasTankBoundUserInterfaceState state) { _lblPressure.SetMarkup(Loc.GetString("gas-tank-window-tank-pressure-text", ("tankPressure", $"{state.TankPressure:0.##}"))); diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs index 17ddba77ff..eafab84ed6 100644 --- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs +++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Client.VendingMachines.UI; using Content.Shared.VendingMachines; using Robust.Client.UserInterface.Controls; using System.Linq; +using Robust.Client.UserInterface; namespace Content.Client.VendingMachines { @@ -28,15 +29,14 @@ namespace Content.Client.VendingMachines _cachedInventory = vendingMachineSys.GetAllInventory(Owner); - _menu = new VendingMachineMenu { Title = EntMan.GetComponent(Owner).EntityName }; + _menu = this.CreateWindow(); + _menu.OpenCenteredLeft(); + _menu.Title = EntMan.GetComponent(Owner).EntityName; - _menu.OnClose += Close; _menu.OnItemSelected += OnItemSelected; _menu.OnSearchChanged += OnSearchChanged; _menu.Populate(_cachedInventory, out _cachedFilteredIndex); - - _menu.OpenCenteredLeft(); } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs index f700c6663b..891804674d 100644 --- a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs +++ b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs @@ -1,12 +1,13 @@ using Content.Shared.VoiceMask; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.VoiceMask; public sealed class VoiceMaskBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly IPrototypeManager _protomanager = default!; [ViewVariables] private VoiceMaskNameChangeWindow? _window; @@ -19,12 +20,11 @@ public sealed class VoiceMaskBoundUserInterface : BoundUserInterface { base.Open(); - _window = new(_proto); + _window = this.CreateWindow(); + _window.ReloadVerbs(_protomanager); - _window.OpenCentered(); _window.OnNameChange += OnNameSelected; _window.OnVerbChange += verb => SendMessage(new VoiceMaskChangeVerbMessage(verb)); - _window.OnClose += Close; } private void OnNameSelected(string name) diff --git a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs index 16a28f9d9b..0dc41f807a 100644 --- a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs +++ b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs @@ -17,7 +17,7 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow private string? _verb; - public VoiceMaskNameChangeWindow(IPrototypeManager proto) + public VoiceMaskNameChangeWindow() { RobustXamlLoader.Load(this); @@ -32,12 +32,10 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow SpeechVerbSelector.SelectId(args.Id); }; - ReloadVerbs(proto); - AddVerbs(); } - private void ReloadVerbs(IPrototypeManager proto) + public void ReloadVerbs(IPrototypeManager proto) { foreach (var verb in proto.EnumeratePrototypes()) { diff --git a/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs b/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs index f3e0c0a539..3f01808c42 100644 --- a/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs +++ b/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs @@ -1,5 +1,6 @@ using Robust.Client.GameObjects; using Content.Shared.Speech.Components; +using Robust.Client.UserInterface; namespace Content.Client.Weapons.Melee.UI; @@ -19,17 +20,10 @@ public sealed class MeleeSpeechBoundUserInterface : BoundUserInterface { base.Open(); - _window = new MeleeSpeechWindow(); - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.OnBattlecryEntered += OnBattlecryChanged; } - private void OnBattlecryChanged(string newBattlecry) { SendMessage(new MeleeSpeechBattlecryChangedMessage(newBattlecry)); diff --git a/Content.Client/Wires/UI/WiresBoundUserInterface.cs b/Content.Client/Wires/UI/WiresBoundUserInterface.cs index 5a8869a204..edf1a2d377 100644 --- a/Content.Client/Wires/UI/WiresBoundUserInterface.cs +++ b/Content.Client/Wires/UI/WiresBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Wires; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Wires.UI { @@ -15,10 +16,8 @@ namespace Content.Client.Wires.UI protected override void Open() { base.Open(); - - _menu = new WiresMenu(this); - _menu.OnClose += Close; - _menu.OpenCenteredLeft(); + _menu = this.CreateWindow(); + _menu.OnAction += PerformAction; } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Wires/UI/WiresMenu.cs b/Content.Client/Wires/UI/WiresMenu.cs index 7bccc20861..eccc548297 100644 --- a/Content.Client/Wires/UI/WiresMenu.cs +++ b/Content.Client/Wires/UI/WiresMenu.cs @@ -1,4 +1,3 @@ -using System; using System.Numerics; using Content.Client.Examine; using Content.Client.Resources; @@ -12,10 +11,6 @@ using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Animations; using Robust.Shared.Input; -using Robust.Shared.IoC; -using Robust.Shared.Localization; -using Robust.Shared.Maths; -using Robust.Shared.Random; using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Wires.UI @@ -24,8 +19,6 @@ namespace Content.Client.Wires.UI { [Dependency] private readonly IResourceCache _resourceCache = default!; - public WiresBoundUserInterface Owner { get; } - private readonly Control _wiresHBox; private readonly Control _topContainer; private readonly Control _statusContainer; @@ -35,11 +28,12 @@ namespace Content.Client.Wires.UI public TextureButton CloseButton { get; set; } - public WiresMenu(WiresBoundUserInterface owner) + public event Action? OnAction; + + public WiresMenu() { IoCManager.InjectDependencies(this); - Owner = owner; var rootContainer = new LayoutContainer {Name = "WireRoot"}; AddChild(rootContainer); @@ -257,12 +251,12 @@ namespace Content.Client.Wires.UI control.WireClicked += () => { - Owner.PerformAction(wire.Id, wire.IsCut ? WiresAction.Mend : WiresAction.Cut); + OnAction?.Invoke(wire.Id, wire.IsCut ? WiresAction.Mend : WiresAction.Cut); }; control.ContactsClicked += () => { - Owner.PerformAction(wire.Id, WiresAction.Pulse); + OnAction?.Invoke(wire.Id, WiresAction.Pulse); }; } diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs index 2538caf6eb..c7a74815b6 100644 --- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs +++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Xenoarchaeology.Equipment; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Xenoarchaeology.Ui; @@ -18,10 +19,7 @@ public sealed class AnalysisConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _consoleMenu = new AnalysisConsoleMenu(); - - _consoleMenu.OnClose += Close; - _consoleMenu.OpenCentered(); + _consoleMenu = this.CreateWindow(); _consoleMenu.OnServerSelectionButtonPressed += () => { From 4997f92e189e1d21eadfdff46d9301db4545fc3d Mon Sep 17 00:00:00 2001 From: Aiden Date: Sat, 20 Jul 2024 00:53:57 -0500 Subject: [PATCH 022/108] MassHallucinationsRule Minor Refactor (#28748) * Update MassHallucinationsRule. * Update Content.Server/StationEvents/Events/MassHallucinationsRule.cs Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> * Update Content.Server/StationEvents/Events/MassHallucinationsRule.cs Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> * Update Content.Server/StationEvents/Events/MassHallucinationsRule.cs Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> * MGS Change * Update Content.Server/StationEvents/Events/MassHallucinationsRule.cs Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Update Content.Server/StationEvents/Events/MassHallucinationsRule.cs Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Move affectedentities to component, remove masshallucinationscomponent as its no longer needed to track entities. * Apply suggested changes. * No double checks --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../Components/MassHallucinationsComponent.cs | 11 ----------- .../MassHallucinationsRuleComponent.cs | 4 ++++ .../Events/MassHallucinationsRule.cs | 19 ++++++++++++------- 3 files changed, 16 insertions(+), 18 deletions(-) delete mode 100644 Content.Server/StationEvents/Components/MassHallucinationsComponent.cs diff --git a/Content.Server/StationEvents/Components/MassHallucinationsComponent.cs b/Content.Server/StationEvents/Components/MassHallucinationsComponent.cs deleted file mode 100644 index 99b893cad5..0000000000 --- a/Content.Server/StationEvents/Components/MassHallucinationsComponent.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Content.Server.StationEvents.Events; - -namespace Content.Server.StationEvents.Components; - -/// -/// This is used to keep track of hallucinated entities to remove effects when event ends -/// -[RegisterComponent, Access(typeof(MassHallucinationsRule))] -public sealed partial class MassHallucinationsComponent : Component -{ -} diff --git a/Content.Server/StationEvents/Components/MassHallucinationsRuleComponent.cs b/Content.Server/StationEvents/Components/MassHallucinationsRuleComponent.cs index 63a1f87251..a5268f97a6 100644 --- a/Content.Server/StationEvents/Components/MassHallucinationsRuleComponent.cs +++ b/Content.Server/StationEvents/Components/MassHallucinationsRuleComponent.cs @@ -1,5 +1,6 @@ using Content.Server.StationEvents.Events; using Robust.Shared.Audio; +using Robust.Shared.Collections; namespace Content.Server.StationEvents.Components; @@ -23,4 +24,7 @@ public sealed partial class MassHallucinationsRuleComponent : Component [DataField("sounds", required: true)] public SoundSpecifier Sounds = default!; + + [DataField, ViewVariables(VVAccess.ReadOnly)] + public List AffectedEntities = new(); } diff --git a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs index bfb7699e9d..b03231b5bc 100644 --- a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs +++ b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs @@ -2,9 +2,11 @@ using Content.Server.GameTicking.Rules.Components; using Content.Server.StationEvents.Components; using Content.Server.Traits.Assorted; using Content.Shared.GameTicking.Components; +using Content.Shared.Humanoid; using Content.Shared.Mind.Components; using Content.Shared.Traits.Assorted; + namespace Content.Server.StationEvents.Events; public sealed class MassHallucinationsRule : StationEventSystem @@ -14,16 +16,17 @@ public sealed class MassHallucinationsRule : StationEventSystem(); - while (query.MoveNext(out var ent, out _)) + + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var ent, out _, out _)) { - if (!HasComp(ent)) + if (!EnsureComp(ent, out var paracusia)) { - EnsureComp(ent); - var paracusia = EnsureComp(ent); _paracusia.SetSounds(ent, component.Sounds, paracusia); _paracusia.SetTime(ent, component.MinTimeBetweenIncidents, component.MaxTimeBetweenIncidents, paracusia); _paracusia.SetDistance(ent, component.MaxSoundDistance); + + component.AffectedEntities.Add(ent); } } } @@ -31,10 +34,12 @@ public sealed class MassHallucinationsRule : StationEventSystem(); - while (query.MoveNext(out var ent, out _)) + + foreach (var ent in component.AffectedEntities) { RemComp(ent); } + + component.AffectedEntities.Clear(); } } From 0cbc2e8d4312cc5cc2ea611f091368c6312284fe Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 20 Jul 2024 05:55:05 +0000 Subject: [PATCH 023/108] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 09ab407edd..ed8f51b786 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Boaz1111 - changes: - - message: Refactored Cluster's medbay, including cryo in the bottom left room - type: Tweak - id: 6442 - time: '2024-04-26T08:01:21.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27293 - author: metalgearsloth changes: - message: Add predicted UI opening for storage and PDAs. @@ -3798,3 +3791,10 @@ id: 6941 time: '2024-07-20T03:00:28.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30156 +- author: Aidenkrz + changes: + - message: The mass hallucinations event no longer affects non-humanoids. + type: Fix + id: 6942 + time: '2024-07-20T05:53:58.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28748 From 8d5792efd700e8e5544ff8eaf75c64ba26230a7f Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sat, 20 Jul 2024 07:56:21 +0200 Subject: [PATCH 024/108] Remove HighImpassable from TableTopLayer (#29455) * uhmm * Update CollisionGroup.cs --- Content.Shared/Physics/CollisionGroup.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs index 775ccb7c44..9f8c5ad9be 100644 --- a/Content.Shared/Physics/CollisionGroup.cs +++ b/Content.Shared/Physics/CollisionGroup.cs @@ -58,7 +58,7 @@ public enum CollisionGroup // Tabletop machines, windoors, firelocks TabletopMachineMask = Impassable | HighImpassable, // Tabletop machines - TabletopMachineLayer = Opaque | HighImpassable | BulletImpassable, + TabletopMachineLayer = Opaque | BulletImpassable, // Airlocks, windoors, firelocks GlassAirlockLayer = HighImpassable | MidImpassable | BulletImpassable | InteractImpassable, From 53eb9421c23d4c60dab47f9073bdb27aa6a38f9a Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sat, 20 Jul 2024 15:56:34 +1000 Subject: [PATCH 025/108] Update submodule to 229.0.0 (#30186) --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index fc1cca4f48..2e4275a7f3 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit fc1cca4f48f2f2d3fbf41aa42b80b4e43b1095a4 +Subproject commit 2e4275a7f3b2800e7fbe1da1e1909e8e349033bf From 3a30eea64003e4d70290980f673eea92542d9f81 Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Sat, 20 Jul 2024 02:22:47 -0400 Subject: [PATCH 026/108] Update oasis (#30182) * Update oasis * unpause map. We really need a test for that. * lv cables * magic or gate airlock --- Resources/Maps/oasis.yml | 9419 ++++++++++++++++++++------------------ 1 file changed, 5031 insertions(+), 4388 deletions(-) diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml index d9d9018051..7353864af1 100644 --- a/Resources/Maps/oasis.yml +++ b/Resources/Maps/oasis.yml @@ -123,7 +123,7 @@ entities: version: 6 1,1: ind: 1,1 - tiles: DAAAAAABDAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADKQAAAAACKQAAAAABKQAAAAADKQAAAAACKQAAAAABgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAABKQAAAAAADAAAAAAADAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAACKQAAAAAAKQAAAAADKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAACgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABKQAAAAABKQAAAAAAKQAAAAADKQAAAAADKQAAAAACgQAAAAAAfwAAAAACfwAAAAABfwAAAAABfwAAAAABgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfwAAAAADfQAAAAADfQAAAAADfQAAAAADgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAAIAAAAAABIAAAAAADgQAAAAAAfwAAAAACfQAAAAACfQAAAAACfQAAAAADgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAARAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADgQAAAAAAfwAAAAADfQAAAAADfQAAAAAAfQAAAAABgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAARAAAAAAAgQAAAAAAgQAAAAAARAAAAAAAIAAAAAAAIAAAAAACgQAAAAAAfwAAAAADfwAAAAABfwAAAAADfwAAAAABgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAAIAAAAAACIAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIQAAAAADgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAADbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAACgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAABYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZQAAAAACZQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAADgQAAAAAAbwAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAAAgQAAAAAAcAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAABgQAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAACYAAAAAADYAAAAAABgQAAAAAAcAAAAAAA + tiles: DAAAAAABDAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADKQAAAAACKQAAAAABKQAAAAADKQAAAAACKQAAAAABgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAABKQAAAAAADAAAAAAADAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAACKQAAAAAAKQAAAAADKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfwAAAAAAfwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABKQAAAAABKQAAAAAAKQAAAAADKQAAAAADKQAAAAACgQAAAAAAfwAAAAACfwAAAAABfwAAAAABfwAAAAABgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfwAAAAADfQAAAAADfQAAAAADfQAAAAADgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAAIAAAAAABIAAAAAADgQAAAAAAfwAAAAACfQAAAAACfQAAAAACfQAAAAADgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAARAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADgQAAAAAAfwAAAAADfQAAAAADfQAAAAAAfQAAAAABgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAARAAAAAAAgQAAAAAAgQAAAAAARAAAAAAAIAAAAAAAIAAAAAACgQAAAAAAfwAAAAADfwAAAAABfwAAAAADfwAAAAABgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAARAAAAAAARAAAAAAARAAAAAAARAAAAAAAIAAAAAACIAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIQAAAAADgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAADbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAABYAAAAAADYAAAAAACgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAABYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZQAAAAACZQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAADgQAAAAAAbwAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAAAgQAAAAAAcAAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAABgQAAAAAAYAAAAAADYAAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAACYAAAAAADYAAAAAABgQAAAAAAcAAAAAAA version: 6 1,0: ind: 1,0 @@ -171,7 +171,7 @@ entities: version: 6 2,-3: ind: 2,-3 - tiles: gQAAAAAAbwAAAAAAKQAAAAADKQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAKQAAAAABbwAAAAAAKQAAAAABKQAAAAAAbwAAAAAAKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAKQAAAAADKQAAAAAAgQAAAAAAKQAAAAACKQAAAAADKQAAAAADKQAAAAACKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAADgQAAAAAAKQAAAAACKQAAAAAAIQAAAAACKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAABKQAAAAACgQAAAAAAgQAAAAAAJAAAAAAAgQAAAAAAdwAAAAAAYAAAAAACYAAAAAABgQAAAAAAKQAAAAABKQAAAAABgQAAAAAAKQAAAAADJgAAAAAAJgAAAAAAJgAAAAAAKQAAAAADgQAAAAAAKQAAAAABKQAAAAAAKQAAAAACdwAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADKQAAAAABKQAAAAAAKQAAAAABKQAAAAACgQAAAAAAKQAAAAACKQAAAAAAKQAAAAAAdwAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAIQAAAAACgQAAAAAAgQAAAAAAKQAAAAADKQAAAAAAKQAAAAADKQAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAAAYAAAAAADgQAAAAAAKQAAAAABKQAAAAAAKQAAAAADKQAAAAACKQAAAAADIQAAAAAAKQAAAAAAKQAAAAACKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAAAKQAAAAABKQAAAAAAgQAAAAAAKQAAAAABKQAAAAAAKQAAAAABKQAAAAADKQAAAAACKQAAAAADKQAAAAACKQAAAAABKQAAAAADKQAAAAAAgQAAAAAAKQAAAAABKQAAAAAAKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAJAAAAAABgQAAAAAAKQAAAAADKQAAAAAAKQAAAAABKQAAAAABKQAAAAABKQAAAAAAKQAAAAACIQAAAAABKQAAAAADKQAAAAAAKQAAAAADKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABKQAAAAACKQAAAAACKQAAAAAAKQAAAAABKQAAAAACKQAAAAACKQAAAAADKQAAAAAAKQAAAAAAKQAAAAABKQAAAAAAKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: gQAAAAAAbwAAAAAAKQAAAAADKQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAKQAAAAABbwAAAAAAKQAAAAABKQAAAAAAbwAAAAAAKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAbwAAAAAAgQAAAAAABwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAKQAAAAADKQAAAAAAgQAAAAAAKQAAAAACKQAAAAADKQAAAAADKQAAAAACKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAADgQAAAAAAKQAAAAACKQAAAAAAIQAAAAACKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAABKQAAAAACgQAAAAAAgQAAAAAAJAAAAAAAgQAAAAAAdwAAAAAAYAAAAAACYAAAAAABgQAAAAAAKQAAAAABKQAAAAABgQAAAAAAKQAAAAADJgAAAAAAJgAAAAAAJgAAAAAAKQAAAAADgQAAAAAAKQAAAAABKQAAAAAAKQAAAAACdwAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADKQAAAAABKQAAAAAAKQAAAAABKQAAAAACgQAAAAAAKQAAAAACKQAAAAAAKQAAAAAAdwAAAAABYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAIQAAAAACgQAAAAAAgQAAAAAAKQAAAAADKQAAAAAAKQAAAAADKQAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAAAYAAAAAADgQAAAAAAKQAAAAABKQAAAAAAKQAAAAADKQAAAAACKQAAAAADIQAAAAAAKQAAAAAAKQAAAAACKQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAAAKQAAAAABKQAAAAAAgQAAAAAAKQAAAAABKQAAAAAAKQAAAAABKQAAAAADKQAAAAACKQAAAAADKQAAAAACKQAAAAABKQAAAAADKQAAAAAAgQAAAAAAKQAAAAABKQAAAAAAKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAJAAAAAABgQAAAAAAKQAAAAADKQAAAAAAKQAAAAABKQAAAAABKQAAAAABKQAAAAAAKQAAAAACIQAAAAABKQAAAAADKQAAAAAAKQAAAAADKQAAAAADKQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAKQAAAAABKQAAAAACKQAAAAACKQAAAAAAKQAAAAABKQAAAAACKQAAAAACKQAAAAADKQAAAAAAKQAAAAAAKQAAAAABKQAAAAAAKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 2,-1: ind: 2,-1 @@ -179,7 +179,7 @@ entities: version: 6 2,0: ind: 2,0 - tiles: YAAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAACgQAAAAAALwAAAAAAYAAAAAAAYAAAAAAALwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAADgQAAAAAALwAAAAAAYAAAAAACYAAAAAABLwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAACgQAAAAAALwAAAAAAYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAADgQAAAAAALwAAAAAAYAAAAAABLwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAADfQAAAAACfQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABKQAAAAACgQAAAAAAfQAAAAADfQAAAAACfwAAAAAAfQAAAAABfQAAAAAAfQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABKQAAAAACKQAAAAAAfQAAAAAAfQAAAAAAfwAAAAACfQAAAAACfQAAAAABfQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADKQAAAAADKQAAAAACfQAAAAAAfQAAAAADfwAAAAADfQAAAAABfQAAAAADfQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAADgQAAAAAAfQAAAAABfQAAAAABfwAAAAAAfQAAAAADfQAAAAAAfQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: YAAAAAAAYAAAAAABYAAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAABYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAABYAAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAACgQAAAAAALwAAAAAAYAAAAAAAYAAAAAAALwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAADgQAAAAAALwAAAAAAYAAAAAACYAAAAAABLwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAACgQAAAAAALwAAAAAAYAAAAAACYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAADgQAAAAAALwAAAAAAYAAAAAABLwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAADfQAAAAACfQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABKQAAAAACgQAAAAAAfQAAAAADfQAAAAACfwAAAAAAfQAAAAABfQAAAAAAfQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABKQAAAAACfwAAAAAAfQAAAAAAfQAAAAAAfwAAAAACfQAAAAACfQAAAAABfQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADKQAAAAADfwAAAAAAfQAAAAAAfQAAAAADfwAAAAADfQAAAAABfQAAAAADfQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAKQAAAAADgQAAAAAAfQAAAAABfQAAAAABfwAAAAAAfQAAAAADfQAAAAAAfQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 2,1: ind: 2,1 @@ -187,11 +187,11 @@ entities: version: 6 -3,-3: ind: -3,-3 - tiles: bwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAfQAAAAACfQAAAAACfQAAAAACfQAAAAADbwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAfwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAADgQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAfQAAAAAAfQAAAAADfQAAAAADfQAAAAAAgQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAfQAAAAACfQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAfQAAAAACfQAAAAADgQAAAAAAfQAAAAACLwAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAFwAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAfwAAAAACgQAAAAAAgQAAAAAAfQAAAAADLwAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAFwAAAAAAFwAAAAAAgQAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAABcwAAAAACcwAAAAACgQAAAAAAfQAAAAACLwAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAFwAAAAAAFwAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAcwAAAAADcwAAAAAAcwAAAAADcwAAAAACgQAAAAAAgQAAAAAALwAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAACcwAAAAAAcwAAAAACcwAAAAAAcwAAAAABcwAAAAABcwAAAAAB + tiles: bwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAfQAAAAACfQAAAAACfQAAAAACfQAAAAADbwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAfwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAADgQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAfQAAAAAAfQAAAAADfQAAAAADfQAAAAAAgQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAfQAAAAACfQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEQAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAfQAAAAACfQAAAAADgQAAAAAAfQAAAAACLwAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAFwAAAAAAgQAAAAAAgQAAAAAAQgAAAAAAQgAAAAAAgQAAAAAAfwAAAAACgQAAAAAAgQAAAAAAfQAAAAADLwAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAFwAAAAAAFwAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfQAAAAACLwAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAFwAAAAAAFwAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAALwAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAcwAAAAABcwAAAAAB version: 6 -3,-2: ind: -3,-2 - tiles: LwAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAACcwAAAAACcwAAAAABcwAAAAABcwAAAAADcwAAAAABcwAAAAAAIAAAAAADIAAAAAADIAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAcwAAAAAAcwAAAAADcwAAAAAAcwAAAAADcwAAAAACgQAAAAAAgQAAAAAAIAAAAAADIAAAAAABIAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABKQAAAAABKQAAAAACYAAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAABYAAAAAACgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAKQAAAAADKQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAADKQAAAAABKQAAAAAAYAAAAAAAYAAAAAACKQAAAAAAYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUwAAAAAAUwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAUwAAAAAAUwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAADUwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAAYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAABUwAAAAAAUwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAfAAAAAAAUwAAAAAAUwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAACgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAfAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACYAAAAAABgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAfAAAAAAA + tiles: LwAAAAAALwAAAAAALwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAcwAAAAABcwAAAAAAIAAAAAADIAAAAAADIAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAIAAAAAADIAAAAAABIAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAABKQAAAAABKQAAAAACYAAAAAAAYAAAAAADgQAAAAAAYAAAAAAAYAAAAAABYAAAAAACgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAAAKQAAAAADKQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAADKQAAAAABKQAAAAAAYAAAAAAAYAAAAAACKQAAAAAAYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcwAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUwAAAAAAUwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAUwAAAAAAUwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAADUwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAAYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAUwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAABUwAAAAAAUwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAfAAAAAAAUwAAAAAAUwAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAAAYAAAAAACgQAAAAAAYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAfAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACYAAAAAABgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAfAAAAAAA version: 6 -3,-1: ind: -3,-1 @@ -203,7 +203,7 @@ entities: version: 6 -3,1: ind: -3,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 0,-4: ind: 0,-4 @@ -251,15 +251,15 @@ entities: version: 6 3,-2: ind: 3,-2 - tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAJwAAAAABJwAAAAAAJwAAAAAAgQAAAAAAJwAAAAADJwAAAAACJwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAJwAAAAACJwAAAAACJwAAAAADgQAAAAAAJwAAAAABJwAAAAACJwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAKQAAAAACKQAAAAADKQAAAAAAKQAAAAADKQAAAAAAKQAAAAACKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAKQAAAAAAKQAAAAADKQAAAAABKQAAAAABKQAAAAADKQAAAAACKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAKQAAAAABKQAAAAACKQAAAAADKQAAAAAAKQAAAAADKQAAAAACKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgAAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAJwAAAAABJwAAAAAAJwAAAAAAgQAAAAAAJwAAAAADJwAAAAACJwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAJwAAAAACJwAAAAACJwAAAAADgQAAAAAAJwAAAAABJwAAAAACJwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAKQAAAAACKQAAAAADKQAAAAAAKQAAAAADKQAAAAAAKQAAAAACKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAKQAAAAAAKQAAAAADKQAAAAABKQAAAAABKQAAAAADKQAAAAACKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAKQAAAAABKQAAAAACKQAAAAADKQAAAAAAKQAAAAADKQAAAAACKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAAAAAAAAAgAAAAAAA version: 6 3,-3: ind: 3,-3 - tiles: AAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAABBwAAAAAEBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAFBwAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAgQAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAGBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAgQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAALBwAAAAAABwAAAAADBwAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAEBwAAAAAABwAAAAAAKQAAAAACgQAAAAAAKQAAAAACKQAAAAAAKQAAAAABKQAAAAABKQAAAAAAKQAAAAABKQAAAAADKQAAAAADKQAAAAABgQAAAAAAgQAAAAAABwAAAAAABwAAAAAABwAAAAAAKQAAAAAAKQAAAAADKQAAAAAAKQAAAAADKQAAAAADKQAAAAADKQAAAAADKQAAAAACKQAAAAAAKQAAAAADKQAAAAADKQAAAAADgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAKQAAAAADKQAAAAACKQAAAAABKQAAAAACKQAAAAABKQAAAAACKQAAAAABKQAAAAACKQAAAAABKQAAAAABKQAAAAADKQAAAAADKQAAAAAAgQAAAAAABwAAAAAABwAAAAAAKQAAAAABgQAAAAAAKQAAAAADKQAAAAAAKQAAAAAAKQAAAAABKQAAAAAAKQAAAAADKQAAAAADKQAAAAABKQAAAAAAKQAAAAABKQAAAAACgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAABBwAAAAAEBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAFBwAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAgQAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAGBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAgQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAALBwAAAAAABwAAAAADBwAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAEBwAAAAAABwAAAAAAKQAAAAACgQAAAAAAKQAAAAACKQAAAAAAKQAAAAABKQAAAAABKQAAAAAAKQAAAAABKQAAAAADKQAAAAADKQAAAAABgQAAAAAAgQAAAAAABwAAAAAABwAAAAAABwAAAAAAKQAAAAAAKQAAAAADKQAAAAAAKQAAAAADKQAAAAADKQAAAAADKQAAAAADKQAAAAACKQAAAAAAKQAAAAADKQAAAAADKQAAAAADgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAKQAAAAADKQAAAAACKQAAAAABKQAAAAACKQAAAAABKQAAAAACKQAAAAABKQAAAAACKQAAAAABKQAAAAABKQAAAAADKQAAAAADKQAAAAAAgQAAAAAABwAAAAAABwAAAAAAKQAAAAABgQAAAAAAKQAAAAADKQAAAAAAKQAAAAAAKQAAAAABKQAAAAAAKQAAAAADKQAAAAADKQAAAAABKQAAAAAAKQAAAAABKQAAAAACgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAA version: 6 -1,2: ind: -1,2 - tiles: fQAAAAAAfwAAAAAAfQAAAAADfQAAAAADfQAAAAAAgQAAAAAAfQAAAAABfQAAAAADfQAAAAADfQAAAAADfQAAAAAAfQAAAAAAfQAAAAABgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAACfQAAAAABgQAAAAAAfQAAAAABfQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAADfQAAAAADgQAAAAAAYAAAAAADYAAAAAADbwAAAAAAgQAAAAAAgQAAAAAAfwAAAAADgQAAAAAAgQAAAAAAfQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAACfQAAAAAAgQAAAAAAYAAAAAABYAAAAAACbwAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAACfQAAAAAAfQAAAAACfQAAAAADfQAAAAAAfQAAAAACfQAAAAAAfQAAAAADfQAAAAACgQAAAAAAYAAAAAABYAAAAAABbwAAAAAAgQAAAAAAfQAAAAAAfQAAAAACfQAAAAABfQAAAAACfQAAAAADfQAAAAAAfQAAAAABfQAAAAAAfQAAAAACfQAAAAACfQAAAAABgQAAAAAAYAAAAAABYAAAAAACbwAAAAAAbwAAAAAAfQAAAAAAfQAAAAACfQAAAAABfQAAAAACfQAAAAACfQAAAAACfQAAAAADfQAAAAABfQAAAAACfQAAAAABfQAAAAACYAAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAfQAAAAABfQAAAAACfQAAAAABfQAAAAADfQAAAAACfQAAAAABfQAAAAACfQAAAAABfQAAAAADfQAAAAADfQAAAAADYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAYAAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAYAAAAAACJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABKQAAAAACKQAAAAABKQAAAAABKQAAAAADKQAAAAAAgQAAAAAA + tiles: fQAAAAAAfwAAAAAAfQAAAAADfQAAAAADfQAAAAAAgQAAAAAAfQAAAAABfQAAAAADfQAAAAADfQAAAAADfQAAAAAAfQAAAAAAfQAAAAABgQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAACfQAAAAABgQAAAAAAfQAAAAABfQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAADfQAAAAADgQAAAAAAYAAAAAADYAAAAAADbwAAAAAAgQAAAAAAgQAAAAAAfwAAAAADgQAAAAAAgQAAAAAAfQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAACfQAAAAAAgQAAAAAAYAAAAAABYAAAAAACbwAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAACfQAAAAAAfQAAAAACfQAAAAADfQAAAAAAfQAAAAACfQAAAAAAfQAAAAADfQAAAAACgQAAAAAAYAAAAAABYAAAAAABbwAAAAAAgQAAAAAAfQAAAAAAfQAAAAACfQAAAAABfQAAAAACfQAAAAADfQAAAAAAfQAAAAABfQAAAAAAfQAAAAACfQAAAAACfQAAAAABYAAAAAAAYAAAAAABYAAAAAACbwAAAAAAbwAAAAAAfQAAAAAAfQAAAAACfQAAAAABfQAAAAACfQAAAAACfQAAAAACfQAAAAADfQAAAAABfQAAAAACfQAAAAABfQAAAAACYAAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAfQAAAAABfQAAAAACfQAAAAABfQAAAAADfQAAAAACfQAAAAABfQAAAAACfQAAAAABfQAAAAADfQAAAAADfQAAAAADgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAADYAAAAAABYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAYAAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAYAAAAAACJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKQAAAAABKQAAAAACKQAAAAABKQAAAAABKQAAAAADKQAAAAAAgQAAAAAA version: 6 -2,2: ind: -2,2 @@ -267,7 +267,7 @@ entities: version: 6 -3,2: ind: -3,2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABJgAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABJgAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABJgAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABJgAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAA version: 6 2,-4: ind: 2,-4 @@ -291,7 +291,7 @@ entities: version: 6 1,3: ind: 1,3 - tiles: gQAAAAAAYAAAAAADYAAAAAACYAAAAAADRAAAAAAAKQAAAAABKQAAAAACKQAAAAABKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAKQAAAAABYAAAAAABYAAAAAADYAAAAAAARAAAAAAAKQAAAAAAKQAAAAADKQAAAAADKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAARAAAAAAARAAAAAAARAAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: gQAAAAAAYAAAAAADYAAAAAACYAAAAAADRAAAAAAAKQAAAAABKQAAAAACKQAAAAABKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAKQAAAAABYAAAAAABYAAAAAADYAAAAAAARAAAAAAAKQAAAAAAKQAAAAADKQAAAAADKQAAAAADKQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAARAAAAAAARAAAAAAARAAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAgQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAABwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,3: ind: 2,3 @@ -363,7 +363,7 @@ entities: version: 6 -4,-1: ind: -4,-1 - tiles: AAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAADYAAAAAABbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADJQAAAAACJQAAAAABJQAAAAACYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAUwAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADJQAAAAACJQAAAAAAJQAAAAACYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAOQAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAJQAAAAAAJQAAAAADJQAAAAADYAAAAAABYAAAAAACYAAAAAADUwAAAAAAOQAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACJQAAAAAAJQAAAAAAJQAAAAADYAAAAAABYAAAAAADYAAAAAAAgQAAAAAAOQAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAACYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAUwAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAagAAAAADZQAAAAACZQAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAABgQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZQAAAAAAZQAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAagAAAAABZQAAAAAAZQAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAAAbAAAAAAAbAAAAAAA + tiles: AAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAbwAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAACYAAAAAAAYAAAAAADYAAAAAABbwAAAAAAbwAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADJQAAAAACJQAAAAABJQAAAAACYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAUwAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADJQAAAAACJQAAAAAAJQAAAAACYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAOQAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAJQAAAAAAJQAAAAADJQAAAAADYAAAAAABYAAAAAACYAAAAAADUwAAAAAAOQAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACJQAAAAAAJQAAAAAAJQAAAAADYAAAAAABYAAAAAADYAAAAAAAgQAAAAAAOQAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAACYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAUwAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAAAYAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAagAAAAADZQAAAAACZQAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAABgQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZQAAAAAAZQAAAAADYAAAAAAAYAAAAAABYAAAAAACYAAAAAABgQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAagAAAAABZQAAAAAAZQAAAAACYAAAAAACYAAAAAABYAAAAAAAYAAAAAACgQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAACYAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAAAbAAAAAAAbAAAAAAA version: 6 4,1: ind: 4,1 @@ -445,445 +445,445 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 709: 42.99683,-1.538444 + 707: 42.99683,-1.538444 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: Arrows decals: - 710: 39.96558,-1.975944 + 708: 39.96558,-1.975944 - node: color: '#FFFFFFFF' id: Bot decals: - 963: -57,-9 - 964: -56,-9 - 965: -55,-9 - 966: -55,-10 - 967: -56,-10 - 968: -57,-10 - 969: -57,-11 - 970: -56,-11 - 971: -55,-11 - 972: -55,-12 - 973: -56,-12 - 974: -57,-12 - 3491: -3,-31 + 961: -57,-9 + 962: -56,-9 + 963: -55,-9 + 964: -55,-10 + 965: -56,-10 + 966: -57,-10 + 967: -57,-11 + 968: -56,-11 + 969: -55,-11 + 970: -55,-12 + 971: -56,-12 + 972: -57,-12 + 3489: -3,-31 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: Bot decals: - 714: 40,-3 + 712: 40,-3 - node: color: '#FFFFFFFF' id: BotGreyscale decals: - 2721: 35,-25 - 2722: 35,-26 - 2723: 32,-25 - 2724: 32,-24 - 2725: 32,-22 - 2836: 7,-38 - 2967: 15,-40 - 2968: 15,-41 + 2719: 35,-25 + 2720: 35,-26 + 2721: 32,-25 + 2722: 32,-24 + 2723: 32,-22 + 2834: 7,-38 + 2965: 15,-40 + 2966: 15,-41 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: BotLeft decals: - 711: 43,-3 - 712: 42,-3 - 713: 41,-3 + 709: 43,-3 + 710: 42,-3 + 711: 41,-3 - node: color: '#FFFFFFFF' id: BotLeftGreyscale decals: - 2837: 7,-38 + 2835: 7,-38 - node: color: '#FFFFFFFF' id: BotRightGreyscale decals: - 2838: 7,-38 + 2836: 7,-38 - node: color: '#FFFFFFFF' id: Box decals: - 1734: 49,-37 - 1735: 49,-38 - 2341: -7,-51 - 2342: -5,-53 + 1732: 49,-37 + 1733: 49,-38 + 2339: -7,-51 + 2340: -5,-53 - node: color: '#C74EBDB2' id: BrickCornerOverlayNE decals: - 2933: -18,-25 + 2931: -18,-25 - node: color: '#EFB34196' id: BrickCornerOverlayNE decals: - 2484: 5,51 - 3098: -3,42 + 2482: 5,51 + 3096: -3,42 - node: color: '#F9801DB2' id: BrickCornerOverlayNE decals: - 2946: -22,-25 + 2944: -22,-25 - node: color: '#FED83DB2' id: BrickCornerOverlayNE decals: - 2939: -15,-25 + 2937: -15,-25 - node: color: '#C74EBDB2' id: BrickCornerOverlayNW decals: - 2934: -20,-25 + 2932: -20,-25 - node: color: '#EFB34196' id: BrickCornerOverlayNW decals: - 2485: 3,51 - 3097: -6,42 + 2483: 3,51 + 3095: -6,42 - node: color: '#F9801DB2' id: BrickCornerOverlayNW decals: - 2945: -23,-25 + 2943: -23,-25 - node: color: '#FED83DB2' id: BrickCornerOverlayNW decals: - 2940: -16,-25 + 2938: -16,-25 - node: color: '#C74EBDB2' id: BrickCornerOverlaySE decals: - 2936: -18,-26 + 2934: -18,-26 - node: color: '#EFB34196' id: BrickCornerOverlaySE decals: - 2486: 5,49 - 3095: -3,41 + 2484: 5,49 + 3093: -3,41 - node: color: '#F9801DB2' id: BrickCornerOverlaySE decals: - 2943: -22,-26 + 2941: -22,-26 - node: color: '#FED83DB2' id: BrickCornerOverlaySE decals: - 2941: -15,-26 + 2939: -15,-26 - node: color: '#C74EBDB2' id: BrickCornerOverlaySW decals: - 2935: -20,-26 + 2933: -20,-26 - node: color: '#EFB34196' id: BrickCornerOverlaySW decals: - 2438: 7,40 - 2487: 3,49 - 3096: -6,41 + 2436: 7,40 + 2485: 3,49 + 3094: -6,41 - node: color: '#F9801DB2' id: BrickCornerOverlaySW decals: - 2944: -23,-26 + 2942: -23,-26 - node: color: '#FED83DB2' id: BrickCornerOverlaySW decals: - 2942: -16,-26 + 2940: -16,-26 - node: color: '#EFB34196' id: BrickLineOverlayE decals: - 2449: 9,50 - 2450: 9,48 - 2451: 9,47 - 2459: 19,50 - 2470: 19,51 - 2471: 9,51 - 2490: 5,50 - 2492: 3,50 + 2447: 9,50 + 2448: 9,48 + 2449: 9,47 + 2457: 19,50 + 2468: 19,51 + 2469: 9,51 + 2488: 5,50 + 2490: 3,50 - node: color: '#C74EBDB2' id: BrickLineOverlayN decals: - 2937: -19,-25 - 2948: -20,-27 - 2949: -18,-27 - 2955: -19,-27 + 2935: -19,-25 + 2946: -20,-27 + 2947: -18,-27 + 2953: -19,-27 - node: color: '#EFB34196' id: BrickLineOverlayN decals: - 2452: 10,46 - 2453: 11,46 - 2454: 15,46 - 2455: 16,46 - 2489: 4,51 - 2495: 4,49 - 3099: -4,42 - 3100: -5,42 + 2450: 10,46 + 2451: 11,46 + 2452: 15,46 + 2453: 16,46 + 2487: 4,51 + 2493: 4,49 + 3097: -4,42 + 3098: -5,42 - node: color: '#F9801DB2' id: BrickLineOverlayN decals: - 2947: -23,-27 - 2956: -22,-27 + 2945: -23,-27 + 2954: -22,-27 - node: color: '#FED83DB2' id: BrickLineOverlayN decals: - 2950: -15,-27 - 2954: -16,-27 + 2948: -15,-27 + 2952: -16,-27 - node: color: '#C74EBDB2' id: BrickLineOverlayS decals: - 2938: -19,-26 + 2936: -19,-26 - node: color: '#EFB34196' id: BrickLineOverlayS decals: - 2491: 4,49 - 2493: 4,51 - 3101: -5,41 - 3102: -4,41 + 2489: 4,49 + 2491: 4,51 + 3099: -5,41 + 3100: -4,41 - node: color: '#EFB34196' id: BrickLineOverlayW decals: - 2439: 7,41 - 2440: 7,42 - 2441: 7,43 - 2442: 7,44 - 2443: 7,45 - 2444: 7,46 - 2445: 7,47 - 2446: 7,48 - 2447: 7,49 - 2448: 7,50 - 2456: 17,47 - 2457: 17,48 - 2458: 17,50 - 2469: 17,51 - 2472: 7,51 - 2488: 3,50 - 2494: 5,50 + 2437: 7,41 + 2438: 7,42 + 2439: 7,43 + 2440: 7,44 + 2441: 7,45 + 2442: 7,46 + 2443: 7,47 + 2444: 7,48 + 2445: 7,49 + 2446: 7,50 + 2454: 17,47 + 2455: 17,48 + 2456: 17,50 + 2467: 17,51 + 2470: 7,51 + 2486: 3,50 + 2492: 5,50 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNe decals: - 874: -53,8 - 875: -52,7 - 1727: 42,-40 + 872: -53,8 + 873: -52,7 + 1725: 42,-40 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNw decals: - 872: -55,8 - 876: -57,7 - 1726: 40,-40 + 870: -55,8 + 874: -57,7 + 1724: 40,-40 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSe decals: - 877: -52,5 + 875: -52,5 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSw decals: - 878: -57,5 + 876: -57,5 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerNe decals: - 620: 22,4 - 885: -53,7 + 618: 22,4 + 883: -53,7 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerNw decals: - 886: -55,7 + 884: -55,7 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSe decals: - 621: 22,9 + 619: 22,9 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE decals: - 616: 22,8 - 617: 22,7 - 618: 22,6 - 619: 22,5 - 887: -52,6 - 2519: 27,42 - 2520: 27,43 - 2521: 30,42 - 2522: 30,43 + 614: 22,8 + 615: 22,7 + 616: 22,6 + 617: 22,5 + 885: -52,6 + 2517: 27,42 + 2518: 27,43 + 2519: 30,42 + 2520: 30,43 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN decals: - 873: -54,8 - 884: -56,7 - 1728: 41,-40 - 3509: -8,-24 + 871: -54,8 + 882: -56,7 + 1726: 41,-40 + 3507: -8,-24 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 879: -56,5 - 880: -55,5 - 881: -54,5 - 882: -53,5 + 877: -56,5 + 878: -55,5 + 879: -54,5 + 880: -53,5 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW decals: - 883: -57,6 - 2523: 31,42 - 2524: 31,43 + 881: -57,6 + 2521: 31,42 + 2522: 31,43 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNe decals: - 724: -1,-34 - 2325: -4,-50 - 2389: 32,-38 - 3081: -28,42 + 722: -1,-34 + 2323: -4,-50 + 2387: 32,-38 + 3079: -28,42 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNw decals: - 2326: -8,-50 - 2388: 29,-38 - 3082: -33,42 - 3427: 19,-18 - 3428: 18,-19 + 2324: -8,-50 + 2386: 29,-38 + 3080: -33,42 + 3425: 19,-18 + 3426: 18,-19 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSe decals: - 723: -1,-39 - 2327: -4,-54 - 2397: 32,-40 - 3083: -28,40 + 721: -1,-39 + 2325: -4,-54 + 2395: 32,-40 + 3081: -28,40 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSw decals: - 2328: -8,-54 - 2393: 29,-40 - 3084: -33,40 + 2326: -8,-54 + 2391: 29,-40 + 3082: -33,40 - node: color: '#FFFFFFFF' id: BrickTileSteelEndN decals: - 2317: -8,-44 + 2315: -8,-44 - node: color: '#FFFFFFFF' id: BrickTileSteelEndS decals: - 2318: -8,-48 + 2316: -8,-48 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerNe decals: - 721: -2,-34 + 719: -2,-34 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerNw decals: - 3433: 19,-19 + 3431: 19,-19 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerSe decals: - 720: -2,-39 + 718: -2,-39 - node: color: '#FFFFFFFF' id: BrickTileSteelLineE decals: - 715: -2,-40 - 716: -1,-38 - 717: -1,-37 - 718: -1,-36 - 719: -1,-35 - 722: -2,-33 - 1815: 17,30 - 2319: -8,-47 - 2320: -8,-46 - 2321: -8,-45 - 2329: -4,-53 - 2330: -4,-52 - 2331: -4,-51 - 2396: 32,-39 - 3085: -28,41 + 713: -2,-40 + 714: -1,-38 + 715: -1,-37 + 716: -1,-36 + 717: -1,-35 + 720: -2,-33 + 1813: 17,30 + 2317: -8,-47 + 2318: -8,-46 + 2319: -8,-45 + 2327: -4,-53 + 2328: -4,-52 + 2329: -4,-51 + 2394: 32,-39 + 3083: -28,41 - node: color: '#FFFFFFFF' id: BrickTileSteelLineN decals: - 2332: -5,-50 - 2333: -6,-50 - 2334: -7,-50 - 2390: 30,-38 - 2394: 31,-38 - 3091: -32,42 - 3092: -31,42 - 3093: -30,42 - 3094: -29,42 - 3431: 20,-18 - 3432: 21,-18 + 2330: -5,-50 + 2331: -6,-50 + 2332: -7,-50 + 2388: 30,-38 + 2392: 31,-38 + 3089: -32,42 + 3090: -31,42 + 3091: -30,42 + 3092: -29,42 + 3429: 20,-18 + 3430: 21,-18 - node: color: '#FFFFFFFF' id: BrickTileSteelLineS decals: - 2335: -5,-54 - 2336: -6,-54 - 2337: -7,-54 - 2391: 30,-40 - 2392: 31,-40 - 3087: -32,40 - 3088: -31,40 - 3089: -30,40 - 3090: -29,40 + 2333: -5,-54 + 2334: -6,-54 + 2335: -7,-54 + 2389: 30,-40 + 2390: 31,-40 + 3085: -32,40 + 3086: -31,40 + 3087: -30,40 + 3088: -29,40 - node: color: '#FFFFFFFF' id: BrickTileSteelLineW decals: - 1816: 12,30 - 2322: -8,-47 - 2323: -8,-46 - 2324: -8,-45 - 2338: -8,-53 - 2339: -8,-52 - 2340: -8,-51 - 2395: 29,-39 - 3086: -33,41 - 3429: 18,-21 - 3430: 18,-20 + 1814: 12,30 + 2320: -8,-47 + 2321: -8,-46 + 2322: -8,-45 + 2336: -8,-53 + 2337: -8,-52 + 2338: -8,-51 + 2393: 29,-39 + 3084: -33,41 + 3427: 18,-21 + 3428: 18,-20 - node: color: '#00BEBE7F' id: BrickTileWhiteCornerNe decals: - 3169: -27,43 - 3179: -36,4 - 3181: -42,5 + 3167: -27,43 + 3177: -36,4 + 3179: -42,5 - node: color: '#334E6DC8' id: BrickTileWhiteCornerNe decals: - 609: 24,9 - 612: 24,8 + 607: 24,9 + 610: 24,8 - node: color: '#4B709CFF' id: BrickTileWhiteCornerNe @@ -897,63 +897,63 @@ entities: 231: -5,-38 494: -25,-26 505: -29,-26 - 557: -24,-39 - 2361: 28,-35 - 2383: 37,-37 + 555: -24,-39 + 2359: 28,-35 + 2381: 37,-37 - node: color: '#765428FF' id: BrickTileWhiteCornerNe decals: - 3333: -53,-17 + 3331: -53,-17 - node: color: '#9FED58B3' id: BrickTileWhiteCornerNe decals: - 2534: -46,-30 + 2532: -46,-30 - node: color: '#BC863FFF' id: BrickTileWhiteCornerNe decals: - 3222: -49,3 + 3220: -49,3 - node: color: '#D381C996' id: BrickTileWhiteCornerNe decals: - 837: -11,-47 - 2189: 16,-35 - 2190: 12,-43 + 835: -11,-47 + 2187: 16,-35 + 2188: 12,-43 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNe decals: - 1551: 51,-3 - 1715: 42,-41 - 1729: 42,-40 + 1549: 51,-3 + 1713: 42,-41 + 1727: 42,-40 - node: color: '#EFB34196' id: BrickTileWhiteCornerNe decals: - 3103: -2,43 + 3101: -2,43 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNe decals: - 574: -30,-27 + 572: -30,-27 - node: color: '#00BEBE7F' id: BrickTileWhiteCornerNw decals: - 3170: -34,43 - 3180: -44,5 + 3168: -34,43 + 3178: -44,5 - node: color: '#334E6DC8' id: BrickTileWhiteCornerNw decals: - 599: 21,8 - 604: 20,8 - 610: 23,9 - 611: 23,8 - 3211: -44,-9 + 597: 21,8 + 602: 20,8 + 608: 23,9 + 609: 23,8 + 3209: -44,-9 - node: color: '#4B709CFF' id: BrickTileWhiteCornerNw @@ -967,62 +967,62 @@ entities: 225: -10,-33 493: -27,-26 504: -33,-26 - 558: -28,-39 - 727: -2,-39 - 2360: 27,-35 + 556: -28,-39 + 725: -2,-39 + 2358: 27,-35 - node: color: '#765428FF' id: BrickTileWhiteCornerNw decals: - 3332: -58,-17 + 3330: -58,-17 - node: color: '#9FED58B3' id: BrickTileWhiteCornerNw decals: - 2535: -48,-30 + 2533: -48,-30 - node: color: '#BC863FFF' id: BrickTileWhiteCornerNw decals: - 3221: -51,3 - 3358: -51,-2 + 3219: -51,3 + 3356: -51,-2 - node: color: '#D381C996' id: BrickTileWhiteCornerNw decals: - 838: -14,-47 - 2183: 6,-43 - 2184: 14,-35 + 836: -14,-47 + 2181: 6,-43 + 2182: 14,-35 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNw decals: - 1550: 49,-3 - 1730: 40,-40 + 1548: 49,-3 + 1728: 40,-40 - node: color: '#EFB34196' id: BrickTileWhiteCornerNw decals: - 3114: -7,43 + 3112: -7,43 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNw decals: - 572: -32,-27 - 573: -32,-27 + 570: -32,-27 + 571: -32,-27 - node: color: '#00BEBE7F' id: BrickTileWhiteCornerSe decals: - 3171: -27,39 - 3183: -36,3 + 3169: -27,39 + 3181: -36,3 - node: color: '#334E6DC8' id: BrickTileWhiteCornerSe decals: - 608: 24,4 - 613: 24,5 - 614: 24,5 + 606: 24,4 + 611: 24,5 + 612: 24,5 - node: color: '#4B709CFF' id: BrickTileWhiteCornerSe @@ -1036,63 +1036,63 @@ entities: 227: -5,-40 491: -25,-30 503: -29,-30 - 555: -24,-42 - 2381: 34,-42 - 2382: 37,-38 + 553: -24,-42 + 2379: 34,-42 + 2380: 37,-38 - node: color: '#765428FF' id: BrickTileWhiteCornerSe decals: - 3335: -53,-24 + 3333: -53,-24 - node: color: '#9FED58B3' id: BrickTileWhiteCornerSe decals: - 2532: -46,-31 + 2530: -46,-31 - node: color: '#BC863FFF' id: BrickTileWhiteCornerSe decals: - 3230: -49,-5 + 3228: -49,-5 - node: color: '#D381C996' id: BrickTileWhiteCornerSe decals: - 836: -11,-51 - 2185: 12,-45 - 2186: 16,-44 + 834: -11,-51 + 2183: 12,-45 + 2184: 16,-44 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerSe decals: - 1552: 51,-4 + 1550: 51,-4 - node: color: '#EFB34196' id: BrickTileWhiteCornerSe decals: - 3104: -2,40 - 3119: 10,40 - 3124: 19,39 + 3102: -2,40 + 3117: 10,40 + 3122: 19,39 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSe decals: - 571: -30,-29 + 569: -30,-29 - node: color: '#00BEBE7F' id: BrickTileWhiteCornerSw decals: - 3172: -34,39 - 3182: -44,3 + 3170: -34,39 + 3180: -44,3 - node: color: '#334E6DC8' id: BrickTileWhiteCornerSw decals: - 600: 21,5 - 603: 20,5 - 607: 23,4 - 615: 23,5 - 3210: -44,-11 + 598: 21,5 + 601: 20,5 + 605: 23,4 + 613: 23,5 + 3208: -44,-11 - node: color: '#4B709CFF' id: BrickTileWhiteCornerSw @@ -1106,48 +1106,48 @@ entities: 229: -10,-35 492: -27,-30 506: -33,-30 - 556: -28,-42 - 726: -2,-34 - 2384: 27,-42 + 554: -28,-42 + 724: -2,-34 + 2382: 27,-42 - node: color: '#765428FF' id: BrickTileWhiteCornerSw decals: - 3334: -58,-24 + 3332: -58,-24 - node: color: '#9FED58B3' id: BrickTileWhiteCornerSw decals: - 2533: -48,-31 + 2531: -48,-31 - node: color: '#BC863FFF' id: BrickTileWhiteCornerSw decals: - 3231: -51,-5 - 3357: -51,1 + 3229: -51,-5 + 3355: -51,1 - node: color: '#D381C996' id: BrickTileWhiteCornerSw decals: - 839: -14,-51 - 2187: 6,-45 - 2188: 14,-44 + 837: -14,-51 + 2185: 6,-45 + 2186: 14,-44 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerSw decals: - 1553: 49,-4 + 1551: 49,-4 - node: color: '#EFB34196' id: BrickTileWhiteCornerSw decals: - 3112: -7,40 - 3123: 17,39 + 3110: -7,40 + 3121: 17,39 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSw decals: - 575: -32,-29 + 573: -32,-29 - node: color: '#169C9CFF' id: BrickTileWhiteEndE @@ -1167,22 +1167,22 @@ entities: color: '#80C71F80' id: BrickTileWhiteEndS decals: - 3451: 53,-20 + 3449: 53,-20 - node: color: '#8932B87F' id: BrickTileWhiteEndS decals: - 3448: 49,-20 + 3446: 49,-20 - node: color: '#DE3A3A96' id: BrickTileWhiteEndS decals: - 1716: 42,-42 + 1714: 42,-42 - node: color: '#F9801D7F' id: BrickTileWhiteEndS decals: - 3447: 45,-20 + 3445: 45,-20 - node: color: '#169C9CFF' id: BrickTileWhiteEndW @@ -1197,7 +1197,7 @@ entities: color: '#DE3A3A96' id: BrickTileWhiteEndW decals: - 1714: 40,-41 + 1712: 40,-41 - node: color: '#F38BAAFF' id: BrickTileWhiteEndW @@ -1207,13 +1207,13 @@ entities: color: '#00BEBE7F' id: BrickTileWhiteInnerNe decals: - 3200: -44,1 - 3208: -42,4 + 3198: -44,1 + 3206: -42,4 - node: color: '#334E6DC8' id: BrickTileWhiteInnerNe decals: - 1357: 33,-8 + 1355: 33,-8 - node: color: '#4B709CFF' id: BrickTileWhiteInnerNe @@ -1223,219 +1223,219 @@ entities: color: '#52B4E996' id: BrickTileWhiteInnerNe decals: - 2387: 28,-37 + 2385: 28,-37 - node: color: '#9FED58B3' id: BrickTileWhiteInnerNe decals: - 2542: -48,-31 + 2540: -48,-31 - node: color: '#BC863FFF' id: BrickTileWhiteInnerNe decals: - 3239: -53,-2 - 3240: -53,3 - 3277: -53,1 - 3278: -53,2 - 3279: -53,3 - 3280: -53,-3 - 3281: -53,-4 - 3282: -53,-5 - 3283: -53,-6 - 3284: -53,-7 - 3285: -53,-8 - 3286: -53,-9 - 3287: -53,-10 - 3288: -53,-11 - 3289: -53,-12 - 3290: -53,-13 - 3291: -53,-15 - 3309: -58,3 - 3310: -57,3 - 3311: -56,3 - 3312: -55,3 + 3237: -53,-2 + 3238: -53,3 + 3275: -53,1 + 3276: -53,2 + 3277: -53,3 + 3278: -53,-3 + 3279: -53,-4 + 3280: -53,-5 + 3281: -53,-6 + 3282: -53,-7 + 3283: -53,-8 + 3284: -53,-9 + 3285: -53,-10 + 3286: -53,-11 + 3287: -53,-12 + 3288: -53,-13 + 3289: -53,-15 + 3307: -58,3 + 3308: -57,3 + 3309: -56,3 + 3310: -55,3 - node: color: '#D381C996' id: BrickTileWhiteInnerNe decals: - 2074: 3,-48 - 2077: 3,-45 - 2104: 17,-37 - 2105: 17,-36 - 2106: 17,-35 - 2107: 17,-34 - 2108: 15,-34 - 2109: 14,-34 - 2110: 13,-34 - 2118: 12,-42 - 2119: 11,-42 - 2120: 10,-42 - 2121: 9,-42 - 2122: 8,-42 - 2123: 7,-42 - 2124: 6,-42 - 2125: 5,-42 - 2133: 4,-34 - 2134: 8,-34 - 2135: 11,-40 - 2167: 8,-47 - 2168: 21,-44 - 2173: 13,-46 - 2182: 18,-45 - 2234: 5,-39 - 2287: -9,-42 - 2288: -8,-42 - 2289: -7,-42 - 2290: -7,-43 - 2296: -7,-46 - 2297: -7,-45 - 2300: -7,-49 - 2301: -6,-49 - 2302: -5,-49 - 2303: -5,-49 - 2304: -4,-49 - 2305: -3,-49 - 2306: -3,-50 - 2307: -3,-51 - 2308: -3,-52 - 2309: -3,-53 - 2310: -3,-54 - 2311: -3,-55 - 2861: 17,-42 - 2863: 17,-38 - 2864: 17,-39 - 2865: 17,-40 - 2866: 17,-43 - 2871: 20,-43 - 2872: 19,-43 - 2873: 18,-43 - 2963: 14,-42 + 2072: 3,-48 + 2075: 3,-45 + 2102: 17,-37 + 2103: 17,-36 + 2104: 17,-35 + 2105: 17,-34 + 2106: 15,-34 + 2107: 14,-34 + 2108: 13,-34 + 2116: 12,-42 + 2117: 11,-42 + 2118: 10,-42 + 2119: 9,-42 + 2120: 8,-42 + 2121: 7,-42 + 2122: 6,-42 + 2123: 5,-42 + 2131: 4,-34 + 2132: 8,-34 + 2133: 11,-40 + 2165: 8,-47 + 2166: 21,-44 + 2171: 13,-46 + 2180: 18,-45 + 2232: 5,-39 + 2285: -9,-42 + 2286: -8,-42 + 2287: -7,-42 + 2288: -7,-43 + 2294: -7,-46 + 2295: -7,-45 + 2298: -7,-49 + 2299: -6,-49 + 2300: -5,-49 + 2301: -5,-49 + 2302: -4,-49 + 2303: -3,-49 + 2304: -3,-50 + 2305: -3,-51 + 2306: -3,-52 + 2307: -3,-53 + 2308: -3,-54 + 2309: -3,-55 + 2859: 17,-42 + 2861: 17,-38 + 2862: 17,-39 + 2863: 17,-40 + 2864: 17,-43 + 2869: 20,-43 + 2870: 19,-43 + 2871: 18,-43 + 2961: 14,-42 - node: color: '#D4D4D428' id: BrickTileWhiteInnerNe decals: - 1364: 30,-3 + 1362: 30,-3 - node: color: '#DE3A3A96' id: BrickTileWhiteInnerNe decals: - 1384: 52,-6 - 1385: 52,-7 - 1386: 53,-8 - 1387: 54,-8 - 1388: 54,-9 - 1389: 54,-14 - 1390: 54,-16 - 1391: 54,-18 - 1392: 54,-17 - 1393: 52,-8 - 1394: 54,-15 - 1395: 54,-13 - 1396: 50,-6 - 1397: 48,-6 - 1420: 47,-8 - 1421: 46,-8 - 1440: 40,-15 - 1441: 40,-14 - 1442: 40,-13 - 1443: 40,-12 - 1444: 39,-11 - 1445: 37,-11 - 1446: 36,-11 - 1447: 35,-11 - 1448: 34,-11 - 1449: 33,-11 - 1450: 31,-11 - 1451: 30,-11 - 1502: 42,-21 - 1503: 42,-20 - 1524: 52,-16 - 1525: 51,-16 - 1526: 49,-16 - 1527: 48,-16 - 1528: 47,-16 - 1540: 47,-15 - 1541: 47,-14 - 1542: 47,-13 - 1543: 47,-12 - 1544: 47,-11 - 1545: 47,-10 - 1570: 40,-24 - 1572: 42,-24 - 1589: 39,-25 - 1590: 42,-25 - 1591: 42,-26 - 1592: 42,-28 - 1593: 42,-29 - 1594: 42,-30 - 1624: 38,-35 - 1646: 38,-31 - 1647: 37,-31 - 1648: 36,-31 - 1649: 35,-31 - 1650: 34,-31 - 1651: 33,-31 - 1652: 32,-31 - 1653: 31,-31 - 1654: 30,-31 - 1664: 40,-32 - 1677: 44,-32 - 1678: 43,-32 - 1679: 42,-32 - 1680: 44,-33 - 1681: 44,-34 - 1682: 43,-35 - 1683: 43,-36 - 1692: 39,-37 - 1700: 43,-39 - 1701: 43,-40 - 1702: 43,-41 - 1703: 43,-42 - 1721: 40,-39 - 1724: 39,-39 - 1732: 37,-42 - 2726: 54,-10 - 2842: 40,-25 - 2848: 42,-23 - 2850: 42,-22 - 3458: 54,-19 + 1382: 52,-6 + 1383: 52,-7 + 1384: 53,-8 + 1385: 54,-8 + 1386: 54,-9 + 1387: 54,-14 + 1388: 54,-16 + 1389: 54,-18 + 1390: 54,-17 + 1391: 52,-8 + 1392: 54,-15 + 1393: 54,-13 + 1394: 50,-6 + 1395: 48,-6 + 1418: 47,-8 + 1419: 46,-8 + 1438: 40,-15 + 1439: 40,-14 + 1440: 40,-13 + 1441: 40,-12 + 1442: 39,-11 + 1443: 37,-11 + 1444: 36,-11 + 1445: 35,-11 + 1446: 34,-11 + 1447: 33,-11 + 1448: 31,-11 + 1449: 30,-11 + 1500: 42,-21 + 1501: 42,-20 + 1522: 52,-16 + 1523: 51,-16 + 1524: 49,-16 + 1525: 48,-16 + 1526: 47,-16 + 1538: 47,-15 + 1539: 47,-14 + 1540: 47,-13 + 1541: 47,-12 + 1542: 47,-11 + 1543: 47,-10 + 1568: 40,-24 + 1570: 42,-24 + 1587: 39,-25 + 1588: 42,-25 + 1589: 42,-26 + 1590: 42,-28 + 1591: 42,-29 + 1592: 42,-30 + 1622: 38,-35 + 1644: 38,-31 + 1645: 37,-31 + 1646: 36,-31 + 1647: 35,-31 + 1648: 34,-31 + 1649: 33,-31 + 1650: 32,-31 + 1651: 31,-31 + 1652: 30,-31 + 1662: 40,-32 + 1675: 44,-32 + 1676: 43,-32 + 1677: 42,-32 + 1678: 44,-33 + 1679: 44,-34 + 1680: 43,-35 + 1681: 43,-36 + 1690: 39,-37 + 1698: 43,-39 + 1699: 43,-40 + 1700: 43,-41 + 1701: 43,-42 + 1719: 40,-39 + 1722: 39,-39 + 1730: 37,-42 + 2724: 54,-10 + 2840: 40,-25 + 2846: 42,-23 + 2848: 42,-22 + 3456: 54,-19 - node: color: '#EFB34196' id: BrickTileWhiteInnerNe decals: - 1757: 6,38 - 1758: 5,38 - 1759: 4,38 - 1760: 8,38 - 1761: 8,37 - 1762: 8,36 - 1763: 8,35 - 1764: 8,34 - 1765: 8,31 - 1766: 8,30 - 1811: 5,31 - 1832: 19,31 - 1847: 25,23 - 1848: 22,28 - 1849: 23,34 - 1850: 25,34 - 1851: 25,40 - 1852: 23,40 - 1866: 22,31 - 2496: 3,49 - 2500: 19,43 - 2513: 9,46 - 3062: 11,31 + 1755: 6,38 + 1756: 5,38 + 1757: 4,38 + 1758: 8,38 + 1759: 8,37 + 1760: 8,36 + 1761: 8,35 + 1762: 8,34 + 1763: 8,31 + 1764: 8,30 + 1809: 5,31 + 1830: 19,31 + 1845: 25,23 + 1846: 22,28 + 1847: 23,34 + 1848: 25,34 + 1849: 25,40 + 1850: 23,40 + 1864: 22,31 + 2494: 3,49 + 2498: 19,43 + 2511: 9,46 + 3060: 11,31 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerNe decals: - 3488: -6,-29 + 3486: -6,-29 - node: color: '#00BEBE7F' id: BrickTileWhiteInnerNw decals: - 3199: -35,1 + 3197: -35,1 - node: color: '#4B709CFF' id: BrickTileWhiteInnerNw @@ -1445,209 +1445,209 @@ entities: color: '#52B4E996' id: BrickTileWhiteInnerNw decals: - 734: -1,-39 + 732: -1,-39 - node: color: '#9FED58B3' id: BrickTileWhiteInnerNw decals: - 2539: -46,-31 + 2537: -46,-31 - node: color: '#A4610696' id: BrickTileWhiteInnerNw decals: - 1014: -48,-5 - 1015: -48,-5 + 1012: -48,-5 + 1013: -48,-5 - node: color: '#BC863FFF' id: BrickTileWhiteInnerNw decals: - 3241: -53,3 - 3242: -55,3 - 3243: -56,3 - 3244: -57,3 - 3245: -58,3 - 3246: -58,2 - 3247: -58,1 - 3248: -58,0 - 3249: -58,-1 - 3250: -58,-8 - 3251: -58,-9 - 3252: -58,-10 - 3253: -58,-11 - 3254: -58,-12 - 3255: -58,-13 - 3256: -58,-14 - 3257: -58,-15 - 3345: -47,-5 - 3353: -47,-2 - 3362: -50,-2 + 3239: -53,3 + 3240: -55,3 + 3241: -56,3 + 3242: -57,3 + 3243: -58,3 + 3244: -58,2 + 3245: -58,1 + 3246: -58,0 + 3247: -58,-1 + 3248: -58,-8 + 3249: -58,-9 + 3250: -58,-10 + 3251: -58,-11 + 3252: -58,-12 + 3253: -58,-13 + 3254: -58,-14 + 3255: -58,-15 + 3343: -47,-5 + 3351: -47,-2 + 3360: -50,-2 - node: color: '#D381C996' id: BrickTileWhiteInnerNw decals: - 2080: 5,-45 - 2085: 5,-42 - 2086: 6,-42 - 2087: 7,-42 - 2088: 8,-42 - 2089: 9,-42 - 2090: 10,-42 - 2091: 11,-42 - 2092: 12,-42 - 2093: 13,-42 - 2094: 13,-41 - 2095: 13,-40 - 2096: 13,-38 - 2097: 13,-37 - 2098: 13,-36 - 2099: 13,-35 - 2100: 13,-34 - 2101: 14,-34 - 2102: 15,-34 - 2103: 17,-34 - 2137: 6,-34 - 2138: 10,-34 - 2235: 9,-39 - 2274: -9,-55 - 2275: -9,-53 - 2276: -9,-52 - 2277: -9,-51 - 2278: -9,-50 - 2279: -9,-48 - 2280: -9,-47 - 2281: -9,-46 - 2282: -9,-44 - 2283: -9,-43 - 2284: -9,-42 - 2285: -8,-42 - 2286: -7,-42 - 2312: -3,-49 - 2313: -4,-49 - 2314: -5,-49 - 2315: -6,-49 - 2353: -1,-48 - 2867: 18,-43 - 2868: 19,-43 - 2869: 20,-43 - 2870: 21,-43 - 2964: 16,-42 + 2078: 5,-45 + 2083: 5,-42 + 2084: 6,-42 + 2085: 7,-42 + 2086: 8,-42 + 2087: 9,-42 + 2088: 10,-42 + 2089: 11,-42 + 2090: 12,-42 + 2091: 13,-42 + 2092: 13,-41 + 2093: 13,-40 + 2094: 13,-38 + 2095: 13,-37 + 2096: 13,-36 + 2097: 13,-35 + 2098: 13,-34 + 2099: 14,-34 + 2100: 15,-34 + 2101: 17,-34 + 2135: 6,-34 + 2136: 10,-34 + 2233: 9,-39 + 2272: -9,-55 + 2273: -9,-53 + 2274: -9,-52 + 2275: -9,-51 + 2276: -9,-50 + 2277: -9,-48 + 2278: -9,-47 + 2279: -9,-46 + 2280: -9,-44 + 2281: -9,-43 + 2282: -9,-42 + 2283: -8,-42 + 2284: -7,-42 + 2310: -3,-49 + 2311: -4,-49 + 2312: -5,-49 + 2313: -6,-49 + 2351: -1,-48 + 2865: 18,-43 + 2866: 19,-43 + 2867: 20,-43 + 2868: 21,-43 + 2962: 16,-42 - node: color: '#D4D4D428' id: BrickTileWhiteInnerNw decals: - 1365: 33,-3 + 1363: 33,-3 - node: color: '#DE3A3A96' id: BrickTileWhiteInnerNw decals: - 1398: 48,-6 - 1399: 48,-7 - 1400: 48,-8 - 1401: 47,-8 - 1402: 46,-8 - 1403: 46,-9 - 1404: 46,-10 - 1405: 46,-11 - 1406: 46,-12 - 1407: 46,-13 - 1408: 46,-14 - 1409: 46,-15 - 1418: 54,-8 - 1419: 53,-8 - 1422: 50,-6 - 1434: 52,-6 - 1452: 30,-11 - 1453: 30,-12 - 1454: 30,-13 - 1472: 39,-19 - 1475: 37,-18 - 1476: 37,-17 - 1477: 37,-16 - 1478: 37,-15 - 1479: 37,-14 - 1488: 31,-11 - 1489: 33,-11 - 1491: 34,-11 - 1492: 35,-11 - 1493: 36,-11 - 1494: 37,-11 - 1495: 39,-11 - 1529: 48,-16 - 1530: 49,-16 - 1531: 51,-16 - 1532: 52,-16 - 1533: 53,-15 - 1534: 53,-14 - 1535: 53,-13 - 1536: 53,-12 - 1537: 53,-11 - 1538: 53,-10 - 1539: 53,-16 - 1571: 42,-24 - 1573: 40,-24 - 1574: 40,-25 - 1575: 39,-25 - 1576: 39,-26 - 1577: 39,-27 - 1578: 39,-28 - 1579: 39,-29 - 1580: 40,-30 - 1622: 30,-34 - 1625: 40,-35 - 1637: 30,-35 - 1655: 30,-31 - 1656: 31,-31 - 1657: 32,-31 - 1658: 33,-31 - 1659: 34,-31 - 1660: 35,-31 - 1661: 36,-31 - 1662: 37,-31 - 1663: 38,-31 - 1665: 42,-32 - 1666: 43,-32 - 1667: 44,-32 - 1668: 40,-36 - 1669: 40,-37 - 1670: 39,-37 - 1711: 39,-42 - 1712: 39,-40 - 1713: 43,-39 - 1722: 40,-39 - 1723: 39,-39 - 2841: 42,-25 - 2846: 40,-23 - 2856: 40,-19 - 2857: 40,-20 + 1396: 48,-6 + 1397: 48,-7 + 1398: 48,-8 + 1399: 47,-8 + 1400: 46,-8 + 1401: 46,-9 + 1402: 46,-10 + 1403: 46,-11 + 1404: 46,-12 + 1405: 46,-13 + 1406: 46,-14 + 1407: 46,-15 + 1416: 54,-8 + 1417: 53,-8 + 1420: 50,-6 + 1432: 52,-6 + 1450: 30,-11 + 1451: 30,-12 + 1452: 30,-13 + 1470: 39,-19 + 1473: 37,-18 + 1474: 37,-17 + 1475: 37,-16 + 1476: 37,-15 + 1477: 37,-14 + 1486: 31,-11 + 1487: 33,-11 + 1489: 34,-11 + 1490: 35,-11 + 1491: 36,-11 + 1492: 37,-11 + 1493: 39,-11 + 1527: 48,-16 + 1528: 49,-16 + 1529: 51,-16 + 1530: 52,-16 + 1531: 53,-15 + 1532: 53,-14 + 1533: 53,-13 + 1534: 53,-12 + 1535: 53,-11 + 1536: 53,-10 + 1537: 53,-16 + 1569: 42,-24 + 1571: 40,-24 + 1572: 40,-25 + 1573: 39,-25 + 1574: 39,-26 + 1575: 39,-27 + 1576: 39,-28 + 1577: 39,-29 + 1578: 40,-30 + 1620: 30,-34 + 1623: 40,-35 + 1635: 30,-35 + 1653: 30,-31 + 1654: 31,-31 + 1655: 32,-31 + 1656: 33,-31 + 1657: 34,-31 + 1658: 35,-31 + 1659: 36,-31 + 1660: 37,-31 + 1661: 38,-31 + 1663: 42,-32 + 1664: 43,-32 + 1665: 44,-32 + 1666: 40,-36 + 1667: 40,-37 + 1668: 39,-37 + 1709: 39,-42 + 1710: 39,-40 + 1711: 43,-39 + 1720: 40,-39 + 1721: 39,-39 + 2839: 42,-25 + 2844: 40,-23 + 2854: 40,-19 + 2855: 40,-20 - node: color: '#EFB34196' id: BrickTileWhiteInnerNw decals: - 1778: 8,38 - 1779: 6,38 - 1780: 5,38 - 1781: 4,38 - 1782: 4,37 - 1783: 4,34 - 1784: 4,31 - 1785: 4,30 - 1812: 7,31 - 1833: 21,31 - 1853: 25,40 - 1854: 27,40 - 1855: 27,34 - 1856: 25,28 - 1857: 25,34 - 1867: 28,31 - 2497: 5,49 - 2502: 20,43 - 2514: 17,46 - 3063: 18,31 + 1776: 8,38 + 1777: 6,38 + 1778: 5,38 + 1779: 4,38 + 1780: 4,37 + 1781: 4,34 + 1782: 4,31 + 1783: 4,30 + 1810: 7,31 + 1831: 21,31 + 1851: 25,40 + 1852: 27,40 + 1853: 27,34 + 1854: 25,28 + 1855: 25,34 + 1865: 28,31 + 2495: 5,49 + 2500: 20,43 + 2512: 17,46 + 3061: 18,31 - node: color: '#334E6DC8' id: BrickTileWhiteInnerSe decals: - 1358: 33,-4 + 1356: 33,-4 - node: color: '#4B709CFF' id: BrickTileWhiteInnerSe @@ -1658,221 +1658,221 @@ entities: id: BrickTileWhiteInnerSe decals: 416: -18,-29 - 2385: 34,-38 + 2383: 34,-38 - node: color: '#80C71F80' id: BrickTileWhiteInnerSe decals: - 3452: 53,-19 + 3450: 53,-19 - node: color: '#8932B87F' id: BrickTileWhiteInnerSe decals: - 3450: 49,-19 + 3448: 49,-19 - node: color: '#9FED58B3' id: BrickTileWhiteInnerSe decals: - 2540: -48,-30 + 2538: -48,-30 - node: color: '#BC863FFF' id: BrickTileWhiteInnerSe decals: - 3258: -58,-15 - 3259: -57,-15 - 3260: -54,-15 - 3261: -53,-15 - 3262: -53,-13 - 3263: -53,-12 - 3264: -53,-11 - 3265: -53,-10 - 3266: -53,-9 - 3267: -53,-8 - 3268: -53,-7 - 3269: -53,-6 - 3270: -53,-4 - 3271: -53,-5 - 3272: -53,-3 - 3273: -53,-2 - 3274: -53,1 - 3275: -53,2 - 3276: -53,3 - 3292: -53,-15 + 3256: -58,-15 + 3257: -57,-15 + 3258: -54,-15 + 3259: -53,-15 + 3260: -53,-13 + 3261: -53,-12 + 3262: -53,-11 + 3263: -53,-10 + 3264: -53,-9 + 3265: -53,-8 + 3266: -53,-7 + 3267: -53,-6 + 3268: -53,-4 + 3269: -53,-5 + 3270: -53,-3 + 3271: -53,-2 + 3272: -53,1 + 3273: -53,2 + 3274: -53,3 + 3290: -53,-15 - node: color: '#D381C996' id: BrickTileWhiteInnerSe decals: - 2075: 3,-45 - 2076: 3,-42 - 2136: 11,-38 - 2139: 21,-42 - 2140: 17,-36 - 2141: 17,-35 - 2142: 17,-34 - 2143: 21,-44 - 2144: 20,-44 - 2145: 19,-44 - 2146: 18,-44 - 2147: 18,-45 - 2148: 17,-45 - 2149: 16,-45 - 2150: 15,-45 - 2151: 14,-45 - 2152: 13,-45 - 2153: 13,-46 - 2154: 12,-46 - 2155: 11,-46 - 2156: 10,-46 - 2157: 9,-46 - 2158: 8,-46 - 2159: 8,-47 - 2160: 5,-47 - 2161: 6,-47 - 2162: 7,-47 - 2236: 5,-35 - 2261: -3,-55 - 2262: -3,-54 - 2263: -3,-53 - 2264: -3,-52 - 2265: -3,-51 - 2266: -3,-50 - 2267: -3,-49 - 2268: -4,-55 - 2269: -5,-55 - 2270: -6,-55 - 2271: -7,-55 - 2272: -8,-55 - 2273: -9,-55 - 2291: -7,-43 - 2292: -7,-42 - 2293: -7,-45 - 2294: -7,-46 - 2295: -7,-48 - 2862: 17,-40 - 2874: 17,-42 - 2875: 17,-39 - 2876: 17,-38 - 2877: 17,-37 - 2965: 14,-39 + 2073: 3,-45 + 2074: 3,-42 + 2134: 11,-38 + 2137: 21,-42 + 2138: 17,-36 + 2139: 17,-35 + 2140: 17,-34 + 2141: 21,-44 + 2142: 20,-44 + 2143: 19,-44 + 2144: 18,-44 + 2145: 18,-45 + 2146: 17,-45 + 2147: 16,-45 + 2148: 15,-45 + 2149: 14,-45 + 2150: 13,-45 + 2151: 13,-46 + 2152: 12,-46 + 2153: 11,-46 + 2154: 10,-46 + 2155: 9,-46 + 2156: 8,-46 + 2157: 8,-47 + 2158: 5,-47 + 2159: 6,-47 + 2160: 7,-47 + 2234: 5,-35 + 2259: -3,-55 + 2260: -3,-54 + 2261: -3,-53 + 2262: -3,-52 + 2263: -3,-51 + 2264: -3,-50 + 2265: -3,-49 + 2266: -4,-55 + 2267: -5,-55 + 2268: -6,-55 + 2269: -7,-55 + 2270: -8,-55 + 2271: -9,-55 + 2289: -7,-43 + 2290: -7,-42 + 2291: -7,-45 + 2292: -7,-46 + 2293: -7,-48 + 2860: 17,-40 + 2872: 17,-42 + 2873: 17,-39 + 2874: 17,-38 + 2875: 17,-37 + 2963: 14,-39 - node: color: '#DE3A3A96' id: BrickTileWhiteInnerSe decals: - 1361: 31,-9 - 1410: 54,-8 - 1411: 54,-9 - 1412: 54,-13 - 1413: 54,-14 - 1414: 54,-15 - 1415: 54,-16 - 1416: 54,-17 - 1417: 54,-18 - 1469: 42,-21 - 1470: 42,-20 - 1471: 42,-19 - 1473: 38,-18 - 1474: 37,-18 - 1482: 34,-13 - 1483: 33,-13 - 1484: 32,-13 - 1485: 30,-13 - 1498: 40,-11 - 1499: 40,-12 - 1500: 40,-13 - 1501: 40,-14 - 1513: 47,-15 - 1514: 47,-14 - 1515: 47,-13 - 1516: 47,-12 - 1517: 47,-11 - 1518: 47,-10 - 1519: 47,-9 - 1520: 48,-9 - 1521: 49,-9 - 1548: 51,-9 - 1549: 52,-9 - 1587: 39,-29 - 1597: 40,-30 - 1598: 42,-30 - 1599: 42,-29 - 1600: 42,-28 - 1601: 42,-26 - 1602: 42,-25 - 1603: 42,-24 - 1620: 28,-31 - 1623: 38,-31 - 1626: 38,-35 - 1638: 30,-35 - 1639: 31,-35 - 1640: 32,-35 - 1641: 33,-35 - 1642: 34,-35 - 1643: 35,-35 - 1644: 36,-35 - 1645: 37,-35 - 1671: 43,-36 - 1672: 43,-35 - 1673: 43,-34 - 1674: 44,-34 - 1675: 44,-33 - 1676: 44,-32 - 1689: 40,-37 - 1690: 39,-37 - 1691: 42,-37 - 1704: 39,-42 - 1705: 40,-42 - 1706: 41,-42 - 1707: 43,-42 - 1708: 43,-41 - 1709: 43,-40 - 1710: 43,-39 - 1733: 37,-40 - 2727: 54,-12 - 2844: 40,-23 - 2847: 42,-23 - 2849: 42,-22 - 2855: 39,-18 - 3456: 52,-7 - 3457: 52,-6 + 1359: 31,-9 + 1408: 54,-8 + 1409: 54,-9 + 1410: 54,-13 + 1411: 54,-14 + 1412: 54,-15 + 1413: 54,-16 + 1414: 54,-17 + 1415: 54,-18 + 1467: 42,-21 + 1468: 42,-20 + 1469: 42,-19 + 1471: 38,-18 + 1472: 37,-18 + 1480: 34,-13 + 1481: 33,-13 + 1482: 32,-13 + 1483: 30,-13 + 1496: 40,-11 + 1497: 40,-12 + 1498: 40,-13 + 1499: 40,-14 + 1511: 47,-15 + 1512: 47,-14 + 1513: 47,-13 + 1514: 47,-12 + 1515: 47,-11 + 1516: 47,-10 + 1517: 47,-9 + 1518: 48,-9 + 1519: 49,-9 + 1546: 51,-9 + 1547: 52,-9 + 1585: 39,-29 + 1595: 40,-30 + 1596: 42,-30 + 1597: 42,-29 + 1598: 42,-28 + 1599: 42,-26 + 1600: 42,-25 + 1601: 42,-24 + 1618: 28,-31 + 1621: 38,-31 + 1624: 38,-35 + 1636: 30,-35 + 1637: 31,-35 + 1638: 32,-35 + 1639: 33,-35 + 1640: 34,-35 + 1641: 35,-35 + 1642: 36,-35 + 1643: 37,-35 + 1669: 43,-36 + 1670: 43,-35 + 1671: 43,-34 + 1672: 44,-34 + 1673: 44,-33 + 1674: 44,-32 + 1687: 40,-37 + 1688: 39,-37 + 1689: 42,-37 + 1702: 39,-42 + 1703: 40,-42 + 1704: 41,-42 + 1705: 43,-42 + 1706: 43,-41 + 1707: 43,-40 + 1708: 43,-39 + 1731: 37,-40 + 2725: 54,-12 + 2842: 40,-23 + 2845: 42,-23 + 2847: 42,-22 + 2853: 39,-18 + 3454: 52,-7 + 3455: 52,-6 - node: color: '#EFB34196' id: BrickTileWhiteInnerSe decals: - 1767: 8,30 - 1768: 7,30 - 1769: 6,30 - 1770: 5,30 - 1771: 4,30 - 1772: 8,31 - 1773: 8,34 - 1774: 8,35 - 1775: 8,36 - 1776: 8,37 - 1777: 8,38 - 1814: 5,37 - 1831: 19,34 - 1858: 22,30 - 1859: 23,36 - 1860: 25,36 - 1861: 25,25 - 1869: 22,33 - 2498: 3,51 - 2501: 19,42 - 2512: 10,45 - 2526: 32,42 - 2527: 25,42 - 2529: 23,42 - 3064: 11,33 + 1765: 8,30 + 1766: 7,30 + 1767: 6,30 + 1768: 5,30 + 1769: 4,30 + 1770: 8,31 + 1771: 8,34 + 1772: 8,35 + 1773: 8,36 + 1774: 8,37 + 1775: 8,38 + 1812: 5,37 + 1829: 19,34 + 1856: 22,30 + 1857: 23,36 + 1858: 25,36 + 1859: 25,25 + 1867: 22,33 + 2496: 3,51 + 2499: 19,42 + 2510: 10,45 + 2524: 32,42 + 2525: 25,42 + 2527: 23,42 + 3062: 11,33 - node: color: '#F9801D7F' id: BrickTileWhiteInnerSe decals: - 3455: 45,-19 + 3453: 45,-19 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerSe decals: - 3487: -6,-26 + 3485: -6,-26 - node: color: '#4B709CFF' id: BrickTileWhiteInnerSw @@ -1883,227 +1883,231 @@ entities: id: BrickTileWhiteInnerSw decals: 415: -20,-29 - 733: -1,-34 + 731: -1,-34 - node: color: '#80C71F80' id: BrickTileWhiteInnerSw decals: - 3453: 53,-19 + 3451: 53,-19 - node: color: '#8932B87F' id: BrickTileWhiteInnerSw decals: - 3449: 49,-19 + 3447: 49,-19 - node: color: '#9FED58B3' id: BrickTileWhiteInnerSw decals: - 2541: -46,-30 + 2539: -46,-30 - node: color: '#A4610696' id: BrickTileWhiteInnerSw decals: - 1016: -48,-2 - 1017: -48,-2 + 1014: -48,-2 + 1015: -48,-2 - node: color: '#BC863FFF' id: BrickTileWhiteInnerSw decals: - 3293: -53,-15 - 3294: -54,-15 - 3295: -57,-15 - 3296: -58,-15 - 3297: -58,-14 - 3298: -58,-13 - 3299: -58,-12 - 3300: -58,-11 - 3301: -58,-10 - 3302: -58,-9 - 3303: -58,-8 - 3304: -58,-7 - 3305: -58,0 - 3306: -58,1 - 3307: -58,2 - 3308: -58,3 - 3348: -47,2 - 3354: -47,-2 - 3361: -50,1 + 3291: -53,-15 + 3292: -54,-15 + 3293: -57,-15 + 3294: -58,-15 + 3295: -58,-14 + 3296: -58,-13 + 3297: -58,-12 + 3298: -58,-11 + 3299: -58,-10 + 3300: -58,-9 + 3301: -58,-8 + 3302: -58,-7 + 3303: -58,0 + 3304: -58,1 + 3305: -58,2 + 3306: -58,3 + 3346: -47,2 + 3352: -47,-2 + 3359: -50,1 - node: color: '#D381C996' id: BrickTileWhiteInnerSw decals: - 2078: 5,-42 - 2079: 5,-45 - 2111: 13,-34 - 2112: 13,-35 - 2113: 13,-36 - 2114: 13,-37 - 2115: 13,-38 - 2116: 13,-40 - 2117: 13,-41 - 2163: 6,-47 - 2164: 7,-47 - 2165: 8,-47 - 2166: 9,-46 - 2169: 10,-46 - 2170: 11,-46 - 2171: 12,-46 - 2172: 13,-46 - 2174: 14,-45 - 2175: 16,-45 - 2176: 15,-45 - 2177: 17,-45 - 2178: 18,-45 - 2179: 19,-44 - 2180: 20,-44 - 2181: 21,-44 - 2233: 9,-35 - 2242: -9,-48 - 2243: -5,-46 - 2244: -9,-47 - 2245: -9,-46 - 2246: -9,-44 - 2247: -9,-43 - 2248: -9,-42 - 2249: -9,-50 - 2250: -9,-51 - 2251: -9,-52 - 2252: -9,-53 - 2254: -9,-55 - 2255: -8,-55 - 2256: -7,-55 - 2257: -6,-55 - 2258: -5,-55 - 2259: -4,-55 - 2260: -3,-55 - 2349: -1,-42 - 2966: 16,-39 + 2076: 5,-42 + 2077: 5,-45 + 2109: 13,-34 + 2110: 13,-35 + 2111: 13,-36 + 2112: 13,-37 + 2113: 13,-38 + 2114: 13,-40 + 2115: 13,-41 + 2161: 6,-47 + 2162: 7,-47 + 2163: 8,-47 + 2164: 9,-46 + 2167: 10,-46 + 2168: 11,-46 + 2169: 12,-46 + 2170: 13,-46 + 2172: 14,-45 + 2173: 16,-45 + 2174: 15,-45 + 2175: 17,-45 + 2176: 18,-45 + 2177: 19,-44 + 2178: 20,-44 + 2179: 21,-44 + 2231: 9,-35 + 2240: -9,-48 + 2241: -5,-46 + 2242: -9,-47 + 2243: -9,-46 + 2244: -9,-44 + 2245: -9,-43 + 2246: -9,-42 + 2247: -9,-50 + 2248: -9,-51 + 2249: -9,-52 + 2250: -9,-53 + 2252: -9,-55 + 2253: -8,-55 + 2254: -7,-55 + 2255: -6,-55 + 2256: -5,-55 + 2257: -4,-55 + 2258: -3,-55 + 2347: -1,-42 + 2964: 16,-39 - node: color: '#DE3A3A96' id: BrickTileWhiteInnerSw decals: - 1360: 33,-9 - 1423: 48,-7 - 1424: 48,-6 - 1425: 46,-8 - 1426: 46,-9 - 1427: 46,-10 - 1428: 46,-11 - 1429: 46,-12 - 1430: 46,-13 - 1431: 46,-14 - 1455: 30,-13 - 1456: 32,-13 - 1457: 33,-13 - 1458: 34,-13 - 1459: 36,-13 - 1460: 37,-13 - 1461: 37,-14 - 1462: 37,-15 - 1463: 37,-16 - 1464: 37,-17 - 1465: 37,-18 - 1466: 38,-18 - 1467: 39,-18 - 1468: 39,-19 - 1486: 30,-12 - 1487: 30,-11 - 1504: 51,-9 - 1505: 52,-9 - 1506: 53,-9 - 1507: 53,-10 - 1508: 53,-11 - 1509: 53,-12 - 1510: 53,-13 - 1511: 53,-14 - 1512: 53,-15 - 1546: 48,-9 - 1547: 49,-9 - 1581: 40,-24 - 1582: 39,-25 - 1583: 39,-26 - 1584: 39,-27 - 1585: 39,-28 - 1586: 39,-29 - 1588: 40,-29 - 1595: 42,-30 - 1596: 40,-30 - 1621: 30,-31 - 1627: 38,-35 - 1628: 37,-35 - 1629: 36,-35 - 1630: 35,-35 - 1631: 34,-35 - 1632: 33,-35 - 1633: 32,-35 - 1634: 31,-35 - 1635: 30,-35 - 1636: 30,-34 - 1684: 44,-34 - 1685: 43,-37 - 1686: 42,-37 - 1687: 40,-37 - 1688: 39,-37 - 1693: 40,-35 - 1694: 40,-36 - 1695: 43,-42 - 1696: 41,-42 - 1697: 40,-42 - 1698: 39,-42 - 1699: 39,-40 - 1719: 42,-41 - 1725: 39,-39 - 2843: 42,-23 - 2845: 40,-23 - 2852: 40,-20 - 2853: 40,-19 - 2854: 40,-18 + 1358: 33,-9 + 1421: 48,-7 + 1422: 48,-6 + 1423: 46,-8 + 1424: 46,-9 + 1425: 46,-10 + 1426: 46,-11 + 1427: 46,-12 + 1428: 46,-13 + 1429: 46,-14 + 1453: 30,-13 + 1454: 32,-13 + 1455: 33,-13 + 1456: 34,-13 + 1457: 36,-13 + 1458: 37,-13 + 1459: 37,-14 + 1460: 37,-15 + 1461: 37,-16 + 1462: 37,-17 + 1463: 37,-18 + 1464: 38,-18 + 1465: 39,-18 + 1466: 39,-19 + 1484: 30,-12 + 1485: 30,-11 + 1502: 51,-9 + 1503: 52,-9 + 1504: 53,-9 + 1505: 53,-10 + 1506: 53,-11 + 1507: 53,-12 + 1508: 53,-13 + 1509: 53,-14 + 1510: 53,-15 + 1544: 48,-9 + 1545: 49,-9 + 1579: 40,-24 + 1580: 39,-25 + 1581: 39,-26 + 1582: 39,-27 + 1583: 39,-28 + 1584: 39,-29 + 1586: 40,-29 + 1593: 42,-30 + 1594: 40,-30 + 1619: 30,-31 + 1625: 38,-35 + 1626: 37,-35 + 1627: 36,-35 + 1628: 35,-35 + 1629: 34,-35 + 1630: 33,-35 + 1631: 32,-35 + 1632: 31,-35 + 1633: 30,-35 + 1634: 30,-34 + 1682: 44,-34 + 1683: 43,-37 + 1684: 42,-37 + 1685: 40,-37 + 1686: 39,-37 + 1691: 40,-35 + 1692: 40,-36 + 1693: 43,-42 + 1694: 41,-42 + 1695: 40,-42 + 1696: 39,-42 + 1697: 39,-40 + 1717: 42,-41 + 1723: 39,-39 + 2841: 42,-23 + 2843: 40,-23 + 2850: 40,-20 + 2851: 40,-19 + 2852: 40,-18 - node: color: '#EFB34196' id: BrickTileWhiteInnerSw decals: - 1790: 4,37 - 1791: 4,34 - 1792: 4,30 - 1793: 5,30 - 1794: 6,30 - 1795: 7,30 - 1796: 8,30 - 1797: 4,31 - 1798: 4,38 - 1813: 7,37 - 1821: 10,34 - 1830: 21,34 - 1862: 25,30 - 1863: 25,36 - 1864: 27,36 - 1865: 27,42 - 1868: 28,33 - 1883: 35,42 - 2499: 5,51 - 2503: 20,42 - 2528: 25,42 - 3065: 18,33 - 3134: 17,45 + 1788: 4,37 + 1789: 4,34 + 1790: 4,30 + 1791: 5,30 + 1792: 6,30 + 1793: 7,30 + 1794: 8,30 + 1795: 4,31 + 1796: 4,38 + 1811: 7,37 + 1819: 10,34 + 1828: 21,34 + 1860: 25,30 + 1861: 25,36 + 1862: 27,36 + 1863: 27,42 + 1866: 28,33 + 1881: 35,42 + 2497: 5,51 + 2501: 20,42 + 2526: 25,42 + 3063: 18,33 + 3132: 17,45 - node: color: '#F9801D7F' id: BrickTileWhiteInnerSw decals: - 3454: 45,-19 + 3452: 45,-19 - node: color: '#00BEBE7F' id: BrickTileWhiteLineE decals: - 3157: -27,40 - 3158: -27,41 - 3159: -27,42 + 3155: -27,40 + 3156: -27,41 + 3157: -27,42 - node: color: '#334E6DC8' id: BrickTileWhiteLineE decals: - 1354: 33,-5 - 1355: 33,-7 - 1356: 33,-6 + 1352: 33,-5 + 1353: 33,-7 + 1354: 33,-6 + 3594: 26,13 + 3595: 26,14 + 3608: 33,13 + 3609: 33,14 - node: color: '#4B709CFF' id: BrickTileWhiteLineE @@ -2124,153 +2128,159 @@ entities: 507: -29,-29 508: -29,-28 509: -29,-27 - 562: -24,-40 - 563: -24,-41 - 2372: 34,-39 - 2373: 34,-40 - 2374: 34,-41 - 2386: 28,-36 + 560: -24,-40 + 561: -24,-41 + 2370: 34,-39 + 2371: 34,-40 + 2372: 34,-41 + 2384: 28,-36 - node: color: '#765428FF' id: BrickTileWhiteLineE decals: - 3319: -53,-18 - 3320: -53,-19 - 3321: -53,-20 - 3322: -53,-21 - 3323: -53,-22 - 3324: -53,-23 + 3317: -53,-18 + 3318: -53,-19 + 3319: -53,-20 + 3320: -53,-21 + 3321: -53,-22 + 3322: -53,-23 - node: color: '#9FED58B3' id: BrickTileWhiteLineE decals: - 2543: -45,-31 - 2544: -45,-30 + 2541: -45,-31 + 2542: -45,-30 - node: color: '#BC863FFF' id: BrickTileWhiteLineE decals: - 3216: -53,-14 - 3217: -53,-1 - 3218: -53,0 - 3224: -49,2 - 3225: -49,1 - 3226: -49,0 - 3227: -49,-1 - 3228: -49,-2 - 3229: -49,-4 - 3356: -49,-3 + 3214: -53,-14 + 3215: -53,-1 + 3216: -53,0 + 3222: -49,2 + 3223: -49,1 + 3224: -49,0 + 3225: -49,-1 + 3226: -49,-2 + 3227: -49,-4 + 3354: -49,-3 - node: color: '#D381C996' id: BrickTileWhiteLineE decals: - 843: -11,-50 - 844: -11,-49 - 845: -11,-48 - 2070: 3,-43 - 2071: 3,-44 - 2072: 3,-46 - 2073: 3,-47 - 2127: 17,-41 - 2128: 21,-43 - 2129: 11,-39 - 2197: 12,-44 - 2198: 16,-43 - 2199: 16,-42 - 2200: 16,-41 - 2201: 16,-40 - 2202: 16,-39 - 2203: 16,-38 - 2204: 16,-37 - 2205: 16,-36 - 2227: 5,-38 - 2228: 5,-37 - 2229: 5,-36 - 2237: -7,-47 - 2239: -7,-44 - 2299: -11,-45 - 2343: -3,-47 - 2344: -3,-46 - 2959: 14,-41 - 2960: 14,-40 + 841: -11,-50 + 842: -11,-49 + 843: -11,-48 + 2068: 3,-43 + 2069: 3,-44 + 2070: 3,-46 + 2071: 3,-47 + 2125: 17,-41 + 2126: 21,-43 + 2127: 11,-39 + 2195: 12,-44 + 2196: 16,-43 + 2197: 16,-42 + 2198: 16,-41 + 2199: 16,-40 + 2200: 16,-39 + 2201: 16,-38 + 2202: 16,-37 + 2203: 16,-36 + 2225: 5,-38 + 2226: 5,-37 + 2227: 5,-36 + 2235: -7,-47 + 2237: -7,-44 + 2297: -11,-45 + 2341: -3,-47 + 2342: -3,-46 + 2957: 14,-41 + 2958: 14,-40 - node: color: '#DE3A3A96' id: BrickTileWhiteLineE decals: - 1604: 42,-27 - 1605: 43,-37 - 1608: 37,-41 - 1609: 38,-34 - 1610: 38,-33 - 1611: 38,-32 - 1617: 27,-27 - 1618: 28,-32 - 1619: 28,-33 + 1602: 42,-27 + 1603: 43,-37 + 1606: 37,-41 + 1607: 38,-34 + 1608: 38,-33 + 1609: 38,-32 + 1615: 27,-27 + 1616: 28,-32 + 1617: 28,-33 - node: color: '#EFB34196' id: BrickTileWhiteLineE decals: - 1755: 8,32 - 1756: 8,33 - 1799: 5,32 - 1800: 5,33 - 1801: 5,34 - 1802: 5,35 - 1803: 5,36 - 1817: 17,30 - 1826: 19,32 - 1827: 19,33 - 1880: 22,32 - 2509: 10,44 - 2510: 10,43 - 2511: 10,42 - 2515: 19,44 - 2516: 19,45 - 2517: 20,42 - 2518: 20,43 - 3053: 11,32 - 3080: 17,34 - 3105: -2,41 - 3106: -2,42 - 3120: 10,41 - 3125: 19,40 - 3126: 19,41 + 1753: 8,32 + 1754: 8,33 + 1797: 5,32 + 1798: 5,33 + 1799: 5,34 + 1800: 5,35 + 1801: 5,36 + 1815: 17,30 + 1824: 19,32 + 1825: 19,33 + 1878: 22,32 + 2507: 10,44 + 2508: 10,43 + 2509: 10,42 + 2513: 19,44 + 2514: 19,45 + 2515: 20,42 + 2516: 20,43 + 3051: 11,32 + 3078: 17,34 + 3103: -2,41 + 3104: -2,42 + 3118: 10,41 + 3123: 19,40 + 3124: 19,41 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineE decals: - 577: -30,-28 - 3489: -6,-28 - 3490: -6,-27 + 575: -30,-28 + 3487: -6,-28 + 3488: -6,-27 - node: color: '#00BEBE7F' id: BrickTileWhiteLineN decals: - 3160: -28,43 - 3161: -29,43 - 3162: -30,43 - 3163: -31,43 - 3164: -32,43 - 3165: -33,43 - 3191: -43,1 - 3192: -42,1 - 3193: -41,1 - 3194: -40,1 - 3195: -39,1 - 3196: -38,1 - 3197: -37,1 - 3198: -36,1 - 3202: -43,5 - 3203: -41,4 - 3204: -40,4 - 3205: -39,4 - 3206: -38,4 - 3207: -37,4 + 3158: -28,43 + 3159: -29,43 + 3160: -30,43 + 3161: -31,43 + 3162: -32,43 + 3163: -33,43 + 3189: -43,1 + 3190: -42,1 + 3191: -41,1 + 3192: -40,1 + 3193: -39,1 + 3194: -38,1 + 3195: -37,1 + 3196: -36,1 + 3200: -43,5 + 3201: -41,4 + 3202: -40,4 + 3203: -39,4 + 3204: -38,4 + 3205: -37,4 - node: color: '#169C9CFF' id: BrickTileWhiteLineN decals: 402: -16,-30 + - node: + color: '#334E6DC8' + id: BrickTileWhiteLineN + decals: + 3610: 30,16 + 3611: 31,16 - node: color: '#4B709CFF' id: BrickTileWhiteLineN @@ -2298,111 +2308,111 @@ entities: 510: -30,-26 511: -31,-26 512: -32,-26 - 559: -27,-39 - 560: -26,-39 - 561: -25,-39 - 2362: 29,-37 - 2363: 30,-37 - 2364: 31,-37 - 2365: 32,-37 - 2366: 33,-37 - 2367: 34,-37 - 2368: 35,-37 - 2369: 36,-37 + 557: -27,-39 + 558: -26,-39 + 559: -25,-39 + 2360: 29,-37 + 2361: 30,-37 + 2362: 31,-37 + 2363: 32,-37 + 2364: 33,-37 + 2365: 34,-37 + 2366: 35,-37 + 2367: 36,-37 - node: color: '#765428FF' id: BrickTileWhiteLineN decals: - 3313: -55,-17 - 3314: -56,-17 - 3315: -57,-17 - 3316: -54,-17 + 3311: -55,-17 + 3312: -56,-17 + 3313: -57,-17 + 3314: -54,-17 - node: color: '#9FED58B3' id: BrickTileWhiteLineN decals: - 2531: -47,-31 - 2537: -47,-30 + 2529: -47,-31 + 2535: -47,-30 - node: color: '#BC863FFF' id: BrickTileWhiteLineN decals: - 3213: -54,3 - 3223: -50,3 + 3211: -54,3 + 3221: -50,3 - node: color: '#D381C996' id: BrickTileWhiteLineN decals: - 834: -13,-47 - 835: -12,-47 - 2130: 16,-34 - 2131: 9,-34 - 2132: 5,-34 - 2191: 7,-43 - 2192: 8,-43 - 2193: 9,-43 - 2194: 10,-43 - 2195: 11,-43 - 2196: 15,-35 - 2224: 6,-39 - 2225: 7,-39 - 2226: 8,-39 + 832: -13,-47 + 833: -12,-47 + 2128: 16,-34 + 2129: 9,-34 + 2130: 5,-34 + 2189: 7,-43 + 2190: 8,-43 + 2191: 9,-43 + 2192: 10,-43 + 2193: 11,-43 + 2194: 15,-35 + 2222: 6,-39 + 2223: 7,-39 + 2224: 8,-39 - node: color: '#D4D4D428' id: BrickTileWhiteLineN decals: - 1362: 31,-3 - 1363: 32,-3 + 1360: 31,-3 + 1361: 32,-3 - node: color: '#DE3A3A96' id: BrickTileWhiteLineN decals: - 1432: 49,-6 - 1433: 51,-6 - 1490: 32,-11 - 1496: 38,-11 - 1497: 40,-11 - 1523: 50,-16 - 1554: 50,-3 - 1568: 41,-32 - 1717: 41,-41 - 1720: 41,-39 - 1731: 41,-40 - 2840: 41,-25 + 1430: 49,-6 + 1431: 51,-6 + 1488: 32,-11 + 1494: 38,-11 + 1495: 40,-11 + 1521: 50,-16 + 1552: 50,-3 + 1566: 41,-32 + 1715: 41,-41 + 1718: 41,-39 + 1729: 41,-40 + 2838: 41,-25 - node: color: '#EFB34196' id: BrickTileWhiteLineN decals: - 1754: 7,38 - 1804: 6,31 - 1834: 23,28 - 1835: 24,28 - 1842: 24,40 - 1843: 26,40 - 1844: 24,34 - 1845: 26,34 - 1846: 26,23 - 1870: 23,31 - 1871: 24,31 - 1872: 25,31 - 1873: 26,31 - 1874: 27,31 - 3041: 17,31 - 3042: 16,31 - 3043: 15,31 - 3044: 14,31 - 3045: 13,31 - 3046: 12,31 - 3056: 12,33 - 3057: 13,33 - 3058: 14,33 - 3059: 15,33 - 3060: 16,33 - 3061: 17,33 - 3115: -6,43 - 3116: -5,43 - 3117: -4,43 - 3118: -3,43 + 1752: 7,38 + 1802: 6,31 + 1832: 23,28 + 1833: 24,28 + 1840: 24,40 + 1841: 26,40 + 1842: 24,34 + 1843: 26,34 + 1844: 26,23 + 1868: 23,31 + 1869: 24,31 + 1870: 25,31 + 1871: 26,31 + 1872: 27,31 + 3039: 17,31 + 3040: 16,31 + 3041: 15,31 + 3042: 14,31 + 3043: 13,31 + 3044: 12,31 + 3054: 12,33 + 3055: 13,33 + 3056: 14,33 + 3057: 15,33 + 3058: 16,33 + 3059: 17,33 + 3113: -6,43 + 3114: -5,43 + 3115: -4,43 + 3116: -3,43 - node: color: '#F38BAAFF' id: BrickTileWhiteLineN @@ -2412,27 +2422,27 @@ entities: color: '#FFFFFFFF' id: BrickTileWhiteLineN decals: - 576: -31,-27 - 3481: -5,-29 - 3482: -4,-29 - 3483: -3,-29 + 574: -31,-27 + 3479: -5,-29 + 3480: -4,-29 + 3481: -3,-29 - node: color: '#00BEBE7F' id: BrickTileWhiteLineS decals: - 3151: -33,39 - 3152: -32,39 - 3153: -31,39 - 3154: -30,39 - 3155: -29,39 - 3156: -28,39 - 3184: -37,3 - 3185: -38,3 - 3186: -39,3 - 3187: -40,3 - 3188: -41,3 - 3189: -42,3 - 3190: -43,3 + 3149: -33,39 + 3150: -32,39 + 3151: -31,39 + 3152: -30,39 + 3153: -29,39 + 3154: -28,39 + 3182: -37,3 + 3183: -38,3 + 3184: -39,3 + 3185: -40,3 + 3186: -41,3 + 3187: -42,3 + 3188: -43,3 - node: color: '#169C9CFF' id: BrickTileWhiteLineS @@ -2469,120 +2479,119 @@ entities: 496: -26,-30 516: -32,-30 517: -31,-30 - 518: -30,-30 - 519: -30,-30 - 564: -25,-42 - 565: -26,-42 - 566: -27,-42 - 2370: 36,-38 - 2371: 35,-38 - 2375: 33,-42 - 2376: 32,-42 - 2377: 31,-42 - 2378: 30,-42 - 2379: 29,-42 - 2380: 28,-42 + 562: -25,-42 + 563: -26,-42 + 564: -27,-42 + 2368: 36,-38 + 2369: 35,-38 + 2373: 33,-42 + 2374: 32,-42 + 2375: 31,-42 + 2376: 30,-42 + 2377: 29,-42 + 2378: 28,-42 + 3624: -30,-30 - node: color: '#765428FF' id: BrickTileWhiteLineS decals: - 3325: -54,-24 - 3326: -55,-24 - 3327: -56,-24 - 3328: -57,-24 + 3323: -54,-24 + 3324: -55,-24 + 3325: -56,-24 + 3326: -57,-24 - node: color: '#80C71F7F' id: BrickTileWhiteLineS decals: - 3438: 54,-19 - 3439: 52,-19 - 3440: 51,-19 + 3436: 54,-19 + 3437: 52,-19 + 3438: 51,-19 - node: color: '#8932B87F' id: BrickTileWhiteLineS decals: - 3441: 50,-19 - 3442: 48,-19 - 3443: 47,-19 + 3439: 50,-19 + 3440: 48,-19 + 3441: 47,-19 - node: color: '#9FED58B3' id: BrickTileWhiteLineS decals: - 2536: -47,-30 - 2538: -47,-31 + 2534: -47,-30 + 2536: -47,-31 - node: color: '#BC863FFF' id: BrickTileWhiteLineS decals: - 3214: -56,-15 - 3215: -55,-15 - 3232: -50,-5 + 3212: -56,-15 + 3213: -55,-15 + 3230: -50,-5 - node: color: '#D381C996' id: BrickTileWhiteLineS decals: - 846: -12,-51 - 847: -13,-51 - 2215: 7,-45 - 2216: 8,-45 - 2217: 9,-45 - 2218: 10,-45 - 2219: 11,-45 - 2220: 15,-44 - 2221: 6,-35 - 2222: 7,-35 - 2223: 8,-35 + 844: -12,-51 + 845: -13,-51 + 2213: 7,-45 + 2214: 8,-45 + 2215: 9,-45 + 2216: 10,-45 + 2217: 11,-45 + 2218: 15,-44 + 2219: 6,-35 + 2220: 7,-35 + 2221: 8,-35 - node: color: '#DE3A3A96' id: BrickTileWhiteLineS decals: - 1359: 32,-9 - 1480: 35,-13 - 1481: 31,-13 - 1522: 50,-9 - 1555: 50,-4 - 1569: 41,-30 - 1606: 41,-37 - 1718: 41,-41 - 2839: 41,-23 + 1357: 32,-9 + 1478: 35,-13 + 1479: 31,-13 + 1520: 50,-9 + 1553: 50,-4 + 1567: 41,-30 + 1604: 41,-37 + 1716: 41,-41 + 2837: 41,-23 - node: color: '#EFB34196' id: BrickTileWhiteLineS decals: - 1810: 6,37 - 1836: 23,30 - 1837: 24,30 - 1838: 26,25 - 1839: 26,36 - 1840: 24,36 - 1841: 26,42 - 1875: 23,33 - 1876: 24,33 - 1877: 25,33 - 1878: 26,33 - 1879: 27,33 - 1882: 34,42 - 2504: 15,45 - 2505: 14,45 - 2506: 13,45 - 2507: 12,45 - 2508: 11,45 - 2525: 33,42 - 2530: 24,42 - 3047: 12,33 - 3048: 13,33 - 3049: 14,33 - 3050: 15,33 - 3051: 16,33 - 3052: 17,33 - 3107: -3,40 - 3108: -4,40 - 3109: -5,40 - 3113: -6,40 - 3121: 9,40 - 3122: 8,40 - 3127: 18,39 - 3133: 16,45 + 1808: 6,37 + 1834: 23,30 + 1835: 24,30 + 1836: 26,25 + 1837: 26,36 + 1838: 24,36 + 1839: 26,42 + 1873: 23,33 + 1874: 24,33 + 1875: 25,33 + 1876: 26,33 + 1877: 27,33 + 1880: 34,42 + 2502: 15,45 + 2503: 14,45 + 2504: 13,45 + 2505: 12,45 + 2506: 11,45 + 2523: 33,42 + 2528: 24,42 + 3045: 12,33 + 3046: 13,33 + 3047: 14,33 + 3048: 15,33 + 3049: 16,33 + 3050: 17,33 + 3105: -3,40 + 3106: -4,40 + 3107: -5,40 + 3111: -6,40 + 3119: 9,40 + 3120: 8,40 + 3125: 18,39 + 3131: 16,45 - node: color: '#F38BAAFF' id: BrickTileWhiteLineS @@ -2592,34 +2601,36 @@ entities: color: '#F9801D7F' id: BrickTileWhiteLineS decals: - 3444: 46,-19 - 3445: 44,-19 - 3446: 43,-19 + 3442: 46,-19 + 3443: 44,-19 + 3444: 43,-19 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineS decals: - 578: -31,-29 - 3484: -5,-26 - 3485: -4,-26 - 3486: -3,-26 + 576: -31,-29 + 3482: -5,-26 + 3483: -4,-26 + 3484: -3,-26 - node: color: '#00BEBE7F' id: BrickTileWhiteLineW decals: - 3166: -34,42 - 3167: -34,41 - 3168: -34,40 - 3201: -44,4 + 3164: -34,42 + 3165: -34,41 + 3166: -34,40 + 3199: -44,4 - node: color: '#334E6DC8' id: BrickTileWhiteLineW decals: - 601: 21,6 - 602: 21,7 - 605: 20,6 - 606: 20,7 - 3212: -44,-10 + 599: 21,6 + 600: 21,7 + 603: 20,6 + 604: 20,7 + 3210: -44,-10 + 3596: 28,13 + 3597: 28,14 - node: color: '#4B709CFF' id: BrickTileWhiteLineW @@ -2640,517 +2651,517 @@ entities: 513: -33,-29 514: -33,-28 515: -33,-27 - 567: -28,-41 - 568: -28,-40 - 725: -2,-33 - 728: -2,-40 - 729: -1,-35 - 730: -1,-36 - 731: -1,-37 - 732: -1,-38 - 2354: 27,-41 - 2355: 27,-40 - 2356: 27,-39 - 2357: 27,-38 - 2358: 27,-37 - 2359: 27,-36 + 565: -28,-41 + 566: -28,-40 + 723: -2,-33 + 726: -2,-40 + 727: -1,-35 + 728: -1,-36 + 729: -1,-37 + 730: -1,-38 + 2352: 27,-41 + 2353: 27,-40 + 2354: 27,-39 + 2355: 27,-38 + 2356: 27,-37 + 2357: 27,-36 - node: color: '#765428FF' id: BrickTileWhiteLineW decals: - 3329: -58,-23 - 3330: -58,-22 - 3331: -58,-21 + 3327: -58,-23 + 3328: -58,-22 + 3329: -58,-21 - node: color: '#9FED58B3' id: BrickTileWhiteLineW decals: - 2545: -45,-31 - 2546: -45,-30 + 2543: -45,-31 + 2544: -45,-30 - node: color: '#BC863FFF' id: BrickTileWhiteLineW decals: - 3219: -51,-4 - 3220: -51,-3 - 3233: -47,-4 - 3234: -47,-3 - 3346: -47,0 - 3347: -47,1 - 3352: -47,-1 - 3355: -51,2 - 3359: -50,-1 - 3360: -50,0 + 3217: -51,-4 + 3218: -51,-3 + 3231: -47,-4 + 3232: -47,-3 + 3344: -47,0 + 3345: -47,1 + 3350: -47,-1 + 3353: -51,2 + 3357: -50,-1 + 3358: -50,0 - node: color: '#D381C996' id: BrickTileWhiteLineW decals: - 840: -14,-50 - 841: -14,-49 - 842: -14,-48 - 2081: 5,-43 - 2082: 5,-44 - 2083: 5,-46 - 2084: 5,-47 - 2126: 13,-39 - 2206: 6,-44 - 2207: 14,-43 - 2208: 14,-42 - 2209: 14,-41 - 2210: 14,-39 - 2211: 14,-40 - 2212: 14,-38 - 2213: 14,-37 - 2214: 14,-36 - 2230: 9,-38 - 2231: 9,-37 - 2232: 9,-36 - 2238: -5,-47 - 2241: -9,-49 - 2253: -9,-54 - 2298: -9,-45 - 2345: -1,-46 - 2346: -1,-45 - 2347: -1,-44 - 2348: -1,-43 - 2352: -1,-47 - 2961: 16,-41 - 2962: 16,-40 + 838: -14,-50 + 839: -14,-49 + 840: -14,-48 + 2079: 5,-43 + 2080: 5,-44 + 2081: 5,-46 + 2082: 5,-47 + 2124: 13,-39 + 2204: 6,-44 + 2205: 14,-43 + 2206: 14,-42 + 2207: 14,-41 + 2208: 14,-39 + 2209: 14,-40 + 2210: 14,-38 + 2211: 14,-37 + 2212: 14,-36 + 2228: 9,-38 + 2229: 9,-37 + 2230: 9,-36 + 2236: -5,-47 + 2239: -9,-49 + 2251: -9,-54 + 2296: -9,-45 + 2343: -1,-46 + 2344: -1,-45 + 2345: -1,-44 + 2346: -1,-43 + 2350: -1,-47 + 2959: 16,-41 + 2960: 16,-40 - node: color: '#DE3A3A96' id: BrickTileWhiteLineW decals: - 1607: 39,-41 - 1612: 40,-34 - 1613: 40,-33 - 1614: 40,-32 - 1615: 30,-33 - 1616: 30,-32 - 2858: 40,-22 - 2859: 40,-21 + 1605: 39,-41 + 1610: 40,-34 + 1611: 40,-33 + 1612: 40,-32 + 1613: 30,-33 + 1614: 30,-32 + 2856: 40,-22 + 2857: 40,-21 - node: color: '#EFB34196' id: BrickTileWhiteLineW decals: - 1786: 4,32 - 1787: 4,33 - 1788: 4,35 - 1789: 4,36 - 1805: 7,32 - 1806: 7,33 - 1807: 7,34 - 1808: 7,35 - 1809: 7,36 - 1818: 12,30 - 1819: 10,33 - 1820: 10,32 - 1828: 21,32 - 1829: 21,33 - 1881: 28,32 - 3054: 18,32 - 3055: 12,34 - 3110: -7,41 - 3111: -7,42 - 3128: 17,40 - 3129: 17,41 - 3130: 17,42 - 3131: 17,43 - 3132: 17,44 + 1784: 4,32 + 1785: 4,33 + 1786: 4,35 + 1787: 4,36 + 1803: 7,32 + 1804: 7,33 + 1805: 7,34 + 1806: 7,35 + 1807: 7,36 + 1816: 12,30 + 1817: 10,33 + 1818: 10,32 + 1826: 21,32 + 1827: 21,33 + 1879: 28,32 + 3052: 18,32 + 3053: 12,34 + 3108: -7,41 + 3109: -7,42 + 3126: 17,40 + 3127: 17,41 + 3128: 17,42 + 3129: 17,43 + 3130: 17,44 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineW decals: - 579: -32,-28 - 580: -32,-28 + 577: -32,-28 + 578: -32,-28 - node: color: '#FFFFFFFF' id: BushAOne decals: - 2647: -12.173578,-13.16537 + 2645: -12.173578,-13.16537 - node: color: '#FFFFFFFF' id: BushAThree decals: - 2604: 7.063609,-17.083809 - 2648: -12.954828,-13.13412 - 2980: -13.009358,7.995878 - 2985: -15.09027,11.031727 + 2602: 7.063609,-17.083809 + 2646: -12.954828,-13.13412 + 2978: -13.009358,7.995878 + 2983: -15.09027,11.031727 - node: color: '#FFFFFFFF' id: BushATwo decals: - 2649: -12.996495,-12.238287 - 2650: -6.0969057,-13.717453 + 2647: -12.996495,-12.238287 + 2648: -6.0969057,-13.717453 - node: color: '#FFFFFFFF' id: BushCOne decals: - 2973: -11.007082,13.412277 + 2971: -11.007082,13.412277 - node: color: '#FFFFFFFF' id: BushCThree decals: - 2598: 17.014423,-8.300894 - 2634: -4.785802,3.4705331 + 2596: 17.014423,-8.300894 + 2632: -4.785802,3.4705331 - node: color: '#FFFFFFFF' id: BushCTwo decals: - 2653: -5.148989,-12.144537 + 2651: -5.148989,-12.144537 - node: color: '#FFFFFFFF' id: BushDTwo decals: - 2590: 17.163681,15.561111 - 2591: 3.516313,17.119299 + 2588: 17.163681,15.561111 + 2589: 3.516313,17.119299 - node: color: '#FFFFFFFF' id: Busha1 decals: - 2592: 4.90173,16.900549 - 2977: -13.092692,9.881294 + 2590: 4.90173,16.900549 + 2975: -13.092692,9.881294 - node: color: '#FFFFFFFF' id: Busha2 decals: - 2982: -13.96527,9.885894 - 2984: -14.642353,10.979644 + 2980: -13.96527,9.885894 + 2982: -14.642353,10.979644 - node: color: '#FFFFFFFF' id: Bushb1 decals: - 2974: -10.975832,14.18311 - 2978: -13.092692,9.006294 + 2972: -10.975832,14.18311 + 2976: -13.092692,9.006294 - node: color: '#FFFFFFFF' id: Bushb2 decals: - 2646: -12.183994,-14.061203 - 2975: -10.996666,15.02686 + 2644: -12.183994,-14.061203 + 2973: -10.996666,15.02686 - node: color: '#FFFFFFFF' id: Bushb3 decals: - 2979: -13.009358,8.402128 - 2983: -14.017353,10.354644 + 2977: -13.009358,8.402128 + 2981: -14.017353,10.354644 - node: color: '#FFFFFFFF' id: Bushc1 decals: - 2651: -5.1698227,-12.957037 - 2981: -14.02777,11.062977 + 2649: -5.1698227,-12.957037 + 2979: -14.02777,11.062977 - node: color: '#FFFFFFFF' id: Bushc3 decals: - 2589: 17.194931,12.9986105 - 2652: -8.055239,-11.332037 - 2976: -11.044625,12.930744 + 2587: 17.194931,12.9986105 + 2650: -8.055239,-11.332037 + 2974: -11.044625,12.930744 - node: color: '#FFFFFFFF' id: Bushe1 decals: - 2580: 6.2998166,3.7755318 - 2595: 17.076923,-7.467561 - 2596: 16.566507,-7.988394 - 2602: 7.2406926,-16.500475 - 2617: 3.5204434,-9.447139 - 2618: 3.2912767,-9.686723 - 2654: -8.044823,-11.092453 + 2578: 6.2998166,3.7755318 + 2593: 17.076923,-7.467561 + 2594: 16.566507,-7.988394 + 2600: 7.2406926,-16.500475 + 2615: 3.5204434,-9.447139 + 2616: 3.2912767,-9.686723 + 2652: -8.044823,-11.092453 - node: color: '#FFFFFFFF' id: Bushe2 decals: - 2581: 6.6984973,3.4174294 - 2597: 17.014423,-8.030061 - 2611: 7.441076,6.766222 - 2971: -17.569584,14.99561 - 2994: -4.0134697,4.9046235 - 3476: 63.771957,-1.9947927 - 3480: 64.23029,-2.0052094 + 2579: 6.6984973,3.4174294 + 2595: 17.014423,-8.030061 + 2609: 7.441076,6.766222 + 2969: -17.569584,14.99561 + 2992: -4.0134697,4.9046235 + 3474: 63.771957,-1.9947927 + 3478: 64.23029,-2.0052094 - node: color: '#FFFFFFFF' id: Bushe3 decals: - 2603: 6.6990256,-16.510893 - 3375: 58.245747,-2.973395 - 3376: 57.818665,-3.0463119 - 3377: 58.308247,-2.1817284 - 3475: 64.15737,-0.19270933 + 2601: 6.6990256,-16.510893 + 3373: 58.245747,-2.973395 + 3374: 57.818665,-3.0463119 + 3375: 58.308247,-2.1817284 + 3473: 64.15737,-0.19270933 - node: color: '#FFFFFFFF' id: Bushe4 decals: - 1304: 57.84424,1.1426643 - 1305: 58.21924,0.9864143 - 1306: 57.885906,-2.0552526 - 1307: 58.15674,-1.5865024 - 1308: 57.90674,0.18433094 - 2628: 6.6556993,14.650438 - 2635: -4.7441354,3.6892834 - 2660: -12.329075,-5.2076516 - 2661: -11.683241,-5.540985 - 2995: -4.2530527,4.29004 - 3474: 63.792793,0.09895742 + 1302: 57.84424,1.1426643 + 1303: 58.21924,0.9864143 + 1304: 57.885906,-2.0552526 + 1305: 58.15674,-1.5865024 + 1306: 57.90674,0.18433094 + 2626: 6.6556993,14.650438 + 2633: -4.7441354,3.6892834 + 2658: -12.329075,-5.2076516 + 2659: -11.683241,-5.540985 + 2993: -4.2530527,4.29004 + 3472: 63.792793,0.09895742 - node: color: '#FFFFFFFF' id: Bushf1 decals: - 1311: 58.167156,-0.24275243 - 3008: -4.922404,-3.8768375 + 1309: 58.167156,-0.24275243 + 3006: -4.922404,-3.8768375 - node: color: '#FFFFFFFF' id: Bushf2 decals: - 1312: 57.833824,-0.37816906 - 3010: -4.4328203,-4.7726707 - 3011: -4.3255215,-5.3247385 + 1310: 57.833824,-0.37816906 + 3008: -4.4328203,-4.7726707 + 3009: -4.3255215,-5.3247385 - node: color: '#FFFFFFFF' id: Bushf3 decals: - 2970: -17.132084,16.266443 - 3009: -4.3703203,-4.199754 - 3374: 57.943665,-2.723395 + 2968: -17.132084,16.266443 + 3007: -4.3703203,-4.199754 + 3372: 57.943665,-2.723395 - node: color: '#FFFFFFFF' id: Bushg1 decals: - 2599: 17.14984,-5.092561 - 2605: 8.53236,-17.187975 - 2639: 3.404969,-4.7533755 - 2986: -9.359586,2.9312673 + 2597: 17.14984,-5.092561 + 2603: 8.53236,-17.187975 + 2637: 3.404969,-4.7533755 + 2984: -9.359586,2.9312673 - node: color: '#FFFFFFFF' id: Bushg2 decals: - 2640: 4.175802,-4.0346255 - 2972: -16.8925,15.828943 + 2638: 4.175802,-4.0346255 + 2970: -16.8925,15.828943 - node: color: '#FFFFFFFF' id: Bushg3 decals: - 2559: -2.1416075,5.8916445 - 2560: -2.162441,14.072103 - 2561: 17.866562,15.155413 - 2562: 18.231146,11.999163 - 2563: 3.059716,-17.07088 - 2564: -4.1298733,-14.029394 - 2565: -2.3702574,-5.9809127 - 2566: -8.961391,-10.053829 - 2567: -17.146135,-6.1901164 + 2557: -2.1416075,5.8916445 + 2558: -2.162441,14.072103 + 2559: 17.866562,15.155413 + 2560: 18.231146,11.999163 + 2561: 3.059716,-17.07088 + 2562: -4.1298733,-14.029394 + 2563: -2.3702574,-5.9809127 + 2564: -8.961391,-10.053829 + 2565: -17.146135,-6.1901164 - node: color: '#FFFFFFFF' id: Bushg4 decals: - 2600: 17.160257,-5.6342273 - 2629: 7.2077823,13.712938 + 2598: 17.160257,-5.6342273 + 2627: 7.2077823,13.712938 - node: color: '#FFFFFFFF' id: Bushh1 decals: - 2577: 5.9211392,3.1419072 - 2582: 8.507914,15.796663 - 2583: 9.528748,15.46333 - 2993: -3.4732609,5.2424126 + 2575: 5.9211392,3.1419072 + 2580: 8.507914,15.796663 + 2581: 9.528748,15.46333 + 2991: -3.4732609,5.2424126 - node: color: '#FFFFFFFF' id: Bushh2 decals: - 2578: 5.087806,3.9127407 - 2584: 8.528747,14.473747 - 2662: -13.162408,-5.0826516 - 2663: -14.037408,-5.988902 + 2576: 5.087806,3.9127407 + 2582: 8.528747,14.473747 + 2660: -13.162408,-5.0826516 + 2661: -14.037408,-5.988902 - node: color: '#FFFFFFFF' id: Bushh3 decals: - 2579: 7.181556,4.0273237 - 2588: 17.465765,12.071527 - 2664: -13.756159,-5.822237 - 2665: -13.901991,-8.228487 - 2990: -9.230458,4.9216795 + 2577: 7.181556,4.0273237 + 2586: 17.465765,12.071527 + 2662: -13.756159,-5.822237 + 2663: -13.901991,-8.228487 + 2988: -9.230458,4.9216795 - node: color: '#FFFFFFFF' id: Bushi1 decals: - 2568: -17.677385,-15.149096 - 2569: -6.0205603,-17.117607 - 2570: -9.970078,-14.052947 - 2571: -9.887934,2.4137444 - 2572: -18.05108,15.0529785 - 2601: 6.2927756,-17.073393 - 2612: 15.850491,-4.61609 - 2614: 9.772904,-4.483665 - 2626: 13.70388,8.66825 - 2627: 7.1036158,14.358771 - 2630: -5.465275,9.849015 - 2631: -6.746525,10.213598 - 2644: 3.4466357,-5.461709 - 2679: -20.130556,-17.838984 - 2680: -16.849306,-19.984818 - 2681: -17.307638,-19.6619 - 2682: -19.265972,-20.13065 - 2998: -14.051299,-2.1793242 - 3001: -17.143507,-2.1316965 - 3002: -14.734559,-9.289597 - 3004: -14.390809,-9.633347 - 3005: -10.377625,-9.233512 - 3013: -3.5338547,-5.210155 - 3014: -4.8467765,-14.670914 - 3370: -2.6337829,9.646117 + 2566: -17.677385,-15.149096 + 2567: -6.0205603,-17.117607 + 2568: -9.970078,-14.052947 + 2569: -9.887934,2.4137444 + 2570: -18.05108,15.0529785 + 2599: 6.2927756,-17.073393 + 2610: 15.850491,-4.61609 + 2612: 9.772904,-4.483665 + 2624: 13.70388,8.66825 + 2625: 7.1036158,14.358771 + 2628: -5.465275,9.849015 + 2629: -6.746525,10.213598 + 2642: 3.4466357,-5.461709 + 2677: -20.130556,-17.838984 + 2678: -16.849306,-19.984818 + 2679: -17.307638,-19.6619 + 2680: -19.265972,-20.13065 + 2996: -14.051299,-2.1793242 + 2999: -17.143507,-2.1316965 + 3000: -14.734559,-9.289597 + 3002: -14.390809,-9.633347 + 3003: -10.377625,-9.233512 + 3011: -3.5338547,-5.210155 + 3012: -4.8467765,-14.670914 + 3368: -2.6337829,9.646117 - node: color: '#FFFFFFFF' id: Bushi2 decals: - 2573: -17.025719,17.03245 - 2574: 18.117056,13.867498 - 2619: 3.580893,-8.535644 - 2620: 8.918044,-3.98356 - 2621: 15.266736,-5.8692675 - 2622: 16.209822,-5.8538113 - 2623: 7.318463,5.66825 - 2624: 6.4642963,5.85575 - 2625: 14.620547,8.230751 - 2636: 6.318049,2.225238 - 2655: -8.044823,-13.97787 - 2656: -8.878156,-13.144537 - 2657: -5.867739,-11.154953 - 2658: -13.026991,-9.009735 - 2659: -11.860325,-5.124318 - 2683: -16.859722,-18.94315 - 2987: -8.75542,2.9208503 - 2992: -13.95071,2.256745 - 2999: -14.165881,-2.439741 - 3003: -14.713725,-9.602097 - 3006: -9.76849,-14.395954 - 3015: -4.450943,-14.608414 - 3371: -2.8004496,9.333617 + 2571: -17.025719,17.03245 + 2572: 18.117056,13.867498 + 2617: 3.580893,-8.535644 + 2618: 8.918044,-3.98356 + 2619: 15.266736,-5.8692675 + 2620: 16.209822,-5.8538113 + 2621: 7.318463,5.66825 + 2622: 6.4642963,5.85575 + 2623: 14.620547,8.230751 + 2634: 6.318049,2.225238 + 2653: -8.044823,-13.97787 + 2654: -8.878156,-13.144537 + 2655: -5.867739,-11.154953 + 2656: -13.026991,-9.009735 + 2657: -11.860325,-5.124318 + 2681: -16.859722,-18.94315 + 2985: -8.75542,2.9208503 + 2990: -13.95071,2.256745 + 2997: -14.165881,-2.439741 + 3001: -14.713725,-9.602097 + 3004: -9.76849,-14.395954 + 3013: -4.450943,-14.608414 + 3369: -2.8004496,9.333617 - node: color: '#FFFFFFFF' id: Bushi3 decals: - 2575: 17.117056,10.211248 - 2576: 9.26489,2.9960737 - 2606: 14.499886,6.958212 - 2607: 13.541552,7.447795 - 2608: 6.0254874,14.498462 - 2613: 16.579659,-3.9598398 - 2637: 7.224299,2.3710713 - 2638: 4.0082765,6.5204124 - 2645: 5.713353,-3.1926599 - 2969: -14.413333,18.172693 - 2989: -9.557503,5.8271008 - 2991: -14.0402975,2.506745 - 3372: -2.8212829,8.989867 + 2573: 17.117056,10.211248 + 2574: 9.26489,2.9960737 + 2604: 14.499886,6.958212 + 2605: 13.541552,7.447795 + 2606: 6.0254874,14.498462 + 2611: 16.579659,-3.9598398 + 2635: 7.224299,2.3710713 + 2636: 4.0082765,6.5204124 + 2643: 5.713353,-3.1926599 + 2967: -14.413333,18.172693 + 2987: -9.557503,5.8271008 + 2989: -14.0402975,2.506745 + 3370: -2.8212829,8.989867 - node: color: '#FFFFFFFF' id: Bushi4 decals: - 2547: -15.13607,-18.199955 - 2548: -18.14605,-11.80234 - 2549: -13.963279,-4.177868 - 2550: -5.8667884,-5.4799514 - 2551: 8.061129,-4.427868 - 2552: 15.901968,-2.2820346 - 2553: 17.151968,2.9988291 - 2554: 9.610178,17.11985 - 2555: 4.0546904,17.078184 - 2556: 3.480264,5.210905 - 2557: -15.017622,18.057854 - 2558: -5.5270247,2.9853945 - 2593: 5.777904,17.049623 - 2594: 9.139725,14.0701685 - 2609: 6.567154,13.456795 - 2610: 6.441076,6.7870555 - 2615: 9.397904,-5.046165 - 2616: 4.3850265,-9.488806 - 2632: -6.2881913,9.494848 - 2633: -5.402775,10.869849 - 2641: 3.8528857,-4.5242085 - 2666: -11.037408,-8.100949 - 2996: -3.7009702,4.4983735 - 2997: -5.697132,-3.1168242 - 3007: -9.425084,-14.560988 - 3012: -3.5442712,-4.7830715 + 2545: -15.13607,-18.199955 + 2546: -18.14605,-11.80234 + 2547: -13.963279,-4.177868 + 2548: -5.8667884,-5.4799514 + 2549: 8.061129,-4.427868 + 2550: 15.901968,-2.2820346 + 2551: 17.151968,2.9988291 + 2552: 9.610178,17.11985 + 2553: 4.0546904,17.078184 + 2554: 3.480264,5.210905 + 2555: -15.017622,18.057854 + 2556: -5.5270247,2.9853945 + 2591: 5.777904,17.049623 + 2592: 9.139725,14.0701685 + 2607: 6.567154,13.456795 + 2608: 6.441076,6.7870555 + 2613: 9.397904,-5.046165 + 2614: 4.3850265,-9.488806 + 2630: -6.2881913,9.494848 + 2631: -5.402775,10.869849 + 2639: 3.8528857,-4.5242085 + 2664: -11.037408,-8.100949 + 2994: -3.7009702,4.4983735 + 2995: -5.697132,-3.1168242 + 3005: -9.425084,-14.560988 + 3010: -3.5442712,-4.7830715 - node: color: '#FFFFFFFF' id: Bushj1 decals: - 2585: 8.789164,15.109163 - 2671: -19.824345,-10.10782 - 2672: -20.11601,-9.63907 - 2674: -20.011845,-8.243237 - 2675: -18.730595,-8.79532 - 2676: -18.873224,-10.013859 - 2677: -19.654474,-7.0659423 - 3388: -18.860361,-7.807997 + 2583: 8.789164,15.109163 + 2669: -19.824345,-10.10782 + 2670: -20.11601,-9.63907 + 2672: -20.011845,-8.243237 + 2673: -18.730595,-8.79532 + 2674: -18.873224,-10.013859 + 2675: -19.654474,-7.0659423 + 3386: -18.860361,-7.807997 - node: color: '#FFFFFFFF' id: Bushj2 decals: - 2673: -18.793095,-6.868236 - 2678: -19.94614,-7.7117753 - 3386: -20.016611,-7.2975807 - 3387: -18.902029,-9.370498 - 3389: -19.318695,-8.485081 + 2671: -18.793095,-6.868236 + 2676: -19.94614,-7.7117753 + 3384: -20.016611,-7.2975807 + 3385: -18.902029,-9.370498 + 3387: -19.318695,-8.485081 - node: color: '#FFFFFFFF' id: Bushj3 decals: - 3373: -4.6337833,10.114867 + 3371: -4.6337833,10.114867 - node: color: '#FFFFFFFF' id: Bushk1 decals: - 2643: 3.0091357,-5.795042 - 2988: -10.00542,5.191684 + 2641: 3.0091357,-5.795042 + 2986: -10.00542,5.191684 - node: color: '#FFFFFFFF' id: Bushk3 decals: - 2586: 15.903748,17.02583 - 2587: 18.067644,12.942497 - 2642: 4.8112187,-3.7846253 + 2584: 15.903748,17.02583 + 2585: 18.067644,12.942497 + 2640: 4.8112187,-3.7846253 - node: color: '#FFFFFFFF' id: Bushm1 decals: - 3477: 63.81363,-0.83854264 + 3475: 63.81363,-0.83854264 - node: color: '#FFFFFFFF' id: Bushm3 decals: - 3478: 64.29279,-0.73437595 + 3476: 64.29279,-0.73437595 - node: color: '#FFFFFFFF' id: Bushm4 decals: - 2667: -10.9586735,-6.0094166 - 2668: -11.224603,-5.736016 - 2669: -13.307937,-8.381849 - 2670: -14.067469,-7.593817 - 3479: 64.12612,-1.2864593 + 2665: -10.9586735,-6.0094166 + 2666: -11.224603,-5.736016 + 2667: -13.307937,-8.381849 + 2668: -14.067469,-7.593817 + 3477: 64.12612,-1.2864593 - node: color: '#FFFFFFFF' id: Bushn1 decals: - 1309: 58.021324,0.5489143 - 1310: 57.96924,-1.1594192 - 3378: 57.99387,-2.411529 + 1307: 58.021324,0.5489143 + 1308: 57.96924,-1.1594192 + 3376: 57.99387,-2.411529 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: Caution decals: - 3546: 56.20735,16.017925 + 3544: 56.20735,16.017925 - node: color: '#52B4E996' id: CheckerNWSE decals: - 2951: -19,-27 - 2952: -16,-27 - 2953: -22,-27 + 2949: -19,-27 + 2950: -16,-27 + 2951: -22,-27 - node: color: '#FFFFFFFF' id: ConcreteTrimCornerNe @@ -3181,33 +3192,33 @@ entities: decals: 30: -2,-2 31: -2,-2 - 3413: 2,4 - 3414: 3,3 - 3415: 4,2 + 3411: 2,4 + 3412: 3,3 + 3413: 4,2 - node: color: '#FFFFFFFF' id: ConcreteTrimInnerNw decals: 33: 2,-2 - 3410: -4,2 - 3411: -3,3 - 3412: -2,4 + 3408: -4,2 + 3409: -3,3 + 3410: -2,4 - node: color: '#FFFFFFFF' id: ConcreteTrimInnerSe decals: 29: -2,2 - 3407: 2,-4 - 3408: 3,-3 - 3409: 4,-2 + 3405: 2,-4 + 3406: 3,-3 + 3407: 4,-2 - node: color: '#FFFFFFFF' id: ConcreteTrimInnerSw decals: 32: 2,2 - 3404: -2,-4 - 3405: -3,-3 - 3406: -4,-2 + 3402: -2,-4 + 3403: -3,-3 + 3404: -4,-2 - node: color: '#FFFFFFFF' id: ConcreteTrimLineE @@ -3271,7 +3282,7 @@ entities: 95: -13,-2 96: -16,-2 97: -17,-2 - 3000: -14,-2 + 2998: -14,-2 - node: color: '#FFFFFFFF' id: ConcreteTrimLineS @@ -3302,8 +3313,8 @@ entities: 105: -8,2 106: -7,2 107: -6,2 - 3396: 11,2 - 3397: 14,2 + 3394: 11,2 + 3395: 14,2 - node: color: '#FFFFFFFF' id: ConcreteTrimLineW @@ -3333,348 +3344,350 @@ entities: 76: 2,-14 77: 2,-16 78: 2,-17 - 3402: 2,10 - 3403: 2,13 + 3400: 2,10 + 3401: 2,13 - node: color: '#FFFFFFFF' id: Delivery decals: - 1736: 50,-39 - 1737: 50,-38 - 1738: 50,-37 - 1739: 50,-36 + 1734: 50,-39 + 1735: 50,-38 + 1736: 50,-37 + 1737: 50,-36 - node: color: '#3EB38896' id: DiagonalCheckerAOverlay decals: - 3523: 12,23 - 3524: 13,22 - 3525: 13,23 - 3526: 14,23 - 3527: 15,23 - 3528: 15,22 - 3529: 14,22 - 3530: 14,21 - 3531: 13,21 - 3532: 12,20 - 3533: 13,20 - 3534: 14,20 - 3535: 15,20 - 3536: 15,21 - 3538: 12,21 - 3539: 12,22 + 3521: 12,23 + 3522: 13,22 + 3523: 13,23 + 3524: 14,23 + 3525: 15,23 + 3526: 15,22 + 3527: 14,22 + 3528: 14,21 + 3529: 13,21 + 3530: 12,20 + 3531: 13,20 + 3532: 14,20 + 3533: 15,20 + 3534: 15,21 + 3536: 12,21 + 3537: 12,22 - node: color: '#639137FF' id: DiagonalCheckerBOverlay decals: - 3510: 12,20 - 3511: 13,20 - 3512: 13,21 - 3513: 13,22 - 3514: 13,23 - 3515: 14,23 - 3516: 14,22 - 3517: 14,21 - 3518: 14,20 - 3519: 15,20 - 3520: 15,21 - 3521: 15,22 - 3522: 15,23 - 3537: 12,23 - 3540: 12,21 - 3541: 12,22 + 3508: 12,20 + 3509: 13,20 + 3510: 13,21 + 3511: 13,22 + 3512: 13,23 + 3513: 14,23 + 3514: 14,22 + 3515: 14,21 + 3516: 14,20 + 3517: 15,20 + 3518: 15,21 + 3519: 15,22 + 3520: 15,23 + 3535: 12,23 + 3538: 12,21 + 3539: 12,22 - node: color: '#D381C996' id: DiagonalOverlay decals: - 2240: -10,-49 - 2316: -10,-45 - 3381: 4,-47 - 3382: 4,-46 - 3383: -2,-47 - 3384: -6,-47 + 2238: -10,-49 + 2314: -10,-45 + 3379: 4,-47 + 3380: 4,-46 + 3381: -2,-47 + 3382: -6,-47 - node: color: '#DE3A3A96' id: DiagonalOverlay decals: - 1556: 51,-2 - 1557: 49,-2 - 1558: 49,-5 - 1559: 51,-5 - 1560: 29,-33 - 1561: 29,-32 - 1562: 39,-34 - 1563: 39,-32 - 1564: 41,-31 - 1565: 44,-37 - 1566: 41,-38 - 1567: 38,-41 - 2851: 41,-24 + 1554: 51,-2 + 1555: 49,-2 + 1556: 49,-5 + 1557: 51,-5 + 1558: 29,-33 + 1559: 29,-32 + 1560: 39,-34 + 1561: 39,-32 + 1562: 41,-31 + 1563: 44,-37 + 1564: 41,-38 + 1565: 38,-41 + 2849: 41,-24 - node: color: '#EFB34196' id: DiagonalOverlay decals: - 1822: 9,33 - 1823: 9,32 - 1824: 20,33 - 1825: 20,32 + 1820: 9,33 + 1821: 9,32 + 1822: 20,33 + 1823: 20,32 - node: color: '#FFFFFFFF' id: FlowersBROne decals: - 2749: 16.070688,16.03927 - 2780: 9.361443,4.4135666 - 2781: 8.71561,5.3614836 + 2747: 16.070688,16.03927 + 2778: 9.361443,4.4135666 + 2779: 8.71561,5.3614836 - node: color: '#FFFFFFFF' id: FlowersBRThree decals: - 2750: 17.062426,11.239492 - 2751: 10.321154,17.060677 - 2784: 7.6635256,6.1948166 - 2785: 8.538526,6.2989836 - 2820: 9.51524,6.327868 + 2748: 17.062426,11.239492 + 2749: 10.321154,17.060677 + 2782: 7.6635256,6.1948166 + 2783: 8.538526,6.2989836 + 2818: 9.51524,6.327868 - node: color: '#FFFFFFFF' id: FlowersBRTwo decals: - 2777: 10.111443,4.4344 - 2778: 8.663526,4.5594 - 2779: 8.05936,5.5073166 - 2821: 9.79649,6.7862015 + 2775: 10.111443,4.4344 + 2776: 8.663526,4.5594 + 2777: 8.05936,5.5073166 + 2819: 9.79649,6.7862015 - node: color: '#FFFFFFFF' id: Flowersbr1 decals: - 2746: 3.1090877,15.838451 - 2747: 15.10194,16.174686 + 2744: 3.1090877,15.838451 + 2745: 15.10194,16.174686 - node: color: '#FFFFFFFF' id: Flowersbr2 decals: - 2748: 15.393607,16.737186 - 2782: 9.49686,5.1010666 - 2783: 9.080193,5.7260666 - 2786: 10.324566,5.2335067 - 2808: 16.988474,10.508276 - 2809: 16.363474,10.747859 - 2810: 11.000941,16.992361 - 2811: 11.6309395,17.170504 - 2827: 7.8013525,4.69695 - 2828: 9.145103,3.603201 - 2829: 9.15132,6.0905905 + 2746: 15.393607,16.737186 + 2780: 9.49686,5.1010666 + 2781: 9.080193,5.7260666 + 2784: 10.324566,5.2335067 + 2806: 16.988474,10.508276 + 2807: 16.363474,10.747859 + 2808: 11.000941,16.992361 + 2809: 11.6309395,17.170504 + 2825: 7.8013525,4.69695 + 2826: 9.145103,3.603201 + 2827: 9.15132,6.0905905 - node: color: '#FFFFFFFF' id: Flowersbr3 decals: - 2819: 8.806907,6.8799515 + 2817: 8.806907,6.8799515 - node: color: '#FFFFFFFF' id: Flowerspv1 decals: - 2787: 15.255633,6.9409747 - 2788: 14.661882,7.545141 + 2785: 15.255633,6.9409747 + 2786: 14.661882,7.545141 - node: color: '#FFFFFFFF' id: Flowerspv2 decals: - 2789: 15.463966,7.690975 - 2791: 14.5844555,8.774308 - 2795: 14.978545,6.1768036 - 2796: 15.728544,6.3643036 - 2822: 14.814111,5.0989227 - 2823: 15.56411,4.4947557 - 2826: 12.9190645,9.799427 + 2787: 15.463966,7.690975 + 2789: 14.5844555,8.774308 + 2793: 14.978545,6.1768036 + 2794: 15.728544,6.3643036 + 2820: 14.814111,5.0989227 + 2821: 15.56411,4.4947557 + 2824: 12.9190645,9.799427 - node: color: '#FFFFFFFF' id: Flowerspv3 decals: - 2740: 8.013186,3.1140726 - 2741: 10.378889,-5.012858 - 2742: 10.274722,-4.383773 - 2790: 15.219872,8.347224 - 2792: 13.9177885,8.774308 - 2793: 13.252036,8.115639 - 2794: 13.134795,8.926804 - 2797: 16.103544,7.1143036 - 2798: 16.42646,6.1143036 - 2799: 15.748611,5.544657 - 2824: 14.501611,4.234339 - 2825: 13.6690645,9.570259 + 2738: 8.013186,3.1140726 + 2739: 10.378889,-5.012858 + 2740: 10.274722,-4.383773 + 2788: 15.219872,8.347224 + 2790: 13.9177885,8.774308 + 2791: 13.252036,8.115639 + 2792: 13.134795,8.926804 + 2795: 16.103544,7.1143036 + 2796: 16.42646,6.1143036 + 2797: 15.748611,5.544657 + 2822: 14.501611,4.234339 + 2823: 13.6690645,9.570259 - node: color: '#FFFFFFFF' id: Flowersy1 decals: - 2738: 7.160172,13.449887 - 2739: 5.483089,13.918637 - 2752: 12.341987,18.164845 - 2759: 4.084557,12.876521 - 2760: 6.313724,11.689021 - 2761: 9.0012245,11.564021 - 2767: 8.3553915,12.168188 - 2768: 6.730391,12.855688 - 2769: 5.105391,14.376521 - 2770: 2.9283073,14.741104 - 2772: 4.719974,13.105688 - 2773: 4.355391,14.585857 - 2774: 3.473161,14.394393 - 2775: 4.3585773,13.821476 - 2801: 2.299132,6.662748 - 2806: 4.7337813,6.6002483 - 2807: 4.5150313,6.0064983 + 2736: 7.160172,13.449887 + 2737: 5.483089,13.918637 + 2750: 12.341987,18.164845 + 2757: 4.084557,12.876521 + 2758: 6.313724,11.689021 + 2759: 9.0012245,11.564021 + 2765: 8.3553915,12.168188 + 2766: 6.730391,12.855688 + 2767: 5.105391,14.376521 + 2768: 2.9283073,14.741104 + 2770: 4.719974,13.105688 + 2771: 4.355391,14.585857 + 2772: 3.473161,14.394393 + 2773: 4.3585773,13.821476 + 2799: 2.299132,6.662748 + 2804: 4.7337813,6.6002483 + 2805: 4.5150313,6.0064983 - node: color: '#FFFFFFFF' id: Flowersy2 decals: - 2753: 14.633654,18.154427 - 2762: 7.6991415,11.939021 - 2763: 7.0533075,11.282771 - 2764: 8.1783085,11.241104 - 2802: 3.0178826,5.8710814 + 2751: 14.633654,18.154427 + 2760: 7.6991415,11.939021 + 2761: 7.0533075,11.282771 + 2762: 8.1783085,11.241104 + 2800: 3.0178826,5.8710814 - node: color: '#FFFFFFFF' id: Flowersy3 decals: - 2754: 13.227404,18.091927 - 2756: 11.914904,18.11276 - 2757: 11.914904,18.11276 - 2765: 6.938724,12.168188 - 2766: 7.6158075,12.918188 - 2776: 3.4939945,13.592309 - 2803: 3.1637156,6.5481644 - 2804: 3.7887158,5.704415 - 2805: 3.9108648,7.0273314 + 2752: 13.227404,18.091927 + 2754: 11.914904,18.11276 + 2755: 11.914904,18.11276 + 2763: 6.938724,12.168188 + 2764: 7.6158075,12.918188 + 2774: 3.4939945,13.592309 + 2801: 3.1637156,6.5481644 + 2802: 3.7887158,5.704415 + 2803: 3.9108648,7.0273314 - node: color: '#FFFFFFFF' id: Flowersy4 decals: - 2743: 3.8501334,-9.470912 - 2744: 4.3709664,-9.908412 - 2745: 3.6209664,-9.960495 - 2755: 13.966987,18.133595 - 2758: 15.123237,18.071095 - 2771: 5.136641,13.511938 - 2800: 2.2574656,5.8294144 - 2812: 9.849766,11.338729 - 2813: 9.047683,10.619978 - 2814: 4.7809443,7.692894 - 2815: 5.676778,7.797061 - 2816: 5.4059443,8.505394 - 2817: 5.8902392,6.890369 - 2818: 6.223573,8.400785 + 2741: 3.8501334,-9.470912 + 2742: 4.3709664,-9.908412 + 2743: 3.6209664,-9.960495 + 2753: 13.966987,18.133595 + 2756: 15.123237,18.071095 + 2769: 5.136641,13.511938 + 2798: 2.2574656,5.8294144 + 2810: 9.849766,11.338729 + 2811: 9.047683,10.619978 + 2812: 4.7809443,7.692894 + 2813: 5.676778,7.797061 + 2814: 5.4059443,8.505394 + 2815: 5.8902392,6.890369 + 2816: 6.223573,8.400785 - node: color: '#00BEBE7F' id: FullTileOverlayGreyscale decals: - 3173: -26,40 - 3174: -26,42 - 3175: -43,2 - 3176: -42,2 - 3177: -37,2 - 3178: -36,2 + 3171: -26,40 + 3172: -26,42 + 3173: -43,2 + 3174: -42,2 + 3175: -37,2 + 3176: -36,2 - node: color: '#334E6DC8' id: FullTileOverlayGreyscale decals: - 706: 21,3 - 707: 23,3 - 708: 25,3 - 808: -33,-9 - 809: -29,-9 - 2860: -23,-36 + 704: 21,3 + 705: 23,3 + 706: 25,3 + 806: -33,-9 + 807: -29,-9 + 2858: -23,-36 + 3612: 27,13 + 3613: 27,14 - node: color: '#373737FF' id: FullTileOverlayGreyscale decals: - 3416: 21,-19 - 3417: 20,-19 - 3418: 19,-19 - 3419: 19,-18 - 3420: 18,-19 - 3421: 18,-20 - 3422: 19,-20 - 3423: 19,-21 - 3424: 18,-21 - 3425: 21,-18 - 3426: 20,-18 - 3434: 17,-18 - 3435: 18,-17 - 3436: 21,-22 - 3437: 22,-21 + 3414: 21,-19 + 3415: 20,-19 + 3416: 19,-19 + 3417: 19,-18 + 3418: 18,-19 + 3419: 18,-20 + 3420: 19,-20 + 3421: 19,-21 + 3422: 18,-21 + 3423: 21,-18 + 3424: 20,-18 + 3432: 17,-18 + 3433: 18,-17 + 3434: 21,-22 + 3435: 22,-21 - node: color: '#4A35194C' id: FullTileOverlayGreyscale decals: - 2689: -22,3 - 2690: -21,3 - 2691: -20,3 - 2692: -19,3 - 2693: -19,4 - 2694: -19,5 - 2695: -19,6 - 2696: -19,7 - 2697: -19,8 - 2698: -19,9 - 2699: -19,10 - 2700: -20,10 - 2701: -20,9 - 2702: -20,8 - 2703: -20,7 - 2704: -20,6 - 2705: -20,5 - 2706: -20,4 - 2707: -21,4 - 2708: -22,4 - 2709: -22,5 - 2710: -21,5 - 2711: -21,6 - 2712: -22,6 - 2713: -22,7 - 2714: -21,7 - 2715: -21,8 - 2716: -22,8 - 2717: -22,9 - 2718: -21,9 - 2719: -21,10 - 2720: -22,10 + 2687: -22,3 + 2688: -21,3 + 2689: -20,3 + 2690: -19,3 + 2691: -19,4 + 2692: -19,5 + 2693: -19,6 + 2694: -19,7 + 2695: -19,8 + 2696: -19,9 + 2697: -19,10 + 2698: -20,10 + 2699: -20,9 + 2700: -20,8 + 2701: -20,7 + 2702: -20,6 + 2703: -20,5 + 2704: -20,4 + 2705: -21,4 + 2706: -22,4 + 2707: -22,5 + 2708: -21,5 + 2709: -21,6 + 2710: -22,6 + 2711: -22,7 + 2712: -21,7 + 2713: -21,8 + 2714: -22,8 + 2715: -22,9 + 2716: -21,9 + 2717: -21,10 + 2718: -22,10 - node: color: '#52B4E996' id: FullTileOverlayGreyscale decals: 244: -8,-39 245: -7,-39 - 530: -26,-27 - 531: -26,-28 - 532: -26,-29 - 533: -12,-30 - 534: -12,-29 - 535: -11,-29 - 550: -26,-41 - 735: -3,-37 - 736: -3,-36 - 818: -29,-6 - 819: -33,-6 - 927: -28,-29 - 928: -28,-28 - 929: -24,-29 - 930: -24,-28 + 528: -26,-27 + 529: -26,-28 + 530: -26,-29 + 531: -12,-30 + 532: -12,-29 + 533: -11,-29 + 548: -26,-41 + 733: -3,-37 + 734: -3,-36 + 816: -29,-6 + 817: -33,-6 + 925: -28,-29 + 926: -28,-28 + 927: -24,-29 + 928: -24,-28 - node: color: '#765428FF' id: FullTileOverlayGreyscale decals: - 3317: -55,-16 - 3318: -56,-16 + 3315: -55,-16 + 3316: -56,-16 - node: color: '#951710FF' id: FullTileOverlayGreyscale decals: - 2398: 43,37 - 2399: 43,38 - 2400: 43,39 - 2401: 43,40 - 2402: 43,41 - 2403: 43,36 - 2404: 43,42 + 2396: 43,37 + 2397: 43,38 + 2398: 43,39 + 2399: 43,40 + 2400: 43,41 + 2401: 43,36 + 2402: 43,42 - node: color: '#9FED5896' id: FullTileOverlayGreyscale @@ -3687,102 +3700,106 @@ entities: 193: -31,-17 263: -26,-14 474: -30,-22 - 814: -31,-9 - 815: -31,-4 + 812: -31,-9 + 813: -31,-4 - node: color: '#A4610696' id: FullTileOverlayGreyscale decals: - 812: -31,-8 - 813: -31,-5 + 810: -31,-8 + 811: -31,-5 - node: color: '#BC863FFF' id: FullTileOverlayGreyscale decals: - 3235: -48,-3 - 3236: -48,-4 - 3237: -52,-1 - 3238: -52,0 - 3349: -48,0 - 3350: -48,1 - 3351: -48,-1 - 3363: -51,-1 - 3364: -51,0 + 3233: -48,-3 + 3234: -48,-4 + 3235: -52,-1 + 3236: -52,0 + 3347: -48,0 + 3348: -48,1 + 3349: -48,-1 + 3361: -51,-1 + 3362: -51,0 - node: color: '#C6FF91FF' id: FullTileOverlayGreyscale decals: - 3018: -37,-35 - 3019: -37,-34 - 3020: -36,-34 - 3021: -35,-34 + 3016: -37,-35 + 3017: -37,-34 + 3018: -36,-34 + 3019: -35,-34 - node: color: '#D381C996' id: FullTileOverlayGreyscale decals: - 822: -29,-4 - 823: -33,-4 + 820: -29,-4 + 821: -33,-4 - node: color: '#D4D4D496' id: FullTileOverlayGreyscale decals: - 816: -29,-7 - 817: -33,-7 + 814: -29,-7 + 815: -33,-7 - node: color: '#DE3A3A96' id: FullTileOverlayGreyscale decals: - 820: -29,-5 - 821: -33,-5 - 2735: 56,-10 - 2736: 56,-11 - 2737: 56,-12 - 3390: 32,-10 - 3391: 38,-10 - 3392: 40,-10 + 818: -29,-5 + 819: -33,-5 + 2733: 56,-10 + 2734: 56,-11 + 2735: 56,-12 + 3388: 32,-10 + 3389: 38,-10 + 3390: 40,-10 - node: color: '#EFB34196' id: FullTileOverlayGreyscale decals: - 810: -29,-8 - 811: -33,-8 - 2886: -11,-39 - 2887: -19,-40 - 2932: -16,-38 + 808: -29,-8 + 809: -33,-8 + 2884: -11,-39 + 2885: -19,-40 + 2930: -16,-38 - node: color: '#FFFFFFFF' id: GrayConcreteTrimLineE decals: - 3393: 11,2 + 3391: 11,2 - node: color: '#FFFFFFFF' id: GrayConcreteTrimLineN decals: - 3400: 2,10 + 3398: 2,10 - node: color: '#FFFFFFFF' id: GrayConcreteTrimLineS decals: - 3395: 12.501469,3.9993005 - 3398: 2,13 - 3399: 2,13 + 3393: 12.501469,3.9993005 + 3396: 2,13 + 3397: 2,13 - node: color: '#FFFFFFFF' id: GrayConcreteTrimLineW decals: - 3394: 14,2 - 3401: 4.001555,11.500919 + 3392: 14,2 + 3399: 4.001555,11.500919 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale decals: - 593: 20,9 - 594: 21,9 - 595: 21,9 - 596: 22,9 - 597: 22,9 - 598: 25,9 - 622: 26,9 + 591: 20,9 + 592: 21,9 + 593: 21,9 + 594: 22,9 + 595: 22,9 + 596: 25,9 + 620: 26,9 + 3585: 22,18 + 3586: 23,18 + 3587: 24,18 + 3588: 25,18 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale @@ -3795,18 +3812,18 @@ entities: 332: -17,-33 333: -16,-33 334: -15,-33 - 537: -13,-29 - 549: -26,-42 + 535: -13,-29 + 547: -26,-42 - node: color: '#639137FF' id: HalfTileOverlayGreyscale decals: - 640: 4,24 - 641: 5,24 - 642: 6,24 - 643: 7,24 - 644: 8,24 - 645: 9,24 + 638: 4,24 + 639: 5,24 + 640: 6,24 + 641: 7,24 + 642: 8,24 + 643: 9,24 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale @@ -3825,35 +3842,37 @@ entities: color: '#C6FF91FF' id: HalfTileOverlayGreyscale decals: - 3022: -36,-31 - 3023: -37,-31 - 3024: -38,-31 + 3020: -36,-31 + 3021: -37,-31 + 3022: -38,-31 - node: color: '#D381C996' id: HalfTileOverlayGreyscale decals: - 830: -13,-50 - 831: -12,-50 - 2957: 15,-42 + 828: -13,-50 + 829: -12,-50 + 2955: 15,-42 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale decals: - 1435: 45,-15 - 1436: 44,-15 - 1437: 43,-15 - 1438: 42,-15 - 1439: 41,-15 + 1433: 45,-15 + 1434: 44,-15 + 1435: 43,-15 + 1436: 42,-15 + 1437: 41,-15 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale180 decals: - 588: 20,4 - 589: 20,4 - 590: 21,4 - 591: 22,4 - 592: 25,4 - 623: 26,4 + 586: 20,4 + 587: 20,4 + 588: 21,4 + 589: 22,4 + 590: 25,4 + 621: 26,4 + 3589: 23,11 + 3590: 24,11 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale180 @@ -3864,26 +3883,26 @@ entities: 340: -18,-36 341: -20,-36 342: -19,-36 - 536: -13,-28 - 548: -26,-40 + 534: -13,-28 + 546: -26,-40 - node: color: '#639137FF' id: HalfTileOverlayGreyscale180 decals: - 632: 8,22 - 633: 7,22 - 634: 7,22 - 635: 6,22 - 636: 5,22 - 646: 4,19 - 647: 5,19 - 648: 6,19 - 649: 7,19 - 650: 7,19 - 651: 8,19 - 652: 9,19 - 665: 5,23 - 666: 8,23 + 630: 8,22 + 631: 7,22 + 632: 7,22 + 633: 6,22 + 634: 5,22 + 644: 4,19 + 645: 5,19 + 646: 6,19 + 647: 7,19 + 648: 7,19 + 649: 8,19 + 650: 9,19 + 663: 5,23 + 664: 8,23 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale180 @@ -3901,33 +3920,38 @@ entities: color: '#C6FF91FF' id: HalfTileOverlayGreyscale180 decals: - 3017: -38,-35 + 3015: -38,-35 - node: color: '#D381C996' id: HalfTileOverlayGreyscale180 decals: - 824: -13,-48 - 825: -12,-48 - 2958: 15,-39 + 822: -13,-48 + 823: -12,-48 + 2956: 15,-39 - node: color: '#1E5026FF' id: HalfTileOverlayGreyscale270 decals: - 2412: 42,36 - 2413: 42,37 - 2414: 42,38 - 2415: 42,39 - 2416: 42,40 - 2417: 42,41 - 2418: 42,42 + 2410: 42,36 + 2411: 42,37 + 2412: 42,38 + 2413: 42,39 + 2414: 42,40 + 2415: 42,41 + 2416: 42,42 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale270 decals: - 584: 19,5 - 585: 19,6 - 586: 19,7 - 587: 19,8 + 582: 19,5 + 583: 19,6 + 584: 19,7 + 585: 19,8 + 3580: 21,13 + 3581: 21,14 + 3582: 21,15 + 3583: 21,16 + 3584: 21,17 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale270 @@ -3944,32 +3968,32 @@ entities: 257: -8,-34 327: -21,-34 328: -21,-35 - 541: -11,-28 - 542: -11,-27 - 543: -11,-26 - 547: -11,-25 + 539: -11,-28 + 540: -11,-27 + 541: -11,-26 + 545: -11,-25 - node: color: '#639137FF' id: HalfTileOverlayGreyscale270 decals: - 631: 9,21 - 653: 3,20 - 654: 3,21 - 655: 3,22 - 656: 3,23 - 667: 7,20 - 670: 7,21 + 629: 9,21 + 651: 3,20 + 652: 3,21 + 653: 3,22 + 654: 3,23 + 665: 7,20 + 668: 7,21 - node: color: '#951710FF' id: HalfTileOverlayGreyscale270 decals: - 2426: 44,36 - 2427: 44,37 - 2428: 44,38 - 2429: 44,39 - 2430: 44,40 - 2431: 44,41 - 2432: 44,42 + 2424: 44,36 + 2425: 44,37 + 2426: 44,38 + 2427: 44,39 + 2428: 44,40 + 2429: 44,41 + 2430: 44,42 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale270 @@ -3985,32 +4009,39 @@ entities: color: '#C6FF91FF' id: HalfTileOverlayGreyscale270 decals: - 3026: -39,-32 - 3027: -39,-33 - 3028: -39,-34 + 3024: -39,-32 + 3025: -39,-33 + 3026: -39,-34 - node: color: '#D381C996' id: HalfTileOverlayGreyscale270 decals: - 829: -13,-49 + 827: -13,-49 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale270 decals: - 2730: 57,-12 - 2731: 57,-11 - 2732: 57,-10 + 2728: 57,-12 + 2729: 57,-11 + 2730: 57,-10 - node: color: '#1E5026FF' id: HalfTileOverlayGreyscale90 decals: - 2405: 44,36 - 2406: 44,37 - 2407: 44,38 - 2408: 44,39 - 2409: 44,40 - 2410: 44,41 - 2411: 44,42 + 2403: 44,36 + 2404: 44,37 + 2405: 44,38 + 2406: 44,39 + 2407: 44,40 + 2408: 44,41 + 2409: 44,42 + - node: + color: '#334E6DC8' + id: HalfTileOverlayGreyscale90 + decals: + 3591: 26,15 + 3592: 26,16 + 3593: 26,17 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale90 @@ -4021,31 +4052,31 @@ entities: 255: -10,-34 335: -14,-34 336: -14,-35 - 544: -12,-27 - 545: -12,-26 - 546: -12,-25 + 542: -12,-27 + 543: -12,-26 + 544: -12,-25 - node: color: '#639137FF' id: HalfTileOverlayGreyscale90 decals: - 637: 4,21 - 657: 10,20 - 658: 10,21 - 659: 10,22 - 660: 10,23 - 668: 6,20 - 669: 6,21 + 635: 4,21 + 655: 10,20 + 656: 10,21 + 657: 10,22 + 658: 10,23 + 666: 6,20 + 667: 6,21 - node: color: '#951710FF' id: HalfTileOverlayGreyscale90 decals: - 2419: 42,36 - 2420: 42,37 - 2421: 42,38 - 2422: 42,39 - 2423: 42,40 - 2424: 42,41 - 2425: 42,42 + 2417: 42,36 + 2418: 42,37 + 2419: 42,38 + 2420: 42,39 + 2421: 42,40 + 2422: 42,41 + 2423: 42,42 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale90 @@ -4059,238 +4090,238 @@ entities: color: '#D381C996' id: HalfTileOverlayGreyscale90 decals: - 828: -12,-49 + 826: -12,-49 - node: color: '#EFB34196' id: MiniTileCornerOverlayNE decals: - 2881: -14,-40 + 2879: -14,-40 - node: color: '#EFB34196' id: MiniTileCornerOverlayNW decals: - 2878: -16,-40 + 2876: -16,-40 - node: color: '#EFB34196' id: MiniTileCornerOverlaySE decals: - 2879: -14,-42 + 2877: -14,-42 - node: color: '#EFB34196' id: MiniTileCornerOverlaySW decals: - 2880: -16,-42 + 2878: -16,-42 - node: color: '#DE3A3A96' id: MiniTileInnerOverlaySE decals: - 2830: 36,-13 + 2828: 36,-13 - node: color: '#EFB34196' id: MiniTileLineOverlayE decals: - 2883: -14,-41 + 2881: -14,-41 - node: color: '#DE3A3A96' id: MiniTileLineOverlayN decals: - 2729: 55,-10 + 2727: 55,-10 - node: color: '#EFB34196' id: MiniTileLineOverlayN decals: - 2882: -15,-40 + 2880: -15,-40 - node: color: '#DE3A3A96' id: MiniTileLineOverlayS decals: - 2728: 55,-12 + 2726: 55,-12 - node: color: '#EFB34196' id: MiniTileLineOverlayS decals: - 2885: -15,-42 + 2883: -15,-42 - node: color: '#EFB34196' id: MiniTileLineOverlayW decals: - 2884: -16,-41 + 2882: -16,-41 - node: color: '#D4D4D496' id: MiniTileOverlay decals: - 1751: 46,-35 - 1752: 46,-41 + 1749: 46,-35 + 1750: 46,-41 - node: color: '#FFFFFFFF' id: MiniTileOverlay decals: - 1753: 6,39 + 1751: 6,39 - node: color: '#FFFFFFFF' id: MiniTileSteelCornerNe decals: - 1741: 48,-36 + 1739: 48,-36 - node: color: '#FFFFFFFF' id: MiniTileSteelCornerNw decals: - 1742: 45,-36 + 1740: 45,-36 - node: color: '#FFFFFFFF' id: MiniTileSteelCornerSe decals: - 1740: 48,-39 - 1744: 47,-40 + 1738: 48,-39 + 1742: 47,-40 - node: color: '#FFFFFFFF' id: MiniTileSteelCornerSw decals: - 1743: 45,-40 + 1741: 45,-40 - node: color: '#FFFFFFFF' id: MiniTileSteelLineN decals: - 1745: 46,-36 - 1746: 47,-36 + 1743: 46,-36 + 1744: 47,-36 - node: color: '#FFFFFFFF' id: MiniTileSteelLineS decals: - 1747: 46,-40 + 1745: 46,-40 - node: color: '#FFFFFFFF' id: MiniTileSteelLineW decals: - 1748: 45,-39 - 1749: 45,-38 - 1750: 45,-37 + 1746: 45,-39 + 1747: 45,-38 + 1748: 45,-37 - node: color: '#334E6DC8' id: MiniTileWhiteCornerNe decals: - 989: -52,-9 + 987: -52,-9 - node: color: '#A4610696' id: MiniTileWhiteCornerNe decals: - 1004: -57,-3 - 1007: -57,-3 + 1002: -57,-3 + 1005: -57,-3 - node: color: '#BC863FBF' id: MiniTileWhiteCornerNe decals: - 960: -57,-18 + 958: -57,-18 - node: color: '#EFB34196' id: MiniTileWhiteCornerNe decals: - 2923: -11,-42 - 2924: -12,-39 + 2921: -11,-42 + 2922: -12,-39 - node: color: '#FFFFFFFF' id: MiniTileWhiteCornerNe decals: 441: -15,-34 - 2891: -12,-39 - 2892: -11,-42 + 2889: -12,-39 + 2890: -11,-42 - node: color: '#A4610696' id: MiniTileWhiteCornerNw decals: - 1005: -58,-3 - 1006: -58,-3 + 1003: -58,-3 + 1004: -58,-3 - node: color: '#BC863FBF' id: MiniTileWhiteCornerNw decals: - 959: -58,-18 + 957: -58,-18 - node: color: '#EFB34196' id: MiniTileWhiteCornerNw decals: - 2925: -18,-39 + 2923: -18,-39 - node: color: '#FFFFFFFF' id: MiniTileWhiteCornerNw decals: 440: -20,-34 - 2890: -18,-39 + 2888: -18,-39 - node: color: '#334E6DC8' id: MiniTileWhiteCornerSe decals: - 988: -52,-11 + 986: -52,-11 - node: color: '#A4610696' id: MiniTileWhiteCornerSe decals: - 1002: -57,-5 - 1008: -57,-5 + 1000: -57,-5 + 1006: -57,-5 - node: color: '#BC863FBF' id: MiniTileWhiteCornerSe decals: - 957: -57,-20 + 955: -57,-20 - node: color: '#EFB34196' id: MiniTileWhiteCornerSe decals: - 2922: -11,-43 + 2920: -11,-43 - node: color: '#FFFFFFFF' id: MiniTileWhiteCornerSe decals: 438: -15,-35 - 2888: -11,-43 + 2886: -11,-43 - node: color: '#A4610696' id: MiniTileWhiteCornerSw decals: - 1003: -58,-5 - 1009: -58,-5 + 1001: -58,-5 + 1007: -58,-5 - node: color: '#BC863FBF' id: MiniTileWhiteCornerSw decals: - 958: -58,-20 + 956: -58,-20 - node: color: '#EFB34196' id: MiniTileWhiteCornerSw decals: - 2921: -18,-43 + 2919: -18,-43 - node: color: '#FFFFFFFF' id: MiniTileWhiteCornerSw decals: 439: -20,-35 - 2889: -18,-43 + 2887: -18,-43 - node: color: '#D381C996' id: MiniTileWhiteInnerNe decals: - 3385: -7,-48 + 3383: -7,-48 - node: color: '#DE3A3A96' id: MiniTileWhiteInnerNe decals: - 3380: 42,-39 + 3378: 42,-39 - node: color: '#EFB34196' id: MiniTileWhiteInnerNe decals: - 2931: -12,-42 + 2929: -12,-42 - node: color: '#FFFFFFFF' id: MiniTileWhiteInnerNe decals: 434: -21,-36 - 2909: -12,-42 + 2907: -12,-42 - node: color: '#DE3A3A96' id: MiniTileWhiteInnerNw decals: - 3379: 42,-39 + 3377: 42,-39 - node: color: '#FFFFFFFF' id: MiniTileWhiteInnerNw @@ -4311,24 +4342,24 @@ entities: color: '#334E6DC8' id: MiniTileWhiteLineE decals: - 987: -52,-10 + 985: -52,-10 - node: color: '#A4610696' id: MiniTileWhiteLineE decals: - 1012: -57,-4 - 1013: -57,-4 + 1010: -57,-4 + 1011: -57,-4 - node: color: '#BC863FBF' id: MiniTileWhiteLineE decals: - 962: -57,-19 + 960: -57,-19 - node: color: '#EFB34196' id: MiniTileWhiteLineE decals: - 2929: -12,-41 - 2930: -12,-40 + 2927: -12,-41 + 2928: -12,-40 - node: color: '#FFFFFFFF' id: MiniTileWhiteLineE @@ -4336,17 +4367,17 @@ entities: 425: -21,-34 426: -21,-34 427: -21,-35 - 2898: -12,-40 - 2899: -12,-41 + 2896: -12,-40 + 2897: -12,-41 - node: color: '#EFB34196' id: MiniTileWhiteLineN decals: - 2910: -17,-39 - 2911: -16,-39 - 2912: -15,-39 - 2913: -14,-39 - 2914: -13,-39 + 2908: -17,-39 + 2909: -16,-39 + 2910: -15,-39 + 2911: -14,-39 + 2912: -13,-39 - node: color: '#FFFFFFFF' id: MiniTileWhiteLineN @@ -4361,21 +4392,21 @@ entities: 443: -18,-34 444: -17,-34 445: -16,-34 - 2893: -17,-39 - 2894: -16,-39 - 2895: -15,-39 - 2896: -14,-39 - 2897: -13,-39 + 2891: -17,-39 + 2892: -16,-39 + 2893: -15,-39 + 2894: -14,-39 + 2895: -13,-39 - node: color: '#EFB34196' id: MiniTileWhiteLineS decals: - 2915: -12,-43 - 2916: -13,-43 - 2917: -14,-43 - 2918: -15,-43 - 2919: -16,-43 - 2920: -17,-43 + 2913: -12,-43 + 2914: -13,-43 + 2915: -14,-43 + 2916: -15,-43 + 2917: -16,-43 + 2918: -17,-43 - node: color: '#FFFFFFFF' id: MiniTileWhiteLineS @@ -4390,39 +4421,39 @@ entities: 447: -17,-35 448: -18,-35 449: -19,-35 - 2900: -12,-43 - 2901: -13,-43 - 2902: -14,-43 - 2903: -15,-43 - 2904: -16,-43 - 2905: -17,-43 + 2898: -12,-43 + 2899: -13,-43 + 2900: -14,-43 + 2901: -15,-43 + 2902: -16,-43 + 2903: -17,-43 - node: color: '#A4610696' id: MiniTileWhiteLineW decals: - 1010: -58,-4 - 1011: -58,-4 + 1008: -58,-4 + 1009: -58,-4 - node: color: '#BC863FBF' id: MiniTileWhiteLineW decals: - 961: -58,-19 + 959: -58,-19 - node: color: '#EFB34196' id: MiniTileWhiteLineW decals: - 2926: -18,-40 - 2927: -18,-41 - 2928: -18,-42 + 2924: -18,-40 + 2925: -18,-41 + 2926: -18,-42 - node: color: '#FFFFFFFF' id: MiniTileWhiteLineW decals: 417: -14,-35 418: -14,-34 - 2906: -18,-42 - 2907: -18,-41 - 2908: -18,-40 + 2904: -18,-42 + 2905: -18,-41 + 2906: -18,-40 - node: color: '#FFFFFFFF' id: OldConcreteTrimInnerNe @@ -4486,53 +4517,53 @@ entities: color: '#D4D4D428' id: PavementOverlay decals: - 1366: 44,-21 - 1367: 45,-21 - 1368: 46,-21 - 1369: 46,-22 - 1370: 45,-22 - 1371: 44,-22 - 1372: 48,-21 - 1373: 49,-21 - 1374: 50,-21 - 1375: 50,-22 - 1376: 49,-22 - 1377: 48,-22 - 1378: 52,-21 - 1379: 53,-21 - 1380: 54,-21 - 1381: 54,-22 - 1382: 53,-22 - 1383: 52,-22 - 3459: 42,-12 - 3460: 44,-12 - 3461: 44,-13 - 3462: 43,-13 - 3463: 41,-12 - 3464: 41,-14 - 3465: 42,-13 - 3466: 41,-13 - 3467: 42,-14 - 3468: 43,-14 - 3469: 44,-14 - 3470: 45,-14 - 3471: 45,-13 - 3472: 45,-12 - 3473: 43,-12 + 1364: 44,-21 + 1365: 45,-21 + 1366: 46,-21 + 1367: 46,-22 + 1368: 45,-22 + 1369: 44,-22 + 1370: 48,-21 + 1371: 49,-21 + 1372: 50,-21 + 1373: 50,-22 + 1374: 49,-22 + 1375: 48,-22 + 1376: 52,-21 + 1377: 53,-21 + 1378: 54,-21 + 1379: 54,-22 + 1380: 53,-22 + 1381: 52,-22 + 3457: 42,-12 + 3458: 44,-12 + 3459: 44,-13 + 3460: 43,-13 + 3461: 41,-12 + 3462: 41,-14 + 3463: 42,-13 + 3464: 41,-13 + 3465: 42,-14 + 3466: 43,-14 + 3467: 44,-14 + 3468: 45,-14 + 3469: 45,-13 + 3470: 45,-12 + 3471: 43,-12 - node: color: '#1D1D21FF' id: QuarterTileOverlayGreyscale decals: - 2433: 43,37 - 2436: 44,41 + 2431: 43,37 + 2434: 44,41 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale decals: - 1344: 30,-3 - 1348: 30,-8 - 1351: 30,-5 - 1352: 30,-6 + 1342: 30,-3 + 1346: 30,-8 + 1349: 30,-5 + 1350: 30,-6 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale @@ -4586,19 +4617,19 @@ entities: 394: -22,-28 395: -19,-28 396: -16,-28 - 520: -31,-32 - 521: -31,-31 - 524: -31,-33 - 525: -22,-36 - 529: -24,-29 - 538: -14,-29 - 554: -25,-42 - 570: -12,-31 - 737: -2,-37 - 3029: -36,-33 - 3033: -37,-33 - 3037: -35,-33 - 3039: -34,-33 + 518: -31,-32 + 519: -31,-31 + 522: -31,-33 + 523: -22,-36 + 527: -24,-29 + 536: -14,-29 + 552: -25,-42 + 568: -12,-31 + 735: -2,-37 + 3027: -36,-33 + 3031: -37,-33 + 3035: -35,-33 + 3037: -34,-33 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale @@ -4608,168 +4639,169 @@ entities: color: '#D381C996' id: QuarterTileOverlayGreyscale decals: - 832: -11,-50 + 830: -11,-50 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale decals: - 1018: -48,-2 - 1020: -48,3 - 1055: -33,-2 - 1120: -1,18 - 1121: -1,19 - 1122: -1,20 - 1123: -1,21 - 1124: -1,22 - 1125: -1,23 - 1126: -1,24 - 1127: -1,25 - 1128: -1,29 - 1129: -1,30 - 1130: -2,31 - 1131: -2,32 - 1132: -2,33 - 1133: -2,34 - 1134: -2,35 - 1135: -2,36 - 1136: -2,37 - 1137: -2,38 - 1152: -13,53 - 1154: -12,53 - 1155: -11,53 - 1156: -10,53 - 1157: -9,53 - 1162: -8,50 - 1163: -7,50 - 1164: -6,50 - 1165: -5,50 - 1166: -5,50 - 1167: -4,50 - 1168: -3,50 - 1169: -3,51 - 1170: -3,52 - 1171: -3,53 - 1172: -2,53 - 1173: -1,53 - 1174: 0,53 - 1176: 1,53 - 1218: -2,26 - 1219: -2,27 - 1220: -2,27 - 1221: -2,28 - 1257: 53,1 - 1258: 53,2 - 1259: 54,3 - 1260: 55,4 - 1261: 56,5 - 1302: 45,-3 - 1303: 45,-2 - 1315: 59,-3 - 1329: 57,5 - 1330: 58,5 - 1331: 59,5 - 1332: 60,5 - 1333: 61,5 - 1339: 62,0 - 1933: 3,-83 - 1934: 3,-82 - 1935: 3,-81 - 1936: 3,-80 - 1937: 3,-79 - 1938: 3,-78 - 1939: 3,-77 - 1940: 3,-76 - 1941: 3,-75 - 1942: 3,-74 - 1943: 3,-73 - 1944: 3,-72 - 1945: 3,-71 - 1946: 3,-70 - 1947: 3,-69 - 1948: 3,-68 - 1949: 3,-67 - 1950: 3,-66 - 1951: 3,-65 - 1952: 3,-64 - 1987: -10,-81 - 1988: -10,-80 - 1989: -10,-79 - 1990: -10,-78 - 1991: -11,-77 - 1992: -11,-76 - 1993: -11,-75 - 1994: -11,-75 - 1995: -10,-75 - 1996: -10,-74 - 1997: -10,-73 - 1998: -10,-72 - 1999: -10,-71 - 2000: -11,-70 - 2001: -11,-69 - 2002: -11,-68 - 2003: -10,-68 - 2004: -10,-67 - 2005: -10,-66 - 2006: -10,-65 - 2007: -10,-64 - 2008: -10,-63 - 2009: -10,-62 - 2010: -10,-61 - 2011: -10,-60 - 2012: -10,-59 - 2013: -10,-58 - 2014: -10,-57 - 2015: -9,-57 - 2016: -1,-57 - 2017: -1,-56 - 2018: -1,-55 - 2019: -1,-54 - 2020: -1,-53 - 2021: -1,-52 - 2022: -1,-51 - 2023: -1,-50 - 2024: -1,-49 - 2025: -1,-46 - 2026: -1,-45 - 2027: -1,-44 - 2028: -1,-43 - 2029: -1,-42 - 2030: -1,-41 - 2350: -1,-47 - 2351: -1,-48 + 1016: -48,-2 + 1018: -48,3 + 1053: -33,-2 + 1118: -1,18 + 1119: -1,19 + 1120: -1,20 + 1121: -1,21 + 1122: -1,22 + 1123: -1,23 + 1124: -1,24 + 1125: -1,25 + 1126: -1,29 + 1127: -1,30 + 1128: -2,31 + 1129: -2,32 + 1130: -2,33 + 1131: -2,34 + 1132: -2,35 + 1133: -2,36 + 1134: -2,37 + 1135: -2,38 + 1150: -13,53 + 1152: -12,53 + 1153: -11,53 + 1154: -10,53 + 1155: -9,53 + 1160: -8,50 + 1161: -7,50 + 1162: -6,50 + 1163: -5,50 + 1164: -5,50 + 1165: -4,50 + 1166: -3,50 + 1167: -3,51 + 1168: -3,52 + 1169: -3,53 + 1170: -2,53 + 1171: -1,53 + 1172: 0,53 + 1174: 1,53 + 1216: -2,26 + 1217: -2,27 + 1218: -2,27 + 1219: -2,28 + 1255: 53,1 + 1256: 53,2 + 1257: 54,3 + 1258: 55,4 + 1259: 56,5 + 1300: 45,-3 + 1301: 45,-2 + 1313: 59,-3 + 1327: 57,5 + 1328: 58,5 + 1329: 59,5 + 1330: 60,5 + 1331: 61,5 + 1337: 62,0 + 1931: 3,-83 + 1932: 3,-82 + 1933: 3,-81 + 1934: 3,-80 + 1935: 3,-79 + 1936: 3,-78 + 1937: 3,-77 + 1938: 3,-76 + 1939: 3,-75 + 1940: 3,-74 + 1941: 3,-73 + 1942: 3,-72 + 1943: 3,-71 + 1944: 3,-70 + 1945: 3,-69 + 1946: 3,-68 + 1947: 3,-67 + 1948: 3,-66 + 1949: 3,-65 + 1950: 3,-64 + 1985: -10,-81 + 1986: -10,-80 + 1987: -10,-79 + 1988: -10,-78 + 1989: -11,-77 + 1990: -11,-76 + 1991: -11,-75 + 1992: -11,-75 + 1993: -10,-75 + 1994: -10,-74 + 1995: -10,-73 + 1996: -10,-72 + 1997: -10,-71 + 1998: -11,-70 + 1999: -11,-69 + 2000: -11,-68 + 2001: -10,-68 + 2002: -10,-67 + 2003: -10,-66 + 2004: -10,-65 + 2005: -10,-64 + 2006: -10,-63 + 2007: -10,-62 + 2008: -10,-61 + 2009: -10,-60 + 2010: -10,-59 + 2011: -10,-58 + 2012: -10,-57 + 2013: -9,-57 + 2014: -1,-57 + 2015: -1,-56 + 2016: -1,-55 + 2017: -1,-54 + 2018: -1,-53 + 2019: -1,-52 + 2020: -1,-51 + 2021: -1,-50 + 2022: -1,-49 + 2023: -1,-46 + 2024: -1,-45 + 2025: -1,-44 + 2026: -1,-43 + 2027: -1,-42 + 2028: -1,-41 + 2348: -1,-47 + 2349: -1,-48 - node: color: '#D4D4D433' id: QuarterTileOverlayGreyscale decals: - 3139: 0,48 - 3140: 0,47 - 3141: 0,46 - 3142: 0,45 - 3143: 0,44 - 3144: 0,43 - 3145: 0,42 - 3146: 0,41 - 3147: 0,40 - 3148: 0,38 - 3149: 0,39 - 3150: -1,38 + 3137: 0,48 + 3138: 0,47 + 3139: 0,46 + 3140: 0,45 + 3141: 0,44 + 3142: 0,43 + 3143: 0,42 + 3144: 0,41 + 3145: 0,40 + 3146: 0,38 + 3147: 0,39 + 3148: -1,38 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale decals: - 2734: 57,-13 + 2732: 57,-13 - node: color: '#1D1D21FF' id: QuarterTileOverlayGreyscale180 decals: - 2434: 43,39 - 2437: 43,36 + 2432: 43,39 + 2435: 43,36 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale180 decals: - 630: 27,5 - 1346: 33,-9 + 628: 27,5 + 1344: 33,-9 + 3598: 25,12 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale180 @@ -4820,305 +4852,306 @@ entities: 381: -16,-28 382: -15,-28 391: -19,-28 - 522: -31,-31 - 523: -31,-33 - 526: -22,-36 - 527: -22,-35 - 528: -24,-28 - 539: -14,-28 - 551: -27,-40 - 569: -12,-31 - 581: -12,-33 - 3030: -36,-32 - 3031: -37,-32 - 3032: -38,-32 - 3038: -35,-32 - 3040: -34,-32 + 520: -31,-31 + 521: -31,-33 + 524: -22,-36 + 525: -22,-35 + 526: -24,-28 + 537: -14,-28 + 549: -27,-40 + 567: -12,-31 + 579: -12,-33 + 3028: -36,-32 + 3029: -37,-32 + 3030: -38,-32 + 3036: -35,-32 + 3038: -34,-32 - node: color: '#639137FF' id: QuarterTileOverlayGreyscale180 decals: - 639: 4,22 + 637: 4,22 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale180 decals: - 826: -14,-48 + 824: -14,-48 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale180 decals: - 1041: -18,-1 - 1042: -19,-1 - 1043: -20,-1 - 1044: -21,-1 - 1045: -22,-1 - 1046: -23,-1 - 1047: -27,-1 - 1048: -28,-1 - 1049: -29,-1 - 1050: -29,-2 - 1051: -31,-2 - 1053: -33,-2 - 1056: -34,-1 - 1057: -35,-1 - 1058: -36,-1 - 1059: -37,-1 - 1060: -38,-1 - 1061: -39,-1 - 1062: -40,-1 - 1063: -41,-1 - 1064: -41,-2 - 1065: -41,-3 - 1066: -41,-4 - 1067: -41,-5 - 1068: -41,-6 - 1069: -41,-7 - 1070: -41,-8 - 1071: -41,-9 - 1072: -41,-10 - 1073: -41,-13 - 1074: -41,-14 - 1075: -41,-15 - 1076: -41,-16 - 1077: -41,-17 - 1078: -41,-18 - 1079: -41,-19 - 1080: -41,-20 - 1081: -41,-21 - 1082: -41,-22 - 1083: -41,-23 - 1084: -41,-24 - 1085: -41,-25 - 1086: -41,-26 - 1087: -41,-27 - 1088: -41,-28 - 1089: -41,-29 - 1090: -41,-30 - 1091: -41,-31 - 1092: -43,-31 - 1159: -9,53 - 1160: -9,52 - 1161: -9,51 - 1177: 1,53 - 1202: 2,31 - 1205: -2,31 - 1268: 52,-1 - 1269: 51,-1 - 1270: 50,-1 - 1271: 49,-1 - 1272: 48,-1 - 1273: 47,-2 - 1274: 47,-3 - 1275: 46,-3 - 1276: 44,-1 - 1277: 42,-1 - 1278: 39,-1 - 1279: 38,-1 - 1280: 37,-1 - 1281: 36,-1 - 1282: 35,-1 - 1283: 34,-1 - 1284: 33,-1 - 1285: 32,-1 - 1286: 31,-1 - 1287: 29,-1 - 1288: 28,-2 - 1289: 27,-2 - 1290: 26,-2 - 1291: 25,-1 - 1292: 24,-1 - 1293: 23,-1 - 1294: 22,-1 - 1295: 21,-1 - 1296: 20,-1 - 1297: 19,-1 - 1298: 18,-1 - 1301: 45,-3 - 1316: 57,2 - 1317: 57,1 - 1318: 57,0 - 1319: 57,-1 - 1334: 61,5 - 1335: 61,4 - 1336: 61,3 - 1337: 61,2 - 1338: 61,1 - 1342: 62,-1 - 1343: 30,-1 - 1884: 1,-19 - 1885: 1,-20 - 1886: 1,-18 - 1887: 1,-21 - 1888: 1,-22 - 1889: 1,-23 - 1890: 2,-26 - 1891: 2,-28 - 1892: 1,-29 - 1893: 1,-30 - 1894: 1,-31 - 1895: 1,-32 - 1931: 4,-83 - 1932: 3,-83 - 1953: 2,-63 - 1954: 1,-63 - 1955: 0,-63 - 1956: -1,-63 - 1957: -2,-63 - 1964: -3,-63 - 2042: 1,-33 - 2043: 1,-34 - 2044: 1,-35 - 2045: 1,-36 - 2046: 1,-37 - 2047: 1,-38 - 2048: 1,-39 - 2049: 1,-40 - 2069: 1,-25 + 1039: -18,-1 + 1040: -19,-1 + 1041: -20,-1 + 1042: -21,-1 + 1043: -22,-1 + 1044: -23,-1 + 1045: -27,-1 + 1046: -28,-1 + 1047: -29,-1 + 1048: -29,-2 + 1049: -31,-2 + 1051: -33,-2 + 1054: -34,-1 + 1055: -35,-1 + 1056: -36,-1 + 1057: -37,-1 + 1058: -38,-1 + 1059: -39,-1 + 1060: -40,-1 + 1061: -41,-1 + 1062: -41,-2 + 1063: -41,-3 + 1064: -41,-4 + 1065: -41,-5 + 1066: -41,-6 + 1067: -41,-7 + 1068: -41,-8 + 1069: -41,-9 + 1070: -41,-10 + 1071: -41,-13 + 1072: -41,-14 + 1073: -41,-15 + 1074: -41,-16 + 1075: -41,-17 + 1076: -41,-18 + 1077: -41,-19 + 1078: -41,-20 + 1079: -41,-21 + 1080: -41,-22 + 1081: -41,-23 + 1082: -41,-24 + 1083: -41,-25 + 1084: -41,-26 + 1085: -41,-27 + 1086: -41,-28 + 1087: -41,-29 + 1088: -41,-30 + 1089: -41,-31 + 1090: -43,-31 + 1157: -9,53 + 1158: -9,52 + 1159: -9,51 + 1175: 1,53 + 1200: 2,31 + 1203: -2,31 + 1266: 52,-1 + 1267: 51,-1 + 1268: 50,-1 + 1269: 49,-1 + 1270: 48,-1 + 1271: 47,-2 + 1272: 47,-3 + 1273: 46,-3 + 1274: 44,-1 + 1275: 42,-1 + 1276: 39,-1 + 1277: 38,-1 + 1278: 37,-1 + 1279: 36,-1 + 1280: 35,-1 + 1281: 34,-1 + 1282: 33,-1 + 1283: 32,-1 + 1284: 31,-1 + 1285: 29,-1 + 1286: 28,-2 + 1287: 27,-2 + 1288: 26,-2 + 1289: 25,-1 + 1290: 24,-1 + 1291: 23,-1 + 1292: 22,-1 + 1293: 21,-1 + 1294: 20,-1 + 1295: 19,-1 + 1296: 18,-1 + 1299: 45,-3 + 1314: 57,2 + 1315: 57,1 + 1316: 57,0 + 1317: 57,-1 + 1332: 61,5 + 1333: 61,4 + 1334: 61,3 + 1335: 61,2 + 1336: 61,1 + 1340: 62,-1 + 1341: 30,-1 + 1882: 1,-19 + 1883: 1,-20 + 1884: 1,-18 + 1885: 1,-21 + 1886: 1,-22 + 1887: 1,-23 + 1888: 2,-26 + 1889: 2,-28 + 1890: 1,-29 + 1891: 1,-30 + 1892: 1,-31 + 1893: 1,-32 + 1929: 4,-83 + 1930: 3,-83 + 1951: 2,-63 + 1952: 1,-63 + 1953: 0,-63 + 1954: -1,-63 + 1955: -2,-63 + 1962: -3,-63 + 2040: 1,-33 + 2041: 1,-34 + 2042: 1,-35 + 2043: 1,-36 + 2044: 1,-37 + 2045: 1,-38 + 2046: 1,-39 + 2047: 1,-40 + 2067: 1,-25 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale270 decals: - 1345: 30,-9 - 1349: 30,-7 - 1350: 30,-4 - 1353: 30,-6 + 1343: 30,-9 + 1347: 30,-7 + 1348: 30,-4 + 1351: 30,-6 + 3599: 22,12 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale270 decals: 249: -7,-38 - 553: -25,-40 - 738: -2,-36 - 3035: -37,-32 + 551: -25,-40 + 736: -2,-36 + 3033: -37,-32 - node: color: '#639137FF' id: QuarterTileOverlayGreyscale270 decals: - 638: 9,22 + 636: 9,22 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale270 decals: - 827: -11,-48 + 825: -11,-48 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale270 decals: - 1019: -48,3 - 1052: -31,-2 - 1054: -33,-2 - 1094: -43,-29 - 1095: -43,-28 - 1096: -43,-27 - 1097: -43,-26 - 1098: -43,-25 - 1099: -43,-24 - 1100: -43,-23 - 1101: -43,-22 - 1102: -43,-21 - 1103: -43,-20 - 1104: -43,-19 - 1105: -43,-18 - 1106: -43,-14 - 1107: -43,-13 - 1108: -43,-12 - 1109: -43,-8 - 1110: -43,-7 - 1111: -43,-6 - 1112: -44,-5 - 1113: -45,-5 - 1114: -46,-5 - 1115: -47,-5 - 1116: -48,-5 - 1117: -43,-5 - 1118: -29,-2 - 1138: -4,49 - 1139: -5,49 - 1140: -6,49 - 1141: -7,49 - 1142: -8,49 - 1143: -9,49 - 1144: -10,49 - 1145: -11,49 - 1146: -12,49 - 1147: -13,49 - 1148: -13,50 - 1149: -13,51 - 1150: -13,52 - 1151: -13,53 - 1203: 2,31 - 1204: -2,31 - 1262: 53,-3 - 1263: 54,-4 - 1264: 55,-5 - 1265: 56,-6 - 1266: 53,-1 - 1267: 53,-2 - 1299: 41,-1 - 1300: 45,-3 - 1314: 59,2 - 1320: 59,-1 - 1321: 59,0 - 1322: 59,1 - 1323: 61,-6 - 1340: 62,-1 - 1958: -8,-63 - 1959: -7,-63 - 1960: -6,-63 - 1961: -5,-63 - 1962: -4,-63 - 1963: -3,-63 - 1985: -9,-83 - 1986: -10,-83 - 2031: -1,-32 - 2032: -1,-31 - 2033: -1,-29 - 2034: -1,-30 - 2035: -1,-26 - 2036: -2,-23 - 2037: -2,-22 - 2038: -1,-21 - 2039: -1,-20 - 2040: -1,-19 - 2041: -1,-18 - 2062: 4,-51 - 2063: 3,-51 - 2064: 2,-51 - 2065: -1,-24 - 2066: -1,-25 - 2067: -1,-27 - 2068: -1,-28 + 1017: -48,3 + 1050: -31,-2 + 1052: -33,-2 + 1092: -43,-29 + 1093: -43,-28 + 1094: -43,-27 + 1095: -43,-26 + 1096: -43,-25 + 1097: -43,-24 + 1098: -43,-23 + 1099: -43,-22 + 1100: -43,-21 + 1101: -43,-20 + 1102: -43,-19 + 1103: -43,-18 + 1104: -43,-14 + 1105: -43,-13 + 1106: -43,-12 + 1107: -43,-8 + 1108: -43,-7 + 1109: -43,-6 + 1110: -44,-5 + 1111: -45,-5 + 1112: -46,-5 + 1113: -47,-5 + 1114: -48,-5 + 1115: -43,-5 + 1116: -29,-2 + 1136: -4,49 + 1137: -5,49 + 1138: -6,49 + 1139: -7,49 + 1140: -8,49 + 1141: -9,49 + 1142: -10,49 + 1143: -11,49 + 1144: -12,49 + 1145: -13,49 + 1146: -13,50 + 1147: -13,51 + 1148: -13,52 + 1149: -13,53 + 1201: 2,31 + 1202: -2,31 + 1260: 53,-3 + 1261: 54,-4 + 1262: 55,-5 + 1263: 56,-6 + 1264: 53,-1 + 1265: 53,-2 + 1297: 41,-1 + 1298: 45,-3 + 1312: 59,2 + 1318: 59,-1 + 1319: 59,0 + 1320: 59,1 + 1321: 61,-6 + 1338: 62,-1 + 1956: -8,-63 + 1957: -7,-63 + 1958: -6,-63 + 1959: -5,-63 + 1960: -4,-63 + 1961: -3,-63 + 1983: -9,-83 + 1984: -10,-83 + 2029: -1,-32 + 2030: -1,-31 + 2031: -1,-29 + 2032: -1,-30 + 2033: -1,-26 + 2034: -2,-23 + 2035: -2,-22 + 2036: -1,-21 + 2037: -1,-20 + 2038: -1,-19 + 2039: -1,-18 + 2060: 4,-51 + 2061: 3,-51 + 2062: 2,-51 + 2063: -1,-24 + 2064: -1,-25 + 2065: -1,-27 + 2066: -1,-28 - node: color: '#D4D4D433' id: QuarterTileOverlayGreyscale270 decals: - 3135: -3,49 - 3136: -2,49 - 3137: -1,49 + 3133: -3,49 + 3134: -2,49 + 3135: -1,49 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale270 decals: - 2733: 57,-9 + 2731: 57,-9 - node: color: '#1D1D21FF' id: QuarterTileOverlayGreyscale90 decals: - 2435: 42,40 + 2433: 42,40 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale90 decals: - 629: 27,8 - 1347: 33,-3 + 627: 27,8 + 1345: 33,-3 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale90 decals: 247: -8,-40 - 552: -27,-42 - 3034: -38,-33 + 550: -27,-42 + 3032: -38,-33 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale90 @@ -5128,246 +5161,249 @@ entities: color: '#D381C996' id: QuarterTileOverlayGreyscale90 decals: - 833: -14,-50 + 831: -14,-50 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale90 decals: - 1021: -48,3 - 1022: -47,3 - 1023: -46,3 - 1024: -46,2 - 1025: -46,1 - 1026: -45,1 - 1027: -34,1 - 1028: -33,1 - 1029: -32,1 - 1030: -31,1 - 1031: -30,1 - 1032: -29,1 - 1033: -28,1 - 1034: -27,1 - 1035: -23,1 - 1036: -22,1 - 1037: -21,1 - 1038: -20,1 - 1039: -19,1 - 1040: -18,1 - 1093: -44,-30 - 1119: -29,-2 - 1153: -13,53 - 1158: -9,53 - 1175: 1,53 - 1178: 1,52 - 1179: 1,51 - 1180: 1,50 - 1181: 1,48 - 1182: 1,47 - 1183: 1,46 - 1184: 1,45 - 1185: 1,44 - 1186: 1,43 - 1187: 1,42 - 1188: 1,41 - 1189: 1,40 - 1190: 1,39 - 1191: 1,38 - 1192: 2,38 - 1193: 2,37 - 1194: 2,37 - 1195: 2,36 - 1196: 2,35 - 1197: 2,34 - 1198: 2,33 - 1199: 2,32 - 1200: 2,31 - 1201: 1,30 - 1206: 1,29 - 1207: 1,25 - 1208: 1,24 - 1209: 1,23 - 1210: 1,22 - 1211: 1,21 - 1212: 1,20 - 1213: 1,20 - 1214: 1,19 - 1215: 1,18 - 1216: 2,26 - 1217: 2,27 - 1222: 18,1 - 1223: 19,1 - 1224: 20,1 - 1225: 21,1 - 1226: 22,1 - 1227: 23,1 - 1228: 24,1 - 1229: 25,1 - 1230: 26,1 - 1231: 27,1 - 1232: 28,1 - 1233: 29,1 - 1234: 30,1 - 1235: 31,1 - 1236: 32,1 - 1237: 33,1 - 1238: 34,2 - 1239: 35,2 - 1240: 36,2 - 1241: 37,1 - 1242: 38,1 - 1243: 39,1 - 1244: 40,1 - 1245: 41,1 - 1246: 42,1 - 1247: 43,1 - 1248: 44,1 - 1249: 45,1 - 1250: 46,1 - 1251: 47,1 - 1252: 48,1 - 1253: 49,1 - 1254: 50,1 - 1255: 51,1 - 1256: 52,1 - 1313: 57,-3 - 1324: 61,-6 - 1325: 61,-5 - 1326: 61,-4 - 1327: 61,-3 - 1328: 61,-2 - 1341: 62,0 - 1896: 1,-52 - 1897: 1,-53 - 1898: 1,-54 - 1899: 1,-55 - 1900: 1,-56 - 1901: 1,-57 - 1902: 1,-58 - 1903: 1,-59 - 1904: 1,-60 - 1905: 2,-60 - 1906: 3,-60 - 1907: 4,-60 - 1908: 4,-61 - 1909: 4,-62 - 1910: 4,-63 - 1911: 4,-64 - 1912: 4,-65 - 1913: 4,-66 - 1914: 4,-68 - 1915: 5,-68 - 1916: 5,-69 - 1917: 5,-70 - 1918: 4,-71 - 1919: 4,-67 - 1920: 4,-72 - 1921: 4,-73 - 1922: 4,-74 - 1923: 4,-75 - 1924: 5,-75 - 1925: 5,-76 - 1926: 5,-77 - 1927: 4,-78 - 1928: 4,-79 - 1929: 4,-80 - 1930: 4,-81 - 1965: -9,-64 - 1966: -9,-65 - 1967: -9,-66 - 1968: -9,-67 - 1969: -9,-68 - 1970: -9,-69 - 1971: -9,-70 - 1972: -9,-71 - 1973: -9,-72 - 1974: -9,-73 - 1975: -9,-74 - 1976: -9,-75 - 1977: -9,-76 - 1978: -9,-77 - 1979: -9,-78 - 1980: -9,-79 - 1981: -9,-80 - 1982: -9,-81 - 1983: -9,-82 - 1984: -9,-83 - 2050: 1,-41 - 2051: 2,-42 - 2052: 3,-42 - 2053: 3,-43 - 2054: 3,-44 - 2055: 3,-45 - 2056: 3,-46 - 2057: 3,-47 - 2058: 3,-48 - 2059: 4,-49 - 2060: 4,-50 - 2061: 4,-51 + 1019: -48,3 + 1020: -47,3 + 1021: -46,3 + 1022: -46,2 + 1023: -46,1 + 1024: -45,1 + 1025: -34,1 + 1026: -33,1 + 1027: -32,1 + 1028: -31,1 + 1029: -30,1 + 1030: -29,1 + 1031: -28,1 + 1032: -27,1 + 1033: -23,1 + 1034: -22,1 + 1035: -21,1 + 1036: -20,1 + 1037: -19,1 + 1038: -18,1 + 1091: -44,-30 + 1117: -29,-2 + 1151: -13,53 + 1156: -9,53 + 1173: 1,53 + 1176: 1,52 + 1177: 1,51 + 1178: 1,50 + 1179: 1,48 + 1180: 1,47 + 1181: 1,46 + 1182: 1,45 + 1183: 1,44 + 1184: 1,43 + 1185: 1,42 + 1186: 1,41 + 1187: 1,40 + 1188: 1,39 + 1189: 1,38 + 1190: 2,38 + 1191: 2,37 + 1192: 2,37 + 1193: 2,36 + 1194: 2,35 + 1195: 2,34 + 1196: 2,33 + 1197: 2,32 + 1198: 2,31 + 1199: 1,30 + 1204: 1,29 + 1205: 1,25 + 1206: 1,24 + 1207: 1,23 + 1208: 1,22 + 1209: 1,21 + 1210: 1,20 + 1211: 1,20 + 1212: 1,19 + 1213: 1,18 + 1214: 2,26 + 1215: 2,27 + 1220: 18,1 + 1221: 19,1 + 1222: 20,1 + 1223: 21,1 + 1224: 22,1 + 1225: 23,1 + 1226: 24,1 + 1227: 25,1 + 1228: 26,1 + 1229: 27,1 + 1230: 28,1 + 1231: 29,1 + 1232: 30,1 + 1233: 31,1 + 1234: 32,1 + 1235: 33,1 + 1236: 34,2 + 1237: 35,2 + 1238: 36,2 + 1239: 37,1 + 1240: 38,1 + 1241: 39,1 + 1242: 40,1 + 1243: 41,1 + 1244: 42,1 + 1245: 43,1 + 1246: 44,1 + 1247: 45,1 + 1248: 46,1 + 1249: 47,1 + 1250: 48,1 + 1251: 49,1 + 1252: 50,1 + 1253: 51,1 + 1254: 52,1 + 1311: 57,-3 + 1322: 61,-6 + 1323: 61,-5 + 1324: 61,-4 + 1325: 61,-3 + 1326: 61,-2 + 1339: 62,0 + 1894: 1,-52 + 1895: 1,-53 + 1896: 1,-54 + 1897: 1,-55 + 1898: 1,-56 + 1899: 1,-57 + 1900: 1,-58 + 1901: 1,-59 + 1902: 1,-60 + 1903: 2,-60 + 1904: 3,-60 + 1905: 4,-60 + 1906: 4,-61 + 1907: 4,-62 + 1908: 4,-63 + 1909: 4,-64 + 1910: 4,-65 + 1911: 4,-66 + 1912: 4,-68 + 1913: 5,-68 + 1914: 5,-69 + 1915: 5,-70 + 1916: 4,-71 + 1917: 4,-67 + 1918: 4,-72 + 1919: 4,-73 + 1920: 4,-74 + 1921: 4,-75 + 1922: 5,-75 + 1923: 5,-76 + 1924: 5,-77 + 1925: 4,-78 + 1926: 4,-79 + 1927: 4,-80 + 1928: 4,-81 + 1963: -9,-64 + 1964: -9,-65 + 1965: -9,-66 + 1966: -9,-67 + 1967: -9,-68 + 1968: -9,-69 + 1969: -9,-70 + 1970: -9,-71 + 1971: -9,-72 + 1972: -9,-73 + 1973: -9,-74 + 1974: -9,-75 + 1975: -9,-76 + 1976: -9,-77 + 1977: -9,-78 + 1978: -9,-79 + 1979: -9,-80 + 1980: -9,-81 + 1981: -9,-82 + 1982: -9,-83 + 2048: 1,-41 + 2049: 2,-42 + 2050: 3,-42 + 2051: 3,-43 + 2052: 3,-44 + 2053: 3,-45 + 2054: 3,-46 + 2055: 3,-47 + 2056: 3,-48 + 2057: 4,-49 + 2058: 4,-50 + 2059: 4,-51 - node: color: '#D4D4D433' id: QuarterTileOverlayGreyscale90 decals: - 3138: 1,49 - 3209: -35,1 + 3136: 1,49 + 3207: -35,1 - node: color: '#FFFFFFFF' id: Rock06 decals: - 2684: -6.549043,-18.995234 + 2682: -6.549043,-18.995234 - node: color: '#FFFFFFFF' id: Rock07 decals: - 2685: -10.21571,-19.245234 - 2686: -19.922543,-12.716649 - 2687: -18.60001,-10.259648 - 2688: -18.846893,-8.106161 + 2683: -10.21571,-19.245234 + 2684: -19.922543,-12.716649 + 2685: -18.60001,-10.259648 + 2686: -18.846893,-8.106161 - node: color: '#FFFFFFFF' id: SpaceStationSign1 decals: - 956: 31,0 + 954: 31,0 - node: color: '#FFFFFFFF' id: SpaceStationSign2 decals: - 955: 32,0 + 953: 32,0 - node: color: '#FFFFFFFF' id: SpaceStationSign3 decals: - 954: 33,0 + 952: 33,0 - node: color: '#FFFFFFFF' id: SpaceStationSign4 decals: - 953: 34,0 + 951: 34,0 - node: color: '#FFFFFFFF' id: SpaceStationSign5 decals: - 952: 35,0 + 950: 35,0 - node: color: '#FFFFFFFF' id: SpaceStationSign6 decals: - 951: 36,0 + 949: 36,0 - node: color: '#FFFFFFFF' id: SpaceStationSign7 decals: - 950: 37,0 + 948: 37,0 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: StandClearGreyscale decals: - 3369: -56,-4 + 3367: -56,-4 - node: color: '#334E6DC8' id: ThreeQuarterTileOverlayGreyscale decals: - 582: 19,9 + 580: 19,9 + 3574: 21,18 + 3600: 28,15 + 3601: 29,16 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale @@ -5377,7 +5413,7 @@ entities: color: '#639137FF' id: ThreeQuarterTileOverlayGreyscale decals: - 661: 3,24 + 659: 3,24 - node: color: '#9FED5896' id: ThreeQuarterTileOverlayGreyscale @@ -5392,25 +5428,29 @@ entities: color: '#C6FF91FF' id: ThreeQuarterTileOverlayGreyscale decals: - 3025: -39,-31 + 3023: -39,-31 - node: color: '#334E6DC8' id: ThreeQuarterTileOverlayGreyscale180 decals: - 624: 27,4 - 625: 28,5 - 626: 28,5 + 622: 27,4 + 623: 28,5 + 624: 28,5 + 3578: 25,11 + 3579: 26,12 + 3604: 33,12 + 3605: 32,11 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale180 decals: 489: -14,-36 - 540: -12,-28 + 538: -12,-28 - node: color: '#639137FF' id: ThreeQuarterTileOverlayGreyscale180 decals: - 664: 10,19 + 662: 10,19 - node: color: '#9FED5896' id: ThreeQuarterTileOverlayGreyscale180 @@ -5426,7 +5466,11 @@ entities: color: '#334E6DC8' id: ThreeQuarterTileOverlayGreyscale270 decals: - 583: 19,4 + 581: 19,4 + 3576: 21,12 + 3577: 22,11 + 3606: 29,11 + 3607: 28,12 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale270 @@ -5436,7 +5480,7 @@ entities: color: '#639137FF' id: ThreeQuarterTileOverlayGreyscale270 decals: - 663: 3,19 + 661: 3,19 - node: color: '#9FED5896' id: ThreeQuarterTileOverlayGreyscale270 @@ -5452,13 +5496,16 @@ entities: color: '#C6FF91FF' id: ThreeQuarterTileOverlayGreyscale270 decals: - 3016: -39,-35 + 3014: -39,-35 - node: color: '#334E6DC8' id: ThreeQuarterTileOverlayGreyscale90 decals: - 627: 28,8 - 628: 27,9 + 625: 28,8 + 626: 27,9 + 3575: 26,18 + 3602: 32,16 + 3603: 33,15 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale90 @@ -5468,7 +5515,7 @@ entities: color: '#639137FF' id: ThreeQuarterTileOverlayGreyscale90 decals: - 662: 10,24 + 660: 10,24 - node: color: '#9FED5896' id: ThreeQuarterTileOverlayGreyscale90 @@ -5478,200 +5525,201 @@ entities: 174: -29,-11 175: -32,-11 483: -29,-23 - 3036: -35,-31 + 3034: -35,-31 - node: color: '#FFFFFFFF' id: WarnBox decals: - 3559: -24,36 - 3560: -25,37 - 3561: -26,37 - 3562: -27,37 - 3563: -28,37 - 3564: -29,37 - 3565: -30,37 - 3566: -31,36 - 3567: -25,35 - 3568: -26,35 - 3569: -28,35 - 3570: -29,35 - 3571: -30,35 + 3557: -24,36 + 3558: -25,37 + 3559: -26,37 + 3560: -27,37 + 3561: -28,37 + 3562: -29,37 + 3563: -30,37 + 3564: -31,36 + 3565: -25,35 + 3566: -26,35 + 3567: -28,35 + 3568: -29,35 + 3569: -30,35 - node: color: '#FFFFFFFF' id: WarnCornerGreyscaleNW decals: - 3492: -6,-26 + 3490: -6,-26 - node: color: '#FFFFFFFF' id: WarnCornerSmallGreyscaleNW decals: - 3508: -6,-29 + 3506: -6,-29 - node: color: '#FFFFFFFF' id: WarnCornerSmallNE decals: - 3342: -58,-13 - 3558: -22,42 - 3574: -31,35 + 3340: -58,-13 + 3556: -22,42 + 3572: -31,35 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW decals: - 981: -56,-7 - 985: -56,-3 - 1001: -54,-13 - 3557: -18,42 - 3575: -24,35 + 979: -56,-7 + 983: -56,-3 + 999: -54,-13 + 3555: -18,42 + 3573: -24,35 - node: color: '#FFFFFFFF' id: WarnCornerSmallSE decals: - 3341: -58,-8 - 3555: -22,44 - 3573: -31,37 + 3339: -58,-8 + 3553: -22,44 + 3571: -31,37 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW decals: - 979: -56,-1 - 980: -56,-1 - 986: -56,-5 - 1000: -54,-8 - 3556: -18,44 - 3572: -24,37 + 977: -56,-1 + 978: -56,-1 + 984: -56,-5 + 998: -54,-8 + 3554: -18,44 + 3570: -24,37 - node: color: '#FFFFFFFF' id: WarnFull decals: - 2481: 12,53 - 2482: 13,53 - 2483: 14,53 + 2479: 12,53 + 2480: 13,53 + 2481: 14,53 - node: color: '#BC863FFF' id: WarnFullGreyscale decals: - 3365: -51,-1 - 3366: -51,0 - 3367: -52,-1 - 3368: -52,0 + 3363: -51,-1 + 3364: -51,0 + 3365: -52,-1 + 3366: -52,0 - node: color: '#FFFFFFFF' id: WarnLineE decals: - 2463: 9,49 - 2465: 19,49 - 2466: 19,48 - 2467: 19,47 - 2468: 19,46 - 3336: -58,-12 - 3337: -58,-11 - 3338: -58,-10 - 3339: -58,-9 - 3551: -22,43 + 2461: 9,49 + 2463: 19,49 + 2464: 19,48 + 2465: 19,47 + 2466: 19,46 + 3334: -58,-12 + 3335: -58,-11 + 3336: -58,-10 + 3337: -58,-9 + 3549: -22,43 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleN decals: - 3493: -5,-26 - 3494: -4,-26 - 3495: -3,-26 - 3505: -9,-29 - 3506: -8,-29 - 3507: -7,-29 + 3491: -5,-26 + 3492: -4,-26 + 3493: -3,-26 + 3503: -9,-29 + 3504: -8,-29 + 3505: -7,-29 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleS decals: - 3498: -9,-30 - 3499: -8,-30 - 3500: -7,-30 - 3501: -6,-30 - 3502: -5,-30 - 3503: -4,-30 - 3504: -3,-30 + 3496: -9,-30 + 3497: -8,-30 + 3498: -7,-30 + 3499: -6,-30 + 3500: -5,-30 + 3501: -4,-30 + 3502: -3,-30 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleW decals: - 982: -56,-5 - 983: -56,-4 - 984: -56,-3 - 3496: -6,-27 - 3497: -6,-28 + 980: -56,-5 + 981: -56,-4 + 982: -56,-3 + 3494: -6,-27 + 3495: -6,-28 - node: color: '#FFFFFFFF' id: WarnLineN decals: - 976: -57,-1 - 990: -57,-8 - 991: -56,-8 - 992: -56,-8 - 993: -55,-8 - 3343: -58,-1 - 3548: -19,44 - 3549: -20,44 - 3550: -21,44 + 974: -57,-1 + 988: -57,-8 + 989: -56,-8 + 990: -56,-8 + 991: -55,-8 + 3341: -58,-1 + 3546: -19,44 + 3547: -20,44 + 3548: -21,44 - node: color: '#FFFFFFFF' id: WarnLineS decals: - 977: -56,-6 - 978: -56,-2 - 994: -54,-10 - 995: -54,-11 - 996: -54,-12 - 2464: 17,49 - 3340: -54,-9 - 3542: 21,46 - 3543: 21,47 - 3544: 21,48 - 3545: 21,49 - 3547: -18,43 + 975: -56,-6 + 976: -56,-2 + 992: -54,-10 + 993: -54,-11 + 994: -54,-12 + 2462: 17,49 + 3338: -54,-9 + 3540: 21,46 + 3541: 21,47 + 3542: 21,48 + 3543: 21,49 + 3545: -18,43 - node: color: '#FFFFFFFF' id: WarnLineW decals: - 975: -57,-7 - 997: -55,-13 - 998: -56,-13 - 999: -57,-13 - 2460: 12,46 - 2461: 13,46 - 2462: 14,46 - 2473: 7,51 - 2474: 8,51 - 2475: 9,51 - 2476: 17,51 - 2477: 18,51 - 2478: 19,51 - 2479: 15,53 - 2480: 11,53 - 3344: -58,-7 - 3552: -21,42 - 3553: -20,42 - 3554: -19,42 + 973: -57,-7 + 995: -55,-13 + 996: -56,-13 + 997: -57,-13 + 2458: 12,46 + 2459: 13,46 + 2460: 14,46 + 2471: 7,51 + 2472: 8,51 + 2473: 9,51 + 2474: 17,51 + 2475: 18,51 + 2476: 19,51 + 2477: 15,53 + 2478: 11,53 + 3342: -58,-7 + 3550: -21,42 + 3551: -20,42 + 3552: -19,42 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: 266: -30,-39 286: -29,-35 - 685: 37,-7 - 691: 44,-5 - 739: -4,38 - 740: -12,33 - 781: -16,32 - 797: -19,-3 - 851: -49,7 - 854: -53,12 - 855: -51,10 - 897: 36,18 - 904: 40,16 - 924: 44,-9 - 931: 17,-30 - 932: 20,-30 - 2831: 41,23 - 3066: 19,37 + 683: 37,-7 + 689: 44,-5 + 737: -4,38 + 738: -12,33 + 779: -16,32 + 795: -19,-3 + 849: -49,7 + 852: -53,12 + 853: -51,10 + 895: 36,18 + 902: 40,16 + 922: 44,-9 + 929: 17,-30 + 930: 20,-30 + 2829: 41,23 + 3064: 19,37 + 3614: 10,-19 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNw @@ -5679,108 +5727,111 @@ entities: 269: -31,-39 270: -31,-39 287: -33,-35 - 678: 35,-7 - 679: 35,-3 - 692: 39,-5 - 741: -14,38 - 742: -14,33 - 782: -19,32 - 798: -22,-3 - 850: -50,7 - 856: -55,12 - 857: -57,10 - 898: 35,18 - 905: 38,16 - 906: 35,15 - 921: 42,-9 - 933: 13,-30 - 934: 19,-30 - 2832: 39,23 - 3067: 12,37 + 676: 35,-7 + 677: 35,-3 + 690: 39,-5 + 739: -14,38 + 740: -14,33 + 780: -19,32 + 796: -22,-3 + 848: -50,7 + 854: -55,12 + 855: -57,10 + 896: 35,18 + 903: 38,16 + 904: 35,15 + 919: 42,-9 + 931: 13,-30 + 932: 19,-30 + 2830: 39,23 + 3065: 12,37 + 3615: 7,-19 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSe decals: 268: -30,-41 297: -29,-37 - 689: 37,-5 - 704: 44,-7 - 743: -12,31 - 744: -4,31 - 783: -16,27 - 799: -19,-5 - 848: -49,5 - 859: -51,9 - 889: 41,18 - 900: 36,17 - 901: 40,11 - 922: 44,-10 - 935: 17,-32 - 936: 20,-32 - 3077: 19,36 + 687: 37,-5 + 702: 44,-7 + 741: -12,31 + 742: -4,31 + 781: -16,27 + 797: -19,-5 + 846: -49,5 + 857: -51,9 + 887: 41,18 + 898: 36,17 + 899: 40,11 + 920: 44,-10 + 933: 17,-32 + 934: 20,-32 + 3075: 19,36 + 3617: 10,-21 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSw decals: 267: -31,-41 295: -33,-37 - 676: 35,-5 - 677: 35,-9 - 693: 39,-7 - 745: -14,31 - 746: -14,35 - 747: -10,31 - 784: -19,27 - 800: -22,-5 - 849: -50,5 - 858: -57,9 - 888: 39,18 - 899: 35,17 - 902: 38,11 - 903: 35,12 - 923: 42,-10 - 937: 13,-32 - 938: 19,-32 + 674: 35,-5 + 675: 35,-9 + 691: 39,-7 + 743: -14,31 + 744: -14,35 + 745: -10,31 + 782: -19,27 + 798: -22,-5 + 847: -50,5 + 856: -57,9 + 886: 39,18 + 897: 35,17 + 900: 38,11 + 901: 35,12 + 921: 42,-10 + 935: 13,-32 + 936: 19,-32 + 3616: 7,-21 - node: color: '#FFFFFFFF' id: WoodTrimThinEndE decals: - 671: 38,-3 - 672: 38,-9 + 669: 38,-3 + 670: 38,-9 - node: color: '#FFFFFFFF' id: WoodTrimThinEndN decals: - 919: 46,-5 + 917: 46,-5 - node: color: '#FFFFFFFF' id: WoodTrimThinEndS decals: - 920: 46,-6 + 918: 46,-6 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNe decals: - 687: 37,-9 - 870: -53,10 + 685: 37,-9 + 868: -53,10 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNw decals: - 871: -55,10 - 918: 38,15 + 869: -55,10 + 916: 38,15 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSe decals: - 690: 37,-3 - 3079: 17,36 + 688: 37,-3 + 3077: 17,36 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSw decals: - 777: -10,35 - 917: 38,12 + 775: -10,35 + 915: 38,12 - node: color: '#FFFFFFFF' id: WoodTrimThinLineE @@ -5797,34 +5848,35 @@ entities: 279: -32.293655,-40.00201 280: -32.29232,-41.003887 298: -29,-36 - 686: 37,-8 - 688: 37,-4 - 705: 44,-6 - 754: -4,32 - 755: -4,33 - 756: -4,34 - 757: -4,35 - 758: -4,36 - 759: -4,37 - 760: -12,32 - 785: -16,31 - 786: -16,30 - 787: -16,29 - 788: -16,28 - 801: -19,-4 - 853: -49,6 - 869: -53,11 - 890: 41,19 - 891: 41,20 - 892: 41,21 - 907: 40,14 - 908: 40,15 - 909: 40,12 - 910: 40,13 - 939: 20,-31 - 940: 17,-31 - 2833: 41,22 - 3068: 17,35 + 684: 37,-8 + 686: 37,-4 + 703: 44,-6 + 752: -4,32 + 753: -4,33 + 754: -4,34 + 755: -4,35 + 756: -4,36 + 757: -4,37 + 758: -12,32 + 783: -16,31 + 784: -16,30 + 785: -16,29 + 786: -16,28 + 799: -19,-4 + 851: -49,6 + 867: -53,11 + 888: 41,19 + 889: 41,20 + 890: 41,21 + 905: 40,14 + 906: 40,15 + 907: 40,12 + 908: 40,13 + 937: 20,-31 + 938: 17,-31 + 2831: 41,22 + 3066: 17,35 + 3623: 10,-20 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN @@ -5834,46 +5886,48 @@ entities: 288: -32,-35 289: -31,-35 290: -30,-35 - 680: 36,-3 - 681: 37,-3 - 684: 36,-7 - 699: 40,-5 - 700: 41,-5 - 701: 41,-5 - 702: 42,-5 - 703: 43,-5 - 761: -5,38 - 762: -6,38 - 763: -7,38 - 764: -8,38 - 765: -9,38 - 766: -10,38 - 767: -11,38 - 768: -12,38 - 769: -13,38 - 770: -13,33 - 791: -17,32 - 792: -18,32 - 805: -21,-3 - 806: -20,-3 - 807: -19,-3 - 865: -54,12 - 866: -56,10 - 867: -52,10 - 913: 36,15 - 914: 37,15 - 926: 43,-9 - 946: 14,-30 - 947: 15,-30 - 948: 15,-30 - 949: 16,-30 - 2835: 40,23 - 3071: 13,37 - 3072: 14,37 - 3073: 15,37 - 3074: 16,37 - 3075: 17,37 - 3076: 18,37 + 678: 36,-3 + 679: 37,-3 + 682: 36,-7 + 697: 40,-5 + 698: 41,-5 + 699: 41,-5 + 700: 42,-5 + 701: 43,-5 + 759: -5,38 + 760: -6,38 + 761: -7,38 + 762: -8,38 + 763: -9,38 + 764: -10,38 + 765: -11,38 + 766: -12,38 + 767: -13,38 + 768: -13,33 + 789: -17,32 + 790: -18,32 + 803: -21,-3 + 804: -20,-3 + 805: -19,-3 + 863: -54,12 + 864: -56,10 + 865: -52,10 + 911: 36,15 + 912: 37,15 + 924: 43,-9 + 944: 14,-30 + 945: 15,-30 + 946: 15,-30 + 947: 16,-30 + 2833: 40,23 + 3069: 13,37 + 3070: 14,37 + 3071: 15,37 + 3072: 16,37 + 3073: 17,37 + 3074: 18,37 + 3621: 8,-19 + 3622: 9,-19 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS @@ -5885,71 +5939,74 @@ entities: 292: -31,-37 293: -31,-37 294: -30,-37 - 673: 37,-9 - 674: 36,-9 - 675: 36,-5 - 695: 40,-7 - 696: 41,-7 - 697: 42,-7 - 698: 43,-7 - 748: -13,31 - 749: -9,31 - 750: -8,31 - 751: -7,31 - 752: -6,31 - 753: -5,31 - 778: -11,35 - 779: -12,35 - 780: -13,35 - 789: -17,27 - 790: -18,27 - 803: -21,-5 - 804: -20,-5 - 860: -56,9 - 861: -55,9 - 862: -54,9 - 863: -53,9 - 864: -52,9 - 893: 40,18 - 915: 36,12 - 916: 37,12 - 925: 43,-10 - 943: 14,-32 - 944: 15,-32 - 945: 16,-32 - 3078: 18,36 + 671: 37,-9 + 672: 36,-9 + 673: 36,-5 + 693: 40,-7 + 694: 41,-7 + 695: 42,-7 + 696: 43,-7 + 746: -13,31 + 747: -9,31 + 748: -8,31 + 749: -7,31 + 750: -6,31 + 751: -5,31 + 776: -11,35 + 777: -12,35 + 778: -13,35 + 787: -17,27 + 788: -18,27 + 801: -21,-5 + 802: -20,-5 + 858: -56,9 + 859: -55,9 + 860: -54,9 + 861: -53,9 + 862: -52,9 + 891: 40,18 + 913: 36,12 + 914: 37,12 + 923: 43,-10 + 941: 14,-32 + 942: 15,-32 + 943: 16,-32 + 3076: 18,36 + 3618: 9,-21 + 3619: 8,-21 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW decals: 264: -31,-40 296: -33,-36 - 682: 35,-4 - 683: 35,-8 - 694: 39,-6 - 771: -14,37 - 772: -14,36 - 773: -14,32 - 774: -10,32 - 775: -10,33 - 776: -10,34 - 793: -19,31 - 794: -19,30 - 795: -19,29 - 796: -19,28 - 802: -22,-4 - 852: -50,6 - 868: -55,11 - 894: 39,19 - 895: 39,20 - 896: 39,21 - 911: 35,13 - 912: 35,14 - 941: 19,-31 - 942: 13,-31 - 2834: 39,22 - 3069: 12,35 - 3070: 12,36 + 680: 35,-4 + 681: 35,-8 + 692: 39,-6 + 769: -14,37 + 770: -14,36 + 771: -14,32 + 772: -10,32 + 773: -10,33 + 774: -10,34 + 791: -19,31 + 792: -19,30 + 793: -19,29 + 794: -19,28 + 800: -22,-4 + 850: -50,6 + 866: -55,11 + 892: 39,19 + 893: 39,20 + 894: 39,21 + 909: 35,13 + 910: 35,14 + 939: 19,-31 + 940: 13,-31 + 2832: 39,22 + 3067: 12,35 + 3068: 12,36 + 3620: 7,-20 - type: GridAtmosphere version: 2 data: @@ -6313,7 +6370,8 @@ entities: 1,6: 0: 65295 1,7: - 0: 65295 + 0: 62223 + 2: 3072 1,8: 0: 65535 2,5: @@ -6646,7 +6704,7 @@ entities: 0: 16383 1,-13: 0: 57104 - 2: 8 + 3: 8 2,-12: 0: 65308 2,-11: @@ -6655,7 +6713,7 @@ entities: 0: 28671 2,-13: 0: 7936 - 2: 8 + 3: 8 3,-12: 0: 62349 3,-11: @@ -6664,7 +6722,7 @@ entities: 0: 61182 3,-13: 0: 55040 - 2: 4 + 3: 4 3,-9: 0: 3822 4,-12: @@ -6792,7 +6850,7 @@ entities: 10,-10: 0: 62207 10,-13: - 2: 9902 + 3: 9902 11,-12: 0: 4913 11,-11: @@ -6801,7 +6859,7 @@ entities: 0: 65262 11,-13: 0: 4352 - 2: 127 + 3: 127 12,-10: 0: 65488 12,-9: @@ -6907,14 +6965,14 @@ entities: 12,6: 0: 64271 12,7: - 2: 16368 + 3: 16368 -12,-12: 0: 13119 -12,-13: 0: 65427 -13,-12: 0: 56524 - 3: 17 + 4: 17 -12,-11: 0: 60931 -13,-11: @@ -7012,70 +7070,70 @@ entities: -13,1: 0: 57296 -12,1: - 2: 36352 + 3: 36352 -12,3: - 2: 34956 + 3: 34956 -11,1: 0: 127 - 2: 30464 + 3: 30464 -12,2: - 2: 34952 + 3: 34952 -11,2: - 2: 255 - 4: 57344 + 3: 255 + 5: 57344 -12,4: - 2: 53192 + 3: 53192 -11,3: - 2: 61440 - 5: 224 + 3: 61440 + 6: 224 -10,1: 0: 40847 -10,2: - 2: 8755 + 3: 8755 0: 34952 -10,3: - 2: 12834 + 3: 12834 0: 34952 -10,4: - 2: 8738 + 3: 8738 0: 34952 -13,4: - 2: 32630 + 3: 32630 -12,7: - 2: 52476 + 3: 52476 -13,7: - 2: 26615 + 3: 26615 -12,6: - 2: 51336 + 3: 51336 -12,5: - 2: 34952 + 3: 34952 -11,6: - 2: 61440 - 3: 224 + 3: 61440 + 4: 224 -12,8: - 2: 34952 + 3: 34952 -11,4: - 6: 224 - 3: 57344 + 7: 224 + 4: 57344 -11,5: - 3: 57568 + 4: 57568 -11,7: - 3: 57568 + 4: 57568 -10,6: - 2: 12834 + 3: 12834 0: 34952 -10,5: - 2: 8738 + 3: 8738 0: 34952 -10,7: - 2: 8738 + 3: 8738 0: 34952 -10,8: - 2: 62258 + 3: 62258 0: 136 -9,8: 0: 52479 - 2: 4096 + 3: 4096 0,-16: 0: 65528 -1,-16: @@ -7096,23 +7154,23 @@ entities: 0: 257 1,-14: 0: 4369 - 2: 34956 + 3: 34956 1,-17: 0: 4371 2,-14: - 2: 63631 + 3: 63631 2,-15: - 2: 39315 + 3: 39315 2,-16: - 2: 27776 + 3: 27776 3,-16: - 2: 57375 + 3: 57375 3,-15: - 2: 12443 + 3: 12443 3,-14: - 2: 61488 + 3: 61488 4,-16: - 2: 4883 + 3: 4883 -4,-15: 0: 65088 -4,-14: @@ -7136,7 +7194,7 @@ entities: -2,-14: 0: 65520 -9,-15: - 3: 2048 + 4: 2048 -8,-14: 0: 4080 -9,-14: @@ -7146,69 +7204,69 @@ entities: -9,-13: 0: 4095 -7,-15: - 3: 61184 + 4: 61184 -7,-14: 0: 32752 -6,-15: - 3: 256 + 4: 256 0: 32768 -6,-14: 0: 65528 -12,-16: - 2: 4880 + 3: 4880 -13,-16: - 2: 65520 + 3: 65520 -12,-15: - 3: 53128 + 4: 53128 -12,-14: 0: 30483 - 3: 4 + 4: 4 -13,-14: 0: 52232 - 2: 23 + 3: 23 -11,-16: - 3: 4352 + 4: 4352 -11,-15: - 3: 65425 + 4: 65425 -11,-14: 0: 65520 -11,-13: 0: 831 -10,-15: - 3: 14327 + 4: 14327 -10,-14: 0: 16304 -10,-13: 0: 2187 -10,-16: - 3: 8704 + 4: 8704 -10,-17: - 3: 49152 + 4: 49152 -16,-7: - 2: 52416 + 3: 52416 -16,-6: - 2: 3276 + 3: 3276 0: 32768 -16,-5: 0: 3080 -16,-4: - 2: 140 + 3: 140 -15,-7: - 2: 4368 + 3: 4368 0: 3276 -15,-6: - 2: 273 + 3: 273 0: 52428 -15,-5: 0: 53199 -15,-4: - 2: 4369 + 3: 4369 0: 52416 -15,-8: 0: 52416 -15,-9: 0: 34952 - 3: 256 + 4: 256 -14,-8: 0: 49080 -14,-7: @@ -7228,31 +7286,31 @@ entities: -13,-7: 0: 26214 -16,-12: - 3: 32 + 4: 32 -16,-11: - 3: 32768 + 4: 32768 -16,-10: - 3: 8 + 4: 8 -15,-11: - 3: 13036 + 4: 13036 0: 32768 -15,-10: - 3: 307 + 4: 307 0: 34952 -15,-12: - 3: 51336 + 4: 51336 -14,-12: - 3: 4607 + 4: 4607 0: 49152 -14,-11: - 3: 17 + 4: 17 0: 61644 -14,-10: 0: 65535 -14,-13: - 3: 59392 + 4: 59392 -13,-13: - 3: 4352 + 4: 4352 0: 1604 8,9: 0: 65535 @@ -7281,28 +7339,28 @@ entities: 10,10: 0: 3549 10,11: - 3: 275 + 4: 275 10,12: 0: 305 - 2: 3276 + 3: 3276 11,9: 0: 4469 - 2: 49152 + 3: 49152 11,10: 0: 273 - 2: 52428 + 3: 52428 11,11: - 2: 61166 + 3: 61166 11,12: - 2: 53247 + 3: 53247 12,8: - 2: 13107 + 3: 13107 12,9: - 2: 13107 + 3: 13107 12,10: - 2: 63923 + 3: 63923 12,11: - 2: 61443 + 3: 61443 4,9: 0: 57599 3,9: @@ -7325,7 +7383,7 @@ entities: 0: 60928 5,12: 0: 238 - 2: 49152 + 3: 49152 6,9: 0: 65535 6,10: @@ -7394,26 +7452,26 @@ entities: 0: 16183 15,1: 0: 13119 - 2: 18432 + 3: 18432 15,2: 0: 13107 - 2: 32836 + 3: 32836 15,3: 0: 13107 - 2: 2184 + 3: 2184 15,-1: 0: 30527 15,4: 0: 13107 - 2: 32768 + 3: 32768 16,0: 0: 1793 - 2: 4 + 3: 4 16,1: 0: 7 - 2: 1024 + 3: 1024 16,3: - 2: 4368 + 3: 4368 13,-4: 0: 26215 13,-3: @@ -7432,22 +7490,22 @@ entities: 0: 61098 15,-4: 0: 4113 - 2: 34952 + 3: 34952 15,-3: 0: 4369 - 2: 34952 + 3: 34952 15,-2: 0: 16177 - 2: 8 + 3: 8 15,-5: 0: 4353 - 2: 34952 + 3: 34952 16,-2: 0: 1792 - 2: 4 + 3: 4 16,-1: 0: 4359 - 2: 17408 + 3: 17408 13,-8: 0: 15 13,-6: @@ -7461,56 +7519,56 @@ entities: 14,-9: 0: 36623 15,-8: - 3: 16 + 4: 16 15,-6: - 3: 16 + 4: 16 0: 4096 - 2: 32768 + 3: 32768 15,-9: 0: 4353 16,-5: - 2: 304 + 3: 304 12,-11: - 3: 49156 + 4: 49156 12,-12: - 2: 12 + 3: 12 12,-13: - 2: 52303 + 3: 52303 13,-12: - 2: 15 - 3: 16384 + 3: 15 + 4: 16384 13,-11: - 3: 65228 + 4: 65228 13,-10: 0: 65520 13,-13: - 2: 65295 + 3: 65295 14,-12: - 2: 15 + 3: 15 14,-11: - 3: 65521 + 4: 65521 14,-10: 0: 65392 14,-13: - 2: 65295 + 3: 65295 15,-12: - 2: 1 + 3: 1 15,-11: - 3: 4112 + 4: 4112 15,-10: - 3: 52451 + 4: 52451 0: 4096 15,-13: - 2: 4511 + 3: 4511 16,-10: - 3: 19 + 4: 19 -4,9: 0: 7421 -5,9: 0: 62719 -4,10: 0: 65533 - 7: 2 + 8: 2 -5,10: 0: 65535 -4,11: @@ -7519,13 +7577,13 @@ entities: 0: 32767 -4,12: 0: 34945 - 3: 13072 + 4: 13072 -3,9: 0: 4095 -3,10: 0: 65535 -3,11: - 3: 61408 + 4: 61408 -2,9: 0: 4095 -2,10: @@ -7538,23 +7596,23 @@ entities: 0: 61678 -9,9: 0: 52428 - 2: 4369 + 3: 4369 -8,10: 0: 65535 -9,10: 0: 52428 -8,11: - 2: 43808 + 3: 43808 -9,11: - 2: 20224 + 3: 20224 -8,12: - 2: 43690 + 3: 43690 -7,9: 0: 45311 -7,10: 0: 49087 -7,11: - 2: 768 + 3: 768 0: 34952 -6,9: 0: 61661 @@ -7562,44 +7620,44 @@ entities: 0: 65535 -6,11: 0: 64255 - 8: 256 - 7: 1024 + 9: 256 + 8: 1024 -7,12: 0: 34952 - 2: 12322 + 3: 12322 -6,12: 0: 65535 -5,12: 0: 13111 - 3: 34816 + 4: 34816 -12,9: - 2: 65433 + 3: 65433 -13,9: - 2: 8 + 3: 8 -12,10: - 2: 52428 + 3: 52428 -11,8: - 2: 65520 + 3: 65520 -11,9: - 2: 4607 - 3: 49152 + 3: 4607 + 4: 49152 -11,10: - 2: 33041 - 3: 204 + 3: 33041 + 4: 204 -12,11: - 2: 136 + 3: 136 -11,11: - 2: 248 + 3: 248 -10,9: - 2: 52479 - 3: 4096 + 3: 52479 + 4: 4096 -10,10: - 3: 17 - 2: 34952 + 4: 17 + 3: 34952 -10,11: - 2: 2296 + 3: 2296 -9,12: - 2: 17476 + 3: 17476 8,-15: 0: 65535 7,-15: @@ -7613,50 +7671,50 @@ entities: 9,-14: 0: 4403 10,-16: - 2: 3584 + 3: 3584 11,-16: - 2: 7936 + 3: 7936 10,-14: - 2: 34816 + 3: 34816 11,-14: - 2: 29489 + 3: 29489 11,-15: - 2: 4369 + 3: 4369 12,-16: - 2: 3840 + 3: 3840 4,-17: - 2: 4096 + 3: 4096 4,-14: - 2: 2048 + 3: 2048 5,-14: - 2: 1024 + 3: 1024 6,-14: - 2: 512 + 3: 512 -8,13: - 2: 29666 + 3: 29666 -9,13: - 2: 3140 + 3: 3140 -8,14: - 2: 15 + 3: 15 -7,13: - 2: 32816 + 3: 32816 0: 1032 -7,14: - 2: 15 + 3: 15 -6,13: 0: 255 -6,14: - 2: 49 + 3: 49 -5,13: 0: 51 - 3: 51208 + 4: 51208 -5,14: - 3: 264 + 4: 264 -4,13: - 3: 29443 + 4: 29443 0: 136 -4,14: - 3: 3 + 4: 3 -3,12: 0: 65520 -3,13: @@ -7675,166 +7733,166 @@ entities: 0: 8866 1,14: 0: 8710 - 2: 34952 + 3: 34952 1,15: 0: 8226 - 2: 34952 + 3: 34952 1,16: 0: 8738 - 2: 34952 + 3: 34952 2,13: 0: 184 2,14: - 2: 49023 + 3: 49023 2,15: - 2: 44974 + 3: 44974 2,16: - 2: 32702 + 3: 32702 3,13: 0: 255 3,14: - 2: 44847 + 3: 44847 3,15: - 2: 44975 + 3: 44975 3,16: - 2: 12207 + 3: 12207 4,14: - 2: 61439 + 3: 61439 4,15: - 2: 44971 + 3: 44971 4,13: 0: 224 4,16: - 2: 65515 + 3: 65515 5,15: - 2: 1279 + 3: 1279 0: 8192 5,13: 0: 8738 - 3: 136 + 4: 136 5,14: 0: 546 - 2: 16384 + 3: 16384 5,16: 0: 8738 6,15: - 2: 255 + 3: 255 6,13: 0: 1262 7,13: 0: 1279 7,15: - 2: 255 + 3: 255 8,15: - 2: 255 + 3: 255 9,15: - 2: 255 + 3: 255 10,15: - 2: 55 + 3: 55 10,14: - 2: 65224 + 3: 65224 11,14: - 2: 311 + 3: 311 11,13: - 2: 65228 + 3: 65228 12,12: - 2: 65535 + 3: 65535 13,10: - 2: 17 + 3: 17 13,9: - 2: 13028 + 3: 13028 13,8: - 2: 19652 + 3: 19652 13,7: - 2: 20478 + 3: 20478 14,9: - 2: 248 + 3: 248 14,8: - 2: 52428 + 3: 52428 14,7: - 2: 51711 + 3: 51711 15,8: - 2: 56797 + 3: 56797 15,9: - 2: 248 + 3: 248 15,7: - 2: 55539 + 3: 55539 16,8: - 2: 56797 + 3: 56797 16,9: - 2: 248 + 3: 248 13,5: 0: 1911 13,6: 0: 4111 - 2: 60928 + 3: 60928 14,5: 0: 4369 14,6: 0: 1 - 2: 13056 + 3: 13056 15,6: - 2: 14024 + 3: 14024 16,4: - 2: 29233 + 3: 29233 16,6: - 2: 34947 + 3: 34947 16,7: - 2: 55544 + 3: 55544 13,12: - 2: 4095 + 3: 4095 14,12: - 2: 4095 + 3: 4095 15,12: - 2: 4095 + 3: 4095 16,12: - 2: 883 + 3: 883 0,18: - 2: 49160 + 3: 49160 0,17: - 2: 34816 + 3: 34816 1,17: - 2: 24856 + 3: 24856 0: 3106 1,18: - 2: 61987 + 3: 61987 2,17: - 2: 57359 + 3: 57359 0: 1792 2,18: - 2: 4238 + 3: 4238 3,17: - 2: 61455 + 3: 61455 0: 1792 3,18: - 2: 255 + 3: 255 4,17: - 2: 12303 + 3: 12303 0: 3840 4,18: - 2: 49155 + 3: 49155 5,17: 0: 290 - 2: 48192 + 3: 48192 5,18: - 2: 61998 + 3: 61998 6,17: - 2: 18244 + 3: 18244 6,18: - 2: 4164 + 3: 4164 6,16: - 2: 16384 + 3: 16384 -15,0: - 2: 1 + 3: 1 0: 52428 -15,1: - 2: 4401 + 3: 4401 0: 34944 -15,2: - 2: 4369 + 3: 4369 0: 2176 -15,3: - 2: 34959 + 3: 34959 -15,-1: 0: 52732 -14,0: @@ -7844,49 +7902,49 @@ entities: -14,2: 0: 61439 -14,3: - 2: 61440 + 3: 61440 0: 14 -14,-1: 0: 65535 -13,2: 0: 817 - 2: 128 + 3: 128 -13,3: - 2: 12834 + 3: 12834 -13,5: - 2: 8742 + 3: 8742 -13,6: - 2: 25122 + 3: 25122 -13,8: - 2: 50722 + 3: 50722 -16,-16: - 2: 30583 + 3: 30583 -16,-17: - 2: 29187 + 3: 29187 -16,-15: - 2: 29426 + 3: 29426 -17,-15: - 2: 29426 + 3: 29426 -16,-14: - 2: 30583 + 3: 30583 -16,-13: - 2: 2 + 3: 2 -15,-15: - 2: 240 + 3: 240 -15,-16: - 2: 65520 + 3: 65520 -15,-13: - 3: 64 + 4: 64 -14,-16: - 2: 24404 + 3: 24404 -14,-15: - 2: 52980 + 3: 52980 -14,-17: - 2: 24404 + 3: 24404 -13,-15: - 2: 29456 + 3: 29456 -14,-14: - 2: 8 + 3: 8 0,-20: 0: 34952 0,-19: @@ -7920,140 +7978,140 @@ entities: -2,-18: 0: 4096 -16,-2: - 2: 12 + 3: 12 0: 51200 -16,-1: 0: 2240 -16,-3: - 2: 32768 + 3: 32768 -15,-3: - 2: 4369 + 3: 4369 0: 52428 -15,-2: - 2: 1 + 3: 1 0: 64972 -14,-3: 0: 65535 -14,-2: 0: 65535 16,5: - 2: 62242 + 3: 62242 17,5: - 2: 61440 + 3: 61440 17,6: - 2: 65520 + 3: 65520 17,7: - 2: 55536 + 3: 55536 17,8: - 2: 56797 + 3: 56797 18,5: - 2: 61440 + 3: 61440 18,6: - 2: 65520 + 3: 65520 18,7: - 2: 55536 + 3: 55536 18,8: - 2: 56797 + 3: 56797 19,5: - 2: 61440 + 3: 61440 19,6: - 2: 48056 + 3: 48056 19,7: - 2: 39162 + 3: 39162 19,8: - 2: 39321 + 3: 39321 20,7: - 2: 16 + 3: 16 -12,-19: - 2: 61440 + 3: 61440 -13,-19: - 2: 61440 + 3: 61440 -12,-18: - 2: 4880 + 3: 4880 -13,-18: - 2: 65520 + 3: 65520 -12,-17: - 2: 4880 + 3: 4880 -13,-17: - 2: 65520 + 3: 65520 -11,-19: - 2: 61440 + 3: 61440 -10,-19: - 2: 4096 + 3: 4096 -10,-18: 0: 4 -18,-12: - 2: 68 + 3: 68 -18,-13: - 2: 17476 + 3: 17476 -18,-15: - 2: 17636 + 3: 17636 -18,-16: - 2: 17476 + 3: 17476 -18,-17: - 2: 17484 + 3: 17484 -18,-14: - 2: 17476 + 3: 17476 -17,-16: - 2: 30583 + 3: 30583 -17,-17: - 2: 29199 + 3: 29199 -17,-14: - 2: 30583 + 3: 30583 -17,-13: - 2: 2 + 3: 2 16,-12: - 2: 546 + 3: 546 16,-13: - 2: 8743 + 3: 8743 -16,-19: - 2: 57344 + 3: 57344 -16,-18: - 2: 10786 + 3: 10786 -15,-19: - 2: 61440 + 3: 61440 -15,-18: - 2: 65520 + 3: 65520 -15,-17: - 2: 65520 + 3: 65520 -14,-19: - 2: 62464 + 3: 62464 -14,-18: - 2: 24404 + 3: 24404 12,-15: - 2: 30496 + 3: 30496 12,-14: - 2: 10103 + 3: 10103 13,-16: - 2: 3840 + 3: 3840 13,-15: - 2: 30496 + 3: 30496 13,-14: - 2: 10103 + 3: 10103 14,-16: - 2: 3840 + 3: 3840 14,-15: - 2: 30496 + 3: 30496 14,-14: - 2: 10103 + 3: 10103 15,-16: - 2: 3840 + 3: 3840 15,-15: - 2: 30496 + 3: 30496 15,-14: - 2: 10103 + 3: 10103 16,-16: - 2: 8960 + 3: 8960 16,-15: - 2: 8738 + 3: 8738 16,-14: - 2: 8738 + 3: 8738 17,9: - 2: 248 + 3: 248 18,9: - 2: 248 + 3: 248 19,9: - 2: 248 + 3: 248 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -8085,6 +8143,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 immutable: True moles: @@ -9836,6 +9909,16 @@ entities: container: 8991 - proto: AirAlarm entities: + - uid: 3220 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,30.5 + parent: 2 + - type: DeviceList + devices: + - 16149 + - 16148 - uid: 5583 components: - type: Transform @@ -9919,6 +10002,17 @@ entities: - 5218 - 16531 - 16532 + - uid: 14996 + components: + - type: Transform + pos: -3.5,39.5 + parent: 2 + - type: DeviceList + devices: + - 876 + - 18504 + - 16179 + - 16180 - uid: 15512 components: - type: Transform @@ -10525,26 +10619,6 @@ entities: - 18457 - 14690 - 14689 - - uid: 18469 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 33.5,16.5 - parent: 2 - - type: DeviceList - devices: - - 18471 - - 18472 - - 18473 - - 18474 - - 18475 - - 18476 - - 18468 - - 18467 - - 18459 - - 14721 - - 18461 - - 14720 - uid: 18478 components: - type: Transform @@ -10620,7 +10694,7 @@ entities: - 18490 - 16551 - 16552 - - 18502 + - 876 - 18504 - 18485 - 13281 @@ -10710,15 +10784,12 @@ entities: parent: 2 - type: DeviceList devices: - - 18560 - - 18559 - - 18571 - 18572 - - 18568 - - 18569 - - 18574 - - 16794 + - 18571 + - 18559 + - 18560 - 13584 + - 16794 - 18573 - uid: 18570 components: @@ -10740,7 +10811,6 @@ entities: - 18577 - 13560 - 13559 - - 18574 - uid: 18582 components: - type: Transform @@ -11399,6 +11469,26 @@ entities: - 3136 - 9112 - 28612 + - uid: 28879 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,11.5 + parent: 2 + - type: DeviceList + devices: + - 18459 + - 14721 + - 18461 + - 14720 + - 18474 + - 18473 + - 18475 + - 18476 + - 18467 + - 18468 + - 18471 + - 18472 - proto: AirCanister entities: - uid: 4223 @@ -11770,21 +11860,43 @@ entities: - type: Transform pos: -32.5,34.5 parent: 2 + - type: DeviceLinkSource + linkedPorts: + 28923: + - DoorStatus: InputB - uid: 8505 components: - type: Transform pos: -33.5,34.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 28923: + - DoorStatus: InputA - uid: 8506 components: - type: Transform pos: -32.5,38.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 28922: + - DoorStatus: InputB - uid: 8507 components: - type: Transform pos: -33.5,38.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 28922: + - DoorStatus: InputA - proto: AirlockAtmosphericsLocked entities: - uid: 8143 @@ -12432,6 +12544,22 @@ entities: linkedPorts: 8424: - DoorStatus: DoorBolt + - uid: 28436 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,36.5 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 5 + - type: DeviceLinkSource + linkedPorts: + 8507: + - DoorStatus: DoorBolt + 8506: + - DoorStatus: DoorBolt + 8505: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassCargoLocked entities: - uid: 826 @@ -12439,6 +12567,12 @@ entities: - type: Transform pos: -60.5,-20.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 28494: + - DoorStatus: DoorBolt - uid: 11331 components: - type: Transform @@ -12454,6 +12588,12 @@ entities: - type: Transform pos: -58.5,-19.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 826: + - DoorStatus: DoorBolt - uid: 28495 components: - type: Transform @@ -12839,10 +12979,6 @@ entities: rot: 3.141592653589793 rad pos: 26.5,54.5 parent: 2 - - type: DeviceLinkSource - linkedPorts: - 6863: - - DoorStatus: DoorBolt - uid: 6991 components: - type: Transform @@ -13083,6 +13219,48 @@ entities: - type: Transform pos: 17.5,-17.5 parent: 2 + - uid: 858 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 29.5,51.5 + parent: 2 + - uid: 859 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,51.5 + parent: 2 + - uid: 873 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,37.5 + parent: 2 + - uid: 1284 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-28.5 + parent: 2 + - uid: 1324 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-28.5 + parent: 2 + - uid: 1325 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-55.5 + parent: 2 + - uid: 1326 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-55.5 + parent: 2 - uid: 3448 components: - type: Transform @@ -13107,29 +13285,191 @@ entities: rot: -1.5707963267948966 rad pos: -29.5,2.5 parent: 2 - - uid: 6863 + - uid: 8247 components: - type: Transform - rot: 3.141592653589793 rad - pos: 30.5,51.5 + rot: -1.5707963267948966 rad + pos: -41.5,-5.5 parent: 2 - - uid: 6864 + - uid: 8252 components: - type: Transform - rot: 3.141592653589793 rad - pos: 29.5,51.5 + rot: -1.5707963267948966 rad + pos: -0.5,18.5 parent: 2 - - uid: 7850 + - uid: 8254 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,38.5 + rot: -1.5707963267948966 rad + pos: -0.5,-17.5 parent: 2 - - uid: 7851 + - uid: 8256 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,37.5 + rot: -1.5707963267948966 rad + pos: 18.5,0.5 + parent: 2 + - uid: 8257 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,48.5 + parent: 2 + - uid: 8259 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -27.5,0.5 + parent: 2 + - uid: 8261 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,-0.5 + parent: 2 + - uid: 8262 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-0.5 + parent: 2 + - uid: 8263 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,-0.5 + parent: 2 + - uid: 8393 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -42.5,-5.5 + parent: 2 + - uid: 8515 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -40.5,-5.5 + parent: 2 + - uid: 8542 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,0.5 + parent: 2 + - uid: 8580 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,18.5 + parent: 2 + - uid: 8581 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,29.5 + parent: 2 + - uid: 8588 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,48.5 + parent: 2 + - uid: 8589 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-17.5 + parent: 2 + - uid: 8623 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,18.5 + parent: 2 + - uid: 8624 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,29.5 + parent: 2 + - uid: 8625 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,29.5 + parent: 2 + - uid: 8627 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-28.5 + parent: 2 + - uid: 8775 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -27.5,1.5 + parent: 2 + - uid: 8780 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-0.5 + parent: 2 + - uid: 8818 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,1.5 + parent: 2 + - uid: 8821 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,1.5 + parent: 2 + - uid: 8890 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,0.5 + parent: 2 + - uid: 8891 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,1.5 + parent: 2 + - uid: 8918 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,0.5 + parent: 2 + - uid: 8919 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,1.5 + parent: 2 + - uid: 8927 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-17.5 + parent: 2 + - uid: 9161 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -27.5,-0.5 + parent: 2 + - uid: 9311 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-55.5 parent: 2 - uid: 12229 components: @@ -13163,6 +13503,12 @@ entities: - type: Transform pos: 4.5,-63.5 parent: 2 + - uid: 28603 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,36.5 + parent: 2 - proto: AirlockHatch entities: - uid: 10942 @@ -13729,21 +14075,18 @@ entities: - type: Transform pos: -22.5,-39.5 parent: 2 + - uid: 877 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-35.5 + parent: 2 - uid: 1372 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-36.5 parent: 2 - - uid: 1373 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-35.5 - parent: 2 - - type: Door - secondsUntilStateChange: -583970.1 - state: Opening - uid: 1496 components: - type: Transform @@ -13899,6 +14242,12 @@ entities: parent: 2 - proto: AirlockScienceGlassLocked entities: + - uid: 878 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-48.5 + parent: 2 - uid: 9731 components: - type: Transform @@ -13931,11 +14280,6 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-43.5 parent: 2 - - uid: 10272 - components: - - type: Transform - pos: -9.5,-48.5 - parent: 2 - uid: 10308 components: - type: Transform @@ -14119,23 +14463,47 @@ entities: - type: Transform pos: 60.5,48.5 parent: 2 + - type: DeviceLinkSource + lastSignals: + DoorStatus: True + - type: Door + secondsUntilStateChange: -4821.3525 + state: Opening - uid: 6934 components: - type: Transform rot: 3.141592653589793 rad pos: 60.5,50.5 parent: 2 + - type: DeviceLinkSource + lastSignals: + DoorStatus: True + - type: Door + secondsUntilStateChange: -4823.986 + state: Opening - uid: 6935 components: - type: Transform rot: 3.141592653589793 rad pos: 62.5,50.5 parent: 2 + - type: DeviceLinkSource + lastSignals: + DoorStatus: True + - type: Door + secondsUntilStateChange: -4822.836 + state: Opening - uid: 6936 components: - type: Transform pos: 62.5,48.5 parent: 2 + - type: DeviceLinkSource + lastSignals: + DoorStatus: True + - type: Door + secondsUntilStateChange: -4822.0522 + state: Opening - proto: AirlockTheatreLocked entities: - uid: 2191 @@ -14479,7 +14847,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 18469 + - 28879 - uid: 18460 components: - type: Transform @@ -14494,7 +14862,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 18469 + - 28879 - uid: 18462 components: - type: Transform @@ -14650,16 +15018,6 @@ entities: - type: DeviceNetwork deviceLists: - 18567 - - uid: 18574 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -33.5,36.5 - parent: 2 - - type: DeviceNetwork - deviceLists: - - 18567 - - 18570 - uid: 18576 components: - type: Transform @@ -15515,6 +15873,12 @@ entities: rot: -1.5707963267948966 rad pos: 20.5,45.5 parent: 2 + - uid: 884 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 52.5,17.5 + parent: 2 - uid: 2023 components: - type: MetaData @@ -15528,12 +15892,6 @@ entities: - type: Transform pos: 12.5,-40.5 parent: 2 - - uid: 12830 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 52.5,17.5 - parent: 2 - proto: APCSuperCapacity entities: - uid: 733 @@ -15548,8 +15906,36 @@ entities: rot: 1.5707963267948966 rad pos: -9.5,-45.5 parent: 2 +- proto: Ash + entities: + - uid: 28873 + components: + - type: Transform + pos: 35.773716,-16.714659 + parent: 2 - proto: Ashtray entities: + - uid: 10272 + components: + - type: Transform + pos: 34.393116,-15.167919 + parent: 2 + - type: Storage + storedItems: + 11535: + position: 0,0 + _rotation: South + 11867: + position: 1,0 + _rotation: South + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 11535 + - 11867 - uid: 23244 components: - type: Transform @@ -34704,36 +35090,6 @@ entities: - type: Transform pos: -42.5,25.5 parent: 2 - - uid: 9293 - components: - - type: Transform - pos: -40.5,29.5 - parent: 2 - - uid: 9294 - components: - - type: Transform - pos: -41.5,29.5 - parent: 2 - - uid: 9295 - components: - - type: Transform - pos: -42.5,29.5 - parent: 2 - - uid: 9296 - components: - - type: Transform - pos: -40.5,31.5 - parent: 2 - - uid: 9297 - components: - - type: Transform - pos: -41.5,31.5 - parent: 2 - - uid: 9298 - components: - - type: Transform - pos: -42.5,31.5 - parent: 2 - uid: 9299 components: - type: Transform @@ -35889,10 +36245,10 @@ entities: parent: 2 - proto: Autolathe entities: - - uid: 6716 + - uid: 6864 components: - type: Transform - pos: 8.5,31.5 + pos: 7.5,30.5 parent: 2 - uid: 9959 components: @@ -37250,6 +37606,12 @@ entities: rot: 3.141592653589793 rad pos: -53.658516,9.595246 parent: 2 + - uid: 28614 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 34.492344,-15.954241 + parent: 2 - proto: BoxFolderWhite entities: - uid: 1115 @@ -37581,11 +37943,6 @@ entities: - type: Transform pos: 7.3088074,9.718449 parent: 21002 - - uid: 23354 - components: - - type: Transform - pos: 38.630417,16.50916 - parent: 2 - proto: ButtonFrameGrey entities: - uid: 4519 @@ -37678,11 +38035,26 @@ entities: - type: Transform pos: -21.5,-10.5 parent: 2 + - uid: 1282 + components: + - type: Transform + pos: -39.5,27.5 + parent: 2 + - uid: 1283 + components: + - type: Transform + pos: -39.5,32.5 + parent: 2 - uid: 1330 components: - type: Transform pos: -11.5,-80.5 parent: 2 + - uid: 1373 + components: + - type: Transform + pos: -38.5,32.5 + parent: 2 - uid: 1434 components: - type: Transform @@ -38493,6 +38865,11 @@ entities: - type: Transform pos: -9.5,-82.5 parent: 2 + - uid: 1865 + components: + - type: Transform + pos: -38.5,27.5 + parent: 2 - uid: 1929 components: - type: Transform @@ -49138,6 +49515,11 @@ entities: - type: Transform pos: -40.5,40.5 parent: 2 + - uid: 14151 + components: + - type: Transform + pos: -40.5,32.5 + parent: 2 - uid: 14189 components: - type: Transform @@ -51858,46 +52240,6 @@ entities: - type: Transform pos: -37.5,33.5 parent: 2 - - uid: 23308 - components: - - type: Transform - pos: -38.5,31.5 - parent: 2 - - uid: 23309 - components: - - type: Transform - pos: -39.5,31.5 - parent: 2 - - uid: 23310 - components: - - type: Transform - pos: -40.5,31.5 - parent: 2 - - uid: 23311 - components: - - type: Transform - pos: -41.5,31.5 - parent: 2 - - uid: 23312 - components: - - type: Transform - pos: -41.5,29.5 - parent: 2 - - uid: 23313 - components: - - type: Transform - pos: -40.5,29.5 - parent: 2 - - uid: 23314 - components: - - type: Transform - pos: -39.5,29.5 - parent: 2 - - uid: 23315 - components: - - type: Transform - pos: -38.5,29.5 - parent: 2 - uid: 23316 components: - type: Transform @@ -54923,6 +55265,76 @@ entities: - type: Transform pos: -31.5,9.5 parent: 2 + - uid: 28908 + components: + - type: Transform + pos: -41.5,32.5 + parent: 2 + - uid: 28909 + components: + - type: Transform + pos: -42.5,32.5 + parent: 2 + - uid: 28910 + components: + - type: Transform + pos: -43.5,32.5 + parent: 2 + - uid: 28911 + components: + - type: Transform + pos: -44.5,32.5 + parent: 2 + - uid: 28912 + components: + - type: Transform + pos: -44.5,31.5 + parent: 2 + - uid: 28913 + components: + - type: Transform + pos: -44.5,30.5 + parent: 2 + - uid: 28914 + components: + - type: Transform + pos: -44.5,29.5 + parent: 2 + - uid: 28915 + components: + - type: Transform + pos: -44.5,28.5 + parent: 2 + - uid: 28916 + components: + - type: Transform + pos: -44.5,27.5 + parent: 2 + - uid: 28917 + components: + - type: Transform + pos: -44.5,33.5 + parent: 2 + - uid: 28918 + components: + - type: Transform + pos: -44.5,34.5 + parent: 2 + - uid: 28919 + components: + - type: Transform + pos: -44.5,35.5 + parent: 2 + - uid: 28920 + components: + - type: Transform + pos: -44.5,36.5 + parent: 2 + - uid: 28921 + components: + - type: Transform + pos: -44.5,37.5 + parent: 2 - proto: CableApcStack1 entities: - uid: 23589 @@ -68331,26 +68743,6 @@ entities: - type: Transform pos: 22.5,-16.5 parent: 2 - - uid: 857 - components: - - type: Transform - pos: 22.5,-23.5 - parent: 2 - - uid: 858 - components: - - type: Transform - pos: 23.5,-22.5 - parent: 2 - - uid: 859 - components: - - type: Transform - pos: 24.5,-21.5 - parent: 2 - - uid: 873 - components: - - type: Transform - pos: 21.5,-23.5 - parent: 2 - uid: 874 components: - type: Transform @@ -68361,36 +68753,6 @@ entities: - type: Transform pos: 19.5,-23.5 parent: 2 - - uid: 876 - components: - - type: Transform - pos: 22.5,-22.5 - parent: 2 - - uid: 877 - components: - - type: Transform - pos: 20.5,-23.5 - parent: 2 - - uid: 878 - components: - - type: Transform - pos: 24.5,-20.5 - parent: 2 - - uid: 880 - components: - - type: Transform - pos: 23.5,-21.5 - parent: 2 - - uid: 884 - components: - - type: Transform - pos: 23.5,-21.5 - parent: 2 - - uid: 885 - components: - - type: Transform - pos: 24.5,-19.5 - parent: 2 - uid: 886 components: - type: Transform @@ -68401,21 +68763,6 @@ entities: - type: Transform pos: 24.5,-17.5 parent: 2 - - uid: 888 - components: - - type: Transform - pos: 21.5,-22.5 - parent: 2 - - uid: 889 - components: - - type: Transform - pos: 22.5,-21.5 - parent: 2 - - uid: 890 - components: - - type: Transform - pos: 23.5,-20.5 - parent: 2 - uid: 891 components: - type: Transform @@ -68568,11 +68915,53 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-23.5 parent: 2 + - uid: 2604 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-23.5 + parent: 2 + - uid: 2605 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-21.5 + parent: 2 + - uid: 2730 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-21.5 + parent: 2 + - uid: 3227 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-21.5 + parent: 2 + - uid: 5571 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-20.5 + parent: 2 - uid: 5738 components: - type: Transform pos: 13.5,29.5 parent: 2 + - uid: 6258 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-22.5 + parent: 2 + - uid: 6259 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-22.5 + parent: 2 - uid: 6376 components: - type: Transform @@ -68608,6 +68997,24 @@ entities: - type: Transform pos: 16.5,28.5 parent: 2 + - uid: 6716 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-22.5 + parent: 2 + - uid: 6849 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-23.5 + parent: 2 + - uid: 6857 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-20.5 + parent: 2 - uid: 12160 components: - type: Transform @@ -68628,6 +69035,42 @@ entities: - type: Transform pos: -38.5,-23.5 parent: 2 + - uid: 28886 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-19.5 + parent: 2 + - uid: 28887 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-19.5 + parent: 2 + - uid: 28888 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-19.5 + parent: 2 + - uid: 28889 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-20.5 + parent: 2 + - uid: 28890 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-20.5 + parent: 2 + - uid: 28891 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-20.5 + parent: 2 - proto: CarpetBlue entities: - uid: 2676 @@ -70638,6 +71081,12 @@ entities: rot: 1.5707963267948966 rad pos: -27.5,36.5 parent: 2 + - uid: 9212 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 56.5,-31.5 + parent: 2 - uid: 9384 components: - type: Transform @@ -73527,6 +73976,12 @@ entities: rot: -1.5707963267948966 rad pos: -25.5,23.5 parent: 2 + - uid: 28604 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 57.5,-31.5 + parent: 2 - proto: Chair entities: - uid: 495 @@ -73724,12 +74179,6 @@ entities: rot: 1.5707963267948966 rad pos: -56.5,-21.5 parent: 2 - - uid: 18707 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -56.5,-21.5 - parent: 2 - uid: 18708 components: - type: Transform @@ -74569,6 +75018,19 @@ entities: rot: 3.141592653589793 rad pos: -9.4977665,-59.404213 parent: 2 +- proto: ChurchBell + entities: + - uid: 28892 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-17.5 + parent: 2 + - uid: 28893 + components: + - type: Transform + pos: 18.5,-18.5 + parent: 2 - proto: ChurchOrganInstrument entities: - uid: 45 @@ -74608,6 +75070,26 @@ entities: - type: Transform pos: -54.0773,9.794919 parent: 2 +- proto: Cigarette + entities: + - uid: 28871 + components: + - type: Transform + pos: 34.674366,-15.053335 + parent: 2 + - uid: 28872 + components: + - type: Transform + pos: 34.580616,-15.188752 + parent: 2 +- proto: CigaretteSpent + entities: + - uid: 11535 + components: + - type: Transform + parent: 10272 + - type: Physics + canCollide: False - proto: CigarGold entities: - uid: 2705 @@ -74640,6 +75122,21 @@ entities: rot: 1.5707963267948966 rad pos: -46.538147,-11.384542 parent: 2 +- proto: CigarSpent + entities: + - uid: 11867 + components: + - type: Transform + parent: 10272 + - type: Physics + canCollide: False +- proto: CigPackRed + entities: + - uid: 28869 + components: + - type: Transform + pos: 34.622284,-14.886669 + parent: 2 - proto: CircuitImprinter entities: - uid: 9961 @@ -76703,6 +77200,12 @@ entities: - type: Transform pos: -16.5,14.5 parent: 2 + - uid: 28595 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,35.5 + parent: 2 - proto: ComputerAlert entities: - uid: 9322 @@ -77607,10 +78110,10 @@ entities: parent: 2 - proto: CrateElectrical entities: - - uid: 6259 + - uid: 9603 components: - type: Transform - pos: 7.5,30.5 + pos: 8.5,31.5 parent: 2 - uid: 19667 components: @@ -77703,10 +78206,10 @@ entities: parent: 2 - proto: CrateEngineeringElectricalSupplies entities: - - uid: 6258 + - uid: 1276 components: - type: Transform - pos: 6.5,30.5 + pos: 8.5,30.5 parent: 2 - proto: CrateEngineeringMiniJetpack entities: @@ -78341,7 +78844,7 @@ entities: - uid: 28353 components: - type: Transform - pos: -20.5,-4.5 + pos: -24.5,-20.5 parent: 2 - type: EntityStorage open: True @@ -87605,7 +88108,7 @@ entities: - uid: 23355 components: - type: Transform - pos: 38.60958,16.707075 + pos: 38.62831,16.89455 parent: 2 - uid: 23370 components: @@ -87718,6 +88221,11 @@ entities: - type: Transform pos: 19.668665,37.711403 parent: 2 + - uid: 23353 + components: + - type: Transform + pos: 34.69026,-16.54799 + parent: 2 - uid: 23571 components: - type: Transform @@ -87772,12 +88280,12 @@ entities: - type: Transform pos: -48.22078,-11.387981 parent: 2 -- proto: DrinkIceJug +- proto: DrinkIceBucket entities: - - uid: 23353 + - uid: 7849 components: - type: Transform - pos: 38.8075,16.75916 + pos: 38.63873,16.467466 parent: 2 - proto: DrinkJar entities: @@ -88136,6 +88644,11 @@ entities: - type: Transform pos: 36.738503,-2.8382018 parent: 2 + - uid: 8622 + components: + - type: Transform + pos: 34.48193,-16.51674 + parent: 2 - uid: 23618 components: - type: Transform @@ -89153,6 +89666,13 @@ entities: - type: Transform pos: -59.512844,-33.467316 parent: 2 +- proto: EvidenceMarkerOne + entities: + - uid: 28866 + components: + - type: Transform + pos: 34.392616,-14.27478 + parent: 2 - proto: ExosuitFabricator entities: - uid: 10470 @@ -89247,12 +89767,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-47.5 parent: 2 - - uid: 23799 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-51.5 - parent: 2 - uid: 23800 components: - type: Transform @@ -89270,6 +89784,12 @@ entities: - type: Transform pos: -29.5,34.5 parent: 2 + - uid: 28905 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-52.5 + parent: 2 - proto: FaxMachineBase entities: - uid: 1043 @@ -89405,6 +89925,14 @@ entities: - type: Transform pos: 32.5,20.5 parent: 2 +- proto: FenceWoodSmallGate + entities: + - uid: 28615 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -55.5,-36.5 + parent: 2 - proto: FigureSpawner entities: - uid: 23863 @@ -89688,6 +90216,16 @@ entities: - 17899 - 16671 - 12062 + - uid: 15810 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,38.5 + parent: 2 + - type: DeviceList + devices: + - 876 + - 18504 - uid: 18231 components: - type: Transform @@ -90302,7 +90840,7 @@ entities: - 18490 - 16551 - 16552 - - 18502 + - 876 - 18504 - uid: 18531 components: @@ -90934,6 +91472,15 @@ entities: - 26798 - 26787 - 26792 + - uid: 28901 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,51.5 + parent: 2 + - type: DeviceList + devices: + - 18546 - proto: FireAxeCabinetFilled entities: - uid: 2471 @@ -92346,6 +92893,18 @@ entities: - 18288 - 18282 - 18271 + - uid: 876 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,36.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 18500 + - 18501 + - 15810 + - 14996 - uid: 2200 components: - type: Transform @@ -93488,7 +94047,7 @@ entities: - 18464 - 18463 - 18470 - - 18469 + - 28879 - uid: 18468 components: - type: Transform @@ -93500,7 +94059,7 @@ entities: - 18464 - 18463 - 18470 - - 18469 + - 28879 - uid: 18471 components: - type: Transform @@ -93510,7 +94069,7 @@ entities: - type: DeviceNetwork deviceLists: - 18470 - - 18469 + - 28879 - 18477 - 18478 - uid: 18472 @@ -93522,7 +94081,7 @@ entities: - type: DeviceNetwork deviceLists: - 18470 - - 18469 + - 28879 - 18477 - 18478 - uid: 18473 @@ -93534,7 +94093,7 @@ entities: - type: DeviceNetwork deviceLists: - 18470 - - 18469 + - 28879 - 18484 - 18480 - uid: 18474 @@ -93546,7 +94105,7 @@ entities: - type: DeviceNetwork deviceLists: - 18470 - - 18469 + - 28879 - 18484 - 18480 - uid: 18475 @@ -93558,7 +94117,7 @@ entities: - type: DeviceNetwork deviceLists: - 18470 - - 18469 + - 28879 - 18483 - 18482 - uid: 18476 @@ -93570,7 +94129,7 @@ entities: - type: DeviceNetwork deviceLists: - 18470 - - 18469 + - 28879 - 18483 - 18482 - uid: 18488 @@ -93685,15 +94244,6 @@ entities: deviceLists: - 18498 - 18499 - - uid: 18502 - components: - - type: Transform - pos: -2.5,38.5 - parent: 2 - - type: DeviceNetwork - deviceLists: - - 18500 - - 18501 - uid: 18504 components: - type: Transform @@ -93703,6 +94253,8 @@ entities: deviceLists: - 18500 - 18501 + - 15810 + - 14996 - uid: 18522 components: - type: Transform @@ -93830,6 +94382,7 @@ entities: - 18551 - 18553 - 9410 + - 28901 - uid: 18547 components: - type: Transform @@ -93903,7 +94456,6 @@ entities: - type: DeviceNetwork deviceLists: - 18566 - - 18567 - 18575 - 18570 - uid: 18569 @@ -93915,7 +94467,6 @@ entities: - type: DeviceNetwork deviceLists: - 18566 - - 18567 - 18575 - 18570 - uid: 18571 @@ -95382,16 +95933,6 @@ entities: - type: Transform pos: -42.5,25.5 parent: 2 - - uid: 8580 - components: - - type: Transform - pos: -42.5,29.5 - parent: 2 - - uid: 8581 - components: - - type: Transform - pos: -42.5,31.5 - parent: 2 - uid: 9778 components: - type: Transform @@ -95468,18 +96009,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8523 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -40.5,31.5 - parent: 2 - - uid: 8524 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -40.5,29.5 - parent: 2 - uid: 8527 components: - type: Transform @@ -95662,17 +96191,6 @@ entities: - type: Transform pos: 52.5,16.5 parent: 21002 - - uid: 28594 - components: - - type: Transform - pos: -41.5,29.5 - parent: 2 - - uid: 28595 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -41.5,31.5 - parent: 2 - proto: GasPipeBend entities: - uid: 51 @@ -95864,18 +96382,6 @@ entities: rot: 3.141592653589793 rad pos: -42.5,24.5 parent: 2 - - uid: 8588 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -42.5,28.5 - parent: 2 - - uid: 8589 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -42.5,30.5 - parent: 2 - uid: 8652 components: - type: Transform @@ -96036,30 +96542,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 9201 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -44.5,34.5 - parent: 2 - - uid: 9204 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -41.5,27.5 - parent: 2 - - uid: 9212 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -40.5,36.5 - parent: 2 - - uid: 9234 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -44.5,27.5 - parent: 2 - uid: 9390 components: - type: Transform @@ -98016,46 +98498,6 @@ entities: parent: 21002 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 28599 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -41.5,33.5 - parent: 2 - - uid: 28600 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -39.5,33.5 - parent: 2 - - uid: 28613 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -40.5,34.5 - parent: 2 - - uid: 28614 - components: - - type: Transform - anchored: False - rot: 3.141592653589793 rad - pos: -40.5,34.5 - parent: 2 - - type: Physics - canCollide: True - bodyType: Dynamic - - uid: 28615 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -42.5,36.5 - parent: 2 - - uid: 28616 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -41.5,34.5 - parent: 2 - uid: 28634 components: - type: Transform @@ -98902,6 +99344,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 8250 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,35.5 + parent: 2 + - type: AtmosPipeColor + color: '#B3A234FF' - uid: 8534 components: - type: Transform @@ -98944,18 +99394,6 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,25.5 parent: 2 - - uid: 8541 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -39.5,29.5 - parent: 2 - - uid: 8542 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -39.5,31.5 - parent: 2 - uid: 8543 components: - type: Transform @@ -99286,42 +99724,14 @@ entities: rot: 1.5707963267948966 rad pos: -38.5,28.5 parent: 2 - - uid: 8622 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -39.5,28.5 - parent: 2 - - uid: 8623 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -40.5,28.5 - parent: 2 - - uid: 8624 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -41.5,28.5 - parent: 2 - - uid: 8625 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -41.5,30.5 - parent: 2 - uid: 8626 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -40.5,30.5 - parent: 2 - - uid: 8627 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -39.5,30.5 + rot: -1.5707963267948966 rad + pos: -33.5,35.5 parent: 2 + - type: AtmosPipeColor + color: '#B3A234FF' - uid: 8628 components: - type: Transform @@ -99963,13 +100373,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#3AB334FF' - - uid: 8775 - components: - - type: Transform - pos: -33.5,37.5 - parent: 2 - - type: AtmosPipeColor - color: '#3AB334FF' - uid: 8776 components: - type: Transform @@ -99998,13 +100401,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#3AB334FF' - - uid: 8780 - components: - - type: Transform - pos: -32.5,35.5 - parent: 2 - - type: AtmosPipeColor - color: '#B3A234FF' - uid: 8781 components: - type: Transform @@ -100050,17 +100446,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 8818 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -43.5,34.5 - parent: 2 - - uid: 8821 - components: - - type: Transform - pos: -44.5,32.5 - parent: 2 - uid: 8822 components: - type: Transform @@ -100302,16 +100687,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 9199 - components: - - type: Transform - pos: -44.5,29.5 - parent: 2 - - uid: 9200 - components: - - type: Transform - pos: -44.5,28.5 - parent: 2 - uid: 9386 components: - type: Transform @@ -100408,12 +100783,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 9604 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -43.5,27.5 - parent: 2 - uid: 9611 components: - type: Transform @@ -105924,18 +106293,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 14128 - components: - - type: Transform - anchored: False - rot: -1.5707963267948966 rad - pos: 10.5,-19.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 14129 components: - type: Transform @@ -106071,17 +106428,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 14151 - components: - - type: Transform - anchored: False - pos: 32.5,-1.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 14155 components: - type: Transform @@ -117403,16 +117749,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 16792 - components: - - type: Transform - pos: -44.5,33.5 - parent: 2 - - uid: 16793 - components: - - type: Transform - pos: -44.5,31.5 - parent: 2 - uid: 16796 components: - type: Transform @@ -118944,6 +119280,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 23463 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,37.5 + parent: 2 + - type: AtmosPipeColor + color: '#3AB334FF' - uid: 23478 components: - type: Transform @@ -119299,11 +119643,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 24118 - components: - - type: Transform - pos: -44.5,30.5 - parent: 2 - uid: 25219 components: - type: Transform @@ -119846,28 +120185,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 28593 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -41.5,28.5 - parent: 2 - - uid: 28597 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -41.5,32.5 - parent: 2 - - uid: 28598 - components: - - type: Transform - anchored: False - rot: 3.141592653589793 rad - pos: -41.5,32.5 - parent: 2 - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 28620 components: - type: Transform @@ -120197,6 +120514,22 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 8524 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -33.5,37.5 + parent: 2 + - type: AtmosPipeColor + color: '#3AB334FF' + - uid: 8541 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -32.5,35.5 + parent: 2 + - type: AtmosPipeColor + color: '#B3A234FF' - uid: 8683 components: - type: Transform @@ -122911,30 +123244,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 28602 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -39.5,34.5 - parent: 2 - - uid: 28604 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -39.5,36.5 - parent: 2 - - uid: 28617 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -42.5,34.5 - parent: 2 - - uid: 28618 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -41.5,36.5 - parent: 2 - uid: 28624 components: - type: Transform @@ -123269,22 +123578,6 @@ entities: rot: 1.5707963267948966 rad pos: -36.5,29.5 parent: 2 - - uid: 9202 - components: - - type: Transform - pos: -42.5,35.5 - parent: 2 - - uid: 9311 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -41.5,35.5 - parent: 2 - - uid: 9603 - components: - - type: Transform - pos: -40.5,35.5 - parent: 2 - uid: 9752 components: - type: Transform @@ -123319,12 +123612,6 @@ entities: targetPressure: 501.325 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 28603 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -39.5,35.5 - parent: 2 - proto: GasThermoMachineFreezer entities: - uid: 9281 @@ -123384,6 +123671,16 @@ entities: bodyType: Dynamic - proto: GasValve entities: + - uid: 888 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,37.5 + parent: 2 + - type: GasValve + open: False + - type: AtmosPipeColor + color: '#3AB334FF' - uid: 8100 components: - type: Transform @@ -123434,6 +123731,48 @@ entities: open: False - type: AtmosPipeColor color: '#B3A234FF' + - uid: 8248 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,35.5 + parent: 2 + - type: GasValve + open: False + - type: AtmosPipeColor + color: '#B3A234FF' + - uid: 8329 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -39.5,30.5 + parent: 2 + - type: GasValve + open: False + - uid: 8359 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -39.5,28.5 + parent: 2 + - type: GasValve + open: False + - uid: 8361 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -39.5,31.5 + parent: 2 + - type: GasValve + open: False + - uid: 8523 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -39.5,29.5 + parent: 2 + - type: GasValve + open: False - uid: 8689 components: - type: Transform @@ -123499,14 +123838,6 @@ entities: parent: 2 - type: GasValve open: False - - uid: 9211 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -42.5,27.5 - parent: 2 - - type: GasValve - open: False - uid: 9759 components: - type: Transform @@ -123554,14 +123885,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 28601 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -40.5,33.5 - parent: 2 - - type: GasValve - open: False - uid: 28605 components: - type: Transform @@ -124248,7 +124571,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 18469 + - 28879 - type: AtmosPipeColor color: '#0335FCFF' - uid: 14741 @@ -124954,6 +125277,9 @@ entities: rot: 3.141592653589793 rad pos: -17.5,29.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 3220 - type: AtmosPipeColor color: '#0335FCFF' - uid: 16179 @@ -124962,6 +125288,9 @@ entities: rot: 3.141592653589793 rad pos: -6.5,35.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 14996 - type: AtmosPipeColor color: '#0335FCFF' - uid: 16188 @@ -126065,7 +126394,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 18469 + - 28879 - type: AtmosPipeColor color: '#FF1212FF' - uid: 14740 @@ -126608,18 +126937,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 15810 - components: - - type: Transform - anchored: False - rot: 3.141592653589793 rad - pos: -6.5,-28.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 15814 components: - type: Transform @@ -126776,6 +127093,9 @@ entities: rot: 3.141592653589793 rad pos: -16.5,28.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 3220 - type: AtmosPipeColor color: '#FF1212FF' - uid: 16180 @@ -126784,6 +127104,9 @@ entities: rot: 3.141592653589793 rad pos: -8.5,35.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 14996 - type: AtmosPipeColor color: '#FF1212FF' - uid: 16189 @@ -129202,12 +129525,6 @@ entities: rot: 3.141592653589793 rad pos: 27.5,54.5 parent: 2 - - uid: 6857 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 28.5,54.5 - parent: 2 - uid: 6858 components: - type: Transform @@ -130189,12 +130506,6 @@ entities: rot: 3.141592653589793 rad pos: -37.5,16.5 parent: 2 - - uid: 8393 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -37.5,15.5 - parent: 2 - uid: 8394 components: - type: Transform @@ -130243,16 +130554,6 @@ entities: rot: 3.141592653589793 rad pos: -40.5,2.5 parent: 2 - - uid: 8514 - components: - - type: Transform - pos: -39.5,31.5 - parent: 2 - - uid: 8515 - components: - - type: Transform - pos: -39.5,29.5 - parent: 2 - uid: 8516 components: - type: Transform @@ -131070,6 +131371,12 @@ entities: rot: -1.5707963267948966 rad pos: -53.5,-15.5 parent: 2 + - uid: 11983 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -37.5,15.5 + parent: 2 - uid: 12307 components: - type: Transform @@ -135868,7 +136175,7 @@ entities: pos: 36.5,-35.5 parent: 2 - type: Door - secondsUntilStateChange: -16897.393 + secondsUntilStateChange: -32977.18 state: Opening - uid: 5211 components: @@ -136775,6 +137082,14 @@ entities: - type: Transform pos: 27.345627,0.6012745 parent: 21002 +- proto: Lighter + entities: + - uid: 28870 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 34.559784,-14.813752 + parent: 2 - proto: LightReplacer entities: - uid: 9677 @@ -137567,6 +137882,41 @@ entities: - type: Transform pos: 35.5,35.5 parent: 2 +- proto: LogicGate + entities: + - uid: 28922 + components: + - type: Transform + pos: -32.477474,37.47289 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 28924: + - Output: InputA + - uid: 28923 + components: + - type: Transform + pos: -32.49831,35.52497 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 4 + - type: DeviceLinkSource + linkedPorts: + 28924: + - Output: InputB + - uid: 28924 + components: + - type: Transform + pos: -33.46706,36.483307 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 28436: + - Output: DoorBolt - proto: MachineAnomalyGenerator entities: - uid: 3797 @@ -137849,6 +138199,11 @@ entities: - type: Transform pos: 58.5,7.5 parent: 2 + - uid: 12259 + components: + - type: Transform + pos: -18.5,18.5 + parent: 2 - uid: 23232 components: - type: Transform @@ -137874,6 +138229,21 @@ entities: - type: Transform pos: -11.5,26.5 parent: 2 + - uid: 28594 + components: + - type: Transform + pos: 48.5,-31.5 + parent: 2 + - uid: 28880 + components: + - type: Transform + pos: -22.5,20.5 + parent: 2 + - uid: 28882 + components: + - type: Transform + pos: 41.5,-44.5 + parent: 2 - proto: MaintenanceToolSpawner entities: - uid: 255 @@ -138004,11 +138374,6 @@ entities: - type: Transform pos: -54.5,-30.5 parent: 2 - - uid: 8712 - components: - - type: Transform - pos: -57.5,-14.5 - parent: 2 - proto: MatterBinStockPart entities: - uid: 23592 @@ -138592,11 +138957,6 @@ entities: - type: Transform pos: 40.5,50.5 parent: 2 - - uid: 11868 - components: - - type: Transform - pos: -57.5,-21.5 - parent: 2 - uid: 15320 components: - type: Transform @@ -138757,10 +139117,10 @@ entities: parent: 2 - proto: OreProcessor entities: - - uid: 11983 + - uid: 9204 components: - type: Transform - pos: -56.5,-16.5 + pos: -57.5,-15.5 parent: 2 - proto: OxygenCanister entities: @@ -138799,6 +139159,11 @@ entities: - type: Transform pos: -42.5,13.5 parent: 2 + - uid: 9211 + components: + - type: Transform + pos: -57.5,-21.5 + parent: 2 - uid: 9468 components: - type: Transform @@ -138809,11 +139174,6 @@ entities: - type: Transform pos: 8.5,-35.5 parent: 2 - - uid: 11867 - components: - - type: Transform - pos: -57.5,-16.5 - parent: 2 - uid: 18928 components: - type: Transform @@ -139604,6 +139964,12 @@ entities: - type: Transform pos: -16.680094,39.619514 parent: 2 + - uid: 28865 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 34.554844,-15.797991 + parent: 2 - proto: PenCap entities: - uid: 2672 @@ -139656,6 +140022,13 @@ entities: - type: Transform pos: -4.5151863,-48.460827 parent: 2 +- proto: PetCarrier + entities: + - uid: 16800 + components: + - type: Transform + pos: -20.5,-4.5 + parent: 2 - proto: PhoneInstrument entities: - uid: 2675 @@ -140255,16 +140628,25 @@ entities: - type: Transform pos: 22.5,35.5 parent: 2 - - uid: 28331 - components: - - type: Transform - pos: 3.5,30.5 - parent: 2 - uid: 28332 components: - type: Transform pos: -32.5,7.5 parent: 2 + - uid: 28881 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,39.5 + parent: 2 +- proto: PosterLegitAnatomyPoster + entities: + - uid: 9399 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -32.5,-33.5 + parent: 2 - proto: PosterLegitCarpMount entities: - uid: 28493 @@ -140348,6 +140730,22 @@ entities: - type: Transform pos: -5.5,53.5 parent: 2 +- proto: PosterLegitSafetyMothEpi + entities: + - uid: 1051 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-30.5 + parent: 2 +- proto: PosterLegitSafetyMothMeth + entities: + - uid: 8712 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,-37.5 + parent: 2 - proto: PosterLegitThereIsNoGasGiant entities: - uid: 9176 @@ -141638,11 +142036,6 @@ entities: rot: -1.5707963267948966 rad pos: 26.5,22.5 parent: 2 - - uid: 5571 - components: - - type: Transform - pos: -4.5,38.5 - parent: 2 - uid: 5641 components: - type: Transform @@ -141826,18 +142219,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,52.5 parent: 2 - - uid: 7938 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,35.5 - parent: 2 - - uid: 7939 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,31.5 - parent: 2 - uid: 7940 components: - type: Transform @@ -141983,6 +142364,23 @@ entities: - type: Transform pos: -11.5,43.5 parent: 2 + - uid: 9294 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,31.5 + parent: 2 + - uid: 9295 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,35.5 + parent: 2 + - uid: 9296 + components: + - type: Transform + pos: -4.5,38.5 + parent: 2 - uid: 9578 components: - type: Transform @@ -142888,6 +143286,12 @@ entities: powerLoad: 10 - proto: PoweredLightPostSmall entities: + - uid: 1042 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -45.5,37.5 + parent: 2 - uid: 2259 components: - type: Transform @@ -142898,6 +143302,12 @@ entities: - type: Transform pos: 46.5,-50.5 parent: 2 + - uid: 8258 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -45.5,31.5 + parent: 2 - uid: 11558 components: - type: Transform @@ -142950,11 +143360,6 @@ entities: - type: Transform pos: -41.5,7.5 parent: 2 - - uid: 14996 - components: - - type: Transform - pos: -38.5,34.5 - parent: 2 - uid: 20783 components: - type: Transform @@ -143123,12 +143528,6 @@ entities: - type: Transform pos: 30.5,-14.5 parent: 2 - - uid: 4011 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 35.5,-16.5 - parent: 2 - uid: 4239 components: - type: Transform @@ -143199,16 +143598,6 @@ entities: - type: Transform pos: -41.5,25.5 parent: 2 - - uid: 9161 - components: - - type: Transform - pos: -41.5,29.5 - parent: 2 - - uid: 9162 - components: - - type: Transform - pos: -41.5,31.5 - parent: 2 - uid: 9186 components: - type: Transform @@ -143233,6 +143622,12 @@ entities: rot: 3.141592653589793 rad pos: -12.5,46.5 parent: 2 + - uid: 9298 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 35.5,-15.5 + parent: 2 - uid: 9852 components: - type: Transform @@ -143854,6 +144249,12 @@ entities: rot: 1.5707963267948966 rad pos: -21.5,25.5 parent: 2 + - uid: 28877 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 43.5,8.5 + parent: 2 - proto: PresentRandomCash entities: - uid: 9641 @@ -143881,10 +144282,10 @@ entities: color: '#03FCD3FF' - proto: Protolathe entities: - - uid: 6715 + - uid: 7789 components: - type: Transform - pos: 8.5,30.5 + pos: 6.5,30.5 parent: 2 - uid: 9960 components: @@ -145603,6 +146004,16 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-16.5 parent: 21002 + - uid: 28894 + components: + - type: Transform + pos: 20.5,-22.5 + parent: 2 + - uid: 28895 + components: + - type: Transform + pos: 23.5,-19.5 + parent: 2 - proto: RailingCornerSmall entities: - uid: 380 @@ -146014,6 +146425,30 @@ entities: - type: Transform pos: 19.5,-25.5 parent: 21002 + - uid: 28896 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-22.5 + parent: 2 + - uid: 28897 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-19.5 + parent: 2 + - uid: 28898 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-21.5 + parent: 2 + - uid: 28899 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-18.5 + parent: 2 - proto: RailingRound entities: - uid: 3408 @@ -147322,21 +147757,11 @@ entities: - type: Transform pos: -7.5,46.5 parent: 2 - - uid: 8359 - components: - - type: Transform - pos: -39.5,31.5 - parent: 2 - uid: 8360 components: - type: Transform pos: -39.5,25.5 parent: 2 - - uid: 8361 - components: - - type: Transform - pos: -39.5,29.5 - parent: 2 - uid: 8508 components: - type: Transform @@ -148760,11 +149185,6 @@ entities: - type: Transform pos: 31.5,54.5 parent: 2 - - uid: 6849 - components: - - type: Transform - pos: 28.5,54.5 - parent: 2 - uid: 6850 components: - type: Transform @@ -149034,12 +149454,6 @@ entities: rot: 3.141592653589793 rad pos: -37.5,14.5 parent: 2 - - uid: 8329 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -37.5,15.5 - parent: 2 - uid: 8330 components: - type: Transform @@ -149244,6 +149658,12 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-30.5 parent: 2 + - uid: 9200 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -37.5,15.5 + parent: 2 - uid: 9256 components: - type: Transform @@ -150906,6 +151326,29 @@ entities: rot: 1.5707963267948966 rad pos: 56.5,-7.5 parent: 2 + - uid: 23309 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 62.5,-4.5 + parent: 2 + - uid: 23310 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 62.5,3.5 + parent: 2 + - uid: 23311 + components: + - type: Transform + pos: 56.5,6.5 + parent: 2 + - uid: 23312 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,3.5 + parent: 2 - uid: 23440 components: - type: Transform @@ -150988,6 +151431,16 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,46.5 parent: 2 + - uid: 24118 + components: + - type: Transform + pos: 10.5,18.5 + parent: 2 + - uid: 28331 + components: + - type: Transform + pos: 20.5,10.5 + parent: 2 - uid: 28364 components: - type: Transform @@ -151302,18 +151755,6 @@ entities: parent: 21002 - proto: ShuttersNormal entities: - - uid: 2604 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 34.5,12.5 - parent: 2 - - uid: 2605 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 34.5,15.5 - parent: 2 - uid: 7762 components: - type: Transform @@ -151337,6 +151778,18 @@ entities: - type: Transform pos: 20.5,-1.5 parent: 2 + - uid: 12261 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,15.5 + parent: 2 + - uid: 12830 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,12.5 + parent: 2 - uid: 16922 components: - type: Transform @@ -151953,10 +152406,18 @@ entities: parent: 2 - proto: SignAi entities: - - uid: 23184 + - uid: 23308 components: - type: Transform - rot: 3.141592653589793 rad + rot: -1.5707963267948966 rad + pos: 57.5,18.5 + parent: 2 +- proto: SignAiUpload + entities: + - uid: 12285 + components: + - type: Transform + rot: -1.5707963267948966 rad pos: 59.5,6.5 parent: 2 - proto: SignalButtonDirectional @@ -152102,18 +152563,6 @@ entities: - Pressed: Toggle 5742: - Pressed: Toggle - - uid: 2730 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 35.5,11.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 2604: - - Pressed: Toggle - 2605: - - Pressed: Toggle - uid: 2735 components: - type: MetaData @@ -152314,22 +152763,6 @@ entities: - Pressed: Toggle 7860: - Pressed: Toggle - - uid: 7984 - components: - - type: MetaData - name: light switch - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,36.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 5571: - - Pressed: Toggle - 7939: - - Pressed: Toggle - 7938: - - Pressed: Toggle - uid: 8946 components: - type: Transform @@ -152553,6 +152986,17 @@ entities: linkedPorts: 23781: - Pressed: Toggle + - uid: 18469 + components: + - type: Transform + pos: 35.5,16.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 12261: + - Pressed: Toggle + 12830: + - Pressed: Toggle - uid: 18694 components: - type: MetaData @@ -152874,14 +153318,78 @@ entities: linkedPorts: 12131: - Pressed: DoorBolt + - uid: 28868 + components: + - type: MetaData + name: light + - type: Transform + rot: 3.141592653589793 rad + pos: 35.5,-17.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 9298: + - Pressed: Toggle + - uid: 28874 + components: + - type: MetaData + name: light + - type: Transform + pos: 32.5,-13.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 3764: + - Pressed: Toggle + - uid: 28878 + components: + - type: MetaData + name: door bolt + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,36.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 23642: + - Pressed: DoorBolt + - uid: 28900 + components: + - type: MetaData + name: lights + - type: Transform + pos: -4.5,39.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 9296: + - Pressed: Toggle + 9294: + - Pressed: Toggle + 9295: + - Pressed: Toggle - proto: SignAnomaly entities: + - uid: 16793 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-36.5 + parent: 2 - uid: 23200 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-36.5 parent: 2 +- proto: SignArcade + entities: + - uid: 6863 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -47.5,-40.5 + parent: 2 - proto: SignArmory entities: - uid: 23185 @@ -152914,6 +153422,14 @@ entities: rot: 3.141592653589793 rad pos: 24.5,2.5 parent: 2 +- proto: SignCans + entities: + - uid: 8260 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -32.5,11.5 + parent: 2 - proto: SignCargo entities: - uid: 23190 @@ -152938,7 +153454,7 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-21.5 parent: 2 -- proto: SignChemistry1 +- proto: SignChem entities: - uid: 8921 components: @@ -152962,16 +153478,27 @@ entities: rot: 3.141592653589793 rad pos: 28.5,16.5 parent: 2 -- proto: SignCourt +- proto: SignCryo entities: - - uid: 8922 + - uid: 23799 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 34.5,-1.5 + pos: -45.5,-28.5 parent: 2 - proto: SignDangerMed entities: + - uid: 889 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-52.5 + parent: 2 + - uid: 7938 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-52.5 + parent: 2 - uid: 28305 components: - type: Transform @@ -152994,6 +153521,12 @@ entities: parent: 2 - proto: SignDirectionalChapel entities: + - uid: 1279 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-20.5 + parent: 2 - uid: 3461 components: - type: Transform @@ -153056,11 +153589,6 @@ entities: rot: 3.141592653589793 rad pos: -1.497997,-40.258747 parent: 2 - - uid: 20992 - components: - - type: Transform - pos: -2.4500175,39.76776 - parent: 2 - uid: 20995 components: - type: Transform @@ -153073,8 +153601,18 @@ entities: rot: 1.5707963267948966 rad pos: 38.525524,2.687672 parent: 2 + - uid: 28601 + components: + - type: Transform + pos: -0.50126964,39.711143 + parent: 2 - proto: SignDirectionalFood entities: + - uid: 14128 + components: + - type: Transform + pos: -0.5,39.5 + parent: 2 - uid: 20980 components: - type: Transform @@ -153093,11 +153631,6 @@ entities: rot: 3.141592653589793 rad pos: -1.497997,-40.456665 parent: 2 - - uid: 20993 - components: - - type: Transform - pos: -2.4500175,39.54901 - parent: 2 - uid: 20994 components: - type: Transform @@ -153407,6 +153940,12 @@ entities: parent: 2 - proto: SignEngineering entities: + - uid: 9293 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,30.5 + parent: 2 - uid: 23196 components: - type: Transform @@ -153429,6 +153968,12 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,-34.5 parent: 2 + - uid: 23198 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -36.5,-38.5 + parent: 2 - proto: SignFire entities: - uid: 28553 @@ -153436,7 +153981,65 @@ entities: - type: Transform pos: -27.5,34.5 parent: 2 -- proto: SignHydro2 +- proto: SignGravity + entities: + - uid: 9201 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,34.5 + parent: 2 +- proto: SignHead + entities: + - uid: 857 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 33.5,16.5 + parent: 2 + - uid: 7939 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,-36.5 + parent: 2 + - uid: 8251 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 47.5,-3.5 + parent: 2 + - uid: 9604 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,45.5 + parent: 2 + - uid: 18707 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,-33.5 + parent: 2 + - uid: 23313 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.5,-37.5 + parent: 2 + - uid: 23314 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -55.5,4.5 + parent: 2 + - uid: 28593 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-32.5 + parent: 2 +- proto: SignHydro1 entities: - uid: 23182 components: @@ -153446,11 +154049,11 @@ entities: parent: 2 - proto: SignInterrogation entities: - - uid: 8927 + - uid: 23315 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 36.5,-13.5 + rot: -1.5707963267948966 rad + pos: 33.5,-13.5 parent: 2 - proto: SignJanitor entities: @@ -153462,6 +154065,12 @@ entities: parent: 2 - proto: SignLawyer entities: + - uid: 8922 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 34.5,-1.5 + parent: 2 - uid: 8925 components: - type: Transform @@ -153566,13 +154175,21 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,-47.5 parent: 2 -- proto: SignScience +- proto: SignSalvage entities: - - uid: 23198 + - uid: 28902 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-36.5 + pos: -52.5,-15.5 + parent: 2 +- proto: SignScience + entities: + - uid: 28906 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-40.5 parent: 2 - proto: SignSecurity entities: @@ -153594,6 +154211,22 @@ entities: rot: 1.5707963267948966 rad pos: 26.5,-26.5 parent: 2 +- proto: SignServer + entities: + - uid: 28903 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-33.5 + parent: 2 +- proto: SignShipDock + entities: + - uid: 8514 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,2.5 + parent: 2 - proto: SignShock entities: - uid: 5411 @@ -153657,11 +154290,35 @@ entities: parent: 2 - proto: SignSpace entities: - - uid: 7789 + - uid: 880 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 58.5,-18.5 + rot: -1.5707963267948966 rad + pos: -34.5,38.5 + parent: 2 + - uid: 885 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-81.5 + parent: 2 + - uid: 890 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -50.5,-51.5 + parent: 2 + - uid: 7984 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 45.5,-47.5 + parent: 2 + - uid: 8249 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -58.5,-20.5 parent: 2 - uid: 8936 components: @@ -153669,6 +154326,24 @@ entities: rot: 1.5707963267948966 rad pos: 55.5,-32.5 parent: 2 + - uid: 9162 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,34.5 + parent: 2 + - uid: 9297 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -37.5,7.5 + parent: 2 + - uid: 23354 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 56.5,-18.5 + parent: 2 - uid: 28314 components: - type: Transform @@ -153689,6 +154364,18 @@ entities: - type: Transform pos: 47.5,-45.5 parent: 21002 + - uid: 28437 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -46.5,-54.5 + parent: 2 + - uid: 28864 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-81.5 + parent: 2 - proto: SignSurgery entities: - uid: 8937 @@ -153704,6 +154391,14 @@ entities: - type: Transform pos: -30.5,-2.5 parent: 2 +- proto: SignTheater + entities: + - uid: 28904 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,-48.5 + parent: 2 - proto: SignToolStorage entities: - uid: 5794 @@ -153712,6 +154407,22 @@ entities: rot: -1.5707963267948966 rad pos: -27.5,2.5 parent: 2 +- proto: SignVirology + entities: + - uid: 28907 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -30.5,-24.5 + parent: 2 +- proto: SignXenobio + entities: + - uid: 7850 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-51.5 + parent: 2 - proto: SingularityGenerator entities: - uid: 7089 @@ -154006,11 +154717,6 @@ entities: - type: Transform pos: 15.5,37.5 parent: 2 - - uid: 9399 - components: - - type: Transform - pos: 15.5,37.5 - parent: 2 - proto: SodaDispenserMachineCircuitboard entities: - uid: 5812 @@ -157422,6 +158128,18 @@ entities: parent: 2 - proto: StairStageDark entities: + - uid: 4011 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-19.5 + parent: 2 + - uid: 6715 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-23.5 + parent: 2 - uid: 28344 components: - type: Transform @@ -157455,6 +158173,17 @@ entities: parent: 2 - proto: StationMap entities: + - uid: 18502 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -39.5,-16.5 + parent: 2 + - uid: 18574 + components: + - type: Transform + pos: -47.5,-28.5 + parent: 2 - uid: 23439 components: - type: Transform @@ -157494,11 +158223,6 @@ entities: rot: -1.5707963267948966 rad pos: -39.5,-1.5 parent: 2 - - uid: 23463 - components: - - type: Transform - pos: -43.5,-28.5 - parent: 2 - uid: 23493 components: - type: Transform @@ -157828,16 +158552,6 @@ entities: - type: Transform pos: -42.5,25.5 parent: 2 - - uid: 8890 - components: - - type: Transform - pos: -42.5,29.5 - parent: 2 - - uid: 8891 - components: - - type: Transform - pos: -42.5,31.5 - parent: 2 - uid: 9743 components: - type: Transform @@ -159009,14 +159723,19 @@ entities: pos: -20.5,-2.5 parent: 2 - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEntertainment id: Exhibit A - uid: 532 components: - type: Transform + anchored: False pos: -21.5,-2.5 parent: 2 - type: SurveillanceCamera id: Exhibit B + - type: Physics + bodyType: Dynamic - uid: 3481 components: - type: Transform @@ -160050,6 +160769,12 @@ entities: - type: Transform pos: 37.5,-34.5 parent: 2 + - uid: 9202 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,-16.5 + parent: 2 - uid: 13006 components: - type: Transform @@ -160080,6 +160805,18 @@ entities: - type: Transform pos: 58.5,14.5 parent: 2 + - uid: 16792 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,-14.5 + parent: 2 + - uid: 28613 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,-15.5 + parent: 2 - proto: TableCounterWood entities: - uid: 294 @@ -160146,24 +160883,12 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-54.5 parent: 2 - - uid: 12259 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -54.5,-36.5 - parent: 2 - uid: 12260 components: - type: Transform rot: -1.5707963267948966 rad pos: -53.5,-36.5 parent: 2 - - uid: 12261 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -56.5,-36.5 - parent: 2 - uid: 12263 components: - type: Transform @@ -160206,6 +160931,16 @@ entities: rot: 3.141592653589793 rad pos: 12.5,34.5 parent: 2 + - uid: 20992 + components: + - type: Transform + pos: -54.5,-36.5 + parent: 2 + - uid: 20993 + components: + - type: Transform + pos: -56.5,-36.5 + parent: 2 - uid: 23276 components: - type: Transform @@ -161105,11 +161840,6 @@ entities: - type: Transform pos: 8.5,-18.5 parent: 2 - - uid: 1042 - components: - - type: Transform - pos: 8.5,-19.5 - parent: 2 - uid: 1572 components: - type: Transform @@ -161729,6 +162459,11 @@ entities: - type: Transform pos: 16.5,1.5 parent: 21002 + - uid: 23184 + components: + - type: Transform + pos: 8.5,-19.5 + parent: 2 - uid: 23374 components: - type: Transform @@ -169819,96 +170554,6 @@ entities: rot: 3.141592653589793 rad pos: -37.5,34.5 parent: 2 - - uid: 8247 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -40.5,32.5 - parent: 2 - - uid: 8248 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -41.5,32.5 - parent: 2 - - uid: 8249 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -42.5,32.5 - parent: 2 - - uid: 8250 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -43.5,32.5 - parent: 2 - - uid: 8251 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -43.5,31.5 - parent: 2 - - uid: 8252 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -43.5,30.5 - parent: 2 - - uid: 8254 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -41.5,30.5 - parent: 2 - - uid: 8256 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -39.5,32.5 - parent: 2 - - uid: 8257 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -39.5,30.5 - parent: 2 - - uid: 8258 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -39.5,28.5 - parent: 2 - - uid: 8259 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -40.5,28.5 - parent: 2 - - uid: 8260 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -41.5,28.5 - parent: 2 - - uid: 8261 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -42.5,28.5 - parent: 2 - - uid: 8262 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -43.5,28.5 - parent: 2 - - uid: 8263 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -43.5,29.5 - parent: 2 - uid: 8264 components: - type: Transform @@ -170428,6 +171073,11 @@ entities: - type: Transform pos: -29.5,24.5 parent: 2 + - uid: 9199 + components: + - type: Transform + pos: 28.5,54.5 + parent: 2 - uid: 9383 components: - type: Transform @@ -172831,6 +173481,11 @@ entities: - type: Transform pos: -48.5,-28.5 parent: 2 + - uid: 11868 + components: + - type: Transform + pos: 28.5,55.5 + parent: 2 - uid: 11962 components: - type: Transform @@ -173535,12 +174190,6 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,48.5 parent: 2 - - uid: 16800 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -34.5,36.5 - parent: 2 - uid: 18052 components: - type: Transform @@ -176079,18 +176728,6 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,32.5 parent: 21002 - - uid: 28436 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -40.5,30.5 - parent: 2 - - uid: 28437 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -42.5,30.5 - parent: 2 - uid: 28521 components: - type: Transform @@ -176665,12 +177302,6 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-17.5 parent: 2 - - uid: 1276 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 7.5,-17.5 - parent: 2 - uid: 1277 components: - type: Transform @@ -176683,54 +177314,12 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-17.5 parent: 2 - - uid: 1279 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 8.5,-17.5 - parent: 2 - uid: 1280 components: - type: Transform rot: 3.141592653589793 rad pos: 18.5,-4.5 parent: 2 - - uid: 1282 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-7.5 - parent: 2 - - uid: 1283 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-6.5 - parent: 2 - - uid: 1284 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-9.5 - parent: 2 - - uid: 1324 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-8.5 - parent: 2 - - uid: 1325 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,-17.5 - parent: 2 - - uid: 1326 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 10.5,-17.5 - parent: 2 - uid: 1327 components: - type: Transform @@ -178589,11 +179178,11 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,35.5 parent: 2 - - uid: 7849 + - uid: 7851 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,36.5 + rot: 3.141592653589793 rad + pos: -2.5,38.5 parent: 2 - uid: 7852 components: @@ -179710,11 +180299,6 @@ entities: - type: Transform pos: -51.5,-18.5 parent: 2 - - uid: 11535 - components: - - type: Transform - pos: -57.5,-15.5 - parent: 2 - uid: 11536 components: - type: Transform @@ -180482,6 +181066,54 @@ entities: - type: Transform pos: -22.5,27.5 parent: 2 + - uid: 28597 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-17.5 + parent: 2 + - uid: 28598 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-17.5 + parent: 2 + - uid: 28599 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-9.5 + parent: 2 + - uid: 28600 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-17.5 + parent: 2 + - uid: 28602 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-8.5 + parent: 2 + - uid: 28883 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-17.5 + parent: 2 + - uid: 28884 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-6.5 + parent: 2 + - uid: 28885 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-7.5 + parent: 2 - proto: WallSolidRust entities: - uid: 24642 @@ -181248,18 +181880,6 @@ entities: rot: -1.5707963267948966 rad pos: -22.5,22.5 parent: 2 - - uid: 8918 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -39.5,30.5 - parent: 2 - - uid: 8919 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -39.5,28.5 - parent: 2 - uid: 8938 components: - type: Transform @@ -181703,11 +182323,6 @@ entities: rot: 1.5707963267948966 rad pos: 49.5,-37.5 parent: 2 - - uid: 12285 - components: - - type: Transform - pos: -55.5,-36.5 - parent: 2 - proto: WindoorHydroponicsLocked entities: - uid: 3318 @@ -181892,6 +182507,14 @@ entities: - type: Transform pos: -5.5,-34.5 parent: 2 +- proto: WindoorSecureSalvageLocked + entities: + - uid: 9234 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -57.5,-16.5 + parent: 2 - proto: WindoorSecureScienceLocked entities: - uid: 9918 @@ -182767,6 +183390,44 @@ entities: rot: 3.141592653589793 rad pos: -19.5,-26.5 parent: 2 + - uid: 28616 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -56.5,-28.5 + parent: 2 + - uid: 28617 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -56.5,-29.5 + parent: 2 + - uid: 28618 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -56.5,-27.5 + parent: 2 +- proto: WindowFrostedDirectional + entities: + - uid: 28867 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,-16.5 + parent: 2 + - uid: 28875 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,-15.5 + parent: 2 + - uid: 28876 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 34.5,-14.5 + parent: 2 - proto: WindowReinforcedDirectional entities: - uid: 352 @@ -182925,12 +183586,6 @@ entities: rot: -1.5707963267948966 rad pos: -14.5,-12.5 parent: 2 - - uid: 1865 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -56.5,-28.5 - parent: 2 - uid: 2329 components: - type: Transform @@ -182967,18 +183622,6 @@ entities: rot: -1.5707963267948966 rad pos: 19.5,4.5 parent: 2 - - uid: 3220 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -56.5,-27.5 - parent: 2 - - uid: 3227 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -56.5,-29.5 - parent: 2 - uid: 3424 components: - type: Transform @@ -183261,11 +183904,6 @@ entities: - type: Transform pos: -35.5,-4.5 parent: 2 - - uid: 1051 - components: - - type: Transform - pos: 11.5,-19.5 - parent: 2 - uid: 1596 components: - type: Transform @@ -183312,8 +183950,13 @@ entities: pos: 24.5,2.5 parent: 21002 - type: Door - secondsUntilStateChange: -362102 + secondsUntilStateChange: -378181.78 state: Opening + - uid: 28863 + components: + - type: Transform + pos: 11.5,-19.5 + parent: 2 - proto: WoodenBench entities: - uid: 21 From 12089285644fca383be893c6c4ae284bbbfc23f8 Mon Sep 17 00:00:00 2001 From: JIPDawg <51352440+JIPDawg@users.noreply.github.com> Date: Sat, 20 Jul 2024 01:23:07 -0500 Subject: [PATCH 027/108] Added missing builld components to RCD [empty] (#30177) * Added missing stuff to rcd[empty] * do the smart thing --------- Co-authored-by: JIP --- .../Prototypes/Entities/Objects/Tools/tools.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 36e629c21c..fba506d1f9 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -401,20 +401,6 @@ components: - type: LimitedCharges charges: 0 - - type: RCD - availablePrototypes: - - WallSolid - - FloorSteel - - Plating - - Catwalk - - Grille - - Window - - WindowDirectional - - WindowReinforcedDirectional - - ReinforcedWindow - - Airlock - - AirlockGlass - - Firelock - type: entity id: RCDRecharging From 297baaca2324b57d93dc61d59e3a402886c0847f Mon Sep 17 00:00:00 2001 From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Date: Sat, 20 Jul 2024 01:06:52 -0700 Subject: [PATCH 028/108] Add user to AttemptMeleeEvent, add ThrowItemAttemptEvent (#30193) * Add user to AttemptMeleeEvent, add ThrowItemAttemptEvent * Add xmldoc --- Content.Shared/ActionBlocker/ActionBlockerSystem.cs | 8 +++++++- Content.Shared/Throwing/ThrowAttemptEvent.cs | 8 ++++++++ Content.Shared/Weapons/Melee/Events/AttemptMeleeEvent.cs | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs index 005c7dc78e..afa1e19ead 100644 --- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs +++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs @@ -120,7 +120,13 @@ namespace Content.Shared.ActionBlocker var ev = new ThrowAttemptEvent(user, itemUid); RaiseLocalEvent(user, ev); - return !ev.Cancelled; + if (ev.Cancelled) + return false; + + var itemEv = new ThrowItemAttemptEvent(user); + RaiseLocalEvent(itemUid, ref itemEv); + + return !itemEv.Cancelled; } public bool CanSpeak(EntityUid uid) diff --git a/Content.Shared/Throwing/ThrowAttemptEvent.cs b/Content.Shared/Throwing/ThrowAttemptEvent.cs index bf8cad6c74..dfb3dca5c7 100644 --- a/Content.Shared/Throwing/ThrowAttemptEvent.cs +++ b/Content.Shared/Throwing/ThrowAttemptEvent.cs @@ -13,6 +13,14 @@ public EntityUid ItemUid { get; } } + /// + /// Raised on the item entity that is thrown. + /// + /// The user that threw this entity. + /// Whether or not the throw should be cancelled. + [ByRefEvent] + public record struct ThrowItemAttemptEvent(EntityUid User, bool Cancelled = false); + /// /// Raised when we try to pushback an entity from throwing /// diff --git a/Content.Shared/Weapons/Melee/Events/AttemptMeleeEvent.cs b/Content.Shared/Weapons/Melee/Events/AttemptMeleeEvent.cs index 2800e3b34d..cbcadcd19f 100644 --- a/Content.Shared/Weapons/Melee/Events/AttemptMeleeEvent.cs +++ b/Content.Shared/Weapons/Melee/Events/AttemptMeleeEvent.cs @@ -4,4 +4,4 @@ namespace Content.Shared.Weapons.Melee.Events; /// Raised directed on a weapon when attempt a melee attack. /// [ByRefEvent] -public record struct AttemptMeleeEvent(bool Cancelled, string? Message); +public record struct AttemptMeleeEvent(EntityUid User, bool Cancelled = false, string? Message = null); From c89186a26f282b00a84c248490b2ba8fbcdd2da1 Mon Sep 17 00:00:00 2001 From: chavonadelal <156101927+chavonadelal@users.noreply.github.com> Date: Sat, 20 Jul 2024 19:14:41 +0300 Subject: [PATCH 029/108] Localization of encryption keys (#30172) * Localization of encryption keys * Localization of encryption keys update --- Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs | 4 ++-- Content.Shared/Radio/RadioChannelPrototype.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs index cfa553661a..7b050273db 100644 --- a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs +++ b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs @@ -239,14 +239,14 @@ public sealed partial class EncryptionKeySystem : EntitySystem { var msg = Loc.GetString("examine-headset-default-channel", ("prefix", SharedChatSystem.DefaultChannelPrefix), - ("channel", defaultChannel), + ("channel", proto.LocalizedName), ("color", proto.Color)); examineEvent.PushMarkup(msg); } if (HasComp(examineEvent.Examined)) { var msg = Loc.GetString("examine-encryption-default-channel", - ("channel", defaultChannel), + ("channel", proto.LocalizedName), ("color", proto.Color)); examineEvent.PushMarkup(msg); } diff --git a/Content.Shared/Radio/RadioChannelPrototype.cs b/Content.Shared/Radio/RadioChannelPrototype.cs index cc65f88537..166db0577e 100644 --- a/Content.Shared/Radio/RadioChannelPrototype.cs +++ b/Content.Shared/Radio/RadioChannelPrototype.cs @@ -9,7 +9,7 @@ public sealed partial class RadioChannelPrototype : IPrototype /// Human-readable name for the channel. /// [DataField("name")] - public string Name { get; private set; } = string.Empty; + public LocId Name { get; private set; } = string.Empty; [ViewVariables(VVAccess.ReadOnly)] public string LocalizedName => Loc.GetString(Name); From 6d664c9157cd9da7cecd5abb1beb93b4cf29cb19 Mon Sep 17 00:00:00 2001 From: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> Date: Sat, 20 Jul 2024 18:28:43 -0500 Subject: [PATCH 030/108] Add debug logs to baby jail and fix playtime logic (#30158) * add debug logs * Update Model.cs * fix playtime logic for null playtime * remove unnecessary condition * either me or the compiler is having a C# skill issue --- Content.Server.Database/Model.cs | 3 +++ Content.Server/Connection/ConnectionManager.cs | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs index dea8f9558a..d195201c29 100644 --- a/Content.Server.Database/Model.cs +++ b/Content.Server.Database/Model.cs @@ -903,6 +903,9 @@ namespace Content.Server.Database Panic = 3, /* * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future. + * + * If baby jail is removed, please reserve this value for as long as can reasonably be done to prevent causing ambiguity in connection denial reasons. + * Reservation by commenting out the value is likely sufficient for this purpose, but may impact projects which depend on SS14 like SS14.Admin. */ BabyJail = 4, } diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs index cf7581aa4e..1d675842c7 100644 --- a/Content.Server/Connection/ConnectionManager.cs +++ b/Content.Server/Connection/ConnectionManager.cs @@ -308,6 +308,12 @@ namespace Content.Server.Connection return (false, ""); var isAccountAgeInvalid = record.FirstSeenTime.CompareTo(DateTimeOffset.Now - TimeSpan.FromMinutes(maxAccountAgeMinutes)) <= 0; + + if (isAccountAgeInvalid) + { + _sawmill.Debug($"Baby jail will deny {userId} for account age {record.FirstSeenTime}"); // Remove on or after 2024-09 + } + if (isAccountAgeInvalid && showReason) { var locAccountReason = reason != string.Empty @@ -322,7 +328,12 @@ namespace Content.Server.Connection } var overallTime = ( await _db.GetPlayTimes(e.UserId)).Find(p => p.Tracker == PlayTimeTrackingShared.TrackerOverall); - var isTotalPlaytimeInvalid = overallTime == null || overallTime.TimeSpent.TotalMinutes >= maxPlaytimeMinutes; + var isTotalPlaytimeInvalid = overallTime != null && overallTime.TimeSpent.TotalMinutes >= maxPlaytimeMinutes; + + if (isTotalPlaytimeInvalid) + { + _sawmill.Debug($"Baby jail will deny {userId} for playtime {overallTime!.TimeSpent}"); // Remove on or after 2024-09 + } if (isTotalPlaytimeInvalid && showReason) { From cb0ba66be38677d248ce11f809221230ebe89642 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sat, 20 Jul 2024 20:42:27 -0400 Subject: [PATCH 031/108] Revert "Remove some BUI boilerplate" (#30214) Revert "Remove some BUI boilerplate (#28399)" This reverts commit cbf329a82d77eed2bb5e51666dab5d8a21fd3fff. --- .../UI/AccessOverriderBoundUserInterface.cs | 45 ++--- .../Access/UI/AccessOverriderWindow.xaml.cs | 41 +++-- .../UI/AgentIDCardBoundUserInterface.cs | 19 +- .../Access/UI/AgentIDCardWindow.xaml.cs | 10 +- .../Ame/UI/AmeControllerBoundUserInterface.cs | 16 +- Content.Client/Ame/UI/AmeWindow.xaml.cs | 19 +- .../Ui/AnomalyGeneratorBoundUserInterface.cs | 20 +- .../Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs | 8 +- Content.Client/Arcade/BlockGameMenu.cs | 45 ++--- .../Arcade/SpaceVillainArcadeMenu.cs | 45 +++-- .../Arcade/UI/BlockGameBoundUserInterface.cs | 5 +- .../SpaceVillainArcadeBoundUserInterface.cs | 16 +- .../Monitor/UI/AirAlarmBoundUserInterface.cs | 12 +- .../Atmos/Monitor/UI/AirAlarmWindow.xaml.cs | 7 +- .../Atmos/UI/GasCanisterBoundUserInterface.cs | 9 +- .../Atmos/UI/GasFilterBoundUserInterface.cs | 11 +- .../Atmos/UI/GasFilterWindow.xaml.cs | 7 +- .../Atmos/UI/GasMixerBoundUserInteface.cs | 18 +- .../UI/GasPressurePumpBoundUserInterface.cs | 17 +- .../UI/GasThermomachineBoundUserInterface.cs | 17 +- .../UI/GasVolumePumpBoundUserInterface.cs | 19 +- .../Atmos/UI/SpaceHeaterBoundUserInterface.cs | 10 +- .../Jukebox/JukeboxBoundUserInterface.cs | 21 ++- .../CryostorageBoundUserInterface.cs | 15 +- .../CargoBountyConsoleBoundUserInterface.cs | 17 +- .../CargoPalletConsoleBoundUserInterface.cs | 15 +- .../CargoShuttleConsoleBoundUserInterface.cs | 24 ++- .../Cargo/UI/CargoShuttleMenu.xaml.cs | 13 +- .../UI/ChemMasterBoundUserInterface.cs | 20 +- .../UI/ReagentDispenserBoundUserInterface.cs | 27 ++- .../UI/TransferAmountBoundUserInterface.cs | 12 +- .../UI/CloningConsoleBoundUserInterface.cs | 25 ++- .../UI/ChameleonBoundUserInterface.cs | 16 +- ...CommunicationsConsoleBoundUserInterface.cs | 72 +++++--- .../UI/CommunicationsConsoleMenu.xaml.cs | 79 ++++---- .../Computer/ComputerBoundUserInterface.cs | 15 +- .../UI/ConfigurationBoundUserInterface.cs | 28 ++- .../Configurable/UI/ConfigurationMenu.cs | 18 +- .../UI/FlatpackCreatorBoundUserInterface.cs | 14 +- .../UI/FlatpackCreatorMenu.xaml.cs | 13 +- .../Crayon/UI/CrayonBoundUserInterface.cs | 40 ++-- Content.Client/Crayon/UI/CrayonWindow.xaml.cs | 18 +- .../UI/DisposalRouterBoundUserInterface.cs | 22 ++- .../UI/DisposalTaggerBoundUserInterface.cs | 23 ++- .../DoorElectronicsBoundUserInterface.cs | 31 ++-- .../DoorElectronicsConfigurationMenu.xaml.cs | 21 +-- Content.Client/Fax/UI/FaxBoundUi.cs | 12 +- .../ForensicScannerBoundUserInterface.cs | 15 +- .../Gateway/UI/GatewayBoundUserInterface.cs | 16 +- .../Gateway/UI/GatewayWindow.xaml.cs | 10 +- .../UI/GravityGeneratorBoundUserInterface.cs | 23 ++- .../Gravity/UI/GravityGeneratorWindow.xaml.cs | 15 +- .../UI/HealthAnalyzerBoundUserInterface.cs | 23 ++- ...manoidMarkingModifierBoundUserInterface.cs | 4 +- .../Instruments/UI/BandMenu.xaml.cs | 6 +- .../Instruments/UI/ChannelsMenu.xaml.cs | 5 +- .../UI/InstrumentBoundUserInterface.cs | 36 +--- .../Instruments/UI/InstrumentMenu.xaml.cs | 171 ++++++++---------- .../Inventory/StrippableBoundUserInterface.cs | 25 +-- Content.Client/Kitchen/UI/GrinderMenu.xaml.cs | 42 +++-- .../Kitchen/UI/MicrowaveBoundUserInterface.cs | 47 ++++- .../Kitchen/UI/MicrowaveMenu.xaml.cs | 24 +-- .../UI/ReagentGrinderBoundUserInterface.cs | 34 ++-- .../UI/HandLabelerBoundUserInterface.cs | 16 +- .../Lathe/UI/LatheBoundUserInterface.cs | 17 +- Content.Client/Lathe/UI/LatheMenu.xaml.cs | 29 ++- .../UI/SignalTimerBoundUserInterface.cs | 24 ++- .../UI/SignalTimerWindow.xaml.cs | 24 ++- .../MagicMirrorBoundUserInterface.cs | 15 +- .../Ui/NewsWriterBoundUserInterface.cs | 18 +- .../MassMedia/Ui/NewsWriterMenu.xaml.cs | 6 +- .../Mech/Ui/MechBoundUserInterface.cs | 16 +- Content.Client/Mech/Ui/MechMenu.xaml.cs | 9 +- .../CrewMonitoringBoundUserInterface.cs | 18 +- .../CrewMonitoringWindow.xaml.cs | 17 +- .../NetworkConfiguratorBoundUserInterface.cs | 39 ++-- ...tworkConfiguratorConfigurationMenu.xaml.cs | 8 +- .../NetworkConfiguratorDeviceList.xaml.cs | 12 +- .../NetworkConfiguratorLinkMenu.xaml.cs | 16 +- .../NetworkConfiguratorListMenu.xaml.cs | 13 +- Content.Client/Nuke/NukeBoundUserInterface.cs | 17 +- .../WarDeclaratorBoundUserInterface.cs | 18 +- .../NukeOps/WarDeclaratorWindow.xaml.cs | 9 +- Content.Client/PDA/PdaBoundUserInterface.cs | 17 +- .../PDA/Ringer/RingerBoundUserInterface.cs | 4 +- .../Paper/UI/PaperBoundUserInterface.cs | 17 +- Content.Client/Paper/UI/PaperWindow.xaml.cs | 6 +- .../ParticleAcceleratorBoundUserInterface.cs | 16 +- .../UI/ParticleAcceleratorControlMenu.cs | 30 ++- .../UI/NavMapBeaconBoundUserInterface.cs | 16 +- .../Pinpointer/UI/NavMapBeaconWindow.xaml.cs | 25 +-- .../UI/StationMapBoundUserInterface.cs | 15 +- .../Pinpointer/UI/StationMapWindow.xaml.cs | 11 +- .../UI/UntrackedMapBoundUserInterface.cs | 15 +- .../Power/APC/ApcBoundUserInterface.cs | 16 +- Content.Client/Power/APC/UI/ApcMenu.xaml.cs | 12 +- .../Power/Generator/GeneratorWindow.xaml.cs | 52 +++--- .../PortableGeneratorBoundUserInterface.cs | 25 +-- ...owerMonitoringConsoleBoundUserInterface.cs | 19 +- .../PowerMonitoringWindow.xaml.Widgets.cs | 6 +- .../Power/PowerMonitoringWindow.xaml.cs | 86 ++++----- Content.Client/RCD/RCDMenu.xaml.cs | 35 ++-- .../RCD/RCDMenuBoundUserInterface.cs | 16 +- .../Radio/Ui/IntercomBoundUserInterface.cs | 20 +- Content.Client/Radio/Ui/IntercomMenu.xaml.cs | 4 +- .../UI/DiskConsoleBoundUserInterface.cs | 15 +- .../UI/ResearchClientBoundUserInterface.cs | 16 +- .../ResearchClientServerSelectionMenu.xaml.cs | 11 +- .../UI/ResearchConsoleBoundUserInterface.cs | 28 ++- .../Research/UI/ResearchConsoleMenu.xaml.cs | 31 ++-- .../UI/RoboticsConsoleBoundUserInterface.cs | 18 +- .../Robotics/UI/RoboticsConsoleWindow.xaml.cs | 25 +-- ...vageExpeditionConsoleBoundUserInterface.cs | 12 +- .../UI/SalvageMagnetBoundUserInterface.cs | 21 ++- .../BUI/IFFConsoleBoundUserInterface.cs | 4 +- .../BUI/RadarConsoleBoundUserInterface.cs | 14 +- .../BUI/ShuttleConsoleBoundUserInterface.cs | 5 +- .../Silicons/Borgs/BorgBoundUserInterface.cs | 18 +- Content.Client/Silicons/Borgs/BorgMenu.xaml | 2 +- .../Silicons/Borgs/BorgMenu.xaml.cs | 51 +++--- .../Laws/Ui/SiliconLawBoundUserInterface.cs | 14 +- .../UI/SprayPainterBoundUserInterface.cs | 27 ++- ...lStationRecordConsoleBoundUserInterface.cs | 13 +- .../Store/Ui/StoreBoundUserInterface.cs | 15 +- Content.Client/Strip/StrippingMenu.cs | 11 +- .../UI/SurveillanceCameraMonitorBoundUi.cs | 11 +- .../Thief/ThiefBackpackBoundUserInterface.cs | 19 +- .../Thief/ThiefBackpackMenu.xaml.cs | 28 +-- .../GasTank/GasTankBoundUserInterface.cs | 11 +- .../Systems/Atmos/GasTank/GasTankWindow.cs | 43 ++--- .../VendingMachineBoundUserInterface.cs | 8 +- .../VoiceMask/VoiceMaskBoundUserInterface.cs | 8 +- .../VoiceMaskNameChangeWindow.xaml.cs | 6 +- .../Melee/UI/MeleeSpeechBoundUserInterface.cs | 10 +- .../Wires/UI/WiresBoundUserInterface.cs | 7 +- Content.Client/Wires/UI/WiresMenu.cs | 16 +- .../Ui/AnalysisConsoleBoundUserInterface.cs | 6 +- 137 files changed, 1755 insertions(+), 1096 deletions(-) diff --git a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs index d80c600c03..c1b63dc4d0 100644 --- a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs +++ b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Shared.Access; using Content.Shared.Access.Components; using Content.Shared.Access.Systems; using Content.Shared.Containers.ItemSlots; -using Robust.Client.UserInterface; using Robust.Shared.Prototypes; using static Content.Shared.Access.Components.AccessOverriderComponent; @@ -24,28 +23,6 @@ namespace Content.Client.Access.UI { base.Open(); - _window = this.CreateWindow(); - RefreshAccess(); - _window.Title = EntMan.GetComponent(Owner).EntityName; - _window.OnSubmit += SubmitData; - - _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId)); - } - - public override void OnProtoReload(PrototypesReloadedEventArgs args) - { - base.OnProtoReload(args); - if (!args.WasModified()) - return; - - RefreshAccess(); - - if (State != null) - _window?.UpdateState(_prototypeManager, (AccessOverriderBoundUserInterfaceState) State); - } - - private void RefreshAccess() - { List> accessLevels; if (EntMan.TryGetComponent(Owner, out var accessOverrider)) @@ -53,20 +30,38 @@ namespace Content.Client.Access.UI accessLevels = accessOverrider.AccessLevels; accessLevels.Sort(); } + else { accessLevels = new List>(); _accessOverriderSystem.Log.Error($"No AccessOverrider component found for {EntMan.ToPrettyString(Owner)}!"); } - _window?.SetAccessLevels(_prototypeManager, accessLevels); + _window = new AccessOverriderWindow(this, _prototypeManager, accessLevels) + { + Title = EntMan.GetComponent(Owner).EntityName + }; + + _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId)); + + _window.OnClose += Close; + _window.OpenCentered(); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + + _window?.Dispose(); } protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); var castState = (AccessOverriderBoundUserInterfaceState) state; - _window?.UpdateState(_prototypeManager, castState); + _window?.UpdateState(castState); } public void SubmitData(List> newAccessList) diff --git a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs index ba08771858..6025c3b551 100644 --- a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs +++ b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs @@ -13,24 +13,26 @@ namespace Content.Client.Access.UI [GenerateTypedNameReferences] public sealed partial class AccessOverriderWindow : DefaultWindow { + [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + + private readonly AccessOverriderBoundUserInterface _owner; private readonly Dictionary _accessButtons = new(); - public event Action>>? OnSubmit; - - public AccessOverriderWindow() + public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototypeManager prototypeManager, + List> accessLevels) { RobustXamlLoader.Load(this); - } + IoCManager.InjectDependencies(this); + var logMill = _logManager.GetSawmill(SharedAccessOverriderSystem.Sawmill); - public void SetAccessLevels(IPrototypeManager protoManager, List> accessLevels) - { - _accessButtons.Clear(); - AccessLevelGrid.DisposeAllChildren(); + _owner = owner; foreach (var access in accessLevels) { - if (!protoManager.TryIndex(access, out var accessLevel)) + if (!prototypeManager.TryIndex(access, out var accessLevel)) { + logMill.Error($"Unable to find accesslevel for {access}"); continue; } @@ -42,16 +44,11 @@ namespace Content.Client.Access.UI AccessLevelGrid.AddChild(newButton); _accessButtons.Add(accessLevel.ID, newButton); - newButton.OnPressed += _ => - { - OnSubmit?.Invoke( - // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair - _accessButtons.Where(x => x.Value.Pressed).Select(x => new ProtoId(x.Key)).ToList()); - }; + newButton.OnPressed += _ => SubmitData(); } } - public void UpdateState(IPrototypeManager protoManager, AccessOverriderBoundUserInterfaceState state) + public void UpdateState(AccessOverriderBoundUserInterfaceState state) { PrivilegedIdLabel.Text = state.PrivilegedIdName; PrivilegedIdButton.Text = state.IsPrivilegedIdPresent @@ -69,11 +66,11 @@ namespace Content.Client.Access.UI if (state.MissingPrivilegesList != null && state.MissingPrivilegesList.Any()) { - var missingPrivileges = new List(); + List missingPrivileges = new List(); foreach (string tag in state.MissingPrivilegesList) { - var privilege = Loc.GetString(protoManager.Index(tag)?.Name ?? "generic-unknown"); + string privilege = Loc.GetString(_prototypeManager.Index(tag)?.Name ?? "generic-unknown"); missingPrivileges.Add(privilege); } @@ -93,5 +90,13 @@ namespace Content.Client.Access.UI } } } + + private void SubmitData() + { + _owner.SubmitData( + + // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair + _accessButtons.Where(x => x.Value.Pressed).Select(x => new ProtoId(x.Key)).ToList()); + } } } diff --git a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs index 50add43dc9..761f52988a 100644 --- a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs +++ b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Shared.Access.Systems; using Content.Shared.StatusIcon; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.Access.UI @@ -21,11 +20,16 @@ namespace Content.Client.Access.UI { base.Open(); - _window = this.CreateWindow(); + _window?.Dispose(); + _window = new AgentIDCardWindow(this); + if (State != null) + UpdateState(State); + _window.OpenCentered(); + + _window.OnClose += Close; _window.OnNameChanged += OnNameChanged; _window.OnJobChanged += OnJobChanged; - _window.OnJobIconChanged += OnJobIconChanged; } private void OnNameChanged(string newName) @@ -57,5 +61,14 @@ namespace Content.Client.Access.UI _window.SetCurrentJob(cast.CurrentJob); _window.SetAllowedIcons(cast.Icons, cast.CurrentJobIconId); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + + _window?.Dispose(); + } } } diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs index 071ce41a06..6d0b2a184f 100644 --- a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs +++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs @@ -17,19 +17,19 @@ namespace Content.Client.Access.UI [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IEntitySystemManager _entitySystem = default!; private readonly SpriteSystem _spriteSystem; + private readonly AgentIDCardBoundUserInterface _bui; private const int JobIconColumnCount = 10; public event Action? OnNameChanged; public event Action? OnJobChanged; - public event Action>? OnJobIconChanged; - - public AgentIDCardWindow() + public AgentIDCardWindow(AgentIDCardBoundUserInterface bui) { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); _spriteSystem = _entitySystem.GetEntitySystem(); + _bui = bui; NameLineEdit.OnTextEntered += e => OnNameChanged?.Invoke(e.Text); NameLineEdit.OnFocusExit += e => OnNameChanged?.Invoke(e.Text); @@ -67,7 +67,7 @@ namespace Content.Client.Access.UI }; // Generate buttons textures - var jobIconTexture = new TextureRect + TextureRect jobIconTexture = new TextureRect { Texture = _spriteSystem.Frame0(jobIcon.Icon), TextureScale = new Vector2(2.5f, 2.5f), @@ -75,7 +75,7 @@ namespace Content.Client.Access.UI }; jobIconButton.AddChild(jobIconTexture); - jobIconButton.OnPressed += _ => OnJobIconChanged?.Invoke(jobIcon.ID); + jobIconButton.OnPressed += _ => _bui.OnJobIconChanged(jobIconId); IconGrid.AddChild(jobIconButton); if (jobIconId.Equals(currentJobIconId)) diff --git a/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs b/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs index 3d65f75189..e84cf5d34d 100644 --- a/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs +++ b/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs @@ -1,6 +1,5 @@ using Content.Shared.Ame.Components; using JetBrains.Annotations; -using Robust.Client.UserInterface; namespace Content.Client.Ame.UI { @@ -17,8 +16,9 @@ namespace Content.Client.Ame.UI { base.Open(); - _window = this.CreateWindow(); - _window.OnAmeButton += ButtonPressed; + _window = new AmeWindow(this); + _window.OnClose += Close; + _window.OpenCentered(); } /// @@ -40,5 +40,15 @@ namespace Content.Client.Ame.UI { SendMessage(new UiButtonPressedMessage(button)); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (disposing) + { + _window?.Dispose(); + } + } } } diff --git a/Content.Client/Ame/UI/AmeWindow.xaml.cs b/Content.Client/Ame/UI/AmeWindow.xaml.cs index d6d580bcda..8b91ec5966 100644 --- a/Content.Client/Ame/UI/AmeWindow.xaml.cs +++ b/Content.Client/Ame/UI/AmeWindow.xaml.cs @@ -1,4 +1,3 @@ -using System.Linq; using Content.Client.UserInterface; using Content.Shared.Ame.Components; using Robust.Client.AutoGenerated; @@ -10,17 +9,15 @@ namespace Content.Client.Ame.UI [GenerateTypedNameReferences] public sealed partial class AmeWindow : DefaultWindow { - public event Action? OnAmeButton; - - public AmeWindow() + public AmeWindow(AmeControllerBoundUserInterface ui) { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - EjectButton.OnPressed += _ => OnAmeButton?.Invoke(UiButton.Eject); - ToggleInjection.OnPressed += _ => OnAmeButton?.Invoke(UiButton.ToggleInjection); - IncreaseFuelButton.OnPressed += _ => OnAmeButton?.Invoke(UiButton.IncreaseFuel); - DecreaseFuelButton.OnPressed += _ => OnAmeButton?.Invoke(UiButton.DecreaseFuel); + EjectButton.OnPressed += _ => ui.ButtonPressed(UiButton.Eject); + ToggleInjection.OnPressed += _ => ui.ButtonPressed(UiButton.ToggleInjection); + IncreaseFuelButton.OnPressed += _ => ui.ButtonPressed(UiButton.IncreaseFuel); + DecreaseFuelButton.OnPressed += _ => ui.ButtonPressed(UiButton.DecreaseFuel); } /// @@ -32,7 +29,7 @@ namespace Content.Client.Ame.UI var castState = (AmeControllerBoundUserInterfaceState) state; // Disable all buttons if not powered - if (Contents.Children.Any()) + if (Contents.Children != null) { ButtonHelpers.SetButtonDisabledRecursive(Contents, !castState.HasPower); EjectButton.Disabled = false; @@ -68,8 +65,8 @@ namespace Content.Client.Ame.UI CoreCount.Text = $"{castState.CoreCount}"; InjectionAmount.Text = $"{castState.InjectionAmount}"; // format power statistics to pretty numbers - CurrentPowerSupply.Text = $"{castState.CurrentPowerSupply:N1}"; - TargetedPowerSupply.Text = $"{castState.TargetedPowerSupply:N1}"; + CurrentPowerSupply.Text = $"{castState.CurrentPowerSupply.ToString("N1")}"; + TargetedPowerSupply.Text = $"{castState.TargetedPowerSupply.ToString("N1")}"; } } } diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs index 5d1985485c..5764d0a097 100644 --- a/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs +++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Shared.Anomaly; using Content.Shared.Gravity; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Anomaly.Ui; @@ -19,8 +18,10 @@ public sealed class AnomalyGeneratorBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); - _window.SetEntity(Owner); + _window = new(Owner); + + _window.OpenCentered(); + _window.OnClose += Close; _window.OnGenerateButtonPressed += () => { @@ -36,5 +37,18 @@ public sealed class AnomalyGeneratorBoundUserInterface : BoundUserInterface return; _window?.UpdateState(msg); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) return; + + _window?.Dispose(); + } + + public void SetPowerSwitch(bool on) + { + SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(on)); + } } diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs index 82d41192dd..08438e2a1b 100644 --- a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs +++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs @@ -18,21 +18,17 @@ public sealed partial class AnomalyGeneratorWindow : FancyWindow public Action? OnGenerateButtonPressed; - public AnomalyGeneratorWindow() + public AnomalyGeneratorWindow(EntityUid gen) { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); + EntityView.SetEntity(gen); EntityView.SpriteOffset = false; GenerateButton.OnPressed += _ => OnGenerateButtonPressed?.Invoke(); } - public void SetEntity(EntityUid uid) - { - EntityView.SetEntity(uid); - } - public void UpdateState(AnomalyGeneratorUserInterfaceState state) { _cooldownEnd = state.CooldownEndTime; diff --git a/Content.Client/Arcade/BlockGameMenu.cs b/Content.Client/Arcade/BlockGameMenu.cs index 4a579fc4bf..eeda2a3102 100644 --- a/Content.Client/Arcade/BlockGameMenu.cs +++ b/Content.Client/Arcade/BlockGameMenu.cs @@ -28,6 +28,8 @@ namespace Content.Client.Arcade private static readonly Vector2 BlockSize = new(15, 15); + private readonly BlockGameBoundUserInterface _owner; + private readonly PanelContainer _mainPanel; private readonly BoxContainer _gameRootContainer; @@ -56,11 +58,10 @@ namespace Content.Client.Arcade private bool _isPlayer = false; private bool _gameOver = false; - public event Action? OnAction; - - public BlockGameMenu() + public BlockGameMenu(BlockGameBoundUserInterface owner) { Title = Loc.GetString("blockgame-menu-title"); + _owner = owner; MinSize = SetSize = new Vector2(410, 490); @@ -175,7 +176,7 @@ namespace Content.Client.Arcade }; _newGameButton.OnPressed += (e) => { - OnAction?.Invoke(BlockGamePlayerAction.NewGame); + _owner.SendAction(BlockGamePlayerAction.NewGame); }; pauseMenuContainer.AddChild(_newGameButton); pauseMenuContainer.AddChild(new Control { MinSize = new Vector2(1, 10) }); @@ -185,10 +186,7 @@ namespace Content.Client.Arcade Text = Loc.GetString("blockgame-menu-button-scoreboard"), TextAlign = Label.AlignMode.Center }; - _scoreBoardButton.OnPressed += (e) => - { - OnAction?.Invoke(BlockGamePlayerAction.ShowHighscores); - }; + _scoreBoardButton.OnPressed += (e) => _owner.SendAction(BlockGamePlayerAction.ShowHighscores); pauseMenuContainer.AddChild(_scoreBoardButton); _unpauseButtonMargin = new Control { MinSize = new Vector2(1, 10), Visible = false }; pauseMenuContainer.AddChild(_unpauseButtonMargin); @@ -201,7 +199,7 @@ namespace Content.Client.Arcade }; _unpauseButton.OnPressed += (e) => { - OnAction?.Invoke(BlockGamePlayerAction.Unpause); + _owner.SendAction(BlockGamePlayerAction.Unpause); }; pauseMenuContainer.AddChild(_unpauseButton); @@ -259,7 +257,7 @@ namespace Content.Client.Arcade }; _finalNewGameButton.OnPressed += (e) => { - OnAction?.Invoke(BlockGamePlayerAction.NewGame); + _owner.SendAction(BlockGamePlayerAction.NewGame); }; gameOverMenuContainer.AddChild(_finalNewGameButton); @@ -329,10 +327,7 @@ namespace Content.Client.Arcade Text = Loc.GetString("blockgame-menu-button-back"), TextAlign = Label.AlignMode.Center }; - _highscoreBackButton.OnPressed += (e) => - { - OnAction?.Invoke(BlockGamePlayerAction.Pause); - }; + _highscoreBackButton.OnPressed += (e) => _owner.SendAction(BlockGamePlayerAction.Pause); menuContainer.AddChild(_highscoreBackButton); menuInnerPanel.AddChild(menuContainer); @@ -478,7 +473,7 @@ namespace Content.Client.Arcade private void TryPause() { - OnAction?.Invoke(BlockGamePlayerAction.Pause); + _owner.SendAction(BlockGamePlayerAction.Pause); } public void SetStarted() @@ -581,19 +576,19 @@ namespace Content.Client.Arcade return; else if (args.Function == ContentKeyFunctions.ArcadeLeft) - OnAction?.Invoke(BlockGamePlayerAction.StartLeft); + _owner.SendAction(BlockGamePlayerAction.StartLeft); else if (args.Function == ContentKeyFunctions.ArcadeRight) - OnAction?.Invoke(BlockGamePlayerAction.StartRight); + _owner.SendAction(BlockGamePlayerAction.StartRight); else if (args.Function == ContentKeyFunctions.ArcadeUp) - OnAction?.Invoke(BlockGamePlayerAction.Rotate); + _owner.SendAction(BlockGamePlayerAction.Rotate); else if (args.Function == ContentKeyFunctions.Arcade3) - OnAction?.Invoke(BlockGamePlayerAction.CounterRotate); + _owner.SendAction(BlockGamePlayerAction.CounterRotate); else if (args.Function == ContentKeyFunctions.ArcadeDown) - OnAction?.Invoke(BlockGamePlayerAction.SoftdropStart); + _owner.SendAction(BlockGamePlayerAction.SoftdropStart); else if (args.Function == ContentKeyFunctions.Arcade2) - OnAction?.Invoke(BlockGamePlayerAction.Hold); + _owner.SendAction(BlockGamePlayerAction.Hold); else if (args.Function == ContentKeyFunctions.Arcade1) - OnAction?.Invoke(BlockGamePlayerAction.Harddrop); + _owner.SendAction(BlockGamePlayerAction.Harddrop); } protected override void KeyBindUp(GUIBoundKeyEventArgs args) @@ -604,11 +599,11 @@ namespace Content.Client.Arcade return; else if (args.Function == ContentKeyFunctions.ArcadeLeft) - OnAction?.Invoke(BlockGamePlayerAction.EndLeft); + _owner.SendAction(BlockGamePlayerAction.EndLeft); else if (args.Function == ContentKeyFunctions.ArcadeRight) - OnAction?.Invoke(BlockGamePlayerAction.EndRight); + _owner.SendAction(BlockGamePlayerAction.EndRight); else if (args.Function == ContentKeyFunctions.ArcadeDown) - OnAction?.Invoke(BlockGamePlayerAction.SoftdropEnd); + _owner.SendAction(BlockGamePlayerAction.SoftdropEnd); } public void UpdateNextBlock(BlockGameBlock[] blocks) diff --git a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs index 1ee4c26818..e5542a5848 100644 --- a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs +++ b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs @@ -8,6 +8,8 @@ namespace Content.Client.Arcade { public sealed class SpaceVillainArcadeMenu : DefaultWindow { + public SpaceVillainArcadeBoundUserInterface Owner { get; set; } + private readonly Label _enemyNameLabel; private readonly Label _playerInfoLabel; private readonly Label _enemyInfoLabel; @@ -15,13 +17,11 @@ namespace Content.Client.Arcade private readonly Label _enemyActionLabel; private readonly Button[] _gameButtons = new Button[3]; //used to disable/enable all game buttons - - public event Action? OnPlayerAction; - - public SpaceVillainArcadeMenu() + public SpaceVillainArcadeMenu(SpaceVillainArcadeBoundUserInterface owner) { MinSize = SetSize = new Vector2(300, 225); Title = Loc.GetString("spacevillain-menu-title"); + Owner = owner; var grid = new GridContainer { Columns = 1 }; @@ -47,43 +47,32 @@ namespace Content.Client.Arcade grid.AddChild(_enemyActionLabel); var buttonGrid = new GridContainer { Columns = 3 }; - _gameButtons[0] = new Button() + _gameButtons[0] = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.Attack) { Text = Loc.GetString("spacevillain-menu-button-attack") }; - - _gameButtons[0].OnPressed += - _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.Attack); buttonGrid.AddChild(_gameButtons[0]); - _gameButtons[1] = new Button() + _gameButtons[1] = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.Heal) { Text = Loc.GetString("spacevillain-menu-button-heal") }; - - _gameButtons[1].OnPressed += - _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.Heal); buttonGrid.AddChild(_gameButtons[1]); - _gameButtons[2] = new Button() + _gameButtons[2] = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.Recharge) { Text = Loc.GetString("spacevillain-menu-button-recharge") }; - - _gameButtons[2].OnPressed += - _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.Recharge); buttonGrid.AddChild(_gameButtons[2]); centerContainer = new CenterContainer(); centerContainer.AddChild(buttonGrid); grid.AddChild(centerContainer); - var newGame = new Button() + var newGame = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.NewGame) { Text = Loc.GetString("spacevillain-menu-button-new-game") }; - - newGame.OnPressed += _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.NewGame); grid.AddChild(newGame); Contents.AddChild(grid); @@ -110,5 +99,23 @@ namespace Content.Client.Arcade _playerActionLabel.Text = message.PlayerActionMessage; _enemyActionLabel.Text = message.EnemyActionMessage; } + + private sealed class ActionButton : Button + { + private readonly SpaceVillainArcadeBoundUserInterface _owner; + private readonly SharedSpaceVillainArcadeComponent.PlayerAction _playerAction; + + public ActionButton(SpaceVillainArcadeBoundUserInterface owner, SharedSpaceVillainArcadeComponent.PlayerAction playerAction) + { + _owner = owner; + _playerAction = playerAction; + OnPressed += Clicked; + } + + private void Clicked(ButtonEventArgs e) + { + _owner.SendAction(_playerAction); + } + } } } diff --git a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs index 8fa8035afd..1a3422dec0 100644 --- a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs +++ b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs @@ -1,6 +1,5 @@ using Content.Shared.Arcade; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Arcade.UI; @@ -16,7 +15,9 @@ public sealed class BlockGameBoundUserInterface : BoundUserInterface { base.Open(); - _menu = this.CreateWindow(); + _menu = new BlockGameMenu(this); + _menu.OnClose += Close; + _menu.OpenCentered(); } protected override void ReceiveMessage(BoundUserInterfaceMessage message) diff --git a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs index c0704530de..40bbe8b2d8 100644 --- a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs +++ b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs @@ -1,5 +1,4 @@ using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; using static Content.Shared.Arcade.SharedSpaceVillainArcadeComponent; @@ -10,6 +9,8 @@ public sealed class SpaceVillainArcadeBoundUserInterface : BoundUserInterface { [ViewVariables] private SpaceVillainArcadeMenu? _menu; + //public SharedSpaceVillainArcadeComponent SpaceVillainArcade; + public SpaceVillainArcadeBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { SendAction(PlayerAction.RequestData); @@ -24,7 +25,10 @@ public sealed class SpaceVillainArcadeBoundUserInterface : BoundUserInterface { base.Open(); - _menu = this.CreateWindow(); + _menu = new SpaceVillainArcadeMenu(this); + + _menu.OnClose += Close; + _menu.OpenCentered(); } protected override void ReceiveMessage(BoundUserInterfaceMessage message) @@ -32,4 +36,12 @@ public sealed class SpaceVillainArcadeBoundUserInterface : BoundUserInterface if (message is SpaceVillainArcadeDataUpdateMessage msg) _menu?.UpdateInfo(msg); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (disposing) + _menu?.Dispose(); + } } diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs index 2ae1518835..8f3b507c80 100644 --- a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs +++ b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Shared.Atmos; using Content.Shared.Atmos.Monitor; using Content.Shared.Atmos.Monitor.Components; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; @@ -21,9 +20,16 @@ public sealed class AirAlarmBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); - _window.SetEntity(Owner); + _window = new AirAlarmWindow(this); + if (State != null) + { + UpdateState(State); + } + + _window.OpenCentered(); + + _window.OnClose += Close; _window.AtmosDeviceDataChanged += OnDeviceDataChanged; _window.AtmosDeviceDataCopied += OnDeviceDataCopied; _window.AtmosAlarmThresholdChanged += OnThresholdChanged; diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs index eeec11c766..43be67c9d6 100644 --- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs +++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs @@ -47,7 +47,7 @@ public sealed partial class AirAlarmWindow : FancyWindow private CheckBox _autoMode => AutoModeCheckBox; - public AirAlarmWindow() + public AirAlarmWindow(BoundUserInterface owner) { RobustXamlLoader.Load(this); @@ -95,11 +95,8 @@ public sealed partial class AirAlarmWindow : FancyWindow _sensors.Clear(); ResyncAllRequested!.Invoke(); }; - } - public void SetEntity(EntityUid uid) - { - EntityView.SetEntity(uid); + EntityView.SetEntity(owner.Owner); } public void UpdateState(AirAlarmUIState state) diff --git a/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs b/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs index 7bf9b396d5..a5e316a8de 100644 --- a/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Shared.Atmos.Piping.Binary.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -22,8 +21,14 @@ namespace Content.Client.Atmos.UI { base.Open(); - _window = this.CreateWindow(); + _window = new GasCanisterWindow(); + if (State != null) + UpdateState(State); + + _window.OpenCentered(); + + _window.OnClose += Close; _window.ReleaseValveCloseButtonPressed += OnReleaseValveClosePressed; _window.ReleaseValveOpenButtonPressed += OnReleaseValveOpenPressed; _window.ReleasePressureSet += OnReleasePressureSet; diff --git a/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs b/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs index 2b8020924c..1904e2b340 100644 --- a/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs @@ -3,7 +3,6 @@ using Content.Shared.Atmos; using Content.Shared.Atmos.Piping.Trinary.Components; using Content.Shared.Localizations; using JetBrains.Annotations; -using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -29,8 +28,14 @@ namespace Content.Client.Atmos.UI var atmosSystem = EntMan.System(); - _window = this.CreateWindow(); - _window.PopulateGasList(atmosSystem.Gases); + _window = new GasFilterWindow(atmosSystem.Gases); + + if (State != null) + UpdateState(State); + + _window.OpenCentered(); + + _window.OnClose += Close; _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed; _window.FilterTransferRateChanged += OnFilterTransferRatePressed; diff --git a/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs b/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs index 62748b5259..28766c688a 100644 --- a/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs +++ b/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs @@ -26,9 +26,10 @@ namespace Content.Client.Atmos.UI public event Action? FilterTransferRateChanged; public event Action? SelectGasPressed; - public GasFilterWindow() + public GasFilterWindow(IEnumerable gases) { RobustXamlLoader.Load(this); + PopulateGasList(gases); ToggleStatusButton.OnPressed += _ => SetFilterStatus(!FilterStatus); ToggleStatusButton.OnPressed += _ => ToggleStatusButtonPressed?.Invoke(); @@ -72,7 +73,7 @@ namespace Content.Client.Atmos.UI SelectGasButton.Disabled = true; } - public void PopulateGasList(IEnumerable gases) + private void PopulateGasList(IEnumerable gases) { GasList.Add(new ItemList.Item(GasList) { @@ -80,7 +81,7 @@ namespace Content.Client.Atmos.UI Text = Loc.GetString("comp-gas-filter-ui-filter-gas-none") }); - foreach (var gas in gases) + foreach (GasPrototype gas in gases) { var gasName = Loc.GetString(gas.Name); GasList.Add(GetGasItem(gas.ID, gasName, GasList)); diff --git a/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs b/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs index 392fbf1cd9..709c06517c 100644 --- a/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs +++ b/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs @@ -2,7 +2,7 @@ using Content.Shared.Atmos; using Content.Shared.Atmos.Piping.Trinary.Components; using Content.Shared.Localizations; using JetBrains.Annotations; -using Robust.Client.UserInterface; +using Robust.Client.GameObjects; namespace Content.Client.Atmos.UI { @@ -26,7 +26,14 @@ namespace Content.Client.Atmos.UI { base.Open(); - _window = this.CreateWindow(); + _window = new GasMixerWindow(); + + if (State != null) + UpdateState(State); + + _window.OpenCentered(); + + _window.OnClose += Close; _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed; _window.MixerOutputPressureChanged += OnMixerOutputPressurePressed; @@ -76,5 +83,12 @@ namespace Content.Client.Atmos.UI _window.SetOutputPressure(cast.OutputPressure); _window.SetNodePercentages(cast.NodeOne); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) return; + _window?.Dispose(); + } } } diff --git a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs index 220fdbe875..6eba2e0d21 100644 --- a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs @@ -3,7 +3,6 @@ using Content.Shared.Atmos.Piping.Binary.Components; using Content.Shared.Localizations; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -27,7 +26,14 @@ namespace Content.Client.Atmos.UI { base.Open(); - _window = this.CreateWindow(); + _window = new GasPressurePumpWindow(); + + if (State != null) + UpdateState(State); + + _window.OpenCentered(); + + _window.OnClose += Close; _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed; _window.PumpOutputPressureChanged += OnPumpOutputPressurePressed; @@ -61,5 +67,12 @@ namespace Content.Client.Atmos.UI _window.SetPumpStatus(cast.Enabled); _window.SetOutputPressure(cast.OutputPressure); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) return; + _window?.Dispose(); + } } } diff --git a/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs b/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs index d62be8f4bb..1664c8b9d7 100644 --- a/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Shared.Atmos.Piping.Unary.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -32,7 +31,14 @@ namespace Content.Client.Atmos.UI { base.Open(); - _window = this.CreateWindow(); + _window = new GasThermomachineWindow(); + + if (State != null) + UpdateState(State); + + _window.OpenCentered(); + + _window.OnClose += Close; _window.ToggleStatusButton.OnPressed += _ => OnToggleStatusButtonPressed(); _window.TemperatureSpinbox.OnValueChanged += _ => OnTemperatureChanged(_window.TemperatureSpinbox.Value); @@ -85,5 +91,12 @@ namespace Content.Client.Atmos.UI true => Loc.GetString("comp-gas-thermomachine-ui-title-heater") }; } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) return; + _window?.Dispose(); + } } } diff --git a/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs b/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs index 642f34c2f9..1b39306181 100644 --- a/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs @@ -3,7 +3,6 @@ using Content.Shared.Atmos.Piping.Binary.Components; using Content.Shared.Localizations; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -27,7 +26,14 @@ namespace Content.Client.Atmos.UI { base.Open(); - _window = this.CreateWindow(); + _window = new GasVolumePumpWindow(); + + if (State != null) + UpdateState(State); + + _window.OpenCentered(); + + _window.OnClose += Close; _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed; _window.PumpTransferRateChanged += OnPumpTransferRatePressed; @@ -58,9 +64,16 @@ namespace Content.Client.Atmos.UI if (_window == null || state is not GasVolumePumpBoundUserInterfaceState cast) return; - _window.Title = cast.PumpLabel; + _window.Title = (cast.PumpLabel); _window.SetPumpStatus(cast.Enabled); _window.SetTransferRate(cast.TransferRate); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) return; + _window?.Dispose(); + } } } diff --git a/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs b/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs index e70426575d..4d8d1191e9 100644 --- a/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs @@ -1,6 +1,5 @@ using Content.Shared.Atmos.Piping.Portable.Components; using JetBrains.Annotations; -using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; namespace Content.Client.Atmos.UI; @@ -22,7 +21,14 @@ public sealed class SpaceHeaterBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); + _window = new SpaceHeaterWindow(); + + if (State != null) + UpdateState(State); + + _window.OpenCentered(); + + _window.OnClose += Close; _window.ToggleStatusButton.OnPressed += _ => OnToggleStatusButtonPressed(); _window.IncreaseTempRange.OnPressed += _ => OnTemperatureRangeChanged(_window.TemperatureChangeDelta); diff --git a/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs b/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs index 865dfc478d..60fe339069 100644 --- a/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs +++ b/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs @@ -1,7 +1,8 @@ using Content.Shared.Audio.Jukebox; using Robust.Client.Audio; -using Robust.Client.UserInterface; +using Robust.Client.Player; using Robust.Shared.Audio.Components; +using Robust.Shared.Player; using Robust.Shared.Prototypes; namespace Content.Client.Audio.Jukebox; @@ -22,7 +23,9 @@ public sealed class JukeboxBoundUserInterface : BoundUserInterface { base.Open(); - _menu = this.CreateWindow(); + _menu = new JukeboxMenu(); + _menu.OnClose += Close; + _menu.OpenCentered(); _menu.OnPlayPressed += args => { @@ -97,5 +100,19 @@ public sealed class JukeboxBoundUserInterface : BoundUserInterface SendMessage(new JukeboxSetTimeMessage(sentTime)); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + + if (_menu == null) + return; + + _menu.OnClose -= Close; + _menu.Dispose(); + _menu = null; + } } diff --git a/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs b/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs index 09f3cec8fb..ffab162548 100644 --- a/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs +++ b/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs @@ -1,6 +1,5 @@ using Content.Shared.Bed.Cryostorage; using JetBrains.Annotations; -using Robust.Client.UserInterface; namespace Content.Client.Bed.Cryostorage; @@ -18,7 +17,9 @@ public sealed class CryostorageBoundUserInterface : BoundUserInterface { base.Open(); - _menu = this.CreateWindow(); + _menu = new(); + + _menu.OnClose += Close; _menu.SlotRemoveButtonPressed += (ent, slot) => { @@ -29,6 +30,8 @@ public sealed class CryostorageBoundUserInterface : BoundUserInterface { SendMessage(new CryostorageRemoveItemBuiMessage(ent, hand, CryostorageRemoveItemBuiMessage.RemovalType.Hand)); }; + + _menu.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -42,4 +45,12 @@ public sealed class CryostorageBoundUserInterface : BoundUserInterface break; } } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + _menu?.Dispose(); + } } diff --git a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs index 44c40143d8..d3365702bc 100644 --- a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs +++ b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Client.Cargo.UI; using Content.Shared.Cargo.Components; using JetBrains.Annotations; -using Robust.Client.UserInterface; namespace Content.Client.Cargo.BUI; @@ -19,7 +18,9 @@ public sealed class CargoBountyConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _menu = this.CreateWindow(); + _menu = new(); + + _menu.OnClose += Close; _menu.OnLabelButtonPressed += id => { @@ -30,6 +31,8 @@ public sealed class CargoBountyConsoleBoundUserInterface : BoundUserInterface { SendMessage(new BountySkipMessage(id)); }; + + _menu.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState message) @@ -41,4 +44,14 @@ public sealed class CargoBountyConsoleBoundUserInterface : BoundUserInterface _menu?.UpdateEntries(state.Bounties, state.UntilNextSkip); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (!disposing) + return; + + _menu?.Dispose(); + } } diff --git a/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs index 2461dafb5f..20c23a48a0 100644 --- a/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs +++ b/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Client.Cargo.UI; using Content.Shared.Cargo.BUI; using Content.Shared.Cargo.Events; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Cargo.BUI; @@ -19,9 +18,21 @@ public sealed class CargoPalletConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _menu = this.CreateWindow(); + _menu = new CargoPalletMenu(); _menu.AppraiseRequested += OnAppraisal; _menu.SellRequested += OnSell; + _menu.OnClose += Close; + + _menu.OpenCentered(); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (disposing) + { + _menu?.Dispose(); + } } private void OnAppraisal() diff --git a/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs index 02b721b902..422d03707a 100644 --- a/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs +++ b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Client.Cargo.UI; using Content.Shared.Cargo.BUI; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.Cargo.BUI; @@ -10,8 +9,6 @@ namespace Content.Client.Cargo.BUI; [UsedImplicitly] public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [ViewVariables] private CargoShuttleMenu? _menu; @@ -22,7 +19,24 @@ public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _menu = this.CreateWindow(); + var collection = IoCManager.Instance; + + if (collection == null) + return; + + _menu = new CargoShuttleMenu(collection.Resolve(), collection.Resolve().GetEntitySystem()); + _menu.OnClose += Close; + + _menu.OpenCentered(); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (disposing) + { + _menu?.Dispose(); + } } protected override void UpdateState(BoundUserInterfaceState state) @@ -31,6 +45,6 @@ public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface if (state is not CargoShuttleConsoleBoundUserInterfaceState cargoState) return; _menu?.SetAccountName(cargoState.AccountName); _menu?.SetShuttleName(cargoState.ShuttleName); - _menu?.SetOrders(EntMan.System(), _protoManager, cargoState.Orders); + _menu?.SetOrders(cargoState.Orders); } } diff --git a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs index 43b00089e1..c591f917da 100644 --- a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs +++ b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs @@ -12,9 +12,14 @@ namespace Content.Client.Cargo.UI [GenerateTypedNameReferences] public sealed partial class CargoShuttleMenu : FancyWindow { - public CargoShuttleMenu() + private readonly IPrototypeManager _protoManager; + private readonly SpriteSystem _spriteSystem; + + public CargoShuttleMenu(IPrototypeManager protoManager, SpriteSystem spriteSystem) { RobustXamlLoader.Load(this); + _protoManager = protoManager; + _spriteSystem = spriteSystem; Title = Loc.GetString("cargo-shuttle-console-menu-title"); } @@ -28,19 +33,19 @@ namespace Content.Client.Cargo.UI ShuttleNameLabel.Text = name; } - public void SetOrders(SpriteSystem sprites, IPrototypeManager protoManager, List orders) + public void SetOrders(List orders) { Orders.DisposeAllChildren(); foreach (var order in orders) { - var product = protoManager.Index(order.ProductId); + var product = _protoManager.Index(order.ProductId); var productName = product.Name; var row = new CargoOrderRow { Order = order, - Icon = { Texture = sprites.Frame0(product) }, + Icon = { Texture = _spriteSystem.Frame0(product) }, ProductName = { Text = Loc.GetString( diff --git a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs index 3ef7f0ae73..988fea7978 100644 --- a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs +++ b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Shared.Chemistry; using Content.Shared.Containers.ItemSlots; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Chemistry.UI { @@ -28,8 +27,13 @@ namespace Content.Client.Chemistry.UI base.Open(); // Setup window layout/elements - _window = this.CreateWindow(); - _window.Title = EntMan.GetComponent(Owner).EntityName; + _window = new ChemMasterWindow + { + Title = EntMan.GetComponent(Owner).EntityName, + }; + + _window.OpenCentered(); + _window.OnClose += Close; // Setup static button actions. _window.InputEjectButton.OnPressed += _ => SendMessage( @@ -71,5 +75,15 @@ namespace Content.Client.Chemistry.UI _window?.UpdateState(castState); // Update window state } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (disposing) + { + _window?.Dispose(); + } + } } } diff --git a/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs b/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs index 2ad1b71888..99e5a3d395 100644 --- a/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs +++ b/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs @@ -3,7 +3,6 @@ using Content.Shared.Chemistry; using Content.Shared.Containers.ItemSlots; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Chemistry.UI { @@ -16,6 +15,9 @@ namespace Content.Client.Chemistry.UI [ViewVariables] private ReagentDispenserWindow? _window; + [ViewVariables] + private ReagentDispenserBoundUserInterfaceState? _lastState; + public ReagentDispenserBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } @@ -30,9 +32,14 @@ namespace Content.Client.Chemistry.UI base.Open(); // Setup window layout/elements - _window = this.CreateWindow(); - _window.Title = EntMan.GetComponent(Owner).EntityName; - _window.HelpGuidebookIds = EntMan.GetComponent(Owner).Guides; + _window = new() + { + Title = EntMan.GetComponent(Owner).EntityName, + HelpGuidebookIds = EntMan.GetComponent(Owner).Guides + }; + + _window.OpenCentered(); + _window.OnClose += Close; // Setup static button actions. _window.EjectButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(SharedReagentDispenser.OutputSlotName)); @@ -56,7 +63,19 @@ namespace Content.Client.Chemistry.UI base.UpdateState(state); var castState = (ReagentDispenserBoundUserInterfaceState) state; + _lastState = castState; + _window?.UpdateState(castState); //Update window state } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (disposing) + { + _window?.Dispose(); + } + } } } diff --git a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs index f1cb27a62a..35df131312 100644 --- a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs +++ b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Shared.Chemistry; using Content.Shared.FixedPoint; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Chemistry.UI { @@ -19,7 +18,7 @@ namespace Content.Client.Chemistry.UI protected override void Open() { base.Open(); - _window = this.CreateWindow(); + _window = new TransferAmountWindow(); _window.ApplyButton.OnPressed += _ => { @@ -29,6 +28,15 @@ namespace Content.Client.Chemistry.UI _window.Close(); } }; + _window.OnClose += Close; + _window.OpenCentered(); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) return; + _window?.Dispose(); } } } diff --git a/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs b/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs index 62a02f3718..26f0994701 100644 --- a/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs +++ b/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs @@ -1,7 +1,6 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; using Content.Shared.Cloning.CloningConsole; -using Robust.Client.UserInterface; namespace Content.Client.CloningConsole.UI { @@ -18,11 +17,13 @@ namespace Content.Client.CloningConsole.UI protected override void Open() { base.Open(); - - _window = this.CreateWindow(); - _window.Title = Loc.GetString("cloning-console-window-title"); - + _window = new CloningConsoleWindow + { + Title = Loc.GetString("cloning-console-window-title") + }; + _window.OnClose += Close; _window.CloneButton.OnPressed += _ => SendMessage(new UiButtonPressedMessage(UiButton.Clone)); + _window.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -31,5 +32,19 @@ namespace Content.Client.CloningConsole.UI _window?.Populate((CloningConsoleBoundUserInterfaceState) state); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + + if (_window != null) + { + _window.OnClose -= Close; + _window.CloneButton.OnPressed -= _ => SendMessage(new UiButtonPressedMessage(UiButton.Clone)); + } + _window?.Dispose(); + } } } diff --git a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs index 83f6ba1566..5b0d5fcf21 100644 --- a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs +++ b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Shared.Clothing.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Clothing.UI; @@ -23,8 +22,10 @@ public sealed class ChameleonBoundUserInterface : BoundUserInterface { base.Open(); - _menu = this.CreateWindow(); + _menu = new ChameleonMenu(); + _menu.OnClose += Close; _menu.OnIdSelected += OnIdSelected; + _menu.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -41,4 +42,15 @@ public sealed class ChameleonBoundUserInterface : BoundUserInterface { SendMessage(new ChameleonPrototypeSelectedMessage(selectedId)); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (disposing) + { + _menu?.Close(); + _menu = null; + } + } } diff --git a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs index 0310e91eeb..1c94d32bf8 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Shared.CCVar; using Content.Shared.Chat; using Content.Shared.Communications; -using Robust.Client.UserInterface; using Robust.Shared.Configuration; using Robust.Shared.Timing; @@ -9,11 +8,34 @@ namespace Content.Client.Communications.UI { public sealed class CommunicationsConsoleBoundUserInterface : BoundUserInterface { + [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [ViewVariables] private CommunicationsConsoleMenu? _menu; + [ViewVariables] + public bool CanAnnounce { get; private set; } + [ViewVariables] + public bool CanBroadcast { get; private set; } + + [ViewVariables] + public bool CanCall { get; private set; } + + [ViewVariables] + public bool CountdownStarted { get; private set; } + + [ViewVariables] + public bool AlertLevelSelectable { get; private set; } + + [ViewVariables] + public string CurrentLevel { get; private set; } = default!; + + [ViewVariables] + private TimeSpan? _expectedCountdownTime; + + public int Countdown => _expectedCountdownTime == null ? 0 : Math.Max((int) _expectedCountdownTime.Value.Subtract(_gameTiming.CurTime).TotalSeconds, 0); + public CommunicationsConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } @@ -22,25 +44,23 @@ namespace Content.Client.Communications.UI { base.Open(); - _menu = this.CreateWindow(); - _menu.OnAnnounce += AnnounceButtonPressed; - _menu.OnBroadcast += BroadcastButtonPressed; - _menu.OnAlertLevel += AlertLevelSelected; - _menu.OnEmergencyLevel += EmergencyShuttleButtonPressed; + _menu = new CommunicationsConsoleMenu(this); + _menu.OnClose += Close; + _menu.OpenCentered(); } public void AlertLevelSelected(string level) { - if (_menu!.AlertLevelSelectable) + if (AlertLevelSelectable) { - _menu.CurrentLevel = level; + CurrentLevel = level; SendMessage(new CommunicationsConsoleSelectAlertLevelMessage(level)); } } public void EmergencyShuttleButtonPressed() { - if (_menu!.CountdownStarted) + if (CountdownStarted) RecallShuttle(); else CallShuttle(); @@ -75,23 +95,31 @@ namespace Content.Client.Communications.UI if (state is not CommunicationsConsoleInterfaceState commsState) return; + CanAnnounce = commsState.CanAnnounce; + CanBroadcast = commsState.CanBroadcast; + CanCall = commsState.CanCall; + _expectedCountdownTime = commsState.ExpectedCountdownEnd; + CountdownStarted = commsState.CountdownStarted; + AlertLevelSelectable = commsState.AlertLevels != null && !float.IsNaN(commsState.CurrentAlertDelay) && commsState.CurrentAlertDelay <= 0; + CurrentLevel = commsState.CurrentAlert; + if (_menu != null) { - _menu.CanAnnounce = commsState.CanAnnounce; - _menu.CanBroadcast = commsState.CanBroadcast; - _menu.CanCall = commsState.CanCall; - _menu.CountdownStarted = commsState.CountdownStarted; - _menu.AlertLevelSelectable = commsState.AlertLevels != null && !float.IsNaN(commsState.CurrentAlertDelay) && commsState.CurrentAlertDelay <= 0; - _menu.CurrentLevel = commsState.CurrentAlert; - _menu.CountdownEnd = commsState.ExpectedCountdownEnd; - _menu.UpdateCountdown(); - _menu.UpdateAlertLevels(commsState.AlertLevels, _menu.CurrentLevel); - _menu.AlertLevelButton.Disabled = !_menu.AlertLevelSelectable; - _menu.EmergencyShuttleButton.Disabled = !_menu.CanCall; - _menu.AnnounceButton.Disabled = !_menu.CanAnnounce; - _menu.BroadcastButton.Disabled = !_menu.CanBroadcast; + _menu.UpdateAlertLevels(commsState.AlertLevels, CurrentLevel); + _menu.AlertLevelButton.Disabled = !AlertLevelSelectable; + _menu.EmergencyShuttleButton.Disabled = !CanCall; + _menu.AnnounceButton.Disabled = !CanAnnounce; + _menu.BroadcastButton.Disabled = !CanBroadcast; } } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) return; + + _menu?.Dispose(); + } } } diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs index cef68efd1f..bbca06f519 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs @@ -1,40 +1,31 @@ -using System.Globalization; -using Content.Client.UserInterface.Controls; +using Content.Client.UserInterface.Controls; +using System.Threading; using Content.Shared.CCVar; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.XAML; using Robust.Shared.Configuration; -using Robust.Shared.Timing; using Robust.Shared.Utility; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Client.Communications.UI { [GenerateTypedNameReferences] public sealed partial class CommunicationsConsoleMenu : FancyWindow { + private CommunicationsConsoleBoundUserInterface Owner { get; set; } + private readonly CancellationTokenSource _timerCancelTokenSource = new(); + [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ILocalizationManager _loc = default!; - public bool CanAnnounce; - public bool CanBroadcast; - public bool CanCall; - public bool AlertLevelSelectable; - public bool CountdownStarted; - public string CurrentLevel = string.Empty; - public TimeSpan? CountdownEnd; - - public event Action? OnEmergencyLevel; - public event Action? OnAlertLevel; - public event Action? OnAnnounce; - public event Action? OnBroadcast; - - public CommunicationsConsoleMenu() + public CommunicationsConsoleMenu(CommunicationsConsoleBoundUserInterface owner) { IoCManager.InjectDependencies(this); RobustXamlLoader.Load(this); - MessageInput.Placeholder = new Rope.Leaf(_loc.GetString("comms-console-menu-announcement-placeholder")); + Owner = owner; + + var loc = IoCManager.Resolve(); + MessageInput.Placeholder = new Rope.Leaf(loc.GetString("comms-console-menu-announcement-placeholder")); var maxAnnounceLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength); MessageInput.OnTextChanged += (args) => @@ -46,38 +37,33 @@ namespace Content.Client.Communications.UI } else { - AnnounceButton.Disabled = !CanAnnounce; + AnnounceButton.Disabled = !owner.CanAnnounce; AnnounceButton.ToolTip = null; } }; - AnnounceButton.OnPressed += _ => OnAnnounce?.Invoke(Rope.Collapse(MessageInput.TextRope)); - AnnounceButton.Disabled = !CanAnnounce; + AnnounceButton.OnPressed += (_) => Owner.AnnounceButtonPressed(Rope.Collapse(MessageInput.TextRope)); + AnnounceButton.Disabled = !owner.CanAnnounce; - BroadcastButton.OnPressed += _ => OnBroadcast?.Invoke(Rope.Collapse(MessageInput.TextRope)); - BroadcastButton.Disabled = !CanBroadcast; + BroadcastButton.OnPressed += (_) => Owner.BroadcastButtonPressed(Rope.Collapse(MessageInput.TextRope)); + BroadcastButton.Disabled = !owner.CanBroadcast; AlertLevelButton.OnItemSelected += args => { var metadata = AlertLevelButton.GetItemMetadata(args.Id); if (metadata != null && metadata is string cast) { - OnAlertLevel?.Invoke(cast); + Owner.AlertLevelSelected(cast); } }; + AlertLevelButton.Disabled = !owner.AlertLevelSelectable; + EmergencyShuttleButton.OnPressed += (_) => Owner.EmergencyShuttleButtonPressed(); + EmergencyShuttleButton.Disabled = !owner.CanCall; - AlertLevelButton.Disabled = !AlertLevelSelectable; - - EmergencyShuttleButton.OnPressed += _ => OnEmergencyLevel?.Invoke(); - EmergencyShuttleButton.Disabled = !CanCall; - } - - protected override void FrameUpdate(FrameEventArgs args) - { - base.FrameUpdate(args); UpdateCountdown(); + Timer.SpawnRepeating(1000, UpdateCountdown, _timerCancelTokenSource.Token); } // The current alert could make levels unselectable, so we need to ensure that the UI reacts properly. @@ -119,19 +105,32 @@ namespace Content.Client.Communications.UI public void UpdateCountdown() { - if (!CountdownStarted) + if (!Owner.CountdownStarted) { - CountdownLabel.SetMessage(string.Empty); + CountdownLabel.SetMessage(""); EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-call-shuttle"); return; } - var diff = (CountdownEnd - _timing.CurTime) ?? TimeSpan.Zero; - EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-recall-shuttle"); var infoText = Loc.GetString($"comms-console-menu-time-remaining", - ("time", diff.TotalSeconds.ToString(CultureInfo.CurrentCulture))); + ("time", Owner.Countdown.ToString())); CountdownLabel.SetMessage(infoText); } + + public override void Close() + { + base.Close(); + + _timerCancelTokenSource.Cancel(); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (disposing) + _timerCancelTokenSource.Cancel(); + } } } diff --git a/Content.Client/Computer/ComputerBoundUserInterface.cs b/Content.Client/Computer/ComputerBoundUserInterface.cs index 11c26b252e..bdbfe03fa1 100644 --- a/Content.Client/Computer/ComputerBoundUserInterface.cs +++ b/Content.Client/Computer/ComputerBoundUserInterface.cs @@ -1,5 +1,4 @@ using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using Robust.Client.UserInterface.CustomControls; namespace Content.Client.Computer @@ -20,8 +19,10 @@ namespace Content.Client.Computer { base.Open(); - _window = this.CreateWindow(); + _window = (TWindow) _dynamicTypeFactory.CreateInstance(typeof(TWindow)); _window.SetupComputerWindow(this); + _window.OnClose += Close; + _window.OpenCentered(); } // Alas, this constructor has to be copied to the subclass. :( @@ -41,6 +42,16 @@ namespace Content.Client.Computer _window.UpdateState((TState) state); } + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (disposing) + { + _window?.Dispose(); + } + } + protected override void ReceiveMessage(BoundUserInterfaceMessage message) { _window?.ReceiveMessage(message); diff --git a/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs index e4966f1ec4..4fea44f225 100644 --- a/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs +++ b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs @@ -1,6 +1,5 @@ using System.Text.RegularExpressions; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using static Content.Shared.Configurable.ConfigurationComponent; namespace Content.Client.Configurable.UI @@ -10,6 +9,9 @@ namespace Content.Client.Configurable.UI [ViewVariables] private ConfigurationMenu? _menu; + [ViewVariables] + public Regex? Validation { get; internal set; } + public ConfigurationBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } @@ -17,8 +19,10 @@ namespace Content.Client.Configurable.UI protected override void Open() { base.Open(); - _menu = this.CreateWindow(); - _menu.OnConfiguration += SendConfiguration; + _menu = new ConfigurationMenu(this); + + _menu.OnClose += Close; + _menu.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -26,7 +30,9 @@ namespace Content.Client.Configurable.UI base.UpdateState(state); if (state is not ConfigurationBoundUserInterfaceState configurationState) + { return; + } _menu?.Populate(configurationState); } @@ -35,12 +41,9 @@ namespace Content.Client.Configurable.UI { base.ReceiveMessage(message); - if (_menu == null) - return; - if (message is ValidationUpdateMessage msg) { - _menu.Validation = new Regex(msg.ValidationString, RegexOptions.Compiled); + Validation = new Regex(msg.ValidationString, RegexOptions.Compiled); } } @@ -48,5 +51,16 @@ namespace Content.Client.Configurable.UI { SendMessage(new ConfigurationUpdatedMessage(config)); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (disposing && _menu != null) + { + _menu.OnClose -= Close; + _menu.Close(); + } + } } } diff --git a/Content.Client/Configurable/UI/ConfigurationMenu.cs b/Content.Client/Configurable/UI/ConfigurationMenu.cs index 29217eef7b..cc24af2869 100644 --- a/Content.Client/Configurable/UI/ConfigurationMenu.cs +++ b/Content.Client/Configurable/UI/ConfigurationMenu.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Numerics; -using System.Text.RegularExpressions; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; @@ -14,25 +13,23 @@ namespace Content.Client.Configurable.UI { public sealed class ConfigurationMenu : DefaultWindow { + public ConfigurationBoundUserInterface Owner { get; } + private readonly BoxContainer _column; private readonly BoxContainer _row; private readonly List<(string name, LineEdit input)> _inputs; - [ViewVariables] - public Regex? Validation { get; internal set; } - - public event Action>? OnConfiguration; - - public ConfigurationMenu() + public ConfigurationMenu(ConfigurationBoundUserInterface owner) { MinSize = SetSize = new Vector2(300, 250); + Owner = owner; _inputs = new List<(string name, LineEdit input)>(); Title = Loc.GetString("configuration-menu-device-title"); - var baseContainer = new BoxContainer + BoxContainer baseContainer = new BoxContainer { Orientation = LayoutOrientation.Vertical, VerticalExpand = true, @@ -119,13 +116,14 @@ namespace Content.Client.Configurable.UI private void OnConfirm(ButtonEventArgs args) { var config = GenerateDictionary(_inputs, "Text"); - OnConfiguration?.Invoke(config); + + Owner.SendConfiguration(config); Close(); } private bool Validate(string value) { - return Validation?.IsMatch(value) != false; + return Owner.Validation == null || Owner.Validation.IsMatch(value); } private Dictionary GenerateDictionary(IEnumerable<(string name, LineEdit input)> inputs, string propertyName) diff --git a/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs b/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs index 887492955e..86f1b8b83c 100644 --- a/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs +++ b/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs @@ -1,6 +1,5 @@ using Content.Shared.Construction.Components; using JetBrains.Annotations; -using Robust.Client.UserInterface; namespace Content.Client.Construction.UI { @@ -18,8 +17,8 @@ namespace Content.Client.Construction.UI { base.Open(); - _menu = this.CreateWindow(); - _menu.SetEntity(Owner); + _menu = new FlatpackCreatorMenu(Owner); + _menu.OnClose += Close; _menu.PackButtonPressed += () => { @@ -28,5 +27,14 @@ namespace Content.Client.Construction.UI _menu.OpenCentered(); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + + _menu?.Dispose(); + } } } diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs index 269694ebf9..9f3d5695bb 100644 --- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs +++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs @@ -24,7 +24,7 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow private readonly FlatpackSystem _flatpack; private readonly MaterialStorageSystem _materialStorage; - private EntityUid _owner; + private readonly EntityUid _owner; [ValidatePrototypeId] public const string NoBoardEffectId = "FlatpackerNoBoardEffect"; @@ -33,7 +33,7 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow public event Action? PackButtonPressed; - public FlatpackCreatorMenu() + public FlatpackCreatorMenu(EntityUid uid) { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); @@ -42,15 +42,12 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow _flatpack = _entityManager.System(); _materialStorage = _entityManager.System(); + _owner = uid; + PackButton.OnPressed += _ => PackButtonPressed?.Invoke(); - InsertLabel.SetMarkup(Loc.GetString("flatpacker-ui-insert-board")); - } - - public void SetEntity(EntityUid uid) - { - _owner = uid; MaterialStorageControl.SetOwner(uid); + InsertLabel.SetMarkup(Loc.GetString("flatpacker-ui-insert-board")); } protected override void FrameUpdate(FrameEventArgs args) diff --git a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs index e5be0b1811..e2c4d51ecd 100644 --- a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs +++ b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs @@ -2,15 +2,12 @@ using Content.Shared.Crayon; using Content.Shared.Decals; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.Crayon.UI { public sealed class CrayonBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [ViewVariables] private CrayonWindow? _menu; @@ -21,29 +18,15 @@ namespace Content.Client.Crayon.UI protected override void Open() { base.Open(); - _menu = this.CreateWindow(); - _menu.OnColorSelected += SelectColor; - _menu.OnSelected += Select; - PopulateCrayons(); + _menu = new CrayonWindow(this); + + _menu.OnClose += Close; + var prototypeManager = IoCManager.Resolve(); + var crayonDecals = prototypeManager.EnumeratePrototypes().Where(x => x.Tags.Contains("crayon")); + _menu.Populate(crayonDecals); _menu.OpenCenteredLeft(); } - private void PopulateCrayons() - { - var crayonDecals = _protoManager.EnumeratePrototypes().Where(x => x.Tags.Contains("crayon")); - _menu?.Populate(crayonDecals); - } - - public override void OnProtoReload(PrototypesReloadedEventArgs args) - { - base.OnProtoReload(args); - - if (!args.WasModified()) - return; - - PopulateCrayons(); - } - protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); @@ -60,5 +43,16 @@ namespace Content.Client.Crayon.UI { SendMessage(new CrayonColorMessage(color)); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (disposing) + { + _menu?.Close(); + _menu = null; + } + } } } diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs index b97786cd41..2a5801ccf2 100644 --- a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs +++ b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs @@ -18,17 +18,18 @@ namespace Content.Client.Crayon.UI [GenerateTypedNameReferences] public sealed partial class CrayonWindow : DefaultWindow { + public CrayonBoundUserInterface Owner { get; } + private Dictionary? _decals; private string? _selected; private Color _color; - public event Action? OnColorSelected; - public event Action? OnSelected; - - public CrayonWindow() + public CrayonWindow(CrayonBoundUserInterface owner) { RobustXamlLoader.Load(this); + Owner = owner; + Search.OnTextChanged += _ => RefreshList(); ColorSelector.OnColorChanged += SelectColor; } @@ -37,16 +38,16 @@ namespace Content.Client.Crayon.UI { _color = color; - OnColorSelected?.Invoke(color); + Owner.SelectColor(color); + RefreshList(); } private void RefreshList() { // Clear - Grid.DisposeAllChildren(); - if (_decals == null) - return; + Grid.RemoveAllChildren(); + if (_decals == null) return; var filter = Search.Text; foreach (var (decal, tex) in _decals) @@ -88,6 +89,7 @@ namespace Content.Client.Crayon.UI { if (obj.Button.Name == null) return; + Owner.Select(obj.Button.Name); _selected = obj.Button.Name; RefreshList(); } diff --git a/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs index 296e71d3a9..e8e77217ea 100644 --- a/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs +++ b/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs @@ -1,6 +1,5 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using static Content.Shared.Disposal.Components.SharedDisposalRouterComponent; namespace Content.Client.Disposal.UI @@ -22,16 +21,20 @@ namespace Content.Client.Disposal.UI { base.Open(); - _window = this.CreateWindow(); + _window = new DisposalRouterWindow(); + + _window.OpenCentered(); + _window.OnClose += Close; _window.Confirm.OnPressed += _ => ButtonPressed(UiAction.Ok, _window.TagInput.Text); _window.TagInput.OnTextEntered += args => ButtonPressed(UiAction.Ok, args.Text); + } private void ButtonPressed(UiAction action, string tag) { SendMessage(new UiActionMessage(action, tag)); - Close(); + _window?.Close(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -45,5 +48,18 @@ namespace Content.Client.Disposal.UI _window?.UpdateState(cast); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (disposing) + { + _window?.Dispose(); + } + } + + } + } diff --git a/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs index 7fc0eb8540..3aeed8dc80 100644 --- a/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs +++ b/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs @@ -1,6 +1,5 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using static Content.Shared.Disposal.Components.SharedDisposalTaggerComponent; namespace Content.Client.Disposal.UI @@ -22,17 +21,20 @@ namespace Content.Client.Disposal.UI { base.Open(); - _window = this.CreateWindow(); + _window = new DisposalTaggerWindow(); + + _window.OpenCentered(); + _window.OnClose += Close; _window.Confirm.OnPressed += _ => ButtonPressed(UiAction.Ok, _window.TagInput.Text); _window.TagInput.OnTextEntered += args => ButtonPressed(UiAction.Ok, args.Text); + } private void ButtonPressed(UiAction action, string tag) { - // TODO: This looks copy-pasted with the other mailing stuff... SendMessage(new UiActionMessage(action, tag)); - Close(); + _window?.Close(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -46,5 +48,18 @@ namespace Content.Client.Disposal.UI _window?.UpdateState(cast); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (disposing) + { + _window?.Dispose(); + } + } + + } + } diff --git a/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs index 9b7e23c03a..cd7ea717ce 100644 --- a/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs +++ b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Shared.Access; using Content.Shared.Doors.Electronics; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.Doors.Electronics; @@ -19,23 +18,6 @@ public sealed class DoorElectronicsBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _window = this.CreateWindow(); - _window.OnAccessChanged += UpdateConfiguration; - Reset(); - } - - public override void OnProtoReload(PrototypesReloadedEventArgs args) - { - base.OnProtoReload(args); - - if (!args.WasModified()) - return; - - Reset(); - } - - private void Reset() - { List> accessLevels = new(); foreach (var accessLevel in _prototypeManager.EnumeratePrototypes()) @@ -47,7 +29,10 @@ public sealed class DoorElectronicsBoundUserInterface : BoundUserInterface } accessLevels.Sort(); - _window?.Reset(_prototypeManager, accessLevels); + + _window = new DoorElectronicsConfigurationMenu(this, accessLevels, _prototypeManager); + _window.OnClose += Close; + _window.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -59,6 +44,14 @@ public sealed class DoorElectronicsBoundUserInterface : BoundUserInterface _window?.UpdateState(castState); } + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) return; + + _window?.Dispose(); + } + public void UpdateConfiguration(List> newAccessList) { SendMessage(new DoorElectronicsUpdateConfigurationMessage(newAccessList)); diff --git a/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs index 2112a56297..c01f13a462 100644 --- a/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs +++ b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs @@ -15,23 +15,22 @@ namespace Content.Client.Doors.Electronics; [GenerateTypedNameReferences] public sealed partial class DoorElectronicsConfigurationMenu : FancyWindow { - private readonly AccessLevelControl _buttonsList = new(); + private readonly DoorElectronicsBoundUserInterface _owner; + private AccessLevelControl _buttonsList = new(); - public event Action>>? OnAccessChanged; - - public DoorElectronicsConfigurationMenu() + public DoorElectronicsConfigurationMenu(DoorElectronicsBoundUserInterface ui, List> accessLevels, IPrototypeManager prototypeManager) { RobustXamlLoader.Load(this); + + _owner = ui; + + _buttonsList.Populate(accessLevels, prototypeManager); AccessLevelControlContainer.AddChild(_buttonsList); - } - public void Reset(IPrototypeManager protoManager, List> accessLevels) - { - _buttonsList.Populate(accessLevels, protoManager); - - foreach (var button in _buttonsList.ButtonsList.Values) + foreach (var (id, button) in _buttonsList.ButtonsList) { - button.OnPressed += _ => OnAccessChanged?.Invoke(_buttonsList.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList()); + button.OnPressed += _ => _owner.UpdateConfiguration( + _buttonsList.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList()); } } diff --git a/Content.Client/Fax/UI/FaxBoundUi.cs b/Content.Client/Fax/UI/FaxBoundUi.cs index ca2e834b4f..a95066a3b5 100644 --- a/Content.Client/Fax/UI/FaxBoundUi.cs +++ b/Content.Client/Fax/UI/FaxBoundUi.cs @@ -25,7 +25,10 @@ public sealed class FaxBoundUi : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); + _window = new FaxWindow(); + _window.OpenCentered(); + + _window.OnClose += Close; _window.FileButtonPressed += OnFileButtonPressed; _window.CopyButtonPressed += OnCopyButtonPressed; _window.SendButtonPressed += OnSendButtonPressed; @@ -101,4 +104,11 @@ public sealed class FaxBoundUi : BoundUserInterface _window.UpdateState(cast); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (disposing) + _window?.Dispose(); + } } diff --git a/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs b/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs index 08596b04e6..ba49f11ea0 100644 --- a/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs +++ b/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs @@ -1,7 +1,6 @@ using Robust.Client.GameObjects; using Robust.Shared.Timing; using Content.Shared.Forensics; -using Robust.Client.UserInterface; namespace Content.Client.Forensics { @@ -22,9 +21,11 @@ namespace Content.Client.Forensics protected override void Open() { base.Open(); - _window = this.CreateWindow(); + _window = new ForensicScannerMenu(); + _window.OnClose += Close; _window.Print.OnPressed += _ => Print(); _window.Clear.OnPressed += _ => Clear(); + _window.OpenCentered(); } private void Print() @@ -61,7 +62,6 @@ namespace Content.Client.Forensics _printCooldown = cast.PrintCooldown; - // TODO: Fix this if (cast.PrintReadyAt > _gameTiming.CurTime) Timer.Spawn(cast.PrintReadyAt - _gameTiming.CurTime, () => { @@ -71,5 +71,14 @@ namespace Content.Client.Forensics _window.UpdateState(cast); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + + _window?.Dispose(); + } } } diff --git a/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs b/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs index 457b70ca7c..fdb3cdbc01 100644 --- a/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs +++ b/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Shared.Gateway; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Gateway.UI; @@ -18,13 +17,24 @@ public sealed class GatewayBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); - _window.SetEntity(EntMan.GetNetEntity(Owner)); + _window = new GatewayWindow(EntMan.GetNetEntity(Owner)); _window.OpenPortal += destination => { SendMessage(new GatewayOpenPortalMessage(destination)); }; + _window.OnClose += Close; + _window?.OpenCentered(); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (disposing) + { + _window?.Dispose(); + _window = null; + } } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Gateway/UI/GatewayWindow.xaml.cs b/Content.Client/Gateway/UI/GatewayWindow.xaml.cs index 1c779b2b35..889dd6e175 100644 --- a/Content.Client/Gateway/UI/GatewayWindow.xaml.cs +++ b/Content.Client/Gateway/UI/GatewayWindow.xaml.cs @@ -22,7 +22,7 @@ public sealed partial class GatewayWindow : FancyWindow, public event Action? OpenPortal; private List _destinations = new(); - public NetEntity Owner; + public readonly NetEntity Owner; private NetEntity? _current; private TimeSpan _nextReady; @@ -46,20 +46,16 @@ public sealed partial class GatewayWindow : FancyWindow, /// private bool _isCooldownPending = true; - public GatewayWindow() + public GatewayWindow(NetEntity netEntity) { RobustXamlLoader.Load(this); var dependencies = IoCManager.Instance!; _timing = dependencies.Resolve(); + Owner = netEntity; NextUnlockBar.ForegroundStyleBoxOverride = new StyleBoxFlat(Color.FromHex("#C74EBD")); } - public void SetEntity(NetEntity entity) - { - - } - public void UpdateState(GatewayBoundUserInterfaceState state) { _destinations = state.Destinations; diff --git a/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs b/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs index 32b40747d5..d72da3e812 100644 --- a/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs +++ b/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs @@ -1,6 +1,6 @@ using Content.Shared.Gravity; using JetBrains.Annotations; -using Robust.Client.UserInterface; +using Robust.Client.GameObjects; namespace Content.Client.Gravity.UI { @@ -18,8 +18,17 @@ namespace Content.Client.Gravity.UI { base.Open(); - _window = this.CreateWindow(); - _window.SetEntity(Owner); + _window = new GravityGeneratorWindow(this); + + /* + _window.Switch.OnPressed += _ => + { + SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(!IsOn)); + }; + */ + + _window.OpenCentered(); + _window.OnClose += Close; } protected override void UpdateState(BoundUserInterfaceState state) @@ -30,6 +39,14 @@ namespace Content.Client.Gravity.UI _window?.UpdateState(castState); } + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) return; + + _window?.Dispose(); + } + public void SetPowerSwitch(bool on) { SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(on)); diff --git a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs index 6f04133b59..75f8eb479b 100644 --- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs +++ b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs @@ -12,23 +12,22 @@ namespace Content.Client.Gravity.UI { private readonly ButtonGroup _buttonGroup = new(); - public event Action? OnPowerSwitch; + private readonly GravityGeneratorBoundUserInterface _owner; - public GravityGeneratorWindow() + public GravityGeneratorWindow(GravityGeneratorBoundUserInterface owner) { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); + _owner = owner; + OnButton.Group = _buttonGroup; OffButton.Group = _buttonGroup; - OnButton.OnPressed += _ => OnPowerSwitch?.Invoke(true); - OffButton.OnPressed += _ => OnPowerSwitch?.Invoke(false); - } + OnButton.OnPressed += _ => _owner.SetPowerSwitch(true); + OffButton.OnPressed += _ => _owner.SetPowerSwitch(false); - public void SetEntity(EntityUid uid) - { - EntityView.SetEntity(uid); + EntityView.SetEntity(owner.Owner); } public void UpdateState(SharedGravityGeneratorComponent.GeneratorState state) diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs index 38760f4aa3..dc0a3e9fcc 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs @@ -1,6 +1,6 @@ using Content.Shared.MedicalScanner; using JetBrains.Annotations; -using Robust.Client.UserInterface; +using Robust.Client.GameObjects; namespace Content.Client.HealthAnalyzer.UI { @@ -17,9 +17,12 @@ namespace Content.Client.HealthAnalyzer.UI protected override void Open() { base.Open(); - _window = this.CreateWindow(); - - _window.Title = EntMan.GetComponent(Owner).EntityName; + _window = new HealthAnalyzerWindow + { + Title = EntMan.GetComponent(Owner).EntityName, + }; + _window.OnClose += Close; + _window.OpenCentered(); } protected override void ReceiveMessage(BoundUserInterfaceMessage message) @@ -32,5 +35,17 @@ namespace Content.Client.HealthAnalyzer.UI _window.Populate(cast); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + + if (_window != null) + _window.OnClose -= Close; + + _window?.Dispose(); + } } } diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs b/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs index 53977eb636..a8872604a4 100644 --- a/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs +++ b/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs @@ -1,6 +1,5 @@ using Content.Shared.Humanoid; using Content.Shared.Humanoid.Markings; -using Robust.Client.UserInterface; namespace Content.Client.Humanoid; @@ -21,7 +20,8 @@ public sealed class HumanoidMarkingModifierBoundUserInterface : BoundUserInterfa { base.Open(); - _window = this.CreateWindow(); + _window = new(); + _window.OnClose += Close; _window.OnMarkingAdded += SendMarkingSet; _window.OnMarkingRemoved += SendMarkingSet; _window.OnMarkingColorChange += SendMarkingSetNoResend; diff --git a/Content.Client/Instruments/UI/BandMenu.xaml.cs b/Content.Client/Instruments/UI/BandMenu.xaml.cs index 26cd1369e5..5fb293a194 100644 --- a/Content.Client/Instruments/UI/BandMenu.xaml.cs +++ b/Content.Client/Instruments/UI/BandMenu.xaml.cs @@ -11,9 +11,7 @@ public sealed partial class BandMenu : DefaultWindow { private readonly InstrumentBoundUserInterface _owner; - public EntityUid? Master; - - public BandMenu(InstrumentBoundUserInterface owner) + public BandMenu(InstrumentBoundUserInterface owner) : base() { RobustXamlLoader.Load(this); @@ -42,7 +40,7 @@ public sealed partial class BandMenu : DefaultWindow { var uid = entManager.GetEntity(nent); var item = BandList.AddItem(name, null, true, uid); - item.Selected = Master == uid; + item.Selected = _owner.Instrument?.Master == uid; } } } diff --git a/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs b/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs index c175e67842..2814d41536 100644 --- a/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs +++ b/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs @@ -51,7 +51,7 @@ public sealed partial class ChannelsMenu : DefaultWindow } } - public void Populate(InstrumentComponent? instrument) + public void Populate() { ChannelList.Clear(); @@ -60,8 +60,7 @@ public sealed partial class ChannelsMenu : DefaultWindow var item = ChannelList.AddItem(_owner.Loc.GetString("instrument-component-channel-name", ("number", i)), null, true, i); - - item.Selected = !instrument?.FilteredChannels[i] ?? false; + item.Selected = !_owner.Instrument?.FilteredChannels[i] ?? false; } } } diff --git a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs index 4816ce8c36..0f5729f55b 100644 --- a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs +++ b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs @@ -24,6 +24,8 @@ namespace Content.Client.Instruments.UI [ViewVariables] private BandMenu? _bandMenu; [ViewVariables] private ChannelsMenu? _channelsMenu; + [ViewVariables] public InstrumentComponent? Instrument { get; private set; } + public InstrumentBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { IoCManager.InjectDependencies(this); @@ -41,20 +43,14 @@ namespace Content.Client.Instruments.UI protected override void Open() { - _instrumentMenu = this.CreateWindow(); - _instrumentMenu.Title = EntMan.GetComponent(Owner).EntityName; + if (!EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument)) + return; - _instrumentMenu.OnOpenBand += OpenBandMenu; - _instrumentMenu.OnOpenChannels += OpenChannelsMenu; - _instrumentMenu.OnCloseChannels += CloseChannelsMenu; - _instrumentMenu.OnCloseBands += CloseBandMenu; + Instrument = instrument; + _instrumentMenu = new InstrumentMenu(this); + _instrumentMenu.OnClose += Close; - _instrumentMenu.SetMIDI(MidiManager.IsAvailable); - - if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument)) - { - _instrumentMenu.SetInstrument((Owner, instrument)); - } + _instrumentMenu.OpenCentered(); } protected override void Dispose(bool disposing) @@ -62,12 +58,7 @@ namespace Content.Client.Instruments.UI base.Dispose(disposing); if (!disposing) return; - - if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument)) - { - _instrumentMenu?.RemoveInstrument(instrument); - } - + _instrumentMenu?.Dispose(); _bandMenu?.Dispose(); _channelsMenu?.Dispose(); } @@ -81,11 +72,6 @@ namespace Content.Client.Instruments.UI { _bandMenu ??= new BandMenu(this); - if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument)) - { - _bandMenu.Master = instrument.Master; - } - // Refresh cache... RefreshBands(); @@ -101,9 +87,7 @@ namespace Content.Client.Instruments.UI public void OpenChannelsMenu() { _channelsMenu ??= new ChannelsMenu(this); - EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument); - - _channelsMenu.Populate(instrument); + _channelsMenu.Populate(); _channelsMenu.OpenCenteredRight(); } diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs index fc863648d7..da443e3fb5 100644 --- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs +++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs @@ -1,10 +1,7 @@ using System.IO; using System.Numerics; using System.Threading.Tasks; -using Content.Client.Interactable; -using Content.Shared.ActionBlocker; using Robust.Client.AutoGenerated; -using Robust.Client.Player; using Robust.Client.UserInterface; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; @@ -19,23 +16,33 @@ namespace Content.Client.Instruments.UI [GenerateTypedNameReferences] public sealed partial class InstrumentMenu : DefaultWindow { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IFileDialogManager _dialogs = default!; - [Dependency] private readonly IPlayerManager _player = default!; + private readonly InstrumentBoundUserInterface _owner; private bool _isMidiFileDialogueWindowOpen; - public event Action? OnOpenBand; - public event Action? OnOpenChannels; - public event Action? OnCloseBands; - public event Action? OnCloseChannels; - - public EntityUid Entity; - - public InstrumentMenu() + public InstrumentMenu(InstrumentBoundUserInterface owner) { RobustXamlLoader.Load(this); - IoCManager.InjectDependencies(this); + + _owner = owner; + + if (_owner.Instrument != null) + { + _owner.Instrument.OnMidiPlaybackEnded += InstrumentOnMidiPlaybackEnded; + Title = _owner.Entities.GetComponent(_owner.Owner).EntityName; + LoopButton.Disabled = !_owner.Instrument.IsMidiOpen; + LoopButton.Pressed = _owner.Instrument.LoopMidi; + ChannelsButton.Disabled = !_owner.Instrument.IsRendererAlive; + StopButton.Disabled = !_owner.Instrument.IsMidiOpen; + PlaybackSlider.MouseFilter = _owner.Instrument.IsMidiOpen ? MouseFilterMode.Pass : MouseFilterMode.Ignore; + } + + if (!_owner.MidiManager.IsAvailable) + { + UnavailableOverlay.Visible = true; + // We return early as to not give the buttons behavior. + return; + } InputButton.OnToggled += MidiInputButtonOnOnToggled; BandButton.OnPressed += BandButtonOnPressed; @@ -50,34 +57,12 @@ namespace Content.Client.Instruments.UI MinSize = SetSize = new Vector2(400, 150); } - public void SetInstrument(Entity entity) - { - Entity = entity; - var component = entity.Comp; - component.OnMidiPlaybackEnded += InstrumentOnMidiPlaybackEnded; - LoopButton.Disabled = !component.IsMidiOpen; - LoopButton.Pressed = component.LoopMidi; - ChannelsButton.Disabled = !component.IsRendererAlive; - StopButton.Disabled = !component.IsMidiOpen; - PlaybackSlider.MouseFilter = component.IsMidiOpen ? MouseFilterMode.Pass : MouseFilterMode.Ignore; - } - - public void RemoveInstrument(InstrumentComponent component) - { - component.OnMidiPlaybackEnded -= InstrumentOnMidiPlaybackEnded; - } - - public void SetMIDI(bool available) - { - UnavailableOverlay.Visible = !available; - } - private void BandButtonOnPressed(ButtonEventArgs obj) { if (!PlayCheck()) return; - OnOpenBand?.Invoke(); + _owner.OpenBandMenu(); } private void BandButtonOnToggled(ButtonToggledEventArgs obj) @@ -85,15 +70,12 @@ namespace Content.Client.Instruments.UI if (obj.Pressed) return; - if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument)) - { - _entManager.System().SetMaster(Entity, instrument.Master); - } + _owner.Instruments.SetMaster(_owner.Owner, null); } private void ChannelsButtonOnPressed(ButtonEventArgs obj) { - OnOpenChannels?.Invoke(); + _owner.OpenChannelsMenu(); } private void InstrumentOnMidiPlaybackEnded() @@ -103,10 +85,8 @@ namespace Content.Client.Instruments.UI public void MidiPlaybackSetButtonsDisabled(bool disabled) { - if (disabled) - { - OnCloseChannels?.Invoke(); - } + if(disabled) + _owner.CloseChannelsMenu(); LoopButton.Disabled = disabled; StopButton.Disabled = disabled; @@ -120,7 +100,7 @@ namespace Content.Client.Instruments.UI if (_isMidiFileDialogueWindowOpen) return; - OnCloseBands?.Invoke(); + _owner.CloseBandMenu(); var filters = new FileDialogFilters(new FileDialogFilters.Group("mid", "midi")); @@ -128,7 +108,7 @@ namespace Content.Client.Instruments.UI // or focus the previously-opened window. _isMidiFileDialogueWindowOpen = true; - await using var file = await _dialogs.OpenFile(filters); + await using var file = await _owner.FileDialogManager.OpenFile(filters); _isMidiFileDialogueWindowOpen = false; @@ -149,18 +129,9 @@ namespace Content.Client.Instruments.UI await file.CopyToAsync(memStream); - if (!_entManager.TryGetComponent(Entity, out var instrument)) - { + if (_owner.Instrument is not {} instrument + || !_owner.Instruments.OpenMidi(_owner.Owner, memStream.GetBuffer().AsSpan(0, (int) memStream.Length), instrument)) return; - } - - if (!_entManager.System() - .OpenMidi(Entity, - memStream.GetBuffer().AsSpan(0, (int) memStream.Length), - instrument)) - { - return; - } MidiPlaybackSetButtonsDisabled(false); if (InputButton.Pressed) @@ -169,7 +140,7 @@ namespace Content.Client.Instruments.UI private void MidiInputButtonOnOnToggled(ButtonToggledEventArgs obj) { - OnCloseBands?.Invoke(); + _owner.CloseBandMenu(); if (obj.Pressed) { @@ -177,99 +148,109 @@ namespace Content.Client.Instruments.UI return; MidiStopButtonOnPressed(null); - - if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument)) - _entManager.System().OpenInput(Entity, instrument); + if(_owner.Instrument is {} instrument) + _owner.Instruments.OpenInput(_owner.Owner, instrument); } - else + else if (_owner.Instrument is { } instrument) { - _entManager.System().CloseInput(Entity, false); - OnCloseChannels?.Invoke(); + _owner.Instruments.CloseInput(_owner.Owner, false, instrument); + _owner.CloseChannelsMenu(); } } private bool PlayCheck() { // TODO all of these checks should also be done server-side. - if (!_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument)) + + var instrumentEnt = _owner.Owner; + var instrument = _owner.Instrument; + + if (instrument == null) return false; - var localEntity = _player.LocalEntity; + var localEntity = _owner.PlayerManager.LocalEntity; // If we don't have a player or controlled entity, we return. if (localEntity == null) return false; // By default, allow an instrument to play itself and skip all other checks - if (localEntity == Entity) + if (localEntity == instrumentEnt) return true; - var container = _entManager.System(); + var container = _owner.Entities.System(); // If we're a handheld instrument, we might be in a container. Get it just in case. - container.TryGetContainingContainer(Entity, out var conMan); + container.TryGetContainingContainer(instrumentEnt, out var conMan); // If the instrument is handheld and we're not holding it, we return. - if (instrument.Handheld && (conMan == null || conMan.Owner != localEntity)) + if ((instrument.Handheld && (conMan == null || conMan.Owner != localEntity))) return false; - if (!_entManager.System().CanInteract(localEntity.Value, Entity)) + if (!_owner.ActionBlocker.CanInteract(localEntity.Value, instrumentEnt)) return false; // We check that we're in range unobstructed just in case. - return _entManager.System().InRangeUnobstructed(localEntity.Value, Entity); + return _owner.Interactions.InRangeUnobstructed(localEntity.Value, instrumentEnt); } private void MidiStopButtonOnPressed(ButtonEventArgs? obj) { MidiPlaybackSetButtonsDisabled(true); - _entManager.System().CloseMidi(Entity, false); - OnCloseChannels?.Invoke(); + if (_owner.Instrument is not {} instrument) + return; + + _owner.Instruments.CloseMidi(_owner.Owner, false, instrument); + _owner.CloseChannelsMenu(); } private void MidiLoopButtonOnOnToggled(ButtonToggledEventArgs obj) { - var instrument = _entManager.System(); + if (_owner.Instrument == null) + return; - if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrumentComp)) - { - instrumentComp.LoopMidi = obj.Pressed; - } - - instrument.UpdateRenderer(Entity); + _owner.Instrument.LoopMidi = obj.Pressed; + _owner.Instruments.UpdateRenderer(_owner.Owner, _owner.Instrument); } private void PlaybackSliderSeek(Range _) { // Do not seek while still grabbing. - if (PlaybackSlider.Grabbed) + if (PlaybackSlider.Grabbed || _owner.Instrument is not {} instrument) return; - _entManager.System().SetPlayerTick(Entity, (int)Math.Ceiling(PlaybackSlider.Value)); + _owner.Instruments.SetPlayerTick(_owner.Owner, (int)Math.Ceiling(PlaybackSlider.Value), instrument); } private void PlaybackSliderKeyUp(GUIBoundKeyEventArgs args) { - if (args.Function != EngineKeyFunctions.UIClick) + if (args.Function != EngineKeyFunctions.UIClick || _owner.Instrument is not {} instrument) return; - _entManager.System().SetPlayerTick(Entity, (int)Math.Ceiling(PlaybackSlider.Value)); + _owner.Instruments.SetPlayerTick(_owner.Owner, (int)Math.Ceiling(PlaybackSlider.Value), instrument); + } + + public override void Close() + { + base.Close(); + _owner.CloseBandMenu(); + _owner.CloseChannelsMenu(); } protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); - if (!_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument)) + if (_owner.Instrument == null) return; - var hasMaster = instrument.Master != null; + var hasMaster = _owner.Instrument.Master != null; BandButton.ToggleMode = hasMaster; BandButton.Pressed = hasMaster; - BandButton.Disabled = instrument.IsMidiOpen || instrument.IsInputOpen; - ChannelsButton.Disabled = !instrument.IsRendererAlive; + BandButton.Disabled = _owner.Instrument.IsMidiOpen || _owner.Instrument.IsInputOpen; + ChannelsButton.Disabled = !_owner.Instrument.IsRendererAlive; - if (!instrument.IsMidiOpen) + if (!_owner.Instrument.IsMidiOpen) { PlaybackSlider.MaxValue = 1; PlaybackSlider.SetValueWithoutEvent(0); @@ -279,8 +260,8 @@ namespace Content.Client.Instruments.UI if (PlaybackSlider.Grabbed) return; - PlaybackSlider.MaxValue = instrument.PlayerTotalTick; - PlaybackSlider.SetValueWithoutEvent(instrument.PlayerTick); + PlaybackSlider.MaxValue = _owner.Instrument.PlayerTotalTick; + PlaybackSlider.SetValueWithoutEvent(_owner.Instrument.PlayerTick); } } } diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs index 132c5ed654..7e50eb1c68 100644 --- a/Content.Client/Inventory/StrippableBoundUserInterface.cs +++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs @@ -41,7 +41,7 @@ namespace Content.Client.Inventory public const string HiddenPocketEntityId = "StrippingHiddenEntity"; [ViewVariables] - private StrippingMenu? _strippingMenu; + private readonly StrippingMenu? _strippingMenu; [ViewVariables] private readonly EntityUid _virtualHiddenEntity; @@ -51,30 +51,33 @@ namespace Content.Client.Inventory _examine = EntMan.System(); _inv = EntMan.System(); _cuffable = EntMan.System(); + + // TODO update name when identity changes + var title = Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner, EntMan))); + _strippingMenu = new StrippingMenu(title, this); + _strippingMenu.OnClose += Close; + + // TODO use global entity + // BUIs are opened and closed while applying comp sates, so spawning entities here is probably not the best idea. _virtualHiddenEntity = EntMan.SpawnEntity(HiddenPocketEntityId, MapCoordinates.Nullspace); } protected override void Open() { base.Open(); - - _strippingMenu = this.CreateWindow(); - _strippingMenu.OnDirty += UpdateMenu; - _strippingMenu.Title = Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner, EntMan))); - _strippingMenu?.OpenCenteredLeft(); } protected override void Dispose(bool disposing) { + base.Dispose(disposing); + + EntMan.DeleteEntity(_virtualHiddenEntity); + if (!disposing) return; - if (_strippingMenu != null) - _strippingMenu.OnDirty -= UpdateMenu; - - EntMan.DeleteEntity(_virtualHiddenEntity); - base.Dispose(disposing); + _strippingMenu?.Dispose(); } public void DirtyMenu() diff --git a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs index 7884268c42..f97d8a7330 100644 --- a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs +++ b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs @@ -12,34 +12,42 @@ namespace Content.Client.Kitchen.UI [GenerateTypedNameReferences] public sealed partial class GrinderMenu : FancyWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + private readonly IEntityManager _entityManager; + private readonly IPrototypeManager _prototypeManager; + private readonly ReagentGrinderBoundUserInterface _owner; private readonly Dictionary _chamberVisualContents = new(); - public event Action? OnToggleAuto; - public event Action? OnGrind; - public event Action? OnJuice; - public event Action? OnEjectAll; - public event Action? OnEjectBeaker; - public event Action? OnEjectChamber; - - public GrinderMenu() + public GrinderMenu(ReagentGrinderBoundUserInterface owner, IEntityManager entityManager, IPrototypeManager prototypeManager) { RobustXamlLoader.Load(this); - IoCManager.InjectDependencies(this); - AutoModeButton.OnPressed += _ => OnToggleAuto?.Invoke(); - GrindButton.OnPressed += _ => OnGrind?.Invoke(); - JuiceButton.OnPressed += _ => OnJuice?.Invoke(); - ChamberContentBox.EjectButton.OnPressed += _ => OnEjectAll?.Invoke(); - BeakerContentBox.EjectButton.OnPressed += _ => OnEjectBeaker?.Invoke(); + _entityManager = entityManager; + _prototypeManager = prototypeManager; + _owner = owner; + AutoModeButton.OnPressed += owner.ToggleAutoMode; + GrindButton.OnPressed += owner.StartGrinding; + JuiceButton.OnPressed += owner.StartJuicing; + ChamberContentBox.EjectButton.OnPressed += owner.EjectAll; + BeakerContentBox.EjectButton.OnPressed += owner.EjectBeaker; ChamberContentBox.BoxContents.OnItemSelected += OnChamberBoxContentsItemSelected; BeakerContentBox.BoxContents.SelectMode = ItemList.ItemListSelectMode.None; } private void OnChamberBoxContentsItemSelected(ItemList.ItemListSelectedEventArgs args) { - OnEjectChamber?.Invoke(_chamberVisualContents[args.ItemIndex]); + _owner.EjectChamberContent(_chamberVisualContents[args.ItemIndex]); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + _chamberVisualContents.Clear(); + GrindButton.OnPressed -= _owner.StartGrinding; + JuiceButton.OnPressed -= _owner.StartJuicing; + ChamberContentBox.EjectButton.OnPressed -= _owner.EjectAll; + BeakerContentBox.EjectButton.OnPressed -= _owner.EjectBeaker; + ChamberContentBox.BoxContents.OnItemSelected -= OnChamberBoxContentsItemSelected; } public void UpdateState(ReagentGrinderInterfaceState state) diff --git a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs index 643ac47054..7e7dd2d693 100644 --- a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs +++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs @@ -3,7 +3,6 @@ using Content.Shared.Kitchen.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Client.Graphics; -using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Timing; @@ -20,15 +19,28 @@ namespace Content.Client.Kitchen.UI [ViewVariables] private readonly Dictionary _reagents = new(); + [Dependency] private readonly IGameTiming _gameTiming = default!; + + public MicrowaveUpdateUserInterfaceState currentState = default!; + + private IEntityManager _entManager; public MicrowaveBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { + _entManager = IoCManager.Resolve(); + } + + public TimeSpan GetCurrentTime() + { + return _gameTiming.CurTime; } protected override void Open() { base.Open(); - _menu = this.CreateWindow(); + _menu = new MicrowaveMenu(this); + _menu.OpenCentered(); + _menu.OnClose += Close; _menu.StartButton.OnPressed += _ => SendPredictedMessage(new MicrowaveStartCookMessage()); _menu.EjectButton.OnPressed += _ => SendPredictedMessage(new MicrowaveEjectMessage()); _menu.IngredientsList.OnItemSelected += args => @@ -62,23 +74,38 @@ namespace Content.Client.Kitchen.UI }; } - protected override void UpdateState(BoundUserInterfaceState state) + protected override void Dispose(bool disposing) { - base.UpdateState(state); - if (state is not MicrowaveUpdateUserInterfaceState cState || _menu == null) + base.Dispose(disposing); + + if (!disposing) { return; } - _menu.IsBusy = cState.IsMicrowaveBusy; - _menu.CurrentCooktimeEnd = cState.CurrentCookTimeEnd; + _solids.Clear(); + _menu?.Dispose(); + } + + protected override void UpdateState(BoundUserInterfaceState state) + { + base.UpdateState(state); + if (state is not MicrowaveUpdateUserInterfaceState cState) + { + return; + } + + + _menu?.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0); + currentState = cState; - _menu.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0); // TODO move this to a component state and ensure the net ids. - RefreshContentsDisplay(EntMan.GetEntityArray(cState.ContainedSolids)); + RefreshContentsDisplay(_entManager.GetEntityArray(cState.ContainedSolids)); + + if (_menu == null) return; //Set the cook time info label - var cookTime = cState.ActiveButtonIndex == 0 + var cookTime = cState.ActiveButtonIndex == 0 ? Loc.GetString("microwave-menu-instant-button") : cState.CurrentCookTime.ToString(); diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs index 7565075f86..b292e9f146 100644 --- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs +++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs @@ -9,20 +9,22 @@ namespace Content.Client.Kitchen.UI [GenerateTypedNameReferences] public sealed partial class MicrowaveMenu : FancyWindow { - [Dependency] private readonly IGameTiming _timing = default!; + public sealed class MicrowaveCookTimeButton : Button + { + public uint CookTime; + } public event Action? OnCookTimeSelected; public ButtonGroup CookTimeButtonGroup { get; } + private readonly MicrowaveBoundUserInterface _owner; - public bool IsBusy; - public TimeSpan CurrentCooktimeEnd; - - public MicrowaveMenu() + public MicrowaveMenu(MicrowaveBoundUserInterface owner) { RobustXamlLoader.Load(this); CookTimeButtonGroup = new ButtonGroup(); InstantCookButton.Group = CookTimeButtonGroup; + _owner = owner; InstantCookButton.OnPressed += args => { OnCookTimeSelected?.Invoke(args, 0); @@ -63,20 +65,14 @@ namespace Content.Client.Kitchen.UI protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); - - if (!IsBusy) + if(!_owner.currentState.IsMicrowaveBusy) return; - if (CurrentCooktimeEnd > _timing.CurTime) + if(_owner.currentState.CurrentCookTimeEnd > _owner.GetCurrentTime()) { CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label", - ("time", CurrentCooktimeEnd.Subtract(_timing.CurTime).Seconds)); + ("time",_owner.currentState.CurrentCookTimeEnd.Subtract(_owner.GetCurrentTime()).Seconds)); } } - - public sealed class MicrowaveCookTimeButton : Button - { - public uint CookTime; - } } } diff --git a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs index bc4cc75b4d..e6f108b305 100644 --- a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs +++ b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Shared.Containers.ItemSlots; using Content.Shared.Kitchen; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Prototypes; @@ -9,6 +8,8 @@ namespace Content.Client.Kitchen.UI { public sealed class ReagentGrinderBoundUserInterface : BoundUserInterface { + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [ViewVariables] private GrinderMenu? _menu; @@ -20,13 +21,20 @@ namespace Content.Client.Kitchen.UI { base.Open(); - _menu = this.CreateWindow(); - _menu.OnToggleAuto += ToggleAutoMode; - _menu.OnGrind += StartGrinding; - _menu.OnJuice += StartJuicing; - _menu.OnEjectAll += EjectAll; - _menu.OnEjectBeaker += EjectBeaker; - _menu.OnEjectChamber += EjectChamberContent; + _menu = new GrinderMenu(this, EntMan, _prototypeManager); + _menu.OpenCentered(); + _menu.OnClose += Close; + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + { + return; + } + + _menu?.Dispose(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -44,27 +52,27 @@ namespace Content.Client.Kitchen.UI _menu?.HandleMessage(message); } - public void ToggleAutoMode() + public void ToggleAutoMode(BaseButton.ButtonEventArgs args) { SendMessage(new ReagentGrinderToggleAutoModeMessage()); } - public void StartGrinding() + public void StartGrinding(BaseButton.ButtonEventArgs? _ = null) { SendMessage(new ReagentGrinderStartMessage(GrinderProgram.Grind)); } - public void StartJuicing() + public void StartJuicing(BaseButton.ButtonEventArgs? _ = null) { SendMessage(new ReagentGrinderStartMessage(GrinderProgram.Juice)); } - public void EjectAll() + public void EjectAll(BaseButton.ButtonEventArgs? _ = null) { SendMessage(new ReagentGrinderEjectChamberAllMessage()); } - public void EjectBeaker() + public void EjectBeaker(BaseButton.ButtonEventArgs? _ = null) { SendMessage(new ItemSlotButtonPressedEvent(SharedReagentGrinder.BeakerSlotId)); } diff --git a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs index 6b65612341..555f1ff09e 100644 --- a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs +++ b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Shared.Labels; using Content.Shared.Labels.Components; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Labels.UI { @@ -24,8 +23,13 @@ namespace Content.Client.Labels.UI { base.Open(); - _window = this.CreateWindow(); + _window = new HandLabelerWindow(); + if (State != null) + UpdateState(State); + _window.OpenCentered(); + + _window.OnClose += Close; _window.OnLabelChanged += OnLabelChanged; Reload(); } @@ -47,5 +51,13 @@ namespace Content.Client.Labels.UI _window.SetCurrentLabel(component.AssignedLabel); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) return; + _window?.Dispose(); + } } + } diff --git a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs index a599f79152..6e6d1b9176 100644 --- a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs +++ b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Shared.Lathe; using Content.Shared.Research.Components; using JetBrains.Annotations; -using Robust.Client.UserInterface; namespace Content.Client.Lathe.UI { @@ -18,9 +17,9 @@ namespace Content.Client.Lathe.UI { base.Open(); - _menu = this.CreateWindow(); - _menu.SetEntity(Owner); - _menu.OpenCenteredRight(); + _menu = new LatheMenu(this); + _menu.OnClose += Close; + _menu.OnServerListButtonPressed += _ => { @@ -31,6 +30,8 @@ namespace Content.Client.Lathe.UI { SendMessage(new LatheQueueRecipeMessage(recipe, amount)); }; + + _menu.OpenCenteredRight(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -49,5 +50,13 @@ namespace Content.Client.Lathe.UI break; } } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + _menu?.Dispose(); + } } } diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs index 6f530b76c7..f2f52b67b5 100644 --- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs +++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs @@ -1,4 +1,3 @@ -using System.Buffers; using System.Linq; using System.Text; using Content.Client.Materials; @@ -23,6 +22,7 @@ public sealed partial class LatheMenu : DefaultWindow [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + private EntityUid _owner; private readonly SpriteSystem _spriteSystem; private readonly LatheSystem _lathe; private readonly MaterialStorageSystem _materialStorage; @@ -36,10 +36,9 @@ public sealed partial class LatheMenu : DefaultWindow public ProtoId? CurrentCategory; - public EntityUid Entity; - - public LatheMenu() + public LatheMenu(LatheBoundUserInterface owner) { + _owner = owner.Owner; RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); @@ -47,6 +46,8 @@ public sealed partial class LatheMenu : DefaultWindow _lathe = _entityManager.System(); _materialStorage = _entityManager.System(); + Title = _entityManager.GetComponent(owner.Owner).EntityName; + SearchBar.OnTextChanged += _ => { PopulateRecipes(); @@ -59,13 +60,8 @@ public sealed partial class LatheMenu : DefaultWindow FilterOption.OnItemSelected += OnItemSelected; ServerListButton.OnPressed += a => OnServerListButtonPressed?.Invoke(a); - } - public void SetEntity(EntityUid uid) - { - Entity = uid; - - if (_entityManager.TryGetComponent(Entity, out var latheComponent)) + if (_entityManager.TryGetComponent(owner.Owner, out var latheComponent)) { if (!latheComponent.DynamicRecipes.Any()) { @@ -73,7 +69,7 @@ public sealed partial class LatheMenu : DefaultWindow } } - MaterialsList.SetOwner(Entity); + MaterialsList.SetOwner(owner.Owner); } /// @@ -106,15 +102,13 @@ public sealed partial class LatheMenu : DefaultWindow var sortedRecipesToShow = recipesToShow.OrderBy(p => p.Name); RecipeList.Children.Clear(); - _entityManager.TryGetComponent(Entity, out LatheComponent? lathe); - foreach (var prototype in sortedRecipesToShow) { EntityPrototype? recipeProto = null; - if (_prototypeManager.TryIndex(prototype.Result, out EntityPrototype? entityProto)) + if (_prototypeManager.TryIndex(prototype.Result, out EntityPrototype? entityProto) && entityProto != null) recipeProto = entityProto; - var canProduce = _lathe.CanProduce(Entity, prototype, quantity, component: lathe); + var canProduce = _lathe.CanProduce(_owner, prototype, quantity); var control = new RecipeControl(prototype, () => GenerateTooltipText(prototype), canProduce, recipeProto); control.OnButtonPressed += s => @@ -130,20 +124,19 @@ public sealed partial class LatheMenu : DefaultWindow private string GenerateTooltipText(LatheRecipePrototype prototype) { StringBuilder sb = new(); - var multiplier = _entityManager.GetComponent(Entity).MaterialUseMultiplier; foreach (var (id, amount) in prototype.RequiredMaterials) { if (!_prototypeManager.TryIndex(id, out var proto)) continue; - var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, multiplier); + var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, _entityManager.GetComponent(_owner).MaterialUseMultiplier); var sheetVolume = _materialStorage.GetSheetVolume(proto); var unit = Loc.GetString(proto.Unit); var sheets = adjustedAmount / (float) sheetVolume; - var availableAmount = _materialStorage.GetMaterialAmount(Entity, id); + var availableAmount = _materialStorage.GetMaterialAmount(_owner, id); var missingAmount = Math.Max(0, adjustedAmount - availableAmount); var missingSheets = missingAmount / (float) sheetVolume; diff --git a/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs b/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs index 11abe8c245..09bdedfd94 100644 --- a/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs +++ b/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs @@ -1,6 +1,5 @@ using Content.Shared.MachineLinking; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using Robust.Shared.Timing; namespace Content.Client.MachineLinking.UI; @@ -20,14 +19,19 @@ public sealed class SignalTimerBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); - _window.OnStartTimer += StartTimer; + _window = new SignalTimerWindow(this); + + if (State != null) + UpdateState(State); + + _window.OpenCentered(); + _window.OnClose += Close; _window.OnCurrentTextChanged += OnTextChanged; _window.OnCurrentDelayMinutesChanged += OnDelayChanged; _window.OnCurrentDelaySecondsChanged += OnDelayChanged; } - public void StartTimer() + public void OnStartTimer() { SendMessage(new SignalTimerStartMessage()); } @@ -44,6 +48,11 @@ public sealed class SignalTimerBoundUserInterface : BoundUserInterface SendMessage(new SignalTimerDelayChangedMessage(_window.GetDelay())); } + public TimeSpan GetCurrentTime() + { + return _gameTiming.CurTime; + } + /// /// Update the UI state based on server-sent info /// @@ -63,4 +72,11 @@ public sealed class SignalTimerBoundUserInterface : BoundUserInterface _window.SetTimerStarted(cast.TimerStarted); _window.SetHasAccess(cast.HasAccess); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) return; + _window?.Dispose(); + } } diff --git a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs index 6133abfcb7..b62595595e 100644 --- a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs +++ b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs @@ -9,44 +9,42 @@ namespace Content.Client.MachineLinking.UI; [GenerateTypedNameReferences] public sealed partial class SignalTimerWindow : DefaultWindow { - [Dependency] private readonly IGameTiming _timing = default!; - private const int MaxTextLength = 5; public event Action? OnCurrentTextChanged; public event Action? OnCurrentDelayMinutesChanged; public event Action? OnCurrentDelaySecondsChanged; + private readonly SignalTimerBoundUserInterface _owner; + private TimeSpan? _triggerTime; private bool _timerStarted; - public event Action? OnStartTimer; - - public SignalTimerWindow() + public SignalTimerWindow(SignalTimerBoundUserInterface owner) { RobustXamlLoader.Load(this); - IoCManager.InjectDependencies(this); + + _owner = owner; CurrentTextEdit.OnTextChanged += e => OnCurrentTextChange(e.Text); CurrentDelayEditMinutes.OnTextChanged += e => OnCurrentDelayMinutesChange(e.Text); CurrentDelayEditSeconds.OnTextChanged += e => OnCurrentDelaySecondsChange(e.Text); - StartTimer.OnPressed += _ => StartTimerWeh(); + StartTimer.OnPressed += _ => OnStartTimer(); } - private void StartTimerWeh() + public void OnStartTimer() { if (!_timerStarted) { _timerStarted = true; - _triggerTime = _timing.CurTime + GetDelay(); + _triggerTime = _owner.GetCurrentTime() + GetDelay(); } else { SetTimerStarted(false); } - - OnStartTimer?.Invoke(); + _owner.OnStartTimer(); } protected override void FrameUpdate(FrameEventArgs args) @@ -56,9 +54,9 @@ public sealed partial class SignalTimerWindow : DefaultWindow if (!_timerStarted || _triggerTime == null) return; - if (_timing.CurTime < _triggerTime.Value) + if (_owner.GetCurrentTime() < _triggerTime.Value) { - StartTimer.Text = TextScreenSystem.TimeToString(_triggerTime.Value - _timing.CurTime); + StartTimer.Text = TextScreenSystem.TimeToString(_triggerTime.Value - _owner.GetCurrentTime()); } else { diff --git a/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs b/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs index 0a87948ff6..f6979bf8d7 100644 --- a/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs +++ b/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Shared.Humanoid.Markings; using Content.Shared.MagicMirror; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.MagicMirror; @@ -18,7 +17,7 @@ public sealed class MagicMirrorBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); + _window = new(); _window.OnHairSelected += tuple => SelectHair(MagicMirrorCategory.Hair, tuple.id, tuple.slot); _window.OnHairColorChanged += args => ChangeColor(MagicMirrorCategory.Hair, args.marking, args.slot); @@ -30,6 +29,9 @@ public sealed class MagicMirrorBoundUserInterface : BoundUserInterface args => ChangeColor(MagicMirrorCategory.FacialHair, args.marking, args.slot); _window.OnFacialHairSlotAdded += delegate () { AddSlot(MagicMirrorCategory.FacialHair); }; _window.OnFacialHairSlotRemoved += args => RemoveSlot(MagicMirrorCategory.FacialHair, args); + + _window.OnClose += Close; + _window.OpenCentered(); } private void SelectHair(MagicMirrorCategory category, string marking, int slot) @@ -63,5 +65,14 @@ public sealed class MagicMirrorBoundUserInterface : BoundUserInterface _window.UpdateState(data); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + + _window?.Dispose(); + } } diff --git a/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs b/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs index 22e5bc452a..80eca82e32 100644 --- a/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs +++ b/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs @@ -1,7 +1,6 @@ using JetBrains.Annotations; using Content.Shared.MassMedia.Systems; using Content.Shared.MassMedia.Components; -using Robust.Client.UserInterface; using Robust.Shared.Timing; using Robust.Shared.Utility; @@ -10,6 +9,8 @@ namespace Content.Client.MassMedia.Ui; [UsedImplicitly] public sealed class NewsWriterBoundUserInterface : BoundUserInterface { + [Dependency] private readonly IGameTiming _gameTiming = default!; + [ViewVariables] private NewsWriterMenu? _menu; @@ -20,7 +21,10 @@ public sealed class NewsWriterBoundUserInterface : BoundUserInterface protected override void Open() { - _menu = this.CreateWindow(); + _menu = new NewsWriterMenu(_gameTiming); + + _menu.OpenCentered(); + _menu.OnClose += Close; _menu.ArticleEditorPanel.PublishButtonPressed += OnPublishButtonPressed; _menu.DeleteButtonPressed += OnDeleteButtonPressed; @@ -28,6 +32,16 @@ public sealed class NewsWriterBoundUserInterface : BoundUserInterface SendMessage(new NewsWriterArticlesRequestMessage()); } + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + + _menu?.Close(); + _menu?.Dispose(); + } + protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); diff --git a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs index c059ce785a..e2d57935e3 100644 --- a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs +++ b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs @@ -10,17 +10,17 @@ namespace Content.Client.MassMedia.Ui; [GenerateTypedNameReferences] public sealed partial class NewsWriterMenu : FancyWindow { - [Dependency] private readonly IGameTiming _gameTiming = default!; + private readonly IGameTiming _gameTiming; private TimeSpan? _nextPublish; public event Action? DeleteButtonPressed; - public NewsWriterMenu() + public NewsWriterMenu(IGameTiming gameTiming) { RobustXamlLoader.Load(this); - IoCManager.InjectDependencies(this); + _gameTiming = gameTiming; ContentsContainer.RectClipContent = false; // Customize scrollbar width and margin. This is not possible in xaml diff --git a/Content.Client/Mech/Ui/MechBoundUserInterface.cs b/Content.Client/Mech/Ui/MechBoundUserInterface.cs index 2130a8c609..4172bdc90f 100644 --- a/Content.Client/Mech/Ui/MechBoundUserInterface.cs +++ b/Content.Client/Mech/Ui/MechBoundUserInterface.cs @@ -3,7 +3,6 @@ using Content.Shared.Mech; using Content.Shared.Mech.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Mech.Ui; @@ -21,8 +20,9 @@ public sealed class MechBoundUserInterface : BoundUserInterface { base.Open(); - _menu = this.CreateWindow(); - _menu.SetEntity(Owner); + _menu = new(Owner); + + _menu.OnClose += Close; _menu.OpenCenteredLeft(); _menu.OnRemoveButtonPressed += uid => @@ -60,6 +60,16 @@ public sealed class MechBoundUserInterface : BoundUserInterface } } + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (!disposing) + return; + + _menu?.Close(); + } + public UIFragment? GetEquipmentUi(EntityUid? uid) { var component = EntMan.GetComponentOrNull(uid); diff --git a/Content.Client/Mech/Ui/MechMenu.xaml.cs b/Content.Client/Mech/Ui/MechMenu.xaml.cs index 6f39bc386e..fad7648808 100644 --- a/Content.Client/Mech/Ui/MechMenu.xaml.cs +++ b/Content.Client/Mech/Ui/MechMenu.xaml.cs @@ -16,15 +16,14 @@ public sealed partial class MechMenu : FancyWindow public event Action? OnRemoveButtonPressed; - public MechMenu() + public MechMenu(EntityUid mech) { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - } - public void SetEntity(EntityUid uid) - { - MechView.SetEntity(uid); + _mech = mech; + + MechView.SetEntity(mech); } public void UpdateMechStats() diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs index b1f239cd78..3978880987 100644 --- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs +++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs @@ -1,5 +1,4 @@ using Content.Shared.Medical.CrewMonitoring; -using Robust.Client.UserInterface; namespace Content.Client.Medical.CrewMonitoring; @@ -15,7 +14,7 @@ public sealed class CrewMonitoringBoundUserInterface : BoundUserInterface protected override void Open() { EntityUid? gridUid = null; - var stationName = string.Empty; + string stationName = string.Empty; if (EntMan.TryGetComponent(Owner, out var xform)) { @@ -27,8 +26,10 @@ public sealed class CrewMonitoringBoundUserInterface : BoundUserInterface } } - _menu = this.CreateWindow(); - _menu.Set(stationName, gridUid); + _menu = new CrewMonitoringWindow(stationName, gridUid); + + _menu.OpenCentered(); + _menu.OnClose += Close; } protected override void UpdateState(BoundUserInterfaceState state) @@ -43,4 +44,13 @@ public sealed class CrewMonitoringBoundUserInterface : BoundUserInterface break; } } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + + _menu?.Dispose(); + } } diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs index e861864c14..863412e553 100644 --- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs +++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs @@ -23,27 +23,22 @@ namespace Content.Client.Medical.CrewMonitoring; [GenerateTypedNameReferences] public sealed partial class CrewMonitoringWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + private readonly IEntityManager _entManager; + private readonly IPrototypeManager _prototypeManager; private readonly SpriteSystem _spriteSystem; private NetEntity? _trackedEntity; private bool _tryToScrollToListFocus; private Texture? _blipTexture; - public CrewMonitoringWindow() + public CrewMonitoringWindow(string stationName, EntityUid? mapUid) { RobustXamlLoader.Load(this); - IoCManager.InjectDependencies(this); + _entManager = IoCManager.Resolve(); + _prototypeManager = IoCManager.Resolve(); _spriteSystem = _entManager.System(); - NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap; - - } - - public void Set(string stationName, EntityUid? mapUid) - { _blipTexture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png"))); if (_entManager.TryGetComponent(mapUid, out var xform)) @@ -54,6 +49,8 @@ public sealed partial class CrewMonitoringWindow : FancyWindow StationName.AddStyleClass("LabelBig"); StationName.Text = stationName; + + NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap; NavMap.ForceNavMapUpdate(); } diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs index f85220a926..80c98f143b 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Client.NetworkConfigurator.Systems; using Content.Shared.DeviceNetwork; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; namespace Content.Client.NetworkConfigurator; @@ -36,12 +35,14 @@ public sealed class NetworkConfiguratorBoundUserInterface : BoundUserInterface switch (UiKey) { case NetworkConfiguratorUiKey.List: - _listMenu = this.CreateWindow(); + _listMenu = new NetworkConfiguratorListMenu(this); + _listMenu.OnClose += Close; _listMenu.ClearButton.OnPressed += _ => OnClearButtonPressed(); - _listMenu.OnRemoveAddress += OnRemoveButtonPressed; + _listMenu.OpenCenteredRight(); break; case NetworkConfiguratorUiKey.Configure: - _configurationMenu = this.CreateWindow(); + _configurationMenu = new NetworkConfiguratorConfigurationMenu(); + _configurationMenu.OnClose += Close; _configurationMenu.Set.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Set); _configurationMenu.Add.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Add); //_configurationMenu.Edit.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Edit); @@ -49,24 +50,12 @@ public sealed class NetworkConfiguratorBoundUserInterface : BoundUserInterface _configurationMenu.Copy.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Copy); _configurationMenu.Show.OnPressed += OnShowPressed; _configurationMenu.Show.Pressed = _netConfig.ConfiguredListIsTracked(Owner); - _configurationMenu.OnRemoveAddress += OnRemoveButtonPressed; + _configurationMenu.OpenCentered(); break; case NetworkConfiguratorUiKey.Link: - _linkMenu = this.CreateWindow(); - _linkMenu.OnLinkDefaults += args => - { - SendMessage(new NetworkConfiguratorLinksSaveMessage(args)); - }; - - _linkMenu.OnToggleLink += (left, right) => - { - SendMessage(new NetworkConfiguratorToggleLinkMessage(left, right)); - }; - - _linkMenu.OnClearLinks += () => - { - SendMessage(new NetworkConfiguratorClearLinksMessage()); - }; + _linkMenu = new NetworkConfiguratorLinkMenu(this); + _linkMenu.OnClose += Close; + _linkMenu.OpenCentered(); break; } } @@ -94,6 +83,16 @@ public sealed class NetworkConfiguratorBoundUserInterface : BoundUserInterface } } + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) return; + + _linkMenu?.Dispose(); + _listMenu?.Dispose(); + _configurationMenu?.Dispose(); + } + private void OnClearButtonPressed() { SendMessage(new NetworkConfiguratorClearDevicesMessage()); diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs index fcd2f75918..19d04cd346 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs @@ -9,23 +9,17 @@ namespace Content.Client.NetworkConfigurator; [GenerateTypedNameReferences] public sealed partial class NetworkConfiguratorConfigurationMenu : FancyWindow { - public event Action? OnRemoveAddress; - public NetworkConfiguratorConfigurationMenu() { RobustXamlLoader.Load(this); Clear.StyleClasses.Add(StyleBase.ButtonOpenLeft); Clear.StyleClasses.Add(StyleNano.StyleClassButtonColorRed); - DeviceList.OnRemoveAddress += args => - { - OnRemoveAddress?.Invoke(args); - }; } public void UpdateState(DeviceListUserInterfaceState state) { - DeviceList.UpdateState(state.DeviceList, false); + DeviceList.UpdateState(null, state.DeviceList); Count.Text = Loc.GetString("network-configurator-ui-count-label", ("count", state.DeviceList.Count)); } diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs index e75c60058c..8cfa97dc6c 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs @@ -7,19 +7,17 @@ namespace Content.Client.NetworkConfigurator; [GenerateTypedNameReferences] public sealed partial class NetworkConfiguratorDeviceList : ScrollContainer { - public event Action? OnRemoveAddress; - - public void UpdateState(HashSet<(string address, string name)> devices, bool ui) + public void UpdateState(NetworkConfiguratorBoundUserInterface? ui, HashSet<(string address, string name)> devices) { DeviceList.RemoveAllChildren(); foreach (var device in devices) { - DeviceList.AddChild(BuildDeviceListRow(device, ui)); + DeviceList.AddChild(BuildDeviceListRow(ui, device)); } } - private BoxContainer BuildDeviceListRow((string address, string name) savedDevice, bool ui) + private static BoxContainer BuildDeviceListRow(NetworkConfiguratorBoundUserInterface? ui, (string address, string name) savedDevice) { var row = new BoxContainer() { @@ -50,10 +48,10 @@ public sealed partial class NetworkConfiguratorDeviceList : ScrollContainer row.AddChild(name); row.AddChild(address); - if (ui) + if (ui != null) { row.AddChild(removeButton); - removeButton.OnPressed += _ => OnRemoveAddress?.Invoke(savedDevice.address); + removeButton.OnPressed += _ => ui.OnRemoveButtonPressed(savedDevice.address); } return row; diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs index 8cdffd16af..c04b42f249 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs @@ -18,20 +18,20 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow private readonly LinksRender _links; + private readonly List _sources = new(); private readonly List _sinks = new(); + private readonly NetworkConfiguratorBoundUserInterface _userInterface; + private (ButtonPosition position, string id, int index)? _selectedButton; private List<(string left, string right)>? _defaults; - public event Action? OnClearLinks; - public event Action? OnToggleLink; - public event Action>? OnLinkDefaults; - - public NetworkConfiguratorLinkMenu() + public NetworkConfiguratorLinkMenu(NetworkConfiguratorBoundUserInterface userInterface) { + _userInterface = userInterface; RobustXamlLoader.Load(this); var footerStyleBox = new StyleBoxFlat() @@ -52,7 +52,7 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow ButtonOk.OnPressed += _ => Close(); ButtonLinkDefault.OnPressed += _ => LinkDefaults(); - ButtonClear.OnPressed += _ => OnClearLinks?.Invoke(); + ButtonClear.OnPressed += _ => _userInterface.SendMessage(new NetworkConfiguratorClearLinksMessage()); } public void UpdateState(DeviceLinkUserInterfaceState linkState) @@ -98,7 +98,7 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow if (_defaults == default) return; - OnLinkDefaults?.Invoke(_defaults); + _userInterface.SendMessage(new NetworkConfiguratorLinksSaveMessage(_defaults)); } private Button CreateButton(ButtonPosition position, string name, string description, string id, int index) @@ -138,7 +138,7 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow var left = _selectedButton.Value.position == ButtonPosition.Left ? _selectedButton.Value.id : id; var right = _selectedButton.Value.position == ButtonPosition.Left ? id : _selectedButton.Value.id; - OnToggleLink?.Invoke(left, right); + _userInterface.SendMessage(new NetworkConfiguratorToggleLinkMessage(left, right)); args.Button.Pressed = false; diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs index 6294facaee..fb4aec1974 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs @@ -9,20 +9,17 @@ namespace Content.Client.NetworkConfigurator; [GenerateTypedNameReferences] public sealed partial class NetworkConfiguratorListMenu : FancyWindow { - public event Action? OnRemoveAddress; - - public NetworkConfiguratorListMenu() + private readonly NetworkConfiguratorBoundUserInterface _ui; + public NetworkConfiguratorListMenu(NetworkConfiguratorBoundUserInterface ui) { RobustXamlLoader.Load(this); - DeviceList.OnRemoveAddress += args => - { - OnRemoveAddress?.Invoke(args); - }; + + _ui = ui; } public void UpdateState(NetworkConfiguratorUserInterfaceState state) { DeviceCountLabel.Text = Loc.GetString("network-configurator-ui-count-label", ("count", state.DeviceList.Count)); - DeviceList.UpdateState(state.DeviceList, true); + DeviceList.UpdateState(_ui, state.DeviceList); } } diff --git a/Content.Client/Nuke/NukeBoundUserInterface.cs b/Content.Client/Nuke/NukeBoundUserInterface.cs index 2e15042373..59fbc5b319 100644 --- a/Content.Client/Nuke/NukeBoundUserInterface.cs +++ b/Content.Client/Nuke/NukeBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Shared.Containers.ItemSlots; using Content.Shared.Nuke; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Nuke { @@ -12,13 +11,15 @@ namespace Content.Client.Nuke [ViewVariables] private NukeMenu? _menu; - public NukeBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) + public NukeBoundUserInterface([NotNull] EntityUid owner, [NotNull] Enum uiKey) : base(owner, uiKey) { } protected override void Open() { - _menu = this.CreateWindow(); + _menu = new NukeMenu(); + _menu.OpenCentered(); + _menu.OnClose += Close; _menu.OnKeypadButtonPressed += i => { @@ -61,5 +62,15 @@ namespace Content.Client.Nuke break; } } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + + _menu?.Close(); + _menu?.Dispose(); + } } } diff --git a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs index ad4f1a75d4..ec055b3240 100644 --- a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs +++ b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Shared.Chat; using Content.Shared.NukeOps; using JetBrains.Annotations; -using Robust.Client.UserInterface; using Robust.Shared.Configuration; using Robust.Shared.Timing; @@ -12,6 +11,8 @@ namespace Content.Client.NukeOps; public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface { [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly ILocalizationManager _localizationManager = default!; [ViewVariables] private WarDeclaratorWindow? _window; @@ -22,7 +23,13 @@ public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); + _window = new WarDeclaratorWindow(_gameTiming, _localizationManager); + if (State != null) + UpdateState(State); + + _window.OpenCentered(); + + _window.OnClose += Close; _window.OnActivated += OnWarDeclaratorActivated; } @@ -35,6 +42,13 @@ public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface _window?.UpdateState(cast); } + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (disposing) + _window?.Dispose(); + } + private void OnWarDeclaratorActivated(string message) { var maxLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength); diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs index aeceae1327..b4a3f1c7fa 100644 --- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs +++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs @@ -11,8 +11,7 @@ namespace Content.Client.NukeOps; [GenerateTypedNameReferences] public sealed partial class WarDeclaratorWindow : FancyWindow { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ILocalizationManager _localizationManager = default!; + private readonly IGameTiming _gameTiming; public event Action? OnActivated; @@ -20,13 +19,15 @@ public sealed partial class WarDeclaratorWindow : FancyWindow private TimeSpan _shuttleDisabledTime; private WarConditionStatus _status; - public WarDeclaratorWindow() + public WarDeclaratorWindow(IGameTiming gameTiming, ILocalizationManager localizationManager) { RobustXamlLoader.Load(this); + _gameTiming = gameTiming; + WarButton.OnPressed += (_) => OnActivated?.Invoke(Rope.Collapse(MessageEdit.TextRope)); - MessageEdit.Placeholder = new Rope.Leaf(_localizationManager.GetString("war-declarator-message-placeholder")); + MessageEdit.Placeholder = new Rope.Leaf(localizationManager.GetString("war-declarator-message-placeholder")); } protected override void FrameUpdate(FrameEventArgs args) diff --git a/Content.Client/PDA/PdaBoundUserInterface.cs b/Content.Client/PDA/PdaBoundUserInterface.cs index 37ce9c4280..f8f4c67076 100644 --- a/Content.Client/PDA/PdaBoundUserInterface.cs +++ b/Content.Client/PDA/PdaBoundUserInterface.cs @@ -24,13 +24,14 @@ namespace Content.Client.PDA if (_menu == null) CreateMenu(); + + _menu?.OpenCenteredLeft(); } private void CreateMenu() { - _menu = this.CreateWindow(); - _menu.OpenCenteredLeft(); - + _menu = new PdaMenu(); + _menu.OnClose += Close; _menu.FlashLightToggleButton.OnToggled += _ => { SendMessage(new PdaToggleFlashlightMessage()); @@ -95,6 +96,7 @@ namespace Content.Client.PDA _menu?.UpdateState(updateState); } + protected override void AttachCartridgeUI(Control cartridgeUIFragment, string? title) { _menu?.ProgramView.AddChild(cartridgeUIFragment); @@ -116,6 +118,15 @@ namespace Content.Client.PDA _menu?.UpdateAvailablePrograms(programs); } + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + + _menu?.Dispose(); + } + private PdaBorderColorComponent? GetBorderColorComponent() { return EntMan.GetComponentOrNull(Owner); diff --git a/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs b/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs index 170a296ac2..a0688523f1 100644 --- a/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs +++ b/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Shared.PDA; using Content.Shared.PDA.Ringer; using JetBrains.Annotations; -using Robust.Client.UserInterface; using Robust.Shared.Timing; namespace Content.Client.PDA.Ringer @@ -19,8 +18,9 @@ namespace Content.Client.PDA.Ringer protected override void Open() { base.Open(); - _menu = this.CreateWindow(); + _menu = new RingtoneMenu(); _menu.OpenToLeft(); + _menu.OnClose += Close; _menu.TestRingerButton.OnPressed += _ => { diff --git a/Content.Client/Paper/UI/PaperBoundUserInterface.cs b/Content.Client/Paper/UI/PaperBoundUserInterface.cs index f3ad1e347e..4b0ac868f0 100644 --- a/Content.Client/Paper/UI/PaperBoundUserInterface.cs +++ b/Content.Client/Paper/UI/PaperBoundUserInterface.cs @@ -1,5 +1,4 @@ using JetBrains.Annotations; -using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Utility; using static Content.Shared.Paper.SharedPaperComponent; @@ -20,13 +19,16 @@ public sealed class PaperBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); - _window.OnSaved += InputOnTextEntered; + _window = new PaperWindow(); + _window.OnClose += Close; + _window.OnSaved += Input_OnTextEntered; if (EntMan.TryGetComponent(Owner, out var visuals)) { _window.InitVisuals(Owner, visuals); } + + _window.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -35,7 +37,7 @@ public sealed class PaperBoundUserInterface : BoundUserInterface _window?.Populate((PaperBoundUserInterfaceState) state); } - private void InputOnTextEntered(string text) + private void Input_OnTextEntered(string text) { SendMessage(new PaperInputTextMessage(text)); @@ -45,4 +47,11 @@ public sealed class PaperBoundUserInterface : BoundUserInterface _window.Input.CursorPosition = new TextEdit.CursorPos(0, TextEdit.LineBreakBias.Top); } } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) return; + _window?.Dispose(); + } } diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs index f7cace642c..7a5fd65264 100644 --- a/Content.Client/Paper/UI/PaperWindow.xaml.cs +++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs @@ -17,7 +17,6 @@ namespace Content.Client.Paper.UI public sealed partial class PaperWindow : BaseWindow { [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IResourceCache _resCache = default!; private static Color DefaultTextColor = new(25, 25, 25); @@ -86,10 +85,11 @@ namespace Content.Client.Paper.UI // Randomize the placement of any stamps based on the entity UID // so that there's some variety in different papers. StampDisplay.PlacementSeed = (int)entity; + var resCache = IoCManager.Resolve(); // Initialize the background: PaperBackground.ModulateSelfOverride = visuals.BackgroundModulate; - var backgroundImage = visuals.BackgroundImagePath != null? _resCache.GetResource(visuals.BackgroundImagePath) : null; + var backgroundImage = visuals.BackgroundImagePath != null? resCache.GetResource(visuals.BackgroundImagePath) : null; if (backgroundImage != null) { var backgroundImageMode = visuals.BackgroundImageTile ? StyleBoxTexture.StretchMode.Tile : StyleBoxTexture.StretchMode.Stretch; @@ -127,7 +127,7 @@ namespace Content.Client.Paper.UI PaperContent.ModulateSelfOverride = visuals.ContentImageModulate; WrittenTextLabel.ModulateSelfOverride = visuals.FontAccentColor; - var contentImage = visuals.ContentImagePath != null ? _resCache.GetResource(visuals.ContentImagePath) : null; + var contentImage = visuals.ContentImagePath != null ? resCache.GetResource(visuals.ContentImagePath) : null; if (contentImage != null) { // Setup the paper content texture, but keep a reference to it, as we can't set diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs index ff1eae36f5..cde5ba9ef7 100644 --- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs +++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs @@ -1,6 +1,5 @@ using Content.Shared.Singularity.Components; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.ParticleAccelerator.UI { @@ -17,10 +16,9 @@ namespace Content.Client.ParticleAccelerator.UI { base.Open(); - _menu = this.CreateWindow(); - _menu.OnOverallState += SendEnableMessage; - _menu.OnPowerState += SendPowerStateMessage; - _menu.OnScanPartsRequested += SendScanPartsMessage; + _menu = new ParticleAcceleratorControlMenu(this); + _menu.OnClose += Close; + _menu.OpenCentered(); } public void SendEnableMessage(bool enable) @@ -42,5 +40,13 @@ namespace Content.Client.ParticleAccelerator.UI { _menu?.DataUpdate((ParticleAcceleratorUIState) state); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + _menu?.Dispose(); + _menu = null; + } } } diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs index 85a5f47629..c69e027137 100644 --- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs +++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs @@ -18,11 +18,10 @@ namespace Content.Client.ParticleAccelerator.UI { public sealed class ParticleAcceleratorControlMenu : BaseWindow { - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly IResourceCache _cache = default!; - private readonly ShaderInstance _greyScaleShader; + private readonly ParticleAcceleratorBoundUserInterface _owner; + private readonly Label _drawLabel; private readonly FastNoiseLite _drawNoiseGenerator; private readonly Button _onButton; @@ -51,21 +50,19 @@ namespace Content.Client.ParticleAccelerator.UI private bool _shouldContinueAnimating; private int _maxStrength = 3; - public event Action? OnOverallState; - public event Action? OnPowerState; - public event Action? OnScanPartsRequested; - - public ParticleAcceleratorControlMenu() + public ParticleAcceleratorControlMenu(ParticleAcceleratorBoundUserInterface owner) { SetSize = new Vector2(400, 320); - _greyScaleShader = _protoManager.Index("Greyscale").Instance(); + _greyScaleShader = IoCManager.Resolve().Index("Greyscale").Instance(); + _owner = owner; _drawNoiseGenerator = new(); _drawNoiseGenerator.SetFractalType(FastNoiseLite.FractalType.FBm); _drawNoiseGenerator.SetFrequency(0.5f); - var font = _cache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13); - var panelTex = _cache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); + var resourceCache = IoCManager.Resolve(); + var font = resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13); + var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); MouseFilter = MouseFilterMode.Stop; @@ -115,8 +112,7 @@ namespace Content.Client.ParticleAccelerator.UI Text = Loc.GetString("particle-accelerator-control-menu-off-button"), StyleClasses = { StyleBase.ButtonOpenRight }, }; - - _offButton.OnPressed += args => OnOverallState?.Invoke(false); + _offButton.OnPressed += args => owner.SendEnableMessage(false); _onButton = new Button { @@ -124,7 +120,7 @@ namespace Content.Client.ParticleAccelerator.UI Text = Loc.GetString("particle-accelerator-control-menu-on-button"), StyleClasses = { StyleBase.ButtonOpenLeft }, }; - _onButton.OnPressed += args => OnOverallState?.Invoke(true); + _onButton.OnPressed += args => owner.SendEnableMessage(true); var closeButton = new TextureButton { @@ -320,7 +316,7 @@ namespace Content.Client.ParticleAccelerator.UI } }); - _scanButton.OnPressed += args => OnScanPartsRequested?.Invoke(); + _scanButton.OnPressed += args => _owner.SendScanPartsMessage(); _alarmControl.AnimationCompleted += s => { @@ -336,7 +332,7 @@ namespace Content.Client.ParticleAccelerator.UI PASegmentControl Segment(string name) { - return new(this, _cache, name); + return new(this, resourceCache, name); } UpdateUI(false, false, false, false); @@ -372,7 +368,7 @@ namespace Content.Client.ParticleAccelerator.UI } _stateSpinBox.SetButtonDisabled(true); - OnPowerState?.Invoke(newState); + _owner.SendPowerStateMessage(newState); } protected override DragMode GetDragModeFor(Vector2 relativeMousePos) diff --git a/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs b/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs index 0df6787170..3ebcf7cbce 100644 --- a/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs +++ b/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs @@ -1,6 +1,5 @@ using Content.Shared.Pinpointer; using JetBrains.Annotations; -using Robust.Client.UserInterface; namespace Content.Client.Pinpointer.UI; @@ -17,16 +16,19 @@ public sealed class NavMapBeaconBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _window = this.CreateWindow(); - - if (EntMan.TryGetComponent(Owner, out NavMapBeaconComponent? beacon)) - { - _window.SetEntity(Owner, beacon); - } + _window = new NavMapBeaconWindow(Owner); + _window.OpenCentered(); + _window.OnClose += Close; _window.OnApplyButtonPressed += (label, enabled, color) => { SendMessage(new NavMapBeaconConfigureBuiMessage(label, enabled, color)); }; } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + _window?.Dispose(); + } } diff --git a/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs b/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs index b77f1af047..968fe188f7 100644 --- a/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs +++ b/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs @@ -10,35 +10,36 @@ namespace Content.Client.Pinpointer.UI; [GenerateTypedNameReferences] public sealed partial class NavMapBeaconWindow : FancyWindow { + [Dependency] private readonly IEntityManager _entityManager = default!; + private string? _defaultLabel; private bool _defaultEnabled; private Color _defaultColor; public event Action? OnApplyButtonPressed; - public NavMapBeaconWindow() + public NavMapBeaconWindow(EntityUid beaconEntity) { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - - VisibleButton.OnPressed += args => UpdateVisibleButton(args.Button.Pressed); - LabelLineEdit.OnTextChanged += OnTextChanged; - ColorSelector.OnColorChanged += _ => TryEnableApplyButton(); - - TryEnableApplyButton(); - ApplyButton.OnPressed += OnApplyPressed; - } - - public void SetEntity(EntityUid uid, NavMapBeaconComponent navMap) - { + if (!_entityManager.TryGetComponent(beaconEntity, out var navMap)) + return; _defaultLabel = navMap.Text; _defaultEnabled = navMap.Enabled; _defaultColor = navMap.Color; UpdateVisibleButton(navMap.Enabled); + VisibleButton.OnPressed += args => UpdateVisibleButton(args.Button.Pressed); + LabelLineEdit.Text = navMap.Text ?? string.Empty; + LabelLineEdit.OnTextChanged += OnTextChanged; + ColorSelector.Color = navMap.Color; + ColorSelector.OnColorChanged += _ => TryEnableApplyButton(); + + TryEnableApplyButton(); + ApplyButton.OnPressed += OnApplyPressed; } private void UpdateVisibleButton(bool value) diff --git a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs index 7417fafede..1483e75e73 100644 --- a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs +++ b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs @@ -1,4 +1,4 @@ -using Robust.Client.UserInterface; +using Robust.Client.GameObjects; namespace Content.Client.Pinpointer.UI; @@ -14,6 +14,7 @@ public sealed class StationMapBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); + _window?.Close(); EntityUid? gridUid = null; if (EntMan.TryGetComponent(Owner, out var xform)) @@ -21,8 +22,14 @@ public sealed class StationMapBoundUserInterface : BoundUserInterface gridUid = xform.GridUid; } - _window = this.CreateWindow(); - _window.Title = EntMan.GetComponent(Owner).EntityName; - _window.Set(gridUid, Owner); + _window = new StationMapWindow(gridUid, Owner); + _window.OpenCentered(); + _window.OnClose += Close; + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + _window?.Dispose(); } } diff --git a/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs b/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs index 7cbb8b7d0d..1b01fe4e30 100644 --- a/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs +++ b/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs @@ -9,18 +9,19 @@ namespace Content.Client.Pinpointer.UI; [GenerateTypedNameReferences] public sealed partial class StationMapWindow : FancyWindow { - public StationMapWindow() + public StationMapWindow(EntityUid? mapUid, EntityUid? trackedEntity) { RobustXamlLoader.Load(this); - } - - public void Set(EntityUid? mapUid, EntityUid? trackedEntity) - { NavMapScreen.MapUid = mapUid; if (trackedEntity != null) NavMapScreen.TrackedCoordinates.Add(new EntityCoordinates(trackedEntity.Value, Vector2.Zero), (true, Color.Cyan)); + if (IoCManager.Resolve().TryGetComponent(mapUid, out var metadata)) + { + Title = metadata.EntityName; + } + NavMapScreen.ForceNavMapUpdate(); } } diff --git a/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs index a3ca6f65da..57965b030a 100644 --- a/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs +++ b/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs @@ -1,4 +1,4 @@ -using Robust.Client.UserInterface; +using Robust.Client.GameObjects; namespace Content.Client.Pinpointer.UI; @@ -14,15 +14,22 @@ public sealed class UntrackedStationMapBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); + _window?.Close(); EntityUid? gridUid = null; - // TODO: What this just looks like it's been copy-pasted wholesale from StationMapBoundUserInterface? if (EntMan.TryGetComponent(Owner, out var xform)) { gridUid = xform.GridUid; } - _window = this.CreateWindow(); - _window.Set(gridUid, Owner); + _window = new StationMapWindow(gridUid, null); + _window.OpenCentered(); + _window.OnClose += Close; + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + _window?.Dispose(); } } diff --git a/Content.Client/Power/APC/ApcBoundUserInterface.cs b/Content.Client/Power/APC/ApcBoundUserInterface.cs index 759a5949ba..fbcbf01156 100644 --- a/Content.Client/Power/APC/ApcBoundUserInterface.cs +++ b/Content.Client/Power/APC/ApcBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Shared.APC; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Power.APC { @@ -20,8 +19,9 @@ namespace Content.Client.Power.APC { base.Open(); - _menu = this.CreateWindow(); - _menu.OnBreaker += BreakerPressed; + _menu = new ApcMenu(this); + _menu.OnClose += Close; + _menu.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -36,5 +36,15 @@ namespace Content.Client.Power.APC { SendMessage(new ApcToggleMainBreakerMessage()); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (disposing) + { + _menu?.Dispose(); + } + } } } diff --git a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs index 2f61ea63a8..dbf68ea07b 100644 --- a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs +++ b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs @@ -17,19 +17,13 @@ namespace Content.Client.Power.APC.UI [GenerateTypedNameReferences] public sealed partial class ApcMenu : FancyWindow { - public event Action? OnBreaker; - - public ApcMenu() + public ApcMenu(ApcBoundUserInterface owner) { IoCManager.InjectDependencies(this); RobustXamlLoader.Load(this); - BreakerButton.OnPressed += _ => OnBreaker?.Invoke(); - } - - public void SetEntity(EntityUid entity) - { - EntityView.SetEntity(entity); + EntityView.SetEntity(owner.Owner); + BreakerButton.OnPressed += _ => owner.BreakerPressed(); } public void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs index e975e5d466..bd5b75de1d 100644 --- a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs +++ b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs @@ -9,39 +9,35 @@ namespace Content.Client.Power.Generator; [GenerateTypedNameReferences] public sealed partial class GeneratorWindow : FancyWindow { + private readonly EntityUid _entity; + [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly ILocalizationManager _loc = default!; - private EntityUid _entity; + private readonly SharedPowerSwitchableSystem _switchable; + private readonly FuelGeneratorComponent? _component; + private PortableGeneratorComponentBuiState? _lastState; - public float? MaximumPower; - - public event Action? OnPower; - public event Action? OnState; - public event Action? OnSwitchOutput; - public event Action? OnEjectFuel; - - public GeneratorWindow() + public GeneratorWindow(PortableGeneratorBoundUserInterface bui, EntityUid entity) { + _entity = entity; RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); + _entityManager.TryGetComponent(entity, out _component); + _switchable = _entityManager.System(); + + EntityView.SetEntity(entity); TargetPower.IsValid += IsValid; TargetPower.ValueChanged += (args) => { - OnPower?.Invoke(args.Value); + bui.SetTargetPower(args.Value); }; - StartButton.OnPressed += _ => OnState?.Invoke(true); - StopButton.OnPressed += _ => OnState?.Invoke(false); - OutputSwitchButton.OnPressed += _ => OnSwitchOutput?.Invoke(); - FuelEject.OnPressed += _ => OnEjectFuel?.Invoke(); - } - - public void SetEntity(EntityUid entity) - { - _entity = entity; - EntityView.SetEntity(entity); + StartButton.OnPressed += _ => bui.Start(); + StopButton.OnPressed += _ => bui.Stop(); + OutputSwitchButton.OnPressed += _ => bui.SwitchOutput(); + FuelEject.OnPressed += _ => bui.EjectFuel(); } private bool IsValid(int arg) @@ -49,7 +45,7 @@ public sealed partial class GeneratorWindow : FancyWindow if (arg < 0) return false; - if (arg > (MaximumPower / 1000.0f ?? 0)) + if (arg > (_lastState?.MaximumPower / 1000.0f ?? 0)) return false; return true; @@ -57,17 +53,16 @@ public sealed partial class GeneratorWindow : FancyWindow public void Update(PortableGeneratorComponentBuiState state) { - MaximumPower = state.MaximumPower; - - if (!_entityManager.TryGetComponent(_entity, out FuelGeneratorComponent? component)) + if (_component == null) return; + _lastState = state; if (!TargetPower.LineEditControl.HasKeyboardFocus()) TargetPower.OverrideValue((int)(state.TargetPower / 1000.0f)); - var efficiency = SharedGeneratorSystem.CalcFuelEfficiency(state.TargetPower, state.OptimalPower, component); + var efficiency = SharedGeneratorSystem.CalcFuelEfficiency(state.TargetPower, state.OptimalPower, _component); Efficiency.Text = efficiency.ToString("P1"); - var burnRate = component.OptimalBurnRate / efficiency; + var burnRate = _component.OptimalBurnRate / efficiency; var left = state.RemainingFuel / burnRate; Eta.Text = Loc.GetString( @@ -107,15 +102,14 @@ public sealed partial class GeneratorWindow : FancyWindow } var canSwitch = _entityManager.TryGetComponent(_entity, out PowerSwitchableComponent? switchable); - var switcher = _entityManager.System(); OutputSwitchLabel.Visible = canSwitch; OutputSwitchButton.Visible = canSwitch; if (switchable != null) { - var voltage = switcher.VoltageString(switcher.GetVoltage(_entity, switchable)); + var voltage = _switchable.VoltageString(_switchable.GetVoltage(_entity, switchable)); OutputSwitchLabel.Text = Loc.GetString("portable-generator-ui-current-output", ("voltage", voltage)); - var nextVoltage = switcher.VoltageString(switcher.GetNextVoltage(_entity, switchable)); + var nextVoltage = _switchable.VoltageString(_switchable.GetNextVoltage(_entity, switchable)); OutputSwitchButton.Text = Loc.GetString("power-switchable-switch-voltage", ("voltage", nextVoltage)); OutputSwitchButton.Disabled = state.On; } diff --git a/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs b/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs index 550e1041b6..30679d71fd 100644 --- a/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs +++ b/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Shared.Power.Generator; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Power.Generator; @@ -17,25 +16,10 @@ public sealed class PortableGeneratorBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _window = this.CreateWindow(); - _window.SetEntity(Owner); - _window.OnState += args => - { - if (args) - { - Start(); - } - else - { - Stop(); - } - }; - - _window.OnPower += SetTargetPower; - _window.OnEjectFuel += EjectFuel; - _window.OnSwitchOutput += SwitchOutput; + _window = new GeneratorWindow(this, Owner); _window.OpenCenteredLeft(); + _window.OnClose += Close; } protected override void UpdateState(BoundUserInterfaceState state) @@ -46,6 +30,11 @@ public sealed class PortableGeneratorBoundUserInterface : BoundUserInterface _window?.Update(msg); } + protected override void Dispose(bool disposing) + { + _window?.Dispose(); + } + public void SetTargetPower(int target) { SendMessage(new PortableGeneratorSetTargetPowerMessage(target)); diff --git a/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs b/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs index cbc343c06c..dc1dcd03ef 100644 --- a/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs +++ b/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs @@ -1,5 +1,4 @@ using Content.Shared.Power; -using Robust.Client.UserInterface; namespace Content.Client.Power; @@ -12,9 +11,9 @@ public sealed class PowerMonitoringConsoleBoundUserInterface : BoundUserInterfac protected override void Open() { - _menu = this.CreateWindow(); - _menu.SetEntity(Owner); - _menu.SendPowerMonitoringConsoleMessageAction += SendPowerMonitoringConsoleMessage; + _menu = new PowerMonitoringWindow(this, Owner); + _menu.OpenCentered(); + _menu.OnClose += Close; } protected override void UpdateState(BoundUserInterfaceState state) @@ -23,6 +22,9 @@ public sealed class PowerMonitoringConsoleBoundUserInterface : BoundUserInterfac var castState = (PowerMonitoringConsoleBoundInterfaceState) state; + if (castState == null) + return; + EntMan.TryGetComponent(Owner, out var xform); _menu?.ShowEntites (castState.TotalSources, @@ -38,4 +40,13 @@ public sealed class PowerMonitoringConsoleBoundUserInterface : BoundUserInterfac { SendMessage(new PowerMonitoringConsoleMessage(netEntity, group)); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + + _menu?.Dispose(); + } } diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs index d995299207..74752ddc53 100644 --- a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs +++ b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs @@ -32,7 +32,7 @@ public sealed partial class PowerMonitoringWindow if (windowEntry == null) return; - // Update sources and loads + // Update sources and loads UpdateEntrySourcesOrLoads(masterContainer, windowEntry.SourcesContainer, focusSources, _sourceIcon); UpdateEntrySourcesOrLoads(masterContainer, windowEntry.LoadsContainer, focusLoads, _loadIconPath); @@ -134,7 +134,7 @@ public sealed partial class PowerMonitoringWindow subEntry.Button.OnButtonUp += args => { ButtonAction(subEntry, masterContainer); }; } - if (!_entManager.TryGetComponent(Entity, out var console)) + if (!_entManager.TryGetComponent(_owner, out var console)) return; // Update all children @@ -379,7 +379,7 @@ public sealed class PowerMonitoringWindowEntry : PowerMonitoringWindowBaseEntry AddChild(MainContainer); - // Grid container to hold the list of sources when selected + // Grid container to hold the list of sources when selected SourcesContainer = new BoxContainer() { Orientation = LayoutOrientation.Vertical, diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.cs index e304325248..81fe1f4d04 100644 --- a/Content.Client/Power/PowerMonitoringWindow.xaml.cs +++ b/Content.Client/Power/PowerMonitoringWindow.xaml.cs @@ -15,12 +15,13 @@ namespace Content.Client.Power; [GenerateTypedNameReferences] public sealed partial class PowerMonitoringWindow : FancyWindow { - [Dependency] private IEntityManager _entManager = default!; + private readonly IEntityManager _entManager; private readonly SpriteSystem _spriteSystem; - [Dependency] private IGameTiming _gameTiming = default!; + private readonly IGameTiming _gameTiming; private const float BlinkFrequency = 1f; + private EntityUid? _owner; private NetEntity? _focusEntity; public event Action? SendPowerMonitoringConsoleMessageAction; @@ -33,14 +34,40 @@ public sealed partial class PowerMonitoringWindow : FancyWindow { PowerMonitoringConsoleGroup.APC, (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_triangle.png")), Color.LimeGreen) }, }; - public EntityUid Entity; - - public PowerMonitoringWindow() + public PowerMonitoringWindow(PowerMonitoringConsoleBoundUserInterface userInterface, EntityUid? owner) { RobustXamlLoader.Load(this); - IoCManager.InjectDependencies(this); + _entManager = IoCManager.Resolve(); + _gameTiming = IoCManager.Resolve(); _spriteSystem = _entManager.System(); + _owner = owner; + + // Pass owner to nav map + NavMap.Owner = _owner; + + // Set nav map grid uid + var stationName = Loc.GetString("power-monitoring-window-unknown-location"); + + if (_entManager.TryGetComponent(owner, out var xform)) + { + NavMap.MapUid = xform.GridUid; + + // Assign station name + if (_entManager.TryGetComponent(xform.GridUid, out var stationMetaData)) + stationName = stationMetaData.EntityName; + + var msg = new FormattedMessage(); + msg.AddMarkup(Loc.GetString("power-monitoring-window-station-name", ("stationName", stationName))); + + StationName.SetMessage(msg); + } + + else + { + StationName.SetMessage(stationName); + NavMap.Visible = false; + } // Set trackable entity selected action NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap; @@ -61,37 +88,9 @@ public sealed partial class PowerMonitoringWindow : FancyWindow ShowHVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.HighVoltage); ShowMVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.MediumVoltage); ShowLVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.Apc); - } - public void SetEntity(EntityUid uid) - { - Entity = uid; - - // Pass owner to nav map - NavMap.Owner = uid; - - // Set nav map grid uid - var stationName = Loc.GetString("power-monitoring-window-unknown-location"); - - if (_entManager.TryGetComponent(uid, out var xform)) - { - NavMap.MapUid = xform.GridUid; - - // Assign station name - if (_entManager.TryGetComponent(xform.GridUid, out var stationMetaData)) - stationName = stationMetaData.EntityName; - - var msg = new FormattedMessage(); - msg.AddMarkupOrThrow(Loc.GetString("power-monitoring-window-station-name", ("stationName", stationName))); - - StationName.SetMessage(msg); - } - - else - { - StationName.SetMessage(stationName); - NavMap.Visible = false; - } + // Set power monitoring message action + SendPowerMonitoringConsoleMessageAction += userInterface.SendPowerMonitoringConsoleMessage; } private void OnTabChanged(int tab) @@ -114,7 +113,10 @@ public sealed partial class PowerMonitoringWindow : FancyWindow PowerMonitoringConsoleEntry[] focusLoads, EntityCoordinates? monitorCoords) { - if (!_entManager.TryGetComponent(Entity, out var console)) + if (_owner == null) + return; + + if (!_entManager.TryGetComponent(_owner.Value, out var console)) return; // Update power status text @@ -159,13 +161,13 @@ public sealed partial class PowerMonitoringWindow : FancyWindow } // Show monitor location - var mon = _entManager.GetNetEntity(Entity); + var mon = _entManager.GetNetEntity(_owner); - if (monitorCoords != null && mon.IsValid()) + if (monitorCoords != null && mon != null) { var texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png"))); var blip = new NavMapBlip(monitorCoords.Value, texture, Color.Cyan, true, false); - NavMap.TrackedEntities[mon] = blip; + NavMap.TrackedEntities[mon.Value] = blip; } // If the entry group doesn't match the current tab, the data is out dated, do not use it @@ -237,7 +239,7 @@ public sealed partial class PowerMonitoringWindow : FancyWindow if (netEntity == null) return; - if (!_entManager.TryGetComponent(Entity, out var console)) + if (!_entManager.TryGetComponent(_owner, out var console)) return; if (!console.PowerMonitoringDeviceMetaData.TryGetValue(netEntity.Value, out var metaData)) @@ -264,7 +266,7 @@ public sealed partial class PowerMonitoringWindow : FancyWindow { AutoScrollToFocus(); - // Warning sign pulse + // Warning sign pulse var lit = _gameTiming.RealTime.TotalSeconds % BlinkFrequency > BlinkFrequency / 2f; SystemWarningPanel.Modulate = lit ? Color.White : new Color(178, 178, 178); } diff --git a/Content.Client/RCD/RCDMenu.xaml.cs b/Content.Client/RCD/RCDMenu.xaml.cs index aefb319181..3eb0397a69 100644 --- a/Content.Client/RCD/RCDMenu.xaml.cs +++ b/Content.Client/RCD/RCDMenu.xaml.cs @@ -20,36 +20,31 @@ public sealed partial class RCDMenu : RadialMenu [Dependency] private readonly IPrototypeManager _protoManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; - private SharedPopupSystem _popup; - private SpriteSystem _sprites; + private readonly SpriteSystem _spriteSystem; + private readonly SharedPopupSystem _popup; public event Action>? SendRCDSystemMessageAction; private EntityUid _owner; - public RCDMenu() + public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui) { IoCManager.InjectDependencies(this); RobustXamlLoader.Load(this); + _spriteSystem = _entManager.System(); _popup = _entManager.System(); - _sprites = _entManager.System(); - OnChildAdded += AddRCDMenuButtonOnClickActions; - } + _owner = owner; - public void SetEntity(EntityUid uid) - { - _owner = uid; - } - - public void Refresh() - { // Find the main radial container var main = FindControl("Main"); + if (main == null) + return; + // Populate secondary radial containers - if (!_entManager.TryGetComponent(_owner, out var rcd)) + if (!_entManager.TryGetComponent(owner, out var rcd)) return; foreach (var protoId in rcd.AvailablePrototypes) @@ -61,6 +56,10 @@ public sealed partial class RCDMenu : RadialMenu continue; var parent = FindControl(proto.Category); + + if (parent == null) + continue; + var tooltip = Loc.GetString(proto.SetName); if ((proto.Mode == RcdMode.ConstructTile || proto.Mode == RcdMode.ConstructObject) && @@ -85,7 +84,7 @@ public sealed partial class RCDMenu : RadialMenu { VerticalAlignment = VAlignment.Center, HorizontalAlignment = HAlignment.Center, - Texture = _sprites.Frame0(proto.Sprite), + Texture = _spriteSystem.Frame0(proto.Sprite), TextureScale = new Vector2(2f, 2f), }; @@ -113,9 +112,11 @@ public sealed partial class RCDMenu : RadialMenu // Set up menu actions foreach (var child in Children) - { AddRCDMenuButtonOnClickActions(child); - } + + OnChildAdded += AddRCDMenuButtonOnClickActions; + + SendRCDSystemMessageAction += bui.SendRCDSystemMessage; } private static string OopsConcat(string a, string b) diff --git a/Content.Client/RCD/RCDMenuBoundUserInterface.cs b/Content.Client/RCD/RCDMenuBoundUserInterface.cs index 1dd03626ae..a37dbcecf8 100644 --- a/Content.Client/RCD/RCDMenuBoundUserInterface.cs +++ b/Content.Client/RCD/RCDMenuBoundUserInterface.cs @@ -3,7 +3,6 @@ using Content.Shared.RCD.Components; using JetBrains.Annotations; using Robust.Client.Graphics; using Robust.Client.Input; -using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.RCD; @@ -25,9 +24,8 @@ public sealed class RCDMenuBoundUserInterface : BoundUserInterface { base.Open(); - _menu = this.CreateWindow(); - _menu.SetEntity(Owner); - _menu.SendRCDSystemMessageAction += SendRCDSystemMessage; + _menu = new(Owner, this); + _menu.OnClose += Close; // Open the menu, centered on the mouse var vpSize = _displayManager.ScreenSize; @@ -36,8 +34,16 @@ public sealed class RCDMenuBoundUserInterface : BoundUserInterface public void SendRCDSystemMessage(ProtoId protoId) { - // A predicted message cannot be used here as the RCD UI is closed immediately + // A predicted message cannot be used here as the RCD UI is closed immediately // after this message is sent, which will stop the server from receiving it SendMessage(new RCDSystemMessage(protoId)); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) return; + + _menu?.Dispose(); + } } diff --git a/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs b/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs index 401e7edd44..7b3e39aa08 100644 --- a/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs +++ b/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs @@ -1,8 +1,6 @@ using Content.Shared.Radio; using Content.Shared.Radio.Components; using JetBrains.Annotations; -using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Radio.Ui; @@ -21,12 +19,9 @@ public sealed class IntercomBoundUserInterface : BoundUserInterface { base.Open(); - _menu = this.CreateWindow(); + var comp = EntMan.GetComponent(Owner); - if (EntMan.TryGetComponent(Owner, out IntercomComponent? intercom)) - { - _menu.Update((Owner, intercom)); - } + _menu = new((Owner, comp)); _menu.OnMicPressed += enabled => { @@ -40,6 +35,17 @@ public sealed class IntercomBoundUserInterface : BoundUserInterface { SendMessage(new SelectIntercomChannelMessage(channel)); }; + + _menu.OnClose += Close; + _menu.OpenCentered(); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + _menu?.Close(); } public void Update(Entity ent) diff --git a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs index 20d2e4a3e5..2e08913051 100644 --- a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs +++ b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs @@ -18,13 +18,15 @@ public sealed partial class IntercomMenu : FancyWindow private readonly List _channels = new(); - public IntercomMenu() + public IntercomMenu(Entity entity) { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); MicButton.OnPressed += args => OnMicPressed?.Invoke(args.Button.Pressed); SpeakerButton.OnPressed += args => OnSpeakerPressed?.Invoke(args.Button.Pressed); + + Update(entity); } public void Update(Entity entity) diff --git a/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs b/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs index 9641adb5b2..c14a8c5bd0 100644 --- a/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs +++ b/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs @@ -1,7 +1,5 @@ using Content.Shared.Research; using Content.Shared.Research.Components; -using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Research.UI { @@ -18,7 +16,10 @@ namespace Content.Client.Research.UI { base.Open(); - _menu = this.CreateWindow(); + _menu = new(); + + _menu.OnClose += Close; + _menu.OpenCentered(); _menu.OnServerButtonPressed += () => { @@ -30,6 +31,14 @@ namespace Content.Client.Research.UI }; } + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + _menu?.Close(); + } + protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); diff --git a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs index 288445e4de..a0a2b58e88 100644 --- a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs +++ b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs @@ -1,6 +1,4 @@ using Content.Shared.Research.Components; -using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Research.UI { @@ -17,9 +15,10 @@ namespace Content.Client.Research.UI protected override void Open() { base.Open(); - _menu = this.CreateWindow(); - _menu.OnServerSelected += SelectServer; - _menu.OnServerDeselected += DeselectServer; + + _menu = new ResearchClientServerSelectionMenu(this); + _menu.OnClose += Close; + _menu.OpenCentered(); } public void SelectServer(int serverId) @@ -38,5 +37,12 @@ namespace Content.Client.Research.UI if (state is not ResearchClientBoundInterfaceState rState) return; _menu?.Populate(rState.ServerCount, rState.ServerNames, rState.ServerIds, rState.SelectedServerId); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) return; + _menu?.Dispose(); + } } } diff --git a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs index d10f8b39f4..ceaa965e59 100644 --- a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs +++ b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs @@ -13,26 +13,27 @@ namespace Content.Client.Research.UI private int[] _serverIds = Array.Empty(); private int _selectedServerId = -1; - public event Action? OnServerSelected; - public event Action? OnServerDeselected; + private ResearchClientBoundUserInterface Owner { get; } - public ResearchClientServerSelectionMenu() + public ResearchClientServerSelectionMenu(ResearchClientBoundUserInterface owner) { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); + Owner = owner; + Servers.OnItemSelected += OnItemSelected; Servers.OnItemDeselected += OnItemDeselected; } public void OnItemSelected(ItemList.ItemListSelectedEventArgs itemListSelectedEventArgs) { - OnServerSelected?.Invoke(_serverIds[itemListSelectedEventArgs.ItemIndex]); + Owner.SelectServer(_serverIds[itemListSelectedEventArgs.ItemIndex]); } public void OnItemDeselected(ItemList.ItemListDeselectedEventArgs itemListDeselectedEventArgs) { - OnServerDeselected?.Invoke(); + Owner.DeselectServer(); } public void Populate(int serverCount, string[] serverNames, int[] serverIds, int selectedServerId) diff --git a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs index 2895ada61f..2a9782045b 100644 --- a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs +++ b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs @@ -1,8 +1,5 @@ using Content.Shared.Research.Components; -using Content.Shared.Research.Prototypes; using JetBrains.Annotations; -using Robust.Client.UserInterface; -using Robust.Shared.Prototypes; namespace Content.Client.Research.UI; @@ -22,8 +19,7 @@ public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface var owner = Owner; - _consoleMenu = this.CreateWindow(); - _consoleMenu.SetEntity(owner); + _consoleMenu = new ResearchConsoleMenu(owner); _consoleMenu.OnTechnologyCardPressed += id => { @@ -34,20 +30,10 @@ public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface { SendMessage(new ConsoleServerSelectionMessage()); }; - } - public override void OnProtoReload(PrototypesReloadedEventArgs args) - { - base.OnProtoReload(args); + _consoleMenu.OnClose += Close; - if (!args.WasModified()) - return; - - if (State is not ResearchConsoleBoundInterfaceState rState) - return; - - _consoleMenu?.UpdatePanels(rState); - _consoleMenu?.UpdateInformationPanel(rState); + _consoleMenu.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -59,4 +45,12 @@ public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface _consoleMenu?.UpdatePanels(castState); _consoleMenu?.UpdateInformationPanel(castState); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + _consoleMenu?.Dispose(); + } } diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs index eafbe75fbb..77ebe6740c 100644 --- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs +++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs @@ -25,13 +25,14 @@ public sealed partial class ResearchConsoleMenu : FancyWindow [Dependency] private readonly IEntityManager _entity = default!; [Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] private readonly IPlayerManager _player = default!; + private readonly TechnologyDatabaseComponent? _technologyDatabase; private readonly ResearchSystem _research; private readonly SpriteSystem _sprite; private readonly AccessReaderSystem _accessReader; - public EntityUid Entity; + public readonly EntityUid Entity; - public ResearchConsoleMenu() + public ResearchConsoleMenu(EntityUid entity) { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); @@ -39,23 +40,21 @@ public sealed partial class ResearchConsoleMenu : FancyWindow _research = _entity.System(); _sprite = _entity.System(); _accessReader = _entity.System(); + Entity = entity; ServerButton.OnPressed += _ => OnServerButtonPressed?.Invoke(); + + _entity.TryGetComponent(entity, out _technologyDatabase); } - public void SetEntity(EntityUid entity) - { - Entity = entity; - } - - public void UpdatePanels(ResearchConsoleBoundInterfaceState state) + public void UpdatePanels(ResearchConsoleBoundInterfaceState state) { TechnologyCardsContainer.Children.Clear(); var availableTech = _research.GetAvailableTechnologies(Entity); SyncTechnologyList(AvailableCardsContainer, availableTech); - if (!_entity.TryGetComponent(Entity, out TechnologyDatabaseComponent? database)) + if (_technologyDatabase == null) return; // i can't figure out the spacing so here you go @@ -67,7 +66,7 @@ public sealed partial class ResearchConsoleMenu : FancyWindow var hasAccess = _player.LocalEntity is not { } local || !_entity.TryGetComponent(Entity, out var access) || _accessReader.IsAllowed(local, Entity, access); - foreach (var techId in database.CurrentTechnologyCards) + foreach (var techId in _technologyDatabase.CurrentTechnologyCards) { var tech = _prototype.Index(techId); var cardControl = new TechnologyCardControl(tech, _prototype, _sprite, _research.GetTechnologyDescription(tech, includeTier: false), state.Points, hasAccess); @@ -75,7 +74,7 @@ public sealed partial class ResearchConsoleMenu : FancyWindow TechnologyCardsContainer.AddChild(cardControl); } - var unlockedTech = database.UnlockedTechnologies.Select(x => _prototype.Index(x)); + var unlockedTech = _technologyDatabase.UnlockedTechnologies.Select(x => _prototype.Index(x)); SyncTechnologyList(UnlockedCardsContainer, unlockedTech); } @@ -86,14 +85,14 @@ public sealed partial class ResearchConsoleMenu : FancyWindow ("points", state.Points))); ResearchAmountLabel.SetMessage(amountMsg); - if (!_entity.TryGetComponent(Entity, out TechnologyDatabaseComponent? database)) + if (_technologyDatabase == null) return; var disciplineText = Loc.GetString("research-discipline-none"); var disciplineColor = Color.Gray; - if (database.MainDiscipline != null) + if (_technologyDatabase.MainDiscipline != null) { - var discipline = _prototype.Index(database.MainDiscipline); + var discipline = _prototype.Index(_technologyDatabase.MainDiscipline); disciplineText = Loc.GetString(discipline.Name); disciplineColor = discipline.Color; } @@ -104,10 +103,10 @@ public sealed partial class ResearchConsoleMenu : FancyWindow MainDisciplineLabel.SetMessage(msg); TierDisplayContainer.Children.Clear(); - foreach (var disciplineId in database.SupportedDisciplines) + foreach (var disciplineId in _technologyDatabase.SupportedDisciplines) { var discipline = _prototype.Index(disciplineId); - var tier = _research.GetHighestDisciplineTier(database, discipline); + var tier = _research.GetHighestDisciplineTier(_technologyDatabase, discipline); // don't show tiers with no available tech if (tier == 0) diff --git a/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs b/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs index 9a5159880f..6185979eee 100644 --- a/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs +++ b/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs @@ -1,6 +1,5 @@ using Content.Shared.Robotics; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Robotics.UI; @@ -17,9 +16,7 @@ public sealed class RoboticsConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); - _window.SetEntity(Owner); - + _window = new RoboticsConsoleWindow(Owner); _window.OnDisablePressed += address => { SendMessage(new RoboticsConsoleDisableMessage(address)); @@ -28,6 +25,9 @@ public sealed class RoboticsConsoleBoundUserInterface : BoundUserInterface { SendMessage(new RoboticsConsoleDestroyMessage(address)); }; + _window.OnClose += Close; + + _window.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -37,6 +37,14 @@ public sealed class RoboticsConsoleBoundUserInterface : BoundUserInterface if (state is not RoboticsConsoleState cast) return; - _window.UpdateState(cast); + _window?.UpdateState(cast); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (disposing) + _window?.Dispose(); } } diff --git a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs index 87d7e62c39..fc7b234bcc 100644 --- a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs +++ b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs @@ -23,12 +23,11 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow public Action? OnDisablePressed; public Action? OnDestroyPressed; + private Entity _console; private string? _selected; private Dictionary _cyborgs = new(); - public EntityUid Entity; - - public RoboticsConsoleWindow() + public RoboticsConsoleWindow(EntityUid console) { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); @@ -36,6 +35,9 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow _lock = _entMan.System(); _sprite = _entMan.System(); + _console = (console, _entMan.GetComponent(console), null); + _entMan.TryGetComponent(_console, out _console.Comp2); + Cyborgs.OnItemSelected += args => { if (Cyborgs[args.ItemIndex].Metadata is not string address) @@ -64,11 +66,6 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow DestroyButton.StyleClasses.Add(StyleBase.ButtonCaution); } - public void SetEntity(EntityUid uid) - { - Entity = uid; - } - public void UpdateState(RoboticsConsoleState state) { _cyborgs = state.Cyborgs; @@ -84,7 +81,7 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow PopulateData(); - var locked = _lock.IsLocked(Entity); + var locked = _lock.IsLocked((_console, _console.Comp2)); DangerZone.Visible = !locked; LockedMessage.Visible = locked; } @@ -138,19 +135,13 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow // how the turntables DisableButton.Disabled = !(data.HasBrain && data.CanDisable); + DestroyButton.Disabled = _timing.CurTime < _console.Comp1.NextDestroy; } protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); - if (_entMan.TryGetComponent(Entity, out RoboticsConsoleComponent? console)) - { - DestroyButton.Disabled = _timing.CurTime < console.NextDestroy; - } - else - { - DestroyButton.Disabled = true; - } + DestroyButton.Disabled = _timing.CurTime < _console.Comp1.NextDestroy; } } diff --git a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs index 663bde15b0..8f1723d1f2 100644 --- a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs +++ b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs @@ -30,9 +30,17 @@ public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterf protected override void Open() { base.Open(); - _window = this.CreateWindow(); + _window = new OfferingWindow(); _window.Title = Loc.GetString("salvage-expedition-window-title"); - _window.OpenCenteredLeft(); + _window.OnClose += Close; + _window?.OpenCenteredLeft(); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + _window?.Dispose(); + _window = null; } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs index a248126a85..eafb692733 100644 --- a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs +++ b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs @@ -21,9 +21,13 @@ public sealed class SalvageMagnetBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); - _window.Title = Loc.GetString("salvage-magnet-window-title"); - _window.OpenCenteredLeft(); + if (_window is null) + { + _window = new OfferingWindow(); + _window.Title = Loc.GetString("salvage-magnet-window-title"); + _window.OnClose += Close; + _window.OpenCenteredLeft(); + } } protected override void UpdateState(BoundUserInterfaceState state) @@ -108,4 +112,15 @@ public sealed class SalvageMagnetBoundUserInterface : BoundUserInterface _window.AddOption(option); } } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (disposing) + { + _window?.Close(); + _window?.Dispose(); + } + } } diff --git a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs index b8b4fb8a74..086369aa26 100644 --- a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs +++ b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs @@ -3,7 +3,6 @@ using Content.Shared.Shuttles.BUIStates; using Content.Shared.Shuttles.Events; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Shuttles.BUI; @@ -21,7 +20,8 @@ public sealed class IFFConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); + _window = new IFFConsoleWindow(); + _window.OnClose += Close; _window.ShowIFF += SendIFFMessage; _window.ShowVessel += SendVesselMessage; _window.OpenCenteredLeft(); diff --git a/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs index f75759b042..4bd44a47a8 100644 --- a/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs +++ b/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Client.Shuttles.UI; using Content.Shared.Shuttles.BUIStates; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using RadarConsoleWindow = Content.Client.Shuttles.UI.RadarConsoleWindow; namespace Content.Client.Shuttles.BUI; @@ -21,7 +20,18 @@ public sealed class RadarConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); + _window = new RadarConsoleWindow(); + _window.OnClose += Close; + _window.OpenCentered(); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (disposing) + { + _window?.Dispose(); + } } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs index e677181419..af7b6055c8 100644 --- a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs +++ b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Client.Shuttles.UI; using Content.Shared.Shuttles.BUIStates; using Content.Shared.Shuttles.Events; using JetBrains.Annotations; -using Robust.Client.UserInterface; using Robust.Shared.Map; namespace Content.Client.Shuttles.BUI; @@ -20,7 +19,9 @@ public sealed class ShuttleConsoleBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _window = this.CreateWindow(); + _window = new ShuttleConsoleWindow(); + _window.OpenCentered(); + _window.OnClose += Close; _window.RequestFTL += OnFTLRequest; _window.RequestBeaconFTL += OnFTLBeaconRequest; diff --git a/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs b/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs index ed9bf40a48..3cc2a35d79 100644 --- a/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs +++ b/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Shared.Silicons.Borgs; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Silicons.Borgs; @@ -19,8 +18,9 @@ public sealed class BorgBoundUserInterface : BoundUserInterface { base.Open(); - _menu = this.CreateWindow(); - _menu.SetEntity(Owner); + var owner = Owner; + + _menu = new BorgMenu(owner); _menu.BrainButtonPressed += () => { @@ -41,6 +41,10 @@ public sealed class BorgBoundUserInterface : BoundUserInterface { SendMessage(new BorgRemoveModuleBuiMessage(EntMan.GetNetEntity(module))); }; + + _menu.OnClose += Close; + + _menu.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -51,4 +55,12 @@ public sealed class BorgBoundUserInterface : BoundUserInterface return; _menu?.UpdateState(msg); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + _menu?.Dispose(); + } } diff --git a/Content.Client/Silicons/Borgs/BorgMenu.xaml b/Content.Client/Silicons/Borgs/BorgMenu.xaml index 4cc2e41a8f..7d8fd9fe57 100644 --- a/Content.Client/Silicons/Borgs/BorgMenu.xaml +++ b/Content.Client/Silicons/Borgs/BorgMenu.xaml @@ -10,7 +10,7 @@ VerticalExpand="True"> - + diff --git a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs index f6a861aa05..474a83b453 100644 --- a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs +++ b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs @@ -21,33 +21,25 @@ public sealed partial class BorgMenu : FancyWindow public Action? NameChanged; public Action? RemoveModuleButtonPressed; + private readonly BorgChassisComponent? _chassis; + public readonly EntityUid Entity; public float AccumulatedTime; private string _lastValidName; private List _modules = new(); - public EntityUid Entity; - - public BorgMenu() + public BorgMenu(EntityUid entity) { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - _lastValidName = NameLineEdit.Text; - - EjectBatteryButton.OnPressed += _ => EjectBatteryButtonPressed?.Invoke(); - BrainButton.OnPressed += _ => BrainButtonPressed?.Invoke(); - - NameLineEdit.OnTextChanged += OnNameChanged; - NameLineEdit.OnTextEntered += OnNameEntered; - NameLineEdit.OnFocusExit += OnNameFocusExit; - - UpdateBrainButton(); - } - - public void SetEntity(EntityUid entity) - { Entity = entity; + + if (_entity.TryGetComponent(Entity, out var chassis)) + _chassis = chassis; + BorgSprite.SetEntity(entity); + ChargeBar.MaxValue = 1f; + ChargeBar.Value = 1f; if (_entity.TryGetComponent(Entity, out var nameIdentifierComponent)) { @@ -63,6 +55,17 @@ public sealed partial class BorgMenu : FancyWindow NameIdentifierLabel.Visible = false; NameLineEdit.Text = _entity.GetComponent(Entity).EntityName; } + + _lastValidName = NameLineEdit.Text; + + EjectBatteryButton.OnPressed += _ => EjectBatteryButtonPressed?.Invoke(); + BrainButton.OnPressed += _ => BrainButtonPressed?.Invoke(); + + NameLineEdit.OnTextChanged += OnNameChanged; + NameLineEdit.OnTextEntered += OnNameEntered; + NameLineEdit.OnFocusExit += OnNameFocusExit; + + UpdateBrainButton(); } protected override void FrameUpdate(FrameEventArgs args) @@ -86,7 +89,7 @@ public sealed partial class BorgMenu : FancyWindow private void UpdateBrainButton() { - if (_entity.TryGetComponent(Entity, out BorgChassisComponent? chassis) && chassis.BrainEntity is { } brain) + if (_chassis?.BrainEntity is { } brain) { BrainButton.Text = _entity.GetComponent(brain).EntityName; BrainView.Visible = true; @@ -105,17 +108,17 @@ public sealed partial class BorgMenu : FancyWindow private void UpdateModulePanel() { - if (!_entity.TryGetComponent(Entity, out BorgChassisComponent? chassis)) + if (_chassis == null) return; ModuleCounter.Text = Loc.GetString("borg-ui-module-counter", - ("actual", chassis.ModuleCount), - ("max", chassis.MaxModules)); + ("actual", _chassis.ModuleCount), + ("max", _chassis.MaxModules)); - if (chassis.ModuleContainer.Count == _modules.Count) + if (_chassis.ModuleContainer.Count == _modules.Count) { var isSame = true; - foreach (var module in chassis.ModuleContainer.ContainedEntities) + foreach (var module in _chassis.ModuleContainer.ContainedEntities) { if (_modules.Contains(module)) continue; @@ -129,7 +132,7 @@ public sealed partial class BorgMenu : FancyWindow ModuleContainer.Children.Clear(); _modules.Clear(); - foreach (var module in chassis.ModuleContainer.ContainedEntities) + foreach (var module in _chassis.ModuleContainer.ContainedEntities) { var control = new BorgModuleControl(module, _entity); control.RemoveButtonPressed += () => diff --git a/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs b/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs index 56216b9184..d150735fa1 100644 --- a/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs +++ b/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs @@ -2,7 +2,6 @@ using System.Linq; using Content.Shared.Silicons.Laws; using Content.Shared.Silicons.Laws.Components; using JetBrains.Annotations; -using Robust.Client.UserInterface; namespace Content.Client.Silicons.Laws.Ui; @@ -23,7 +22,18 @@ public sealed class SiliconLawBoundUserInterface : BoundUserInterface { base.Open(); - _menu = this.CreateWindow(); + _menu = new(); + + _menu.OnClose += Close; + _menu.OpenCentered(); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + _menu?.Close(); } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs b/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs index 7d6a6cf2a5..e8442d2390 100644 --- a/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs +++ b/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs @@ -1,6 +1,6 @@ using Content.Shared.SprayPainter; using Content.Shared.SprayPainter.Components; -using Robust.Client.UserInterface; +using Robust.Client.GameObjects; using Robust.Client.UserInterface.Controls; namespace Content.Client.SprayPainter.UI; @@ -10,6 +10,9 @@ public sealed class SprayPainterBoundUserInterface : BoundUserInterface [ViewVariables] private SprayPainterWindow? _window; + [ViewVariables] + private SprayPainterSystem? _painter; + public SprayPainterBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } @@ -18,15 +21,27 @@ public sealed class SprayPainterBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); + if (!EntMan.TryGetComponent(Owner, out var comp)) + return; + _window = new SprayPainterWindow(); + + _painter = EntMan.System(); + + _window.OnClose += Close; _window.OnSpritePicked = OnSpritePicked; _window.OnColorPicked = OnColorPicked; - if (EntMan.TryGetComponent(Owner, out SprayPainterComponent? comp)) - { - _window.Populate(EntMan.System().Entries, comp.Index, comp.PickedColor, comp.ColorPalette); - } + _window.Populate(_painter.Entries, comp.Index, comp.PickedColor, comp.ColorPalette); + + _window.OpenCentered(); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + _window?.Dispose(); } private void OnSpritePicked(ItemList.ItemListSelectedEventArgs args) diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs index e7bab71e38..720a2efb9d 100644 --- a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs +++ b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs @@ -1,5 +1,4 @@ using Content.Shared.StationRecords; -using Robust.Client.UserInterface; namespace Content.Client.StationRecords; @@ -16,12 +15,15 @@ public sealed class GeneralStationRecordConsoleBoundUserInterface : BoundUserInt { base.Open(); - _window = this.CreateWindow(); + _window = new(); _window.OnKeySelected += key => SendMessage(new SelectStationRecord(key)); _window.OnFiltersChanged += (type, filterValue) => SendMessage(new SetStationRecordFilter(type, filterValue)); _window.OnDeleted += id => SendMessage(new DeleteStationRecord(id)); + _window.OnClose += Close; + + _window.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -33,4 +35,11 @@ public sealed class GeneralStationRecordConsoleBoundUserInterface : BoundUserInt _window?.UpdateState(cast); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + _window?.Close(); + } } diff --git a/Content.Client/Store/Ui/StoreBoundUserInterface.cs b/Content.Client/Store/Ui/StoreBoundUserInterface.cs index 7ed67f7b5d..0010aedd96 100644 --- a/Content.Client/Store/Ui/StoreBoundUserInterface.cs +++ b/Content.Client/Store/Ui/StoreBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Shared.Store; using JetBrains.Annotations; using System.Linq; using Content.Shared.Store.Components; -using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.Store.Ui; @@ -27,10 +26,13 @@ public sealed class StoreBoundUserInterface : BoundUserInterface protected override void Open() { - _menu = this.CreateWindow(); + _menu = new StoreMenu(); if (EntMan.TryGetComponent(Owner, out var store)) _menu.Title = Loc.GetString(store.Name); + _menu.OpenCentered(); + _menu.OnClose += Close; + _menu.OnListingButtonPressed += (_, listing) => { SendMessage(new StoreBuyListingMessage(listing)); @@ -75,6 +77,15 @@ public sealed class StoreBoundUserInterface : BoundUserInterface } } + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + _menu?.Close(); + _menu?.Dispose(); + } + private void UpdateListingsWithSearchFilter() { if (_menu == null) diff --git a/Content.Client/Strip/StrippingMenu.cs b/Content.Client/Strip/StrippingMenu.cs index 1c46b4be35..eea867b794 100644 --- a/Content.Client/Strip/StrippingMenu.cs +++ b/Content.Client/Strip/StrippingMenu.cs @@ -1,3 +1,4 @@ +using Content.Client.Inventory; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Timing; @@ -10,12 +11,14 @@ namespace Content.Client.Strip public LayoutContainer InventoryContainer = new(); public BoxContainer HandsContainer = new() { Orientation = LayoutOrientation.Horizontal }; public BoxContainer SnareContainer = new(); + private StrippableBoundUserInterface _bui; public bool Dirty = true; - public event Action? OnDirty; - - public StrippingMenu() + public StrippingMenu(string title, StrippableBoundUserInterface bui) { + Title = title; + _bui = bui; + var box = new BoxContainer() { Orientation = LayoutOrientation.Vertical, Margin = new Thickness(0, 8) }; Contents.AddChild(box); box.AddChild(SnareContainer); @@ -36,7 +39,7 @@ namespace Content.Client.Strip return; Dirty = false; - OnDirty?.Invoke(); + _bui.UpdateMenu(); } } } diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs index e3646c00cc..9132dd6ed5 100644 --- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs +++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs @@ -1,7 +1,6 @@ using Content.Client.Eye; using Content.Shared.SurveillanceCamera; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.SurveillanceCamera.UI; @@ -26,12 +25,20 @@ public sealed class SurveillanceCameraMonitorBoundUserInterface : BoundUserInter { base.Open(); - _window = this.CreateWindow(); + _window = new SurveillanceCameraMonitorWindow(); + + if (State != null) + { + UpdateState(State); + } + + _window.OpenCentered(); _window.CameraSelected += OnCameraSelected; _window.SubnetOpened += OnSubnetRequest; _window.CameraRefresh += OnCameraRefresh; _window.SubnetRefresh += OnSubnetRefresh; + _window.OnClose += Close; _window.CameraSwitchTimer += OnCameraSwitchTimer; _window.CameraDisconnect += OnCameraDisconnect; } diff --git a/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs b/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs index 0631d98993..37384daafe 100644 --- a/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs +++ b/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Shared.Thief; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Thief; @@ -16,9 +15,21 @@ public sealed class ThiefBackpackBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); - _window.OnApprove += SendApprove; - _window.OnSetChange += SendChangeSelected; + _window = new ThiefBackpackMenu(this); + _window.OnClose += Close; + _window.OpenCentered(); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (!disposing) + return; + + if (_window != null) + _window.OnClose -= Close; + + _window?.Dispose(); } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Thief/ThiefBackpackMenu.xaml.cs b/Content.Client/Thief/ThiefBackpackMenu.xaml.cs index aaee357617..543772c704 100644 --- a/Content.Client/Thief/ThiefBackpackMenu.xaml.cs +++ b/Content.Client/Thief/ThiefBackpackMenu.xaml.cs @@ -12,42 +12,46 @@ public sealed partial class ThiefBackpackMenu : FancyWindow [Dependency] private readonly IEntitySystemManager _sysMan = default!; private readonly SpriteSystem _spriteSystem; - public event Action? OnApprove; - public event Action? OnSetChange; + private readonly ThiefBackpackBoundUserInterface _owner; - public ThiefBackpackMenu() + public ThiefBackpackMenu(ThiefBackpackBoundUserInterface owner) { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); _spriteSystem = _sysMan.GetEntitySystem(); - ApproveButton.OnPressed += args => + _owner = owner; + + ApproveButton.OnButtonDown += (args) => { - OnApprove?.Invoke(); + _owner.SendApprove(); }; } public void UpdateState(ThiefBackpackBoundUserInterfaceState state) { - SetsGrid.DisposeAllChildren(); - var selectedNumber = 0; - foreach (var (set, info) in state.Sets) + SetsGrid.RemoveAllChildren(); + int count = 0; + int selectedNumber = 0; + foreach (var set in state.Sets) { - var child = new ThiefBackpackSet(info, _spriteSystem); + var child = new ThiefBackpackSet(set.Value, _spriteSystem); child.SetButton.OnButtonDown += (args) => { - OnSetChange?.Invoke(set); + _owner.SendChangeSelected(set.Key); }; SetsGrid.AddChild(child); - if (info.Selected) + count++; + + if (set.Value.Selected) selectedNumber++; } Description.Text = Loc.GetString("thief-backpack-window-description", ("maxCount", state.MaxSelectedSets)); SelectedSets.Text = Loc.GetString("thief-backpack-window-selected", ("selectedCount", selectedNumber), ("maxCount", state.MaxSelectedSets)); - ApproveButton.Disabled = selectedNumber != state.MaxSelectedSets; + ApproveButton.Disabled = selectedNumber == state.MaxSelectedSets ? false : true; } } diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs index 4ae74a5d65..4702f8f365 100644 --- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs +++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs @@ -1,7 +1,5 @@ using Content.Shared.Atmos.Components; using JetBrains.Annotations; -using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.UserInterface.Systems.Atmos.GasTank { @@ -15,7 +13,7 @@ namespace Content.Client.UserInterface.Systems.Atmos.GasTank { } - public void SetOutputPressure(float value) + public void SetOutputPressure(in float value) { SendMessage(new GasTankSetPressureMessage { @@ -31,10 +29,9 @@ namespace Content.Client.UserInterface.Systems.Atmos.GasTank protected override void Open() { base.Open(); - _window = this.CreateWindow(); - _window.SetTitle(EntMan.GetComponent(Owner).EntityName); - _window.OnOutputPressure += SetOutputPressure; - _window.OnToggleInternals += ToggleInternals; + _window = new GasTankWindow(this, EntMan.GetComponent(Owner).EntityName); + _window.OnClose += Close; + _window.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs index 12eeaa55de..c23850a650 100644 --- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs +++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs @@ -15,28 +15,23 @@ namespace Content.Client.UserInterface.Systems.Atmos.GasTank; public sealed class GasTankWindow : BaseWindow { - [Dependency] private readonly IResourceCache _cache = default!; - private readonly RichTextLabel _lblPressure; private readonly FloatSpinBox _spbPressure; private readonly RichTextLabel _lblInternals; private readonly Button _btnInternals; - private readonly Label _topLabel; - public event Action? OnOutputPressure; - public event Action? OnToggleInternals; - - public GasTankWindow() + public GasTankWindow(GasTankBoundUserInterface owner, string uidName) { Control contentContainer; BoxContainer topContainer; TextureButton btnClose; + var resourceCache = IoCManager.Resolve(); var rootContainer = new LayoutContainer { Name = "GasTankRoot" }; AddChild(rootContainer); MouseFilter = MouseFilterMode.Stop; - var panelTex = _cache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); + var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); var back = new StyleBoxTexture { Texture = panelTex, @@ -83,17 +78,7 @@ public sealed class GasTankWindow LayoutContainer.SetAnchorPreset(topContainerWrap, LayoutContainer.LayoutPreset.Wide); - var font = _cache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13); - - _topLabel = new Label - { - FontOverride = font, - FontColorOverride = StyleNano.NanoGold, - VerticalAlignment = VAlignment.Center, - HorizontalExpand = true, - HorizontalAlignment = HAlignment.Left, - Margin = new Thickness(0, 0, 20, 0), - }; + var font = resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13); var topRow = new BoxContainer { @@ -101,7 +86,16 @@ public sealed class GasTankWindow Margin = new Thickness(4, 2, 12, 2), Children = { - _topLabel, + (new Label + { + Text = uidName, + FontOverride = font, + FontColorOverride = StyleNano.NanoGold, + VerticalAlignment = VAlignment.Center, + HorizontalExpand = true, + HorizontalAlignment = HAlignment.Left, + Margin = new Thickness(0, 0, 20, 0), + }), (btnClose = new TextureButton { StyleClasses = {DefaultWindow.StyleClassWindowCloseButton}, @@ -174,22 +168,17 @@ public sealed class GasTankWindow // Handlers _spbPressure.OnValueChanged += args => { - OnOutputPressure?.Invoke(args.Value); + owner.SetOutputPressure(args.Value); }; _btnInternals.OnPressed += args => { - OnToggleInternals?.Invoke(); + owner.ToggleInternals(); }; btnClose.OnPressed += _ => Close(); } - public void SetTitle(string name) - { - _topLabel.Text = name; - } - public void UpdateState(GasTankBoundUserInterfaceState state) { _lblPressure.SetMarkup(Loc.GetString("gas-tank-window-tank-pressure-text", ("tankPressure", $"{state.TankPressure:0.##}"))); diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs index eafab84ed6..17ddba77ff 100644 --- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs +++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs @@ -2,7 +2,6 @@ using Content.Client.VendingMachines.UI; using Content.Shared.VendingMachines; using Robust.Client.UserInterface.Controls; using System.Linq; -using Robust.Client.UserInterface; namespace Content.Client.VendingMachines { @@ -29,14 +28,15 @@ namespace Content.Client.VendingMachines _cachedInventory = vendingMachineSys.GetAllInventory(Owner); - _menu = this.CreateWindow(); - _menu.OpenCenteredLeft(); - _menu.Title = EntMan.GetComponent(Owner).EntityName; + _menu = new VendingMachineMenu { Title = EntMan.GetComponent(Owner).EntityName }; + _menu.OnClose += Close; _menu.OnItemSelected += OnItemSelected; _menu.OnSearchChanged += OnSearchChanged; _menu.Populate(_cachedInventory, out _cachedFilteredIndex); + + _menu.OpenCenteredLeft(); } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs index 891804674d..f700c6663b 100644 --- a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs +++ b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs @@ -1,13 +1,12 @@ using Content.Shared.VoiceMask; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.VoiceMask; public sealed class VoiceMaskBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _protomanager = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; [ViewVariables] private VoiceMaskNameChangeWindow? _window; @@ -20,11 +19,12 @@ public sealed class VoiceMaskBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); - _window.ReloadVerbs(_protomanager); + _window = new(_proto); + _window.OpenCentered(); _window.OnNameChange += OnNameSelected; _window.OnVerbChange += verb => SendMessage(new VoiceMaskChangeVerbMessage(verb)); + _window.OnClose += Close; } private void OnNameSelected(string name) diff --git a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs index 0dc41f807a..16a28f9d9b 100644 --- a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs +++ b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs @@ -17,7 +17,7 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow private string? _verb; - public VoiceMaskNameChangeWindow() + public VoiceMaskNameChangeWindow(IPrototypeManager proto) { RobustXamlLoader.Load(this); @@ -32,10 +32,12 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow SpeechVerbSelector.SelectId(args.Id); }; + ReloadVerbs(proto); + AddVerbs(); } - public void ReloadVerbs(IPrototypeManager proto) + private void ReloadVerbs(IPrototypeManager proto) { foreach (var verb in proto.EnumeratePrototypes()) { diff --git a/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs b/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs index 3f01808c42..f3e0c0a539 100644 --- a/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs +++ b/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs @@ -1,6 +1,5 @@ using Robust.Client.GameObjects; using Content.Shared.Speech.Components; -using Robust.Client.UserInterface; namespace Content.Client.Weapons.Melee.UI; @@ -20,10 +19,17 @@ public sealed class MeleeSpeechBoundUserInterface : BoundUserInterface { base.Open(); - _window = this.CreateWindow(); + _window = new MeleeSpeechWindow(); + if (State != null) + UpdateState(State); + + _window.OpenCentered(); + + _window.OnClose += Close; _window.OnBattlecryEntered += OnBattlecryChanged; } + private void OnBattlecryChanged(string newBattlecry) { SendMessage(new MeleeSpeechBattlecryChangedMessage(newBattlecry)); diff --git a/Content.Client/Wires/UI/WiresBoundUserInterface.cs b/Content.Client/Wires/UI/WiresBoundUserInterface.cs index edf1a2d377..5a8869a204 100644 --- a/Content.Client/Wires/UI/WiresBoundUserInterface.cs +++ b/Content.Client/Wires/UI/WiresBoundUserInterface.cs @@ -1,6 +1,5 @@ using Content.Shared.Wires; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Wires.UI { @@ -16,8 +15,10 @@ namespace Content.Client.Wires.UI protected override void Open() { base.Open(); - _menu = this.CreateWindow(); - _menu.OnAction += PerformAction; + + _menu = new WiresMenu(this); + _menu.OnClose += Close; + _menu.OpenCenteredLeft(); } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Wires/UI/WiresMenu.cs b/Content.Client/Wires/UI/WiresMenu.cs index eccc548297..7bccc20861 100644 --- a/Content.Client/Wires/UI/WiresMenu.cs +++ b/Content.Client/Wires/UI/WiresMenu.cs @@ -1,3 +1,4 @@ +using System; using System.Numerics; using Content.Client.Examine; using Content.Client.Resources; @@ -11,6 +12,10 @@ using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Animations; using Robust.Shared.Input; +using Robust.Shared.IoC; +using Robust.Shared.Localization; +using Robust.Shared.Maths; +using Robust.Shared.Random; using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Wires.UI @@ -19,6 +24,8 @@ namespace Content.Client.Wires.UI { [Dependency] private readonly IResourceCache _resourceCache = default!; + public WiresBoundUserInterface Owner { get; } + private readonly Control _wiresHBox; private readonly Control _topContainer; private readonly Control _statusContainer; @@ -28,12 +35,11 @@ namespace Content.Client.Wires.UI public TextureButton CloseButton { get; set; } - public event Action? OnAction; - - public WiresMenu() + public WiresMenu(WiresBoundUserInterface owner) { IoCManager.InjectDependencies(this); + Owner = owner; var rootContainer = new LayoutContainer {Name = "WireRoot"}; AddChild(rootContainer); @@ -251,12 +257,12 @@ namespace Content.Client.Wires.UI control.WireClicked += () => { - OnAction?.Invoke(wire.Id, wire.IsCut ? WiresAction.Mend : WiresAction.Cut); + Owner.PerformAction(wire.Id, wire.IsCut ? WiresAction.Mend : WiresAction.Cut); }; control.ContactsClicked += () => { - OnAction?.Invoke(wire.Id, WiresAction.Pulse); + Owner.PerformAction(wire.Id, WiresAction.Pulse); }; } diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs index c7a74815b6..2538caf6eb 100644 --- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs +++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs @@ -1,7 +1,6 @@ using Content.Shared.Xenoarchaeology.Equipment; using JetBrains.Annotations; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; namespace Content.Client.Xenoarchaeology.Ui; @@ -19,7 +18,10 @@ public sealed class AnalysisConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _consoleMenu = this.CreateWindow(); + _consoleMenu = new AnalysisConsoleMenu(); + + _consoleMenu.OnClose += Close; + _consoleMenu.OpenCentered(); _consoleMenu.OnServerSelectionButtonPressed += () => { From 6b57cf202062de26f2b4c92292a2e58b268d328e Mon Sep 17 00:00:00 2001 From: buntobaggins <113877683+buntobaggins@users.noreply.github.com> Date: Sat, 20 Jul 2024 20:29:21 -0700 Subject: [PATCH 032/108] Spationaut Hardsuit Light buff (#30049) Buffed the light on the Spationaut Hardsuit Co-authored-by: buntobaggins --- .../Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 7f0c057300..ffa5747e87 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -111,6 +111,8 @@ - state: equipped-head - state: equipped-head-unshaded shader: unshaded + - type: PointLight + radius: 6 - type: PressureProtection highPressureMultiplier: 0.72 lowPressureMultiplier: 1000 From 87e52e50b4b353bfc2721bf243bc0ffe1f8264b9 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 21 Jul 2024 03:30:29 +0000 Subject: [PATCH 033/108] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ed8f51b786..1ed3320d34 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: metalgearsloth - changes: - - message: Add predicted UI opening for storage and PDAs. - type: Add - id: 6443 - time: '2024-04-26T08:16:24.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27214 - author: DrSmugleaf changes: - message: Fixed mobs that are able to pry doors not being able to do so by just @@ -3798,3 +3791,10 @@ id: 6942 time: '2024-07-20T05:53:58.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28748 +- author: buntobaggins + changes: + - message: Increased light radius on the Spationaut Hardsuit + type: Tweak + id: 6943 + time: '2024-07-21T03:29:21.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30049 From edb05e36bbddfd9809877debdcb20fbb2d1feb43 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 21 Jul 2024 14:48:13 +1000 Subject: [PATCH 034/108] Reapply "Remove some BUI boilerplate" (#30214) (#30219) * Reapply "Remove some BUI boilerplate" (#30214) This reverts commit cb0ba66be38677d248ce11f809221230ebe89642. * Fix gas tank * Fix PA * Fix microwave * Comms console underwrap * Fix rcd * log wehs --- .../UI/AccessOverriderBoundUserInterface.cs | 45 +++-- .../Access/UI/AccessOverriderWindow.xaml.cs | 41 ++--- .../UI/AgentIDCardBoundUserInterface.cs | 19 +- .../Access/UI/AgentIDCardWindow.xaml.cs | 10 +- .../Ame/UI/AmeControllerBoundUserInterface.cs | 16 +- Content.Client/Ame/UI/AmeWindow.xaml.cs | 19 +- .../Ui/AnomalyGeneratorBoundUserInterface.cs | 20 +- .../Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs | 8 +- Content.Client/Arcade/BlockGameMenu.cs | 45 +++-- .../Arcade/SpaceVillainArcadeMenu.cs | 45 ++--- .../Arcade/UI/BlockGameBoundUserInterface.cs | 5 +- .../SpaceVillainArcadeBoundUserInterface.cs | 16 +- .../Monitor/UI/AirAlarmBoundUserInterface.cs | 12 +- .../Atmos/Monitor/UI/AirAlarmWindow.xaml.cs | 7 +- .../Atmos/UI/GasCanisterBoundUserInterface.cs | 9 +- .../Atmos/UI/GasFilterBoundUserInterface.cs | 11 +- .../Atmos/UI/GasFilterWindow.xaml.cs | 7 +- .../Atmos/UI/GasMixerBoundUserInteface.cs | 18 +- .../UI/GasPressurePumpBoundUserInterface.cs | 17 +- .../UI/GasThermomachineBoundUserInterface.cs | 17 +- .../UI/GasVolumePumpBoundUserInterface.cs | 19 +- .../Atmos/UI/SpaceHeaterBoundUserInterface.cs | 10 +- .../Jukebox/JukeboxBoundUserInterface.cs | 21 +-- .../CryostorageBoundUserInterface.cs | 15 +- .../CargoBountyConsoleBoundUserInterface.cs | 17 +- .../CargoPalletConsoleBoundUserInterface.cs | 15 +- .../CargoShuttleConsoleBoundUserInterface.cs | 24 +-- .../Cargo/UI/CargoShuttleMenu.xaml.cs | 13 +- .../UI/ChemMasterBoundUserInterface.cs | 20 +- .../UI/ReagentDispenserBoundUserInterface.cs | 27 +-- .../UI/TransferAmountBoundUserInterface.cs | 12 +- .../UI/CloningConsoleBoundUserInterface.cs | 25 +-- .../UI/ChameleonBoundUserInterface.cs | 16 +- ...CommunicationsConsoleBoundUserInterface.cs | 72 +++----- .../UI/CommunicationsConsoleMenu.xaml.cs | 79 ++++---- .../Computer/ComputerBoundUserInterface.cs | 15 +- .../UI/ConfigurationBoundUserInterface.cs | 28 +-- .../Configurable/UI/ConfigurationMenu.cs | 18 +- .../UI/FlatpackCreatorBoundUserInterface.cs | 14 +- .../UI/FlatpackCreatorMenu.xaml.cs | 13 +- .../Crayon/UI/CrayonBoundUserInterface.cs | 40 ++-- Content.Client/Crayon/UI/CrayonWindow.xaml.cs | 18 +- .../UI/DisposalRouterBoundUserInterface.cs | 22 +-- .../UI/DisposalTaggerBoundUserInterface.cs | 23 +-- .../DoorElectronicsBoundUserInterface.cs | 31 ++-- .../DoorElectronicsConfigurationMenu.xaml.cs | 21 ++- Content.Client/Fax/UI/FaxBoundUi.cs | 12 +- .../ForensicScannerBoundUserInterface.cs | 15 +- .../Gateway/UI/GatewayBoundUserInterface.cs | 16 +- .../Gateway/UI/GatewayWindow.xaml.cs | 10 +- .../UI/GravityGeneratorBoundUserInterface.cs | 23 +-- .../Gravity/UI/GravityGeneratorWindow.xaml.cs | 15 +- .../UI/HealthAnalyzerBoundUserInterface.cs | 23 +-- ...manoidMarkingModifierBoundUserInterface.cs | 4 +- .../Instruments/UI/BandMenu.xaml.cs | 6 +- .../Instruments/UI/ChannelsMenu.xaml.cs | 5 +- .../UI/InstrumentBoundUserInterface.cs | 36 +++- .../Instruments/UI/InstrumentMenu.xaml.cs | 171 ++++++++++-------- .../Inventory/StrippableBoundUserInterface.cs | 25 ++- Content.Client/Kitchen/UI/GrinderMenu.xaml.cs | 42 ++--- .../Kitchen/UI/MicrowaveBoundUserInterface.cs | 43 +---- .../Kitchen/UI/MicrowaveMenu.xaml.cs | 25 ++- .../UI/ReagentGrinderBoundUserInterface.cs | 34 ++-- .../UI/HandLabelerBoundUserInterface.cs | 16 +- .../Lathe/UI/LatheBoundUserInterface.cs | 17 +- Content.Client/Lathe/UI/LatheMenu.xaml.cs | 29 +-- .../UI/SignalTimerBoundUserInterface.cs | 24 +-- .../UI/SignalTimerWindow.xaml.cs | 24 +-- .../MagicMirrorBoundUserInterface.cs | 15 +- .../Ui/NewsWriterBoundUserInterface.cs | 18 +- .../MassMedia/Ui/NewsWriterMenu.xaml.cs | 6 +- .../Mech/Ui/MechBoundUserInterface.cs | 16 +- Content.Client/Mech/Ui/MechMenu.xaml.cs | 9 +- .../CrewMonitoringBoundUserInterface.cs | 18 +- .../CrewMonitoringWindow.xaml.cs | 17 +- .../NetworkConfiguratorBoundUserInterface.cs | 39 ++-- ...tworkConfiguratorConfigurationMenu.xaml.cs | 8 +- .../NetworkConfiguratorDeviceList.xaml.cs | 12 +- .../NetworkConfiguratorLinkMenu.xaml.cs | 16 +- .../NetworkConfiguratorListMenu.xaml.cs | 13 +- Content.Client/Nuke/NukeBoundUserInterface.cs | 17 +- .../WarDeclaratorBoundUserInterface.cs | 18 +- .../NukeOps/WarDeclaratorWindow.xaml.cs | 9 +- Content.Client/PDA/PdaBoundUserInterface.cs | 17 +- .../PDA/Ringer/RingerBoundUserInterface.cs | 4 +- .../Paper/UI/PaperBoundUserInterface.cs | 17 +- Content.Client/Paper/UI/PaperWindow.xaml.cs | 6 +- .../ParticleAcceleratorBoundUserInterface.cs | 16 +- .../UI/ParticleAcceleratorControlMenu.cs | 35 ++-- .../UI/NavMapBeaconBoundUserInterface.cs | 16 +- .../Pinpointer/UI/NavMapBeaconWindow.xaml.cs | 25 ++- .../UI/StationMapBoundUserInterface.cs | 15 +- .../Pinpointer/UI/StationMapWindow.xaml.cs | 11 +- .../UI/UntrackedMapBoundUserInterface.cs | 15 +- .../Power/APC/ApcBoundUserInterface.cs | 16 +- Content.Client/Power/APC/UI/ApcMenu.xaml.cs | 12 +- .../Power/Generator/GeneratorWindow.xaml.cs | 52 +++--- .../PortableGeneratorBoundUserInterface.cs | 25 ++- ...owerMonitoringConsoleBoundUserInterface.cs | 19 +- .../PowerMonitoringWindow.xaml.Widgets.cs | 6 +- .../Power/PowerMonitoringWindow.xaml.cs | 86 +++++---- Content.Client/RCD/RCDMenu.xaml.cs | 40 ++-- .../RCD/RCDMenuBoundUserInterface.cs | 16 +- .../Radio/Ui/IntercomBoundUserInterface.cs | 20 +- Content.Client/Radio/Ui/IntercomMenu.xaml.cs | 4 +- .../UI/DiskConsoleBoundUserInterface.cs | 15 +- .../UI/ResearchClientBoundUserInterface.cs | 16 +- .../ResearchClientServerSelectionMenu.xaml.cs | 11 +- .../UI/ResearchConsoleBoundUserInterface.cs | 28 +-- .../Research/UI/ResearchConsoleMenu.xaml.cs | 31 ++-- .../UI/RoboticsConsoleBoundUserInterface.cs | 18 +- .../Robotics/UI/RoboticsConsoleWindow.xaml.cs | 25 ++- ...vageExpeditionConsoleBoundUserInterface.cs | 12 +- .../UI/SalvageMagnetBoundUserInterface.cs | 21 +-- .../BUI/IFFConsoleBoundUserInterface.cs | 4 +- .../BUI/RadarConsoleBoundUserInterface.cs | 14 +- .../BUI/ShuttleConsoleBoundUserInterface.cs | 5 +- .../Silicons/Borgs/BorgBoundUserInterface.cs | 18 +- Content.Client/Silicons/Borgs/BorgMenu.xaml | 2 +- .../Silicons/Borgs/BorgMenu.xaml.cs | 51 +++--- .../Laws/Ui/SiliconLawBoundUserInterface.cs | 14 +- .../UI/SprayPainterBoundUserInterface.cs | 27 +-- ...lStationRecordConsoleBoundUserInterface.cs | 13 +- .../Store/Ui/StoreBoundUserInterface.cs | 15 +- Content.Client/Strip/StrippingMenu.cs | 11 +- .../UI/SurveillanceCameraMonitorBoundUi.cs | 11 +- .../Thief/ThiefBackpackBoundUserInterface.cs | 19 +- .../Thief/ThiefBackpackMenu.xaml.cs | 28 ++- .../GasTank/GasTankBoundUserInterface.cs | 11 +- .../Systems/Atmos/GasTank/GasTankWindow.cs | 44 +++-- .../VendingMachineBoundUserInterface.cs | 8 +- .../VoiceMask/VoiceMaskBoundUserInterface.cs | 8 +- .../VoiceMaskNameChangeWindow.xaml.cs | 6 +- .../Melee/UI/MeleeSpeechBoundUserInterface.cs | 10 +- .../Wires/UI/WiresBoundUserInterface.cs | 7 +- Content.Client/Wires/UI/WiresMenu.cs | 16 +- .../Ui/AnalysisConsoleBoundUserInterface.cs | 6 +- 137 files changed, 1102 insertions(+), 1757 deletions(-) diff --git a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs index c1b63dc4d0..d80c600c03 100644 --- a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs +++ b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Access; using Content.Shared.Access.Components; using Content.Shared.Access.Systems; using Content.Shared.Containers.ItemSlots; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; using static Content.Shared.Access.Components.AccessOverriderComponent; @@ -23,6 +24,28 @@ namespace Content.Client.Access.UI { base.Open(); + _window = this.CreateWindow(); + RefreshAccess(); + _window.Title = EntMan.GetComponent(Owner).EntityName; + _window.OnSubmit += SubmitData; + + _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId)); + } + + public override void OnProtoReload(PrototypesReloadedEventArgs args) + { + base.OnProtoReload(args); + if (!args.WasModified()) + return; + + RefreshAccess(); + + if (State != null) + _window?.UpdateState(_prototypeManager, (AccessOverriderBoundUserInterfaceState) State); + } + + private void RefreshAccess() + { List> accessLevels; if (EntMan.TryGetComponent(Owner, out var accessOverrider)) @@ -30,38 +53,20 @@ namespace Content.Client.Access.UI accessLevels = accessOverrider.AccessLevels; accessLevels.Sort(); } - else { accessLevels = new List>(); _accessOverriderSystem.Log.Error($"No AccessOverrider component found for {EntMan.ToPrettyString(Owner)}!"); } - _window = new AccessOverriderWindow(this, _prototypeManager, accessLevels) - { - Title = EntMan.GetComponent(Owner).EntityName - }; - - _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId)); - - _window.OnClose += Close; - _window.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _window?.Dispose(); + _window?.SetAccessLevels(_prototypeManager, accessLevels); } protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); var castState = (AccessOverriderBoundUserInterfaceState) state; - _window?.UpdateState(castState); + _window?.UpdateState(_prototypeManager, castState); } public void SubmitData(List> newAccessList) diff --git a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs index 6025c3b551..ba08771858 100644 --- a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs +++ b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs @@ -13,26 +13,24 @@ namespace Content.Client.Access.UI [GenerateTypedNameReferences] public sealed partial class AccessOverriderWindow : DefaultWindow { - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - - private readonly AccessOverriderBoundUserInterface _owner; private readonly Dictionary _accessButtons = new(); - public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototypeManager prototypeManager, - List> accessLevels) + public event Action>>? OnSubmit; + + public AccessOverriderWindow() { RobustXamlLoader.Load(this); - IoCManager.InjectDependencies(this); - var logMill = _logManager.GetSawmill(SharedAccessOverriderSystem.Sawmill); + } - _owner = owner; + public void SetAccessLevels(IPrototypeManager protoManager, List> accessLevels) + { + _accessButtons.Clear(); + AccessLevelGrid.DisposeAllChildren(); foreach (var access in accessLevels) { - if (!prototypeManager.TryIndex(access, out var accessLevel)) + if (!protoManager.TryIndex(access, out var accessLevel)) { - logMill.Error($"Unable to find accesslevel for {access}"); continue; } @@ -44,11 +42,16 @@ namespace Content.Client.Access.UI AccessLevelGrid.AddChild(newButton); _accessButtons.Add(accessLevel.ID, newButton); - newButton.OnPressed += _ => SubmitData(); + newButton.OnPressed += _ => + { + OnSubmit?.Invoke( + // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair + _accessButtons.Where(x => x.Value.Pressed).Select(x => new ProtoId(x.Key)).ToList()); + }; } } - public void UpdateState(AccessOverriderBoundUserInterfaceState state) + public void UpdateState(IPrototypeManager protoManager, AccessOverriderBoundUserInterfaceState state) { PrivilegedIdLabel.Text = state.PrivilegedIdName; PrivilegedIdButton.Text = state.IsPrivilegedIdPresent @@ -66,11 +69,11 @@ namespace Content.Client.Access.UI if (state.MissingPrivilegesList != null && state.MissingPrivilegesList.Any()) { - List missingPrivileges = new List(); + var missingPrivileges = new List(); foreach (string tag in state.MissingPrivilegesList) { - string privilege = Loc.GetString(_prototypeManager.Index(tag)?.Name ?? "generic-unknown"); + var privilege = Loc.GetString(protoManager.Index(tag)?.Name ?? "generic-unknown"); missingPrivileges.Add(privilege); } @@ -90,13 +93,5 @@ namespace Content.Client.Access.UI } } } - - private void SubmitData() - { - _owner.SubmitData( - - // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair - _accessButtons.Where(x => x.Value.Pressed).Select(x => new ProtoId(x.Key)).ToList()); - } } } diff --git a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs index 761f52988a..50add43dc9 100644 --- a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs +++ b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Access.Systems; using Content.Shared.StatusIcon; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.Access.UI @@ -20,16 +21,11 @@ namespace Content.Client.Access.UI { base.Open(); - _window?.Dispose(); - _window = new AgentIDCardWindow(this); - if (State != null) - UpdateState(State); + _window = this.CreateWindow(); - _window.OpenCentered(); - - _window.OnClose += Close; _window.OnNameChanged += OnNameChanged; _window.OnJobChanged += OnJobChanged; + _window.OnJobIconChanged += OnJobIconChanged; } private void OnNameChanged(string newName) @@ -61,14 +57,5 @@ namespace Content.Client.Access.UI _window.SetCurrentJob(cast.CurrentJob); _window.SetAllowedIcons(cast.Icons, cast.CurrentJobIconId); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _window?.Dispose(); - } } } diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs index 6d0b2a184f..071ce41a06 100644 --- a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs +++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs @@ -17,19 +17,19 @@ namespace Content.Client.Access.UI [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IEntitySystemManager _entitySystem = default!; private readonly SpriteSystem _spriteSystem; - private readonly AgentIDCardBoundUserInterface _bui; private const int JobIconColumnCount = 10; public event Action? OnNameChanged; public event Action? OnJobChanged; - public AgentIDCardWindow(AgentIDCardBoundUserInterface bui) + public event Action>? OnJobIconChanged; + + public AgentIDCardWindow() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); _spriteSystem = _entitySystem.GetEntitySystem(); - _bui = bui; NameLineEdit.OnTextEntered += e => OnNameChanged?.Invoke(e.Text); NameLineEdit.OnFocusExit += e => OnNameChanged?.Invoke(e.Text); @@ -67,7 +67,7 @@ namespace Content.Client.Access.UI }; // Generate buttons textures - TextureRect jobIconTexture = new TextureRect + var jobIconTexture = new TextureRect { Texture = _spriteSystem.Frame0(jobIcon.Icon), TextureScale = new Vector2(2.5f, 2.5f), @@ -75,7 +75,7 @@ namespace Content.Client.Access.UI }; jobIconButton.AddChild(jobIconTexture); - jobIconButton.OnPressed += _ => _bui.OnJobIconChanged(jobIconId); + jobIconButton.OnPressed += _ => OnJobIconChanged?.Invoke(jobIcon.ID); IconGrid.AddChild(jobIconButton); if (jobIconId.Equals(currentJobIconId)) diff --git a/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs b/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs index e84cf5d34d..3d65f75189 100644 --- a/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs +++ b/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Ame.Components; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Ame.UI { @@ -16,9 +17,8 @@ namespace Content.Client.Ame.UI { base.Open(); - _window = new AmeWindow(this); - _window.OnClose += Close; - _window.OpenCentered(); + _window = this.CreateWindow(); + _window.OnAmeButton += ButtonPressed; } /// @@ -40,15 +40,5 @@ namespace Content.Client.Ame.UI { SendMessage(new UiButtonPressedMessage(button)); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _window?.Dispose(); - } - } } } diff --git a/Content.Client/Ame/UI/AmeWindow.xaml.cs b/Content.Client/Ame/UI/AmeWindow.xaml.cs index 8b91ec5966..d6d580bcda 100644 --- a/Content.Client/Ame/UI/AmeWindow.xaml.cs +++ b/Content.Client/Ame/UI/AmeWindow.xaml.cs @@ -1,3 +1,4 @@ +using System.Linq; using Content.Client.UserInterface; using Content.Shared.Ame.Components; using Robust.Client.AutoGenerated; @@ -9,15 +10,17 @@ namespace Content.Client.Ame.UI [GenerateTypedNameReferences] public sealed partial class AmeWindow : DefaultWindow { - public AmeWindow(AmeControllerBoundUserInterface ui) + public event Action? OnAmeButton; + + public AmeWindow() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - EjectButton.OnPressed += _ => ui.ButtonPressed(UiButton.Eject); - ToggleInjection.OnPressed += _ => ui.ButtonPressed(UiButton.ToggleInjection); - IncreaseFuelButton.OnPressed += _ => ui.ButtonPressed(UiButton.IncreaseFuel); - DecreaseFuelButton.OnPressed += _ => ui.ButtonPressed(UiButton.DecreaseFuel); + EjectButton.OnPressed += _ => OnAmeButton?.Invoke(UiButton.Eject); + ToggleInjection.OnPressed += _ => OnAmeButton?.Invoke(UiButton.ToggleInjection); + IncreaseFuelButton.OnPressed += _ => OnAmeButton?.Invoke(UiButton.IncreaseFuel); + DecreaseFuelButton.OnPressed += _ => OnAmeButton?.Invoke(UiButton.DecreaseFuel); } /// @@ -29,7 +32,7 @@ namespace Content.Client.Ame.UI var castState = (AmeControllerBoundUserInterfaceState) state; // Disable all buttons if not powered - if (Contents.Children != null) + if (Contents.Children.Any()) { ButtonHelpers.SetButtonDisabledRecursive(Contents, !castState.HasPower); EjectButton.Disabled = false; @@ -65,8 +68,8 @@ namespace Content.Client.Ame.UI CoreCount.Text = $"{castState.CoreCount}"; InjectionAmount.Text = $"{castState.InjectionAmount}"; // format power statistics to pretty numbers - CurrentPowerSupply.Text = $"{castState.CurrentPowerSupply.ToString("N1")}"; - TargetedPowerSupply.Text = $"{castState.TargetedPowerSupply.ToString("N1")}"; + CurrentPowerSupply.Text = $"{castState.CurrentPowerSupply:N1}"; + TargetedPowerSupply.Text = $"{castState.TargetedPowerSupply:N1}"; } } } diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs index 5764d0a097..5d1985485c 100644 --- a/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs +++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Anomaly; using Content.Shared.Gravity; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Anomaly.Ui; @@ -18,10 +19,8 @@ public sealed class AnomalyGeneratorBoundUserInterface : BoundUserInterface { base.Open(); - _window = new(Owner); - - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); + _window.SetEntity(Owner); _window.OnGenerateButtonPressed += () => { @@ -37,18 +36,5 @@ public sealed class AnomalyGeneratorBoundUserInterface : BoundUserInterface return; _window?.UpdateState(msg); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - - _window?.Dispose(); - } - - public void SetPowerSwitch(bool on) - { - SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(on)); - } } diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs index 08438e2a1b..82d41192dd 100644 --- a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs +++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs @@ -18,17 +18,21 @@ public sealed partial class AnomalyGeneratorWindow : FancyWindow public Action? OnGenerateButtonPressed; - public AnomalyGeneratorWindow(EntityUid gen) + public AnomalyGeneratorWindow() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - EntityView.SetEntity(gen); EntityView.SpriteOffset = false; GenerateButton.OnPressed += _ => OnGenerateButtonPressed?.Invoke(); } + public void SetEntity(EntityUid uid) + { + EntityView.SetEntity(uid); + } + public void UpdateState(AnomalyGeneratorUserInterfaceState state) { _cooldownEnd = state.CooldownEndTime; diff --git a/Content.Client/Arcade/BlockGameMenu.cs b/Content.Client/Arcade/BlockGameMenu.cs index eeda2a3102..4a579fc4bf 100644 --- a/Content.Client/Arcade/BlockGameMenu.cs +++ b/Content.Client/Arcade/BlockGameMenu.cs @@ -28,8 +28,6 @@ namespace Content.Client.Arcade private static readonly Vector2 BlockSize = new(15, 15); - private readonly BlockGameBoundUserInterface _owner; - private readonly PanelContainer _mainPanel; private readonly BoxContainer _gameRootContainer; @@ -58,10 +56,11 @@ namespace Content.Client.Arcade private bool _isPlayer = false; private bool _gameOver = false; - public BlockGameMenu(BlockGameBoundUserInterface owner) + public event Action? OnAction; + + public BlockGameMenu() { Title = Loc.GetString("blockgame-menu-title"); - _owner = owner; MinSize = SetSize = new Vector2(410, 490); @@ -176,7 +175,7 @@ namespace Content.Client.Arcade }; _newGameButton.OnPressed += (e) => { - _owner.SendAction(BlockGamePlayerAction.NewGame); + OnAction?.Invoke(BlockGamePlayerAction.NewGame); }; pauseMenuContainer.AddChild(_newGameButton); pauseMenuContainer.AddChild(new Control { MinSize = new Vector2(1, 10) }); @@ -186,7 +185,10 @@ namespace Content.Client.Arcade Text = Loc.GetString("blockgame-menu-button-scoreboard"), TextAlign = Label.AlignMode.Center }; - _scoreBoardButton.OnPressed += (e) => _owner.SendAction(BlockGamePlayerAction.ShowHighscores); + _scoreBoardButton.OnPressed += (e) => + { + OnAction?.Invoke(BlockGamePlayerAction.ShowHighscores); + }; pauseMenuContainer.AddChild(_scoreBoardButton); _unpauseButtonMargin = new Control { MinSize = new Vector2(1, 10), Visible = false }; pauseMenuContainer.AddChild(_unpauseButtonMargin); @@ -199,7 +201,7 @@ namespace Content.Client.Arcade }; _unpauseButton.OnPressed += (e) => { - _owner.SendAction(BlockGamePlayerAction.Unpause); + OnAction?.Invoke(BlockGamePlayerAction.Unpause); }; pauseMenuContainer.AddChild(_unpauseButton); @@ -257,7 +259,7 @@ namespace Content.Client.Arcade }; _finalNewGameButton.OnPressed += (e) => { - _owner.SendAction(BlockGamePlayerAction.NewGame); + OnAction?.Invoke(BlockGamePlayerAction.NewGame); }; gameOverMenuContainer.AddChild(_finalNewGameButton); @@ -327,7 +329,10 @@ namespace Content.Client.Arcade Text = Loc.GetString("blockgame-menu-button-back"), TextAlign = Label.AlignMode.Center }; - _highscoreBackButton.OnPressed += (e) => _owner.SendAction(BlockGamePlayerAction.Pause); + _highscoreBackButton.OnPressed += (e) => + { + OnAction?.Invoke(BlockGamePlayerAction.Pause); + }; menuContainer.AddChild(_highscoreBackButton); menuInnerPanel.AddChild(menuContainer); @@ -473,7 +478,7 @@ namespace Content.Client.Arcade private void TryPause() { - _owner.SendAction(BlockGamePlayerAction.Pause); + OnAction?.Invoke(BlockGamePlayerAction.Pause); } public void SetStarted() @@ -576,19 +581,19 @@ namespace Content.Client.Arcade return; else if (args.Function == ContentKeyFunctions.ArcadeLeft) - _owner.SendAction(BlockGamePlayerAction.StartLeft); + OnAction?.Invoke(BlockGamePlayerAction.StartLeft); else if (args.Function == ContentKeyFunctions.ArcadeRight) - _owner.SendAction(BlockGamePlayerAction.StartRight); + OnAction?.Invoke(BlockGamePlayerAction.StartRight); else if (args.Function == ContentKeyFunctions.ArcadeUp) - _owner.SendAction(BlockGamePlayerAction.Rotate); + OnAction?.Invoke(BlockGamePlayerAction.Rotate); else if (args.Function == ContentKeyFunctions.Arcade3) - _owner.SendAction(BlockGamePlayerAction.CounterRotate); + OnAction?.Invoke(BlockGamePlayerAction.CounterRotate); else if (args.Function == ContentKeyFunctions.ArcadeDown) - _owner.SendAction(BlockGamePlayerAction.SoftdropStart); + OnAction?.Invoke(BlockGamePlayerAction.SoftdropStart); else if (args.Function == ContentKeyFunctions.Arcade2) - _owner.SendAction(BlockGamePlayerAction.Hold); + OnAction?.Invoke(BlockGamePlayerAction.Hold); else if (args.Function == ContentKeyFunctions.Arcade1) - _owner.SendAction(BlockGamePlayerAction.Harddrop); + OnAction?.Invoke(BlockGamePlayerAction.Harddrop); } protected override void KeyBindUp(GUIBoundKeyEventArgs args) @@ -599,11 +604,11 @@ namespace Content.Client.Arcade return; else if (args.Function == ContentKeyFunctions.ArcadeLeft) - _owner.SendAction(BlockGamePlayerAction.EndLeft); + OnAction?.Invoke(BlockGamePlayerAction.EndLeft); else if (args.Function == ContentKeyFunctions.ArcadeRight) - _owner.SendAction(BlockGamePlayerAction.EndRight); + OnAction?.Invoke(BlockGamePlayerAction.EndRight); else if (args.Function == ContentKeyFunctions.ArcadeDown) - _owner.SendAction(BlockGamePlayerAction.SoftdropEnd); + OnAction?.Invoke(BlockGamePlayerAction.SoftdropEnd); } public void UpdateNextBlock(BlockGameBlock[] blocks) diff --git a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs index e5542a5848..1ee4c26818 100644 --- a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs +++ b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs @@ -8,8 +8,6 @@ namespace Content.Client.Arcade { public sealed class SpaceVillainArcadeMenu : DefaultWindow { - public SpaceVillainArcadeBoundUserInterface Owner { get; set; } - private readonly Label _enemyNameLabel; private readonly Label _playerInfoLabel; private readonly Label _enemyInfoLabel; @@ -17,11 +15,13 @@ namespace Content.Client.Arcade private readonly Label _enemyActionLabel; private readonly Button[] _gameButtons = new Button[3]; //used to disable/enable all game buttons - public SpaceVillainArcadeMenu(SpaceVillainArcadeBoundUserInterface owner) + + public event Action? OnPlayerAction; + + public SpaceVillainArcadeMenu() { MinSize = SetSize = new Vector2(300, 225); Title = Loc.GetString("spacevillain-menu-title"); - Owner = owner; var grid = new GridContainer { Columns = 1 }; @@ -47,32 +47,43 @@ namespace Content.Client.Arcade grid.AddChild(_enemyActionLabel); var buttonGrid = new GridContainer { Columns = 3 }; - _gameButtons[0] = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.Attack) + _gameButtons[0] = new Button() { Text = Loc.GetString("spacevillain-menu-button-attack") }; + + _gameButtons[0].OnPressed += + _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.Attack); buttonGrid.AddChild(_gameButtons[0]); - _gameButtons[1] = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.Heal) + _gameButtons[1] = new Button() { Text = Loc.GetString("spacevillain-menu-button-heal") }; + + _gameButtons[1].OnPressed += + _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.Heal); buttonGrid.AddChild(_gameButtons[1]); - _gameButtons[2] = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.Recharge) + _gameButtons[2] = new Button() { Text = Loc.GetString("spacevillain-menu-button-recharge") }; + + _gameButtons[2].OnPressed += + _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.Recharge); buttonGrid.AddChild(_gameButtons[2]); centerContainer = new CenterContainer(); centerContainer.AddChild(buttonGrid); grid.AddChild(centerContainer); - var newGame = new ActionButton(Owner, SharedSpaceVillainArcadeComponent.PlayerAction.NewGame) + var newGame = new Button() { Text = Loc.GetString("spacevillain-menu-button-new-game") }; + + newGame.OnPressed += _ => OnPlayerAction?.Invoke(SharedSpaceVillainArcadeComponent.PlayerAction.NewGame); grid.AddChild(newGame); Contents.AddChild(grid); @@ -99,23 +110,5 @@ namespace Content.Client.Arcade _playerActionLabel.Text = message.PlayerActionMessage; _enemyActionLabel.Text = message.EnemyActionMessage; } - - private sealed class ActionButton : Button - { - private readonly SpaceVillainArcadeBoundUserInterface _owner; - private readonly SharedSpaceVillainArcadeComponent.PlayerAction _playerAction; - - public ActionButton(SpaceVillainArcadeBoundUserInterface owner, SharedSpaceVillainArcadeComponent.PlayerAction playerAction) - { - _owner = owner; - _playerAction = playerAction; - OnPressed += Clicked; - } - - private void Clicked(ButtonEventArgs e) - { - _owner.SendAction(_playerAction); - } - } } } diff --git a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs index 1a3422dec0..8fa8035afd 100644 --- a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs +++ b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Arcade; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Arcade.UI; @@ -15,9 +16,7 @@ public sealed class BlockGameBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new BlockGameMenu(this); - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); } protected override void ReceiveMessage(BoundUserInterfaceMessage message) diff --git a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs index 40bbe8b2d8..c0704530de 100644 --- a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs +++ b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs @@ -1,4 +1,5 @@ using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.GameObjects; using Robust.Shared.ViewVariables; using static Content.Shared.Arcade.SharedSpaceVillainArcadeComponent; @@ -9,8 +10,6 @@ public sealed class SpaceVillainArcadeBoundUserInterface : BoundUserInterface { [ViewVariables] private SpaceVillainArcadeMenu? _menu; - //public SharedSpaceVillainArcadeComponent SpaceVillainArcade; - public SpaceVillainArcadeBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { SendAction(PlayerAction.RequestData); @@ -25,10 +24,7 @@ public sealed class SpaceVillainArcadeBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new SpaceVillainArcadeMenu(this); - - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); } protected override void ReceiveMessage(BoundUserInterfaceMessage message) @@ -36,12 +32,4 @@ public sealed class SpaceVillainArcadeBoundUserInterface : BoundUserInterface if (message is SpaceVillainArcadeDataUpdateMessage msg) _menu?.UpdateInfo(msg); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - _menu?.Dispose(); - } } diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs index 8f3b507c80..2ae1518835 100644 --- a/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs +++ b/Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Atmos; using Content.Shared.Atmos.Monitor; using Content.Shared.Atmos.Monitor.Components; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; @@ -20,16 +21,9 @@ public sealed class AirAlarmBoundUserInterface : BoundUserInterface { base.Open(); - _window = new AirAlarmWindow(this); + _window = this.CreateWindow(); + _window.SetEntity(Owner); - if (State != null) - { - UpdateState(State); - } - - _window.OpenCentered(); - - _window.OnClose += Close; _window.AtmosDeviceDataChanged += OnDeviceDataChanged; _window.AtmosDeviceDataCopied += OnDeviceDataCopied; _window.AtmosAlarmThresholdChanged += OnThresholdChanged; diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs index 43be67c9d6..eeec11c766 100644 --- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs +++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs @@ -47,7 +47,7 @@ public sealed partial class AirAlarmWindow : FancyWindow private CheckBox _autoMode => AutoModeCheckBox; - public AirAlarmWindow(BoundUserInterface owner) + public AirAlarmWindow() { RobustXamlLoader.Load(this); @@ -95,8 +95,11 @@ public sealed partial class AirAlarmWindow : FancyWindow _sensors.Clear(); ResyncAllRequested!.Invoke(); }; + } - EntityView.SetEntity(owner.Owner); + public void SetEntity(EntityUid uid) + { + EntityView.SetEntity(uid); } public void UpdateState(AirAlarmUIState state) diff --git a/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs b/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs index a5e316a8de..7bf9b396d5 100644 --- a/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Atmos.Piping.Binary.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -21,14 +22,8 @@ namespace Content.Client.Atmos.UI { base.Open(); - _window = new GasCanisterWindow(); + _window = this.CreateWindow(); - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; _window.ReleaseValveCloseButtonPressed += OnReleaseValveClosePressed; _window.ReleaseValveOpenButtonPressed += OnReleaseValveOpenPressed; _window.ReleasePressureSet += OnReleasePressureSet; diff --git a/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs b/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs index 1904e2b340..2b8020924c 100644 --- a/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Atmos; using Content.Shared.Atmos.Piping.Trinary.Components; using Content.Shared.Localizations; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -28,14 +29,8 @@ namespace Content.Client.Atmos.UI var atmosSystem = EntMan.System(); - _window = new GasFilterWindow(atmosSystem.Gases); - - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); + _window.PopulateGasList(atmosSystem.Gases); _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed; _window.FilterTransferRateChanged += OnFilterTransferRatePressed; diff --git a/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs b/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs index 28766c688a..62748b5259 100644 --- a/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs +++ b/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs @@ -26,10 +26,9 @@ namespace Content.Client.Atmos.UI public event Action? FilterTransferRateChanged; public event Action? SelectGasPressed; - public GasFilterWindow(IEnumerable gases) + public GasFilterWindow() { RobustXamlLoader.Load(this); - PopulateGasList(gases); ToggleStatusButton.OnPressed += _ => SetFilterStatus(!FilterStatus); ToggleStatusButton.OnPressed += _ => ToggleStatusButtonPressed?.Invoke(); @@ -73,7 +72,7 @@ namespace Content.Client.Atmos.UI SelectGasButton.Disabled = true; } - private void PopulateGasList(IEnumerable gases) + public void PopulateGasList(IEnumerable gases) { GasList.Add(new ItemList.Item(GasList) { @@ -81,7 +80,7 @@ namespace Content.Client.Atmos.UI Text = Loc.GetString("comp-gas-filter-ui-filter-gas-none") }); - foreach (GasPrototype gas in gases) + foreach (var gas in gases) { var gasName = Loc.GetString(gas.Name); GasList.Add(GetGasItem(gas.ID, gasName, GasList)); diff --git a/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs b/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs index 709c06517c..392fbf1cd9 100644 --- a/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs +++ b/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs @@ -2,7 +2,7 @@ using Content.Shared.Atmos; using Content.Shared.Atmos.Piping.Trinary.Components; using Content.Shared.Localizations; using JetBrains.Annotations; -using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -26,14 +26,7 @@ namespace Content.Client.Atmos.UI { base.Open(); - _window = new GasMixerWindow(); - - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed; _window.MixerOutputPressureChanged += OnMixerOutputPressurePressed; @@ -83,12 +76,5 @@ namespace Content.Client.Atmos.UI _window.SetOutputPressure(cast.OutputPressure); _window.SetNodePercentages(cast.NodeOne); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); - } } } diff --git a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs index 6eba2e0d21..220fdbe875 100644 --- a/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Atmos.Piping.Binary.Components; using Content.Shared.Localizations; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -26,14 +27,7 @@ namespace Content.Client.Atmos.UI { base.Open(); - _window = new GasPressurePumpWindow(); - - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed; _window.PumpOutputPressureChanged += OnPumpOutputPressurePressed; @@ -67,12 +61,5 @@ namespace Content.Client.Atmos.UI _window.SetPumpStatus(cast.Enabled); _window.SetOutputPressure(cast.OutputPressure); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); - } } } diff --git a/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs b/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs index 1664c8b9d7..d62be8f4bb 100644 --- a/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Atmos.Piping.Unary.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -31,14 +32,7 @@ namespace Content.Client.Atmos.UI { base.Open(); - _window = new GasThermomachineWindow(); - - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.ToggleStatusButton.OnPressed += _ => OnToggleStatusButtonPressed(); _window.TemperatureSpinbox.OnValueChanged += _ => OnTemperatureChanged(_window.TemperatureSpinbox.Value); @@ -91,12 +85,5 @@ namespace Content.Client.Atmos.UI true => Loc.GetString("comp-gas-thermomachine-ui-title-heater") }; } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); - } } } diff --git a/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs b/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs index 1b39306181..642f34c2f9 100644 --- a/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Atmos.Piping.Binary.Components; using Content.Shared.Localizations; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Atmos.UI { @@ -26,14 +27,7 @@ namespace Content.Client.Atmos.UI { base.Open(); - _window = new GasVolumePumpWindow(); - - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed; _window.PumpTransferRateChanged += OnPumpTransferRatePressed; @@ -64,16 +58,9 @@ namespace Content.Client.Atmos.UI if (_window == null || state is not GasVolumePumpBoundUserInterfaceState cast) return; - _window.Title = (cast.PumpLabel); + _window.Title = cast.PumpLabel; _window.SetPumpStatus(cast.Enabled); _window.SetTransferRate(cast.TransferRate); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); - } } } diff --git a/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs b/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs index 4d8d1191e9..e70426575d 100644 --- a/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs +++ b/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Atmos.Piping.Portable.Components; using JetBrains.Annotations; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; namespace Content.Client.Atmos.UI; @@ -21,14 +22,7 @@ public sealed class SpaceHeaterBoundUserInterface : BoundUserInterface { base.Open(); - _window = new SpaceHeaterWindow(); - - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.ToggleStatusButton.OnPressed += _ => OnToggleStatusButtonPressed(); _window.IncreaseTempRange.OnPressed += _ => OnTemperatureRangeChanged(_window.TemperatureChangeDelta); diff --git a/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs b/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs index 60fe339069..865dfc478d 100644 --- a/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs +++ b/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs @@ -1,8 +1,7 @@ using Content.Shared.Audio.Jukebox; using Robust.Client.Audio; -using Robust.Client.Player; +using Robust.Client.UserInterface; using Robust.Shared.Audio.Components; -using Robust.Shared.Player; using Robust.Shared.Prototypes; namespace Content.Client.Audio.Jukebox; @@ -23,9 +22,7 @@ public sealed class JukeboxBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new JukeboxMenu(); - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); _menu.OnPlayPressed += args => { @@ -100,19 +97,5 @@ public sealed class JukeboxBoundUserInterface : BoundUserInterface SendMessage(new JukeboxSetTimeMessage(sentTime)); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - if (_menu == null) - return; - - _menu.OnClose -= Close; - _menu.Dispose(); - _menu = null; - } } diff --git a/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs b/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs index ffab162548..09f3cec8fb 100644 --- a/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs +++ b/Content.Client/Bed/Cryostorage/CryostorageBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Bed.Cryostorage; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Bed.Cryostorage; @@ -17,9 +18,7 @@ public sealed class CryostorageBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new(); - - _menu.OnClose += Close; + _menu = this.CreateWindow(); _menu.SlotRemoveButtonPressed += (ent, slot) => { @@ -30,8 +29,6 @@ public sealed class CryostorageBoundUserInterface : BoundUserInterface { SendMessage(new CryostorageRemoveItemBuiMessage(ent, hand, CryostorageRemoveItemBuiMessage.RemovalType.Hand)); }; - - _menu.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -45,12 +42,4 @@ public sealed class CryostorageBoundUserInterface : BoundUserInterface break; } } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _menu?.Dispose(); - } } diff --git a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs index d3365702bc..44c40143d8 100644 --- a/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs +++ b/Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Client.Cargo.UI; using Content.Shared.Cargo.Components; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Cargo.BUI; @@ -18,9 +19,7 @@ public sealed class CargoBountyConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new(); - - _menu.OnClose += Close; + _menu = this.CreateWindow(); _menu.OnLabelButtonPressed += id => { @@ -31,8 +30,6 @@ public sealed class CargoBountyConsoleBoundUserInterface : BoundUserInterface { SendMessage(new BountySkipMessage(id)); }; - - _menu.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState message) @@ -44,14 +41,4 @@ public sealed class CargoBountyConsoleBoundUserInterface : BoundUserInterface _menu?.UpdateEntries(state.Bounties, state.UntilNextSkip); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (!disposing) - return; - - _menu?.Dispose(); - } } diff --git a/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs index 20c23a48a0..2461dafb5f 100644 --- a/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs +++ b/Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Client.Cargo.UI; using Content.Shared.Cargo.BUI; using Content.Shared.Cargo.Events; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Cargo.BUI; @@ -18,21 +19,9 @@ public sealed class CargoPalletConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new CargoPalletMenu(); + _menu = this.CreateWindow(); _menu.AppraiseRequested += OnAppraisal; _menu.SellRequested += OnSell; - _menu.OnClose += Close; - - _menu.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (disposing) - { - _menu?.Dispose(); - } } private void OnAppraisal() diff --git a/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs index 422d03707a..02b721b902 100644 --- a/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs +++ b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Client.Cargo.UI; using Content.Shared.Cargo.BUI; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.Cargo.BUI; @@ -9,6 +10,8 @@ namespace Content.Client.Cargo.BUI; [UsedImplicitly] public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface { + [Dependency] private readonly IPrototypeManager _protoManager = default!; + [ViewVariables] private CargoShuttleMenu? _menu; @@ -19,24 +22,7 @@ public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - var collection = IoCManager.Instance; - - if (collection == null) - return; - - _menu = new CargoShuttleMenu(collection.Resolve(), collection.Resolve().GetEntitySystem()); - _menu.OnClose += Close; - - _menu.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (disposing) - { - _menu?.Dispose(); - } + _menu = this.CreateWindow(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -45,6 +31,6 @@ public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface if (state is not CargoShuttleConsoleBoundUserInterfaceState cargoState) return; _menu?.SetAccountName(cargoState.AccountName); _menu?.SetShuttleName(cargoState.ShuttleName); - _menu?.SetOrders(cargoState.Orders); + _menu?.SetOrders(EntMan.System(), _protoManager, cargoState.Orders); } } diff --git a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs index c591f917da..43b00089e1 100644 --- a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs +++ b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs @@ -12,14 +12,9 @@ namespace Content.Client.Cargo.UI [GenerateTypedNameReferences] public sealed partial class CargoShuttleMenu : FancyWindow { - private readonly IPrototypeManager _protoManager; - private readonly SpriteSystem _spriteSystem; - - public CargoShuttleMenu(IPrototypeManager protoManager, SpriteSystem spriteSystem) + public CargoShuttleMenu() { RobustXamlLoader.Load(this); - _protoManager = protoManager; - _spriteSystem = spriteSystem; Title = Loc.GetString("cargo-shuttle-console-menu-title"); } @@ -33,19 +28,19 @@ namespace Content.Client.Cargo.UI ShuttleNameLabel.Text = name; } - public void SetOrders(List orders) + public void SetOrders(SpriteSystem sprites, IPrototypeManager protoManager, List orders) { Orders.DisposeAllChildren(); foreach (var order in orders) { - var product = _protoManager.Index(order.ProductId); + var product = protoManager.Index(order.ProductId); var productName = product.Name; var row = new CargoOrderRow { Order = order, - Icon = { Texture = _spriteSystem.Frame0(product) }, + Icon = { Texture = sprites.Frame0(product) }, ProductName = { Text = Loc.GetString( diff --git a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs index 988fea7978..3ef7f0ae73 100644 --- a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs +++ b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Chemistry; using Content.Shared.Containers.ItemSlots; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Chemistry.UI { @@ -27,13 +28,8 @@ namespace Content.Client.Chemistry.UI base.Open(); // Setup window layout/elements - _window = new ChemMasterWindow - { - Title = EntMan.GetComponent(Owner).EntityName, - }; - - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); + _window.Title = EntMan.GetComponent(Owner).EntityName; // Setup static button actions. _window.InputEjectButton.OnPressed += _ => SendMessage( @@ -75,15 +71,5 @@ namespace Content.Client.Chemistry.UI _window?.UpdateState(castState); // Update window state } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _window?.Dispose(); - } - } } } diff --git a/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs b/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs index 99e5a3d395..2ad1b71888 100644 --- a/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs +++ b/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Chemistry; using Content.Shared.Containers.ItemSlots; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Chemistry.UI { @@ -15,9 +16,6 @@ namespace Content.Client.Chemistry.UI [ViewVariables] private ReagentDispenserWindow? _window; - [ViewVariables] - private ReagentDispenserBoundUserInterfaceState? _lastState; - public ReagentDispenserBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } @@ -32,14 +30,9 @@ namespace Content.Client.Chemistry.UI base.Open(); // Setup window layout/elements - _window = new() - { - Title = EntMan.GetComponent(Owner).EntityName, - HelpGuidebookIds = EntMan.GetComponent(Owner).Guides - }; - - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); + _window.Title = EntMan.GetComponent(Owner).EntityName; + _window.HelpGuidebookIds = EntMan.GetComponent(Owner).Guides; // Setup static button actions. _window.EjectButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(SharedReagentDispenser.OutputSlotName)); @@ -63,19 +56,7 @@ namespace Content.Client.Chemistry.UI base.UpdateState(state); var castState = (ReagentDispenserBoundUserInterfaceState) state; - _lastState = castState; - _window?.UpdateState(castState); //Update window state } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _window?.Dispose(); - } - } } } diff --git a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs index 35df131312..f1cb27a62a 100644 --- a/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs +++ b/Content.Client/Chemistry/UI/TransferAmountBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Chemistry; using Content.Shared.FixedPoint; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Chemistry.UI { @@ -18,7 +19,7 @@ namespace Content.Client.Chemistry.UI protected override void Open() { base.Open(); - _window = new TransferAmountWindow(); + _window = this.CreateWindow(); _window.ApplyButton.OnPressed += _ => { @@ -28,15 +29,6 @@ namespace Content.Client.Chemistry.UI _window.Close(); } }; - _window.OnClose += Close; - _window.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); } } } diff --git a/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs b/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs index 26f0994701..62a02f3718 100644 --- a/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs +++ b/Content.Client/CloningConsole/UI/CloningConsoleBoundUserInterface.cs @@ -1,6 +1,7 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; using Content.Shared.Cloning.CloningConsole; +using Robust.Client.UserInterface; namespace Content.Client.CloningConsole.UI { @@ -17,13 +18,11 @@ namespace Content.Client.CloningConsole.UI protected override void Open() { base.Open(); - _window = new CloningConsoleWindow - { - Title = Loc.GetString("cloning-console-window-title") - }; - _window.OnClose += Close; + + _window = this.CreateWindow(); + _window.Title = Loc.GetString("cloning-console-window-title"); + _window.CloneButton.OnPressed += _ => SendMessage(new UiButtonPressedMessage(UiButton.Clone)); - _window.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -32,19 +31,5 @@ namespace Content.Client.CloningConsole.UI _window?.Populate((CloningConsoleBoundUserInterfaceState) state); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - if (_window != null) - { - _window.OnClose -= Close; - _window.CloneButton.OnPressed -= _ => SendMessage(new UiButtonPressedMessage(UiButton.Clone)); - } - _window?.Dispose(); - } } } diff --git a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs index 5b0d5fcf21..83f6ba1566 100644 --- a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs +++ b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Clothing.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Clothing.UI; @@ -22,10 +23,8 @@ public sealed class ChameleonBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new ChameleonMenu(); - _menu.OnClose += Close; + _menu = this.CreateWindow(); _menu.OnIdSelected += OnIdSelected; - _menu.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -42,15 +41,4 @@ public sealed class ChameleonBoundUserInterface : BoundUserInterface { SendMessage(new ChameleonPrototypeSelectedMessage(selectedId)); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _menu?.Close(); - _menu = null; - } - } } diff --git a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs index 1c94d32bf8..0310e91eeb 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.CCVar; using Content.Shared.Chat; using Content.Shared.Communications; +using Robust.Client.UserInterface; using Robust.Shared.Configuration; using Robust.Shared.Timing; @@ -8,34 +9,11 @@ namespace Content.Client.Communications.UI { public sealed class CommunicationsConsoleBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [ViewVariables] private CommunicationsConsoleMenu? _menu; - [ViewVariables] - public bool CanAnnounce { get; private set; } - [ViewVariables] - public bool CanBroadcast { get; private set; } - - [ViewVariables] - public bool CanCall { get; private set; } - - [ViewVariables] - public bool CountdownStarted { get; private set; } - - [ViewVariables] - public bool AlertLevelSelectable { get; private set; } - - [ViewVariables] - public string CurrentLevel { get; private set; } = default!; - - [ViewVariables] - private TimeSpan? _expectedCountdownTime; - - public int Countdown => _expectedCountdownTime == null ? 0 : Math.Max((int) _expectedCountdownTime.Value.Subtract(_gameTiming.CurTime).TotalSeconds, 0); - public CommunicationsConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } @@ -44,23 +22,25 @@ namespace Content.Client.Communications.UI { base.Open(); - _menu = new CommunicationsConsoleMenu(this); - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); + _menu.OnAnnounce += AnnounceButtonPressed; + _menu.OnBroadcast += BroadcastButtonPressed; + _menu.OnAlertLevel += AlertLevelSelected; + _menu.OnEmergencyLevel += EmergencyShuttleButtonPressed; } public void AlertLevelSelected(string level) { - if (AlertLevelSelectable) + if (_menu!.AlertLevelSelectable) { - CurrentLevel = level; + _menu.CurrentLevel = level; SendMessage(new CommunicationsConsoleSelectAlertLevelMessage(level)); } } public void EmergencyShuttleButtonPressed() { - if (CountdownStarted) + if (_menu!.CountdownStarted) RecallShuttle(); else CallShuttle(); @@ -95,31 +75,23 @@ namespace Content.Client.Communications.UI if (state is not CommunicationsConsoleInterfaceState commsState) return; - CanAnnounce = commsState.CanAnnounce; - CanBroadcast = commsState.CanBroadcast; - CanCall = commsState.CanCall; - _expectedCountdownTime = commsState.ExpectedCountdownEnd; - CountdownStarted = commsState.CountdownStarted; - AlertLevelSelectable = commsState.AlertLevels != null && !float.IsNaN(commsState.CurrentAlertDelay) && commsState.CurrentAlertDelay <= 0; - CurrentLevel = commsState.CurrentAlert; - if (_menu != null) { + _menu.CanAnnounce = commsState.CanAnnounce; + _menu.CanBroadcast = commsState.CanBroadcast; + _menu.CanCall = commsState.CanCall; + _menu.CountdownStarted = commsState.CountdownStarted; + _menu.AlertLevelSelectable = commsState.AlertLevels != null && !float.IsNaN(commsState.CurrentAlertDelay) && commsState.CurrentAlertDelay <= 0; + _menu.CurrentLevel = commsState.CurrentAlert; + _menu.CountdownEnd = commsState.ExpectedCountdownEnd; + _menu.UpdateCountdown(); - _menu.UpdateAlertLevels(commsState.AlertLevels, CurrentLevel); - _menu.AlertLevelButton.Disabled = !AlertLevelSelectable; - _menu.EmergencyShuttleButton.Disabled = !CanCall; - _menu.AnnounceButton.Disabled = !CanAnnounce; - _menu.BroadcastButton.Disabled = !CanBroadcast; + _menu.UpdateAlertLevels(commsState.AlertLevels, _menu.CurrentLevel); + _menu.AlertLevelButton.Disabled = !_menu.AlertLevelSelectable; + _menu.EmergencyShuttleButton.Disabled = !_menu.CanCall; + _menu.AnnounceButton.Disabled = !_menu.CanAnnounce; + _menu.BroadcastButton.Disabled = !_menu.CanBroadcast; } } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - - _menu?.Dispose(); - } } } diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs index bbca06f519..63868e7a93 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs @@ -1,31 +1,40 @@ -using Content.Client.UserInterface.Controls; -using System.Threading; +using System.Globalization; +using Content.Client.UserInterface.Controls; using Content.Shared.CCVar; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.XAML; using Robust.Shared.Configuration; +using Robust.Shared.Timing; using Robust.Shared.Utility; -using Timer = Robust.Shared.Timing.Timer; namespace Content.Client.Communications.UI { [GenerateTypedNameReferences] public sealed partial class CommunicationsConsoleMenu : FancyWindow { - private CommunicationsConsoleBoundUserInterface Owner { get; set; } - private readonly CancellationTokenSource _timerCancelTokenSource = new(); - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly ILocalizationManager _loc = default!; - public CommunicationsConsoleMenu(CommunicationsConsoleBoundUserInterface owner) + public bool CanAnnounce; + public bool CanBroadcast; + public bool CanCall; + public bool AlertLevelSelectable; + public bool CountdownStarted; + public string CurrentLevel = string.Empty; + public TimeSpan? CountdownEnd; + + public event Action? OnEmergencyLevel; + public event Action? OnAlertLevel; + public event Action? OnAnnounce; + public event Action? OnBroadcast; + + public CommunicationsConsoleMenu() { IoCManager.InjectDependencies(this); RobustXamlLoader.Load(this); - Owner = owner; - - var loc = IoCManager.Resolve(); - MessageInput.Placeholder = new Rope.Leaf(loc.GetString("comms-console-menu-announcement-placeholder")); + MessageInput.Placeholder = new Rope.Leaf(_loc.GetString("comms-console-menu-announcement-placeholder")); var maxAnnounceLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength); MessageInput.OnTextChanged += (args) => @@ -37,33 +46,38 @@ namespace Content.Client.Communications.UI } else { - AnnounceButton.Disabled = !owner.CanAnnounce; + AnnounceButton.Disabled = !CanAnnounce; AnnounceButton.ToolTip = null; } }; - AnnounceButton.OnPressed += (_) => Owner.AnnounceButtonPressed(Rope.Collapse(MessageInput.TextRope)); - AnnounceButton.Disabled = !owner.CanAnnounce; + AnnounceButton.OnPressed += _ => OnAnnounce?.Invoke(Rope.Collapse(MessageInput.TextRope)); + AnnounceButton.Disabled = !CanAnnounce; - BroadcastButton.OnPressed += (_) => Owner.BroadcastButtonPressed(Rope.Collapse(MessageInput.TextRope)); - BroadcastButton.Disabled = !owner.CanBroadcast; + BroadcastButton.OnPressed += _ => OnBroadcast?.Invoke(Rope.Collapse(MessageInput.TextRope)); + BroadcastButton.Disabled = !CanBroadcast; AlertLevelButton.OnItemSelected += args => { var metadata = AlertLevelButton.GetItemMetadata(args.Id); if (metadata != null && metadata is string cast) { - Owner.AlertLevelSelected(cast); + OnAlertLevel?.Invoke(cast); } }; - AlertLevelButton.Disabled = !owner.AlertLevelSelectable; - EmergencyShuttleButton.OnPressed += (_) => Owner.EmergencyShuttleButtonPressed(); - EmergencyShuttleButton.Disabled = !owner.CanCall; + AlertLevelButton.Disabled = !AlertLevelSelectable; + + EmergencyShuttleButton.OnPressed += _ => OnEmergencyLevel?.Invoke(); + EmergencyShuttleButton.Disabled = !CanCall; + } + + protected override void FrameUpdate(FrameEventArgs args) + { + base.FrameUpdate(args); UpdateCountdown(); - Timer.SpawnRepeating(1000, UpdateCountdown, _timerCancelTokenSource.Token); } // The current alert could make levels unselectable, so we need to ensure that the UI reacts properly. @@ -105,32 +119,19 @@ namespace Content.Client.Communications.UI public void UpdateCountdown() { - if (!Owner.CountdownStarted) + if (!CountdownStarted) { - CountdownLabel.SetMessage(""); + CountdownLabel.SetMessage(string.Empty); EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-call-shuttle"); return; } + var diff = MathHelper.Max((CountdownEnd - _timing.CurTime) ?? TimeSpan.Zero, TimeSpan.Zero); + EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-recall-shuttle"); var infoText = Loc.GetString($"comms-console-menu-time-remaining", - ("time", Owner.Countdown.ToString())); + ("time", diff.TotalSeconds.ToString(CultureInfo.CurrentCulture))); CountdownLabel.SetMessage(infoText); } - - public override void Close() - { - base.Close(); - - _timerCancelTokenSource.Cancel(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - _timerCancelTokenSource.Cancel(); - } } } diff --git a/Content.Client/Computer/ComputerBoundUserInterface.cs b/Content.Client/Computer/ComputerBoundUserInterface.cs index bdbfe03fa1..11c26b252e 100644 --- a/Content.Client/Computer/ComputerBoundUserInterface.cs +++ b/Content.Client/Computer/ComputerBoundUserInterface.cs @@ -1,4 +1,5 @@ using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.CustomControls; namespace Content.Client.Computer @@ -19,10 +20,8 @@ namespace Content.Client.Computer { base.Open(); - _window = (TWindow) _dynamicTypeFactory.CreateInstance(typeof(TWindow)); + _window = this.CreateWindow(); _window.SetupComputerWindow(this); - _window.OnClose += Close; - _window.OpenCentered(); } // Alas, this constructor has to be copied to the subclass. :( @@ -42,16 +41,6 @@ namespace Content.Client.Computer _window.UpdateState((TState) state); } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _window?.Dispose(); - } - } - protected override void ReceiveMessage(BoundUserInterfaceMessage message) { _window?.ReceiveMessage(message); diff --git a/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs index 4fea44f225..e4966f1ec4 100644 --- a/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs +++ b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs @@ -1,5 +1,6 @@ using System.Text.RegularExpressions; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using static Content.Shared.Configurable.ConfigurationComponent; namespace Content.Client.Configurable.UI @@ -9,9 +10,6 @@ namespace Content.Client.Configurable.UI [ViewVariables] private ConfigurationMenu? _menu; - [ViewVariables] - public Regex? Validation { get; internal set; } - public ConfigurationBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } @@ -19,10 +17,8 @@ namespace Content.Client.Configurable.UI protected override void Open() { base.Open(); - _menu = new ConfigurationMenu(this); - - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); + _menu.OnConfiguration += SendConfiguration; } protected override void UpdateState(BoundUserInterfaceState state) @@ -30,9 +26,7 @@ namespace Content.Client.Configurable.UI base.UpdateState(state); if (state is not ConfigurationBoundUserInterfaceState configurationState) - { return; - } _menu?.Populate(configurationState); } @@ -41,9 +35,12 @@ namespace Content.Client.Configurable.UI { base.ReceiveMessage(message); + if (_menu == null) + return; + if (message is ValidationUpdateMessage msg) { - Validation = new Regex(msg.ValidationString, RegexOptions.Compiled); + _menu.Validation = new Regex(msg.ValidationString, RegexOptions.Compiled); } } @@ -51,16 +48,5 @@ namespace Content.Client.Configurable.UI { SendMessage(new ConfigurationUpdatedMessage(config)); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing && _menu != null) - { - _menu.OnClose -= Close; - _menu.Close(); - } - } } } diff --git a/Content.Client/Configurable/UI/ConfigurationMenu.cs b/Content.Client/Configurable/UI/ConfigurationMenu.cs index cc24af2869..29217eef7b 100644 --- a/Content.Client/Configurable/UI/ConfigurationMenu.cs +++ b/Content.Client/Configurable/UI/ConfigurationMenu.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Numerics; +using System.Text.RegularExpressions; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; @@ -13,23 +14,25 @@ namespace Content.Client.Configurable.UI { public sealed class ConfigurationMenu : DefaultWindow { - public ConfigurationBoundUserInterface Owner { get; } - private readonly BoxContainer _column; private readonly BoxContainer _row; private readonly List<(string name, LineEdit input)> _inputs; - public ConfigurationMenu(ConfigurationBoundUserInterface owner) + [ViewVariables] + public Regex? Validation { get; internal set; } + + public event Action>? OnConfiguration; + + public ConfigurationMenu() { MinSize = SetSize = new Vector2(300, 250); - Owner = owner; _inputs = new List<(string name, LineEdit input)>(); Title = Loc.GetString("configuration-menu-device-title"); - BoxContainer baseContainer = new BoxContainer + var baseContainer = new BoxContainer { Orientation = LayoutOrientation.Vertical, VerticalExpand = true, @@ -116,14 +119,13 @@ namespace Content.Client.Configurable.UI private void OnConfirm(ButtonEventArgs args) { var config = GenerateDictionary(_inputs, "Text"); - - Owner.SendConfiguration(config); + OnConfiguration?.Invoke(config); Close(); } private bool Validate(string value) { - return Owner.Validation == null || Owner.Validation.IsMatch(value); + return Validation?.IsMatch(value) != false; } private Dictionary GenerateDictionary(IEnumerable<(string name, LineEdit input)> inputs, string propertyName) diff --git a/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs b/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs index 86f1b8b83c..887492955e 100644 --- a/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs +++ b/Content.Client/Construction/UI/FlatpackCreatorBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Construction.Components; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Construction.UI { @@ -17,8 +18,8 @@ namespace Content.Client.Construction.UI { base.Open(); - _menu = new FlatpackCreatorMenu(Owner); - _menu.OnClose += Close; + _menu = this.CreateWindow(); + _menu.SetEntity(Owner); _menu.PackButtonPressed += () => { @@ -27,14 +28,5 @@ namespace Content.Client.Construction.UI _menu.OpenCentered(); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _menu?.Dispose(); - } } } diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs index 9f3d5695bb..269694ebf9 100644 --- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs +++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs @@ -24,7 +24,7 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow private readonly FlatpackSystem _flatpack; private readonly MaterialStorageSystem _materialStorage; - private readonly EntityUid _owner; + private EntityUid _owner; [ValidatePrototypeId] public const string NoBoardEffectId = "FlatpackerNoBoardEffect"; @@ -33,7 +33,7 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow public event Action? PackButtonPressed; - public FlatpackCreatorMenu(EntityUid uid) + public FlatpackCreatorMenu() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); @@ -42,14 +42,17 @@ public sealed partial class FlatpackCreatorMenu : FancyWindow _flatpack = _entityManager.System(); _materialStorage = _entityManager.System(); - _owner = uid; - PackButton.OnPressed += _ => PackButtonPressed?.Invoke(); - MaterialStorageControl.SetOwner(uid); InsertLabel.SetMarkup(Loc.GetString("flatpacker-ui-insert-board")); } + public void SetEntity(EntityUid uid) + { + _owner = uid; + MaterialStorageControl.SetOwner(uid); + } + protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); diff --git a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs index e2c4d51ecd..e5be0b1811 100644 --- a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs +++ b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs @@ -2,12 +2,15 @@ using Content.Shared.Crayon; using Content.Shared.Decals; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.Crayon.UI { public sealed class CrayonBoundUserInterface : BoundUserInterface { + [Dependency] private readonly IPrototypeManager _protoManager = default!; + [ViewVariables] private CrayonWindow? _menu; @@ -18,15 +21,29 @@ namespace Content.Client.Crayon.UI protected override void Open() { base.Open(); - _menu = new CrayonWindow(this); - - _menu.OnClose += Close; - var prototypeManager = IoCManager.Resolve(); - var crayonDecals = prototypeManager.EnumeratePrototypes().Where(x => x.Tags.Contains("crayon")); - _menu.Populate(crayonDecals); + _menu = this.CreateWindow(); + _menu.OnColorSelected += SelectColor; + _menu.OnSelected += Select; + PopulateCrayons(); _menu.OpenCenteredLeft(); } + private void PopulateCrayons() + { + var crayonDecals = _protoManager.EnumeratePrototypes().Where(x => x.Tags.Contains("crayon")); + _menu?.Populate(crayonDecals); + } + + public override void OnProtoReload(PrototypesReloadedEventArgs args) + { + base.OnProtoReload(args); + + if (!args.WasModified()) + return; + + PopulateCrayons(); + } + protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); @@ -43,16 +60,5 @@ namespace Content.Client.Crayon.UI { SendMessage(new CrayonColorMessage(color)); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _menu?.Close(); - _menu = null; - } - } } } diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs index 2a5801ccf2..b97786cd41 100644 --- a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs +++ b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs @@ -18,18 +18,17 @@ namespace Content.Client.Crayon.UI [GenerateTypedNameReferences] public sealed partial class CrayonWindow : DefaultWindow { - public CrayonBoundUserInterface Owner { get; } - private Dictionary? _decals; private string? _selected; private Color _color; - public CrayonWindow(CrayonBoundUserInterface owner) + public event Action? OnColorSelected; + public event Action? OnSelected; + + public CrayonWindow() { RobustXamlLoader.Load(this); - Owner = owner; - Search.OnTextChanged += _ => RefreshList(); ColorSelector.OnColorChanged += SelectColor; } @@ -38,16 +37,16 @@ namespace Content.Client.Crayon.UI { _color = color; - Owner.SelectColor(color); - + OnColorSelected?.Invoke(color); RefreshList(); } private void RefreshList() { // Clear - Grid.RemoveAllChildren(); - if (_decals == null) return; + Grid.DisposeAllChildren(); + if (_decals == null) + return; var filter = Search.Text; foreach (var (decal, tex) in _decals) @@ -89,7 +88,6 @@ namespace Content.Client.Crayon.UI { if (obj.Button.Name == null) return; - Owner.Select(obj.Button.Name); _selected = obj.Button.Name; RefreshList(); } diff --git a/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs index e8e77217ea..296e71d3a9 100644 --- a/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs +++ b/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs @@ -1,5 +1,6 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using static Content.Shared.Disposal.Components.SharedDisposalRouterComponent; namespace Content.Client.Disposal.UI @@ -21,20 +22,16 @@ namespace Content.Client.Disposal.UI { base.Open(); - _window = new DisposalRouterWindow(); - - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); _window.Confirm.OnPressed += _ => ButtonPressed(UiAction.Ok, _window.TagInput.Text); _window.TagInput.OnTextEntered += args => ButtonPressed(UiAction.Ok, args.Text); - } private void ButtonPressed(UiAction action, string tag) { SendMessage(new UiActionMessage(action, tag)); - _window?.Close(); + Close(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -48,18 +45,5 @@ namespace Content.Client.Disposal.UI _window?.UpdateState(cast); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _window?.Dispose(); - } - } - - } - } diff --git a/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs index 3aeed8dc80..7fc0eb8540 100644 --- a/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs +++ b/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs @@ -1,5 +1,6 @@ using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using static Content.Shared.Disposal.Components.SharedDisposalTaggerComponent; namespace Content.Client.Disposal.UI @@ -21,20 +22,17 @@ namespace Content.Client.Disposal.UI { base.Open(); - _window = new DisposalTaggerWindow(); - - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); _window.Confirm.OnPressed += _ => ButtonPressed(UiAction.Ok, _window.TagInput.Text); _window.TagInput.OnTextEntered += args => ButtonPressed(UiAction.Ok, args.Text); - } private void ButtonPressed(UiAction action, string tag) { + // TODO: This looks copy-pasted with the other mailing stuff... SendMessage(new UiActionMessage(action, tag)); - _window?.Close(); + Close(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -48,18 +46,5 @@ namespace Content.Client.Disposal.UI _window?.UpdateState(cast); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _window?.Dispose(); - } - } - - } - } diff --git a/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs index cd7ea717ce..9b7e23c03a 100644 --- a/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs +++ b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Access; using Content.Shared.Doors.Electronics; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.Doors.Electronics; @@ -18,6 +19,23 @@ public sealed class DoorElectronicsBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); + _window = this.CreateWindow(); + _window.OnAccessChanged += UpdateConfiguration; + Reset(); + } + + public override void OnProtoReload(PrototypesReloadedEventArgs args) + { + base.OnProtoReload(args); + + if (!args.WasModified()) + return; + + Reset(); + } + + private void Reset() + { List> accessLevels = new(); foreach (var accessLevel in _prototypeManager.EnumeratePrototypes()) @@ -29,10 +47,7 @@ public sealed class DoorElectronicsBoundUserInterface : BoundUserInterface } accessLevels.Sort(); - - _window = new DoorElectronicsConfigurationMenu(this, accessLevels, _prototypeManager); - _window.OnClose += Close; - _window.OpenCentered(); + _window?.Reset(_prototypeManager, accessLevels); } protected override void UpdateState(BoundUserInterfaceState state) @@ -44,14 +59,6 @@ public sealed class DoorElectronicsBoundUserInterface : BoundUserInterface _window?.UpdateState(castState); } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - - _window?.Dispose(); - } - public void UpdateConfiguration(List> newAccessList) { SendMessage(new DoorElectronicsUpdateConfigurationMessage(newAccessList)); diff --git a/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs index c01f13a462..2112a56297 100644 --- a/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs +++ b/Content.Client/Doors/Electronics/DoorElectronicsConfigurationMenu.xaml.cs @@ -15,22 +15,23 @@ namespace Content.Client.Doors.Electronics; [GenerateTypedNameReferences] public sealed partial class DoorElectronicsConfigurationMenu : FancyWindow { - private readonly DoorElectronicsBoundUserInterface _owner; - private AccessLevelControl _buttonsList = new(); + private readonly AccessLevelControl _buttonsList = new(); - public DoorElectronicsConfigurationMenu(DoorElectronicsBoundUserInterface ui, List> accessLevels, IPrototypeManager prototypeManager) + public event Action>>? OnAccessChanged; + + public DoorElectronicsConfigurationMenu() { RobustXamlLoader.Load(this); - - _owner = ui; - - _buttonsList.Populate(accessLevels, prototypeManager); AccessLevelControlContainer.AddChild(_buttonsList); + } - foreach (var (id, button) in _buttonsList.ButtonsList) + public void Reset(IPrototypeManager protoManager, List> accessLevels) + { + _buttonsList.Populate(accessLevels, protoManager); + + foreach (var button in _buttonsList.ButtonsList.Values) { - button.OnPressed += _ => _owner.UpdateConfiguration( - _buttonsList.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList()); + button.OnPressed += _ => OnAccessChanged?.Invoke(_buttonsList.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList()); } } diff --git a/Content.Client/Fax/UI/FaxBoundUi.cs b/Content.Client/Fax/UI/FaxBoundUi.cs index a95066a3b5..ca2e834b4f 100644 --- a/Content.Client/Fax/UI/FaxBoundUi.cs +++ b/Content.Client/Fax/UI/FaxBoundUi.cs @@ -25,10 +25,7 @@ public sealed class FaxBoundUi : BoundUserInterface { base.Open(); - _window = new FaxWindow(); - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.FileButtonPressed += OnFileButtonPressed; _window.CopyButtonPressed += OnCopyButtonPressed; _window.SendButtonPressed += OnSendButtonPressed; @@ -104,11 +101,4 @@ public sealed class FaxBoundUi : BoundUserInterface _window.UpdateState(cast); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (disposing) - _window?.Dispose(); - } } diff --git a/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs b/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs index ba49f11ea0..08596b04e6 100644 --- a/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs +++ b/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs @@ -1,6 +1,7 @@ using Robust.Client.GameObjects; using Robust.Shared.Timing; using Content.Shared.Forensics; +using Robust.Client.UserInterface; namespace Content.Client.Forensics { @@ -21,11 +22,9 @@ namespace Content.Client.Forensics protected override void Open() { base.Open(); - _window = new ForensicScannerMenu(); - _window.OnClose += Close; + _window = this.CreateWindow(); _window.Print.OnPressed += _ => Print(); _window.Clear.OnPressed += _ => Clear(); - _window.OpenCentered(); } private void Print() @@ -62,6 +61,7 @@ namespace Content.Client.Forensics _printCooldown = cast.PrintCooldown; + // TODO: Fix this if (cast.PrintReadyAt > _gameTiming.CurTime) Timer.Spawn(cast.PrintReadyAt - _gameTiming.CurTime, () => { @@ -71,14 +71,5 @@ namespace Content.Client.Forensics _window.UpdateState(cast); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _window?.Dispose(); - } } } diff --git a/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs b/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs index fdb3cdbc01..457b70ca7c 100644 --- a/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs +++ b/Content.Client/Gateway/UI/GatewayBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Gateway; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Gateway.UI; @@ -17,24 +18,13 @@ public sealed class GatewayBoundUserInterface : BoundUserInterface { base.Open(); - _window = new GatewayWindow(EntMan.GetNetEntity(Owner)); + _window = this.CreateWindow(); + _window.SetEntity(EntMan.GetNetEntity(Owner)); _window.OpenPortal += destination => { SendMessage(new GatewayOpenPortalMessage(destination)); }; - _window.OnClose += Close; - _window?.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (disposing) - { - _window?.Dispose(); - _window = null; - } } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Gateway/UI/GatewayWindow.xaml.cs b/Content.Client/Gateway/UI/GatewayWindow.xaml.cs index 889dd6e175..1c779b2b35 100644 --- a/Content.Client/Gateway/UI/GatewayWindow.xaml.cs +++ b/Content.Client/Gateway/UI/GatewayWindow.xaml.cs @@ -22,7 +22,7 @@ public sealed partial class GatewayWindow : FancyWindow, public event Action? OpenPortal; private List _destinations = new(); - public readonly NetEntity Owner; + public NetEntity Owner; private NetEntity? _current; private TimeSpan _nextReady; @@ -46,16 +46,20 @@ public sealed partial class GatewayWindow : FancyWindow, /// private bool _isCooldownPending = true; - public GatewayWindow(NetEntity netEntity) + public GatewayWindow() { RobustXamlLoader.Load(this); var dependencies = IoCManager.Instance!; _timing = dependencies.Resolve(); - Owner = netEntity; NextUnlockBar.ForegroundStyleBoxOverride = new StyleBoxFlat(Color.FromHex("#C74EBD")); } + public void SetEntity(NetEntity entity) + { + + } + public void UpdateState(GatewayBoundUserInterfaceState state) { _destinations = state.Destinations; diff --git a/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs b/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs index d72da3e812..32b40747d5 100644 --- a/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs +++ b/Content.Client/Gravity/UI/GravityGeneratorBoundUserInterface.cs @@ -1,6 +1,6 @@ using Content.Shared.Gravity; using JetBrains.Annotations; -using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Gravity.UI { @@ -18,17 +18,8 @@ namespace Content.Client.Gravity.UI { base.Open(); - _window = new GravityGeneratorWindow(this); - - /* - _window.Switch.OnPressed += _ => - { - SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(!IsOn)); - }; - */ - - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); + _window.SetEntity(Owner); } protected override void UpdateState(BoundUserInterfaceState state) @@ -39,14 +30,6 @@ namespace Content.Client.Gravity.UI _window?.UpdateState(castState); } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - - _window?.Dispose(); - } - public void SetPowerSwitch(bool on) { SendMessage(new SharedGravityGeneratorComponent.SwitchGeneratorMessage(on)); diff --git a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs index 75f8eb479b..6f04133b59 100644 --- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs +++ b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs @@ -12,22 +12,23 @@ namespace Content.Client.Gravity.UI { private readonly ButtonGroup _buttonGroup = new(); - private readonly GravityGeneratorBoundUserInterface _owner; + public event Action? OnPowerSwitch; - public GravityGeneratorWindow(GravityGeneratorBoundUserInterface owner) + public GravityGeneratorWindow() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - _owner = owner; - OnButton.Group = _buttonGroup; OffButton.Group = _buttonGroup; - OnButton.OnPressed += _ => _owner.SetPowerSwitch(true); - OffButton.OnPressed += _ => _owner.SetPowerSwitch(false); + OnButton.OnPressed += _ => OnPowerSwitch?.Invoke(true); + OffButton.OnPressed += _ => OnPowerSwitch?.Invoke(false); + } - EntityView.SetEntity(owner.Owner); + public void SetEntity(EntityUid uid) + { + EntityView.SetEntity(uid); } public void UpdateState(SharedGravityGeneratorComponent.GeneratorState state) diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs index dc0a3e9fcc..38760f4aa3 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs @@ -1,6 +1,6 @@ using Content.Shared.MedicalScanner; using JetBrains.Annotations; -using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.HealthAnalyzer.UI { @@ -17,12 +17,9 @@ namespace Content.Client.HealthAnalyzer.UI protected override void Open() { base.Open(); - _window = new HealthAnalyzerWindow - { - Title = EntMan.GetComponent(Owner).EntityName, - }; - _window.OnClose += Close; - _window.OpenCentered(); + _window = this.CreateWindow(); + + _window.Title = EntMan.GetComponent(Owner).EntityName; } protected override void ReceiveMessage(BoundUserInterfaceMessage message) @@ -35,17 +32,5 @@ namespace Content.Client.HealthAnalyzer.UI _window.Populate(cast); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - if (_window != null) - _window.OnClose -= Close; - - _window?.Dispose(); - } } } diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs b/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs index a8872604a4..53977eb636 100644 --- a/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs +++ b/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Humanoid; using Content.Shared.Humanoid.Markings; +using Robust.Client.UserInterface; namespace Content.Client.Humanoid; @@ -20,8 +21,7 @@ public sealed class HumanoidMarkingModifierBoundUserInterface : BoundUserInterfa { base.Open(); - _window = new(); - _window.OnClose += Close; + _window = this.CreateWindow(); _window.OnMarkingAdded += SendMarkingSet; _window.OnMarkingRemoved += SendMarkingSet; _window.OnMarkingColorChange += SendMarkingSetNoResend; diff --git a/Content.Client/Instruments/UI/BandMenu.xaml.cs b/Content.Client/Instruments/UI/BandMenu.xaml.cs index 5fb293a194..26cd1369e5 100644 --- a/Content.Client/Instruments/UI/BandMenu.xaml.cs +++ b/Content.Client/Instruments/UI/BandMenu.xaml.cs @@ -11,7 +11,9 @@ public sealed partial class BandMenu : DefaultWindow { private readonly InstrumentBoundUserInterface _owner; - public BandMenu(InstrumentBoundUserInterface owner) : base() + public EntityUid? Master; + + public BandMenu(InstrumentBoundUserInterface owner) { RobustXamlLoader.Load(this); @@ -40,7 +42,7 @@ public sealed partial class BandMenu : DefaultWindow { var uid = entManager.GetEntity(nent); var item = BandList.AddItem(name, null, true, uid); - item.Selected = _owner.Instrument?.Master == uid; + item.Selected = Master == uid; } } } diff --git a/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs b/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs index 2814d41536..c175e67842 100644 --- a/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs +++ b/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs @@ -51,7 +51,7 @@ public sealed partial class ChannelsMenu : DefaultWindow } } - public void Populate() + public void Populate(InstrumentComponent? instrument) { ChannelList.Clear(); @@ -60,7 +60,8 @@ public sealed partial class ChannelsMenu : DefaultWindow var item = ChannelList.AddItem(_owner.Loc.GetString("instrument-component-channel-name", ("number", i)), null, true, i); - item.Selected = !_owner.Instrument?.FilteredChannels[i] ?? false; + + item.Selected = !instrument?.FilteredChannels[i] ?? false; } } } diff --git a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs index 0f5729f55b..4816ce8c36 100644 --- a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs +++ b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs @@ -24,8 +24,6 @@ namespace Content.Client.Instruments.UI [ViewVariables] private BandMenu? _bandMenu; [ViewVariables] private ChannelsMenu? _channelsMenu; - [ViewVariables] public InstrumentComponent? Instrument { get; private set; } - public InstrumentBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { IoCManager.InjectDependencies(this); @@ -43,14 +41,20 @@ namespace Content.Client.Instruments.UI protected override void Open() { - if (!EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument)) - return; + _instrumentMenu = this.CreateWindow(); + _instrumentMenu.Title = EntMan.GetComponent(Owner).EntityName; - Instrument = instrument; - _instrumentMenu = new InstrumentMenu(this); - _instrumentMenu.OnClose += Close; + _instrumentMenu.OnOpenBand += OpenBandMenu; + _instrumentMenu.OnOpenChannels += OpenChannelsMenu; + _instrumentMenu.OnCloseChannels += CloseChannelsMenu; + _instrumentMenu.OnCloseBands += CloseBandMenu; - _instrumentMenu.OpenCentered(); + _instrumentMenu.SetMIDI(MidiManager.IsAvailable); + + if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument)) + { + _instrumentMenu.SetInstrument((Owner, instrument)); + } } protected override void Dispose(bool disposing) @@ -58,7 +62,12 @@ namespace Content.Client.Instruments.UI base.Dispose(disposing); if (!disposing) return; - _instrumentMenu?.Dispose(); + + if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument)) + { + _instrumentMenu?.RemoveInstrument(instrument); + } + _bandMenu?.Dispose(); _channelsMenu?.Dispose(); } @@ -72,6 +81,11 @@ namespace Content.Client.Instruments.UI { _bandMenu ??= new BandMenu(this); + if (EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument)) + { + _bandMenu.Master = instrument.Master; + } + // Refresh cache... RefreshBands(); @@ -87,7 +101,9 @@ namespace Content.Client.Instruments.UI public void OpenChannelsMenu() { _channelsMenu ??= new ChannelsMenu(this); - _channelsMenu.Populate(); + EntMan.TryGetComponent(Owner, out InstrumentComponent? instrument); + + _channelsMenu.Populate(instrument); _channelsMenu.OpenCenteredRight(); } diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs index da443e3fb5..fc863648d7 100644 --- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs +++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs @@ -1,7 +1,10 @@ using System.IO; using System.Numerics; using System.Threading.Tasks; +using Content.Client.Interactable; +using Content.Shared.ActionBlocker; using Robust.Client.AutoGenerated; +using Robust.Client.Player; using Robust.Client.UserInterface; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; @@ -16,33 +19,23 @@ namespace Content.Client.Instruments.UI [GenerateTypedNameReferences] public sealed partial class InstrumentMenu : DefaultWindow { - private readonly InstrumentBoundUserInterface _owner; + [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private readonly IFileDialogManager _dialogs = default!; + [Dependency] private readonly IPlayerManager _player = default!; private bool _isMidiFileDialogueWindowOpen; - public InstrumentMenu(InstrumentBoundUserInterface owner) + public event Action? OnOpenBand; + public event Action? OnOpenChannels; + public event Action? OnCloseBands; + public event Action? OnCloseChannels; + + public EntityUid Entity; + + public InstrumentMenu() { RobustXamlLoader.Load(this); - - _owner = owner; - - if (_owner.Instrument != null) - { - _owner.Instrument.OnMidiPlaybackEnded += InstrumentOnMidiPlaybackEnded; - Title = _owner.Entities.GetComponent(_owner.Owner).EntityName; - LoopButton.Disabled = !_owner.Instrument.IsMidiOpen; - LoopButton.Pressed = _owner.Instrument.LoopMidi; - ChannelsButton.Disabled = !_owner.Instrument.IsRendererAlive; - StopButton.Disabled = !_owner.Instrument.IsMidiOpen; - PlaybackSlider.MouseFilter = _owner.Instrument.IsMidiOpen ? MouseFilterMode.Pass : MouseFilterMode.Ignore; - } - - if (!_owner.MidiManager.IsAvailable) - { - UnavailableOverlay.Visible = true; - // We return early as to not give the buttons behavior. - return; - } + IoCManager.InjectDependencies(this); InputButton.OnToggled += MidiInputButtonOnOnToggled; BandButton.OnPressed += BandButtonOnPressed; @@ -57,12 +50,34 @@ namespace Content.Client.Instruments.UI MinSize = SetSize = new Vector2(400, 150); } + public void SetInstrument(Entity entity) + { + Entity = entity; + var component = entity.Comp; + component.OnMidiPlaybackEnded += InstrumentOnMidiPlaybackEnded; + LoopButton.Disabled = !component.IsMidiOpen; + LoopButton.Pressed = component.LoopMidi; + ChannelsButton.Disabled = !component.IsRendererAlive; + StopButton.Disabled = !component.IsMidiOpen; + PlaybackSlider.MouseFilter = component.IsMidiOpen ? MouseFilterMode.Pass : MouseFilterMode.Ignore; + } + + public void RemoveInstrument(InstrumentComponent component) + { + component.OnMidiPlaybackEnded -= InstrumentOnMidiPlaybackEnded; + } + + public void SetMIDI(bool available) + { + UnavailableOverlay.Visible = !available; + } + private void BandButtonOnPressed(ButtonEventArgs obj) { if (!PlayCheck()) return; - _owner.OpenBandMenu(); + OnOpenBand?.Invoke(); } private void BandButtonOnToggled(ButtonToggledEventArgs obj) @@ -70,12 +85,15 @@ namespace Content.Client.Instruments.UI if (obj.Pressed) return; - _owner.Instruments.SetMaster(_owner.Owner, null); + if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument)) + { + _entManager.System().SetMaster(Entity, instrument.Master); + } } private void ChannelsButtonOnPressed(ButtonEventArgs obj) { - _owner.OpenChannelsMenu(); + OnOpenChannels?.Invoke(); } private void InstrumentOnMidiPlaybackEnded() @@ -85,8 +103,10 @@ namespace Content.Client.Instruments.UI public void MidiPlaybackSetButtonsDisabled(bool disabled) { - if(disabled) - _owner.CloseChannelsMenu(); + if (disabled) + { + OnCloseChannels?.Invoke(); + } LoopButton.Disabled = disabled; StopButton.Disabled = disabled; @@ -100,7 +120,7 @@ namespace Content.Client.Instruments.UI if (_isMidiFileDialogueWindowOpen) return; - _owner.CloseBandMenu(); + OnCloseBands?.Invoke(); var filters = new FileDialogFilters(new FileDialogFilters.Group("mid", "midi")); @@ -108,7 +128,7 @@ namespace Content.Client.Instruments.UI // or focus the previously-opened window. _isMidiFileDialogueWindowOpen = true; - await using var file = await _owner.FileDialogManager.OpenFile(filters); + await using var file = await _dialogs.OpenFile(filters); _isMidiFileDialogueWindowOpen = false; @@ -129,9 +149,18 @@ namespace Content.Client.Instruments.UI await file.CopyToAsync(memStream); - if (_owner.Instrument is not {} instrument - || !_owner.Instruments.OpenMidi(_owner.Owner, memStream.GetBuffer().AsSpan(0, (int) memStream.Length), instrument)) + if (!_entManager.TryGetComponent(Entity, out var instrument)) + { return; + } + + if (!_entManager.System() + .OpenMidi(Entity, + memStream.GetBuffer().AsSpan(0, (int) memStream.Length), + instrument)) + { + return; + } MidiPlaybackSetButtonsDisabled(false); if (InputButton.Pressed) @@ -140,7 +169,7 @@ namespace Content.Client.Instruments.UI private void MidiInputButtonOnOnToggled(ButtonToggledEventArgs obj) { - _owner.CloseBandMenu(); + OnCloseBands?.Invoke(); if (obj.Pressed) { @@ -148,109 +177,99 @@ namespace Content.Client.Instruments.UI return; MidiStopButtonOnPressed(null); - if(_owner.Instrument is {} instrument) - _owner.Instruments.OpenInput(_owner.Owner, instrument); + + if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument)) + _entManager.System().OpenInput(Entity, instrument); } - else if (_owner.Instrument is { } instrument) + else { - _owner.Instruments.CloseInput(_owner.Owner, false, instrument); - _owner.CloseChannelsMenu(); + _entManager.System().CloseInput(Entity, false); + OnCloseChannels?.Invoke(); } } private bool PlayCheck() { // TODO all of these checks should also be done server-side. - - var instrumentEnt = _owner.Owner; - var instrument = _owner.Instrument; - - if (instrument == null) + if (!_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument)) return false; - var localEntity = _owner.PlayerManager.LocalEntity; + var localEntity = _player.LocalEntity; // If we don't have a player or controlled entity, we return. if (localEntity == null) return false; // By default, allow an instrument to play itself and skip all other checks - if (localEntity == instrumentEnt) + if (localEntity == Entity) return true; - var container = _owner.Entities.System(); + var container = _entManager.System(); // If we're a handheld instrument, we might be in a container. Get it just in case. - container.TryGetContainingContainer(instrumentEnt, out var conMan); + container.TryGetContainingContainer(Entity, out var conMan); // If the instrument is handheld and we're not holding it, we return. - if ((instrument.Handheld && (conMan == null || conMan.Owner != localEntity))) + if (instrument.Handheld && (conMan == null || conMan.Owner != localEntity)) return false; - if (!_owner.ActionBlocker.CanInteract(localEntity.Value, instrumentEnt)) + if (!_entManager.System().CanInteract(localEntity.Value, Entity)) return false; // We check that we're in range unobstructed just in case. - return _owner.Interactions.InRangeUnobstructed(localEntity.Value, instrumentEnt); + return _entManager.System().InRangeUnobstructed(localEntity.Value, Entity); } private void MidiStopButtonOnPressed(ButtonEventArgs? obj) { MidiPlaybackSetButtonsDisabled(true); - if (_owner.Instrument is not {} instrument) - return; - - _owner.Instruments.CloseMidi(_owner.Owner, false, instrument); - _owner.CloseChannelsMenu(); + _entManager.System().CloseMidi(Entity, false); + OnCloseChannels?.Invoke(); } private void MidiLoopButtonOnOnToggled(ButtonToggledEventArgs obj) { - if (_owner.Instrument == null) - return; + var instrument = _entManager.System(); - _owner.Instrument.LoopMidi = obj.Pressed; - _owner.Instruments.UpdateRenderer(_owner.Owner, _owner.Instrument); + if (_entManager.TryGetComponent(Entity, out InstrumentComponent? instrumentComp)) + { + instrumentComp.LoopMidi = obj.Pressed; + } + + instrument.UpdateRenderer(Entity); } private void PlaybackSliderSeek(Range _) { // Do not seek while still grabbing. - if (PlaybackSlider.Grabbed || _owner.Instrument is not {} instrument) + if (PlaybackSlider.Grabbed) return; - _owner.Instruments.SetPlayerTick(_owner.Owner, (int)Math.Ceiling(PlaybackSlider.Value), instrument); + _entManager.System().SetPlayerTick(Entity, (int)Math.Ceiling(PlaybackSlider.Value)); } private void PlaybackSliderKeyUp(GUIBoundKeyEventArgs args) { - if (args.Function != EngineKeyFunctions.UIClick || _owner.Instrument is not {} instrument) + if (args.Function != EngineKeyFunctions.UIClick) return; - _owner.Instruments.SetPlayerTick(_owner.Owner, (int)Math.Ceiling(PlaybackSlider.Value), instrument); - } - - public override void Close() - { - base.Close(); - _owner.CloseBandMenu(); - _owner.CloseChannelsMenu(); + _entManager.System().SetPlayerTick(Entity, (int)Math.Ceiling(PlaybackSlider.Value)); } protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); - if (_owner.Instrument == null) + if (!_entManager.TryGetComponent(Entity, out InstrumentComponent? instrument)) return; - var hasMaster = _owner.Instrument.Master != null; + var hasMaster = instrument.Master != null; BandButton.ToggleMode = hasMaster; BandButton.Pressed = hasMaster; - BandButton.Disabled = _owner.Instrument.IsMidiOpen || _owner.Instrument.IsInputOpen; - ChannelsButton.Disabled = !_owner.Instrument.IsRendererAlive; + BandButton.Disabled = instrument.IsMidiOpen || instrument.IsInputOpen; + ChannelsButton.Disabled = !instrument.IsRendererAlive; - if (!_owner.Instrument.IsMidiOpen) + if (!instrument.IsMidiOpen) { PlaybackSlider.MaxValue = 1; PlaybackSlider.SetValueWithoutEvent(0); @@ -260,8 +279,8 @@ namespace Content.Client.Instruments.UI if (PlaybackSlider.Grabbed) return; - PlaybackSlider.MaxValue = _owner.Instrument.PlayerTotalTick; - PlaybackSlider.SetValueWithoutEvent(_owner.Instrument.PlayerTick); + PlaybackSlider.MaxValue = instrument.PlayerTotalTick; + PlaybackSlider.SetValueWithoutEvent(instrument.PlayerTick); } } } diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs index 7e50eb1c68..132c5ed654 100644 --- a/Content.Client/Inventory/StrippableBoundUserInterface.cs +++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs @@ -41,7 +41,7 @@ namespace Content.Client.Inventory public const string HiddenPocketEntityId = "StrippingHiddenEntity"; [ViewVariables] - private readonly StrippingMenu? _strippingMenu; + private StrippingMenu? _strippingMenu; [ViewVariables] private readonly EntityUid _virtualHiddenEntity; @@ -51,33 +51,30 @@ namespace Content.Client.Inventory _examine = EntMan.System(); _inv = EntMan.System(); _cuffable = EntMan.System(); - - // TODO update name when identity changes - var title = Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner, EntMan))); - _strippingMenu = new StrippingMenu(title, this); - _strippingMenu.OnClose += Close; - - // TODO use global entity - // BUIs are opened and closed while applying comp sates, so spawning entities here is probably not the best idea. _virtualHiddenEntity = EntMan.SpawnEntity(HiddenPocketEntityId, MapCoordinates.Nullspace); } protected override void Open() { base.Open(); + + _strippingMenu = this.CreateWindow(); + _strippingMenu.OnDirty += UpdateMenu; + _strippingMenu.Title = Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner, EntMan))); + _strippingMenu?.OpenCenteredLeft(); } protected override void Dispose(bool disposing) { - base.Dispose(disposing); - - EntMan.DeleteEntity(_virtualHiddenEntity); - if (!disposing) return; - _strippingMenu?.Dispose(); + if (_strippingMenu != null) + _strippingMenu.OnDirty -= UpdateMenu; + + EntMan.DeleteEntity(_virtualHiddenEntity); + base.Dispose(disposing); } public void DirtyMenu() diff --git a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs index f97d8a7330..7884268c42 100644 --- a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs +++ b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs @@ -12,42 +12,34 @@ namespace Content.Client.Kitchen.UI [GenerateTypedNameReferences] public sealed partial class GrinderMenu : FancyWindow { - private readonly IEntityManager _entityManager; - private readonly IPrototypeManager _prototypeManager; - private readonly ReagentGrinderBoundUserInterface _owner; + [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; private readonly Dictionary _chamberVisualContents = new(); - public GrinderMenu(ReagentGrinderBoundUserInterface owner, IEntityManager entityManager, IPrototypeManager prototypeManager) + public event Action? OnToggleAuto; + public event Action? OnGrind; + public event Action? OnJuice; + public event Action? OnEjectAll; + public event Action? OnEjectBeaker; + public event Action? OnEjectChamber; + + public GrinderMenu() { RobustXamlLoader.Load(this); - _entityManager = entityManager; - _prototypeManager = prototypeManager; - _owner = owner; - AutoModeButton.OnPressed += owner.ToggleAutoMode; - GrindButton.OnPressed += owner.StartGrinding; - JuiceButton.OnPressed += owner.StartJuicing; - ChamberContentBox.EjectButton.OnPressed += owner.EjectAll; - BeakerContentBox.EjectButton.OnPressed += owner.EjectBeaker; + IoCManager.InjectDependencies(this); + AutoModeButton.OnPressed += _ => OnToggleAuto?.Invoke(); + GrindButton.OnPressed += _ => OnGrind?.Invoke(); + JuiceButton.OnPressed += _ => OnJuice?.Invoke(); + ChamberContentBox.EjectButton.OnPressed += _ => OnEjectAll?.Invoke(); + BeakerContentBox.EjectButton.OnPressed += _ => OnEjectBeaker?.Invoke(); ChamberContentBox.BoxContents.OnItemSelected += OnChamberBoxContentsItemSelected; BeakerContentBox.BoxContents.SelectMode = ItemList.ItemListSelectMode.None; } private void OnChamberBoxContentsItemSelected(ItemList.ItemListSelectedEventArgs args) { - _owner.EjectChamberContent(_chamberVisualContents[args.ItemIndex]); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - _chamberVisualContents.Clear(); - GrindButton.OnPressed -= _owner.StartGrinding; - JuiceButton.OnPressed -= _owner.StartJuicing; - ChamberContentBox.EjectButton.OnPressed -= _owner.EjectAll; - BeakerContentBox.EjectButton.OnPressed -= _owner.EjectBeaker; - ChamberContentBox.BoxContents.OnItemSelected -= OnChamberBoxContentsItemSelected; + OnEjectChamber?.Invoke(_chamberVisualContents[args.ItemIndex]); } public void UpdateState(ReagentGrinderInterfaceState state) diff --git a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs index 7e7dd2d693..643ac47054 100644 --- a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs +++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Kitchen.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Client.Graphics; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Timing; @@ -19,28 +20,15 @@ namespace Content.Client.Kitchen.UI [ViewVariables] private readonly Dictionary _reagents = new(); - [Dependency] private readonly IGameTiming _gameTiming = default!; - - public MicrowaveUpdateUserInterfaceState currentState = default!; - - private IEntityManager _entManager; public MicrowaveBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { - _entManager = IoCManager.Resolve(); - } - - public TimeSpan GetCurrentTime() - { - return _gameTiming.CurTime; } protected override void Open() { base.Open(); - _menu = new MicrowaveMenu(this); - _menu.OpenCentered(); - _menu.OnClose += Close; + _menu = this.CreateWindow(); _menu.StartButton.OnPressed += _ => SendPredictedMessage(new MicrowaveStartCookMessage()); _menu.EjectButton.OnPressed += _ => SendPredictedMessage(new MicrowaveEjectMessage()); _menu.IngredientsList.OnItemSelected += args => @@ -74,38 +62,23 @@ namespace Content.Client.Kitchen.UI }; } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (!disposing) - { - return; - } - - _solids.Clear(); - _menu?.Dispose(); - } - protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); - if (state is not MicrowaveUpdateUserInterfaceState cState) + if (state is not MicrowaveUpdateUserInterfaceState cState || _menu == null) { return; } + _menu.IsBusy = cState.IsMicrowaveBusy; + _menu.CurrentCooktimeEnd = cState.CurrentCookTimeEnd; - _menu?.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0); - currentState = cState; - + _menu.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0); // TODO move this to a component state and ensure the net ids. - RefreshContentsDisplay(_entManager.GetEntityArray(cState.ContainedSolids)); - - if (_menu == null) return; + RefreshContentsDisplay(EntMan.GetEntityArray(cState.ContainedSolids)); //Set the cook time info label - var cookTime = cState.ActiveButtonIndex == 0 + var cookTime = cState.ActiveButtonIndex == 0 ? Loc.GetString("microwave-menu-instant-button") : cState.CurrentCookTime.ToString(); diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs index b292e9f146..13029e3846 100644 --- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs +++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs @@ -9,22 +9,21 @@ namespace Content.Client.Kitchen.UI [GenerateTypedNameReferences] public sealed partial class MicrowaveMenu : FancyWindow { - public sealed class MicrowaveCookTimeButton : Button - { - public uint CookTime; - } + [Dependency] private readonly IGameTiming _timing = default!; public event Action? OnCookTimeSelected; public ButtonGroup CookTimeButtonGroup { get; } - private readonly MicrowaveBoundUserInterface _owner; - public MicrowaveMenu(MicrowaveBoundUserInterface owner) + public bool IsBusy; + public TimeSpan CurrentCooktimeEnd; + + public MicrowaveMenu() { RobustXamlLoader.Load(this); + IoCManager.InjectDependencies(this); CookTimeButtonGroup = new ButtonGroup(); InstantCookButton.Group = CookTimeButtonGroup; - _owner = owner; InstantCookButton.OnPressed += args => { OnCookTimeSelected?.Invoke(args, 0); @@ -65,14 +64,20 @@ namespace Content.Client.Kitchen.UI protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); - if(!_owner.currentState.IsMicrowaveBusy) + + if (!IsBusy) return; - if(_owner.currentState.CurrentCookTimeEnd > _owner.GetCurrentTime()) + if (CurrentCooktimeEnd > _timing.CurTime) { CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label", - ("time",_owner.currentState.CurrentCookTimeEnd.Subtract(_owner.GetCurrentTime()).Seconds)); + ("time", CurrentCooktimeEnd.Subtract(_timing.CurTime).Seconds)); } } + + public sealed class MicrowaveCookTimeButton : Button + { + public uint CookTime; + } } } diff --git a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs index e6f108b305..bc4cc75b4d 100644 --- a/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs +++ b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Containers.ItemSlots; using Content.Shared.Kitchen; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Prototypes; @@ -8,8 +9,6 @@ namespace Content.Client.Kitchen.UI { public sealed class ReagentGrinderBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [ViewVariables] private GrinderMenu? _menu; @@ -21,20 +20,13 @@ namespace Content.Client.Kitchen.UI { base.Open(); - _menu = new GrinderMenu(this, EntMan, _prototypeManager); - _menu.OpenCentered(); - _menu.OnClose += Close; - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - { - return; - } - - _menu?.Dispose(); + _menu = this.CreateWindow(); + _menu.OnToggleAuto += ToggleAutoMode; + _menu.OnGrind += StartGrinding; + _menu.OnJuice += StartJuicing; + _menu.OnEjectAll += EjectAll; + _menu.OnEjectBeaker += EjectBeaker; + _menu.OnEjectChamber += EjectChamberContent; } protected override void UpdateState(BoundUserInterfaceState state) @@ -52,27 +44,27 @@ namespace Content.Client.Kitchen.UI _menu?.HandleMessage(message); } - public void ToggleAutoMode(BaseButton.ButtonEventArgs args) + public void ToggleAutoMode() { SendMessage(new ReagentGrinderToggleAutoModeMessage()); } - public void StartGrinding(BaseButton.ButtonEventArgs? _ = null) + public void StartGrinding() { SendMessage(new ReagentGrinderStartMessage(GrinderProgram.Grind)); } - public void StartJuicing(BaseButton.ButtonEventArgs? _ = null) + public void StartJuicing() { SendMessage(new ReagentGrinderStartMessage(GrinderProgram.Juice)); } - public void EjectAll(BaseButton.ButtonEventArgs? _ = null) + public void EjectAll() { SendMessage(new ReagentGrinderEjectChamberAllMessage()); } - public void EjectBeaker(BaseButton.ButtonEventArgs? _ = null) + public void EjectBeaker() { SendMessage(new ItemSlotButtonPressedEvent(SharedReagentGrinder.BeakerSlotId)); } diff --git a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs index 555f1ff09e..6b65612341 100644 --- a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs +++ b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Labels; using Content.Shared.Labels.Components; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Labels.UI { @@ -23,13 +24,8 @@ namespace Content.Client.Labels.UI { base.Open(); - _window = new HandLabelerWindow(); - if (State != null) - UpdateState(State); + _window = this.CreateWindow(); - _window.OpenCentered(); - - _window.OnClose += Close; _window.OnLabelChanged += OnLabelChanged; Reload(); } @@ -51,13 +47,5 @@ namespace Content.Client.Labels.UI _window.SetCurrentLabel(component.AssignedLabel); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); - } } - } diff --git a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs index 6e6d1b9176..a599f79152 100644 --- a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs +++ b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Lathe; using Content.Shared.Research.Components; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Lathe.UI { @@ -17,9 +18,9 @@ namespace Content.Client.Lathe.UI { base.Open(); - _menu = new LatheMenu(this); - _menu.OnClose += Close; - + _menu = this.CreateWindow(); + _menu.SetEntity(Owner); + _menu.OpenCenteredRight(); _menu.OnServerListButtonPressed += _ => { @@ -30,8 +31,6 @@ namespace Content.Client.Lathe.UI { SendMessage(new LatheQueueRecipeMessage(recipe, amount)); }; - - _menu.OpenCenteredRight(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -50,13 +49,5 @@ namespace Content.Client.Lathe.UI break; } } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _menu?.Dispose(); - } } } diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs index f2f52b67b5..6f530b76c7 100644 --- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs +++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs @@ -1,3 +1,4 @@ +using System.Buffers; using System.Linq; using System.Text; using Content.Client.Materials; @@ -22,7 +23,6 @@ public sealed partial class LatheMenu : DefaultWindow [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - private EntityUid _owner; private readonly SpriteSystem _spriteSystem; private readonly LatheSystem _lathe; private readonly MaterialStorageSystem _materialStorage; @@ -36,9 +36,10 @@ public sealed partial class LatheMenu : DefaultWindow public ProtoId? CurrentCategory; - public LatheMenu(LatheBoundUserInterface owner) + public EntityUid Entity; + + public LatheMenu() { - _owner = owner.Owner; RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); @@ -46,8 +47,6 @@ public sealed partial class LatheMenu : DefaultWindow _lathe = _entityManager.System(); _materialStorage = _entityManager.System(); - Title = _entityManager.GetComponent(owner.Owner).EntityName; - SearchBar.OnTextChanged += _ => { PopulateRecipes(); @@ -60,8 +59,13 @@ public sealed partial class LatheMenu : DefaultWindow FilterOption.OnItemSelected += OnItemSelected; ServerListButton.OnPressed += a => OnServerListButtonPressed?.Invoke(a); + } - if (_entityManager.TryGetComponent(owner.Owner, out var latheComponent)) + public void SetEntity(EntityUid uid) + { + Entity = uid; + + if (_entityManager.TryGetComponent(Entity, out var latheComponent)) { if (!latheComponent.DynamicRecipes.Any()) { @@ -69,7 +73,7 @@ public sealed partial class LatheMenu : DefaultWindow } } - MaterialsList.SetOwner(owner.Owner); + MaterialsList.SetOwner(Entity); } /// @@ -102,13 +106,15 @@ public sealed partial class LatheMenu : DefaultWindow var sortedRecipesToShow = recipesToShow.OrderBy(p => p.Name); RecipeList.Children.Clear(); + _entityManager.TryGetComponent(Entity, out LatheComponent? lathe); + foreach (var prototype in sortedRecipesToShow) { EntityPrototype? recipeProto = null; - if (_prototypeManager.TryIndex(prototype.Result, out EntityPrototype? entityProto) && entityProto != null) + if (_prototypeManager.TryIndex(prototype.Result, out EntityPrototype? entityProto)) recipeProto = entityProto; - var canProduce = _lathe.CanProduce(_owner, prototype, quantity); + var canProduce = _lathe.CanProduce(Entity, prototype, quantity, component: lathe); var control = new RecipeControl(prototype, () => GenerateTooltipText(prototype), canProduce, recipeProto); control.OnButtonPressed += s => @@ -124,19 +130,20 @@ public sealed partial class LatheMenu : DefaultWindow private string GenerateTooltipText(LatheRecipePrototype prototype) { StringBuilder sb = new(); + var multiplier = _entityManager.GetComponent(Entity).MaterialUseMultiplier; foreach (var (id, amount) in prototype.RequiredMaterials) { if (!_prototypeManager.TryIndex(id, out var proto)) continue; - var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, _entityManager.GetComponent(_owner).MaterialUseMultiplier); + var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, multiplier); var sheetVolume = _materialStorage.GetSheetVolume(proto); var unit = Loc.GetString(proto.Unit); var sheets = adjustedAmount / (float) sheetVolume; - var availableAmount = _materialStorage.GetMaterialAmount(_owner, id); + var availableAmount = _materialStorage.GetMaterialAmount(Entity, id); var missingAmount = Math.Max(0, adjustedAmount - availableAmount); var missingSheets = missingAmount / (float) sheetVolume; diff --git a/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs b/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs index 09bdedfd94..11abe8c245 100644 --- a/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs +++ b/Content.Client/MachineLinking/UI/SignalTimerBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.MachineLinking; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.Timing; namespace Content.Client.MachineLinking.UI; @@ -19,19 +20,14 @@ public sealed class SignalTimerBoundUserInterface : BoundUserInterface { base.Open(); - _window = new SignalTimerWindow(this); - - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); + _window.OnStartTimer += StartTimer; _window.OnCurrentTextChanged += OnTextChanged; _window.OnCurrentDelayMinutesChanged += OnDelayChanged; _window.OnCurrentDelaySecondsChanged += OnDelayChanged; } - public void OnStartTimer() + public void StartTimer() { SendMessage(new SignalTimerStartMessage()); } @@ -48,11 +44,6 @@ public sealed class SignalTimerBoundUserInterface : BoundUserInterface SendMessage(new SignalTimerDelayChangedMessage(_window.GetDelay())); } - public TimeSpan GetCurrentTime() - { - return _gameTiming.CurTime; - } - /// /// Update the UI state based on server-sent info /// @@ -72,11 +63,4 @@ public sealed class SignalTimerBoundUserInterface : BoundUserInterface _window.SetTimerStarted(cast.TimerStarted); _window.SetHasAccess(cast.HasAccess); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); - } } diff --git a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs index b62595595e..6133abfcb7 100644 --- a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs +++ b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs @@ -9,42 +9,44 @@ namespace Content.Client.MachineLinking.UI; [GenerateTypedNameReferences] public sealed partial class SignalTimerWindow : DefaultWindow { + [Dependency] private readonly IGameTiming _timing = default!; + private const int MaxTextLength = 5; public event Action? OnCurrentTextChanged; public event Action? OnCurrentDelayMinutesChanged; public event Action? OnCurrentDelaySecondsChanged; - private readonly SignalTimerBoundUserInterface _owner; - private TimeSpan? _triggerTime; private bool _timerStarted; - public SignalTimerWindow(SignalTimerBoundUserInterface owner) + public event Action? OnStartTimer; + + public SignalTimerWindow() { RobustXamlLoader.Load(this); - - _owner = owner; + IoCManager.InjectDependencies(this); CurrentTextEdit.OnTextChanged += e => OnCurrentTextChange(e.Text); CurrentDelayEditMinutes.OnTextChanged += e => OnCurrentDelayMinutesChange(e.Text); CurrentDelayEditSeconds.OnTextChanged += e => OnCurrentDelaySecondsChange(e.Text); - StartTimer.OnPressed += _ => OnStartTimer(); + StartTimer.OnPressed += _ => StartTimerWeh(); } - public void OnStartTimer() + private void StartTimerWeh() { if (!_timerStarted) { _timerStarted = true; - _triggerTime = _owner.GetCurrentTime() + GetDelay(); + _triggerTime = _timing.CurTime + GetDelay(); } else { SetTimerStarted(false); } - _owner.OnStartTimer(); + + OnStartTimer?.Invoke(); } protected override void FrameUpdate(FrameEventArgs args) @@ -54,9 +56,9 @@ public sealed partial class SignalTimerWindow : DefaultWindow if (!_timerStarted || _triggerTime == null) return; - if (_owner.GetCurrentTime() < _triggerTime.Value) + if (_timing.CurTime < _triggerTime.Value) { - StartTimer.Text = TextScreenSystem.TimeToString(_triggerTime.Value - _owner.GetCurrentTime()); + StartTimer.Text = TextScreenSystem.TimeToString(_triggerTime.Value - _timing.CurTime); } else { diff --git a/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs b/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs index f6979bf8d7..0a87948ff6 100644 --- a/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs +++ b/Content.Client/MagicMirror/MagicMirrorBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Humanoid.Markings; using Content.Shared.MagicMirror; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.MagicMirror; @@ -17,7 +18,7 @@ public sealed class MagicMirrorBoundUserInterface : BoundUserInterface { base.Open(); - _window = new(); + _window = this.CreateWindow(); _window.OnHairSelected += tuple => SelectHair(MagicMirrorCategory.Hair, tuple.id, tuple.slot); _window.OnHairColorChanged += args => ChangeColor(MagicMirrorCategory.Hair, args.marking, args.slot); @@ -29,9 +30,6 @@ public sealed class MagicMirrorBoundUserInterface : BoundUserInterface args => ChangeColor(MagicMirrorCategory.FacialHair, args.marking, args.slot); _window.OnFacialHairSlotAdded += delegate () { AddSlot(MagicMirrorCategory.FacialHair); }; _window.OnFacialHairSlotRemoved += args => RemoveSlot(MagicMirrorCategory.FacialHair, args); - - _window.OnClose += Close; - _window.OpenCentered(); } private void SelectHair(MagicMirrorCategory category, string marking, int slot) @@ -65,14 +63,5 @@ public sealed class MagicMirrorBoundUserInterface : BoundUserInterface _window.UpdateState(data); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _window?.Dispose(); - } } diff --git a/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs b/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs index 80eca82e32..22e5bc452a 100644 --- a/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs +++ b/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs @@ -1,6 +1,7 @@ using JetBrains.Annotations; using Content.Shared.MassMedia.Systems; using Content.Shared.MassMedia.Components; +using Robust.Client.UserInterface; using Robust.Shared.Timing; using Robust.Shared.Utility; @@ -9,8 +10,6 @@ namespace Content.Client.MassMedia.Ui; [UsedImplicitly] public sealed class NewsWriterBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [ViewVariables] private NewsWriterMenu? _menu; @@ -21,10 +20,7 @@ public sealed class NewsWriterBoundUserInterface : BoundUserInterface protected override void Open() { - _menu = new NewsWriterMenu(_gameTiming); - - _menu.OpenCentered(); - _menu.OnClose += Close; + _menu = this.CreateWindow(); _menu.ArticleEditorPanel.PublishButtonPressed += OnPublishButtonPressed; _menu.DeleteButtonPressed += OnDeleteButtonPressed; @@ -32,16 +28,6 @@ public sealed class NewsWriterBoundUserInterface : BoundUserInterface SendMessage(new NewsWriterArticlesRequestMessage()); } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _menu?.Close(); - _menu?.Dispose(); - } - protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); diff --git a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs index e2d57935e3..c059ce785a 100644 --- a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs +++ b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs @@ -10,17 +10,17 @@ namespace Content.Client.MassMedia.Ui; [GenerateTypedNameReferences] public sealed partial class NewsWriterMenu : FancyWindow { - private readonly IGameTiming _gameTiming; + [Dependency] private readonly IGameTiming _gameTiming = default!; private TimeSpan? _nextPublish; public event Action? DeleteButtonPressed; - public NewsWriterMenu(IGameTiming gameTiming) + public NewsWriterMenu() { RobustXamlLoader.Load(this); + IoCManager.InjectDependencies(this); - _gameTiming = gameTiming; ContentsContainer.RectClipContent = false; // Customize scrollbar width and margin. This is not possible in xaml diff --git a/Content.Client/Mech/Ui/MechBoundUserInterface.cs b/Content.Client/Mech/Ui/MechBoundUserInterface.cs index 4172bdc90f..2130a8c609 100644 --- a/Content.Client/Mech/Ui/MechBoundUserInterface.cs +++ b/Content.Client/Mech/Ui/MechBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Mech; using Content.Shared.Mech.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Mech.Ui; @@ -20,9 +21,8 @@ public sealed class MechBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new(Owner); - - _menu.OnClose += Close; + _menu = this.CreateWindow(); + _menu.SetEntity(Owner); _menu.OpenCenteredLeft(); _menu.OnRemoveButtonPressed += uid => @@ -60,16 +60,6 @@ public sealed class MechBoundUserInterface : BoundUserInterface } } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (!disposing) - return; - - _menu?.Close(); - } - public UIFragment? GetEquipmentUi(EntityUid? uid) { var component = EntMan.GetComponentOrNull(uid); diff --git a/Content.Client/Mech/Ui/MechMenu.xaml.cs b/Content.Client/Mech/Ui/MechMenu.xaml.cs index fad7648808..6f39bc386e 100644 --- a/Content.Client/Mech/Ui/MechMenu.xaml.cs +++ b/Content.Client/Mech/Ui/MechMenu.xaml.cs @@ -16,14 +16,15 @@ public sealed partial class MechMenu : FancyWindow public event Action? OnRemoveButtonPressed; - public MechMenu(EntityUid mech) + public MechMenu() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); + } - _mech = mech; - - MechView.SetEntity(mech); + public void SetEntity(EntityUid uid) + { + MechView.SetEntity(uid); } public void UpdateMechStats() diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs index 3978880987..b1f239cd78 100644 --- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs +++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringBoundUserInterface.cs @@ -1,4 +1,5 @@ using Content.Shared.Medical.CrewMonitoring; +using Robust.Client.UserInterface; namespace Content.Client.Medical.CrewMonitoring; @@ -14,7 +15,7 @@ public sealed class CrewMonitoringBoundUserInterface : BoundUserInterface protected override void Open() { EntityUid? gridUid = null; - string stationName = string.Empty; + var stationName = string.Empty; if (EntMan.TryGetComponent(Owner, out var xform)) { @@ -26,10 +27,8 @@ public sealed class CrewMonitoringBoundUserInterface : BoundUserInterface } } - _menu = new CrewMonitoringWindow(stationName, gridUid); - - _menu.OpenCentered(); - _menu.OnClose += Close; + _menu = this.CreateWindow(); + _menu.Set(stationName, gridUid); } protected override void UpdateState(BoundUserInterfaceState state) @@ -44,13 +43,4 @@ public sealed class CrewMonitoringBoundUserInterface : BoundUserInterface break; } } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _menu?.Dispose(); - } } diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs index 863412e553..e861864c14 100644 --- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs +++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs @@ -23,22 +23,27 @@ namespace Content.Client.Medical.CrewMonitoring; [GenerateTypedNameReferences] public sealed partial class CrewMonitoringWindow : FancyWindow { - private readonly IEntityManager _entManager; - private readonly IPrototypeManager _prototypeManager; + [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; private readonly SpriteSystem _spriteSystem; private NetEntity? _trackedEntity; private bool _tryToScrollToListFocus; private Texture? _blipTexture; - public CrewMonitoringWindow(string stationName, EntityUid? mapUid) + public CrewMonitoringWindow() { RobustXamlLoader.Load(this); + IoCManager.InjectDependencies(this); - _entManager = IoCManager.Resolve(); - _prototypeManager = IoCManager.Resolve(); _spriteSystem = _entManager.System(); + NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap; + + } + + public void Set(string stationName, EntityUid? mapUid) + { _blipTexture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png"))); if (_entManager.TryGetComponent(mapUid, out var xform)) @@ -49,8 +54,6 @@ public sealed partial class CrewMonitoringWindow : FancyWindow StationName.AddStyleClass("LabelBig"); StationName.Text = stationName; - - NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap; NavMap.ForceNavMapUpdate(); } diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs index 80c98f143b..f85220a926 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Client.NetworkConfigurator.Systems; using Content.Shared.DeviceNetwork; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; namespace Content.Client.NetworkConfigurator; @@ -35,14 +36,12 @@ public sealed class NetworkConfiguratorBoundUserInterface : BoundUserInterface switch (UiKey) { case NetworkConfiguratorUiKey.List: - _listMenu = new NetworkConfiguratorListMenu(this); - _listMenu.OnClose += Close; + _listMenu = this.CreateWindow(); _listMenu.ClearButton.OnPressed += _ => OnClearButtonPressed(); - _listMenu.OpenCenteredRight(); + _listMenu.OnRemoveAddress += OnRemoveButtonPressed; break; case NetworkConfiguratorUiKey.Configure: - _configurationMenu = new NetworkConfiguratorConfigurationMenu(); - _configurationMenu.OnClose += Close; + _configurationMenu = this.CreateWindow(); _configurationMenu.Set.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Set); _configurationMenu.Add.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Add); //_configurationMenu.Edit.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Edit); @@ -50,12 +49,24 @@ public sealed class NetworkConfiguratorBoundUserInterface : BoundUserInterface _configurationMenu.Copy.OnPressed += _ => OnConfigButtonPressed(NetworkConfiguratorButtonKey.Copy); _configurationMenu.Show.OnPressed += OnShowPressed; _configurationMenu.Show.Pressed = _netConfig.ConfiguredListIsTracked(Owner); - _configurationMenu.OpenCentered(); + _configurationMenu.OnRemoveAddress += OnRemoveButtonPressed; break; case NetworkConfiguratorUiKey.Link: - _linkMenu = new NetworkConfiguratorLinkMenu(this); - _linkMenu.OnClose += Close; - _linkMenu.OpenCentered(); + _linkMenu = this.CreateWindow(); + _linkMenu.OnLinkDefaults += args => + { + SendMessage(new NetworkConfiguratorLinksSaveMessage(args)); + }; + + _linkMenu.OnToggleLink += (left, right) => + { + SendMessage(new NetworkConfiguratorToggleLinkMessage(left, right)); + }; + + _linkMenu.OnClearLinks += () => + { + SendMessage(new NetworkConfiguratorClearLinksMessage()); + }; break; } } @@ -83,16 +94,6 @@ public sealed class NetworkConfiguratorBoundUserInterface : BoundUserInterface } } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - - _linkMenu?.Dispose(); - _listMenu?.Dispose(); - _configurationMenu?.Dispose(); - } - private void OnClearButtonPressed() { SendMessage(new NetworkConfiguratorClearDevicesMessage()); diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs index 19d04cd346..fcd2f75918 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs @@ -9,17 +9,23 @@ namespace Content.Client.NetworkConfigurator; [GenerateTypedNameReferences] public sealed partial class NetworkConfiguratorConfigurationMenu : FancyWindow { + public event Action? OnRemoveAddress; + public NetworkConfiguratorConfigurationMenu() { RobustXamlLoader.Load(this); Clear.StyleClasses.Add(StyleBase.ButtonOpenLeft); Clear.StyleClasses.Add(StyleNano.StyleClassButtonColorRed); + DeviceList.OnRemoveAddress += args => + { + OnRemoveAddress?.Invoke(args); + }; } public void UpdateState(DeviceListUserInterfaceState state) { - DeviceList.UpdateState(null, state.DeviceList); + DeviceList.UpdateState(state.DeviceList, false); Count.Text = Loc.GetString("network-configurator-ui-count-label", ("count", state.DeviceList.Count)); } diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs index 8cfa97dc6c..e75c60058c 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorDeviceList.xaml.cs @@ -7,17 +7,19 @@ namespace Content.Client.NetworkConfigurator; [GenerateTypedNameReferences] public sealed partial class NetworkConfiguratorDeviceList : ScrollContainer { - public void UpdateState(NetworkConfiguratorBoundUserInterface? ui, HashSet<(string address, string name)> devices) + public event Action? OnRemoveAddress; + + public void UpdateState(HashSet<(string address, string name)> devices, bool ui) { DeviceList.RemoveAllChildren(); foreach (var device in devices) { - DeviceList.AddChild(BuildDeviceListRow(ui, device)); + DeviceList.AddChild(BuildDeviceListRow(device, ui)); } } - private static BoxContainer BuildDeviceListRow(NetworkConfiguratorBoundUserInterface? ui, (string address, string name) savedDevice) + private BoxContainer BuildDeviceListRow((string address, string name) savedDevice, bool ui) { var row = new BoxContainer() { @@ -48,10 +50,10 @@ public sealed partial class NetworkConfiguratorDeviceList : ScrollContainer row.AddChild(name); row.AddChild(address); - if (ui != null) + if (ui) { row.AddChild(removeButton); - removeButton.OnPressed += _ => ui.OnRemoveButtonPressed(savedDevice.address); + removeButton.OnPressed += _ => OnRemoveAddress?.Invoke(savedDevice.address); } return row; diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs index c04b42f249..8cdffd16af 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs @@ -18,20 +18,20 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow private readonly LinksRender _links; - private readonly List _sources = new(); private readonly List _sinks = new(); - private readonly NetworkConfiguratorBoundUserInterface _userInterface; - private (ButtonPosition position, string id, int index)? _selectedButton; private List<(string left, string right)>? _defaults; - public NetworkConfiguratorLinkMenu(NetworkConfiguratorBoundUserInterface userInterface) + public event Action? OnClearLinks; + public event Action? OnToggleLink; + public event Action>? OnLinkDefaults; + + public NetworkConfiguratorLinkMenu() { - _userInterface = userInterface; RobustXamlLoader.Load(this); var footerStyleBox = new StyleBoxFlat() @@ -52,7 +52,7 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow ButtonOk.OnPressed += _ => Close(); ButtonLinkDefault.OnPressed += _ => LinkDefaults(); - ButtonClear.OnPressed += _ => _userInterface.SendMessage(new NetworkConfiguratorClearLinksMessage()); + ButtonClear.OnPressed += _ => OnClearLinks?.Invoke(); } public void UpdateState(DeviceLinkUserInterfaceState linkState) @@ -98,7 +98,7 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow if (_defaults == default) return; - _userInterface.SendMessage(new NetworkConfiguratorLinksSaveMessage(_defaults)); + OnLinkDefaults?.Invoke(_defaults); } private Button CreateButton(ButtonPosition position, string name, string description, string id, int index) @@ -138,7 +138,7 @@ public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow var left = _selectedButton.Value.position == ButtonPosition.Left ? _selectedButton.Value.id : id; var right = _selectedButton.Value.position == ButtonPosition.Left ? id : _selectedButton.Value.id; - _userInterface.SendMessage(new NetworkConfiguratorToggleLinkMessage(left, right)); + OnToggleLink?.Invoke(left, right); args.Button.Pressed = false; diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs index fb4aec1974..6294facaee 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs @@ -9,17 +9,20 @@ namespace Content.Client.NetworkConfigurator; [GenerateTypedNameReferences] public sealed partial class NetworkConfiguratorListMenu : FancyWindow { - private readonly NetworkConfiguratorBoundUserInterface _ui; - public NetworkConfiguratorListMenu(NetworkConfiguratorBoundUserInterface ui) + public event Action? OnRemoveAddress; + + public NetworkConfiguratorListMenu() { RobustXamlLoader.Load(this); - - _ui = ui; + DeviceList.OnRemoveAddress += args => + { + OnRemoveAddress?.Invoke(args); + }; } public void UpdateState(NetworkConfiguratorUserInterfaceState state) { DeviceCountLabel.Text = Loc.GetString("network-configurator-ui-count-label", ("count", state.DeviceList.Count)); - DeviceList.UpdateState(_ui, state.DeviceList); + DeviceList.UpdateState(state.DeviceList, true); } } diff --git a/Content.Client/Nuke/NukeBoundUserInterface.cs b/Content.Client/Nuke/NukeBoundUserInterface.cs index 59fbc5b319..2e15042373 100644 --- a/Content.Client/Nuke/NukeBoundUserInterface.cs +++ b/Content.Client/Nuke/NukeBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Containers.ItemSlots; using Content.Shared.Nuke; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Nuke { @@ -11,15 +12,13 @@ namespace Content.Client.Nuke [ViewVariables] private NukeMenu? _menu; - public NukeBoundUserInterface([NotNull] EntityUid owner, [NotNull] Enum uiKey) : base(owner, uiKey) + public NukeBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } protected override void Open() { - _menu = new NukeMenu(); - _menu.OpenCentered(); - _menu.OnClose += Close; + _menu = this.CreateWindow(); _menu.OnKeypadButtonPressed += i => { @@ -62,15 +61,5 @@ namespace Content.Client.Nuke break; } } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _menu?.Close(); - _menu?.Dispose(); - } } } diff --git a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs index ec055b3240..ad4f1a75d4 100644 --- a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs +++ b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Chat; using Content.Shared.NukeOps; using JetBrains.Annotations; +using Robust.Client.UserInterface; using Robust.Shared.Configuration; using Robust.Shared.Timing; @@ -11,8 +12,6 @@ namespace Content.Client.NukeOps; public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface { [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ILocalizationManager _localizationManager = default!; [ViewVariables] private WarDeclaratorWindow? _window; @@ -23,13 +22,7 @@ public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface { base.Open(); - _window = new WarDeclaratorWindow(_gameTiming, _localizationManager); - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.OnActivated += OnWarDeclaratorActivated; } @@ -42,13 +35,6 @@ public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface _window?.UpdateState(cast); } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (disposing) - _window?.Dispose(); - } - private void OnWarDeclaratorActivated(string message) { var maxLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength); diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs index b4a3f1c7fa..aeceae1327 100644 --- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs +++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs @@ -11,7 +11,8 @@ namespace Content.Client.NukeOps; [GenerateTypedNameReferences] public sealed partial class WarDeclaratorWindow : FancyWindow { - private readonly IGameTiming _gameTiming; + [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly ILocalizationManager _localizationManager = default!; public event Action? OnActivated; @@ -19,15 +20,13 @@ public sealed partial class WarDeclaratorWindow : FancyWindow private TimeSpan _shuttleDisabledTime; private WarConditionStatus _status; - public WarDeclaratorWindow(IGameTiming gameTiming, ILocalizationManager localizationManager) + public WarDeclaratorWindow() { RobustXamlLoader.Load(this); - _gameTiming = gameTiming; - WarButton.OnPressed += (_) => OnActivated?.Invoke(Rope.Collapse(MessageEdit.TextRope)); - MessageEdit.Placeholder = new Rope.Leaf(localizationManager.GetString("war-declarator-message-placeholder")); + MessageEdit.Placeholder = new Rope.Leaf(_localizationManager.GetString("war-declarator-message-placeholder")); } protected override void FrameUpdate(FrameEventArgs args) diff --git a/Content.Client/PDA/PdaBoundUserInterface.cs b/Content.Client/PDA/PdaBoundUserInterface.cs index f8f4c67076..37ce9c4280 100644 --- a/Content.Client/PDA/PdaBoundUserInterface.cs +++ b/Content.Client/PDA/PdaBoundUserInterface.cs @@ -24,14 +24,13 @@ namespace Content.Client.PDA if (_menu == null) CreateMenu(); - - _menu?.OpenCenteredLeft(); } private void CreateMenu() { - _menu = new PdaMenu(); - _menu.OnClose += Close; + _menu = this.CreateWindow(); + _menu.OpenCenteredLeft(); + _menu.FlashLightToggleButton.OnToggled += _ => { SendMessage(new PdaToggleFlashlightMessage()); @@ -96,7 +95,6 @@ namespace Content.Client.PDA _menu?.UpdateState(updateState); } - protected override void AttachCartridgeUI(Control cartridgeUIFragment, string? title) { _menu?.ProgramView.AddChild(cartridgeUIFragment); @@ -118,15 +116,6 @@ namespace Content.Client.PDA _menu?.UpdateAvailablePrograms(programs); } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _menu?.Dispose(); - } - private PdaBorderColorComponent? GetBorderColorComponent() { return EntMan.GetComponentOrNull(Owner); diff --git a/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs b/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs index a0688523f1..170a296ac2 100644 --- a/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs +++ b/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.PDA; using Content.Shared.PDA.Ringer; using JetBrains.Annotations; +using Robust.Client.UserInterface; using Robust.Shared.Timing; namespace Content.Client.PDA.Ringer @@ -18,9 +19,8 @@ namespace Content.Client.PDA.Ringer protected override void Open() { base.Open(); - _menu = new RingtoneMenu(); + _menu = this.CreateWindow(); _menu.OpenToLeft(); - _menu.OnClose += Close; _menu.TestRingerButton.OnPressed += _ => { diff --git a/Content.Client/Paper/UI/PaperBoundUserInterface.cs b/Content.Client/Paper/UI/PaperBoundUserInterface.cs index 4b0ac868f0..f3ad1e347e 100644 --- a/Content.Client/Paper/UI/PaperBoundUserInterface.cs +++ b/Content.Client/Paper/UI/PaperBoundUserInterface.cs @@ -1,4 +1,5 @@ using JetBrains.Annotations; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Utility; using static Content.Shared.Paper.SharedPaperComponent; @@ -19,16 +20,13 @@ public sealed class PaperBoundUserInterface : BoundUserInterface { base.Open(); - _window = new PaperWindow(); - _window.OnClose += Close; - _window.OnSaved += Input_OnTextEntered; + _window = this.CreateWindow(); + _window.OnSaved += InputOnTextEntered; if (EntMan.TryGetComponent(Owner, out var visuals)) { _window.InitVisuals(Owner, visuals); } - - _window.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -37,7 +35,7 @@ public sealed class PaperBoundUserInterface : BoundUserInterface _window?.Populate((PaperBoundUserInterfaceState) state); } - private void Input_OnTextEntered(string text) + private void InputOnTextEntered(string text) { SendMessage(new PaperInputTextMessage(text)); @@ -47,11 +45,4 @@ public sealed class PaperBoundUserInterface : BoundUserInterface _window.Input.CursorPosition = new TextEdit.CursorPos(0, TextEdit.LineBreakBias.Top); } } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _window?.Dispose(); - } } diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs index 7a5fd65264..f7cace642c 100644 --- a/Content.Client/Paper/UI/PaperWindow.xaml.cs +++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs @@ -17,6 +17,7 @@ namespace Content.Client.Paper.UI public sealed partial class PaperWindow : BaseWindow { [Dependency] private readonly IInputManager _inputManager = default!; + [Dependency] private readonly IResourceCache _resCache = default!; private static Color DefaultTextColor = new(25, 25, 25); @@ -85,11 +86,10 @@ namespace Content.Client.Paper.UI // Randomize the placement of any stamps based on the entity UID // so that there's some variety in different papers. StampDisplay.PlacementSeed = (int)entity; - var resCache = IoCManager.Resolve(); // Initialize the background: PaperBackground.ModulateSelfOverride = visuals.BackgroundModulate; - var backgroundImage = visuals.BackgroundImagePath != null? resCache.GetResource(visuals.BackgroundImagePath) : null; + var backgroundImage = visuals.BackgroundImagePath != null? _resCache.GetResource(visuals.BackgroundImagePath) : null; if (backgroundImage != null) { var backgroundImageMode = visuals.BackgroundImageTile ? StyleBoxTexture.StretchMode.Tile : StyleBoxTexture.StretchMode.Stretch; @@ -127,7 +127,7 @@ namespace Content.Client.Paper.UI PaperContent.ModulateSelfOverride = visuals.ContentImageModulate; WrittenTextLabel.ModulateSelfOverride = visuals.FontAccentColor; - var contentImage = visuals.ContentImagePath != null ? resCache.GetResource(visuals.ContentImagePath) : null; + var contentImage = visuals.ContentImagePath != null ? _resCache.GetResource(visuals.ContentImagePath) : null; if (contentImage != null) { // Setup the paper content texture, but keep a reference to it, as we can't set diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs index cde5ba9ef7..ff1eae36f5 100644 --- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs +++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Singularity.Components; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.ParticleAccelerator.UI { @@ -16,9 +17,10 @@ namespace Content.Client.ParticleAccelerator.UI { base.Open(); - _menu = new ParticleAcceleratorControlMenu(this); - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); + _menu.OnOverallState += SendEnableMessage; + _menu.OnPowerState += SendPowerStateMessage; + _menu.OnScanPartsRequested += SendScanPartsMessage; } public void SendEnableMessage(bool enable) @@ -40,13 +42,5 @@ namespace Content.Client.ParticleAccelerator.UI { _menu?.DataUpdate((ParticleAcceleratorUIState) state); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - _menu?.Dispose(); - _menu = null; - } } } diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs index c69e027137..05a296edf3 100644 --- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs +++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs @@ -18,9 +18,10 @@ namespace Content.Client.ParticleAccelerator.UI { public sealed class ParticleAcceleratorControlMenu : BaseWindow { - private readonly ShaderInstance _greyScaleShader; + [Dependency] private readonly IPrototypeManager _protoManager = default!; + [Dependency] private readonly IResourceCache _cache = default!; - private readonly ParticleAcceleratorBoundUserInterface _owner; + private readonly ShaderInstance _greyScaleShader; private readonly Label _drawLabel; private readonly FastNoiseLite _drawNoiseGenerator; @@ -50,19 +51,22 @@ namespace Content.Client.ParticleAccelerator.UI private bool _shouldContinueAnimating; private int _maxStrength = 3; - public ParticleAcceleratorControlMenu(ParticleAcceleratorBoundUserInterface owner) - { - SetSize = new Vector2(400, 320); - _greyScaleShader = IoCManager.Resolve().Index("Greyscale").Instance(); + public event Action? OnOverallState; + public event Action? OnPowerState; + public event Action? OnScanPartsRequested; + + public ParticleAcceleratorControlMenu() + { + IoCManager.InjectDependencies(this); + SetSize = new Vector2(400, 320); + _greyScaleShader = _protoManager.Index("Greyscale").Instance(); - _owner = owner; _drawNoiseGenerator = new(); _drawNoiseGenerator.SetFractalType(FastNoiseLite.FractalType.FBm); _drawNoiseGenerator.SetFrequency(0.5f); - var resourceCache = IoCManager.Resolve(); - var font = resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13); - var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); + var font = _cache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13); + var panelTex = _cache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); MouseFilter = MouseFilterMode.Stop; @@ -112,7 +116,8 @@ namespace Content.Client.ParticleAccelerator.UI Text = Loc.GetString("particle-accelerator-control-menu-off-button"), StyleClasses = { StyleBase.ButtonOpenRight }, }; - _offButton.OnPressed += args => owner.SendEnableMessage(false); + + _offButton.OnPressed += args => OnOverallState?.Invoke(false); _onButton = new Button { @@ -120,7 +125,7 @@ namespace Content.Client.ParticleAccelerator.UI Text = Loc.GetString("particle-accelerator-control-menu-on-button"), StyleClasses = { StyleBase.ButtonOpenLeft }, }; - _onButton.OnPressed += args => owner.SendEnableMessage(true); + _onButton.OnPressed += args => OnOverallState?.Invoke(true); var closeButton = new TextureButton { @@ -316,7 +321,7 @@ namespace Content.Client.ParticleAccelerator.UI } }); - _scanButton.OnPressed += args => _owner.SendScanPartsMessage(); + _scanButton.OnPressed += args => OnScanPartsRequested?.Invoke(); _alarmControl.AnimationCompleted += s => { @@ -332,7 +337,7 @@ namespace Content.Client.ParticleAccelerator.UI PASegmentControl Segment(string name) { - return new(this, resourceCache, name); + return new(this, _cache, name); } UpdateUI(false, false, false, false); @@ -368,7 +373,7 @@ namespace Content.Client.ParticleAccelerator.UI } _stateSpinBox.SetButtonDisabled(true); - _owner.SendPowerStateMessage(newState); + OnPowerState?.Invoke(newState); } protected override DragMode GetDragModeFor(Vector2 relativeMousePos) diff --git a/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs b/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs index 3ebcf7cbce..0df6787170 100644 --- a/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs +++ b/Content.Client/Pinpointer/UI/NavMapBeaconBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Pinpointer; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Pinpointer.UI; @@ -16,19 +17,16 @@ public sealed class NavMapBeaconBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _window = new NavMapBeaconWindow(Owner); - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); + + if (EntMan.TryGetComponent(Owner, out NavMapBeaconComponent? beacon)) + { + _window.SetEntity(Owner, beacon); + } _window.OnApplyButtonPressed += (label, enabled, color) => { SendMessage(new NavMapBeaconConfigureBuiMessage(label, enabled, color)); }; } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - _window?.Dispose(); - } } diff --git a/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs b/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs index 968fe188f7..b77f1af047 100644 --- a/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs +++ b/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs @@ -10,36 +10,35 @@ namespace Content.Client.Pinpointer.UI; [GenerateTypedNameReferences] public sealed partial class NavMapBeaconWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; - private string? _defaultLabel; private bool _defaultEnabled; private Color _defaultColor; public event Action? OnApplyButtonPressed; - public NavMapBeaconWindow(EntityUid beaconEntity) + public NavMapBeaconWindow() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - if (!_entityManager.TryGetComponent(beaconEntity, out var navMap)) - return; + + VisibleButton.OnPressed += args => UpdateVisibleButton(args.Button.Pressed); + LabelLineEdit.OnTextChanged += OnTextChanged; + ColorSelector.OnColorChanged += _ => TryEnableApplyButton(); + + TryEnableApplyButton(); + ApplyButton.OnPressed += OnApplyPressed; + } + + public void SetEntity(EntityUid uid, NavMapBeaconComponent navMap) + { _defaultLabel = navMap.Text; _defaultEnabled = navMap.Enabled; _defaultColor = navMap.Color; UpdateVisibleButton(navMap.Enabled); - VisibleButton.OnPressed += args => UpdateVisibleButton(args.Button.Pressed); - LabelLineEdit.Text = navMap.Text ?? string.Empty; - LabelLineEdit.OnTextChanged += OnTextChanged; - ColorSelector.Color = navMap.Color; - ColorSelector.OnColorChanged += _ => TryEnableApplyButton(); - - TryEnableApplyButton(); - ApplyButton.OnPressed += OnApplyPressed; } private void UpdateVisibleButton(bool value) diff --git a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs index 1483e75e73..7417fafede 100644 --- a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs +++ b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs @@ -1,4 +1,4 @@ -using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Pinpointer.UI; @@ -14,7 +14,6 @@ public sealed class StationMapBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _window?.Close(); EntityUid? gridUid = null; if (EntMan.TryGetComponent(Owner, out var xform)) @@ -22,14 +21,8 @@ public sealed class StationMapBoundUserInterface : BoundUserInterface gridUid = xform.GridUid; } - _window = new StationMapWindow(gridUid, Owner); - _window.OpenCentered(); - _window.OnClose += Close; - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - _window?.Dispose(); + _window = this.CreateWindow(); + _window.Title = EntMan.GetComponent(Owner).EntityName; + _window.Set(gridUid, Owner); } } diff --git a/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs b/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs index 1b01fe4e30..7cbb8b7d0d 100644 --- a/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs +++ b/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs @@ -9,19 +9,18 @@ namespace Content.Client.Pinpointer.UI; [GenerateTypedNameReferences] public sealed partial class StationMapWindow : FancyWindow { - public StationMapWindow(EntityUid? mapUid, EntityUid? trackedEntity) + public StationMapWindow() { RobustXamlLoader.Load(this); + } + + public void Set(EntityUid? mapUid, EntityUid? trackedEntity) + { NavMapScreen.MapUid = mapUid; if (trackedEntity != null) NavMapScreen.TrackedCoordinates.Add(new EntityCoordinates(trackedEntity.Value, Vector2.Zero), (true, Color.Cyan)); - if (IoCManager.Resolve().TryGetComponent(mapUid, out var metadata)) - { - Title = metadata.EntityName; - } - NavMapScreen.ForceNavMapUpdate(); } } diff --git a/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs index 57965b030a..a3ca6f65da 100644 --- a/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs +++ b/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs @@ -1,4 +1,4 @@ -using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Pinpointer.UI; @@ -14,22 +14,15 @@ public sealed class UntrackedStationMapBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _window?.Close(); EntityUid? gridUid = null; + // TODO: What this just looks like it's been copy-pasted wholesale from StationMapBoundUserInterface? if (EntMan.TryGetComponent(Owner, out var xform)) { gridUid = xform.GridUid; } - _window = new StationMapWindow(gridUid, null); - _window.OpenCentered(); - _window.OnClose += Close; - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - _window?.Dispose(); + _window = this.CreateWindow(); + _window.Set(gridUid, Owner); } } diff --git a/Content.Client/Power/APC/ApcBoundUserInterface.cs b/Content.Client/Power/APC/ApcBoundUserInterface.cs index fbcbf01156..759a5949ba 100644 --- a/Content.Client/Power/APC/ApcBoundUserInterface.cs +++ b/Content.Client/Power/APC/ApcBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.APC; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Power.APC { @@ -19,9 +20,8 @@ namespace Content.Client.Power.APC { base.Open(); - _menu = new ApcMenu(this); - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); + _menu.OnBreaker += BreakerPressed; } protected override void UpdateState(BoundUserInterfaceState state) @@ -36,15 +36,5 @@ namespace Content.Client.Power.APC { SendMessage(new ApcToggleMainBreakerMessage()); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _menu?.Dispose(); - } - } } } diff --git a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs index dbf68ea07b..2f61ea63a8 100644 --- a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs +++ b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs @@ -17,13 +17,19 @@ namespace Content.Client.Power.APC.UI [GenerateTypedNameReferences] public sealed partial class ApcMenu : FancyWindow { - public ApcMenu(ApcBoundUserInterface owner) + public event Action? OnBreaker; + + public ApcMenu() { IoCManager.InjectDependencies(this); RobustXamlLoader.Load(this); - EntityView.SetEntity(owner.Owner); - BreakerButton.OnPressed += _ => owner.BreakerPressed(); + BreakerButton.OnPressed += _ => OnBreaker?.Invoke(); + } + + public void SetEntity(EntityUid entity) + { + EntityView.SetEntity(entity); } public void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs index bd5b75de1d..e975e5d466 100644 --- a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs +++ b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs @@ -9,35 +9,39 @@ namespace Content.Client.Power.Generator; [GenerateTypedNameReferences] public sealed partial class GeneratorWindow : FancyWindow { - private readonly EntityUid _entity; - [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly ILocalizationManager _loc = default!; - private readonly SharedPowerSwitchableSystem _switchable; - private readonly FuelGeneratorComponent? _component; - private PortableGeneratorComponentBuiState? _lastState; + private EntityUid _entity; - public GeneratorWindow(PortableGeneratorBoundUserInterface bui, EntityUid entity) + public float? MaximumPower; + + public event Action? OnPower; + public event Action? OnState; + public event Action? OnSwitchOutput; + public event Action? OnEjectFuel; + + public GeneratorWindow() { - _entity = entity; RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - _entityManager.TryGetComponent(entity, out _component); - _switchable = _entityManager.System(); - - EntityView.SetEntity(entity); TargetPower.IsValid += IsValid; TargetPower.ValueChanged += (args) => { - bui.SetTargetPower(args.Value); + OnPower?.Invoke(args.Value); }; - StartButton.OnPressed += _ => bui.Start(); - StopButton.OnPressed += _ => bui.Stop(); - OutputSwitchButton.OnPressed += _ => bui.SwitchOutput(); - FuelEject.OnPressed += _ => bui.EjectFuel(); + StartButton.OnPressed += _ => OnState?.Invoke(true); + StopButton.OnPressed += _ => OnState?.Invoke(false); + OutputSwitchButton.OnPressed += _ => OnSwitchOutput?.Invoke(); + FuelEject.OnPressed += _ => OnEjectFuel?.Invoke(); + } + + public void SetEntity(EntityUid entity) + { + _entity = entity; + EntityView.SetEntity(entity); } private bool IsValid(int arg) @@ -45,7 +49,7 @@ public sealed partial class GeneratorWindow : FancyWindow if (arg < 0) return false; - if (arg > (_lastState?.MaximumPower / 1000.0f ?? 0)) + if (arg > (MaximumPower / 1000.0f ?? 0)) return false; return true; @@ -53,16 +57,17 @@ public sealed partial class GeneratorWindow : FancyWindow public void Update(PortableGeneratorComponentBuiState state) { - if (_component == null) + MaximumPower = state.MaximumPower; + + if (!_entityManager.TryGetComponent(_entity, out FuelGeneratorComponent? component)) return; - _lastState = state; if (!TargetPower.LineEditControl.HasKeyboardFocus()) TargetPower.OverrideValue((int)(state.TargetPower / 1000.0f)); - var efficiency = SharedGeneratorSystem.CalcFuelEfficiency(state.TargetPower, state.OptimalPower, _component); + var efficiency = SharedGeneratorSystem.CalcFuelEfficiency(state.TargetPower, state.OptimalPower, component); Efficiency.Text = efficiency.ToString("P1"); - var burnRate = _component.OptimalBurnRate / efficiency; + var burnRate = component.OptimalBurnRate / efficiency; var left = state.RemainingFuel / burnRate; Eta.Text = Loc.GetString( @@ -102,14 +107,15 @@ public sealed partial class GeneratorWindow : FancyWindow } var canSwitch = _entityManager.TryGetComponent(_entity, out PowerSwitchableComponent? switchable); + var switcher = _entityManager.System(); OutputSwitchLabel.Visible = canSwitch; OutputSwitchButton.Visible = canSwitch; if (switchable != null) { - var voltage = _switchable.VoltageString(_switchable.GetVoltage(_entity, switchable)); + var voltage = switcher.VoltageString(switcher.GetVoltage(_entity, switchable)); OutputSwitchLabel.Text = Loc.GetString("portable-generator-ui-current-output", ("voltage", voltage)); - var nextVoltage = _switchable.VoltageString(_switchable.GetNextVoltage(_entity, switchable)); + var nextVoltage = switcher.VoltageString(switcher.GetNextVoltage(_entity, switchable)); OutputSwitchButton.Text = Loc.GetString("power-switchable-switch-voltage", ("voltage", nextVoltage)); OutputSwitchButton.Disabled = state.On; } diff --git a/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs b/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs index 30679d71fd..550e1041b6 100644 --- a/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs +++ b/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Power.Generator; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Power.Generator; @@ -16,10 +17,25 @@ public sealed class PortableGeneratorBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _window = new GeneratorWindow(this, Owner); + _window = this.CreateWindow(); + _window.SetEntity(Owner); + _window.OnState += args => + { + if (args) + { + Start(); + } + else + { + Stop(); + } + }; + + _window.OnPower += SetTargetPower; + _window.OnEjectFuel += EjectFuel; + _window.OnSwitchOutput += SwitchOutput; _window.OpenCenteredLeft(); - _window.OnClose += Close; } protected override void UpdateState(BoundUserInterfaceState state) @@ -30,11 +46,6 @@ public sealed class PortableGeneratorBoundUserInterface : BoundUserInterface _window?.Update(msg); } - protected override void Dispose(bool disposing) - { - _window?.Dispose(); - } - public void SetTargetPower(int target) { SendMessage(new PortableGeneratorSetTargetPowerMessage(target)); diff --git a/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs b/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs index dc1dcd03ef..cbc343c06c 100644 --- a/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs +++ b/Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs @@ -1,4 +1,5 @@ using Content.Shared.Power; +using Robust.Client.UserInterface; namespace Content.Client.Power; @@ -11,9 +12,9 @@ public sealed class PowerMonitoringConsoleBoundUserInterface : BoundUserInterfac protected override void Open() { - _menu = new PowerMonitoringWindow(this, Owner); - _menu.OpenCentered(); - _menu.OnClose += Close; + _menu = this.CreateWindow(); + _menu.SetEntity(Owner); + _menu.SendPowerMonitoringConsoleMessageAction += SendPowerMonitoringConsoleMessage; } protected override void UpdateState(BoundUserInterfaceState state) @@ -22,9 +23,6 @@ public sealed class PowerMonitoringConsoleBoundUserInterface : BoundUserInterfac var castState = (PowerMonitoringConsoleBoundInterfaceState) state; - if (castState == null) - return; - EntMan.TryGetComponent(Owner, out var xform); _menu?.ShowEntites (castState.TotalSources, @@ -40,13 +38,4 @@ public sealed class PowerMonitoringConsoleBoundUserInterface : BoundUserInterfac { SendMessage(new PowerMonitoringConsoleMessage(netEntity, group)); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - _menu?.Dispose(); - } } diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs index 74752ddc53..d995299207 100644 --- a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs +++ b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs @@ -32,7 +32,7 @@ public sealed partial class PowerMonitoringWindow if (windowEntry == null) return; - // Update sources and loads + // Update sources and loads UpdateEntrySourcesOrLoads(masterContainer, windowEntry.SourcesContainer, focusSources, _sourceIcon); UpdateEntrySourcesOrLoads(masterContainer, windowEntry.LoadsContainer, focusLoads, _loadIconPath); @@ -134,7 +134,7 @@ public sealed partial class PowerMonitoringWindow subEntry.Button.OnButtonUp += args => { ButtonAction(subEntry, masterContainer); }; } - if (!_entManager.TryGetComponent(_owner, out var console)) + if (!_entManager.TryGetComponent(Entity, out var console)) return; // Update all children @@ -379,7 +379,7 @@ public sealed class PowerMonitoringWindowEntry : PowerMonitoringWindowBaseEntry AddChild(MainContainer); - // Grid container to hold the list of sources when selected + // Grid container to hold the list of sources when selected SourcesContainer = new BoxContainer() { Orientation = LayoutOrientation.Vertical, diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.cs index 81fe1f4d04..e304325248 100644 --- a/Content.Client/Power/PowerMonitoringWindow.xaml.cs +++ b/Content.Client/Power/PowerMonitoringWindow.xaml.cs @@ -15,13 +15,12 @@ namespace Content.Client.Power; [GenerateTypedNameReferences] public sealed partial class PowerMonitoringWindow : FancyWindow { - private readonly IEntityManager _entManager; + [Dependency] private IEntityManager _entManager = default!; private readonly SpriteSystem _spriteSystem; - private readonly IGameTiming _gameTiming; + [Dependency] private IGameTiming _gameTiming = default!; private const float BlinkFrequency = 1f; - private EntityUid? _owner; private NetEntity? _focusEntity; public event Action? SendPowerMonitoringConsoleMessageAction; @@ -34,40 +33,14 @@ public sealed partial class PowerMonitoringWindow : FancyWindow { PowerMonitoringConsoleGroup.APC, (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_triangle.png")), Color.LimeGreen) }, }; - public PowerMonitoringWindow(PowerMonitoringConsoleBoundUserInterface userInterface, EntityUid? owner) + public EntityUid Entity; + + public PowerMonitoringWindow() { RobustXamlLoader.Load(this); - _entManager = IoCManager.Resolve(); - _gameTiming = IoCManager.Resolve(); + IoCManager.InjectDependencies(this); _spriteSystem = _entManager.System(); - _owner = owner; - - // Pass owner to nav map - NavMap.Owner = _owner; - - // Set nav map grid uid - var stationName = Loc.GetString("power-monitoring-window-unknown-location"); - - if (_entManager.TryGetComponent(owner, out var xform)) - { - NavMap.MapUid = xform.GridUid; - - // Assign station name - if (_entManager.TryGetComponent(xform.GridUid, out var stationMetaData)) - stationName = stationMetaData.EntityName; - - var msg = new FormattedMessage(); - msg.AddMarkup(Loc.GetString("power-monitoring-window-station-name", ("stationName", stationName))); - - StationName.SetMessage(msg); - } - - else - { - StationName.SetMessage(stationName); - NavMap.Visible = false; - } // Set trackable entity selected action NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap; @@ -88,9 +61,37 @@ public sealed partial class PowerMonitoringWindow : FancyWindow ShowHVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.HighVoltage); ShowMVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.MediumVoltage); ShowLVCable.OnToggled += _ => OnShowCableToggled(PowerMonitoringConsoleLineGroup.Apc); + } - // Set power monitoring message action - SendPowerMonitoringConsoleMessageAction += userInterface.SendPowerMonitoringConsoleMessage; + public void SetEntity(EntityUid uid) + { + Entity = uid; + + // Pass owner to nav map + NavMap.Owner = uid; + + // Set nav map grid uid + var stationName = Loc.GetString("power-monitoring-window-unknown-location"); + + if (_entManager.TryGetComponent(uid, out var xform)) + { + NavMap.MapUid = xform.GridUid; + + // Assign station name + if (_entManager.TryGetComponent(xform.GridUid, out var stationMetaData)) + stationName = stationMetaData.EntityName; + + var msg = new FormattedMessage(); + msg.AddMarkupOrThrow(Loc.GetString("power-monitoring-window-station-name", ("stationName", stationName))); + + StationName.SetMessage(msg); + } + + else + { + StationName.SetMessage(stationName); + NavMap.Visible = false; + } } private void OnTabChanged(int tab) @@ -113,10 +114,7 @@ public sealed partial class PowerMonitoringWindow : FancyWindow PowerMonitoringConsoleEntry[] focusLoads, EntityCoordinates? monitorCoords) { - if (_owner == null) - return; - - if (!_entManager.TryGetComponent(_owner.Value, out var console)) + if (!_entManager.TryGetComponent(Entity, out var console)) return; // Update power status text @@ -161,13 +159,13 @@ public sealed partial class PowerMonitoringWindow : FancyWindow } // Show monitor location - var mon = _entManager.GetNetEntity(_owner); + var mon = _entManager.GetNetEntity(Entity); - if (monitorCoords != null && mon != null) + if (monitorCoords != null && mon.IsValid()) { var texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png"))); var blip = new NavMapBlip(monitorCoords.Value, texture, Color.Cyan, true, false); - NavMap.TrackedEntities[mon.Value] = blip; + NavMap.TrackedEntities[mon] = blip; } // If the entry group doesn't match the current tab, the data is out dated, do not use it @@ -239,7 +237,7 @@ public sealed partial class PowerMonitoringWindow : FancyWindow if (netEntity == null) return; - if (!_entManager.TryGetComponent(_owner, out var console)) + if (!_entManager.TryGetComponent(Entity, out var console)) return; if (!console.PowerMonitoringDeviceMetaData.TryGetValue(netEntity.Value, out var metaData)) @@ -266,7 +264,7 @@ public sealed partial class PowerMonitoringWindow : FancyWindow { AutoScrollToFocus(); - // Warning sign pulse + // Warning sign pulse var lit = _gameTiming.RealTime.TotalSeconds % BlinkFrequency > BlinkFrequency / 2f; SystemWarningPanel.Modulate = lit ? Color.White : new Color(178, 178, 178); } diff --git a/Content.Client/RCD/RCDMenu.xaml.cs b/Content.Client/RCD/RCDMenu.xaml.cs index 3eb0397a69..f0d27d6b1f 100644 --- a/Content.Client/RCD/RCDMenu.xaml.cs +++ b/Content.Client/RCD/RCDMenu.xaml.cs @@ -20,31 +20,37 @@ public sealed partial class RCDMenu : RadialMenu [Dependency] private readonly IPrototypeManager _protoManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; - private readonly SpriteSystem _spriteSystem; - private readonly SharedPopupSystem _popup; + private SharedPopupSystem _popup; + private SpriteSystem _sprites; public event Action>? SendRCDSystemMessageAction; private EntityUid _owner; - public RCDMenu(EntityUid owner, RCDMenuBoundUserInterface bui) + public RCDMenu() { IoCManager.InjectDependencies(this); RobustXamlLoader.Load(this); - _spriteSystem = _entManager.System(); _popup = _entManager.System(); + _sprites = _entManager.System(); - _owner = owner; + OnChildAdded += AddRCDMenuButtonOnClickActions; + } + public void SetEntity(EntityUid uid) + { + _owner = uid; + Refresh(); + } + + public void Refresh() + { // Find the main radial container var main = FindControl("Main"); - if (main == null) - return; - // Populate secondary radial containers - if (!_entManager.TryGetComponent(owner, out var rcd)) + if (!_entManager.TryGetComponent(_owner, out var rcd)) return; foreach (var protoId in rcd.AvailablePrototypes) @@ -56,14 +62,10 @@ public sealed partial class RCDMenu : RadialMenu continue; var parent = FindControl(proto.Category); - - if (parent == null) - continue; - var tooltip = Loc.GetString(proto.SetName); if ((proto.Mode == RcdMode.ConstructTile || proto.Mode == RcdMode.ConstructObject) && - proto.Prototype != null && _protoManager.TryIndex(proto.Prototype, out var entProto)) + proto.Prototype != null && _protoManager.TryIndex(proto.Prototype, out var entProto, logError: false)) { tooltip = Loc.GetString(entProto.Name); } @@ -84,7 +86,7 @@ public sealed partial class RCDMenu : RadialMenu { VerticalAlignment = VAlignment.Center, HorizontalAlignment = HAlignment.Center, - Texture = _spriteSystem.Frame0(proto.Sprite), + Texture = _sprites.Frame0(proto.Sprite), TextureScale = new Vector2(2f, 2f), }; @@ -112,11 +114,9 @@ public sealed partial class RCDMenu : RadialMenu // Set up menu actions foreach (var child in Children) + { AddRCDMenuButtonOnClickActions(child); - - OnChildAdded += AddRCDMenuButtonOnClickActions; - - SendRCDSystemMessageAction += bui.SendRCDSystemMessage; + } } private static string OopsConcat(string a, string b) @@ -153,7 +153,7 @@ public sealed partial class RCDMenu : RadialMenu var name = Loc.GetString(proto.SetName); if (proto.Prototype != null && - _protoManager.TryIndex(proto.Prototype, out var entProto)) + _protoManager.TryIndex(proto.Prototype, out var entProto, logError: false)) name = entProto.Name; msg = Loc.GetString("rcd-component-change-build-mode", ("name", name)); diff --git a/Content.Client/RCD/RCDMenuBoundUserInterface.cs b/Content.Client/RCD/RCDMenuBoundUserInterface.cs index a37dbcecf8..1dd03626ae 100644 --- a/Content.Client/RCD/RCDMenuBoundUserInterface.cs +++ b/Content.Client/RCD/RCDMenuBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.RCD.Components; using JetBrains.Annotations; using Robust.Client.Graphics; using Robust.Client.Input; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.RCD; @@ -24,8 +25,9 @@ public sealed class RCDMenuBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new(Owner, this); - _menu.OnClose += Close; + _menu = this.CreateWindow(); + _menu.SetEntity(Owner); + _menu.SendRCDSystemMessageAction += SendRCDSystemMessage; // Open the menu, centered on the mouse var vpSize = _displayManager.ScreenSize; @@ -34,16 +36,8 @@ public sealed class RCDMenuBoundUserInterface : BoundUserInterface public void SendRCDSystemMessage(ProtoId protoId) { - // A predicted message cannot be used here as the RCD UI is closed immediately + // A predicted message cannot be used here as the RCD UI is closed immediately // after this message is sent, which will stop the server from receiving it SendMessage(new RCDSystemMessage(protoId)); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - - _menu?.Dispose(); - } } diff --git a/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs b/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs index 7b3e39aa08..401e7edd44 100644 --- a/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs +++ b/Content.Client/Radio/Ui/IntercomBoundUserInterface.cs @@ -1,6 +1,8 @@ using Content.Shared.Radio; using Content.Shared.Radio.Components; using JetBrains.Annotations; +using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Radio.Ui; @@ -19,9 +21,12 @@ public sealed class IntercomBoundUserInterface : BoundUserInterface { base.Open(); - var comp = EntMan.GetComponent(Owner); + _menu = this.CreateWindow(); - _menu = new((Owner, comp)); + if (EntMan.TryGetComponent(Owner, out IntercomComponent? intercom)) + { + _menu.Update((Owner, intercom)); + } _menu.OnMicPressed += enabled => { @@ -35,17 +40,6 @@ public sealed class IntercomBoundUserInterface : BoundUserInterface { SendMessage(new SelectIntercomChannelMessage(channel)); }; - - _menu.OnClose += Close; - _menu.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _menu?.Close(); } public void Update(Entity ent) diff --git a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs index 2e08913051..20d2e4a3e5 100644 --- a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs +++ b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs @@ -18,15 +18,13 @@ public sealed partial class IntercomMenu : FancyWindow private readonly List _channels = new(); - public IntercomMenu(Entity entity) + public IntercomMenu() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); MicButton.OnPressed += args => OnMicPressed?.Invoke(args.Button.Pressed); SpeakerButton.OnPressed += args => OnSpeakerPressed?.Invoke(args.Button.Pressed); - - Update(entity); } public void Update(Entity entity) diff --git a/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs b/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs index c14a8c5bd0..9641adb5b2 100644 --- a/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs +++ b/Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs @@ -1,5 +1,7 @@ using Content.Shared.Research; using Content.Shared.Research.Components; +using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Research.UI { @@ -16,10 +18,7 @@ namespace Content.Client.Research.UI { base.Open(); - _menu = new(); - - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); _menu.OnServerButtonPressed += () => { @@ -31,14 +30,6 @@ namespace Content.Client.Research.UI }; } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _menu?.Close(); - } - protected override void UpdateState(BoundUserInterfaceState state) { base.UpdateState(state); diff --git a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs index a0a2b58e88..288445e4de 100644 --- a/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs +++ b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs @@ -1,4 +1,6 @@ using Content.Shared.Research.Components; +using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Research.UI { @@ -15,10 +17,9 @@ namespace Content.Client.Research.UI protected override void Open() { base.Open(); - - _menu = new ResearchClientServerSelectionMenu(this); - _menu.OnClose += Close; - _menu.OpenCentered(); + _menu = this.CreateWindow(); + _menu.OnServerSelected += SelectServer; + _menu.OnServerDeselected += DeselectServer; } public void SelectServer(int serverId) @@ -37,12 +38,5 @@ namespace Content.Client.Research.UI if (state is not ResearchClientBoundInterfaceState rState) return; _menu?.Populate(rState.ServerCount, rState.ServerNames, rState.ServerIds, rState.SelectedServerId); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) return; - _menu?.Dispose(); - } } } diff --git a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs index ceaa965e59..d10f8b39f4 100644 --- a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs +++ b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs @@ -13,27 +13,26 @@ namespace Content.Client.Research.UI private int[] _serverIds = Array.Empty(); private int _selectedServerId = -1; - private ResearchClientBoundUserInterface Owner { get; } + public event Action? OnServerSelected; + public event Action? OnServerDeselected; - public ResearchClientServerSelectionMenu(ResearchClientBoundUserInterface owner) + public ResearchClientServerSelectionMenu() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); - Owner = owner; - Servers.OnItemSelected += OnItemSelected; Servers.OnItemDeselected += OnItemDeselected; } public void OnItemSelected(ItemList.ItemListSelectedEventArgs itemListSelectedEventArgs) { - Owner.SelectServer(_serverIds[itemListSelectedEventArgs.ItemIndex]); + OnServerSelected?.Invoke(_serverIds[itemListSelectedEventArgs.ItemIndex]); } public void OnItemDeselected(ItemList.ItemListDeselectedEventArgs itemListDeselectedEventArgs) { - Owner.DeselectServer(); + OnServerDeselected?.Invoke(); } public void Populate(int serverCount, string[] serverNames, int[] serverIds, int selectedServerId) diff --git a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs index 2a9782045b..2895ada61f 100644 --- a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs +++ b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs @@ -1,5 +1,8 @@ using Content.Shared.Research.Components; +using Content.Shared.Research.Prototypes; using JetBrains.Annotations; +using Robust.Client.UserInterface; +using Robust.Shared.Prototypes; namespace Content.Client.Research.UI; @@ -19,7 +22,8 @@ public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface var owner = Owner; - _consoleMenu = new ResearchConsoleMenu(owner); + _consoleMenu = this.CreateWindow(); + _consoleMenu.SetEntity(owner); _consoleMenu.OnTechnologyCardPressed += id => { @@ -30,10 +34,20 @@ public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface { SendMessage(new ConsoleServerSelectionMessage()); }; + } - _consoleMenu.OnClose += Close; + public override void OnProtoReload(PrototypesReloadedEventArgs args) + { + base.OnProtoReload(args); - _consoleMenu.OpenCentered(); + if (!args.WasModified()) + return; + + if (State is not ResearchConsoleBoundInterfaceState rState) + return; + + _consoleMenu?.UpdatePanels(rState); + _consoleMenu?.UpdateInformationPanel(rState); } protected override void UpdateState(BoundUserInterfaceState state) @@ -45,12 +59,4 @@ public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface _consoleMenu?.UpdatePanels(castState); _consoleMenu?.UpdateInformationPanel(castState); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _consoleMenu?.Dispose(); - } } diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs index 77ebe6740c..eafbe75fbb 100644 --- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs +++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs @@ -25,14 +25,13 @@ public sealed partial class ResearchConsoleMenu : FancyWindow [Dependency] private readonly IEntityManager _entity = default!; [Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] private readonly IPlayerManager _player = default!; - private readonly TechnologyDatabaseComponent? _technologyDatabase; private readonly ResearchSystem _research; private readonly SpriteSystem _sprite; private readonly AccessReaderSystem _accessReader; - public readonly EntityUid Entity; + public EntityUid Entity; - public ResearchConsoleMenu(EntityUid entity) + public ResearchConsoleMenu() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); @@ -40,21 +39,23 @@ public sealed partial class ResearchConsoleMenu : FancyWindow _research = _entity.System(); _sprite = _entity.System(); _accessReader = _entity.System(); - Entity = entity; ServerButton.OnPressed += _ => OnServerButtonPressed?.Invoke(); - - _entity.TryGetComponent(entity, out _technologyDatabase); } - public void UpdatePanels(ResearchConsoleBoundInterfaceState state) + public void SetEntity(EntityUid entity) + { + Entity = entity; + } + + public void UpdatePanels(ResearchConsoleBoundInterfaceState state) { TechnologyCardsContainer.Children.Clear(); var availableTech = _research.GetAvailableTechnologies(Entity); SyncTechnologyList(AvailableCardsContainer, availableTech); - if (_technologyDatabase == null) + if (!_entity.TryGetComponent(Entity, out TechnologyDatabaseComponent? database)) return; // i can't figure out the spacing so here you go @@ -66,7 +67,7 @@ public sealed partial class ResearchConsoleMenu : FancyWindow var hasAccess = _player.LocalEntity is not { } local || !_entity.TryGetComponent(Entity, out var access) || _accessReader.IsAllowed(local, Entity, access); - foreach (var techId in _technologyDatabase.CurrentTechnologyCards) + foreach (var techId in database.CurrentTechnologyCards) { var tech = _prototype.Index(techId); var cardControl = new TechnologyCardControl(tech, _prototype, _sprite, _research.GetTechnologyDescription(tech, includeTier: false), state.Points, hasAccess); @@ -74,7 +75,7 @@ public sealed partial class ResearchConsoleMenu : FancyWindow TechnologyCardsContainer.AddChild(cardControl); } - var unlockedTech = _technologyDatabase.UnlockedTechnologies.Select(x => _prototype.Index(x)); + var unlockedTech = database.UnlockedTechnologies.Select(x => _prototype.Index(x)); SyncTechnologyList(UnlockedCardsContainer, unlockedTech); } @@ -85,14 +86,14 @@ public sealed partial class ResearchConsoleMenu : FancyWindow ("points", state.Points))); ResearchAmountLabel.SetMessage(amountMsg); - if (_technologyDatabase == null) + if (!_entity.TryGetComponent(Entity, out TechnologyDatabaseComponent? database)) return; var disciplineText = Loc.GetString("research-discipline-none"); var disciplineColor = Color.Gray; - if (_technologyDatabase.MainDiscipline != null) + if (database.MainDiscipline != null) { - var discipline = _prototype.Index(_technologyDatabase.MainDiscipline); + var discipline = _prototype.Index(database.MainDiscipline); disciplineText = Loc.GetString(discipline.Name); disciplineColor = discipline.Color; } @@ -103,10 +104,10 @@ public sealed partial class ResearchConsoleMenu : FancyWindow MainDisciplineLabel.SetMessage(msg); TierDisplayContainer.Children.Clear(); - foreach (var disciplineId in _technologyDatabase.SupportedDisciplines) + foreach (var disciplineId in database.SupportedDisciplines) { var discipline = _prototype.Index(disciplineId); - var tier = _research.GetHighestDisciplineTier(_technologyDatabase, discipline); + var tier = _research.GetHighestDisciplineTier(database, discipline); // don't show tiers with no available tech if (tier == 0) diff --git a/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs b/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs index 6185979eee..9a5159880f 100644 --- a/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs +++ b/Content.Client/Robotics/UI/RoboticsConsoleBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Robotics; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Robotics.UI; @@ -16,7 +17,9 @@ public sealed class RoboticsConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _window = new RoboticsConsoleWindow(Owner); + _window = this.CreateWindow(); + _window.SetEntity(Owner); + _window.OnDisablePressed += address => { SendMessage(new RoboticsConsoleDisableMessage(address)); @@ -25,9 +28,6 @@ public sealed class RoboticsConsoleBoundUserInterface : BoundUserInterface { SendMessage(new RoboticsConsoleDestroyMessage(address)); }; - _window.OnClose += Close; - - _window.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -37,14 +37,6 @@ public sealed class RoboticsConsoleBoundUserInterface : BoundUserInterface if (state is not RoboticsConsoleState cast) return; - _window?.UpdateState(cast); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - _window?.Dispose(); + _window.UpdateState(cast); } } diff --git a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs index fc7b234bcc..87d7e62c39 100644 --- a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs +++ b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs @@ -23,11 +23,12 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow public Action? OnDisablePressed; public Action? OnDestroyPressed; - private Entity _console; private string? _selected; private Dictionary _cyborgs = new(); - public RoboticsConsoleWindow(EntityUid console) + public EntityUid Entity; + + public RoboticsConsoleWindow() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); @@ -35,9 +36,6 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow _lock = _entMan.System(); _sprite = _entMan.System(); - _console = (console, _entMan.GetComponent(console), null); - _entMan.TryGetComponent(_console, out _console.Comp2); - Cyborgs.OnItemSelected += args => { if (Cyborgs[args.ItemIndex].Metadata is not string address) @@ -66,6 +64,11 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow DestroyButton.StyleClasses.Add(StyleBase.ButtonCaution); } + public void SetEntity(EntityUid uid) + { + Entity = uid; + } + public void UpdateState(RoboticsConsoleState state) { _cyborgs = state.Cyborgs; @@ -81,7 +84,7 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow PopulateData(); - var locked = _lock.IsLocked((_console, _console.Comp2)); + var locked = _lock.IsLocked(Entity); DangerZone.Visible = !locked; LockedMessage.Visible = locked; } @@ -135,13 +138,19 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow // how the turntables DisableButton.Disabled = !(data.HasBrain && data.CanDisable); - DestroyButton.Disabled = _timing.CurTime < _console.Comp1.NextDestroy; } protected override void FrameUpdate(FrameEventArgs args) { base.FrameUpdate(args); - DestroyButton.Disabled = _timing.CurTime < _console.Comp1.NextDestroy; + if (_entMan.TryGetComponent(Entity, out RoboticsConsoleComponent? console)) + { + DestroyButton.Disabled = _timing.CurTime < console.NextDestroy; + } + else + { + DestroyButton.Disabled = true; + } } } diff --git a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs index 8f1723d1f2..663bde15b0 100644 --- a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs +++ b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs @@ -30,17 +30,9 @@ public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterf protected override void Open() { base.Open(); - _window = new OfferingWindow(); + _window = this.CreateWindow(); _window.Title = Loc.GetString("salvage-expedition-window-title"); - _window.OnClose += Close; - _window?.OpenCenteredLeft(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - _window?.Dispose(); - _window = null; + _window.OpenCenteredLeft(); } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs index eafb692733..a248126a85 100644 --- a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs +++ b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs @@ -21,13 +21,9 @@ public sealed class SalvageMagnetBoundUserInterface : BoundUserInterface { base.Open(); - if (_window is null) - { - _window = new OfferingWindow(); - _window.Title = Loc.GetString("salvage-magnet-window-title"); - _window.OnClose += Close; - _window.OpenCenteredLeft(); - } + _window = this.CreateWindow(); + _window.Title = Loc.GetString("salvage-magnet-window-title"); + _window.OpenCenteredLeft(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -112,15 +108,4 @@ public sealed class SalvageMagnetBoundUserInterface : BoundUserInterface _window.AddOption(option); } } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - if (disposing) - { - _window?.Close(); - _window?.Dispose(); - } - } } diff --git a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs index 086369aa26..b8b4fb8a74 100644 --- a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs +++ b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Shuttles.BUIStates; using Content.Shared.Shuttles.Events; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Shuttles.BUI; @@ -20,8 +21,7 @@ public sealed class IFFConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _window = new IFFConsoleWindow(); - _window.OnClose += Close; + _window = this.CreateWindow(); _window.ShowIFF += SendIFFMessage; _window.ShowVessel += SendVesselMessage; _window.OpenCenteredLeft(); diff --git a/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs index 4bd44a47a8..f75759b042 100644 --- a/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs +++ b/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Client.Shuttles.UI; using Content.Shared.Shuttles.BUIStates; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using RadarConsoleWindow = Content.Client.Shuttles.UI.RadarConsoleWindow; namespace Content.Client.Shuttles.BUI; @@ -20,18 +21,7 @@ public sealed class RadarConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _window = new RadarConsoleWindow(); - _window.OnClose += Close; - _window.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (disposing) - { - _window?.Dispose(); - } + _window = this.CreateWindow(); } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs index af7b6055c8..e677181419 100644 --- a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs +++ b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Client.Shuttles.UI; using Content.Shared.Shuttles.BUIStates; using Content.Shared.Shuttles.Events; using JetBrains.Annotations; +using Robust.Client.UserInterface; using Robust.Shared.Map; namespace Content.Client.Shuttles.BUI; @@ -19,9 +20,7 @@ public sealed class ShuttleConsoleBoundUserInterface : BoundUserInterface protected override void Open() { base.Open(); - _window = new ShuttleConsoleWindow(); - _window.OpenCentered(); - _window.OnClose += Close; + _window = this.CreateWindow(); _window.RequestFTL += OnFTLRequest; _window.RequestBeaconFTL += OnFTLBeaconRequest; diff --git a/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs b/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs index 3cc2a35d79..ed9bf40a48 100644 --- a/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs +++ b/Content.Client/Silicons/Borgs/BorgBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Silicons.Borgs; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Silicons.Borgs; @@ -18,9 +19,8 @@ public sealed class BorgBoundUserInterface : BoundUserInterface { base.Open(); - var owner = Owner; - - _menu = new BorgMenu(owner); + _menu = this.CreateWindow(); + _menu.SetEntity(Owner); _menu.BrainButtonPressed += () => { @@ -41,10 +41,6 @@ public sealed class BorgBoundUserInterface : BoundUserInterface { SendMessage(new BorgRemoveModuleBuiMessage(EntMan.GetNetEntity(module))); }; - - _menu.OnClose += Close; - - _menu.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -55,12 +51,4 @@ public sealed class BorgBoundUserInterface : BoundUserInterface return; _menu?.UpdateState(msg); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _menu?.Dispose(); - } } diff --git a/Content.Client/Silicons/Borgs/BorgMenu.xaml b/Content.Client/Silicons/Borgs/BorgMenu.xaml index 7d8fd9fe57..4cc2e41a8f 100644 --- a/Content.Client/Silicons/Borgs/BorgMenu.xaml +++ b/Content.Client/Silicons/Borgs/BorgMenu.xaml @@ -10,7 +10,7 @@ VerticalExpand="True"> - + diff --git a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs index 474a83b453..f6a861aa05 100644 --- a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs +++ b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs @@ -21,25 +21,33 @@ public sealed partial class BorgMenu : FancyWindow public Action? NameChanged; public Action? RemoveModuleButtonPressed; - private readonly BorgChassisComponent? _chassis; - public readonly EntityUid Entity; public float AccumulatedTime; private string _lastValidName; private List _modules = new(); - public BorgMenu(EntityUid entity) + public EntityUid Entity; + + public BorgMenu() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); + _lastValidName = NameLineEdit.Text; + + EjectBatteryButton.OnPressed += _ => EjectBatteryButtonPressed?.Invoke(); + BrainButton.OnPressed += _ => BrainButtonPressed?.Invoke(); + + NameLineEdit.OnTextChanged += OnNameChanged; + NameLineEdit.OnTextEntered += OnNameEntered; + NameLineEdit.OnFocusExit += OnNameFocusExit; + + UpdateBrainButton(); + } + + public void SetEntity(EntityUid entity) + { Entity = entity; - - if (_entity.TryGetComponent(Entity, out var chassis)) - _chassis = chassis; - BorgSprite.SetEntity(entity); - ChargeBar.MaxValue = 1f; - ChargeBar.Value = 1f; if (_entity.TryGetComponent(Entity, out var nameIdentifierComponent)) { @@ -55,17 +63,6 @@ public sealed partial class BorgMenu : FancyWindow NameIdentifierLabel.Visible = false; NameLineEdit.Text = _entity.GetComponent(Entity).EntityName; } - - _lastValidName = NameLineEdit.Text; - - EjectBatteryButton.OnPressed += _ => EjectBatteryButtonPressed?.Invoke(); - BrainButton.OnPressed += _ => BrainButtonPressed?.Invoke(); - - NameLineEdit.OnTextChanged += OnNameChanged; - NameLineEdit.OnTextEntered += OnNameEntered; - NameLineEdit.OnFocusExit += OnNameFocusExit; - - UpdateBrainButton(); } protected override void FrameUpdate(FrameEventArgs args) @@ -89,7 +86,7 @@ public sealed partial class BorgMenu : FancyWindow private void UpdateBrainButton() { - if (_chassis?.BrainEntity is { } brain) + if (_entity.TryGetComponent(Entity, out BorgChassisComponent? chassis) && chassis.BrainEntity is { } brain) { BrainButton.Text = _entity.GetComponent(brain).EntityName; BrainView.Visible = true; @@ -108,17 +105,17 @@ public sealed partial class BorgMenu : FancyWindow private void UpdateModulePanel() { - if (_chassis == null) + if (!_entity.TryGetComponent(Entity, out BorgChassisComponent? chassis)) return; ModuleCounter.Text = Loc.GetString("borg-ui-module-counter", - ("actual", _chassis.ModuleCount), - ("max", _chassis.MaxModules)); + ("actual", chassis.ModuleCount), + ("max", chassis.MaxModules)); - if (_chassis.ModuleContainer.Count == _modules.Count) + if (chassis.ModuleContainer.Count == _modules.Count) { var isSame = true; - foreach (var module in _chassis.ModuleContainer.ContainedEntities) + foreach (var module in chassis.ModuleContainer.ContainedEntities) { if (_modules.Contains(module)) continue; @@ -132,7 +129,7 @@ public sealed partial class BorgMenu : FancyWindow ModuleContainer.Children.Clear(); _modules.Clear(); - foreach (var module in _chassis.ModuleContainer.ContainedEntities) + foreach (var module in chassis.ModuleContainer.ContainedEntities) { var control = new BorgModuleControl(module, _entity); control.RemoveButtonPressed += () => diff --git a/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs b/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs index d150735fa1..56216b9184 100644 --- a/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs +++ b/Content.Client/Silicons/Laws/Ui/SiliconLawBoundUserInterface.cs @@ -2,6 +2,7 @@ using System.Linq; using Content.Shared.Silicons.Laws; using Content.Shared.Silicons.Laws.Components; using JetBrains.Annotations; +using Robust.Client.UserInterface; namespace Content.Client.Silicons.Laws.Ui; @@ -22,18 +23,7 @@ public sealed class SiliconLawBoundUserInterface : BoundUserInterface { base.Open(); - _menu = new(); - - _menu.OnClose += Close; - _menu.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _menu?.Close(); + _menu = this.CreateWindow(); } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs b/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs index e8442d2390..7d6a6cf2a5 100644 --- a/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs +++ b/Content.Client/SprayPainter/UI/SprayPainterBoundUserInterface.cs @@ -1,6 +1,6 @@ using Content.Shared.SprayPainter; using Content.Shared.SprayPainter.Components; -using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; namespace Content.Client.SprayPainter.UI; @@ -10,9 +10,6 @@ public sealed class SprayPainterBoundUserInterface : BoundUserInterface [ViewVariables] private SprayPainterWindow? _window; - [ViewVariables] - private SprayPainterSystem? _painter; - public SprayPainterBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { } @@ -21,27 +18,15 @@ public sealed class SprayPainterBoundUserInterface : BoundUserInterface { base.Open(); - if (!EntMan.TryGetComponent(Owner, out var comp)) - return; + _window = this.CreateWindow(); - _window = new SprayPainterWindow(); - - _painter = EntMan.System(); - - _window.OnClose += Close; _window.OnSpritePicked = OnSpritePicked; _window.OnColorPicked = OnColorPicked; - _window.Populate(_painter.Entries, comp.Index, comp.PickedColor, comp.ColorPalette); - - _window.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - _window?.Dispose(); + if (EntMan.TryGetComponent(Owner, out SprayPainterComponent? comp)) + { + _window.Populate(EntMan.System().Entries, comp.Index, comp.PickedColor, comp.ColorPalette); + } } private void OnSpritePicked(ItemList.ItemListSelectedEventArgs args) diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs index 720a2efb9d..e7bab71e38 100644 --- a/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs +++ b/Content.Client/StationRecords/GeneralStationRecordConsoleBoundUserInterface.cs @@ -1,4 +1,5 @@ using Content.Shared.StationRecords; +using Robust.Client.UserInterface; namespace Content.Client.StationRecords; @@ -15,15 +16,12 @@ public sealed class GeneralStationRecordConsoleBoundUserInterface : BoundUserInt { base.Open(); - _window = new(); + _window = this.CreateWindow(); _window.OnKeySelected += key => SendMessage(new SelectStationRecord(key)); _window.OnFiltersChanged += (type, filterValue) => SendMessage(new SetStationRecordFilter(type, filterValue)); _window.OnDeleted += id => SendMessage(new DeleteStationRecord(id)); - _window.OnClose += Close; - - _window.OpenCentered(); } protected override void UpdateState(BoundUserInterfaceState state) @@ -35,11 +33,4 @@ public sealed class GeneralStationRecordConsoleBoundUserInterface : BoundUserInt _window?.UpdateState(cast); } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - - _window?.Close(); - } } diff --git a/Content.Client/Store/Ui/StoreBoundUserInterface.cs b/Content.Client/Store/Ui/StoreBoundUserInterface.cs index 0010aedd96..7ed67f7b5d 100644 --- a/Content.Client/Store/Ui/StoreBoundUserInterface.cs +++ b/Content.Client/Store/Ui/StoreBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Shared.Store; using JetBrains.Annotations; using System.Linq; using Content.Shared.Store.Components; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.Store.Ui; @@ -26,13 +27,10 @@ public sealed class StoreBoundUserInterface : BoundUserInterface protected override void Open() { - _menu = new StoreMenu(); + _menu = this.CreateWindow(); if (EntMan.TryGetComponent(Owner, out var store)) _menu.Title = Loc.GetString(store.Name); - _menu.OpenCentered(); - _menu.OnClose += Close; - _menu.OnListingButtonPressed += (_, listing) => { SendMessage(new StoreBuyListingMessage(listing)); @@ -77,15 +75,6 @@ public sealed class StoreBoundUserInterface : BoundUserInterface } } - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - _menu?.Close(); - _menu?.Dispose(); - } - private void UpdateListingsWithSearchFilter() { if (_menu == null) diff --git a/Content.Client/Strip/StrippingMenu.cs b/Content.Client/Strip/StrippingMenu.cs index eea867b794..1c46b4be35 100644 --- a/Content.Client/Strip/StrippingMenu.cs +++ b/Content.Client/Strip/StrippingMenu.cs @@ -1,4 +1,3 @@ -using Content.Client.Inventory; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Timing; @@ -11,14 +10,12 @@ namespace Content.Client.Strip public LayoutContainer InventoryContainer = new(); public BoxContainer HandsContainer = new() { Orientation = LayoutOrientation.Horizontal }; public BoxContainer SnareContainer = new(); - private StrippableBoundUserInterface _bui; public bool Dirty = true; - public StrippingMenu(string title, StrippableBoundUserInterface bui) - { - Title = title; - _bui = bui; + public event Action? OnDirty; + public StrippingMenu() + { var box = new BoxContainer() { Orientation = LayoutOrientation.Vertical, Margin = new Thickness(0, 8) }; Contents.AddChild(box); box.AddChild(SnareContainer); @@ -39,7 +36,7 @@ namespace Content.Client.Strip return; Dirty = false; - _bui.UpdateMenu(); + OnDirty?.Invoke(); } } } diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs index 9132dd6ed5..e3646c00cc 100644 --- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs +++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs @@ -1,6 +1,7 @@ using Content.Client.Eye; using Content.Shared.SurveillanceCamera; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.SurveillanceCamera.UI; @@ -25,20 +26,12 @@ public sealed class SurveillanceCameraMonitorBoundUserInterface : BoundUserInter { base.Open(); - _window = new SurveillanceCameraMonitorWindow(); - - if (State != null) - { - UpdateState(State); - } - - _window.OpenCentered(); + _window = this.CreateWindow(); _window.CameraSelected += OnCameraSelected; _window.SubnetOpened += OnSubnetRequest; _window.CameraRefresh += OnCameraRefresh; _window.SubnetRefresh += OnSubnetRefresh; - _window.OnClose += Close; _window.CameraSwitchTimer += OnCameraSwitchTimer; _window.CameraDisconnect += OnCameraDisconnect; } diff --git a/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs b/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs index 37384daafe..0631d98993 100644 --- a/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs +++ b/Content.Client/Thief/ThiefBackpackBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Thief; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Thief; @@ -15,21 +16,9 @@ public sealed class ThiefBackpackBoundUserInterface : BoundUserInterface { base.Open(); - _window = new ThiefBackpackMenu(this); - _window.OnClose += Close; - _window.OpenCentered(); - } - - protected override void Dispose(bool disposing) - { - base.Dispose(disposing); - if (!disposing) - return; - - if (_window != null) - _window.OnClose -= Close; - - _window?.Dispose(); + _window = this.CreateWindow(); + _window.OnApprove += SendApprove; + _window.OnSetChange += SendChangeSelected; } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Thief/ThiefBackpackMenu.xaml.cs b/Content.Client/Thief/ThiefBackpackMenu.xaml.cs index 543772c704..aaee357617 100644 --- a/Content.Client/Thief/ThiefBackpackMenu.xaml.cs +++ b/Content.Client/Thief/ThiefBackpackMenu.xaml.cs @@ -12,46 +12,42 @@ public sealed partial class ThiefBackpackMenu : FancyWindow [Dependency] private readonly IEntitySystemManager _sysMan = default!; private readonly SpriteSystem _spriteSystem; - private readonly ThiefBackpackBoundUserInterface _owner; + public event Action? OnApprove; + public event Action? OnSetChange; - public ThiefBackpackMenu(ThiefBackpackBoundUserInterface owner) + public ThiefBackpackMenu() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); _spriteSystem = _sysMan.GetEntitySystem(); - _owner = owner; - - ApproveButton.OnButtonDown += (args) => + ApproveButton.OnPressed += args => { - _owner.SendApprove(); + OnApprove?.Invoke(); }; } public void UpdateState(ThiefBackpackBoundUserInterfaceState state) { - SetsGrid.RemoveAllChildren(); - int count = 0; - int selectedNumber = 0; - foreach (var set in state.Sets) + SetsGrid.DisposeAllChildren(); + var selectedNumber = 0; + foreach (var (set, info) in state.Sets) { - var child = new ThiefBackpackSet(set.Value, _spriteSystem); + var child = new ThiefBackpackSet(info, _spriteSystem); child.SetButton.OnButtonDown += (args) => { - _owner.SendChangeSelected(set.Key); + OnSetChange?.Invoke(set); }; SetsGrid.AddChild(child); - count++; - - if (set.Value.Selected) + if (info.Selected) selectedNumber++; } Description.Text = Loc.GetString("thief-backpack-window-description", ("maxCount", state.MaxSelectedSets)); SelectedSets.Text = Loc.GetString("thief-backpack-window-selected", ("selectedCount", selectedNumber), ("maxCount", state.MaxSelectedSets)); - ApproveButton.Disabled = selectedNumber == state.MaxSelectedSets ? false : true; + ApproveButton.Disabled = selectedNumber != state.MaxSelectedSets; } } diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs index 4702f8f365..4ae74a5d65 100644 --- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs +++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs @@ -1,5 +1,7 @@ using Content.Shared.Atmos.Components; using JetBrains.Annotations; +using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.UserInterface.Systems.Atmos.GasTank { @@ -13,7 +15,7 @@ namespace Content.Client.UserInterface.Systems.Atmos.GasTank { } - public void SetOutputPressure(in float value) + public void SetOutputPressure(float value) { SendMessage(new GasTankSetPressureMessage { @@ -29,9 +31,10 @@ namespace Content.Client.UserInterface.Systems.Atmos.GasTank protected override void Open() { base.Open(); - _window = new GasTankWindow(this, EntMan.GetComponent(Owner).EntityName); - _window.OnClose += Close; - _window.OpenCentered(); + _window = this.CreateWindow(); + _window.SetTitle(EntMan.GetComponent(Owner).EntityName); + _window.OnOutputPressure += SetOutputPressure; + _window.OnToggleInternals += ToggleInternals; } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs index c23850a650..fd5624ad8a 100644 --- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs +++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs @@ -15,23 +15,29 @@ namespace Content.Client.UserInterface.Systems.Atmos.GasTank; public sealed class GasTankWindow : BaseWindow { + [Dependency] private readonly IResourceCache _cache = default!; + private readonly RichTextLabel _lblPressure; private readonly FloatSpinBox _spbPressure; private readonly RichTextLabel _lblInternals; private readonly Button _btnInternals; + private readonly Label _topLabel; - public GasTankWindow(GasTankBoundUserInterface owner, string uidName) + public event Action? OnOutputPressure; + public event Action? OnToggleInternals; + + public GasTankWindow() { + IoCManager.InjectDependencies(this); Control contentContainer; BoxContainer topContainer; TextureButton btnClose; - var resourceCache = IoCManager.Resolve(); var rootContainer = new LayoutContainer { Name = "GasTankRoot" }; AddChild(rootContainer); MouseFilter = MouseFilterMode.Stop; - var panelTex = resourceCache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); + var panelTex = _cache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); var back = new StyleBoxTexture { Texture = panelTex, @@ -78,7 +84,17 @@ public sealed class GasTankWindow LayoutContainer.SetAnchorPreset(topContainerWrap, LayoutContainer.LayoutPreset.Wide); - var font = resourceCache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13); + var font = _cache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13); + + _topLabel = new Label + { + FontOverride = font, + FontColorOverride = StyleNano.NanoGold, + VerticalAlignment = VAlignment.Center, + HorizontalExpand = true, + HorizontalAlignment = HAlignment.Left, + Margin = new Thickness(0, 0, 20, 0), + }; var topRow = new BoxContainer { @@ -86,16 +102,7 @@ public sealed class GasTankWindow Margin = new Thickness(4, 2, 12, 2), Children = { - (new Label - { - Text = uidName, - FontOverride = font, - FontColorOverride = StyleNano.NanoGold, - VerticalAlignment = VAlignment.Center, - HorizontalExpand = true, - HorizontalAlignment = HAlignment.Left, - Margin = new Thickness(0, 0, 20, 0), - }), + _topLabel, (btnClose = new TextureButton { StyleClasses = {DefaultWindow.StyleClassWindowCloseButton}, @@ -168,17 +175,22 @@ public sealed class GasTankWindow // Handlers _spbPressure.OnValueChanged += args => { - owner.SetOutputPressure(args.Value); + OnOutputPressure?.Invoke(args.Value); }; _btnInternals.OnPressed += args => { - owner.ToggleInternals(); + OnToggleInternals?.Invoke(); }; btnClose.OnPressed += _ => Close(); } + public void SetTitle(string name) + { + _topLabel.Text = name; + } + public void UpdateState(GasTankBoundUserInterfaceState state) { _lblPressure.SetMarkup(Loc.GetString("gas-tank-window-tank-pressure-text", ("tankPressure", $"{state.TankPressure:0.##}"))); diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs index 17ddba77ff..eafab84ed6 100644 --- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs +++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs @@ -2,6 +2,7 @@ using Content.Client.VendingMachines.UI; using Content.Shared.VendingMachines; using Robust.Client.UserInterface.Controls; using System.Linq; +using Robust.Client.UserInterface; namespace Content.Client.VendingMachines { @@ -28,15 +29,14 @@ namespace Content.Client.VendingMachines _cachedInventory = vendingMachineSys.GetAllInventory(Owner); - _menu = new VendingMachineMenu { Title = EntMan.GetComponent(Owner).EntityName }; + _menu = this.CreateWindow(); + _menu.OpenCenteredLeft(); + _menu.Title = EntMan.GetComponent(Owner).EntityName; - _menu.OnClose += Close; _menu.OnItemSelected += OnItemSelected; _menu.OnSearchChanged += OnSearchChanged; _menu.Populate(_cachedInventory, out _cachedFilteredIndex); - - _menu.OpenCenteredLeft(); } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs index f700c6663b..891804674d 100644 --- a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs +++ b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs @@ -1,12 +1,13 @@ using Content.Shared.VoiceMask; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; using Robust.Shared.Prototypes; namespace Content.Client.VoiceMask; public sealed class VoiceMaskBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly IPrototypeManager _protomanager = default!; [ViewVariables] private VoiceMaskNameChangeWindow? _window; @@ -19,12 +20,11 @@ public sealed class VoiceMaskBoundUserInterface : BoundUserInterface { base.Open(); - _window = new(_proto); + _window = this.CreateWindow(); + _window.ReloadVerbs(_protomanager); - _window.OpenCentered(); _window.OnNameChange += OnNameSelected; _window.OnVerbChange += verb => SendMessage(new VoiceMaskChangeVerbMessage(verb)); - _window.OnClose += Close; } private void OnNameSelected(string name) diff --git a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs index 16a28f9d9b..0dc41f807a 100644 --- a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs +++ b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs @@ -17,7 +17,7 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow private string? _verb; - public VoiceMaskNameChangeWindow(IPrototypeManager proto) + public VoiceMaskNameChangeWindow() { RobustXamlLoader.Load(this); @@ -32,12 +32,10 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow SpeechVerbSelector.SelectId(args.Id); }; - ReloadVerbs(proto); - AddVerbs(); } - private void ReloadVerbs(IPrototypeManager proto) + public void ReloadVerbs(IPrototypeManager proto) { foreach (var verb in proto.EnumeratePrototypes()) { diff --git a/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs b/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs index f3e0c0a539..3f01808c42 100644 --- a/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs +++ b/Content.Client/Weapons/Melee/UI/MeleeSpeechBoundUserInterface.cs @@ -1,5 +1,6 @@ using Robust.Client.GameObjects; using Content.Shared.Speech.Components; +using Robust.Client.UserInterface; namespace Content.Client.Weapons.Melee.UI; @@ -19,17 +20,10 @@ public sealed class MeleeSpeechBoundUserInterface : BoundUserInterface { base.Open(); - _window = new MeleeSpeechWindow(); - if (State != null) - UpdateState(State); - - _window.OpenCentered(); - - _window.OnClose += Close; + _window = this.CreateWindow(); _window.OnBattlecryEntered += OnBattlecryChanged; } - private void OnBattlecryChanged(string newBattlecry) { SendMessage(new MeleeSpeechBattlecryChangedMessage(newBattlecry)); diff --git a/Content.Client/Wires/UI/WiresBoundUserInterface.cs b/Content.Client/Wires/UI/WiresBoundUserInterface.cs index 5a8869a204..edf1a2d377 100644 --- a/Content.Client/Wires/UI/WiresBoundUserInterface.cs +++ b/Content.Client/Wires/UI/WiresBoundUserInterface.cs @@ -1,5 +1,6 @@ using Content.Shared.Wires; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Wires.UI { @@ -15,10 +16,8 @@ namespace Content.Client.Wires.UI protected override void Open() { base.Open(); - - _menu = new WiresMenu(this); - _menu.OnClose += Close; - _menu.OpenCenteredLeft(); + _menu = this.CreateWindow(); + _menu.OnAction += PerformAction; } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Wires/UI/WiresMenu.cs b/Content.Client/Wires/UI/WiresMenu.cs index 7bccc20861..eccc548297 100644 --- a/Content.Client/Wires/UI/WiresMenu.cs +++ b/Content.Client/Wires/UI/WiresMenu.cs @@ -1,4 +1,3 @@ -using System; using System.Numerics; using Content.Client.Examine; using Content.Client.Resources; @@ -12,10 +11,6 @@ using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Animations; using Robust.Shared.Input; -using Robust.Shared.IoC; -using Robust.Shared.Localization; -using Robust.Shared.Maths; -using Robust.Shared.Random; using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Wires.UI @@ -24,8 +19,6 @@ namespace Content.Client.Wires.UI { [Dependency] private readonly IResourceCache _resourceCache = default!; - public WiresBoundUserInterface Owner { get; } - private readonly Control _wiresHBox; private readonly Control _topContainer; private readonly Control _statusContainer; @@ -35,11 +28,12 @@ namespace Content.Client.Wires.UI public TextureButton CloseButton { get; set; } - public WiresMenu(WiresBoundUserInterface owner) + public event Action? OnAction; + + public WiresMenu() { IoCManager.InjectDependencies(this); - Owner = owner; var rootContainer = new LayoutContainer {Name = "WireRoot"}; AddChild(rootContainer); @@ -257,12 +251,12 @@ namespace Content.Client.Wires.UI control.WireClicked += () => { - Owner.PerformAction(wire.Id, wire.IsCut ? WiresAction.Mend : WiresAction.Cut); + OnAction?.Invoke(wire.Id, wire.IsCut ? WiresAction.Mend : WiresAction.Cut); }; control.ContactsClicked += () => { - Owner.PerformAction(wire.Id, WiresAction.Pulse); + OnAction?.Invoke(wire.Id, WiresAction.Pulse); }; } diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs index 2538caf6eb..c7a74815b6 100644 --- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs +++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs @@ -1,6 +1,7 @@ using Content.Shared.Xenoarchaeology.Equipment; using JetBrains.Annotations; using Robust.Client.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Xenoarchaeology.Ui; @@ -18,10 +19,7 @@ public sealed class AnalysisConsoleBoundUserInterface : BoundUserInterface { base.Open(); - _consoleMenu = new AnalysisConsoleMenu(); - - _consoleMenu.OnClose += Close; - _consoleMenu.OpenCentered(); + _consoleMenu = this.CreateWindow(); _consoleMenu.OnServerSelectionButtonPressed += () => { From 0b5fe2a9acdc6b324dce7f45f6839f780223202e Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sun, 21 Jul 2024 01:27:18 -0400 Subject: [PATCH 035/108] PA ui cleanup + bugfixes (#28750) * ui and visual aspect + radio * finish jank ui shit and finish radio * remove radio * send it --------- Co-authored-by: metalgearsloth --- .../ParticleAcceleratorBoundUserInterface.cs | 5 +- .../UI/ParticleAcceleratorControlMenu.cs | 526 ------------------ .../UI/ParticleAcceleratorControlMenu.xaml | 74 +++ .../UI/ParticleAcceleratorControlMenu.xaml.cs | 311 +++++++++++ .../ParticleAcceleratorEmitterComponent.cs | 7 +- .../ParticleAcceleratorSystem.ControlBox.cs | 27 +- .../ParticleAcceleratorSystem.Parts.cs | 38 +- .../ParticleAcceleratorInterfaceWireAction.cs | 5 + .../ParticleAcceleratorLimiterWireAction.cs | 7 +- .../ParticleAcceleratorStrengthWireAction.cs | 4 + .../ui/particle-accelerator-control-menu.ftl | 24 +- .../Generation/PA/control_box.rsi/unlitp0.png | Bin 526 -> 529 bytes .../Generation/PA/control_box.rsi/unlitp1.png | Bin 533 -> 533 bytes .../Generation/PA/control_box.rsi/unlitp2.png | Bin 537 -> 539 bytes .../Generation/PA/control_box.rsi/unlitp3.png | Bin 870 -> 859 bytes 15 files changed, 462 insertions(+), 566 deletions(-) delete mode 100644 Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs create mode 100644 Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml create mode 100644 Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs index ff1eae36f5..93306f2fd1 100644 --- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs +++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs @@ -1,5 +1,4 @@ using Content.Shared.Singularity.Components; -using Robust.Client.GameObjects; using Robust.Client.UserInterface; namespace Content.Client.ParticleAccelerator.UI @@ -18,9 +17,11 @@ namespace Content.Client.ParticleAccelerator.UI base.Open(); _menu = this.CreateWindow(); + _menu.SetEntity(Owner); + _menu.OnOverallState += SendEnableMessage; _menu.OnPowerState += SendPowerStateMessage; - _menu.OnScanPartsRequested += SendScanPartsMessage; + _menu.OnScan += SendScanPartsMessage; } public void SendEnableMessage(bool enable) diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs deleted file mode 100644 index 05a296edf3..0000000000 --- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs +++ /dev/null @@ -1,526 +0,0 @@ -using System.Numerics; -using Content.Client.Resources; -using Content.Client.Stylesheets; -using Content.Client.UserInterface.Controls; -using Content.Shared.Singularity.Components; -using Robust.Client.Animations; -using Robust.Client.Graphics; -using Robust.Client.ResourceManagement; -using Robust.Client.UserInterface; -using Robust.Client.UserInterface.Controls; -using Robust.Client.UserInterface.CustomControls; -using Robust.Shared.Noise; -using Robust.Shared.Prototypes; -using Robust.Shared.Timing; -using static Robust.Client.UserInterface.Controls.BoxContainer; - -namespace Content.Client.ParticleAccelerator.UI -{ - public sealed class ParticleAcceleratorControlMenu : BaseWindow - { - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly IResourceCache _cache = default!; - - private readonly ShaderInstance _greyScaleShader; - - private readonly Label _drawLabel; - private readonly FastNoiseLite _drawNoiseGenerator; - private readonly Button _onButton; - private readonly Button _offButton; - private readonly Button _scanButton; - private readonly Label _statusLabel; - private readonly SpinBox _stateSpinBox; - - private readonly BoxContainer _alarmControl; - private readonly Animation _alarmControlAnimation; - - private readonly PASegmentControl _endCapTexture; - private readonly PASegmentControl _fuelChamberTexture; - private readonly PASegmentControl _controlBoxTexture; - private readonly PASegmentControl _powerBoxTexture; - private readonly PASegmentControl _emitterForeTexture; - private readonly PASegmentControl _emitterPortTexture; - private readonly PASegmentControl _emitterStarboardTexture; - - private float _time; - private int _lastDraw; - private int _lastReceive; - - private bool _blockSpinBox; - private bool _assembled; - private bool _shouldContinueAnimating; - private int _maxStrength = 3; - - public event Action? OnOverallState; - public event Action? OnPowerState; - public event Action? OnScanPartsRequested; - - public ParticleAcceleratorControlMenu() - { - IoCManager.InjectDependencies(this); - SetSize = new Vector2(400, 320); - _greyScaleShader = _protoManager.Index("Greyscale").Instance(); - - _drawNoiseGenerator = new(); - _drawNoiseGenerator.SetFractalType(FastNoiseLite.FractalType.FBm); - _drawNoiseGenerator.SetFrequency(0.5f); - - var font = _cache.GetFont("/Fonts/Boxfont-round/Boxfont Round.ttf", 13); - var panelTex = _cache.GetTexture("/Textures/Interface/Nano/button.svg.96dpi.png"); - - MouseFilter = MouseFilterMode.Stop; - - _alarmControlAnimation = new Animation - { - Length = TimeSpan.FromSeconds(1), - AnimationTracks = - { - new AnimationTrackControlProperty - { - Property = nameof(Control.Visible), - KeyFrames = - { - new AnimationTrackProperty.KeyFrame(true, 0), - new AnimationTrackProperty.KeyFrame(false, 0.75f), - } - } - } - }; - - var back = new StyleBoxTexture - { - Texture = panelTex, - Modulate = Color.FromHex("#25252A"), - }; - back.SetPatchMargin(StyleBox.Margin.All, 10); - - var back2 = new StyleBoxTexture(back) - { - Modulate = Color.FromHex("#202023") - }; - - AddChild(new PanelContainer - { - PanelOverride = back, - MouseFilter = MouseFilterMode.Pass - }); - - _stateSpinBox = new SpinBox { Value = 0, IsValid = StrengthSpinBoxValid }; - _stateSpinBox.InitDefaultButtons(); - _stateSpinBox.ValueChanged += PowerStateChanged; - _stateSpinBox.LineEditDisabled = true; - - _offButton = new Button - { - ToggleMode = false, - Text = Loc.GetString("particle-accelerator-control-menu-off-button"), - StyleClasses = { StyleBase.ButtonOpenRight }, - }; - - _offButton.OnPressed += args => OnOverallState?.Invoke(false); - - _onButton = new Button - { - ToggleMode = false, - Text = Loc.GetString("particle-accelerator-control-menu-on-button"), - StyleClasses = { StyleBase.ButtonOpenLeft }, - }; - _onButton.OnPressed += args => OnOverallState?.Invoke(true); - - var closeButton = new TextureButton - { - StyleClasses = { "windowCloseButton" }, - HorizontalAlignment = HAlignment.Right, - Margin = new Thickness(0, 0, 8, 0) - }; - closeButton.OnPressed += args => Close(); - - var serviceManual = new Label - { - HorizontalAlignment = HAlignment.Center, - StyleClasses = { StyleBase.StyleClassLabelSubText }, - Text = Loc.GetString("particle-accelerator-control-menu-service-manual-reference") - }; - _drawLabel = new Label(); - var imgSize = new Vector2(32, 32); - AddChild(new BoxContainer - { - Orientation = LayoutOrientation.Vertical, - Children = - { - new Control - { - Margin = new Thickness(2, 2, 0, 0), - Children = - { - new Label - { - Text = Loc.GetString("particle-accelerator-control-menu-device-version-label"), - FontOverride = font, - FontColorOverride = StyleNano.NanoGold, - }, - closeButton - } - }, - new PanelContainer - { - PanelOverride = new StyleBoxFlat {BackgroundColor = StyleNano.NanoGold}, - MinSize = new Vector2(0, 2), - }, - new Control - { - MinSize = new Vector2(0, 4) - }, - - new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - VerticalExpand = true, - Children = - { - new BoxContainer - { - Orientation = LayoutOrientation.Vertical, - Margin = new Thickness(4, 0, 0, 0), - HorizontalExpand = true, - Children = - { - new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - Children = - { - new Label - { - Text = Loc.GetString("particle-accelerator-control-menu-power-label") + " ", - HorizontalExpand = true, - HorizontalAlignment = HAlignment.Left, - }, - _offButton, - _onButton - } - }, - new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - Children = - { - new Label - { - Text = Loc.GetString("particle-accelerator-control-menu-strength-label") + " ", - HorizontalExpand = true, - HorizontalAlignment = HAlignment.Left, - }, - _stateSpinBox - } - }, - new Control - { - MinSize = new Vector2(0, 10), - }, - _drawLabel, - new Control - { - VerticalExpand = true, - }, - (_alarmControl = new BoxContainer - { - Orientation = LayoutOrientation.Vertical, - Children = - { - new Label - { - Text = Loc.GetString("particle-accelerator-control-menu-alarm-control"), - FontColorOverride = Color.Red, - Align = Label.AlignMode.Center - }, - serviceManual - }, - Visible = false, - }), - } - }, - new BoxContainer - { - Orientation = LayoutOrientation.Vertical, - MinSize = new Vector2(186, 0), - Children = - { - (_statusLabel = new Label - { - HorizontalAlignment = HAlignment.Center - }), - new Control - { - MinSize = new Vector2(0, 20) - }, - new PanelContainer - { - HorizontalAlignment = HAlignment.Center, - PanelOverride = back2, - Children = - { - new GridContainer - { - Columns = 3, - VSeparationOverride = 0, - HSeparationOverride = 0, - Children = - { - new Control {MinSize = imgSize}, - (_endCapTexture = Segment("end_cap")), - new Control {MinSize = imgSize}, - (_controlBoxTexture = Segment("control_box")), - (_fuelChamberTexture = Segment("fuel_chamber")), - new Control {MinSize = imgSize}, - new Control {MinSize = imgSize}, - (_powerBoxTexture = Segment("power_box")), - new Control {MinSize = imgSize}, - (_emitterStarboardTexture = Segment("emitter_starboard")), - (_emitterForeTexture = Segment("emitter_fore")), - (_emitterPortTexture = Segment("emitter_port")), - } - } - } - }, - (_scanButton = new Button - { - Text = Loc.GetString("particle-accelerator-control-menu-scan-parts-button"), - HorizontalAlignment = HAlignment.Center - }) - } - } - } - }, - new StripeBack - { - Children = - { - new Label - { - Margin = new Thickness(4, 4, 0, 4), - Text = Loc.GetString("particle-accelerator-control-menu-check-containment-field-warning"), - HorizontalAlignment = HAlignment.Center, - StyleClasses = {StyleBase.StyleClassLabelSubText}, - } - } - }, - new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - Margin = new Thickness(12, 0, 0, 0), - Children = - { - new Label - { - Text = Loc.GetString("particle-accelerator-control-menu-foo-bar-baz"), - StyleClasses = {StyleBase.StyleClassLabelSubText} - } - } - }, - } - }); - - _scanButton.OnPressed += args => OnScanPartsRequested?.Invoke(); - - _alarmControl.AnimationCompleted += s => - { - if (_shouldContinueAnimating) - { - _alarmControl.PlayAnimation(_alarmControlAnimation, "warningAnim"); - } - else - { - _alarmControl.Visible = false; - } - }; - - PASegmentControl Segment(string name) - { - return new(this, _cache, name); - } - - UpdateUI(false, false, false, false); - } - - private bool StrengthSpinBoxValid(int n) - { - return n >= 0 && n <= _maxStrength && !_blockSpinBox; - } - - private void PowerStateChanged(ValueChangedEventArgs e) - { - ParticleAcceleratorPowerState newState; - switch (e.Value) - { - case 0: - newState = ParticleAcceleratorPowerState.Standby; - break; - case 1: - newState = ParticleAcceleratorPowerState.Level0; - break; - case 2: - newState = ParticleAcceleratorPowerState.Level1; - break; - case 3: - newState = ParticleAcceleratorPowerState.Level2; - break; - case 4: - newState = ParticleAcceleratorPowerState.Level3; - break; - default: - return; - } - - _stateSpinBox.SetButtonDisabled(true); - OnPowerState?.Invoke(newState); - } - - protected override DragMode GetDragModeFor(Vector2 relativeMousePos) - { - return DragMode.Move; - } - - public void DataUpdate(ParticleAcceleratorUIState uiState) - { - _assembled = uiState.Assembled; - UpdateUI(uiState.Assembled, uiState.InterfaceBlock, uiState.Enabled, - uiState.WirePowerBlock); - _statusLabel.Text = Loc.GetString("particle-accelerator-control-menu-status-label", - ("status", Loc.GetString(uiState.Assembled ? "particle-accelerator-control-menu-status-operational" : - "particle-accelerator-control-menu-status-incomplete"))); - UpdatePowerState(uiState.State, uiState.Enabled, uiState.Assembled, - uiState.MaxLevel); - UpdatePreview(uiState); - _lastDraw = uiState.PowerDraw; - _lastReceive = uiState.PowerReceive; - } - - private void UpdatePowerState(ParticleAcceleratorPowerState state, bool enabled, bool assembled, - ParticleAcceleratorPowerState maxState) - { - _stateSpinBox.OverrideValue(state switch - { - ParticleAcceleratorPowerState.Standby => 0, - ParticleAcceleratorPowerState.Level0 => 1, - ParticleAcceleratorPowerState.Level1 => 2, - ParticleAcceleratorPowerState.Level2 => 3, - ParticleAcceleratorPowerState.Level3 => 4, - _ => 0 - }); - - - _maxStrength = maxState == ParticleAcceleratorPowerState.Level3 ? 4 : 3; - if (_maxStrength > 3 && enabled && assembled) - { - _shouldContinueAnimating = true; - if (!_alarmControl.HasRunningAnimation("warningAnim")) - _alarmControl.PlayAnimation(_alarmControlAnimation, "warningAnim"); - } - else - _shouldContinueAnimating = false; - } - - private void UpdateUI(bool assembled, bool blocked, bool enabled, bool powerBlock) - { - _onButton.Pressed = enabled; - _offButton.Pressed = !enabled; - - var cantUse = !assembled || blocked || powerBlock; - _onButton.Disabled = cantUse; - _offButton.Disabled = cantUse; - _scanButton.Disabled = blocked; - - var cantChangeLevel = !assembled || blocked; - _stateSpinBox.SetButtonDisabled(cantChangeLevel); - _blockSpinBox = cantChangeLevel; - } - - private void UpdatePreview(ParticleAcceleratorUIState updateMessage) - { - _endCapTexture.SetPowerState(updateMessage, updateMessage.EndCapExists); - _controlBoxTexture.SetPowerState(updateMessage, true); - _fuelChamberTexture.SetPowerState(updateMessage, updateMessage.FuelChamberExists); - _powerBoxTexture.SetPowerState(updateMessage, updateMessage.PowerBoxExists); - _emitterStarboardTexture.SetPowerState(updateMessage, updateMessage.EmitterStarboardExists); - _emitterForeTexture.SetPowerState(updateMessage, updateMessage.EmitterForeExists); - _emitterPortTexture.SetPowerState(updateMessage, updateMessage.EmitterPortExists); - } - - protected override void FrameUpdate(FrameEventArgs args) - { - base.FrameUpdate(args); - - if (!_assembled) - { - _drawLabel.Text = Loc.GetString("particle-accelerator-control-menu-draw-not-available"); - return; - } - - _time += args.DeltaSeconds; - - var watts = 0; - if (_lastDraw != 0) - { - var val = _drawNoiseGenerator.GetNoise(_time, 0f); - watts = (int) (_lastDraw + val * 5); - } - - _drawLabel.Text = Loc.GetString("particle-accelerator-control-menu-draw", - ("watts", $"{watts:##,##0}"), - ("lastReceive", $"{_lastReceive:##,##0}")); - } - - private sealed class PASegmentControl : Control - { - private readonly ParticleAcceleratorControlMenu _menu; - private readonly string _baseState; - private readonly TextureRect _base; - private readonly TextureRect _unlit; - private readonly RSI _rsi; - - public PASegmentControl(ParticleAcceleratorControlMenu menu, IResourceCache cache, string name) - { - _menu = menu; - _baseState = name; - _rsi = cache.GetResource($"/Textures/Structures/Power/Generation/PA/{name}.rsi").RSI; - - AddChild(_base = new TextureRect { Texture = _rsi[$"completed"].Frame0 }); - AddChild(_unlit = new TextureRect()); - MinSize = _rsi.Size; - } - - public void SetPowerState(ParticleAcceleratorUIState state, bool exists) - { - _base.ShaderOverride = exists ? null : _menu._greyScaleShader; - _base.ModulateSelfOverride = exists ? null : new Color(127, 127, 127); - - if (!state.Enabled || !exists) - { - _unlit.Visible = false; - return; - } - - _unlit.Visible = true; - - var suffix = state.State switch - { - ParticleAcceleratorPowerState.Standby => "_unlitp", - ParticleAcceleratorPowerState.Level0 => "_unlitp0", - ParticleAcceleratorPowerState.Level1 => "_unlitp1", - ParticleAcceleratorPowerState.Level2 => "_unlitp2", - ParticleAcceleratorPowerState.Level3 => "_unlitp3", - _ => "" - }; - - if (!_rsi.TryGetState(_baseState + suffix, out var rState)) - { - _unlit.Visible = false; - return; - } - - _unlit.Texture = rState.Frame0; - } - } - } -} diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml new file mode 100644 index 0000000000..63f1583706 --- /dev/null +++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml @@ -0,0 +1,74 @@ + + + + + + + + + + + + [DataField(required: true)] - public ComponentRegistry ChasingComponent = default!; + public ComponentRegistry ChasingComponent = []; /// /// The maximum radius in which the entity chooses the target component to follow diff --git a/Content.Server/Physics/Controllers/ChasingWalkSystem.cs b/Content.Server/Physics/Controllers/ChasingWalkSystem.cs index 618dd4156f..fa55ce024e 100644 --- a/Content.Server/Physics/Controllers/ChasingWalkSystem.cs +++ b/Content.Server/Physics/Controllers/ChasingWalkSystem.cs @@ -61,6 +61,9 @@ public sealed class ChasingWalkSystem : VirtualController private void ChangeTarget(EntityUid uid, ChasingWalkComponent component) { + if (component.ChasingComponent.Count <= 0) + return; + //We find our coordinates and calculate the radius of the target search. var xform = Transform(uid); var range = component.MaxChaseRadius; From d5bdada430df06eccd3b72a6f46ff90726421446 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Sun, 21 Jul 2024 18:20:09 +0200 Subject: [PATCH 068/108] fix microwave construction (#30232) * fix microwave construction * retry --- Content.Server/Kitchen/Components/MicrowaveComponent.cs | 3 +++ Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs index 1d26f68cae..5337d80fd1 100644 --- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs +++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs @@ -79,6 +79,9 @@ namespace Content.Server.Kitchen.Components public Container Storage = default!; + [DataField] + public string ContainerId = "microwave_entity_container"; + [DataField, ViewVariables(VVAccess.ReadWrite)] public int Capacity = 10; diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs index 71986ae859..98c875e773 100644 --- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs @@ -252,7 +252,7 @@ namespace Content.Server.Kitchen.EntitySystems private void OnInit(Entity ent, ref ComponentInit args) { // this really does have to be in ComponentInit - ent.Comp.Storage = _container.EnsureContainer(ent, "microwave_entity_container"); + ent.Comp.Storage = _container.EnsureContainer(ent, ent.Comp.ContainerId); } private void OnMapInit(Entity ent, ref MapInitEvent args) @@ -312,6 +312,9 @@ namespace Content.Server.Kitchen.EntitySystems private void OnInsertAttempt(Entity ent, ref ContainerIsInsertingAttemptEvent args) { + if (args.Container.ID != ent.Comp.ContainerId) + return; + if (ent.Comp.Broken) { args.Cancel(); From b66afb572e544b86614fc91758b1a2ab73e12526 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 21 Jul 2024 16:21:15 +0000 Subject: [PATCH 069/108] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 7b95142486..f625cdfdbc 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Errant - changes: - - message: Vox now take significant damage over time while inhaling oxygen. - type: Tweak - id: 6458 - time: '2024-04-27T10:33:35.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26705 - author: TheShuEd changes: - message: Added tomato killers in floral anomaly berries @@ -3800,3 +3793,10 @@ id: 6957 time: '2024-07-21T10:46:33.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29842 +- author: slarticodefast + changes: + - message: Fixed microwave construction. + type: Fix + id: 6958 + time: '2024-07-21T16:20:09.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30232 From 1e89c075732285672622f020bf06eef02684a437 Mon Sep 17 00:00:00 2001 From: Sphiral <145869023+SphiraI@users.noreply.github.com> Date: Sun, 21 Jul 2024 12:16:58 -0500 Subject: [PATCH 070/108] The Shelfs Update (#27858) * goofed up * wip, mostly test sprites * Nearly done, just need to fix storage locks * everything done to my knowledge * Alright, construction tested and working, and updated health spread * remove a single comment I forgot. Pending sprite changes. * Update sprites and add chemistry locked preset * Forgot to remove a comment --- .../Objects/Consumable/Drinks/drinks.yml | 3 + .../Objects/Consumable/Food/ingredients.yml | 9 + .../Entities/Structures/Wallmounts/shelfs.yml | 475 ++++++++++++++++++ .../Construction/Graphs/furniture/shelfs.yml | 268 ++++++++++ .../Recipes/Construction/storage.yml | 148 ++++++ Resources/Prototypes/tags.yml | 6 + .../Medical/chemistry.rsi/base.png | Bin 0 -> 692 bytes .../Medical/chemistry.rsi/chem-0.png | Bin 0 -> 108 bytes .../Medical/chemistry.rsi/chem-1.png | Bin 0 -> 233 bytes .../Medical/chemistry.rsi/chem-2.png | Bin 0 -> 311 bytes .../Medical/chemistry.rsi/chem-3.png | Bin 0 -> 393 bytes .../Medical/chemistry.rsi/chem-4.png | Bin 0 -> 520 bytes .../Medical/chemistry.rsi/chem-5.png | Bin 0 -> 605 bytes .../Medical/chemistry.rsi/chem-6.png | Bin 0 -> 710 bytes .../Medical/chemistry.rsi/closed.png | Bin 0 -> 267 bytes .../Medical/chemistry.rsi/locked.png | Bin 0 -> 109 bytes .../Medical/chemistry.rsi/meta.json | 47 ++ .../Medical/chemistry.rsi/open.png | Bin 0 -> 267 bytes .../Medical/chemistry.rsi/unlocked.png | Bin 0 -> 107 bytes .../Departments/Service/bar.rsi/bar-0.png | Bin 0 -> 170 bytes .../Departments/Service/bar.rsi/bar-1.png | Bin 0 -> 238 bytes .../Departments/Service/bar.rsi/bar-10.png | Bin 0 -> 652 bytes .../Departments/Service/bar.rsi/bar-11.png | Bin 0 -> 690 bytes .../Departments/Service/bar.rsi/bar-12.png | Bin 0 -> 729 bytes .../Departments/Service/bar.rsi/bar-2.png | Bin 0 -> 306 bytes .../Departments/Service/bar.rsi/bar-3.png | Bin 0 -> 305 bytes .../Departments/Service/bar.rsi/bar-4.png | Bin 0 -> 417 bytes .../Departments/Service/bar.rsi/bar-5.png | Bin 0 -> 445 bytes .../Departments/Service/bar.rsi/bar-6.png | Bin 0 -> 489 bytes .../Departments/Service/bar.rsi/bar-7.png | Bin 0 -> 546 bytes .../Departments/Service/bar.rsi/bar-8.png | Bin 0 -> 577 bytes .../Departments/Service/bar.rsi/bar-9.png | Bin 0 -> 613 bytes .../Departments/Service/bar.rsi/base.png | Bin 0 -> 672 bytes .../Departments/Service/bar.rsi/meta.json | 53 ++ .../Departments/Service/kitchen.rsi/base.png | Bin 0 -> 420 bytes .../Service/kitchen.rsi/kitchen-0.png | Bin 0 -> 108 bytes .../Service/kitchen.rsi/kitchen-1.png | Bin 0 -> 188 bytes .../Service/kitchen.rsi/kitchen-10.png | Bin 0 -> 741 bytes .../Service/kitchen.rsi/kitchen-11.png | Bin 0 -> 804 bytes .../Service/kitchen.rsi/kitchen-12.png | Bin 0 -> 818 bytes .../Service/kitchen.rsi/kitchen-2.png | Bin 0 -> 275 bytes .../Service/kitchen.rsi/kitchen-3.png | Bin 0 -> 342 bytes .../Service/kitchen.rsi/kitchen-4.png | Bin 0 -> 387 bytes .../Service/kitchen.rsi/kitchen-5.png | Bin 0 -> 465 bytes .../Service/kitchen.rsi/kitchen-6.png | Bin 0 -> 547 bytes .../Service/kitchen.rsi/kitchen-7.png | Bin 0 -> 564 bytes .../Service/kitchen.rsi/kitchen-8.png | Bin 0 -> 585 bytes .../Service/kitchen.rsi/kitchen-9.png | Bin 0 -> 650 bytes .../Departments/Service/kitchen.rsi/meta.json | 53 ++ .../Storage/Shelfs/glass.rsi/base.png | Bin 0 -> 223 bytes .../Storage/Shelfs/glass.rsi/closed.png | Bin 0 -> 267 bytes .../Storage/Shelfs/glass.rsi/locked.png | Bin 0 -> 109 bytes .../Storage/Shelfs/glass.rsi/meta.json | 29 ++ .../Storage/Shelfs/glass.rsi/open.png | Bin 0 -> 267 bytes .../Storage/Shelfs/glass.rsi/rbase.png | Bin 0 -> 549 bytes .../Storage/Shelfs/glass.rsi/unlocked.png | Bin 0 -> 107 bytes .../Storage/Shelfs/metal.rsi/base.png | Bin 0 -> 352 bytes .../Storage/Shelfs/metal.rsi/closed.png | Bin 0 -> 267 bytes .../Storage/Shelfs/metal.rsi/locked.png | Bin 0 -> 109 bytes .../Storage/Shelfs/metal.rsi/meta.json | 29 ++ .../Storage/Shelfs/metal.rsi/open.png | Bin 0 -> 267 bytes .../Storage/Shelfs/metal.rsi/rbase.png | Bin 0 -> 352 bytes .../Storage/Shelfs/metal.rsi/unlocked.png | Bin 0 -> 107 bytes .../Storage/Shelfs/wood.rsi/base.png | Bin 0 -> 525 bytes .../Storage/Shelfs/wood.rsi/closed.png | Bin 0 -> 375 bytes .../Storage/Shelfs/wood.rsi/locked.png | Bin 0 -> 108 bytes .../Storage/Shelfs/wood.rsi/meta.json | 29 ++ .../Storage/Shelfs/wood.rsi/open.png | Bin 0 -> 483 bytes .../Storage/Shelfs/wood.rsi/rbase.png | Bin 0 -> 525 bytes .../Storage/Shelfs/wood.rsi/unlocked.png | Bin 0 -> 107 bytes 70 files changed, 1149 insertions(+) create mode 100644 Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/base.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-0.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-1.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-2.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-3.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-4.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-5.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-6.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/closed.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/locked.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/open.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/unlocked.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-11.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-3.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-6.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-9.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/base.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/base.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-0.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-1.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-10.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-11.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-12.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-2.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-3.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-4.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-5.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-6.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-7.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-8.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-9.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json create mode 100644 Resources/Textures/Structures/Storage/Shelfs/glass.rsi/base.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/glass.rsi/closed.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/glass.rsi/locked.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json create mode 100644 Resources/Textures/Structures/Storage/Shelfs/glass.rsi/open.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/glass.rsi/rbase.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/glass.rsi/unlocked.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/metal.rsi/base.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/metal.rsi/closed.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/metal.rsi/locked.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json create mode 100644 Resources/Textures/Structures/Storage/Shelfs/metal.rsi/open.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/metal.rsi/rbase.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/metal.rsi/unlocked.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/wood.rsi/base.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/wood.rsi/closed.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/wood.rsi/locked.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json create mode 100644 Resources/Textures/Structures/Storage/Shelfs/wood.rsi/open.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/wood.rsi/rbase.png create mode 100644 Resources/Textures/Structures/Storage/Shelfs/wood.rsi/unlocked.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 5d77c91a5d..a51a9a1930 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -78,6 +78,9 @@ solution: drink - type: FitsInDispenser solution: drink + - type: Tag + tags: + - DrinkGlass # Transformable container - normal glass - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index be23c2e43f..f1f30f6c46 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -34,6 +34,9 @@ solution: food - type: TrashOnSolutionEmpty solution: food + - type: Tag + tags: + - Ingredient - type: entity abstract: true @@ -272,6 +275,9 @@ reagents: - ReagentId: Nutriment Quantity: 15 + - type: Tag + tags: + - Ingredient - type: entity name: dough @@ -684,3 +690,6 @@ reagents: - ReagentId: CocoaPowder Quantity: 2 + - type: Tag + tags: + - Ingredient diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml new file mode 100644 index 0000000000..af68f5898d --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml @@ -0,0 +1,475 @@ +# Parents +- type: entity + abstract: true + id: ShelfBase + parent: BaseStructure + name: shelf + description: a strange place to place, well, anything really. You feel like you shouldn't be seeing this.' + components: + - type: Sprite + drawdepth: WallMountedItems + sprite: Structures/Storage/Shelfs/wood.rsi + state: base + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.35,-0.35,0.35,0.35" + density: 35 + layer: + - BulletImpassable + - type: Transform + - type: Damageable + damageModifierSet: Wood + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 60 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroyHeavy + - !type:DoActsBehavior + acts: ["Destruction"] + - type: WallMount + arc: 175 + - type: Storage + grid: + - 0,0,3,1 + - 0,3,3,4 + maxItemSize: Normal + - type: UserInterface + interfaces: + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + - type: InteractionOutline + - type: ContainerContainer + containers: + storagebase: !type:Container + - type: Tag + tags: + - Structure + +- type: entity + abstract: true + id: ShelfBaseReinforced + parent: ShelfBase + name: reinforced shelf + description: It looks as strong as reality itself. + components: + - type: Lock + - type: LockVisuals + - type: Sprite + sprite: Structures/Storage/Shelfs/wood.rsi + state: base + layers: + - state: rbase + map: ["enum.StorageVisualLayers.Base"] + - state: unlocked + shader: unshaded + # used to keep the unlocked light visible while open. + - state: closed + map: ["enum.StorageVisualLayers.Door"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - type: Appearance + - type: EntityStorageVisuals + stateDoorOpen: open + stateDoorClosed: closed + + - type: AccessReader + +# Normal +- type: entity + id: ShelfWood + parent: ShelfBase + name: wooden shelf + description: A convenient place to place, well, anything really. + components: + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 60 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroyHeavy + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank1: + min: 1 + max: 3 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Tag + tags: + - Structure + - Wooden + - type: Construction + graph: Shelf + node: ShelfWood + +- type: entity + id: ShelfMetal + parent: ShelfBase + name: metal shelf + description: A sturdy place to place, well, anything really. + components: + - type: Sprite + sprite: Structures/Storage/Shelfs/metal.rsi + state: base + - type: Damageable + damageModifierSet: Metallic + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 120 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel1: + min: 2 + max: 4 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Tag + tags: + - Structure + - type: Construction + graph: Shelf + node: ShelfMetal + +- type: entity + id: ShelfGlass + parent: ShelfBase + name: glass shelf + description: A fragile place to place, well, anything really. + components: + - type: Sprite + sprite: Structures/Storage/Shelfs/glass.rsi + state: base + - type: Damageable + damageModifierSet: Glass + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WindowShatter + - !type:SpawnEntitiesBehavior + spawn: + ShardGlass: + min: 0 + max: 2 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Tag + tags: + - Structure + - type: Construction + graph: Shelf + node: ShelfGlass + +# Reinforced +- type: entity + id: ShelfRWood + parent: ShelfBaseReinforced + name: sturdy wood shelf + description: A safe place to put your favorite bottle of whiskey + components: + - type: Sprite + sprite: Structures/Storage/Shelfs/wood.rsi + state: base + layers: + - state: rbase + map: ["enum.StorageVisualLayers.Base"] + - state: closed + map: ["enum.StorageVisualLayers.Door"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 215 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroyHeavy + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank: + min: 2 + max: 5 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Construction + graph: Shelf + node: ShelfRWood + +- type: entity + id: ShelfRMetal + parent: ShelfBaseReinforced + name: sturdy metal shelf + description: A strong & shiny place to keep all your vials safe + components: + - type: Sprite + sprite: Structures/Storage/Shelfs/metal.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 450 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetPlasteel1: + min: 2 + max: 3 + ShardGlass: + min: 1 + max: 2 + PartRodMetal1: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Construction + graph: Shelf + node: ShelfRMetal + +- type: entity + id: ShelfRGlass + parent: ShelfBaseReinforced + name: sturdy glass shelf + description: Crystal clear reinforced glass doors to show off all your fancy bottles you definitely didn't sell a co-worker's favorite mothroach for. + components: + - type: Sprite + sprite: Structures/Storage/Shelfs/glass.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 250 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WindowShatter + - !type:SpawnEntitiesBehavior + spawn: + SheetPlastic1: + min: 1 + max: 3 + ShardGlass: + min: 1 + max: 2 + PartRodMetal1: + min: 0 + max: 1 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Construction + graph: Shelf + node: ShelfRGlass + +# Departmental +- type: entity + id: ShelfBar + parent: ShelfBase + name: bar shelf + description: Made out of the finest synthetic wood for all alcohol holding needs. + components: + - type: Sprite + sprite: Structures/Storage/Shelfs/Departments/Service/bar.rsi + state: base + layers: + - state: base + - state: bar-0 + - map: ["enum.StorageFillLayers.Fill"] + - type: Appearance + - type: StorageFillVisualizer + maxFillLevels: 13 + fillBaseName: bar + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroyHeavy + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank1: + min: 1 + max: 4 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Storage + grid: + - 0,0,5,1 + - 0,3,5,4 + maxItemSize: Normal + whitelist: + tags: + - DrinkGlass + - DrinkBottle + - DrinkCan + - Beer + - type: Construction + graph: Shelf + node: ShelfBar + +- type: entity + id: ShelfKitchen + parent: ShelfBase + name: cooking shelf + description: Holds knifes, spice, and everything nice! + components: + - type: Sprite + sprite: Structures/Storage/Shelfs/Departments/Service/kitchen.rsi + state: base + layers: + - state: base + - state: kitchen-0 + - map: ["enum.StorageFillLayers.Fill"] + - type: Appearance + - type: StorageFillVisualizer + maxFillLevels: 13 + fillBaseName: kitchen + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel1: + min: 1 + max: 4 + MaterialWoodPlank1: + min: 0 + max: 1 + PartRodMetal1: + min: 0 + max: 2 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Storage + grid: + - 0,0,5,1 + - 0,3,5,4 + maxItemSize: Normal + whitelist: + tags: + - DrinkGlass + - BoxCardboard + - MonkeyCube + - Enzyme + - Mayo + - Packet + - Cleaver + - Knife + - KitchenKnife + - RollingPin + - Ingredient + - Trash + - type: Construction + graph: Shelf + node: ShelfKitchen + +- type: entity + id: ShelfChemistry + parent: ShelfBaseReinforced + name: chemical shelf + description: Keeps all your chemicals safe and out of the clow- er, public hands! + components: + - type: Sprite + sprite: Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi + layers: + - state: base + map: ["enum.StorageVisualLayers.Base"] + - state: unlocked + shader: unshaded + - state: chem-0 + - map: ["enum.StorageFillLayers.Fill"] + - state: closed + map: ["enum.StorageVisualLayers.Door"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - type: StorageFillVisualizer + maxFillLevels: 7 + fillBaseName: chem + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 330 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + SheetPlasteel1: + min: 1 + max: 2 + SheetPlastic1: + min: 1 + max: 2 + ShardGlass: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Storage + grid: + - 0,0,5,1 + - 0,3,5,4 + maxItemSize: Normal + whitelist: + tags: + - ChemDispensable + - GlassBeaker + - Bottle + - type: Construction + graph: Shelf + node: ShelfChemistry + + + +# Access presets +# Try to keep alphabetical sorting if adding more + +- type: entity + parent: ShelfChemistry + id: ShelfChemistryChemistrySecure + suffix: Chemistry, Secure + components: + - type: AccessReader + access: [["Chemistry"]] + diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml new file mode 100644 index 0000000000..61a903f7a0 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml @@ -0,0 +1,268 @@ +- type: constructionGraph + id: Shelf + start: start + graph: + - node: start + actions: + - !type:DeleteEntity {} + edges: +# Normal + - to: ShelfWood + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: WoodPlank + amount: 4 + doAfter: 2 + - to: ShelfMetal + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Steel + amount: 5 + doAfter: 3 + - to: ShelfGlass + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Glass + amount: 4 + doAfter: 2 +# Reinforced + - to: ShelfRWood + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: WoodPlank + amount: 8 + doAfter: 3 + - material: Cable + amount: 2 + doAfter: 1 + - to: ShelfRMetal + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Plasteel + amount: 5 + doAfter: 3 + - material: ReinforcedGlass + amount: 5 + doAfter: 2 + - material: Cable + amount: 3 + doAfter: 1 + - to: ShelfRGlass + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Plastic + amount: 5 + doAfter: 2 + - material: ReinforcedGlass + amount: 5 + doAfter: 3 + - material: Cable + amount: 2 + doAfter: 1 +# Departmental + - to: ShelfBar + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: WoodPlank + amount: 6 + doAfter: 2 + - to: ShelfKitchen + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: MetalRod + amount: 2 + doAfter: 1 + - material: Steel + amount: 5 + - material: WoodPlank + amount: 3 + doAfter: 2 + - to: ShelfChemistry + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Plasteel + amount: 2 + doAfter: 2 + - material: ReinforcedGlass + amount: 5 + doAfter: 2 + - material: Plastic + amount: 5 + doAfter: 2 + - material: Cable + amount: 2 + doAfter: 1 + +# Normal deconstructs + - node: ShelfWood + entity: ShelfWood + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 4 + steps: + - tool: Prying + doAfter: 2 + + - node: ShelfMetal + entity: ShelfMetal + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 5 + steps: + - tool: Screwing + doAfter: 5 + + - node: ShelfGlass + entity: ShelfGlass + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetGlass1 + amount: 4 + steps: + - tool: Screwing + doAfter: 2 +# Reinforced deconstructs + - node: ShelfRWood + entity: ShelfRWood + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 8 + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 2 + steps: + - tool: Screwing + doAfter: 5 + - tool: Prying + doAfter: 2 + + - node: ShelfRMetal + entity: ShelfRMetal + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetPlasteel1 + amount: 5 + - !type:SpawnPrototype + prototype: SheetRGlass1 + amount: 5 + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 3 + steps: + - tool: Screwing + doAfter: 2 + - tool: Welding + doAfter: 5 + + - node: ShelfRGlass + entity: ShelfRGlass + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetPlastic1 + amount: 5 + - !type:SpawnPrototype + prototype: SheetRGlass1 + amount: 5 + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 2 + steps: + - tool: Welding + doAfter: 2 + - tool: Screwing + doAfter: 4 + +# Departmental deconstructs + - node: ShelfBar + entity: ShelfBar + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 6 + steps: + - tool: Prying + doAfter: 3 + + - node: ShelfKitchen + entity: ShelfKitchen + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: PartRodMetal + amount: 2 + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 5 + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 3 + steps: + - tool: Screwing + doAfter: 2 + - tool: Welding + doAfter: 2 + - tool: Prying + doAfter: 1 + + - node: ShelfChemistry + entity: ShelfChemistry + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetPlasteel1 + amount: 2 + - !type:SpawnPrototype + prototype: SheetPlastic1 + amount: 5 + - !type:SpawnPrototype + prototype: SheetRGlass1 + amount: 5 + - !type:SpawnPrototype + prototype: CableApcStack1 + amount: 2 + steps: + - tool: Welding + doAfter: 2 + - tool: Screwing + doAfter: 1 + - tool: Anchoring + doAfter: 2 + - tool: Prying + doAfter: 4 diff --git a/Resources/Prototypes/Recipes/Construction/storage.yml b/Resources/Prototypes/Recipes/Construction/storage.yml index c8edebc509..7128c79eee 100644 --- a/Resources/Prototypes/Recipes/Construction/storage.yml +++ b/Resources/Prototypes/Recipes/Construction/storage.yml @@ -67,3 +67,151 @@ canBuildInImpassable: false conditions: - !type:TileNotBlocked + +# Shelfs +# Normals +- type: construction + id: ShelfWood + name: wooden shelf + description: A convenient place to place, well, anything really. + graph: Shelf + startNode: start + targetNode: ShelfWood + icon: + sprite: Structures/Storage/Shelfs/wood.rsi + state: base + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + conditions: + - !type:WallmountCondition + +- type: construction + id: ShelfMetal + name: metal shelf + description: A sturdy place to place, well, anything really. + graph: Shelf + startNode: start + targetNode: ShelfMetal + icon: + sprite: Structures/Storage/Shelfs/metal.rsi + state: base + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + conditions: + - !type:WallmountCondition + +- type: construction + id: ShelfGlass + name: glass shelf + description: Just like a normal shelf! But fragile and without the walls! + graph: Shelf + startNode: start + targetNode: ShelfGlass + icon: + sprite: Structures/Storage/Shelfs/glass.rsi + state: base + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + conditions: + - !type:WallmountCondition + +# Reinforced +- type: construction + id: ShelfRWood + name: sturdy wooden shelf + description: The perfect place to store all your vintage records. + graph: Shelf + startNode: start + targetNode: ShelfRWood + icon: + sprite: Structures/Storage/Shelfs/wood.rsi + state: rbase + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + conditions: + - !type:WallmountCondition + +- type: construction + id: ShelfRMetal + name: sturdy metal shelf + description: Nice and strong, and keeps your maints loot secure. + graph: Shelf + startNode: start + targetNode: ShelfRMetal + icon: + sprite: Structures/Storage/Shelfs/metal.rsi + state: rbase + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + conditions: + - !type:WallmountCondition + +- type: construction + id: ShelfRGlass + name: sturdy glass shelf + description: See through, decent strength, shiny plastic case. Whats not to love? + graph: Shelf + startNode: start + targetNode: ShelfRGlass + icon: + sprite: Structures/Storage/Shelfs/glass.rsi + state: rbase + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + conditions: + - !type:WallmountCondition + +# Departmental +- type: construction + id: ShelfBar + name: bar shelf + description: A convenient place for all your extra booze, specifically designed to hold more bottles! + graph: Shelf + startNode: start + targetNode: ShelfBar + icon: + sprite: Structures/Storage/Shelfs/Departments/Service/bar.rsi + state: base + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + conditions: + - !type:WallmountCondition + +- type: construction + id: ShelfKitchen + name: cooking shelf + description: Holds your knifes, spice, and everything nice! + graph: Shelf + startNode: start + targetNode: ShelfKitchen + icon: + sprite: Structures/Storage/Shelfs/Departments/Service/kitchen.rsi + state: base + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + conditions: + - !type:WallmountCondition + +- type: construction + id: ShelfChemistry + name: chemical shelf + description: Perfect for keeping the most important chemicals safe, and out of the clumsy clowns hands! + graph: Shelf + startNode: start + targetNode: ShelfChemistry + icon: + sprite: Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi + state: base + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: true + conditions: + - !type:WallmountCondition diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index d7a7f089b1..197966b491 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -542,6 +542,9 @@ - type: Tag id: DrinkCan +- type: Tag + id: DrinkGlass + - type: Tag id: DrinkSpaceGlue @@ -764,6 +767,9 @@ - type: Tag id: Igniter +- type: Tag + id: Ingredient + - type: Tag #Drop this innate tool instead of deleting it. id: InnateDontDelete diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..2d67101d2fc367f5c3efabe8639b97017257635c GIT binary patch literal 692 zcmV;l0!#ggP)Px%Zb?KzR9J=WRzGMHQ5gT_PjkIX!d*;Fa-kHD#GymMrHj;)=%Q05g(3wP$?WXx ztec1g1aVOuGQ~v#MO?b1RSb=SrIbsfiOqRUV&!Zd^zQO5?=DG|bTGf^eed_Z@B6(! z-^T+c_}}5_HL}_4(KwP83I#K--%jT9d9W;N+8oDOeTKcrxitW|bveCA6Xm5%8pqc7cF?76Wds;8dauG&K)qi7 zXUXj%n$2b(M|}gsApGPiVQVWz2TylUuV9=Qcmkgj5*}7I5%Q5*y_fD2_TfHRmiv`W zs0j)9@)rWwxV|(k1RyX0=(-NCy5s2E%N_Ew5SRcCP6hD8t1ory{?|hbh(@DmwOWYH zL7q!Sab{))0I=0)U^W&905F_@ou>2Fj+kk%em?>c9}t0en^9#W_CNs!);Hc@eZw)w z$XK42sPlvXRaMQgD4bsffU`dbIsSU{~-0{~p)8KC_gX#Z}p5`cvl z7fe6TmFL8|g_qaN@mm`w@eC2$RR92_(`o8%PIJyaZk!v44_YRZ8OyJ@R4RD}drdIG anD7hV)XtMD4qp-g0000cq@Gs=6k_mn^>bP0l+XkK DN_QQ_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-1.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-1.png new file mode 100644 index 0000000000000000000000000000000000000000..47ee108f18c6ba3e19ba03b4510b862b4e703184 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}i#=T&Ln2y} z6C_v{Cy4Zv9PsdHJbY}nyM% zITnt&>;l3}{}bOZ|9i!9HTWtcpLG7Z-AkfY{m#3;*O~_i<|!4kY!hj8yMk?3WNI2EC@xv>ubG7z2%4MUMDe%1fA4?klp@F-O@RhnZU;3aSe3;Y Z7&H>pj7p#CZvi@&!PC{xWt~$(695g5P=f#f literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-2.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-2.png new file mode 100644 index 0000000000000000000000000000000000000000..77a54a15cef75cea27d1362369af7614827dae4b GIT binary patch literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}A3a?hLn2y} z6C_v{Cy4Zv9PsdHJbY}nyM%kg8 zR}AgF=GS9`bg$NKe}7Mw4G8=vS~h{S#+co+Ns`(WFrl%rQE{4T-_DYM$Nxu9T+}Xd zz{TU>uj@y(*h`mJB~1Q&1hfy;Bq^t0rFuBGlTO(_f$i#-`jznXYh3Ob6Mw<&;$V1`F_>_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-3.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-3.png new file mode 100644 index 0000000000000000000000000000000000000000..ddd26ba62701212cd38959dfa7b0b63db2337528 GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<&YmugArY;~ z2@q8R{IPj6FO@a)gOe^0(~aC5T(Mb-W19gtN}RzA$J`3FC9 z^VZ!;#{)s)%;s^?oB#Z-W}ffd!O6J8mHp4vhp%EM9Qm%$sl3|#y0cNijf&#A7fkox z<_Rv@X6$qE=DVGbj&QDc>aG>JdR^G2u-LuFDj&Cf@0xr)@lpE~$#lEGu1QZwNGN!c`k-awM@BIx zu2=RR1|VQ@V%^t-AOHTT`26`Xt77eAd4-%jHjd=}{kwRXO)ko{dC1;o* jm)k)NNPsm>Px$!bwCyR9J;$U>F6XU=)mWz(`1e!^WFO7#J9=Ilh0mu_MA<6DFRSnfV{ao<4m# zia9PDZysU){y}&vl6tZn;IQ%LItB)YKzBusqdV{au;%>!{^a%u3kwDY28Jh3p1>U- zBO}8Iv-l4KgSERN$593b28IJSUR$&L`+EbQLx>3hxJ3v2)#2)0ki_>Oi6g5=*F!RJ z*m!fD&^5o?3{!NrGfdIh?z!T`38>{qDp{+pRQ42*Cg-uoUF-FZm+Hu3`#&>$XJBApaO7p+gt74f z7D5W@KS(ezFfcGU$gcHZ`2PMRO#Jwoc&+0fAZ%_12xE`Gx(x#~(H@3K9o^%vZbQh9 zQ81u@U>0#In)VXL-q)8UPHhL^O@!{1EAN?^s=tBpS=m?K+u0tjL`?_a4T0l#@1JO# zbJrZkuTN1vX{oGeK}`n`%!ZTW`Ch(Z6%}V-U|`sG@uN8*^`rv41ySRiyKD>$3=AT_ zU%wRj{rctU({IjG+W`aQ7{SyD*ym^+n>E~C=Pr80000< KMNUMnLSTZVlj>^# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-5.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-5.png new file mode 100644 index 0000000000000000000000000000000000000000..1b7430d80959724d2f248e5c254936089d2e0ebe GIT binary patch literal 605 zcmV-j0;2tiP)Px%7fD1xR9J;$U>F6XU=)mWz(`1e!^WFO7#J9=Ilh0mu_MA<6DFRSnfV{ao<4m# zia9PDZysU){y}&vl6tZn;IQ%LItB)YKzBusqdV{au;%>!{^a%u3kwDY28Jh3p1>U- zBO}8Iv-l4KgSERN$593b28IJSUR$&L`+EbQLx>3hxJ3v2)#2)0ki_>Oi6g5=*F!RJ z*m!fD&^5o?3{!NrGfdIh?z!T`38>{qDp{+pRQ42*Cg-uoUF-FZm+Hu3`#&>$XJBApaO7p+gt74f z7D5W@KS(ezFfcGU$gcHZ`2PMRO#Jwoc&+0fAZ%_12xE`Gx(x#~(H@3K9o^%vZbQh9 zQ81u@U>0#In)VXL-q)8U4r4nPF1W|Qz`(G#KS7BS2jESF?v*R=nVG7;f$>?{SKiy% z98q%v-IN z9Q#+~TF$^gL^hlp&-d~TtEe~w0|UdhiyzGy7#JApQP$eylmgm?gCfuUA6Z= r0|NuY);4GI%lc6;3P!;w7z_Xa8xYH1*bm_900000NkvXXu0mjf_}~@3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-6.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-6.png new file mode 100644 index 0000000000000000000000000000000000000000..e415ee1a7e8898bca03da2d4cb2b7b4d7fa4e2c6 GIT binary patch literal 710 zcmV;%0y+JOP)Px%fJsC_R9J=WlU+ztVHn5%E9bT%f|3%M7qj5tH2Q$lHlx)hTMimsC3ca7H|w1@})wGLjL5m z!2eGT7Eda2(x>{;LtyarO;a`B>tWhoiz+5t`uh`m5 zmTTlsPM}n1&PJ8|CV?Ih=tBSQZ~hvCFXcV4d}{?GjWZZ&oVhs>4sRC^IpofSL+(s0 ztCC6UMC1$6=P9s5HAoEAATdvYCAs}LB-X@Kw(snRb1yA>-t5^+*14Z~*sM5FGBRBU)SEc$r$E>fwe7Hwi*Xod@~ zB%|MHhU005?|a z*>u%LHXV!QmW291d-Jzww5aXoet!e^`bi?QS5AoN5Lz68(hmGCQ^`+uHvP;f6L{l? sWwMK8y~*=SewXQzSPcmY35f&cH@C12VU!4N-T(jq07*qoM6N<$f|40ef&c&j literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/closed.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..c79f80c0c2310f301d6313426bec0a4a53311631 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}M?GB}Ln2y} z6C_v{Cy4MEBpgvql)tpGf0meROz^`N-#M()*;s?u9&X_=y)wzbvh0@_KQr@T#v<8c zF6-Q~8UxvTtQeLvFH(A2!jXAz)29_;%*@QqJ+qj;$~yEYM-}NjG@JaIV-8=$wm%m{ zlVlDaIB?*@lWWYIWE;&{I4l>Xo%+Z=#i}Vm>cDf3`30}DPfVNim}Ai;2E&Vv>y$at zoTIFp5|mVq2^w&pEMy7noG`6VL4x&%%)*uHzcoj=_cR3>aJez+F)&okPTdx?G;ANx OLkym-elF{r5}E+_Ygr+ArY-_ z&lxf@FmNy{B(JG=WzOK>m-lcGEx2&9#OOXh14F}P)<w1lw}$KTFM5ezk1=AE4ZUOAL1I78TNam(66JpsOk(WKzsvE8}P& zcgyhpMb!FsY_Neb67e#xO~{SKtca#>qQNat5cX6F8&C9wPEE|TcC#+JYD@< J);T3K0RU(OUmpMf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/unlocked.png new file mode 100644 index 0000000000000000000000000000000000000000..39d2fb77884f3e7d5ec21c0538d18761652efca5 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}s-7;6ArY-_ z&lxf@FmN2+Pi0jO8VkuLc9xTmmm7EjISihzelF{r5}E** CYagWm literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png new file mode 100644 index 0000000000000000000000000000000000000000..c090326148dd2c90eda107a749782cd9a2c9f7ba GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}DV{ElArY;~ z2@I;*M#72S8xM29xHA*UEs#7;w2A)Bu|qz{1cqk>{w5yu=cqeGHzi KelF{r5}E+2SvuSR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png new file mode 100644 index 0000000000000000000000000000000000000000..7d698e0020f00e0d34ad9d97cc5a45c60703f879 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}D?D8sLn2y} z6C_v{Cy4Yg2|0K*ysgigebQx8mY-zS?ehmb)*RAF|5~nd#>b}q-@o5Rx$k`yonGzz zd}_Xtfq_BJ+$);B{<0Sp6*3dFf4sd|9_Gm$?WnZXqw|E;zs~pbK2Ff$O8|li-^&!E z*6v$*qTEWL~T~}T6mg%CuKsPgZy85}Sb4q9e020Jr>;M1& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png new file mode 100644 index 0000000000000000000000000000000000000000..5acb43b17992e3a4febbfbf730ad8712a3205eb4 GIT binary patch literal 652 zcmV;70(1R|P)Px%MoC0LR9J=WlwC+uVHn5%XFIx9Yi(_QE{i$Kp|urVj6T$xjSUQ1nRHhdeIUUG zAxn0=DuOU2(1?Z(DH^d0w?Oft79!Q^Li(_d7l6K2?z)X2=L&vy^dt}wWS*JCoNY*TtxoMwjYJ0TL1uq)gl4_y2IKe0Ngxl z%Gn6TMf5D_CUc1+JQu2Dav-&Dd(dL1rsu-5&+oG$K*T1tgKlsfiyISK%4o+im-BZg*J7v(=(m7 zfnRKEG~=360`ZqV^q!X&NUau(Y+@;2a~c6fLXoXCS`K~C=xY}NY|YC+@LuPqnA?j= zLwP3gCj2dXZY(*LJU*|&`1J)eu|?Vyp;bTIs?ci*0HEa32>_VxdGN0C5k-%q_>AGy zRlI(6|B12qigCi|kk$l{c>BB9+pZQ)_e_8n`!4J!^%ooR{)7M?uOKu$wDg=d+SE`S zEdc@L?@@vCo>>AIhAXD{&-D#vc0O7cuo3ctB&}( zBi05hiTJuBeDd-BBwBQ3L{&&*b}@J2x}){AIX^Z{ED|w>x6h mJ9ZI&yCe4Biwg({0000Px%Y)M2xR9J=WlwC+uVHn5%XCAfHvaQYUEaogl%OzcmKGd6u0|PCS?(D(}5fnm} zY+fZnm?O}L#uO=%*u^$MQK-e7*6Kp~u&{_#e!y5XwOtGab9=g|WV5n!9CUSla4z2W z{GaFlyyv{n0|*ER2=L&1O({jMl^NOeH!W90TtwEZx*ta3Jph2Ad=UYFs#+NWfZG=} zTP}p*B6{X9(7juZuWW)yvKEenp0Wm+Jjb%gB#4qJ9NEz%-_F!_K8ndz)zanzfRUcg z?9Fm>`T~KZ3}hZIl`YS&Bu-0OWB?HSd?w|fCn%{)Nru?D1bdtI#fGpfMUHaqT$gz+ z?gDEy+mu(hJL_ltgi51zfv=%s^cjc4a|N}*RON=yyr0jeu>TSOKzc_#0L=9~e3v`Huv198 zP~31GuU|cQqE5S}o>n)D3+)KJ{Zs5+eIuuPCculMmyc1|mGYS0w{+Cggib}4j(T1* zfpZr)M~2tiX{SyB>FIO;fZJvw0AL13k<`=xW^j~`KX-E%K-N3`1OTUMYREYJnA|oK zRh%dzx6MT3V=n3~QPB99EAH|98)m?HA0RW}jNUi2>ZxBPB15Zw%ch)uf!}Dd&7(O#$uCE22J4LCmSW1Kr-r@=Ed!bbI;a<2@uA zRhcADVzIco2J=V%di;@+;{oYzg(A4Lu<-n)CzWsBxUsf3`|=MQB5QlI@4uT12nfW( YcMSv4Nr;lodH?_b07*qoM6N<$f&^+mUH||9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png new file mode 100644 index 0000000000000000000000000000000000000000..77469720a635ab8497a7de25b3a39cdf1bc8560a GIT binary patch literal 729 zcmV;~0w(>5P)Px%lSxEDR9J=Wlv_ws0T{>sXHIQ3*KG5i#hj&Rxugf_qP|QV*vMwmn>|<|f(Vw(z5wH=NYc)R_iS_~jx{?G00Ls$}F96)Wl=0U= z7&fA3Rz2OjW&J7)5{OsV*1b=K`fypiX^sgJgwopju2R`frl9VTpI2Ual?woRn(E@V z@@Dl0+#%73Ig%N^IJp!&DlQKP0MF;Ml0!otaiJs>BKtfnRq7X;%3|g5iq-S=#)*If z{9=Ee8aK*A5%i@QrpuCGQEm<#yFE->;TkMbx71gw$~pBRE;)4tz`lS2SUc)Jx%4ea zNQ+%}zZv@GdvDk~>^-+A!^q7g6nG*On@SUZ9$O;ZP5=N=HAMh0(e&_L!XP6YLFC1> z;_G<*>cJCLw?F|F~Oh+$5N{hjC^a22Ct+s%-q+fFfK;}EG1OR99^U2Wt znEKlrDCcAr^|v?BK%aw})8#bK=O9O?g>*J8IXW%>CWH~N-v`JD*nO|-D=Mi~DIk4C zrC%eRO-or-YSP)X+Xi6u38oDO_4^${OdAYp0O-=B5CBY$jiXtdhRLyUKmGF5!c17K z1j|zkGi>}h(UOr&2NF}MB_rAI>6~qi&fM%=a<(-(x%hEj5+%wQl7$E{x3UW3$LWpw zqvN3}VZ_dNR6A0e{4eIL&hCb1N00000 LNkvXXu0mjf`A1iX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png new file mode 100644 index 0000000000000000000000000000000000000000..5eab596dd4648c3d0651b52b21a060968028c6de GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Z#-QbLn2y} z6C_v{Cy4Yg2|0K*ysb~!x2WYyeN0v-tB=acXHy&>YW>!(TX==B=ZMysqOkhoht3@N z{QUiX{mb9(i4^&5tU7$+%#nZp-|wGa{ai-aG5r19@PAVp8ygc}FY(K)c_t*wG>L6n z(|x(x^r xI9J@N`B8uM*YW>!(TX==B=ZMysqOkhoht3@N z{QUiX{mb9(i4^&5tU7$+%#nZp-`l_2Tilmeam0H4A5CUv=EK)K=U)18M%9W%g*S(F zzwNJcTA2yjCk`Aq@ZtUW{rOhz_8v9hv1T z9I*B0hySb2wrieK1$n3`(16SBpoRpi2|L4W4SOCA9-aL_Z!>th`njxgN@xNAdkTZQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png new file mode 100644 index 0000000000000000000000000000000000000000..15c03124e69b1c62484d2e10751603caa0312ce4 GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<(Vi}jArY;~ z2@!%$S$vx6Qeu%wgK* zU)Jlki`S)FuHK&vlqm4qSjD{be<$asq!r)KY1hA+8~$%f7T*Mu4WfU(y|7-rq;ahR zGc)ty{r3O&y_ETTK={=0a|d?*mOXr{XnJu*)Do8z(f>!v&sTJuj}c3fJpcp>@832Z zdR|hVdgFL`!$j3D@<83$j4772;q$F|fWSXLCiGys+C{|=e-1tTzFuGc?_UrDB;}*y z6SI8(oPR?9d}lm-^yEFyL3tO^i(6JW7{(p&Si@Y_62xpM#j literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png new file mode 100644 index 0000000000000000000000000000000000000000..ece06f2d7866b49989b8ee21e84ca5c1d753c47f GIT binary patch literal 445 zcmV;u0Yd(XP)Px$cS%G+R9J;$U>F6XU=)l35N{1LU;~8M2(!-*LUY@H@*{{T%}X1A}vl)f*`NPfU;(Lyvb}`BU$_ z@~2dBz-u-M21x^3!EcYgvq~D+3NkP-F#P-T@0-ri4?LlK>5dQ$&hUq1T#`Gv#p85kHCm{^#&PJcQ5CH$K(!^O$p8G=8EDxzss zfnvOXs1Oiuieq44V0bub*L5YB*xotEL>L$t7{uE3uj=P=YOQ5>eGQx5g{2vc#Mm(k z20z%nbu-@VM03mcF);jJv0xs>MK4)k1_Q(HWeg1eXD~4ArncEcm4wf$s$6bzurNHY ns&XN$dK8R;Q7{Td0cijL)3}BnsfDj;oiL;tWQV&l?6&R7k6Ei*7)o1GeO+BzdY_|@cTWVmWLD`$Ts6- z^JI=bnBTu|vzOEjE+Yd2gFnANzn^{XBEQYTnm0UicHcK#qg!s-zRcIlCG4Yr&G(-6 zA7|1Ok1-l3ynowt=y^$b>W$;&4HH$r$OGMw&6r|Y8$REf2MGN0V?qz6s~r@G*uL-g zz00R8dAzEE{>R1J{rdg0_3(R12?>cA5i@r9)m#2m{WII(@X?d^C7bL!v=(KCHYV+9 zSRo*g-<6z@kWgWfdA(G1#*KTH$6bJWB#zwry8hMkqO7&46}7yx@3k(K>^XA7kjsN< zT58z;w^DC4^;#q(I?l9#+^~ClUR%0)9KRr2qe5ZU4gWdJW%+miOt^VFJnv{z<$sVH zcBmT~zOXs5w2Qfe$yh?7Og}l{hkbKnqWRXdYFaGw!b5l7d6JM=5f}Q@DdMXJG(s*h ZFa)p_u24=pt_+Mj22WQ%mvv4FO#r6D%&Y(a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png new file mode 100644 index 0000000000000000000000000000000000000000..e9468e2cdfe0803e96cb8900071461a19c86d8a7 GIT binary patch literal 546 zcmV+-0^R+IP)Px$+(|@1R9J;$U>F6XU=)l35N{1LU;~8M2(!-*LUY@H@*{{T%}X1A}vl)f*`NPfU;(Lyvb}`BU$_ z@~2dBz-u-M21x^3!EcYgvq~D+3NkP-F#P-T@0-ri4?LlK>5dQ$&hUq1T#`Gv#p85kHCm{^#&PJcQ5CH$K(!^O$p8G=8EDxzss zfnvOXs1Oiuieq44V0bub*L5YB*xotEL>L$t7{uE3uj=P=YOQ5>eGQx5g{2vc#Mm(k zNCK8+R{!l9?I|vV7#N7mh71f047;~(hG!>U4-p1|AaQEgPn-jGZ{7Tm+1poc#e#YN z85kHCxF<0&=sd`!iUWuOGZ+|lFJoZ%KZAi`H?_?sDg>TaRk_^cU}1P(Rpmlh^#Fm} zOD5iSw|D=4d&$Jxr0AnsAz^H2{aQdsMC8M}H*e0KKPpPBKB990AyDdN^y|svdkm#s kM!%?K<|r5iqkt{|09xgT$Sc6)6#xJL07*qoM6N<$g8Fdm^#A|> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png new file mode 100644 index 0000000000000000000000000000000000000000..d01b2a6bc8774dd113d4aa31f2cba9f46c8b37b2 GIT binary patch literal 577 zcmV-H0>1r;P)Px$`$F6XU=)l35k!b_gReijJ?V{J(hWy7w&1Ogw-7{`+!_rBYB>cGg=) zW+wLkfB$i333D+9ckV$k%R8_9DFXuo!`4Zi()i3KDg<7$Niawn*b07o^quu8Po5wH z0|Uc{7a@E)M?dg{^06~;?taIxw%p|$nl>pBS;ar`-7_9i>;M>$_jY0E%VTF?el?q6 zRv{lNr@Je|KK>7kOG5uLtQB}IfUH*E)#r}1hW0N81_n8b9I$SE_r0f;a~PELr2f6W zeDpW6-03f;zl47iX1F-{J45gXQAISZDo~6UunC3i7gy0G(zzF52dRsCE}t+foVuVK@>ur!0HbT$e|0+wY~|Lq#>DK3N<7)Zzk zySHwJXD40{5e9)EacbC4oC9`m-TaW*+gEPIf_eWL7#JA1CowVTJjkVr1Be1M7#Mah zV_^6{gMnc;waq3f1fEw_x!mMnVR&9uPx%A4x<(R9J;$U>F6XU=)l35k!b_gReijJ?V{J(hWy7w&1Ogw-7{`+!_rBYB>cGg=) zW+wLkfB$i333D+9ckV$k%R8_9DFXuo!`4Zi()i3KDg<7$Niawn*b07o^quu8Po5wH z0|Uc{7a@E)M?dg{^06~;?taIxw%p|$nl>pBS;ar`-7_9i>;M>$_jY0E%VTF?el?q6 zRv{lNr@Je|KK>7kOG5uLtQB}IfUH*E)#r}1hW0N81_n8b9I$SE_r0f;a~PELr2f6W zeDpW6-03f;zl47iX1F-{J45gXQAISZDo~6UunC3i7gy0G(zzF52dRsCE}t+foVuVK@>ur!0HbT$e|0+wY~|Lq#>DK3N<7)Zzk zySHwJXD40{5e9)EacbC4oC9`m-TaW*+gEPIf_eWL7#JA1CowVTJjkVr1Be1M7#Mah zV_^6{gMnc;waq3f1fEw_x!mMnVR&9u<-)+gz_7_fiz@L?7MNqM@n2O%`~Mts4HQS* zUNZ5vyS@AW+e;?iCdE9G3yBP6$^XJ^EDUdd{b87K_c>g@v7z;A0U;5Q5AWW*IeY%7 zD5>UB3|3UPx%T1iAfR9J=WR$Xh;U=)7x(X{E(mC!n7u@}OsOu9KlLGi*HKduDv(m&yk@?N~H z>}FRA7MXJxx^C*|Hb-nNH8tN&yeN51nzw7CMKA0Fft=@@Jm=&j=kNk^{O@4G#+_x! z{~JlSPWvP;Kk9sR{}#F5xN;HQz5!VhBQf2+K^3OO$&!fe51$D4;^nJIOsoI^c>Sgh zo@KDJ{T5lCjrere0|3|qAFelS7|${gxZz9D;)B?mH?GHWQ48Q%21gwm&5lKLPei4V zjyzi_q;a7jP-EFqB4umjZDt99W0117$prxMHqHX$G-sbFA?5|dra;w9GHOq*74Wrh z!X0?vITq)n%vAR0j*G|ZGSPg0tV4G_sG2#s0AM)d08o_ku)x8wOr+8o6lG~D8=W5H z{NgXcW1VPDRed=h$ee-$-|~z5(^SJ``aY2%d?CVIs@3sFp+= zwY%imYDq-fa3>dV`okrHyC(**{}js$JXu7en$({#SVWpRAlJQ1ixE2sAJ!ZN^%De3 zW38Np?s!;{(|Eqq#e>y6_PZ9cDK-%g$De)?E#)%gJ`k%ZJpe#W>0w1qC+2C|V+#o5 z>XJyr0@RdVV*V^pKS6-4eT&-Or2I!UKK}uz9SBAZ0P2TMq`mb+=ePK<=9wK(_72F> zc>1tP_ywhjjnxWnuSesj;h$~3gFWz}>>b1kh|I?2T*kj!$)RnyPx$UP(kjR9J=WmpzJuKpe$ivSKl85rp6t9w3Fi*tn&w)!u85-~|@XV4(+C7oxR| z2th5TShC3$;;bKIh#Qqa{8jVu_q~VA{9%BFM`u-^SeA93!_;vc<}0)}4a2~0w_|fj zlDHy=!=W+1rf$FA!*$)pekT9`*tX3TyA@5-I&0hj0O0#R8!L)}EXxL&Z8jUkam?nr zu5;_wgH$J=6M#}WnHf*}{{Fz+^d7Uc>h{ zZPXAS?iY8xH-PsUL0GRKK9#R1BK&o2dOYF#=Zxd2%vja6YXCIrc>Ds2D35#B$#J^? O0000cq@Gs=6k_mn^>bP0l+XkK DN_QQ_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-1.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-1.png new file mode 100644 index 0000000000000000000000000000000000000000..ded931cadfcd6e0e6785420f851a6e1d88a349f8 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Wu7jMArY;~ z2@iBll{4{D_w@$B3!j$pg4x17VQ^8v|1I-2dngR{D f+zx6$Y++(Z3s;mkZ;F}@bOD2>tDnm{r-UW|VP8OD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-10.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-10.png new file mode 100644 index 0000000000000000000000000000000000000000..8d71c464f6e186f7c34473f5b2f9dbff18d36277 GIT binary patch literal 741 zcmVPx%pGibPR9J=Wms>~_Q5?pT42L+$YPFK(vET3KSbw*Mwm2_eC*S6pQGVkI-rn62b5rM)IuZy3l)1@d zA_D^hOeUyBvm-fVUFv?MOGD_r?1Q~$L02CN1qc94438pj*AWEz9%1x@9{^B!>Wra@ zB--MIlgUVzhJf+!Xj#f#wI(w&PieAV;1$l&958qU0N`?^K#nA#57C%4V`CCR;V5P- zr-5)3A7{U?^k$R8UO*i70%BBG={QQ%*MwMQ7?iG8Ud=5%u$N~(<1C_vFdPn(si`R) zGn>sE0JPn?rI@QedyxYGucwpzSeyp{B&|&azq^8Jm})?lW#s4Q>lgrZyW5F%>ox#@ z=eZl*?sl^0;0dm%Fb{)0O#p!HWlq}m#s)GnGL(jD1^`(6sx(*6)3QntnGu!o@lDyp zC4G*07pMk&J|Ap0n~niM*NYwiz{Z?x%{($AA}y;_8J{aUL~CIjLa$dFLZ1H>!mH=2 zl(lQE4>1IW-%a9M`c4PcvD`;$om~ONWkCG~Cv)cTrx)5@OL$ Xz2p}k6(iR800000NkvXXu0mjfKblOx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-11.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-11.png new file mode 100644 index 0000000000000000000000000000000000000000..5885ae1c6e3c0603b261730d78d52eb6ea6cf7d8 GIT binary patch literal 804 zcmV+<1Ka$GP)Px%-bqA3R9J=Wmt9CxVHn4MM=G)8=6%u`|5+fAOfPCMsRgSzm4bKd9o zK6{@(?|I&{b0kuvqM{-(K5lJomCXKblHTM<5?H))`KrkFB)4Vj@9o*W8bZyeR+4-N(eKzCaQ1h$Q=k@^=8;uyrZ^bf0syZ!ok%Q=CX}Q(ot+^DqY7c` zE{H0;9T+xK+nmbmb3~bajxfsGQnp#dUngW%hK*AH$d|CCYgfsp&$t=sHeoax6}`Q^ z8kUunB>`Nza7Hz^bI$<@z}Ik7eEl*4K-%Q#$SWMWhII`@A`uD;3pEVjaotr>G=BjA z4fpGKTz6HhTZ&Q=S?GXTDPREx*Q8M!6I!hUtUZFZjU zhTbRL1ziJyKmeP~reOf}4;lfOH8U?Ej)nbXGhE&;SZt4+waF0D*y(@yCBki+Q`4yP+6&wSkm*;;c}Epn~OEdjV)UI8$ygi(|a z+^RqJS52mS4AaNY{CBxsUNNkM)!1UmWYgNCV%$W{GJC?VR6TuSXinFFyL2&k`(kPw z3b!ZCy&|s`#U4)r%P%h%#U2kcGNxj+T7PNA@P#B^vvaM)?*M?Jd;nnXs6toU>x8+v zqYBFw+y4B&;6{)6HyhdSmwX&y7%bx<$EI1KSFPx%>`6pHR9J=Wmt9B{Q5c4wkqT`UF-0u}h1d+qD2bAgwLi$4h(a)}y(o%)Xvv5) z=pq7ze!w;gi7>io(;M+3yU2cZ5!s?7k}&_XcBNL=)pRNpJKf~8>$o#x33cInGv|BH zJKy(m<~uWIB<2WdX=!3=+}_?U8NF|T*5sJ)lK3`MPVVLVyt=tAWYUt;#lr1&E3wIB z5-lw)hD>OR209bPqR4GTd)jC^)k=2bxJo}b=oSFI9bF`E+>N`rmacd002CZJtZO1n zYx4O1aH2hJ(DR*Zlgnn*#Kk2mMHbsF3U8!1=sW@dha&>tXc*1NAvN9I9tQm~Uh^UF z%X}CZHd5Od^0QM#es-$R(-q|J5rNlv7=>=5)IW6wE$Q|x7Q=ho2sE3}@Ar$ozCINf z6B8o=RNlC%m^*mngaqJhs1ZLV#sCOg7>Q+5o~B_<13sURl#~<|2k@-!j!0X%3V?=3 zbv&!PBR21_N^8@TdDD0ifYmuATIux-#Ky)d1p_$%CcY}g1LLUpEJnR9WxOvbK{!00 zL#~3Rf!5YmGBPq$963~oY;<#!XFIaa95 zU8ty%06Je>4APs|m&|F?&g1_;UZGXw6&Iqh~aoim(Z9{&oO&*;jnhr;)1j8C2+Dk~03f6L7pHTPTt zC!ges=9iwyK(2IGp^5{T&JB033DV63%^wp0*PCwo`#%l^a&7N>R9tUExtPvP^nX?9 wW^JH&MYW2{E4{AbUdt90*Yu@IFa13D2@k?kk3Ej8IRF3v07*qoM6N<$f-jVP-v9sr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-2.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-2.png new file mode 100644 index 0000000000000000000000000000000000000000..03799bb6889c95e57db990a3ae4af1ba91c97d6a GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}XFXjULn2y} z6C_v{Cy4Zv9Pscsc&@hnpYrFsbKh{hQe@rmU~e}DhC^UEi7aB^`O85tNDoSA7T z_-@CPo|;WEZQ+;aT9^Oh=H_19vA6d3G)Gt0*24eKj{d)DS|R}gd~fcZQP5m{;=v1P z?@h`d+8Q=&FgSdBd%ocjuykF0b9CRC<*S(W;`g0duzGd3;;{n<4s0ks@5lxMo}7gu zb}JhaCdgW~%;I?aMxb+pk~Wv#b;DfAP~qnq5LY(^8gRKCJi*A|&1wC0!uRtwK#wta My85}Sb4q9e0AJc`u>b%7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-3.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-3.png new file mode 100644 index 0000000000000000000000000000000000000000..5daaf7dda8978a6e6b8f0fce0a66da66843c5f3a GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<0-i38ArY;~ z2@_nEs+2LzBl*IC}^%e@!*BD z_a@~JZ4DbX7#zO6J>T#MSh}vhIlAx6@>R@w@%zp!SiQPi@z{X_2R0O+cVq(rPtHOS zyOj+I6J)JgW^ufIBha})Nt;XWx?!$lsPJGJgnD_*-25xBmAd?!(>7-%C96 z@m}bedbq_uC~V66v*F#5Jf5EO{%0gwIvU%7cZ~!P aU|_IR3kqbKwOa`oPz;`~elF{r5}E*J&x+On literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-4.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-4.png new file mode 100644 index 0000000000000000000000000000000000000000..fc7be0c7da2abdb4ba0d8f50301695b36fb59dcb GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T_nEs+2LzBl*IC}^%e@!*BD z_a@~JZ4DbX7#zO6J>T#MSh}vhIlAx6@>R@w@%zp!SiQPi@z{X_2R0O+cVq(rPtHOS zyOj+I6J)JgW^ufIBha})Nt;XWx?!$lsPJ8(e z$2-0gTg{Vhe0*c%BsX8tcl$2BA@8qD**pTGO{|J!bT9{qXyl4ls} zwyHg4xEG_Ked_zO)kk&OmZ+Ss-?CxO0%njK{bF{V{_y7J<8tO_4Mtm^ZrM~V0t^EK b0|tgig)yZG^}o*mLzThP)z4*}Q$iB}EEJ=r literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-5.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-5.png new file mode 100644 index 0000000000000000000000000000000000000000..150e8f3ec78c5dc6bbe287407329006c4a33afbc GIT binary patch literal 465 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<-JULvArY;~ z2@_nEs+2LzBl*IC}^%e@!*BD z_a@~JZ4DbX7#zO6J>T#MSh}vhIlAx6@>R@w@%zp!SiQPi@z{X_2R0O+cVq(rPtHOS zyOj+I6J)JgW^ufIBha})Nt;XWx?!$lsPJ8&z zhkV5LYU{&aXN66XS^V#}^qq@}&(BSK*AP>!+$MY8PWWj<|5@ArvCI731$T!9e2C9J z#KNW+$H&GN8oEZY<2vIKhNtoIlJD;B>QYS0TheX*>Vs9n&t`rX>j%EYwu?)0AJ>-{ zvW5FEIxE4-%=AHR!oQun|Lw2+*!uA3<#L|lWlJwCkx4kDuBmPx$-AP12R9J=WmtQDDQ5?s=TM`dwZZf3E{7Lr00}pE=k_T@}`SV~&lEsr0lB6Vs zRwMD`-pdNmWC@5X=s690x*(j|Two zKJ&%Dj{g+EVzEH2R{MAWu(r7i07z0M3dVs-v}GofFoas|X9&AmYx%h$U51E!5llH3E#|AN$n*n3aW6m+`EcPWaC0sz3l(FN@G l>xZBLbY?9|RXZ#Izy}@eon9gux1#_6002ovPDHLkV1g^q^Pm6# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-7.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-7.png new file mode 100644 index 0000000000000000000000000000000000000000..8fb7d79932d64e321e67d2b086b91c77069c3c0c GIT binary patch literal 564 zcmV-40?Yl0P)Px$?ny*JR9J=WmrE!_Q5?pvg=I0g@KCH>AQhx+l4}sGs^uLC=<9zt?1Y=_XAoo7l zg3~PqxD=#D(t^}T&t%|VpyCM@Rt=K&XJ_cSYm~qYp~K;z7K_EDrdF#}05Ck%Cz>m( zsQHmG<|4D%Oa(!Z)CeKaYPG7h*-;u7p9lb0Uz$Z|L=@8VN)(%5c0dpW5JFsP0DzZA z@$ir1Uo~JdnV{3@TxtNYu)F~P2-Sp0#!BI~%wUj)P_KUvVMAr1IM*>S@vGtV@_%3k zr>MPO4B2>NwOc~QyoLdvUP3IUm*#NT)GoO(aW9Xe>HM7?>I{y}ZfjA6H@DKy zHDu+=-ouMWUe(|rZ=#{>Yj z_fBB5UEJ_=XY1Wmj!vPx%14%?dR9J;$U>MBc%iFI1uWw8IH%>eAe?T1Y`nJUXkI!TNGn_I0f5e`RCXQgj zCz+GT!NC9YIs?PK9}JWKO3}i81{OjJmMr09c>9@&;TXeLnmB+U2)9xAA8w;CFlk^! z07gOzcJ4cb68!E?b_Dg10`Mln_wV2TfB5hrhM1tBAR_|<1H+sd6XA|a$;cn8B|nM824{p{9j!|hk=2Cf#JaJ%?y&ViVTjvu_QYJZwLqr3p2cZ z`xZltfq{X6;rBPV<;Z-hI^go<%M7}@x)@>%3=9lA_Z(zkU|?X7ln_VZlL`n1*`Y(I ziO|jtkq9fYqTq5J)0R;+agKtK1MnuC=+?>bM7Fd#mnMk}Z#LvaD}?ZYb-TAST(44PV%YKQGf@us*xd8qW%_g!v1*H#TtSH z8zjU6;e?bZz5*bTI~3Pom8j1p@-`CXoKQ zyZ*m@@rB{V({~JWrll~FB1RRkX48q+g?l~zA3O8(FS1xmU=)TJ0|NsCvKX-dZ^wjz zfq~(~rMnEzo;`ktEO!0DJq)q?2m1b_i&4b^WopYY#6nu8V2EA#YDcQwqkw^dfq?-4 XqfONM&j)!600000NkvXXu0mjfV|5M) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-9.png b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-9.png new file mode 100644 index 0000000000000000000000000000000000000000..9f61aeeb480158a0f8cfd103194e23f0f605a558 GIT binary patch literal 650 zcmV;50(Jd~P)Px%L`g(JR9J=Wmr+PlQ5?p9cT^}Ou?D&_m=Md57N}4@$gC);hlpSxm^}m%6-oAz zK}CcL8BvCzJ=l{gU!;fjP-dl$kP$<|QG-V2h?%*j$yB0Yr>Aba-n#cL9E;lbbk6Ub zd;TAPzQes2{$|a^u8L^LD$0-fMMexnLsl{Sp;q887tgC!rNx9vYw^_49M(jFF!qJ^ z#r5f^&kDT_Zg(!RxQSur(_%nZ)s;n}y0R!U8Tc22tH=2f(R?=GkAGpR^3gflZU zA{-8@nAvQW0J?79l+D#0KP>@x2Ybc0#2f&om8)^?aA_LWG!To$u-R-X1~B017R8&l z05I6^VZhTZb{;q)m6mK^bf^`8tyPU$$LkxgSS)hEWClQDK`x#=&&#hMKIN0gwS@)3 z9r^g%E@&DE1Ohl54iy9Fdol#TI%|Pq9-s1&mtP@|Pm~_iDxn`juU8pDr}JkB&z-E1 z*RFKjlK?_5S{3{4+ZvZOv|0Uo(hSJqmUcN%chA?SB}|&vF!#ruH=z6d4+&mqQQUyy z#DZ+vH8PUAf%>X49!#DZ8~D_8Nh-W}SuADj*>CuatTH0afZVwASi~mhn2b!*)lnyJ>e{xsa_QoRHLJR|ZAqQjzv|TSxqJ6)*|O!v_3M$5k^ley|06s98c+j& zNswPK!`72P5jeOwztIjTUs-Lb@{pyRfpfy1FvYhK+_sMvG4v z8yOlJDXnB+_-;!N6PNr6|FxA;rv4=gPFZ_2cV$pn(jYu6{1- HoD!MXo%+Z=#i}Vm>cDf3`30}DPfVNim}Ai;2E&Vv>y$at zoTIFp5|mVq2^w&pEMy7noG`6VL4x&%%)*uHzcoj=_cR3>aJez+F)&okPTdx?G;ANx OLkym-elF{r5}E+_Ygr+ArY-_ z&lxf@FmNy{B(JG=WzOK>m-lcGEx2&9#OOXh14F}P)<w1lw}$KTFM5ezk1=AE4ZUOAL1I78TNam(66JpsOk(WKzsvE8}P& zcgyhpMb!FsY_Neb67e#xO~{SKtca#>qQNat5cX6F8&C9wPEE|TcC#+JYD@< J);T3K0RU(OUmpMf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/rbase.png b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/rbase.png new file mode 100644 index 0000000000000000000000000000000000000000..584a185caabdcd79c22e51feea45a1cb9f52088a GIT binary patch literal 549 zcmV+=0^0qFP)Px$-$_J4R9J=Wl(BBwP!xtg(^6@09&P~OP7e9mx-bZ zsY{n`JV2KWU9vQ&3W9csP-KVHG&l&_NHlc82*a(x0?|m}lPvk%dvyNa$M+ss^4O7v zgKRe2TZCw_SRClCjBXYR1!P$s#Gz0~SftbGxZ-K@TCEnjT+X#WW&ogCtqP0HimIwe zlB?-%1H+r|K7Bt0h}?YHfBWV&reXLKOC)&z;UhPZ=cfRNuTuM>yntxYX`6L>_sf^6 z0H?<2FZ-u~dc8h3@lg|vMq{#pMf2Yc2yekK*Kv*Ga>ajTyMi6p;D>jbX9wh1H?zLI zh6MEP?|nTIu)e*99P4JhG{!m*jYerUo9ynP?n;PfZ4chn@QV|GXMf82EQ9FVlk`b{Ngve! z!5I+U)p@a;15+6goz!{Z>lQd%#Wjw;p8Hq(*_?e4ZK+*diEa27@1w*v*iyT?SB|g) zhGEQS5CQScO=_#QZWsp1WOA|r(=-8isRW_@8`_ruXaMc2L7sT5h|!dwtG1^BfK)2w nqx@`)8OZ1J3lm?mi0jO8VkuLc9xTmmm7EjISihzelF{r5}E** CYagWm literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..430b603aa3af9356e29b3ea3dce738733060e9ed GIT binary patch literal 352 zcmV-m0iXVfP)Px$8c9S!R9J=Wlrf5hFc^eqm&GEL2x8*_EbPU`*48U}1J7Wg7qC!k8xcfPq}?r+ z1bt@3?0XU6`BnK%oEanzaP#hbEQcgXzRxhtvP}4XJ#I!(1kdxtY+066WE{uUeB@kR z*U0mHwZ91f0BM>^#hxVyg3U8&001bpC%qVJJQKsidlbO#sH2 zHZz&_^}fK_{CNpEgb*;sU>JsyFk?)-`|kjbT0040u!}tBC z%sEw6fl?~8cLQ)Jr6`KxB?0zW1(@eqtaTO9(gV1A;EDlcH}zF0{RPXH-m8c>I*RB} yfTn2x=qVzuy&C}dEs?X>1Zdm#H1nIAOYj3E`*YfR{bVBm0000Xo%+Z=#i}Vm>cDf3`30}DPfVNim}Ai;2E&Vv>y$at zoTIFp5|mVq2^w&pEMy7noG`6VL4x&%%)*uHzcoj=_cR3>aJez+F)&okPTdx?G;ANx OLkym-elF{r5}E+_Ygr+ArY-_ z&lxf@FmNy{B(JG=WzOK>m-lcGEx2&9#OOXh14F}P)<w1lw}$KTFM5ezk1=AE4ZUOAL1I78TNam(66JpsOk(WKzsvE8}P& zcgyhpMb!FsY_Neb67e#xO~{SKtca#>qQNat5cX6F8&C9wPEE|TcC#+JYD@< J);T3K0RU(OUmpMf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/rbase.png b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/rbase.png new file mode 100644 index 0000000000000000000000000000000000000000..430b603aa3af9356e29b3ea3dce738733060e9ed GIT binary patch literal 352 zcmV-m0iXVfP)Px$8c9S!R9J=Wlrf5hFc^eqm&GEL2x8*_EbPU`*48U}1J7Wg7qC!k8xcfPq}?r+ z1bt@3?0XU6`BnK%oEanzaP#hbEQcgXzRxhtvP}4XJ#I!(1kdxtY+066WE{uUeB@kR z*U0mHwZ91f0BM>^#hxVyg3U8&001bpC%qVJJQKsidlbO#sH2 zHZz&_^}fK_{CNpEgb*;sU>JsyFk?)-`|kjbT0040u!}tBC z%sEw6fl?~8cLQ)Jr6`KxB?0zW1(@eqtaTO9(gV1A;EDlcH}zF0{RPXH-m8c>I*RB} yfTn2x=qVzuy&C}dEs?X>1Zdm#H1nIAOYj3E`*YfR{bVBm0000i0jO8VkuLc9xTmmm7EjISihzelF{r5}E** CYagWm literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/base.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..a1054e575dd9260e6df82eacddc12818bc603784 GIT binary patch literal 525 zcmV+o0`mQdP)Px$$4Nv%R9J=WR!d6)Q562>;pD_vN@5~Kwuuq~p@LdT1g-n0wT>WMNI?(8K*Nw+ zg-D?`laFB>TMTni=lH_uLHVubo_pqe-<>(<;{r4McW~W{L|Ey32WhgTF@aU=|?hpVtKcgEMRMUN?3Gw3s$R_MYEG(niY-3KCOsn3u-p!WiksT>vmY zsmvqvb_bHcu`V9hh-?Fr1P%)#k5`j+`5pnK4}%pveWPx$F-b&0R9J=Wl{rp>F%X5H7c5~ANI-!ET@FIU4RVPThyze_07Sthasw(3LI)BB zi4>MZ*qN9D0RcQ-5(y~$RhHiK%=>?DK%>$4V+1E0?rjDLR{kV}qDGguqi8YBO^{Mx zXG6j$0juQ~Z9JX9QNZ9aAOvK6_YX5R7#qN74Wk0=$@%ej%>uyb(b2x6zXOb?{N^boS0fp~5r4#n&lDZk)JO*KL@iF;x7h4;X9{~|iBsgVtkTEDF|6&=^q$OcI5fl_ic z7QP8fS?VTCt>3&>>WjhtpM%}?u)l4RuiVYR0RT#TS9ec!&oO|H202Q7jYgvp;}s)= Vg1{w;ek%X~002ovPDHLkV1g*Km?;1N literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/locked.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/locked.png new file mode 100644 index 0000000000000000000000000000000000000000..421688fcda8a1eb453d5a02967f22689105b4a0c GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}YMw5RArY-_ z&p8S*Ft9Kf7=Br=!5}-wdcN*KB?bnIfSG@585*`Sw#73kb8gP^1?ph%boFyt=akR{ E030V9oB#j- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json new file mode 100644 index 0000000000..544b43a1e8 --- /dev/null +++ b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Kezu", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "rbase" + }, + { + "name": "locked" + }, + { + "name": "unlocked" + }, + { + "name": "closed" + }, + { + "name": "open" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/open.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/open.png new file mode 100644 index 0000000000000000000000000000000000000000..c0e25c446bdc9bd77db14ca156f03395faa3d608 GIT binary patch literal 483 zcmV<90UZ8`P)Px$ok>JNR9J=Wl}}2;KorKm%uFYtmLyuNg;qC}UZbnx1$v2sn5Bz?3&8`l2wuV) zxN_?mbf+K@q{ct3Go8joO)+I6VuzxT-!8nD@B8xJFadIMa{elN+v``RwAwW<&Z@Dj zX3nT7e>l7_*S)xVva|t`hMjT&!*>-40oPap0B(ug`Zle%kq$!IH7{=0ytwRAG`BdM z-XQR8YSbJ6e4Eyt-XLghag<$(#Fr6bVbdk>j!uK5*-UGZ%)HEx)tsSO~M+3|m;sSUuX1*w!VbEy$ z31qdZrMTi3;Bt!Va6EtE^8Ur>No-Y1^AYS;97IAP9Lm`Q!l6V6Y25TH3)<#)oRjl! Z`2ZmpllAvCI~4!`002ovPDHLkV1gx{+;ji{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/rbase.png b/Resources/Textures/Structures/Storage/Shelfs/wood.rsi/rbase.png new file mode 100644 index 0000000000000000000000000000000000000000..a1054e575dd9260e6df82eacddc12818bc603784 GIT binary patch literal 525 zcmV+o0`mQdP)Px$$4Nv%R9J=WR!d6)Q562>;pD_vN@5~Kwuuq~p@LdT1g-n0wT>WMNI?(8K*Nw+ zg-D?`laFB>TMTni=lH_uLHVubo_pqe-<>(<;{r4McW~W{L|Ey32WhgTF@aU=|?hpVtKcgEMRMUN?3Gw3s$R_MYEG(niY-3KCOsn3u-p!WiksT>vmY zsmvqvb_bHcu`V9hh-?Fr1P%)#k5`j+`5pnK4}%pveWo&qkIIMuq}~x&Q1K4%}jJHDXHr^zz&@paup{S3j3^P6 Date: Sun, 21 Jul 2024 17:18:04 +0000 Subject: [PATCH 071/108] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f625cdfdbc..3066419802 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: TheShuEd - changes: - - message: Added tomato killers in floral anomaly berries - type: Add - - message: tweak size and damage of killer tomatoes - type: Tweak - id: 6459 - time: '2024-04-27T10:35:13.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27265 - author: Plykiya changes: - message: You can no longer print singular bullets at the security techfab. @@ -3800,3 +3791,10 @@ id: 6958 time: '2024-07-21T16:20:09.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30232 +- author: Sphiral&Kezu + changes: + - message: 'Added a variety of new wall based storages: Shelfs! Build some today!' + type: Add + id: 6959 + time: '2024-07-21T17:16:58.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/27858 From a0aafdfedd8b1d8c1d0e4f8548721e75bf6dce8c Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Mon, 22 Jul 2024 04:50:21 +0200 Subject: [PATCH 072/108] vital clown bugfix PR (#30243) vital bugfix --- .../Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index cb04869c2c..09ec706e1f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -148,6 +148,8 @@ - state: tin - state: plain - type: CreamPie + - type: ThrowingAngle + angle: 180 - type: LandAtCursor - type: ContainerContainer containers: From 290542534abbecbc0d296b9f248150c185454326 Mon Sep 17 00:00:00 2001 From: justdie12 <125140938+justdie12@users.noreply.github.com> Date: Mon, 22 Jul 2024 05:53:10 +0300 Subject: [PATCH 073/108] Update water.yml (#29596) * Update water.yml Water should put out the fire. That's why now the water tiles are extinguishing you. * Update water.yml --- Resources/Prototypes/Entities/Tiles/water.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Prototypes/Entities/Tiles/water.yml b/Resources/Prototypes/Entities/Tiles/water.yml index 2fd1c8547d..c488df231b 100644 --- a/Resources/Prototypes/Entities/Tiles/water.yml +++ b/Resources/Prototypes/Entities/Tiles/water.yml @@ -54,3 +54,12 @@ collection: FootstepWater params: volume: 8 + - type: StepTrigger + requiredTriggeredSpeed: 0 + intersectRatio: 0.1 + blacklist: + tags: + - Catwalk + - type: TileEntityEffect + effects: + - !type:ExtinguishReaction From 4eed2fd97367f82af5bc220b36237837c012c7ae Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Mon, 22 Jul 2024 05:55:34 +0200 Subject: [PATCH 074/108] fix borgs being unable to state laws with an active flashlight (#30183) fix borg laws --- .../Silicons/Laws/SiliconLawPrototype.cs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Silicons/Laws/SiliconLawPrototype.cs b/Content.Shared/Silicons/Laws/SiliconLawPrototype.cs index d10b86c241..5924c95cdc 100644 --- a/Content.Shared/Silicons/Laws/SiliconLawPrototype.cs +++ b/Content.Shared/Silicons/Laws/SiliconLawPrototype.cs @@ -6,7 +6,7 @@ namespace Content.Shared.Silicons.Laws; [Virtual, DataDefinition] [Serializable, NetSerializable] -public partial class SiliconLaw : IComparable +public partial class SiliconLaw : IComparable, IEquatable { /// /// A locale string which is the actual text of the law. @@ -39,13 +39,27 @@ public partial class SiliconLaw : IComparable return Order.CompareTo(other.Order); } - public bool Equals(SiliconLaw other) + public bool Equals(SiliconLaw? other) { + if (other == null) + return false; return LawString == other.LawString && Order == other.Order && LawIdentifierOverride == other.LawIdentifierOverride; } + public override bool Equals(object? obj) + { + if (obj == null) + return false; + return Equals(obj as SiliconLaw); + } + + public override int GetHashCode() + { + return HashCode.Combine(LawString, Order, LawIdentifierOverride); + } + /// /// Return a shallow clone of this law. /// From 1fa91e27850106faeb34fc82c6368a6ad6b442fb Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 22 Jul 2024 03:56:42 +0000 Subject: [PATCH 075/108] Automatic changelog update --- Resources/Changelog/Changelog.yml | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3066419802..5026331c1e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,18 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: You can no longer print singular bullets at the security techfab. - type: Remove - - message: The security techfab now has recipes for ammunition boxes and pre-filled - magazines of every type of ammo. - type: Add - - message: You can now print empty magazines at the security techfab. - type: Add - - message: Material costs for printing all ammo and mags were rebalanced. - type: Tweak - id: 6460 - time: '2024-04-27T10:38:59.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26178 - author: Ramlik changes: - message: Added security walkie talkies to the vendor. @@ -3798,3 +3784,10 @@ id: 6959 time: '2024-07-21T17:16:58.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/27858 +- author: valquaint, slarticodefast + changes: + - message: Fixed borgs being unable to state laws with an activated flashlight. + type: Fix + id: 6960 + time: '2024-07-22T03:55:35.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30183 From 395b296d68318c2572bfcf67de73b71d01eb2623 Mon Sep 17 00:00:00 2001 From: LankLTE <135308300+LankLTE@users.noreply.github.com> Date: Sun, 21 Jul 2024 22:38:56 -0700 Subject: [PATCH 076/108] Darts can now pop balloons. (#30088) Basic implementation. --- .../Weapons/Melee/Balloon/BalloonPopperSystem.cs | 12 +++++++++++- Resources/Prototypes/Entities/Objects/Fun/darts.yml | 1 + .../Entities/Objects/Weapons/Melee/needle.yml | 7 +++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs b/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs index 45c6a3d9d5..a8460a8c66 100644 --- a/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs +++ b/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs @@ -4,7 +4,7 @@ using Content.Shared.IdentityManagement; using Content.Shared.Popups; using Content.Shared.Tag; using Content.Shared.Weapons.Melee.Events; -using Robust.Shared.Audio; +using Content.Shared.Throwing; using Robust.Shared.Audio.Systems; namespace Content.Server.Weapons.Melee.Balloon; @@ -23,6 +23,7 @@ public sealed class BalloonPopperSystem : EntitySystem public override void Initialize() { SubscribeLocalEvent(OnMeleeHit); + SubscribeLocalEvent(OnThrowHit); } private void OnMeleeHit(EntityUid uid, BalloonPopperComponent component, MeleeHitEvent args) @@ -40,6 +41,15 @@ public sealed class BalloonPopperSystem : EntitySystem } } + private void OnThrowHit(EntityUid uid, BalloonPopperComponent component, ThrowDoHitEvent args) + { + foreach (var held in _hands.EnumerateHeld(args.Target)) + { + if (_tag.HasTag(held, component.BalloonTag)) + PopBallooon(uid, held, component); + } + } + /// /// Pops a target balloon, making a popup and playing a sound. /// diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml index dd25d503ce..31fd4fd8e2 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml @@ -84,6 +84,7 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: BalloonPopper - type: entity parent: Dart diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml index 11efeba5f8..e472157081 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml @@ -12,6 +12,13 @@ damage: types: Piercing: 1 + - type: DamageOtherOnHit + damage: + types: + Piercing: 1 - type: Item size: Tiny - type: BalloonPopper + - type: ThrowingAngle + angle: -135 + - type: LandAtCursor From 4e34fb66ecd738893904d3ae239c39801f739050 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 22 Jul 2024 05:40:03 +0000 Subject: [PATCH 077/108] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5026331c1e..1639a1bd61 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Ramlik - changes: - - message: Added security walkie talkies to the vendor. - type: Add - id: 6461 - time: '2024-04-27T13:27:18.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25913 - author: brainfood1183 changes: - message: Centcom advises all crewmembers to please stop putting rodents in the @@ -3791,3 +3784,10 @@ id: 6960 time: '2024-07-22T03:55:35.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30183 +- author: Lank + changes: + - message: Darts can now pop balloons. Keep them away from any monkeys. + type: Add + id: 6961 + time: '2024-07-22T05:38:56.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30088 From 1aa2410f4ef179a37c351b12b23da9126be2b72e Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Mon, 22 Jul 2024 02:17:57 -0700 Subject: [PATCH 078/108] Eating and Drinking Doafter Change (#30060) My lawyer told me to do this Co-authored-by: plykiya --- Content.Server/Nutrition/EntitySystems/DrinkSystem.cs | 1 + Content.Server/Nutrition/EntitySystems/FoodSystem.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs index d9122ff278..36c4ef4b55 100644 --- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs @@ -211,6 +211,7 @@ public sealed class DrinkSystem : SharedDrinkSystem target: target, used: item) { + BreakOnHandChange = false, BreakOnMove = forceDrink, BreakOnDamage = true, MovementThreshold = 0.01f, diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index d609f737e7..4d670a3eb7 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -198,6 +198,7 @@ public sealed class FoodSystem : EntitySystem target: target, used: food) { + BreakOnHandChange = false, BreakOnMove = forceFeed, BreakOnDamage = true, MovementThreshold = 0.01f, From 28c8eba3305b0b8f855ebde12811510681656e40 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 22 Jul 2024 09:19:03 +0000 Subject: [PATCH 079/108] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1639a1bd61..92e056bc76 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: brainfood1183 - changes: - - message: Centcom advises all crewmembers to please stop putting rodents in the - fax machines (rodents can now be inserted into fax machine). - type: Add - id: 6462 - time: '2024-04-27T13:50:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/21461 - author: MilenVolf changes: - message: Glass Box now can be constructed and deconstructed! @@ -3791,3 +3783,10 @@ id: 6961 time: '2024-07-22T05:38:56.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30088 +- author: Plykiya + changes: + - message: You can now eat or drink and swap hands without it being interrupted. + type: Tweak + id: 6962 + time: '2024-07-22T09:17:57.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30060 From 9bc9b6b69681a02785af0c89092d5a04ce11cdaf Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Mon, 22 Jul 2024 05:33:02 -0400 Subject: [PATCH 080/108] Amend spacelaw to allow zookeepers to have tranq shotguns. (#30237) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In loving memory of Harambe May 27, 1999 – May 28, 2016 --- .../Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml index f51558f1a2..bb63d45487 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml @@ -5,7 +5,7 @@ - \[Security\] Security clothing - \[Security\] Less than lethal and non-lethal weapons, excluding disablers and beanbag shotguns - \[Security/Command\] Disablers - - \[Security/Bartender\] Beanbag shotguns + - \[Security/Bartender/Zookeeper\] Nonlethal shotguns - \[Security\] Flash technology, excluding handheld flashes - \[Security/Science/Command\] Handheld flashes - \[Security\] Helmets and shields From 183d26f001867e6244d1e56bfd05afdaa71f0037 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 22 Jul 2024 09:34:08 +0000 Subject: [PATCH 081/108] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 92e056bc76..8cc9f88966 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,15 +1,4 @@ Entries: -- author: MilenVolf - changes: - - message: Glass Box now can be constructed and deconstructed! - type: Add - - message: Glass Box now makes an alarm sound on destruction. - type: Tweak - - message: Now Antique Laser can be put back in the Glass Box. - type: Fix - id: 6463 - time: '2024-04-27T13:53:16.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25365 - author: metalgearsloth changes: - message: Fix a lot of UI bugs. @@ -3790,3 +3779,10 @@ id: 6962 time: '2024-07-22T09:17:57.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30060 +- author: IProduceWidgets + changes: + - message: Zookeepers can now possess Nonlethal shotguns according to spacelaw. + type: Tweak + id: 6963 + time: '2024-07-22T09:33:03.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30237 From edd9bb6e74ba574c9421d8100398a6e576bd7f28 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Mon, 22 Jul 2024 02:54:15 -0700 Subject: [PATCH 082/108] Quieter bag sounds (#30225) Co-authored-by: plykiya --- .../Storage/EntitySystems/SharedStorageSystem.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index 4bb4192fc4..7a207fb47c 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs @@ -22,6 +22,7 @@ using Content.Shared.Storage.Components; using Content.Shared.Timing; using Content.Shared.Verbs; using Content.Shared.Whitelist; +using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; using Robust.Shared.GameStates; @@ -65,6 +66,9 @@ public abstract class SharedStorageSystem : EntitySystem public const string DefaultStorageMaxItemSize = "Normal"; public const float AreaInsertDelayPerItem = 0.075f; + private static AudioParams _audioParams = AudioParams.Default + .WithMaxDistance(7f) + .WithVolume(-2f); private ItemSizePrototype _defaultStorageMaxItemSize = default!; @@ -542,7 +546,7 @@ public abstract class SharedStorageSystem : EntitySystem // If we picked up at least one thing, play a sound and do a cool animation! if (successfullyInserted.Count > 0) { - Audio.PlayPredicted(component.StorageInsertSound, uid, args.User); + Audio.PlayPredicted(component.StorageInsertSound, uid, args.User, _audioParams); EntityManager.RaiseSharedEvent(new AnimateInsertingEntitiesEvent( GetNetEntity(uid), GetNetEntityList(successfullyInserted), @@ -603,7 +607,7 @@ public abstract class SharedStorageSystem : EntitySystem { if (_sharedHandsSystem.TryPickupAnyHand(player, entity, handsComp: hands) && storageComp.StorageRemoveSound != null) - Audio.PlayPredicted(storageComp.StorageRemoveSound, uid, player); + Audio.PlayPredicted(storageComp.StorageRemoveSound, uid, player, _audioParams); { return; } @@ -663,7 +667,7 @@ public abstract class SharedStorageSystem : EntitySystem return; TransformSystem.DropNextTo(itemEnt, player); - Audio.PlayPredicted(storageComp.StorageRemoveSound, storageEnt, player); + Audio.PlayPredicted(storageComp.StorageRemoveSound, storageEnt, player, _audioParams); } private void OnInsertItemIntoLocation(StorageInsertItemIntoLocationEvent msg, EntitySessionEventArgs args) @@ -836,7 +840,7 @@ public abstract class SharedStorageSystem : EntitySystem Insert(target, entity, out _, user: user, targetComp, playSound: false); } - Audio.PlayPredicted(sourceComp.StorageInsertSound, target, user); + Audio.PlayPredicted(sourceComp.StorageInsertSound, target, user, _audioParams); } /// @@ -1015,7 +1019,7 @@ public abstract class SharedStorageSystem : EntitySystem return false; if (playSound) - Audio.PlayPredicted(storageComp.StorageInsertSound, uid, user); + Audio.PlayPredicted(storageComp.StorageInsertSound, uid, user, _audioParams); return true; } @@ -1045,7 +1049,7 @@ public abstract class SharedStorageSystem : EntitySystem } if (playSound) - Audio.PlayPredicted(storageComp.StorageInsertSound, uid, user); + Audio.PlayPredicted(storageComp.StorageInsertSound, uid, user, _audioParams); return true; } From 1c43f85ffe0b42cf0a31b7a0f9e0ad48e335d87f Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 22 Jul 2024 09:55:21 +0000 Subject: [PATCH 083/108] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 8cc9f88966..a35b9c25de 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: metalgearsloth - changes: - - message: Fix a lot of UI bugs. - type: Fix - id: 6464 - time: '2024-04-27T16:32:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27401 - author: RiceMar1244 changes: - message: Resprited the captain's antique laser pistol. @@ -3786,3 +3779,11 @@ id: 6963 time: '2024-07-22T09:33:03.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30237 +- author: Plykiya + changes: + - message: Bag sounds can now only be heard from half the distance and is quieter + in general. + type: Tweak + id: 6964 + time: '2024-07-22T09:54:15.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30225 From 159a7413a7f92cdde23419e60e09e6fb05a86007 Mon Sep 17 00:00:00 2001 From: 3nderall <101940324+3nderall@users.noreply.github.com> Date: Mon, 22 Jul 2024 10:55:44 +0100 Subject: [PATCH 084/108] Stops foam counting as a connection for walls (#30236) Stops walls from connecting to foam Co-authored-by: 3nderall <3nderall@gmail.com> --- Resources/Prototypes/Entities/Effects/chemistry_effects.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml index ee300e9aea..4f925ed311 100644 --- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml +++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml @@ -70,7 +70,6 @@ state: foam-west - type: SmoothEdge - type: IconSmooth - key: walls mode: NoSprite - type: FoamVisuals animationTime: 0.6 From cac867fa6d14a7a054122b81b3223334dfa2042e Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 22 Jul 2024 11:56:48 +0200 Subject: [PATCH 085/108] improve info about :cl: symbol in pr template (#30204) * Improve PR template * fix typo --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a397604185..88ad911c07 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -34,7 +34,7 @@ Make players aware of new features and changes that could affect how they play t -->