From 2bdded55f4816a35cf2594b122fe3118614db3aa Mon Sep 17 00:00:00 2001 From: SpicyDarkFox Date: Mon, 23 Sep 2024 21:15:00 +0300 Subject: [PATCH 1/8] =?UTF-8?q?=D0=BA=D0=BE=D1=88=D0=B0=D1=87=D0=B8=D0=B9?= =?UTF-8?q?=20=D0=BA=D0=B0=D1=81=D1=82=D0=BE=D0=BC=20=D1=81=D0=BF=D0=BE?= =?UTF-8?q?=D0=BD=D1=81=D0=BE=D1=80=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_LostParadise/SponsorMarkingsTier.ftl | 2 +- .../Mobs/Customization/Markings/felinid.yml | 10 +++--- .../Mobs/Customization/Markings/felinid.yml | 36 ++++++++++++------- 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/Resources/Locale/ru-RU/_LostParadise/SponsorMarkingsTier.ftl b/Resources/Locale/ru-RU/_LostParadise/SponsorMarkingsTier.ftl index ac30090360..4da1f6e07f 100644 --- a/Resources/Locale/ru-RU/_LostParadise/SponsorMarkingsTier.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/SponsorMarkingsTier.ftl @@ -1,6 +1,6 @@ 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-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;FelinidEarsBasic;FelinidEarsCurled;FelinidEarsDroopy;FelinidEarsFuzzy;FelinidEarsStubby;FelinidEarsTall;FelinidEarsTorn;FelinidEarsWide;FelinidTailBasic;FelinidTailBasicWithBow;FelinidTailBasicWithBell;FelinidTailBasicWithBowAndBell;FelinidFluffyTailRings;FelinidFluffyTail;FelinidAlternativeTail sponsor-markings-tier-4 = { sponsor-markings-tier-3 }; sponsor-markings-tier-5 = { sponsor-markings-tier-4 }; diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml index 795bcaacb0..e7e7818eeb 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml @@ -2,7 +2,8 @@ id: FelinidFluffyTailRings bodyPart: Tail markingCategory: Tail - speciesRestriction: [Felinid] + # speciesRestriction: [Felinid] + sponsorOnly: true sprites: - sprite: DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi state: Felinid_fluffy_tail_full @@ -13,7 +14,8 @@ id: FelinidFluffyTail bodyPart: Tail markingCategory: Tail - speciesRestriction: [Felinid] + # speciesRestriction: [Felinid] + sponsorOnly: true sprites: - sprite: DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi state: Felinid_fluffy_tail_full @@ -22,8 +24,8 @@ id: FelinidAlternativeTail bodyPart: Tail markingCategory: Tail - speciesRestriction: [Felinid] + #speciesRestriction: [Felinid] + sponsorOnly: true sprites: - sprite: DeltaV/Mobs/Customization/Felinid/alternative_tail.rsi state: m_waggingtail_cat_FRONT - diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml index e27a7f8be1..ee71e66e98 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml @@ -4,7 +4,8 @@ id: FelinidEarsBasic bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Felinid] + # speciesRestriction: [Felinid] + sponsorOnly: true sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: basic_outer @@ -15,7 +16,8 @@ id: FelinidEarsCurled bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Felinid] + # speciesRestriction: [Felinid] + sponsorOnly: true sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: curled_outer @@ -26,7 +28,8 @@ id: FelinidEarsDroopy bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Felinid] + # speciesRestriction: [Felinid] + sponsorOnly: true sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: droopy_outer @@ -37,7 +40,8 @@ id: FelinidEarsFuzzy bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Felinid] + # speciesRestriction: [Felinid] + sponsorOnly: true sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: basic_outer @@ -48,7 +52,8 @@ id: FelinidEarsStubby bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Felinid] + # speciesRestriction: [Felinid] + sponsorOnly: true sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: stubby_outer @@ -59,7 +64,8 @@ id: FelinidEarsTall bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Felinid] + # speciesRestriction: [Felinid] + sponsorOnly: true sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: tall_outer @@ -72,7 +78,8 @@ id: FelinidEarsTorn bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Felinid] + # speciesRestriction: [Felinid] + sponsorOnly: true sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: torn_outer @@ -83,7 +90,8 @@ id: FelinidEarsWide bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Felinid] + # speciesRestriction: [Felinid] + sponsorOnly: true sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_ears.rsi state: wide_outer @@ -96,7 +104,8 @@ id: FelinidTailBasic bodyPart: Tail markingCategory: Tail - speciesRestriction: [Felinid] + # speciesRestriction: [Felinid] + sponsorOnly: true sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi state: basic_tail_tip @@ -109,7 +118,8 @@ id: FelinidTailBasicWithBow bodyPart: Tail markingCategory: Tail - speciesRestriction: [Felinid] + # speciesRestriction: [Felinid] + sponsorOnly: true sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi state: basic_tail_tip @@ -124,7 +134,8 @@ id: FelinidTailBasicWithBell bodyPart: Tail markingCategory: Tail - speciesRestriction: [Felinid] + # speciesRestriction: [Felinid] + sponsorOnly: true sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi state: basic_tail_tip @@ -139,7 +150,8 @@ id: FelinidTailBasicWithBowAndBell bodyPart: Tail markingCategory: Tail - speciesRestriction: [Felinid] + # speciesRestriction: [Felinid] + sponsorOnly: true sprites: - sprite: Nyanotrasen/Mobs/Customization/felinid_tails.rsi state: basic_tail_tip From 2bce0ac1dcbf8c4dc2096f03b368e16671db8a08 Mon Sep 17 00:00:00 2001 From: Lost-Paradise-Bot <172407741+Lost-Paradise-Bot@users.noreply.github.com> Date: Mon, 23 Sep 2024 18:31:09 +0000 Subject: [PATCH 2/8] =?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(#193)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogLPP.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index a511b46531..2985a5fcb7 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -638,7 +638,8 @@ Entries: message: Теперь некоторые Т3 технологии требуют очищенный алмаз! - type: Tweak message: >- - Портативный монитор датчиков теперь в технологии Продвинутое отслеживание! + Портативный монитор датчиков теперь в технологии Продвинутое + отслеживание! - type: Tweak message: >- Теперь технология Базовое отслеживание открывает платы монитора и @@ -668,3 +669,10 @@ Entries: id: 62 time: '2024-09-23T13:14:50.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/185 +- author: SpicyDarkFox + changes: + - type: Add + message: Добавлена возможность выбора анимированных кошачьих хвостиков + id: 63 + time: '2024-09-23T18:30:37.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/193 From 4056902642c0fc6bb0e9c5f559b6e01e86c09229 Mon Sep 17 00:00:00 2001 From: SpicyDarkFox <128318785+SpicyDarkFox@users.noreply.github.com> Date: Mon, 23 Sep 2024 22:37:22 +0300 Subject: [PATCH 3/8] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BB=D0=BE=D0=B1=D0=B1=D0=B8=20=D0=A2?= =?UTF-8?q?=D0=A2=D0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Client/Corvax/TTS/TTSSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Client/Corvax/TTS/TTSSystem.cs b/Content.Client/Corvax/TTS/TTSSystem.cs index 609fc8fde2..762ff09c8a 100644 --- a/Content.Client/Corvax/TTS/TTSSystem.cs +++ b/Content.Client/Corvax/TTS/TTSSystem.cs @@ -112,7 +112,7 @@ private void OnPlayTTS(PlayTTSEvent ev) } else { - //_audio.PlayGlobal(soundPath, Filter.Local(), false); // поскольку источника нет/не видно, то пусть молчит + _audio.PlayGlobal(soundPath, Filter.Local(), false); } _contentRoot.RemoveFile(filePath); From a80ac1deec989b81677869bc7d5d8968cb8910f0 Mon Sep 17 00:00:00 2001 From: SpicyDarkFox Date: Mon, 23 Sep 2024 23:26:48 +0300 Subject: [PATCH 4/8] =?UTF-8?q?=D0=BE=D1=82=D0=BB=D0=B0=D0=B4=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=91=D0=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/Database/ServerDbBase.cs | 34 ++++++++++++++----------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs index 69c6e277ff..22427cf67b 100644 --- a/Content.Server/Database/ServerDbBase.cs +++ b/Content.Server/Database/ServerDbBase.cs @@ -34,7 +34,7 @@ public ServerDbBase(ISawmill opsLog) public async Task GetPlayerPreferencesAsync(NetUserId userId) { await using var db = await GetDb(); - + Logger.Warning($"Get preferences for profile: {userId}"); //тест БД var prefs = await db.DbContext .Preference .Include(p => p.Profiles).ThenInclude(h => h.Jobs) @@ -86,6 +86,8 @@ public async Task SaveCharacterSlotAsync(NetUserId userId, ICharacterProfile? pr throw new NotImplementedException(); } + Logger.Warning($"Saving Character Slot: {userId}/{profile.Name}"); //тест БД + var oldProfile = db.DbContext.Profile .Include(p => p.Preference) .Where(p => p.Preference.UserId == userId.UserId) @@ -145,7 +147,7 @@ public async Task InitPrefsAsync(NetUserId userId, ICharacter await db.DbContext.SaveChangesAsync(); - return new PlayerPreferences(new[] {new KeyValuePair(0, defaultProfile)}, 0, Color.FromHex(prefs.AdminOOCColor)); + return new PlayerPreferences(new[] { new KeyValuePair(0, defaultProfile) }, 0, Color.FromHex(prefs.AdminOOCColor)); } public async Task DeleteSlotAndSetSelectedIndex(NetUserId userId, int deleteSlot, int newSlot) @@ -184,6 +186,7 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile) var traits = profile.Traits.Select(t => t.TraitName); var loadouts = profile.Loadouts.Select(t => t.LoadoutName); #if LPP_Sponsors + Logger.Warning($"Selecting Donates for profile: {profile.Id}/{profile.CharacterName}"); //тест БД var donates = profile.Donate.Select(t => t.DonateName); // Lost Paradise Donate Preferences #endif @@ -298,22 +301,23 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl profile.Jobs.AddRange( humanoid.JobPriorities .Where(j => j.Value != JobPriority.Never) - .Select(j => new Job {JobName = j.Key, Priority = (DbJobPriority) j.Value}) + .Select(j => new Job { JobName = j.Key, Priority = (DbJobPriority) j.Value }) ); profile.Antags.Clear(); profile.Antags.AddRange( humanoid.AntagPreferences - .Select(a => new Antag {AntagName = a}) + .Select(a => new Antag { AntagName = a }) ); profile.Traits.Clear(); profile.Traits.AddRange( humanoid.TraitPreferences - .Select(t => new Trait {TraitName = t}) + .Select(t => new Trait { TraitName = t }) ); #if LPP_Sponsors + Logger.Warning($"Converting profile: {profile.Id}/{profile.CharacterName}"); //тест БД profile.Donate.Clear(); // Lost Paradise Donate Preferences profile.Donate.AddRange( humanoid.DonatePreferences @@ -324,7 +328,7 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl profile.Loadouts.Clear(); profile.Loadouts.AddRange( humanoid.LoadoutPreferences - .Select(t => new Loadout {LoadoutName = t}) + .Select(t => new Loadout { LoadoutName = t }) ); return profile; @@ -1261,7 +1265,7 @@ ban.Unban is null ban.LastEditedAt, ban.ExpirationTime, ban.Hidden, - new [] { ban.RoleId.Replace(BanManager.JobPrefix, null) }, + new[] { ban.RoleId.Replace(BanManager.JobPrefix, null) }, MakePlayerRecord(unbanningAdmin), ban.Unban?.UnbanTime); } @@ -1425,10 +1429,10 @@ public async Task> GetActiveWatchlists(Guid player) protected async Task> GetActiveWatchlistsImpl(DbGuard db, Guid player) { var entities = await (from watchlist in db.DbContext.AdminWatchlists - where watchlist.PlayerUserId == player && - !watchlist.Deleted && - (watchlist.ExpirationTime == null || DateTime.UtcNow < watchlist.ExpirationTime) - select watchlist) + where watchlist.PlayerUserId == player && + !watchlist.Deleted && + (watchlist.ExpirationTime == null || DateTime.UtcNow < watchlist.ExpirationTime) + select watchlist) .Include(note => note.Round) .ThenInclude(r => r!.Server) .Include(note => note.CreatedBy) @@ -1453,9 +1457,9 @@ public async Task> GetMessages(Guid player) protected async Task> GetMessagesImpl(DbGuard db, Guid player) { var entities = await (from message in db.DbContext.AdminMessages - where message.PlayerUserId == player && !message.Deleted && - (message.ExpirationTime == null || DateTime.UtcNow < message.ExpirationTime) - select message).Include(note => note.Round) + where message.PlayerUserId == player && !message.Deleted && + (message.ExpirationTime == null || DateTime.UtcNow < message.ExpirationTime) + select message).Include(note => note.Round) .ThenInclude(r => r!.Server) .Include(note => note.CreatedBy) .Include(note => note.LastEditedBy) @@ -1534,7 +1538,7 @@ protected async Task> GetGroupedServerRoleBansAsNo // Client side query, as EF can't do groups yet var bansEnumerable = bansQuery - .GroupBy(ban => new { ban.BanTime, CreatedBy = (Player?)ban.CreatedBy, ban.Reason, Unbanned = ban.Unban == null }) + .GroupBy(ban => new { ban.BanTime, CreatedBy = (Player?) ban.CreatedBy, ban.Reason, Unbanned = ban.Unban == null }) .Select(banGroup => banGroup) .ToArray(); From c590b375c05fb64631304d9b372b5dd4cfa01852 Mon Sep 17 00:00:00 2001 From: SpicyDarkFox Date: Mon, 23 Sep 2024 23:50:22 +0300 Subject: [PATCH 5/8] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BE=D1=82?= =?UTF-8?q?=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=91?= =?UTF-8?q?=D0=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/Database/ServerDbBase.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs index 22427cf67b..51d5f0e711 100644 --- a/Content.Server/Database/ServerDbBase.cs +++ b/Content.Server/Database/ServerDbBase.cs @@ -34,7 +34,7 @@ public ServerDbBase(ISawmill opsLog) public async Task GetPlayerPreferencesAsync(NetUserId userId) { await using var db = await GetDb(); - Logger.Warning($"Get preferences for profile: {userId}"); //тест БД + _opsLog.Warning($"Get preferences for profile: {userId}"); //тест БД var prefs = await db.DbContext .Preference .Include(p => p.Profiles).ThenInclude(h => h.Jobs) @@ -86,7 +86,7 @@ public async Task SaveCharacterSlotAsync(NetUserId userId, ICharacterProfile? pr throw new NotImplementedException(); } - Logger.Warning($"Saving Character Slot: {userId}/{profile.Name}"); //тест БД + _opsLog.Warning($"Saving Character Slot: {userId}/{profile.Name}"); //тест БД var oldProfile = db.DbContext.Profile .Include(p => p.Preference) From 07fc85f347ef8505d4900abe1172ece52d03cab3 Mon Sep 17 00:00:00 2001 From: SpicyDarkFox Date: Tue, 24 Sep 2024 00:03:55 +0300 Subject: [PATCH 6/8] =?UTF-8?q?=D0=B1=D0=BE=D0=BB=D0=B5=D0=B5=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BC=D0=B5=D1=82=D0=BD=D1=8B=D0=B5=20=D0=BB=D0=BE=D0=B3?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/Database/ServerDbBase.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs index 51d5f0e711..e87069825c 100644 --- a/Content.Server/Database/ServerDbBase.cs +++ b/Content.Server/Database/ServerDbBase.cs @@ -34,7 +34,7 @@ public ServerDbBase(ISawmill opsLog) public async Task GetPlayerPreferencesAsync(NetUserId userId) { await using var db = await GetDb(); - _opsLog.Warning($"Get preferences for profile: {userId}"); //тест БД + _opsLog.Error($"Get preferences for profile: {userId}"); //тест БД var prefs = await db.DbContext .Preference .Include(p => p.Profiles).ThenInclude(h => h.Jobs) @@ -86,7 +86,7 @@ public async Task SaveCharacterSlotAsync(NetUserId userId, ICharacterProfile? pr throw new NotImplementedException(); } - _opsLog.Warning($"Saving Character Slot: {userId}/{profile.Name}"); //тест БД + _opsLog.Error($"Saving Character Slot: {userId}/{profile.Name}"); //тест БД var oldProfile = db.DbContext.Profile .Include(p => p.Preference) @@ -186,7 +186,7 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile) var traits = profile.Traits.Select(t => t.TraitName); var loadouts = profile.Loadouts.Select(t => t.LoadoutName); #if LPP_Sponsors - Logger.Warning($"Selecting Donates for profile: {profile.Id}/{profile.CharacterName}"); //тест БД + Logger.Error($"Selecting Donates for profile: {profile.Id}/{profile.CharacterName}"); //тест БД var donates = profile.Donate.Select(t => t.DonateName); // Lost Paradise Donate Preferences #endif @@ -317,7 +317,7 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl ); #if LPP_Sponsors - Logger.Warning($"Converting profile: {profile.Id}/{profile.CharacterName}"); //тест БД + Logger.Error($"Converting profile: {profile.Id}/{profile.CharacterName}"); //тест БД profile.Donate.Clear(); // Lost Paradise Donate Preferences profile.Donate.AddRange( humanoid.DonatePreferences From 127fc24923bf1ed40eeeaaab5bb2571cf6d0a4ec Mon Sep 17 00:00:00 2001 From: SpicyDarkFox <128318785+SpicyDarkFox@users.noreply.github.com> Date: Tue, 24 Sep 2024 00:12:43 +0300 Subject: [PATCH 7/8] Update ServerDbBase.cs --- Content.Server/Database/ServerDbBase.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs index e87069825c..51d5f0e711 100644 --- a/Content.Server/Database/ServerDbBase.cs +++ b/Content.Server/Database/ServerDbBase.cs @@ -34,7 +34,7 @@ public ServerDbBase(ISawmill opsLog) public async Task GetPlayerPreferencesAsync(NetUserId userId) { await using var db = await GetDb(); - _opsLog.Error($"Get preferences for profile: {userId}"); //тест БД + _opsLog.Warning($"Get preferences for profile: {userId}"); //тест БД var prefs = await db.DbContext .Preference .Include(p => p.Profiles).ThenInclude(h => h.Jobs) @@ -86,7 +86,7 @@ public async Task SaveCharacterSlotAsync(NetUserId userId, ICharacterProfile? pr throw new NotImplementedException(); } - _opsLog.Error($"Saving Character Slot: {userId}/{profile.Name}"); //тест БД + _opsLog.Warning($"Saving Character Slot: {userId}/{profile.Name}"); //тест БД var oldProfile = db.DbContext.Profile .Include(p => p.Preference) @@ -186,7 +186,7 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile) var traits = profile.Traits.Select(t => t.TraitName); var loadouts = profile.Loadouts.Select(t => t.LoadoutName); #if LPP_Sponsors - Logger.Error($"Selecting Donates for profile: {profile.Id}/{profile.CharacterName}"); //тест БД + Logger.Warning($"Selecting Donates for profile: {profile.Id}/{profile.CharacterName}"); //тест БД var donates = profile.Donate.Select(t => t.DonateName); // Lost Paradise Donate Preferences #endif @@ -317,7 +317,7 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl ); #if LPP_Sponsors - Logger.Error($"Converting profile: {profile.Id}/{profile.CharacterName}"); //тест БД + Logger.Warning($"Converting profile: {profile.Id}/{profile.CharacterName}"); //тест БД profile.Donate.Clear(); // Lost Paradise Donate Preferences profile.Donate.AddRange( humanoid.DonatePreferences From d05c9570e3d837f60d5219246c1b06a1f8675db0 Mon Sep 17 00:00:00 2001 From: Evgencheg <73418250+Evgencheg@users.noreply.github.com> Date: Tue, 24 Sep 2024 01:12:13 +0300 Subject: [PATCH 8/8] =?UTF-8?q?Revert=20"=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=BB=D0=BE=D0=B1=D0=B1=D0=B8=20?= =?UTF-8?q?=D0=A2=D0=A2=D0=A1"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Client/Corvax/TTS/TTSSystem.cs | 2 +- Content.Server/Database/ServerDbBase.cs | 34 +++++++++++-------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/Content.Client/Corvax/TTS/TTSSystem.cs b/Content.Client/Corvax/TTS/TTSSystem.cs index 762ff09c8a..609fc8fde2 100644 --- a/Content.Client/Corvax/TTS/TTSSystem.cs +++ b/Content.Client/Corvax/TTS/TTSSystem.cs @@ -112,7 +112,7 @@ private void OnPlayTTS(PlayTTSEvent ev) } else { - _audio.PlayGlobal(soundPath, Filter.Local(), false); + //_audio.PlayGlobal(soundPath, Filter.Local(), false); // поскольку источника нет/не видно, то пусть молчит } _contentRoot.RemoveFile(filePath); diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs index 51d5f0e711..69c6e277ff 100644 --- a/Content.Server/Database/ServerDbBase.cs +++ b/Content.Server/Database/ServerDbBase.cs @@ -34,7 +34,7 @@ public ServerDbBase(ISawmill opsLog) public async Task GetPlayerPreferencesAsync(NetUserId userId) { await using var db = await GetDb(); - _opsLog.Warning($"Get preferences for profile: {userId}"); //тест БД + var prefs = await db.DbContext .Preference .Include(p => p.Profiles).ThenInclude(h => h.Jobs) @@ -86,8 +86,6 @@ public async Task SaveCharacterSlotAsync(NetUserId userId, ICharacterProfile? pr throw new NotImplementedException(); } - _opsLog.Warning($"Saving Character Slot: {userId}/{profile.Name}"); //тест БД - var oldProfile = db.DbContext.Profile .Include(p => p.Preference) .Where(p => p.Preference.UserId == userId.UserId) @@ -147,7 +145,7 @@ public async Task InitPrefsAsync(NetUserId userId, ICharacter await db.DbContext.SaveChangesAsync(); - return new PlayerPreferences(new[] { new KeyValuePair(0, defaultProfile) }, 0, Color.FromHex(prefs.AdminOOCColor)); + return new PlayerPreferences(new[] {new KeyValuePair(0, defaultProfile)}, 0, Color.FromHex(prefs.AdminOOCColor)); } public async Task DeleteSlotAndSetSelectedIndex(NetUserId userId, int deleteSlot, int newSlot) @@ -186,7 +184,6 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile) var traits = profile.Traits.Select(t => t.TraitName); var loadouts = profile.Loadouts.Select(t => t.LoadoutName); #if LPP_Sponsors - Logger.Warning($"Selecting Donates for profile: {profile.Id}/{profile.CharacterName}"); //тест БД var donates = profile.Donate.Select(t => t.DonateName); // Lost Paradise Donate Preferences #endif @@ -301,23 +298,22 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl profile.Jobs.AddRange( humanoid.JobPriorities .Where(j => j.Value != JobPriority.Never) - .Select(j => new Job { JobName = j.Key, Priority = (DbJobPriority) j.Value }) + .Select(j => new Job {JobName = j.Key, Priority = (DbJobPriority) j.Value}) ); profile.Antags.Clear(); profile.Antags.AddRange( humanoid.AntagPreferences - .Select(a => new Antag { AntagName = a }) + .Select(a => new Antag {AntagName = a}) ); profile.Traits.Clear(); profile.Traits.AddRange( humanoid.TraitPreferences - .Select(t => new Trait { TraitName = t }) + .Select(t => new Trait {TraitName = t}) ); #if LPP_Sponsors - Logger.Warning($"Converting profile: {profile.Id}/{profile.CharacterName}"); //тест БД profile.Donate.Clear(); // Lost Paradise Donate Preferences profile.Donate.AddRange( humanoid.DonatePreferences @@ -328,7 +324,7 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl profile.Loadouts.Clear(); profile.Loadouts.AddRange( humanoid.LoadoutPreferences - .Select(t => new Loadout { LoadoutName = t }) + .Select(t => new Loadout {LoadoutName = t}) ); return profile; @@ -1265,7 +1261,7 @@ ban.Unban is null ban.LastEditedAt, ban.ExpirationTime, ban.Hidden, - new[] { ban.RoleId.Replace(BanManager.JobPrefix, null) }, + new [] { ban.RoleId.Replace(BanManager.JobPrefix, null) }, MakePlayerRecord(unbanningAdmin), ban.Unban?.UnbanTime); } @@ -1429,10 +1425,10 @@ public async Task> GetActiveWatchlists(Guid player) protected async Task> GetActiveWatchlistsImpl(DbGuard db, Guid player) { var entities = await (from watchlist in db.DbContext.AdminWatchlists - where watchlist.PlayerUserId == player && - !watchlist.Deleted && - (watchlist.ExpirationTime == null || DateTime.UtcNow < watchlist.ExpirationTime) - select watchlist) + where watchlist.PlayerUserId == player && + !watchlist.Deleted && + (watchlist.ExpirationTime == null || DateTime.UtcNow < watchlist.ExpirationTime) + select watchlist) .Include(note => note.Round) .ThenInclude(r => r!.Server) .Include(note => note.CreatedBy) @@ -1457,9 +1453,9 @@ public async Task> GetMessages(Guid player) protected async Task> GetMessagesImpl(DbGuard db, Guid player) { var entities = await (from message in db.DbContext.AdminMessages - where message.PlayerUserId == player && !message.Deleted && - (message.ExpirationTime == null || DateTime.UtcNow < message.ExpirationTime) - select message).Include(note => note.Round) + where message.PlayerUserId == player && !message.Deleted && + (message.ExpirationTime == null || DateTime.UtcNow < message.ExpirationTime) + select message).Include(note => note.Round) .ThenInclude(r => r!.Server) .Include(note => note.CreatedBy) .Include(note => note.LastEditedBy) @@ -1538,7 +1534,7 @@ protected async Task> GetGroupedServerRoleBansAsNo // Client side query, as EF can't do groups yet var bansEnumerable = bansQuery - .GroupBy(ban => new { ban.BanTime, CreatedBy = (Player?) ban.CreatedBy, ban.Reason, Unbanned = ban.Unban == null }) + .GroupBy(ban => new { ban.BanTime, CreatedBy = (Player?)ban.CreatedBy, ban.Reason, Unbanned = ban.Unban == null }) .Select(banGroup => banGroup) .ToArray();