From 92999fec6d9025e7622487e5c8d98f2db4a7b067 Mon Sep 17 00:00:00 2001 From: zorgjbe <90790349+zorgjbe@users.noreply.github.com> Date: Tue, 5 Apr 2022 19:40:12 +0200 Subject: [PATCH] Revert "Add minigame-specific success messages when struggling out (#3298)" This reverts commit 157ca97fdf51c81f95c8a6a5c38f0aa3868821e2. --- .../Screens/Character/Player/Dialog_Player.csv | 3 --- BondageClub/Scripts/Struggle.js | 12 ++---------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/BondageClub/Screens/Character/Player/Dialog_Player.csv b/BondageClub/Screens/Character/Player/Dialog_Player.csv index 161d3eb413..b3d6964a16 100644 --- a/BondageClub/Screens/Character/Player/Dialog_Player.csv +++ b/BondageClub/Screens/Character/Player/Dialog_Player.csv @@ -183,11 +183,8 @@ Using25,,,Using 25% of your skill...,, Using0,,,Using none of your skill...,, Impossible,,,Impossible to escape!,, Strength,,,Use brute force,, -StrengthSuccess,,,"SourceCharacter snaps open her PrevAsset.",, Flexibility,,,Try to squeeze out,, -FlexibilitySuccess,,,"SourceCharacter wiggles out of her PrevAsset.",, Dexterity,,,Try to unfasten,, -DexteritySuccess,,,"SourceCharacter unfastens her PrevAsset.",, ChooseStruggleMethod,,,Choose struggling method...,, CanStruggle,,,Struggle to free yourself,, CannotStruggle,,,You'll need help to get out,, diff --git a/BondageClub/Scripts/Struggle.js b/BondageClub/Scripts/Struggle.js index 8475f8f9bd..01a9e3319c 100644 --- a/BondageClub/Scripts/Struggle.js +++ b/BondageClub/Scripts/Struggle.js @@ -184,10 +184,6 @@ function StruggleProgressAutoDraw(C, Offset) { } } -/** - * Struggle minigame helper for checking and performing completion actions - * @param {Character} C - The character to check for progress. - */ function StruggleProgressCheckEnd(C) { // If the operation is completed if (StruggleProgress >= 100) { @@ -198,7 +194,6 @@ function StruggleProgressCheckEnd(C) { // Removes the item & associated items if needed, then wears the new one InventoryRemove(C, C.FocusGroup.Name); if (StruggleProgressNextItem != null) InventoryWear(C, StruggleProgressNextItem.Asset.Name, StruggleProgressNextItem.Asset.Group.Name, (DialogColorSelect == null) ? "Default" : DialogColorSelect, SkillGetWithRatio("Bondage"), Player.MemberNumber); - let action = null; // The player can use another item right away, for another character we jump back to her reaction if (C.ID == 0) { @@ -209,7 +204,6 @@ function StruggleProgressCheckEnd(C) { StruggleProgress = -1; DialogColor = null; } - action = StruggleProgressCurrentMinigame + "Success" } else { if (StruggleProgressNextItem != null) SkillProgress("Bondage", StruggleProgressSkill); if (((StruggleProgressNextItem == null) || !StruggleProgressNextItem.Asset.Extended) && (CurrentScreen != "ChatRoom")) { @@ -221,11 +215,9 @@ function StruggleProgressCheckEnd(C) { // Check to open the extended menu of the item. In a chat room, we publish the result for everyone if ((StruggleProgressNextItem != null) && StruggleProgressNextItem.Asset.Extended) { DialogInventoryBuild(C); - ChatRoomPublishAction(C, StruggleProgressPrevItem, StruggleProgressNextItem, false, action); + ChatRoomPublishAction(C, StruggleProgressPrevItem, StruggleProgressNextItem, false); DialogExtendItem(InventoryGet(C, StruggleProgressNextItem.Asset.Group.Name)); - } else { - ChatRoomPublishAction(C, StruggleProgressPrevItem, StruggleProgressNextItem, true, action); - } + } else ChatRoomPublishAction(C, StruggleProgressPrevItem, StruggleProgressNextItem, true); // Reset the the character's position if (CharacterAppearanceForceUpCharacter == C.MemberNumber) { -- GitLab