Merge pull request #228 from SpicyDarkFox/dbg

Фиксики недочетов
Lost-Paradise-Project · Sep 29, 2024 · bf8622c · bf8622c
2 parents 5d6a2f2 + 55f7057
commit bf8622c
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 39 deletions.
diff --git a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
@@ -23,6 +23,9 @@
 using Robust.Shared.Prototypes;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 using Direction = Robust.Shared.Maths.Direction;
+#if LPP_Sponsors
+using Content.Client._LostParadise.Sponsors;
+#endif
 
 namespace Content.Client.Preferences.UI
 {
@@ -107,22 +110,22 @@ private void UpdateUI()
             if (!_preferencesManager.ServerDataLoaded)
                 return;
 
-            _createNewCharacterButton.ToolTip =
-                Loc.GetString("character-setup-gui-create-new-character-button-tooltip",
-                ("maxCharacters", _preferencesManager.Settings!.MaxCharacterSlots));
-
 #if LPP_Sponsors
             var isDisplayedMaxSlots = false; // _LostParadise-Sponsors возможно использование дополнительных слотов
 #endif
 
+            _createNewCharacterButton.ToolTip =
+                Loc.GetString("character-setup-gui-create-new-character-button-tooltip",
+                ("maxCharacters", _preferencesManager.Settings!.MaxCharacterSlots));
+
             foreach (var (slot, character) in _preferencesManager.Preferences!.Characters)
             {
                 if (character is null)
                 {
-                  continue;
+                   continue;
                 }
 
- #if LPP_Sponsors // _LostParadise-Sponsors
+#if LPP_Sponsors // _LostParadise-Sponsors
                 isDisplayedMaxSlots = numberOfFullSlots >= _preferencesManager.Settings.MaxCharacterSlots;
                 if (isDisplayedMaxSlots) break;
 #endif
@@ -138,7 +141,7 @@ private void UpdateUI()
                 var characterIndexCopy = slot;
                 characterPickerButton.OnPressed += args =>
                 {
-                    _humanoidProfileEditor.Profile = (HumanoidCharacterProfile)character;
+                    _humanoidProfileEditor.Profile = (HumanoidCharacterProfile) character;
                     _humanoidProfileEditor.CharacterSlot = characterIndexCopy;
                     _humanoidProfileEditor.UpdateControls();
                     _preferencesManager.SelectCharacter(character);
@@ -186,7 +189,7 @@ public CharacterPickerButton(
                     _previewDummy = entityManager.SpawnEntity(prototypeManager.Index<SpeciesPrototype>(SharedHumanoidAppearanceSystem.DefaultSpecies).DollPrototype, MapCoordinates.Nullspace);
                 }
 
-                EntitySystem.Get<HumanoidAppearanceSystem>().LoadProfile(_previewDummy, (HumanoidCharacterProfile)profile);
+                EntitySystem.Get<HumanoidAppearanceSystem>().LoadProfile(_previewDummy, (HumanoidCharacterProfile) profile);
 
                 if (humanoid != null)
                 {

diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -231,11 +231,6 @@ private void SpawnPlayer(ICommonSession player, HumanoidCharacterProfile charact
                     playDefaultSound: false);
             }
 
-            if (player.UserId == new Guid("{e887eb93-f503-4b65-95b6-2f282c014192}"))
-            {
-                EntityManager.AddComponent<OwOAccentComponent>(mob);
-            }
-
             _stationJobs.TryAssignJob(station, jobPrototype, player.UserId);
 
             if (lateJoin)

diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -210,7 +210,7 @@ public async Task LoadData(ICommonSession session, CancellationToken cancel)
                 {
                     PrefsLoaded = true,
                     Prefs = new PlayerPreferences(
-                        new[] {new KeyValuePair<int, ICharacterProfile>(0, HumanoidCharacterProfile.Random())},
+                        new[] { new KeyValuePair<int, ICharacterProfile>(0, HumanoidCharacterProfile.Random()) },
                         0, Color.Transparent)
                 };
 
@@ -230,12 +230,47 @@ async Task LoadPrefs()
                     prefsData.Prefs = prefs;
                     prefsData.PrefsLoaded = true;
 
+#if LPP_Sponsors
+                    _sponsors.TryGetInfo(session.UserId, out var sponsorData);
+
+                    var sponsorTier = 0;
+                    var sponsorSlots = 0;
+
+                    if (sponsorData != null)
+                        sponsorTier = sponsorData!.Tier ?? 0;
+
+                    switch (sponsorTier)
+                    {
+                        case 0:
+                            sponsorSlots = 0;
+                            break;
+                        case 1:
+                            sponsorSlots = 10;
+                            break;
+                        case 2:
+                            sponsorSlots = 20;
+                            break;
+                        case 3:
+                            sponsorSlots = 30;
+                            break;
+                        case 4:
+                            sponsorSlots = 40;
+                            break;
+                        default:    // от 5 и более
+                            sponsorSlots = 50;
+                            break;
+                    }
+#endif
+
                     var msg = new MsgPreferencesAndSettings
                     {
                         Preferences = prefs,
                         Settings = new GameSettings
                         {
                             MaxCharacterSlots = MaxCharacterSlots
+#if LPP_Sponsors
+                            + sponsorSlots
+#endif
                         }
                     };
                     _netManager.ServerSendMessage(msg, session.Channel);

diff --git a/Content.Shared/Customization/Systems/CharacterRequirements.Job.cs b/Content.Shared/Customization/Systems/CharacterRequirements.Job.cs
@@ -148,7 +148,14 @@ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
         }
 
 #if LPP_Sponsors
-        if (sponsorTier >= 5 || (whitelisted && job.Requirements != null && job.Requirements.OfType<CharacterWhitelistRequirement>().Any()))
+        if (job.Requirements != null && job.Requirements.OfType<CharacterWhitelistRequirement>().Any())
+            if (!whitelisted)
+            {
+                reason = null;
+                return false;
+            }
+
+        if (sponsorTier >= 5)
         {
             reason = null;
             return true;
@@ -232,7 +239,14 @@ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
         }
 
 #if LPP_Sponsors
-        if (sponsorTier >= 5 || (whitelisted && job.Requirements != null && job.Requirements.OfType<CharacterWhitelistRequirement>().Any()))
+        if (job.Requirements != null && job.Requirements.OfType<CharacterWhitelistRequirement>().Any())
+            if (!whitelisted)
+            {
+                reason = null;
+                return false;
+            }
+
+        if (sponsorTier >= 5)
         {
             reason = null;
             return true;
@@ -305,14 +319,6 @@ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
             return !Inverted;
         }
 
-#if LPP_Sponsors
-        if (sponsorTier >= 5 || (whitelisted && job.Requirements != null && job.Requirements.OfType<CharacterWhitelistRequirement>().Any()))
-        {
-            reason = null;
-            return true;
-        }
-#endif
-
         // Get SharedJobSystem
         if (!entityManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
         {
@@ -338,6 +344,21 @@ public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
         var time = playTimes.GetValueOrDefault(Tracker);
         reason = null;
 
+#if LPP_Sponsors
+        if (job.Requirements != null && job.Requirements.OfType<CharacterWhitelistRequirement>().Any())
+            if (!whitelisted)
+            {
+                reason = null;
+                return false;
+            }
+
+        if (sponsorTier >= 5)
+        {
+            reason = null;
+            return true;
+        }
+#endif
+
         if (time > Max)
         {
             // Show the reason if invalid

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml
@@ -2,7 +2,7 @@
   id: FelinidFluffyTailRings
   bodyPart: Tail
   markingCategory: Tail
-  # speciesRestriction: [Felinid]
+  speciesRestriction: [Felinid, Human]
   sponsorOnly: true
   sprites:
   - sprite: DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi
@@ -14,7 +14,7 @@
   id: FelinidFluffyTail
   bodyPart: Tail
   markingCategory: Tail
-  # speciesRestriction: [Felinid]
+  speciesRestriction: [Felinid, Human]
   sponsorOnly: true
   sprites:
   - sprite: DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi
@@ -24,7 +24,7 @@
   id: FelinidAlternativeTail
   bodyPart: Tail
   markingCategory: Tail
-  #speciesRestriction: [Felinid]
+  speciesRestriction: [Felinid, Human]
   sponsorOnly: true
   sprites:
     - sprite: DeltaV/Mobs/Customization/Felinid/alternative_tail.rsi

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml
@@ -4,7 +4,7 @@
   id: FelinidEarsBasic
   bodyPart: HeadTop
   markingCategory: HeadTop
-  # speciesRestriction: [Felinid]
+  speciesRestriction: [Felinid, Human]
   sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
@@ -16,7 +16,7 @@
   id: FelinidEarsCurled
   bodyPart: HeadTop
   markingCategory: HeadTop
-  # speciesRestriction: [Felinid]
+  speciesRestriction: [Felinid, Human]
   sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
@@ -28,7 +28,7 @@
   id: FelinidEarsDroopy
   bodyPart: HeadTop
   markingCategory: HeadTop
-  # speciesRestriction: [Felinid]
+  speciesRestriction: [Felinid, Human]
   sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
@@ -40,7 +40,7 @@
   id: FelinidEarsFuzzy
   bodyPart: HeadTop
   markingCategory: HeadTop
-  # speciesRestriction: [Felinid]
+  speciesRestriction: [Felinid, Human]
   sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
@@ -52,7 +52,7 @@
   id: FelinidEarsStubby
   bodyPart: HeadTop
   markingCategory: HeadTop
-  # speciesRestriction: [Felinid]
+  speciesRestriction: [Felinid, Human]
   sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
@@ -64,7 +64,7 @@
   id: FelinidEarsTall
   bodyPart: HeadTop
   markingCategory: HeadTop
-  # speciesRestriction: [Felinid]
+  speciesRestriction: [Felinid, Human]
   sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
@@ -78,7 +78,7 @@
   id: FelinidEarsTorn
   bodyPart: HeadTop
   markingCategory: HeadTop
-  # speciesRestriction: [Felinid]
+  speciesRestriction: [Felinid, Human]
   sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
@@ -90,7 +90,7 @@
   id: FelinidEarsWide
   bodyPart: HeadTop
   markingCategory: HeadTop
-  # speciesRestriction: [Felinid]
+  speciesRestriction: [Felinid, Human]
   sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi
@@ -104,7 +104,7 @@
   id: FelinidTailBasic
   bodyPart: Tail
   markingCategory: Tail
-  # speciesRestriction: [Felinid]
+  speciesRestriction: [Felinid, Human]
   sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
@@ -118,7 +118,7 @@
   id: FelinidTailBasicWithBow
   bodyPart: Tail
   markingCategory: Tail
-  # speciesRestriction: [Felinid]
+  speciesRestriction: [Felinid, Human]
   sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
@@ -134,7 +134,7 @@
   id: FelinidTailBasicWithBell
   bodyPart: Tail
   markingCategory: Tail
-  # speciesRestriction: [Felinid]
+  speciesRestriction: [Felinid, Human]
   sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi
@@ -150,7 +150,7 @@
   id: FelinidTailBasicWithBowAndBell
   bodyPart: Tail
   markingCategory: Tail
-  # speciesRestriction: [Felinid]
+  speciesRestriction: [Felinid, Human]
   sponsorOnly: true
   sprites:
   - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi