переделки?) (#274)

* DELETE NOTHING ADD THING))) * again thing add * переводы * мда * Update CharacterRequirements.Profile.cs * Update CharacterRequirements.Profile.cs * Update CharacterRequirements.Profile.cs * Update CharacterRequirements.Profile.cs * Всё * bruh 1 * bruh2 * ФИУКСЫ
Lost-Paradise-Project · Oct 18, 2024 · 2a9e045 · 2a9e045
1 parent da1df6c
commit 2a9e045
Show file tree

Hide file tree

Showing 114 changed files with 3,755 additions and 1,016 deletions.
diff --git a/.github/workflows/test-secrets4.yml b/.github/workflows/test-secrets4.yml
@@ -10,7 +10,7 @@ jobs:
   validate_rsis:
     name: Validate RSIs
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' && github.repository == 'Lost-Paradise-Project/Lost-Paradise'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/[email protected]
       - name: Download parts
@@ -27,7 +27,7 @@ jobs:
         uses: space-wizards/[email protected]
       - name: Install Python dependencies
         run: |
-          pip3 install --ignore-installed --user pillow jsonschema --break-system-packages
+          pip3 install --ignore-installed --user pillow jsonschema
       - name: Validate RSIs
         run: |
           python3 RobustToolbox/Schemas/validate_rsis.py Resources/
diff --git a/.github/workflows/validate-rsis.yml b/.github/workflows/validate-rsis.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   validate_rsis:
     name: Validate RSIs
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/[email protected]
       - name: Setup Submodule
@@ -22,7 +22,7 @@ jobs:
         uses: space-wizards/[email protected]
       - name: Install Python dependencies
         run: |
-          pip3 install --ignore-installed --user pillow jsonschema --break-system-packages
+          pip3 install --ignore-installed --user pillow jsonschema
       - name: Validate RSIs
         run: |
           python3 RobustToolbox/Schemas/validate_rsis.py Resources/
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -4,7 +4,6 @@
     xmlns:humanoid="clr-namespace:Content.Client.Humanoid"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
-    xmlns:donate="clr-namespace:Content.Client._LostParadise.Donate"
     HorizontalExpand="True">
     <!-- Left side -->
     <BoxContainer Orientation="Vertical" Margin="10 10 10 10" HorizontalExpand="True">
@@ -213,16 +212,6 @@
 
                 <ui:NeoTabContainer Name="CLoadoutsTabs" VerticalExpand="True" SeparatorMargin="0" />
             </BoxContainer>
-            <!-- Lost Paradise Donate Preferences Begin -->
-            <BoxContainer Orientation="Vertical" Margin="10" Name="LPPDonateTab">
-                <!-- Donate -->
-                <ScrollContainer HorizontalExpand="True" HScrollEnabled="True" VerticalExpand="True" VScrollEnabled="True">
-                    <BoxContainer Name="DonateList" Orientation="Vertical">
-                        <CheckBox></CheckBox>
-                    </BoxContainer>
-                </ScrollContainer>
-            </BoxContainer>
-            <!-- Lost Paradise Donate Preferences End -->
             <BoxContainer Name="CMarkingsTab" HorizontalExpand="True" Orientation="Vertical" Margin="10">
                 <ScrollContainer HorizontalExpand="True" HScrollEnabled="True" VerticalExpand="True" VScrollEnabled="True">
                     <!-- Markings -->

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -90,11 +90,6 @@ public sealed partial class HumanoidProfileEditor : BoxContainer
         private Button _loadoutsShowUnusableButton => LoadoutsShowUnusableButton;
         private Button _loadoutsRemoveUnusableButton => LoadoutsRemoveUnusableButton;
         private NeoTabContainer _loadoutsTabs => CLoadoutsTabs;
-
-        private BoxContainer _donateList => LPPDonateTab; // Lost Paradise Donate Preferences
-#if LPP_Sponsors
-        private List<_LostParadise.Donate.DonatePreferenceSelector> _donatePreferences;     // Lost Paradise Donate Preferences
-#endif
         private readonly List<JobPrioritySelector> _jobPriorities;
         private OptionButton _preferenceUnavailableButton => CPreferenceUnavailableButton;
         private readonly Dictionary<string, BoxContainer> _jobCategories;
@@ -588,45 +583,6 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             };
 
             #endregion Dummy
-
-#if LPP_Sponsors            // Lost Paradise Donate Preferences
-            #region Donate
-            LPPDonateTab.Orphan();
-            _tabContainer.AddTab(LPPDonateTab, Loc.GetString("lost-donate-editor"));
-            var donate = prototypeManager.EnumeratePrototypes<Shared._LostParadise.Donate.DonatePrototype>().OrderBy(t => Loc.GetString(t.Name)).ToList();
-            _donatePreferences = new List<_LostParadise.Donate.DonatePreferenceSelector>();
-            var granted = false;
-            _donateList.DisposeAllChildren();
-            if (donate.Count > 0)
-            {
-                foreach (var donatet in donate)
-                {
-                    var selector = new _LostParadise.Donate.DonatePreferenceSelector(donatet);
-                    selector.PreferenceChanged += preference =>
-                    {
-                        Profile = Profile?.WithDonatePreference(donatet.ID, preference);
-                    };
-                    if (selector.Gave)
-                        granted = true;
-
-                    _donateList.AddChild(selector);
-                    _donatePreferences.Add(selector);
-                }
-            }
-            if (!granted)
-            {
-                _donateList.AddChild(new Label
-                {
-                    Text = Loc.GetString("lost-nodonate"),
-                    FontColorOverride = Color.Gray,
-                });
-            }
-            // Lost Paradise Donate Preferences End
-            #endregion
-
-#else
-            LPPDonateTab.Dispose();
-#endif
             #endregion Left
 
             if (preferencesManager.ServerDataLoaded)
@@ -641,20 +597,6 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             IsDirty = false;
         }
 
-#if LPP_Sponsors        // Lost Paradise Donate Preferences
-        private void RefreshDonatePreferences()
-        {
-            _donatePreferences = new List<_LostParadise.Donate.DonatePreferenceSelector>();
-            foreach (var preferenceSelector in _donatePreferences)
-            {
-                var donateId = preferenceSelector.Donate.ID;
-                var preference = Profile?.DonatePreferences.Contains(donateId) ?? false;
-
-                preferenceSelector.Preference = preference;
-            }
-        }
-#endif
-
         private void LoadoutsChanged(bool enabled)
         {
             _tabContainer.SetTabVisible(4, enabled);

diff --git a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
@@ -68,9 +68,6 @@ private static HumanoidCharacterProfile CharlieCharlieson()
                 antagPreferences: new List<string>(),
                 traitPreferences: new List<string>(),
                 loadoutPreferences: new List<string>()
-#if LPP_Sponsors
-                , donatePreferences: new List<string>()   // Lost Paradise Donate Preferences
-#endif
             );
         }