Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Доработочка маркингов и редактора #62

Merged
merged 3 commits into from
Sep 4, 2024
Merged

Доработочка маркингов и редактора #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a18ba4d
фикс кнопок в редакторе
SpicyDarkFox Sep 4, 2024
44f2ca9
разделение маркингов по уровням спонсорки
SpicyDarkFox Sep 4, 2024
e807ea0
Merge branch 'dbg' of github.com:SpicyDarkFox/LPP_verse into dbg
SpicyDarkFox Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Content.Client/Humanoid/MarkingPicker.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
7 changes: 7 additions & 0 deletions Resources/Locale/ru-RU/_LostParadise/SponsorMarkingsTier.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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};
Loading