From a18ba4d8f88474efaae1a6c8a934699dec380bba Mon Sep 17 00:00:00 2001 From: SpicyDarkFox Date: Wed, 4 Sep 2024 11:21:36 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BA=D0=BD?= =?UTF-8?q?=D0=BE=D0=BF=D0=BE=D0=BA=20=D0=B2=20=D1=80=D0=B5=D0=B4=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs index ada7b39f79..a45ba0a3b9 100644 --- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs @@ -669,12 +669,14 @@ private void OnSpeciesInfoButtonPressed(BaseButton.ButtonEventArgs args) private void ToggleClothes(BaseButton.ButtonEventArgs _) { + _controller.UpdateClothes = true; _controller.ShowClothes = ShowClothes.Pressed; _controller.UpdateCharacterUI(); } private void ToggleLoadouts(BaseButton.ButtonEventArgs _) { + _controller.UpdateClothes = true; _controller.ShowLoadouts = ShowLoadouts.Pressed; _controller.UpdateCharacterUI(); } From 44f2ca9851e6bb9fa9703f2f71988542b3d78dfe Mon Sep 17 00:00:00 2001 From: SpicyDarkFox Date: Wed, 4 Sep 2024 18:13:57 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B0=D1=80=D0=BA=D0=B8=D0=BD=D0=B3?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=BF=D0=BE=20=D1=83=D1=80=D0=BE=D0=B2=D0=BD?= =?UTF-8?q?=D1=8F=D0=BC=20=D1=81=D0=BF=D0=BE=D0=BD=D1=81=D0=BE=D1=80=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Client/Humanoid/MarkingPicker.xaml.cs | 4 +++- Content.Client/Humanoid/SingleMarkingPicker.xaml.cs | 4 +++- .../Locale/ru-RU/_LostParadise/SponsorMarkingsTier.ftl | 7 +++++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/ru-RU/_LostParadise/SponsorMarkingsTier.ftl diff --git a/Content.Client/Humanoid/MarkingPicker.xaml.cs b/Content.Client/Humanoid/MarkingPicker.xaml.cs index 76a0b74213..c3862ef847 100644 --- a/Content.Client/Humanoid/MarkingPicker.xaml.cs +++ b/Content.Client/Humanoid/MarkingPicker.xaml.cs @@ -237,7 +237,9 @@ public void Populate(string filter) item.Disabled = true; if (_sponsorsManager.TryGetInfo(out var sponsor)) { - item.Disabled = !(sponsor.AllowedMarkings.Contains(marking.ID) || sponsor.AllowedMarkings.Contains("ALL")); + var tier = sponsor.Tier > 5 ? 5 : sponsor.Tier; //если уровень выше максимального, ставится максимальный + var marks = Loc.GetString($"sponsor-markings-tier-{tier}").Split(";", StringSplitOptions.RemoveEmptyEntries); + item.Disabled = !(sponsor.AllowedMarkings.Contains(marking.ID) || sponsor.AllowedMarkings.Contains("ALL") || marks.Contains(marking.ID)); } } #endif diff --git a/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs b/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs index 3c53f0e4a8..a26e06e84f 100644 --- a/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs +++ b/Content.Client/Humanoid/SingleMarkingPicker.xaml.cs @@ -203,7 +203,9 @@ public void PopulateList(string filter) item.Disabled = true; if (_sponsorsManager.TryGetInfo(out var sponsor)) { - item.Disabled = !(sponsor.AllowedMarkings.Contains(marking.ID) || sponsor.AllowedMarkings.Contains("ALL")); + var tier = sponsor.Tier > 5 ? 5 : sponsor.Tier; //если уровень выше максимального, ставится максимальный + var marks = Loc.GetString($"sponsor-markings-tier-{tier}").Split(";", StringSplitOptions.RemoveEmptyEntries); + item.Disabled = !(sponsor.AllowedMarkings.Contains(marking.ID) || sponsor.AllowedMarkings.Contains("ALL") || marks.Contains(marking.ID)); } } #endif diff --git a/Resources/Locale/ru-RU/_LostParadise/SponsorMarkingsTier.ftl b/Resources/Locale/ru-RU/_LostParadise/SponsorMarkingsTier.ftl new file mode 100644 index 0000000000..222e55bc4d --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/SponsorMarkingsTier.ftl @@ -0,0 +1,7 @@ +sponsor-markings-tier-0 = "" +sponsor-markings-tier-1 = {sponsor-markings-tier-0}; +sponsor-markings-tier-2 = {sponsor-markings-tier-1}; +sponsor-markings-tier-3 = {sponsor-markings-tier-2};LPPVulpkaninykiteru_sponsor_hair;LPPVulpkaninhair_sponsor;LPPVulpkaninjagged_sponsor_hair;LPPTajaranHead7;CatTail;CatTailStripes;CatEars;CatEarsStubby;CatEarsCurled;CatEarsTorn;FoxEars;SlimeCatEars;SlimeCatTail;SlimeCatTailStripes;SlimeCatEarsStubby;SlimeCatEarsCurled;SlimeCatEarsTorn;SlimeFoxEars;AugmentsRoboticRightArm-robotic_r_arm;AugmentsRoboticRightArm;AugmentsRoboticRightHand-robotic_r_hand;AugmentsRoboticRightHand;LPPVulpkaninskull_sponsor;LPPVulpkaninprotogen_face;LPPVulpkanintprotogen_torso;LPPVulpkanintprotogen_legs;LPPVulpkanintprotogen_hands;LPPVulpkanintprotogen_hands_ful_gif;LPPVulpkanintprotogen_hands_l_gif;LPPVulpkanintprotogen_hands_r_gif;LPPVulpkanintprotogen_legs_ful_gif;LPPVulpkanintprotogen_legs_l_gif;LPPVulpkanintprotogen_legs_r_gif;LPPVulpkanintprotogen_hands_ful_rgb;LPPVulpkanintprotogen_hands_l_rgb;LPPVulpkanintprotogen_hands_r_rgb;LPPVulpkanintprotogen_legs_ful_rgb;LPPVulpkanintprotogen_legs_l_rgb;LPPVulpkanintprotogen_legs_r_rgb;HumanHairSpicy;HumanHairCotton;HumanHairFingerwave;HumanHairFortuneteller;HumanHairFortunetellerAlt;HumanHairLongdtails;HumanHairLooseSlicked;HumanHairQuadcurls;HumanHairShy;HumanHairWife;LPPAllsuccubus;LPPAlldurak;LPPAllhorn1;LPPAllhorn2;LPPAllhorn3;LPPAllhorn4;LPPAllhorn5;LPPAllhorn6;LPPAlllord;LPPAlloldpain;LPPAlltavrhorn;LPPAlltelehorn;LPPAllvampirehorn;LPPTattooAgent;LPPTattooTear;LPPJaw;LPPVisor;LPPRobohead;LPPIronheart;LPPProsthesisLLeg;LPPProsthesisRLeg;LPPProsthesisLHand;LPPProsthesisRHand;LPPProsthesisLWrist;LPPProsthesisRWrist;CyberlimbRArmBishop;CyberlimbLArmBishop;CyberlimbRHandBishop;CyberlimbLHandBishop;CyberlimbRLegBishop;CyberlimbLLegBishop;CyberlimbLFootBishop;CyberlimbRFootBishop;CyberlimbTorsoBishop;CyberlimbRArmHephaestus;CyberlimbLArmHephaestus;CyberlimbRHandHephaestus;CyberlimbLHandHephaestus;CyberlimbRLegHephaestus;CyberlimbLLegHephaestus;CyberlimbLFootHephaestus;CyberlimbRFootHephaestus;CyberlimbTorsoHephaestus;CyberlimbRArmHephaestusTitan;CyberlimbLArmHephaestusTitan;CyberlimbRHandHephaestusTitan;CyberlimbLHandHephaestusTitan;CyberlimbRLegHephaestusTitan;CyberlimbLLegHephaestusTitan;CyberlimbLFootHephaestusTitan;CyberlimbRFootHephaestusTitan;CyberlimbTorsoHephaestusTitan;CyberlimbRArmMorpheus;CyberlimbLArmMorpheus;CyberlimbRHandMorpheus;CyberlimbLHandMorpheus;CyberlimbRLegMorpheus;CyberlimbLLegMorpheus;CyberlimbLFootMorpheus;CyberlimbRFootMorpheus;CyberlimbTorsoMorpheus;CyberlimbRArmWardtakahashi;CyberlimbLArmWardtakahashi;CyberlimbRHandWardtakahashi;CyberlimbLHandWardtakahashi;CyberlimbRLegWardtakahashi;CyberlimbLLegWardtakahashi;CyberlimbLFootWardtakahashi;CyberlimbRFootWardtakahashi;CyberlimbTorsoWardtakahashiMale;CyberlimbTorsoWardtakahashiFemale;CyberlimbRArmZenghu;CyberlimbLArmZenghu;CyberlimbRHandZenghu;CyberlimbLHandZenghu;CyberlimbRLegZenghu;CyberlimbLLegZenghu;CyberlimbLFootZenghu;CyberlimbRFootZenghu;CyberlimbTorsoZenghu;CyberlimbRArmNanotrasen;CyberlimbLArmNanotrasen;CyberlimbRHandNanotrasen;CyberlimbLHandNanotrasen;CyberlimbRLegNanotrasen;CyberlimbLLegNanotrasen;CyberlimbLFootNanotrasen;CyberlimbRFootNanotrasen;CyberlimbTorsoNanotrasen;CyberlimbRArmXion;CyberlimbLArmXion;CyberlimbRHandXion;CyberlimbLHandXion;CyberlimbRLegXion;CyberlimbLLegXion;CyberlimbLFootXion;CyberlimbRFootXion;CyberlimbTorsoXion;LPPTailLisichkaBolsh;LPPTailLisichka;LPPTailLisichkaPushok;LPPTailLisichkaPyatna;LPPSevenTail;LPPTailVulptail; + +sponsor-markings-tier-4 = {sponsor-markings-tier-3}; +sponsor-markings-tier-5 = {sponsor-markings-tier-4};