From b3d72df6844422af41a3028568d532b27eb8ebdd Mon Sep 17 00:00:00 2001
From: tetris245 <58624501+tetris245@users.noreply.github.com>
Date: Thu, 12 May 2022 18:06:58 +0200
Subject: [PATCH 1/4] Messages for change of nickname
---
BondageClub/Screens/Character/Title/Title.js | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/BondageClub/Screens/Character/Title/Title.js b/BondageClub/Screens/Character/Title/Title.js
index fd2cf09a42..23c2e95c30 100644
--- a/BondageClub/Screens/Character/Title/Title.js
+++ b/BondageClub/Screens/Character/Title/Title.js
@@ -206,12 +206,19 @@ function TitleClick() {
function TitleExit() {
let Regex = /^[a-zA-Z\s]*$/;
let Nick = ElementValue("InputNickname");
+ var tmpname = Player.Nickname;
if (Nick == null) Nick = "";
Nick = Nick.trim().substring(0, 20);
if (Regex.test(Nick)) {
- Player.Nickname = Nick;
- ServerAccountUpdate.QueueData({ Nickname: Nick });
- ElementRemove("InputNickname");
- CommonSetScreen("Character", "InformationSheet");
+ if (Nick == Player.Name) {
+ ServerSend("ChatRoomChat", { Content: "Beep", Type: "Action", Dictionary: [{Tag: "Beep", Text: ""+tmpname+" is now known as "+Player.Name+"." }]});
+ }
+ if ((Nick != Player.Name) && (Nick != tmpname)) {
+ ServerSend("ChatRoomChat", { Content: "Beep", Type: "Action", Dictionary: [{Tag: "Beep", Text: ""+tmpname+" is now known as "+Nick+"." }]});
+ }
+ Player.Nickname = Nick;
+ ServerAccountUpdate.QueueData({ Nickname: Nick });
+ ElementRemove("InputNickname");
+ CommonSetScreen("Character", "InformationSheet");
}
-}
\ No newline at end of file
+}
--
GitLab
From b5e15f1782fadf0a5a99ab3e39414686a12fcd70 Mon Sep 17 00:00:00 2001
From: tetris245 <58624501+tetris245@users.noreply.github.com>
Date: Thu, 12 May 2022 20:23:10 +0200
Subject: [PATCH 2/4] Improved version
---
BondageClub/Screens/Character/Title/Title.js | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/BondageClub/Screens/Character/Title/Title.js b/BondageClub/Screens/Character/Title/Title.js
index 23c2e95c30..1546b79a6e 100644
--- a/BondageClub/Screens/Character/Title/Title.js
+++ b/BondageClub/Screens/Character/Title/Title.js
@@ -207,14 +207,12 @@ function TitleExit() {
let Regex = /^[a-zA-Z\s]*$/;
let Nick = ElementValue("InputNickname");
var tmpname = Player.Nickname;
+ const dictionary = [{Tag: "OldName", Text: tmpname}, {Tag: "NewName", Text: Nick}];;
if (Nick == null) Nick = "";
Nick = Nick.trim().substring(0, 20);
if (Regex.test(Nick)) {
- if (Nick == Player.Name) {
- ServerSend("ChatRoomChat", { Content: "Beep", Type: "Action", Dictionary: [{Tag: "Beep", Text: ""+tmpname+" is now known as "+Player.Name+"." }]});
- }
- if ((Nick != Player.Name) && (Nick != tmpname)) {
- ServerSend("ChatRoomChat", { Content: "Beep", Type: "Action", Dictionary: [{Tag: "Beep", Text: ""+tmpname+" is now known as "+Nick+"." }]});
+ if (Nick == Player.Name || ((Nick != Player.Name) && (Nick != tmpname)) ) {
+ ChatRoomPublishCustomAction("NicknameChange", false, dictionary);
}
Player.Nickname = Nick;
ServerAccountUpdate.QueueData({ Nickname: Nick });
--
GitLab
From 75940c13eada399c58bda6c10686d251a1015fd9 Mon Sep 17 00:00:00 2001
From: tetris245 <58624501+tetris245@users.noreply.github.com>
Date: Thu, 12 May 2022 20:27:48 +0200
Subject: [PATCH 3/4] Update Dialog_Player.csv
---
BondageClub/Screens/Character/Player/Dialog_Player.csv | 1 +
1 file changed, 1 insertion(+)
diff --git a/BondageClub/Screens/Character/Player/Dialog_Player.csv b/BondageClub/Screens/Character/Player/Dialog_Player.csv
index 45c69dae8e..f13d52ad86 100644
--- a/BondageClub/Screens/Character/Player/Dialog_Player.csv
+++ b/BondageClub/Screens/Character/Player/Dialog_Player.csv
@@ -3216,3 +3216,4 @@ GGTSInteractionPause5Target,,,[GGTS] SourceCharacter program five minutes pause
GGTSInteractionSpeed20Target,,,[GGTS] SourceCharacter program slower pace for TargetCharacter.,,
GGTSInteractionSpeed10Target,,,[GGTS] SourceCharacter program normal pace for TargetCharacter.,,
GGTSInteractionSpeed5Target,,,[GGTS] SourceCharacter program faster pace for TargetCharacter.,,
+NicknameChange,,,OldName is now known as NewName.,,
--
GitLab
From fd8e406da5e8c655bc05842ff94c9eb3390628b0 Mon Sep 17 00:00:00 2001
From: tetris245 <58624501+tetris245@users.noreply.github.com>
Date: Thu, 12 May 2022 21:46:08 +0200
Subject: [PATCH 4/4] Final version (?)
I don't think I need to add Nina suggestion, but maybe I'm wrong. Anyway the condition is now correctly working, and I've removed the spaces to use tabs.
---
BondageClub/Screens/Character/Title/Title.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/BondageClub/Screens/Character/Title/Title.js b/BondageClub/Screens/Character/Title/Title.js
index 1546b79a6e..bb03c1f7fb 100644
--- a/BondageClub/Screens/Character/Title/Title.js
+++ b/BondageClub/Screens/Character/Title/Title.js
@@ -211,12 +211,12 @@ function TitleExit() {
if (Nick == null) Nick = "";
Nick = Nick.trim().substring(0, 20);
if (Regex.test(Nick)) {
- if (Nick == Player.Name || ((Nick != Player.Name) && (Nick != tmpname)) ) {
+ if (Nick != tmpname) {
ChatRoomPublishCustomAction("NicknameChange", false, dictionary);
- }
- Player.Nickname = Nick;
- ServerAccountUpdate.QueueData({ Nickname: Nick });
- ElementRemove("InputNickname");
- CommonSetScreen("Character", "InformationSheet");
+ }
+ Player.Nickname = Nick;
+ ServerAccountUpdate.QueueData({ Nickname: Nick });
+ ElementRemove("InputNickname");
+ CommonSetScreen("Character", "InformationSheet");
}
}
--
GitLab