Merge remote-tracking branch 'origin/master'

Content.Client/Humanoid/MarkingPicker.xaml.cs

@@ -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

Content.Client/Humanoid/SingleMarkingPicker.xaml.cs

@@ -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

Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs

@@ -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();
         }

Resources/Changelog/ChangelogLPP.yml

@@ -69,3 +69,31 @@ Entries:
   id: 8
   time: '2024-09-03T19:18:56.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/60
+- author: MegaDaimond
+  changes:
+    - type: Add
+      message: Добавлены спрайты ко многим скафандрам и их шлемам под расы
+    - type: Add
+      message: Банданы теперь нормально смотрятся на мордах других рас
+    - type: Add
+      message: Больше кастома для НПЗ (На будущие обновления)
+    - type: Tweak
+      message: Изменены характеристики скафандра детектива
+    - type: Fix
+      message: Исправлены meta для некоторых шлемов скафандров
+  id: 9
+  time: '2024-09-04T11:55:47.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/61
+- author: SpicyDarkFox
+  changes:
+    - type: Add
+      message: Разделение маркингов по уровням спонсорки
+    - type: Tweak
+      message: >-
+        У людей изменены очки внешности: по 1 на уши и хвост, и по 4 на руки и
+        ноги вместо 6
+    - type: Fix
+      message: Исправлены кнопки в редакторе персонажа, снимающие одежду
+  id: 10
+  time: '2024-09-04T15:33:10.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/62

Resources/Locale/ru-RU/_LostParadise/SponsorMarkingsTier.ftl

@@ -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};

Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/cloaks.yml

@@ -214,4 +214,13 @@
   description: Kore yon deru hito wa bakadayo.
   components:
     - type: Sprite
-      sprite: _LostParadise/Clothing/Neck/Cloaks/Monorich.rsi
+      sprite: _LostParadise/Clothing/Neck/Cloaks/Monorich.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: LPPCloakMantleNPZ
+  name: накидка НПЗ
+  description: Мы торопимся или действуем скрытно?
+  components:
+    - type: Sprite
+      sprite: _LostParadise/Clothing/Neck/NPZ/NPZmantle.rsi

Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml

@@ -133,3 +133,30 @@
   - type: Clothing
     sprite: _LostParadise/Clothing/Neck/shemags/purpleup.rsi
 
+- type: entity
+  parent: ClothingNeckBase
+  id: LPPClothingNeckShemagNPZ
+  name: урбан шемаг
+  description: тёплая шёлковая ткань, защищающая от пыли и холода, а так же придающая брутальности и тактикульности носителю. Теперь в цветах НПЗ!
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Neck/shemags/NPZdown.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Neck/shemags/NPZdown.rsi
+  - type: ToggleableClothing
+    clothingPrototype: LPPClothingMaskShemagNPZ
+    requiredSlot:
+    - neck
+    slot: mask
+
+- type: entity
+  parent: ClothingMaskBase
+  id: LPPClothingMaskShemagNPZ
+  noSpawn: true
+  name: урбан шемаг
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Neck/shemags/NPZup.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Neck/shemags/NPZup.rsi
+

Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/detectivehardsuit.yml

@@ -18,11 +18,11 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.95
-        Slash: 0.95
-        Piercing: 0.8
+        Blunt: 0.8
+        Slash: 0.8
+        Piercing: 0.65
         Caustic: 0.7
-        Heat: 0.85
+        Heat: 0.8
   - type: ClothingSpeedModifier
     walkModifier: 0.95
     sprintModifier: 0.90

Resources/Prototypes/_LostParadise/Entities/Clothing/Shoes/magboots.yml

@@ -72,3 +72,27 @@
     - HighRiskItem
   - type: StaticPrice
     price: 450
+
+- type: entity
+  parent: ClothingShoesBootsMag
+  id: LPPClothingShoesBootsMagNPZ
+  name: магитные сапоги НПЗ
+  description: Стандартизированные магнитные сапоги от военно-исследовательских сил Независимого Правительства Земли.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Shoes/Boots/NPZmagboots.rsi
+    state: icon
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Shoes/Boots/NPZmagboots.rsi
+  - type: Magboots
+    toggleAction: ActionToggleMagbootsAdvanced
+  - type: ClothingSpeedModifier
+    walkModifier: 0.95
+    sprintModifier: 0.95
+    enabled: false
+  - type: NoSlip
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+  - type: StaticPrice
+    price: 450

Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -218,3 +218,60 @@
     startingCharge: 4000
   - type: Item
     size: Large
+
+- type: entity
+  name: гибридный модуль S.O.L.E.I.L.
+  parent: BaseWeaponBatterySmall
+  id: LPPWeaponEnergyGunSoleil
+  description: Прототип гибридного лазерного "пистолета", представляющего из себя устройство, что цепляется на локоть, имеет летальный и нелетальный режимы стрельбы.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mode-disabler
+      shader: unshaded
+      map: [ "Firemode" ]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Clothing
+    sprite: _LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi
+  - type: Gun
+    soundGunshot:
+      path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg
+    soundEmpty:
+      path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg
+  - type: Battery
+    maxCharge: 750
+    startingCharge: 750
+  - type: ProjectileBatteryAmmoProvider
+    proto: BulletDisabler
+    fireCost: 50
+  - type: EnergyGun
+    fireModes:
+    - proto: BulletDisabler
+      fireCost: 50
+      name: disable
+      state: disabler
+    - proto: BulletEnergyGunLaser
+      fireCost: 75
+      name: lethal
+      state: lethal
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.EnergyGunFireModeVisuals.State:
+        Firemode:
+          Disabler: { state: mode-disabler }
+          Lethal: { state: mode-lethal }
+  - type: Tag
+    tags:
+    - Sidearm
+  - type: StaticPrice
+    price: 750

Resources/Textures/Clothing/Head/Bandanas/black.rsi/meta.json

@@ -36,6 +36,22 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-MASK-shark",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-tajaran",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-vulpkanin",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-reptilian",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Clothing/Head/Bandanas/blue.rsi/meta.json

@@ -36,6 +36,22 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-MASK-shark",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-tajaran",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-vulpkanin",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-reptilian",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Clothing/Head/Bandanas/botany.rsi/meta.json

@@ -36,6 +36,22 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-MASK-shark",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-tajaran",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-vulpkanin",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-reptilian",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json

@@ -28,6 +28,22 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-MASK-shark",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-tajaran",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-reptilian",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-vulpkanin",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Clothing/Head/Bandanas/gold.rsi/meta.json

@@ -36,6 +36,22 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-MASK-shark",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-tajaran",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-vulpkanin",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-reptilian",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Clothing/Head/Bandanas/green.rsi/meta.json

@@ -18,11 +18,11 @@
       "directions": 4
     },
     {
-      "name": "equipped-MASK",
+      "name": "equipped-HELMET-vox",
       "directions": 4
     },
     {
-      "name": "equipped-HELMET-vox",
+      "name": "equipped-MASK",
       "directions": 4
     },
     {
@@ -36,6 +36,22 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-MASK-shark",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-tajaran",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-vulpkanin",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-reptilian",
+      "directions": 4
     }
   ]
 }