From 244a4c1db019cea61bc1cddc696e876c884b4947 Mon Sep 17 00:00:00 2001 From: Maou Date: Mon, 12 May 2025 23:38:20 +0100 Subject: [PATCH] Revert "fixed strangler disciplinary and reversed the skill mistake" This reverts commit 32c730a743db6545fa4b5162e40fd3ee00d30444. --- www/data/CommonEvents.json | 20 ++++++++++---------- www/js/plugins/MW_CallEvaluation.js | 18 +++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/www/data/CommonEvents.json b/www/data/CommonEvents.json index 66dad78..4e100c6 100644 --- a/www/data/CommonEvents.json +++ b/www/data/CommonEvents.json @@ -377403,7 +377403,7 @@ "code": 356, "indent": 1, "parameters": [ - "D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16" + "D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16" ] }, { @@ -377557,7 +377557,7 @@ "code": 356, "indent": 2, "parameters": [ - "D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16" + "D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16" ] }, { @@ -377711,7 +377711,7 @@ "code": 356, "indent": 3, "parameters": [ - "D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16" + "D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16" ] }, { @@ -377856,7 +377856,7 @@ "code": 356, "indent": 4, "parameters": [ - "D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16" + "D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16" ] }, { @@ -377985,7 +377985,7 @@ "code": 356, "indent": 5, "parameters": [ - "D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16" + "D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16" ] }, { @@ -378103,7 +378103,7 @@ "code": 356, "indent": 5, "parameters": [ - "D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16" + "D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16" ] }, { @@ -544605,7 +544605,7 @@ "code": 356, "indent": 1, "parameters": [ - "D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16" + "D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16" ] }, { @@ -555124,7 +555124,7 @@ "code": 356, "indent": 1, "parameters": [ - "D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16" + "D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16" ] }, { @@ -558639,7 +558639,7 @@ "code": 356, "indent": 1, "parameters": [ - "D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16" + "D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16" ] }, { @@ -561958,7 +561958,7 @@ "code": 356, "indent": 1, "parameters": [ - "D_TEXT [Current_Public_Morals_Confidence_Vote_Results] 16" + "D_TEXT [Current_Disciplinary_Committee_Confidence_Vote_Results] 16" ] }, { diff --git a/www/js/plugins/MW_CallEvaluation.js b/www/js/plugins/MW_CallEvaluation.js index 1d0b5fb..8c96bcf 100644 --- a/www/js/plugins/MW_CallEvaluation.js +++ b/www/js/plugins/MW_CallEvaluation.js @@ -324,7 +324,7 @@ break; case 4200: nickname = "Zero Sense for Art" - text1 = "Did you see the Public Morals Awareness poster?" + text1 = "Did you see that Disciplinary Awareness poster?" text2 = "Maybe the Committee has no sense for art..." NPC="B_" Emote=2 @@ -352,22 +352,22 @@ break; case 4600: nickname = "Great Art Sense" - text1 = "Those Public Morals posters in the hall, somehow" + text1 = "Those Disciplinary Awareness posters in the hall, somehow" text2 = "they're kind of emo, right?" NPC="B_" Emote=5 break; case 4700: nickname = "Shadow Worker" - text1 = "Since those Public Morals Awareness posters" - text2 = "went up, there's less trash around school." + text1 = "Since those Disciplinary Awareness posters went up," + text2 = "there's less trash around school." NPC="B_" Emote=5 break; case 4800: nickname = "Cute Underwear Committee" - text1 = "The model in the lewd Public Morals Awareness" - text2 = "poster, rumor has it it’s the Committee..." + text1 = "The model in the lewd Disciplinary Awareness poster," + text2 = "rumor has it it’s the Committee..." NPC="C_" Emote=1 break; @@ -380,7 +380,7 @@ break; case 5000: nickname = "Masochistic Anti-Example" - text1 = "That lewd Public Morals Awareness poster," + text1 = "That lewd Disciplinary Awareness poster," text2 = "I wanna hang one up at home♡" NPC="C_" Emote=3 @@ -394,14 +394,14 @@ break; case 5200: nickname = "Makes Trouble Even When Absent" - text1 = "Since those Public Morals posters went up," + text1 = "Since those Disciplinary posters went up," text2 = "the school’s really lost all order lately♡" NPC="C_" Emote=3 break; case 5300: nickname = "Everyone's Fap Material Provider" - text1 = "Because of that Public Morals Awareness poster (lol)," + text1 = "Because of that Disciplinary Awareness poster (lol)," text2 = "the boys' bathroom reeks of cum lately♡" NPC="C_" Emote=3