From 91ffe59ffce55de76e272132c2f166950a3bdb63 Mon Sep 17 00:00:00 2001 From: SpicyDarkFox Date: Sun, 15 Sep 2024 13:06:29 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=205=20=D1=81=D0=BF?= =?UTF-8?q?=D0=BE=D0=BD=D1=81=D0=BE=D1=80=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Client/LateJoin/LateJoinGui.cs | 8 ++--- .../Preferences/UI/AntagPreferenceSelector.cs | 8 ++--- .../UI/HumanoidProfileEditor.xaml.cs | 32 +++++++++---------- .../UI/LoadoutPreferenceSelector.cs | 8 ++--- .../Preferences/UI/TraitPreferenceSelector.cs | 9 +++--- .../Systems/CharacterRequirements.Job.cs | 9 ++---- 6 files changed, 35 insertions(+), 39 deletions(-) diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs index 09ec8002dc..e3d849a2fd 100644 --- a/Content.Client/LateJoin/LateJoinGui.cs +++ b/Content.Client/LateJoin/LateJoinGui.cs @@ -91,10 +91,10 @@ private void RebuildUI() _jobCategories.Clear(); #if LPP_Sponsors - var sys = IoCManager.Resolve(); - var checkSponsorSystem = sys.GetEntitySystem(); - checkSponsorSystem.GoCheckSponsor(); - var sponsorTier = checkSponsorSystem.GetSponsorStatus().Item2; + var sys = IoCManager.Resolve(); + var sponsorTier = 0; + if (sys.TryGetInfo(out var sponsorInfo)) + sponsorTier = sponsorInfo.Tier ?? 0; #endif if (!_gameTicker.DisallowedLateJoin && _gameTicker.StationNames.Count == 0) diff --git a/Content.Client/Preferences/UI/AntagPreferenceSelector.cs b/Content.Client/Preferences/UI/AntagPreferenceSelector.cs index a74774ee6c..1cd6cc6689 100644 --- a/Content.Client/Preferences/UI/AntagPreferenceSelector.cs +++ b/Content.Client/Preferences/UI/AntagPreferenceSelector.cs @@ -44,10 +44,10 @@ public AntagPreferenceSelector(AntagPrototype proto, JobPrototype highJob) : bas var configMan = IoCManager.Resolve(); #if LPP_Sponsors - var sys = IoCManager.Resolve(); - var checkSponsorSystem = sys.GetEntitySystem(); - checkSponsorSystem.GoCheckSponsor(); - var sponsorTier = checkSponsorSystem.GetSponsorStatus().Item2; + var sys = IoCManager.Resolve(); + var sponsorTier = 0; + if (sys.TryGetInfo(out var sponsorInfo)) + sponsorTier = sponsorInfo.Tier ?? 0; #endif if (proto.Requirements != null diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs index 762c43e099..a60a3ea4d9 100644 --- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs @@ -755,10 +755,10 @@ private void UpdateRoleRequirements() var firstCategory = true; #if LPP_Sponsors - var sys = IoCManager.Resolve(); - var checkSponsorSystem = sys.GetEntitySystem(); - checkSponsorSystem.GoCheckSponsor(); - var sponsorTier = checkSponsorSystem.GetSponsorStatus().Item2; + var sys = IoCManager.Resolve(); + var sponsorTier = 0; + if (sys.TryGetInfo(out var sponsorInfo)) + sponsorTier = sponsorInfo.Tier ?? 0; #endif var departments = _prototypeManager.EnumeratePrototypes().ToArray(); @@ -875,10 +875,10 @@ out var reasons private void EnsureJobRequirementsValid() { #if LPP_Sponsors - var sys = IoCManager.Resolve(); - var checkSponsorSystem = sys.GetEntitySystem(); - checkSponsorSystem.GoCheckSponsor(); - var sponsorTier = checkSponsorSystem.GetSponsorStatus().Item2; + var sys = IoCManager.Resolve(); + var sponsorTier = 0; + if (sys.TryGetInfo(out var sponsorInfo)) + sponsorTier = sponsorInfo.Tier ?? 0; #endif foreach (var selector in _jobPriorities) { @@ -1545,10 +1545,10 @@ private void UpdateTraits(bool showUnusable) var highJob = _controller.GetPreferredJob(Profile ?? HumanoidCharacterProfile.DefaultWithSpecies()); #if LPP_Sponsors - var sys = IoCManager.Resolve(); - var checkSponsorSystem = sys.GetEntitySystem(); - checkSponsorSystem.GoCheckSponsor(); - var sponsorTier = checkSponsorSystem.GetSponsorStatus().Item2; + var sys = IoCManager.Resolve(); + var sponsorTier = 0; + if (sys.TryGetInfo(out var sponsorInfo)) + sponsorTier = sponsorInfo.Tier ?? 0; #endif _traits.Clear(); @@ -1861,10 +1861,10 @@ private void UpdateLoadouts(bool showUnusable) _loadoutPointsBar.Value = points; #if LPP_Sponsors - var sys = IoCManager.Resolve(); - var checkSponsorSystem = sys.GetEntitySystem(); - checkSponsorSystem.GoCheckSponsor(); - var sponsorTier = checkSponsorSystem.GetSponsorStatus().Item2; + var sys = IoCManager.Resolve(); + var sponsorTier = 0; + if (sys.TryGetInfo(out var sponsorInfo)) + sponsorTier = sponsorInfo.Tier ?? 0; #endif // Get the highest priority job to use for loadout filtering diff --git a/Content.Client/Preferences/UI/LoadoutPreferenceSelector.cs b/Content.Client/Preferences/UI/LoadoutPreferenceSelector.cs index 5c50705237..976ccc28bf 100644 --- a/Content.Client/Preferences/UI/LoadoutPreferenceSelector.cs +++ b/Content.Client/Preferences/UI/LoadoutPreferenceSelector.cs @@ -148,10 +148,10 @@ public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob, tooltip.Append($"{Loc.GetString(desc)}"); #if LPP_Sponsors - var sys = IoCManager.Resolve(); - var checkSponsorSystem = sys.GetEntitySystem(); - checkSponsorSystem.GoCheckSponsor(); - var sponsorTier = checkSponsorSystem.GetSponsorStatus().Item2; + var sys = IoCManager.Resolve(); + var sponsorTier = 0; + if (sys.TryGetInfo(out var sponsorInfo)) + sponsorTier = sponsorInfo.Tier ?? 0; #endif // Get requirement reasons diff --git a/Content.Client/Preferences/UI/TraitPreferenceSelector.cs b/Content.Client/Preferences/UI/TraitPreferenceSelector.cs index 2a9ae3f56a..a44e6fecf6 100644 --- a/Content.Client/Preferences/UI/TraitPreferenceSelector.cs +++ b/Content.Client/Preferences/UI/TraitPreferenceSelector.cs @@ -85,11 +85,10 @@ public TraitPreferenceSelector(TraitPrototype trait, JobPrototype highJob, Human tooltip.Append(desc); #if LPP_Sponsors - //Logger.Error("SPONSOR: go check sponsor - Trait"); - var sys = IoCManager.Resolve(); - var _checkSponsorSystem = sys.GetEntitySystem(); - _checkSponsorSystem.GoCheckSponsor(); - var sponsorTier = _checkSponsorSystem.GetSponsorStatus().Item2; + var sys = IoCManager.Resolve(); + var sponsorTier = 0; + if (sys.TryGetInfo(out var sponsorInfo)) + sponsorTier = sponsorInfo.Tier ?? 0; #endif // Get requirement reasons diff --git a/Content.Shared/Customization/Systems/CharacterRequirements.Job.cs b/Content.Shared/Customization/Systems/CharacterRequirements.Job.cs index d62b6ea7d2..15e62c7610 100644 --- a/Content.Shared/Customization/Systems/CharacterRequirements.Job.cs +++ b/Content.Shared/Customization/Systems/CharacterRequirements.Job.cs @@ -148,8 +148,7 @@ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile, } #if LPP_Sponsors - //Logger.Error($"SPONSOR: CharacterDepartmentTimeRequirement. Tier: {sponsorTier}, whitelisted: {whitelisted}"); - if (sponsorTier >= 5) + if (sponsorTier >= 5 !whitelisted) { reason = null; return true; @@ -233,8 +232,7 @@ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile, } #if LPP_Sponsors - //Logger.Error($"SPONSOR: CharacterOverallTimeRequirement. Tier: {sponsorTier}, whitelisted: {whitelisted}"); - if (sponsorTier >=5) + if (sponsorTier >= 5 !whitelisted) { reason = null; return true; @@ -308,8 +306,7 @@ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile, } #if LPP_Sponsors - //Logger.Error($"SPONSOR: CharacterPlaytimeRequirement. Tier: {sponsorTier}, whitelisted: {whitelisted}"); - if (sponsorTier >= 5) + if (sponsorTier >= 5 && !whitelisted) { reason = null; return true; From e0931deb114840632bbdfc620d20de1780c5cd5b Mon Sep 17 00:00:00 2001 From: SpicyDarkFox Date: Sun, 15 Sep 2024 13:15:01 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D1=87=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Customization/Systems/CharacterRequirements.Job.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Customization/Systems/CharacterRequirements.Job.cs b/Content.Shared/Customization/Systems/CharacterRequirements.Job.cs index 15e62c7610..f4edf515fa 100644 --- a/Content.Shared/Customization/Systems/CharacterRequirements.Job.cs +++ b/Content.Shared/Customization/Systems/CharacterRequirements.Job.cs @@ -148,7 +148,7 @@ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile, } #if LPP_Sponsors - if (sponsorTier >= 5 !whitelisted) + if (sponsorTier >= 5 && !whitelisted) { reason = null; return true; @@ -232,7 +232,7 @@ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile, } #if LPP_Sponsors - if (sponsorTier >= 5 !whitelisted) + if (sponsorTier >= 5 && !whitelisted) { reason = null; return true; From 71c8e204ae9c392cad7128c7e01f7e9e906a17d2 Mon Sep 17 00:00:00 2001 From: SpicyDarkFox Date: Sun, 15 Sep 2024 21:57:26 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=D1=87=D0=B5=D1=81=D0=BE=D0=BA=20=D1=80=D0=B5=D0=BF=D1=82?= =?UTF-8?q?=D0=B8=D0=BB=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Species/reptilian.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml index 85e4df99f6..a57c388971 100644 --- a/Resources/Prototypes/Species/reptilian.yml +++ b/Resources/Prototypes/Species/reptilian.yml @@ -22,6 +22,7 @@ id: MobReptilianSprites sprites: Head: MobReptilianHead + Hair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking Chest: MobReptilianTorso HeadTop: MobHumanoidAnyMarking @@ -42,7 +43,7 @@ onlyWhitelisted: true points: Hair: - points: 0 + points: 1 required: false FacialHair: points: 0 From b62f3ffde3155280436085f5cd3c405074f541f0 Mon Sep 17 00:00:00 2001 From: SpicyDarkFox Date: Sun, 15 Sep 2024 22:57:04 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D1=84=D0=B8=D0=B3=D0=BD=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/guidebook/food.ftl | 4 ++-- .../_LostParadise/Entities/Clothing/Neck/shemags.yml | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/ru-RU/guidebook/food.ftl b/Resources/Locale/ru-RU/guidebook/food.ftl index 0204494702..bb00879669 100644 --- a/Resources/Locale/ru-RU/guidebook/food.ftl +++ b/Resources/Locale/ru-RU/guidebook/food.ftl @@ -3,8 +3,8 @@ guidebook-food-unknown-proto = Неизвестный прототип guidebook-food-sources-header = Источники guidebook-food-sources-ent-wrapper = { $name } guidebook-food-reagents-header = Химический состав -guidebook-food-processing-butchering = Нарежте -guidebook-food-processing-slicing = Слайсуйте +guidebook-food-processing-butchering = Разделайте +guidebook-food-processing-slicing = Нарежьте guidebook-food-processing-cooking = Разогрейте на { $time }сек guidebook-food-processing-reaction = Смешайте guidebook-food-processing-recipe = { $ingredients } diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml index 3a88a420e8..09f336f1c8 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml @@ -10,6 +10,8 @@ sprite: _LostParadise/Clothing/Neck/shemags/greendown.rsi - type: ToggleableClothing clothingPrototype: LPPClothingMaskShemagGreen + requiredSlot: + - neck slot: mask - type: ContainerContainer containers: @@ -41,6 +43,8 @@ sprite: _LostParadise/Clothing/Neck/shemags/reddown.rsi - type: ToggleableClothing clothingPrototype: LPPClothingMaskShemagRed + requiredSlot: + - neck slot: mask - type: ContainerContainer containers: @@ -72,6 +76,8 @@ sprite: _LostParadise/Clothing/Neck/shemags/bluedown.rsi - type: ToggleableClothing clothingPrototype: LPPClothingMaskShemagBlue + requiredSlot: + - neck slot: mask - type: ContainerContainer containers: @@ -103,6 +109,8 @@ sprite: _LostParadise/Clothing/Neck/shemags/browndown.rsi - type: ToggleableClothing clothingPrototype: LPPClothingMaskShemagBrown + requiredSlot: + - neck slot: mask - type: ContainerContainer containers: @@ -134,6 +142,8 @@ sprite: _LostParadise/Clothing/Neck/shemags/purpledown.rsi - type: ToggleableClothing clothingPrototype: LPPClothingMaskShemagPurple + requiredSlot: + - neck slot: mask - type: ContainerContainer containers: @@ -165,6 +175,8 @@ sprite: _LostParadise/Clothing/Neck/shemags/NPZdown.rsi - type: ToggleableClothing clothingPrototype: LPPClothingMaskShemagNPZ + requiredSlot: + - neck slot: mask - type: ContainerContainer containers: From b7af1fca743274a75f1c35f760a60796b80874cf Mon Sep 17 00:00:00 2001 From: Lost-Paradise-Bot <172407741+Lost-Paradise-Bot@users.noreply.github.com> Date: Sun, 15 Sep 2024 20:06:03 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20(#148)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogLPP.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index 856d893f16..16247d8b20 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -400,3 +400,14 @@ Entries: id: 43 time: '2024-09-14T20:13:05.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/146 +- author: SpicyDarkFox + changes: + - type: Add + message: Добавлена возможность спонсорам 5 уровня заходить за любую роль кроме ВЛ + - type: Fix + message: Исправлена проблема с прическами унатхов + - type: Fix + message: Исправлены шемаги + id: 44 + time: '2024-09-15T20:05:33.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/148