Merge pull request #190 from Lost-Paradise-Project/revert-168-master

Revert "Revert "Улучшение системы действий""
Lost-Paradise-Project · Sep 23, 2024 · 9a1e203 · 9a1e203
2 parents c976a31 + 32ecd93
commit 9a1e203
Show file tree

Hide file tree

Showing 15 changed files with 328 additions and 3 deletions.
diff --git a/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/core.ftl b/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/core.ftl
diff --git a/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/help.ftl b/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/help.ftl
diff --git a/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/noop.ftl b/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/noop.ftl
@@ -0,0 +1,52 @@
+interaction-LPPPatShoulder-name = Похлопать по плечу
+interaction-LPPPatShoulder-description = Подбодрите кого-нибудь похлопав его по плечу!
+interaction-LPPPatShoulder-success-self-popup = Вы хлопаете по плечу { THE($target) }.
+interaction-LPPPatShoulder-success-target-popup = Вы чуствуете как { THE($user) } хлопает вам по плечу...
+interaction-LPPPatShoulder-success-others-popup = { THE($user) } хлопает по плечу { THE($target) }.
+interaction-LPPFuckYou-name = Показать средний палец
+interaction-LPPFuckYou-description = Покажите свое желание послать кого-то этим действием.
+interaction-LPPFuckYou-success-self-popup =
+    Вы показываете средний палец { $hasUsed ->
+        [false] { THE($target) }.
+       *[true] держа { $used } { THE($target) }.
+    }
+interaction-LPPFuckYou-success-target-popup =
+    { THE($user) } показывает средний палец { $hasUsed ->
+        [false] вам.
+       *[true] { POSS-PRONOUN($user) } { $used } вам.
+    }
+interaction-LPPFuckYou-success-others-popup =
+    { THE($user) } показывает средний палец { $hasUsed ->
+        [false] { THE($target) }.
+       *[true] { POSS-PRONOUN($user) } { $used } { THE($target) }.
+    }
+interaction-LPPKisscheek-name = Поцеловать в щеку
+interaction-LPPKisscheek-description = Наконец-то вы можете поцеловать кого-то в щеку.
+interaction-LPPKisscheek-success-self-popup = Вы целуете { THE($target) }.
+interaction-LPPKisscheek-success-target-popup = Вы чуствуете как { THE($user) } целует вас в щеку...
+interaction-LPPKisscheek-success-others-popup = { THE($user) } целует в щеку { THE($target) }.
+interaction-LPPKiss-name = Поцеловать
+interaction-LPPKiss-description = Наконец-то вы можете поцеловать кого-то.
+interaction-LPPKiss-success-self-popup = Вы целуете { THE($target) }.
+interaction-LPPKiss-success-target-popup = Вы чуствуете как { THE($user) } целует вас...
+interaction-LPPKiss-success-others-popup = { THE($user) } целует { THE($target) }.
+interaction-LPPTickle-name = Щекотать
+interaction-LPPTickle-description = Пощекотайте кого-то.
+interaction-LPPTickle-success-self-popup = Вы щекочите { THE($target) }.
+interaction-LPPTickle-success-target-popup = { THE($user) } щекочет вас.
+interaction-LPPTickle-success-others-popup = { THE($user) } щекочет { THE($target) }.
+interaction-LPPSlap-name = Пощёчина
+interaction-LPPSlap-description = Как насчет оставить след на чужой щеке?
+interaction-LPPSlap-success-self-popup = Вы наносите пощёчину { THE($target) }.
+interaction-LPPSlap-success-target-popup = { THE($user) } наносит вам пощёчину.
+interaction-LPPSlap-success-others-popup = { THE($user) } наносит пощёчину { THE($target) }.
+interaction-LPPSlap2-name = Шлёпнуть
+interaction-LPPSlap2-description = Так прекрасно, хочу шлепнуть!
+interaction-LPPSlap2-success-self-popup = Вы наносите шлепок { THE($target) }.
+interaction-LPPSlap2-success-target-popup = { THE($user) } наносит вам легкий шлепок.
+interaction-LPPSlap2-success-others-popup = { THE($user) } наносит легкий шлепок { THE($target) }.
+interaction-LPPLick-name = Лизнуть
+interaction-LPPLick-description = Фрьх~...
+interaction-LPPLick-success-self-popup = Вы лизнули { THE($target) }.
+interaction-LPPLick-success-target-popup = { THE($user) } лизнул вас.
+interaction-LPPLick-success-others-popup = { THE($user) } лизнул { THE($target) }.
diff --git a/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/self.ftl b/Resources/Locale/ru-RU/_LostParadise/interaction/verbs/self.ftl
@@ -0,0 +1,11 @@
+interaction-LPPMakeSleepIPC-name = Гибернация
+interaction-LPPMakeSleepIPC-description = Перейти в режим "Гибернации"
+interaction-LPPMakeSleepIPC-fail-self-popup = Ты не можешь сейчас перейти в гибернацию
+interaction-LPPMakeSleepIPC-success-self-popup = Твоя система наконецто погружаешся в гибернацию.
+interaction-LPPMakeSleepIPC-success-others-popup = { THE($user) } переходит в состояние гибернации.
+# Действие между собой/другим
+interaction-LPPCheckStatusSilicon-name = Диагностика
+interaction-LPPCheckStatusSilicon-description = Выполните диагностику своей системы.
+interaction-LPPCheckStatusSilicon-fail-self-popup = Ты не можешь провести диагностику системы { THE($user) }!
+interaction-LPPCheckStatusSilicon-success-self-popup = Ты успешно провёл диагностику системы { THE ($target) }.
+interaction-LPPCheckStatusSilicon-success-others-popup = { THE($user) } проводит диагностику системы { THE($target) }.
diff --git a/Resources/Locale/ru-RU/_LostParadise/mood/mood.ftl b/Resources/Locale/ru-RU/_LostParadise/mood/mood.ftl
@@ -0,0 +1,5 @@
+mood-effect-LPPEncouraged = Я чувствую себя ободренным(-ой), это приятно!
+mood-effect-LPPLoved = я чувствую себя любимым(-ой)... Так чудесно
+mood-effect-LPPSlapped = Наконец-то я смог(-ла) показать ему/ей свои чувства, я ударил(-а) его по лицу, мне легче...
+mood-effect-LPPGotSlap = Ай.. Получить пощечину от кого-то это крайне обидно!
+modd-effect-LPPEmbarrassment = Я чувствую себя из-за своих или чужих действий легкое смущение...
diff --git a/Resources/Locale/ru-RU/interaction/verbs/core.ftl b/Resources/Locale/ru-RU/interaction/verbs/core.ftl
@@ -1,5 +1,5 @@
 interaction-verb-invalid = Некоторые требования к этому действию не соблюдены. Вы не можете использовать его прямо сейчас.
-interaction-verb-cooldown = Этот слово находится в режиме "Кулдауна". Подождите{ TOSTRING($seconds, "F1") } секунд.
+interaction-verb-cooldown = Этот слово находится в режиме "Кулдауна". Подождите: { TOSTRING($seconds, "F1") } секунд.
 interaction-verb-too-strong = Вы слишком сильны чтобы взаимодействовать.
 interaction-verb-too-weak = Вы слишком слабы чтобы взаимодействовать.
 interaction-verb-invalid-target = Вы не можете взаимодействовать с этим/ним.

diff --git a/Resources/Prototypes/Interactions/help_interactions.yml b/Resources/Prototypes/Interactions/help_interactions.yml
@@ -17,6 +17,7 @@
 - type: Interaction
   id: HelpUp
   parent: [BaseHelp, BaseGlobal]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood6.png # < Tweak MrDarkSide >
   delay: 1.5
   cooldown: 0.5
   hideByRequirement: true
@@ -42,6 +43,7 @@
 - type: Interaction
   id: ForceDown
   parent: [BaseHelp, BaseGlobal]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood4.png # < Tweak MrDarkSide >
   delay: 4.5
   hideByRequirement: true
   requirement:
@@ -54,6 +56,7 @@
 - type: Interaction
   id: MakeSleepOther
   parent: [BaseHelp, BaseGlobal]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood4.png # < Tweak MrDarkSide >
   priority: -6
   delay: 10 # Should be long enough to be non-abusable, right?
   hideByRequirement: true
@@ -73,6 +76,7 @@
 - type: Interaction
   id: ShakeOther
   parent: [BaseHelp, BaseGlobal]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood5.png # < Tweak MrDarkSide >
   priority: -5
   delay: 0.8
   cooldown: 10 # Slightly abusable

diff --git a/Resources/Prototypes/Interactions/mood_interactions.yml b/Resources/Prototypes/Interactions/mood_interactions.yml
@@ -3,7 +3,7 @@
   id: Hug
   parent: [BaseGlobal, BaseHands]
   priority: 2
-  #icon: /Textures/Interface/Actions/hug.png
+  icon: /Textures/Interface/Alerts/mood.rsi/mood6.png # < Tweak MrDarkSide >
   delay: 0.7
   range: {max: 1}
   hideByRequirement: true
@@ -20,7 +20,7 @@
   id: Pet
   parent: [BaseGlobal, BaseHands]
   priority: 1
-  #icon: /Textures/Interface/Actions/hug.png
+  icon: /Textures/Interface/Alerts/mood.rsi/mood6.png # < Tweak MrDarkSide >
   delay: 0.4
   range: {max: 1}
   hideByRequirement: true
@@ -40,6 +40,7 @@
 - type: Interaction
   id: PetAnimal
   parent: Pet
+  icon: /Textures/Interface/Alerts/mood.rsi/mood6.png # < Tweak MrDarkSide >
   requirement:
     !type:ComplexRequirement
     requirements:

diff --git a/Resources/Prototypes/Interactions/noop_interactions.yml b/Resources/Prototypes/Interactions/noop_interactions.yml
@@ -18,6 +18,7 @@
 - type: Interaction
   id: WaveAt
   parent: [BaseHands, BaseGlobal]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood5.png # < Tweak MrDarkSide >
   priority: 3
   requiresCanInteract: false
   contactInteraction: false
@@ -36,6 +37,7 @@
 # Knocking on the target - windows, doors, etc.
 - type: Interaction
   id: KnockOn
+  icon: /Textures/Interface/Alerts/mood.rsi/mood5.png # < Tweak MrDarkSide >
   parent: BaseHands
   priority: 20
   effectSuccess:
@@ -48,6 +50,7 @@
 - type: Interaction
   id: Rattle
   parent: BaseHands
+  icon: /Textures/Interface/Alerts/mood.rsi/mood5.png # < Tweak MrDarkSide >
   priority: 20
   effectSuccess:
     popup: VisibleNoChat

diff --git a/Resources/Prototypes/Interactions/self_interactions.yml b/Resources/Prototypes/Interactions/self_interactions.yml
@@ -16,6 +16,7 @@
 - type: Interaction
   id: PinchSelf
   parent: SelfInteractionBase
+  icon: /Textures/Interface/Alerts/mood.rsi/mood4.png # < Tweak MrDarkSide >
   delay: 1
   action:
     !type:ComplexAction
@@ -35,6 +36,7 @@
 # Sleeping on the floor is real
 - type: Interaction
   id: MakeSleepSelf
+  icon: /Textures/Interface/Alerts/mood.rsi/mood5.png # < Tweak MrDarkSide >
   parent: [SelfInteractionBase, MakeSleepOther]
   delay: 4.5
   requirement:

diff --git a/Resources/Prototypes/_LostParadise/Interactions/Popups/interaction_popups.yml b/Resources/Prototypes/_LostParadise/Interactions/Popups/interaction_popups.yml
@@ -0,0 +1 @@
+
diff --git a/Resources/Prototypes/_LostParadise/Interactions/interactions.yml b/Resources/Prototypes/_LostParadise/Interactions/interactions.yml
@@ -0,0 +1,204 @@
+# MrDarkSide - Lost Paradise
+# <
+
+# С КЕМ-ТО / ЧЕМ-ТО
+- type: Interaction
+  id: LPPKiss # Поцелуй
+  parent: [BaseGlobal, BaseHands]
+  priority: 2
+  icon: /Textures/Interface/Alerts/mood.rsi/mood7.png
+  delay: 0.5
+  range: {max: 1}
+  hideByRequirement: true
+  requirement:
+    !type:MobStateRequirement
+    inverted: true
+  action:
+    !type:MoodAction
+    effect: LPPLoved
+
+- type: Interaction
+  id: LPPKisscheek # Поцелуй в щеку
+  parent: [BaseGlobal, BaseHands]
+  priority: 2
+  icon: /Textures/Interface/Alerts/mood.rsi/mood6.png
+  delay: 0.5
+  range: {max: 1}
+  hideByRequirement: true
+  requirement:
+    !type:MobStateRequirement
+    inverted: true
+  action:
+    !type:ComplexAction
+    actions:
+    - !type:MoodAction
+      effect: LPPLoved
+    - !type:OnUserAction
+      action:
+        !type:MoodAction
+        effect: LPPLoved
+
+- type: Interaction
+  id: LPPPatShoulder # Похлопать по плечу
+  parent: [BaseGlobal, BaseHands]
+  priority: 2
+  icon: /Textures/Interface/Alerts/mood.rsi/mood6.png
+  delay: 0.7
+  cooldown: 5
+  range: {max: 1}
+  hideByRequirement: true
+  requirement:
+    !type:MobStateRequirement
+    inverted: true
+  effectSuccess:
+    popup: VisibleNoChat
+    sound: {collection: Claps}
+  action:
+    !type:OnUserAction
+    action:
+      !type:MoodAction
+      effect: LPPEncouraged
+
+- type: Interaction
+  id: LPPLick # Лизнуть
+  parent: [BaseGlobal, BaseHands]
+  priority: 2
+  icon: /Textures/Interface/Alerts/mood.rsi/mood6.png
+  delay: 0.2
+  cooldown: 5
+  range: {max: 1}
+  hideByRequirement: true
+  requirement:
+    !type:ComplexRequirement
+    requirements:
+    - !type:MobStateRequirement
+      inverted: true
+    # - !type:EntityWhitelistRequirement
+    #   blacklist:
+    #     components: [Silicon, BorgChassis]
+  effectSuccess:
+    popup: Visible
+    sound: {path: /Audio/Nyanotrasen/Voice/Felinid/cat_hiss1.ogg}
+  action:
+    !type:ComplexAction
+    actions:
+    - !type:MoodAction
+      effect: LPPEmbarrassment
+    - !type:OnUserAction
+      action:
+        !type:MoodAction
+        effect: LPPEmbarrassment
+
+- type: Interaction
+  id: LPPSlap
+  parent: [BaseGlobal, BaseHands]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood4.png
+  delay: 0.2
+  cooldown: 10
+  hideByRequirement: true
+  requirement:
+    !type:MobStateRequirement
+    inverted: true
+  effectSuccess:
+    popup: Dangerous
+    sound: {path: /Audio/_LostParadise/Effects/whip.ogg}
+  action:
+    !type:ComplexAction
+    actions:
+    - !type:ModifyHealthAction
+      damage:
+        types: {Blunt: 3}
+    - !type:ConditionalAction
+      condition:
+        !type:ChanceRequirement
+        chance: 0.5
+      true:
+        !type:ModifyHealthAction
+        damage:
+          types: {Blunt: 5.5}
+    - !type:MoodAction
+      effect: LPPSlapped
+    - !type:OnUserAction
+      action:
+        !type:MoodAction
+        effect: LPPGotSlap
+
+- type: Interaction
+  id: LPPSlap2 # Шлёпнуть
+  parent: [BaseGlobal, BaseHands]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood5.png
+  delay: 0.2
+  cooldown: 5
+  hideByRequirement: true
+  requirement:
+    !type:MobStateRequirement
+    inverted: true
+  effectSuccess:
+    popup: Visible
+    sound: {path: /Audio/_LostParadise/Effects/whip.ogg}
+  action:
+    !type:ComplexAction
+    actions:
+    - !type:MoodAction
+      effect: LPPEmbarrassment
+    - !type:OnUserAction
+      action:
+        !type:MoodAction
+        effect: LPPEmbarrassment
+
+- type: Interaction
+  id: LPPFuckYou # Показать кому-то средний палец
+  parent: [BaseHands, BaseGlobal]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood4.png
+  priority: -2
+  requiresCanInteract: false
+  contactInteraction: false
+  range: {max: 20}
+  hideByRequirement: true
+  requirement:
+    !type:MobStateRequirement
+    inverted: true
+  action:
+    !type:NoOpAction
+
+- type: Interaction
+  id: LPPTickle # Щекотать
+  parent: [BaseHands, BaseGlobal]
+  icon: /Textures/Interface/Alerts/mood.rsi/mood5.png
+  priority: 3
+  requiresCanInteract: false
+  contactInteraction: false
+  range: {max: 1}
+  hideByRequirement: true
+  requirement:
+    !type:MobStateRequirement
+    inverted: true
+  effectSuccess:
+    popup: VisibleNoChat
+  action:
+    !type:NoOpAction
+
+# С СОБОЙ
+
+- type: Interaction
+  id: LPPCheckStatusSilicon # Проверка своего состояния / Состояние другого синтетика
+  parent: SelfInteractionBase
+  icon: /Textures/Interface/Actions/malfunction.png # Иконка для синтетиков  
+  priority: -6
+  delay: 1.2
+  cooldown: 30
+  effectSuccess:
+    popup: Visible
+    sound: {path: /Audio/Effects/poster_being_set.ogg}
+    soundPerceivedByOthers: true
+  hideByRequirement: true
+  requirement:
+    !type:ComplexRequirement
+    requirements:
+    - !type:EntityWhitelistRequirement
+      whitelist:
+        components: [Silicon, BorgChassis]
+  action:
+    !type:NoOpAction
+
+# >
diff --git a/Resources/Prototypes/_LostParadise/Mood/genericNegativeEffects.yml b/Resources/Prototypes/_LostParadise/Mood/genericNegativeEffects.yml
@@ -0,0 +1,10 @@
+# Made DarkSide <
+# Негативные эффекты настроения
+
+
+- type: moodEffect
+  id: LPPGotSlap
+  moodChange: -3
+  timeout: 180
+
+# >