some changes

space-sunrise · Jun 25, 2024 · 6ba8dbf · 6ba8dbf
1 parent 3155e02
commit 6ba8dbf
Show file tree

Hide file tree

Showing 23 changed files with 186 additions and 65 deletions.
diff --git a/Content.Client/_Sunrise/ERP/InteractionEui.cs b/Content.Client/_Sunrise/ERP/InteractionEui.cs
@@ -58,7 +58,7 @@ public void RequestLove()
         {
             if (!_player.LocalEntity.HasValue) return;
             if (!_window.TargetEntityId.HasValue) return;
-            SendMessage(new AddLoveMessage(_entManager.GetNetEntity(_player.LocalEntity.Value), _window.TargetEntityId.Value, 0));
+            SendMessage(new AddLoveMessage(_entManager.GetNetEntity(_player.LocalEntity.Value), _window.TargetEntityId.Value, 0, 0));
         }
 
         public void RequestState()
@@ -119,7 +119,7 @@ public void OnItemSelect(ItemList.ItemListSelectedEventArgs args)
                     _audio.PlayPvs(_random.Pick(interaction.Sounds), _player.LocalEntity.Value);
                 }
                 if (!_window.TargetEntityId.HasValue) return;
-                SendMessage(new AddLoveMessage(_entManager.GetNetEntity(_player.LocalEntity.Value), _window.TargetEntityId.Value, interaction.LovePercent));
+                SendMessage(new AddLoveMessage(_entManager.GetNetEntity(_player.LocalEntity.Value), _window.TargetEntityId.Value, interaction.LovePercentUser, interaction.LovePercentTarget));
                 _window.TimeUntilAllow = _gameTiming.CurTime + TimeSpan.FromSeconds(2);
             }
         }

diff --git a/Content.Client/_Sunrise/ERP/InteractionWindow.xaml.cs b/Content.Client/_Sunrise/ERP/InteractionWindow.xaml.cs
@@ -98,14 +98,22 @@ public void Populate()
             UserDescription.AddChild(new Label { Text = "Вы..." });
             if (UserHasClothing) UserDescription.AddChild(new Label { Text = "...Обладаете одеждой" });
             else UserDescription.AddChild(new Label { Text = "...Не обладаете одеждой" });
+            UserDescription.AddChild(new Label { Text = "...Обладаете анусом" });
             if (UserSex.Value == Sex.Male) UserDescription.AddChild(new Label { Text = "...Обладаете пенисом" });
-            else if (UserSex.Value == Sex.Female) UserDescription.AddChild(new Label { Text = "...Обладаете вагиной" });
+            if (UserSex.Value == Sex.Female) UserDescription.AddChild(new Label { Text = "...Обладаете вагиной" });
+            if (UserSex.Value == Sex.Female) UserDescription.AddChild(new Label { Text = "...Обладаете грудью" });
             //Таргет
             TargetDescription.AddChild(new Label { Text = Identity.Name(_eui._entManager.GetEntity(TargetEntityId.Value), _eui._entManager, _player.LocalEntity.Value) + "..." });
             if (TargetHasClothing) TargetDescription.AddChild(new Label { Text = "...Обладает одеждой" });
-            else TargetDescription.AddChild(new Label { Text = "...Не обладает одеждой" });
-            if (TargetSex.Value == Sex.Male) TargetDescription.AddChild(new Label { Text = "...Обладает пенисом" });
-            else if (TargetSex.Value == Sex.Female) TargetDescription.AddChild(new Label { Text = "...Обладает вагиной" });
+            else
+            {
+                TargetDescription.AddChild(new Label { Text = "...Не обладает одеждой" });
+                TargetDescription.AddChild(new Label { Text = "...Обладает анусом" });
+                if (TargetSex.Value == Sex.Male) TargetDescription.AddChild(new Label { Text = "...Обладает пенисом" });
+                if (TargetSex.Value == Sex.Female) TargetDescription.AddChild(new Label { Text = "...Обладает вагиной" });
+            }
+            if (TargetSex.Value == Sex.Female) TargetDescription.AddChild(new Label { Text = "...Обладает грудью" });
+
         }
         else
         {

diff --git a/Content.Server/_Sunrise/ERP/Systems/InteractionEui.cs b/Content.Server/_Sunrise/ERP/Systems/InteractionEui.cs
@@ -44,7 +44,7 @@ public override void HandleMessage(EuiMessageBase msg)
             switch (msg)
             {
                 case AddLoveMessage req:
-                    _interaction.AddLove(req.User, req.Target, req.Percent);
+                    _interaction.AddLove(req.User, req.Target, req.PercentUser, req.PercentTarget);
                     if(_entManager.TryGetComponent<InteractionComponent>(_entManager.GetEntity(req.User), out var usComp))
                     {
                         SendMessage(new ResponseLoveMessage(usComp.Love));

diff --git a/Content.Server/_Sunrise/ERP/Systems/InteractionSystem.cs b/Content.Server/_Sunrise/ERP/Systems/InteractionSystem.cs
@@ -25,7 +25,7 @@ public override void Initialize()
         {
             base.Initialize();
             SubscribeLocalEvent<InteractionComponent, ComponentInit>(OnComponentInit);
-            SubscribeLocalEvent<GetVerbsEvent<Verb>>(AddVerbs);
+            SubscribeLocalEvent<InteractionComponent, GetVerbsEvent<Verb>>(AddVerbs);
         }
 
         public (Sex, bool, Sex, bool, bool)? RequestMenu(EntityUid User, EntityUid Target)
@@ -55,36 +55,70 @@ public override void Initialize()
             return null;
         }
 
-        public void AddLove(NetEntity entity, NetEntity target, int percent)
+        public void AddLove(NetEntity entity, NetEntity target, int percentUser, int percentTarget)
         {
-            List<EntityUid> ents = new();
-            ents.Add(GetEntity(entity));
-            ents.Add(GetEntity(target));
-            foreach (var ent in ents)
+            var User = GetEntity(entity);
+            var Target = GetEntity(target);
+            if (!TryComp<InteractionComponent>(User, out var compUser)) return;
+            if (!TryComp<InteractionComponent>(Target, out var compTarget)) return;
+
+            if (percentUser != 0)
+            {
+                if (_gameTiming.CurTime > compUser.LoveDelay)
+                {
+                    compUser.ActualLove += (percentUser + _random.Next(-percentUser / 2, percentUser / 2)) / 100f;
+                    compUser.TimeFromLastErp = _gameTiming.CurTime;
+                }
+                Spawn("EffectHearts", Transform(User).Coordinates);
+                if(_random.Prob(0.1f))
+                {
+                    _chat.TryEmoteWithChat(User, "Moan", ChatTransmitRange.Normal);
+                }
+            }
+            if (compUser.Love >= 1)
             {
-                if (!TryComp<HumanoidAppearanceComponent>(ent, out var humanoid)) continue;
-                if (TryComp<InteractionComponent>(ent, out var comp))
+                compUser.ActualLove = 0;
+                compUser.Love = 0.95f;
+                compUser.LoveDelay = _gameTiming.CurTime + TimeSpan.FromMinutes(1);
+                _chat.TrySendInGameICMessage(User, "кончает!", InGameICChatType.Emote, false);
+                if(TryComp<HumanoidAppearanceComponent>(User, out var humuser))
                 {
-                    if (percent != 0)
+                    if(humuser.Sex == Sex.Male)
                     {
-                        if (_gameTiming.CurTime > comp.LoveDelay && humanoid.Sex == Sex.Male)
-                        {
-                            comp.ActualLove += (percent + _random.Next(-percent / 2, percent / 2)) / 100f;
-                            comp.TimeFromLastErp = _gameTiming.CurTime;
-                        }
-                        Spawn("EffectHearts", Transform(ent).Coordinates);
+                        Spawn("PuddleSemen", Transform(User).Coordinates);
                     }
-                    if (comp.Love >= 1 && humanoid.Sex == Sex.Male)
+                } 
+            }
+
+            if (percentTarget != 0)
+            {
+                if (_gameTiming.CurTime > compTarget.LoveDelay)
+                {
+                    compTarget.ActualLove += (percentTarget + _random.Next(-percentTarget / 2, percentTarget / 2)) / 100f;
+                    compTarget.TimeFromLastErp = _gameTiming.CurTime;
+                }
+                Spawn("EffectHearts", Transform(Target).Coordinates);
+                if (_random.Prob(0.1f))
+                {
+                    _chat.TryEmoteWithChat(User, "Moan", ChatTransmitRange.Normal);
+                }
+            }
+            if (compTarget.Love >= 1)
+            {
+                compTarget.ActualLove = 0;
+                compTarget.Love = 0.95f;
+                compTarget.LoveDelay = _gameTiming.CurTime + TimeSpan.FromMinutes(1);
+                _chat.TrySendInGameICMessage(Target, "кончает!", InGameICChatType.Emote, false);
+                if (TryComp<HumanoidAppearanceComponent>(Target, out var taruser))
+                {
+                    if (taruser.Sex == Sex.Male)
                     {
-                        comp.ActualLove = 0;
-                        comp.Love = 0.95f;
-                        comp.LoveDelay = _gameTiming.CurTime + TimeSpan.FromMinutes(1);
-                        _chat.TrySendInGameICMessage(ent, "кончает!", InGameICChatType.Emote, false);
+                        Spawn("PuddleSemen", Transform(Target).Coordinates);
                     }
                 }
             }
         }
-        private void AddVerbs(GetVerbsEvent<Verb> args)
+        private void AddVerbs(EntityUid uid, InteractionComponent comp, GetVerbsEvent<Verb> args)
         {
             if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
                 return;
@@ -98,7 +132,7 @@ private void AddVerbs(GetVerbsEvent<Verb> args)
                 {
                     Priority = -1,
                     Text = "Взаимодействовать с...",
-                    Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/snow.svg.192dpi.png")), //Не знаю, какую иконку вставить
+                    Icon = new SpriteSpecifier.Texture(new("/Textures/_Sunrise/Interface/ERP/heart.png")),
                     Act = () =>
                     {
                         if (!args.CanInteract || !args.CanAccess) return;

diff --git a/Content.Shared/_Sunrise/ERP/InteractionPrototype.cs b/Content.Shared/_Sunrise/ERP/InteractionPrototype.cs
@@ -37,5 +37,6 @@ public sealed partial class InteractionPrototype : IPrototype
 
     [DataField] public bool Erp = false; // Это ЕРП-действие?
 
-    [DataField] public int LovePercent = 0; // Сколько процентов добавлять к шкале "окончания"
+    [DataField] public int LovePercentUser = 0; // Сколько процентов добавлять к шкале "окончания"
+    [DataField] public int LovePercentTarget = 0; // Сколько процентов добавлять к шкале "окончания"
 }
diff --git a/Content.Shared/_Sunrise/ERP/SharedInteractionSystem.cs b/Content.Shared/_Sunrise/ERP/SharedInteractionSystem.cs
@@ -33,13 +33,15 @@ public sealed class AddLoveMessage : EuiMessageBase
     {
         public NetEntity User;
         public NetEntity Target;
-        public int Percent;
+        public int PercentUser;
+        public int PercentTarget;
 
-        public AddLoveMessage(NetEntity user, NetEntity target, int percent)
+        public AddLoveMessage(NetEntity user, NetEntity target, int percentUser, int percentTarget)
         {
             User = user;
             Target = target;
-            Percent = percent;
+            PercentUser = percentUser;
+            PercentTarget = percentTarget;
         }
     }
 

diff --git a/Resources/Audio/_Sunrise/ERP/femston1.ogg b/Resources/Audio/_Sunrise/ERP/femston1.ogg
diff --git a/Resources/Audio/_Sunrise/ERP/femston2.ogg b/Resources/Audio/_Sunrise/ERP/femston2.ogg
diff --git a/Resources/Audio/_Sunrise/ERP/femston3.ogg b/Resources/Audio/_Sunrise/ERP/femston3.ogg
diff --git a/Resources/Audio/_Sunrise/ERP/femston4.ogg b/Resources/Audio/_Sunrise/ERP/femston4.ogg
diff --git a/Resources/Audio/_Sunrise/ERP/kiss1.ogg b/Resources/Audio/_Sunrise/ERP/kiss1.ogg
diff --git a/Resources/Audio/_Sunrise/ERP/kiss2.ogg b/Resources/Audio/_Sunrise/ERP/kiss2.ogg
diff --git a/Resources/Audio/_Sunrise/ERP/kiss3.ogg b/Resources/Audio/_Sunrise/ERP/kiss3.ogg
diff --git a/Resources/Audio/_Sunrise/ERP/kiss4.ogg b/Resources/Audio/_Sunrise/ERP/kiss4.ogg
diff --git a/Resources/Audio/_Sunrise/ERP/kiss5.ogg b/Resources/Audio/_Sunrise/ERP/kiss5.ogg
diff --git a/Resources/Audio/_Sunrise/ERP/kiss6.ogg b/Resources/Audio/_Sunrise/ERP/kiss6.ogg
diff --git a/Resources/Audio/_Sunrise/ERP/maleston1.ogg b/Resources/Audio/_Sunrise/ERP/maleston1.ogg
diff --git a/Resources/Audio/_Sunrise/ERP/maleston2.ogg b/Resources/Audio/_Sunrise/ERP/maleston2.ogg
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -28,6 +28,8 @@
       collection: BikeHorn
     Sigh:
       collection: MaleSigh
+    Moan:
+      collection: MaleMoan
     Crying:
       collection: MaleCry
     Whistle:
@@ -68,6 +70,8 @@
       collection: CluwneHorn
     Sigh:
       collection: FemaleSigh
+    Moan:
+      collection: FemaleMoan
     Crying:
       collection: FemaleCry
     Whistle:
@@ -152,6 +156,8 @@
       collection: BikeHorn
     Sigh:
       collection: MaleSigh
+    Moan:
+      collection: MaleMoan
     Crying:
       collection: MaleCry
     Whistle:
@@ -194,6 +200,8 @@
       collection: CluwneHorn
     Sigh:
       collection: FemaleSigh
+    Moan:
+      collection: FemaleMoan
     Crying:
       collection: FemaleCry
     Whistle:
@@ -281,6 +289,8 @@
       collection: Snores
     Sigh:
       collection: MaleSigh
+    Moan:
+      collection: MaleMoan
     Honk:
       collection: BikeHorn
     Crying:
@@ -322,6 +332,8 @@
       collection: Snores
     Sigh:
       collection: FemaleSigh
+    Moan:
+      collection: FemaleMoan
     Honk:
       collection: BikeHorn
     Crying:

diff --git a/Resources/Prototypes/_Sunrise/ERP/Interactions/interactions.yml b/Resources/Prototypes/_Sunrise/ERP/Interactions/interactions.yml
@@ -64,7 +64,8 @@
   userWithoutCloth: false
   targetWithoutCloth: false
   erp: true
-  lovePercent: 2
+  lovePercentUser: 0
+  lovePercentTarget: 2
 
 - type: interaction
   id: ERPkiss
@@ -94,7 +95,8 @@
   userWithoutCloth: false
   targetWithoutCloth: false
   erp: true
-  lovePercent: 5
+  lovePercentUser: 5
+  lovePercentTarget: 6
 
 - type: interaction
   id: ERPkiss2
@@ -117,7 +119,8 @@
   userWithoutCloth: false
   targetWithoutCloth: false
   erp: true
-  lovePercent: 4
+  lovePercentUser: 5
+  lovePercentTarget: 6
 
 - type: interaction
   id: ERPbreast1
@@ -137,7 +140,8 @@
   userWithoutCloth: false
   targetWithoutCloth: true
   erp: true
-  lovePercent: 1
+  lovePercentUser: 4
+  lovePercentTarget: 10
 
 - type: interaction
   id: ERPbreast2
@@ -153,7 +157,8 @@
   userWithoutCloth: false
   targetWithoutCloth: true
   erp: true
-  lovePercent: 1
+  lovePercentUser: 5
+  lovePercentTarget: 13
 
 - type: interaction
   id: ERPanusInsert
@@ -175,7 +180,8 @@
   userWithoutCloth: true
   targetWithoutCloth: true
   erp: true
-  lovePercent: 15
+  lovePercentUser: 20
+  lovePercentTarget: 20
 
 - type: interaction
   id: ERPvaginaInsert
@@ -196,7 +202,8 @@
   userWithoutCloth: true
   targetWithoutCloth: true
   erp: true
-  lovePercent: 15
+  lovePercentUser: 20
+  lovePercentTarget: 20
 
 - type: interaction
   id: ERPvaginaLick
@@ -211,7 +218,8 @@
   userWithoutCloth: false
   targetWithoutCloth: true
   erp: true
-  lovePercent: 3
+  lovePercentUser: 4
+  lovePercentTarget: 12
 
 - type: interaction
   id: ERPmasturbate
@@ -232,10 +240,11 @@
   userWithoutCloth: false
   targetWithoutCloth: true
   erp: true
-  lovePercent: 15
+  lovePercentUser: 2
+  lovePercentTarget: 15
 
 - type: interaction
-  id: ERPmasturbateSelfMale
+  id: ERPmasturbateSelf
   name: Мастурбировать себе
   icon: _Sunrise/Interface/ERP/heartIcon.png
   emotes:
@@ -248,29 +257,13 @@
   - path: /Audio/_Sunrise/ERP/hlup2.ogg
   - path: /Audio/_Sunrise/ERP/hlup3.ogg
   - path: /Audio/_Sunrise/ERP/hlup4.ogg
-  userSex: Male
-  targetSex: Unsexed
-  userWithoutCloth: true
-  targetWithoutCloth: false
-  erp: true
-  lovePercent: 15
-
-- type: interaction
-  id: ERPmasturbateSelfFemale
-  name: Мастурбировать себе
-  icon: _Sunrise/Interface/ERP/heartIcon.png
-  emotes:
-  - мастурбирует
-  - мастурбирует, смотря на %target
-  - начинает мастурбировать
-  - начинает мастурбировать, смотря на %target
-  userSex: Female
+  userSex: Unsexed
   targetSex: Unsexed
   userWithoutCloth: true
   targetWithoutCloth: false
   erp: true
-  lovePercent: 0
-
+  lovePercentUser: 15
+  lovePercentTarget: 2
 
 - type: interaction
   id: ERPbruh
@@ -285,19 +278,20 @@
   userWithoutCloth: false
   targetWithoutCloth: true
   erp: true
-  lovePercent: 15
+  lovePercentUser: 3
+  lovePercentTarget: 15
 
 - type: interaction
   id: ERPbruh2
   name: Заставить отсосать
   icon: _Sunrise/Interface/ERP/heartIcon.png
   emotes:
-  - заставляет отсасывать у себя %target
   - заставляет сосать %target
   - заставляет делать минет %target
   userSex: Male
   targetSex: Unsexed
   userWithoutCloth: true
   targetWithoutCloth: false
   erp: true
-  lovePercent: 15
+  lovePercentUser: 15
+  lovePercentTarget: 3