From 19342eae7e2642bd5237e2a3a5cd0fc39e218fbf Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Tue, 6 Feb 2024 22:59:41 +0800
Subject: [PATCH] Upd: Rogue events in 2.0

---
 tasks/rogue/keywords/curio.py        |  2 +-
 tasks/rogue/keywords/event_option.py | 14 +++++++-------
 tasks/rogue/keywords/event_title.py  |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tasks/rogue/keywords/curio.py b/tasks/rogue/keywords/curio.py
index bfd7fedf3..87407f3d2 100644
--- a/tasks/rogue/keywords/curio.py
+++ b/tasks/rogue/keywords/curio.py
@@ -486,7 +486,7 @@ Fissured_Cuckoo_Clock = RogueCurio(
     cn='分裂咕咕钟',
     cht='分裂咕咕鐘',
     en='Fissured Cuckoo Clock',
-    jp='分裂鳩時計',
+    jp='機械式鳩時計',
     es='Reloj de cuco agrietado',
 )
 Typical_Genius_Society_Gossip = RogueCurio(
diff --git a/tasks/rogue/keywords/event_option.py b/tasks/rogue/keywords/event_option.py
index c11560faa..f18d18677 100644
--- a/tasks/rogue/keywords/event_option.py
+++ b/tasks/rogue/keywords/event_option.py
@@ -441,8 +441,8 @@ You_re_not_a_reliable_investment_manager = RogueEventOption(
     cn='你不是一个值得信任的*投资经理*。',
     cht='你不是一個值得信任的*投資經理*。',
     en='You\'re not a reliable "investment manager."',
-    jp='{F#あんた}{M#お前}は信頼できる※ファンドマネージャー※ではない',
-    es='No eres {F#una}{M#un} "{F#gestora}{M#gestor} de inversiones" fiable.',
+    jp='は信頼できる※ファンドマネージャー※ではない',
+    es='No eres  " de inversiones" fiable.',
 )
 I_hate_this_era = RogueEventOption(
     id=50,
@@ -1765,7 +1765,7 @@ Hide_under_the_boat_together = RogueEventOption(
     cht='一起躲在船底。',
     en='Hide under the boat together.',
     jp='一緒に船底に隠れる',
-    es='Escóndanse junt{F#as}{M#os} debajo del bote.',
+    es='Escóndanse junt debajo del bote.',
 )
 Bottoms_up = RogueEventOption(
     id=197,
@@ -2179,7 +2179,7 @@ Release_them_together_from_the_pain = RogueEventOption(
     cht='將牠們一併從「痛苦」中釋放。',
     en='Release them together from the "pain."',
     jp='彼らをまとめて「苦痛」から解放する',
-    es='Libéral{F#as}{M#os} junt{F#as}{M#os} del "dolor".',
+    es='Libéral junt del "dolor".',
 )
 Give_the_adult_beast_a_send_off = RogueEventOption(
     id=243,
@@ -2988,7 +2988,7 @@ Adjust_Intra_Cognition_I_am_organic = RogueEventOption(
     cn='调整「自我认知」-我是有机。',
     cht='調整「自我認知」-我是有機。',
     en='Adjust Intra-Cognition — I am organic.',
-    jp='「自己認識」を調整-{F#私}{M#俺}は有機生命体',
+    jp='「自己認識」を調整-は有機生命体',
     es='Ajusta tu autopercepción: soy orgánico.',
 )
 Adjust_Intra_Cognition_I_am_inorganic = RogueEventOption(
@@ -2997,7 +2997,7 @@ Adjust_Intra_Cognition_I_am_inorganic = RogueEventOption(
     cn='调整「自我认知」-我是无机。',
     cht='調整「自我認知」-我是無機。',
     en='Adjust Intra-Cognition — I am inorganic.',
-    jp='「自己認識」を調整-{F#私}{M#俺}は無機生命体',
+    jp='「自己認識」を調整-は無機生命体',
     es='Ajusta tu autopercepción: soy inorgánico.',
 )
 Pick_a_family_element = RogueEventOption(
@@ -3214,5 +3214,5 @@ Forced_to_fight = RogueEventOption(
     cht='被迫戰鬥。',
     en='Forced to fight.',
     jp='戦闘を強いられる',
-    es='Obligad{F#a}{M#o} a combatir.',
+    es='Obligad a combatir.',
 )
diff --git a/tasks/rogue/keywords/event_title.py b/tasks/rogue/keywords/event_title.py
index 6b03050d9..86490d346 100644
--- a/tasks/rogue/keywords/event_title.py
+++ b/tasks/rogue/keywords/event_title.py
@@ -199,7 +199,7 @@ Cosmic_Altruist_Part_3 = RogueEventTitle(
     cn='银河好人（其三）',
     cht='銀河好人（其三）',
     en='Cosmic Altruist (Part 3)',
-    jp='銀河のお人好し（その3）',
+    jp='銀河のお人よし（その3）',
     es='Altruismo galáctico (III)',
     option_ids=[81, 82, 83, 84, 85],
 )
@@ -269,7 +269,7 @@ We_Are_Cowboys = RogueEventTitle(
     cn='我们是牛仔',
     cht='我們是牛仔',
     en='We Are Cowboys',
-    jp='俺たちカウボーイ',
+    jp='僕たちカウボーイ',
     es='Somos vaqueros',
     option_ids=[104, 105, 106, 107, 108],
 )
@@ -879,7 +879,7 @@ The_Perfect_Grand_Challenge = RogueEventTitle(
     cn='*完美*大挑战！',
     cht='*完美*大挑戰！',
     en='The *Perfect* Grand Challenge!',
-    jp='※完璧※大挑戦！',
+    jp='「完璧」大挑戦！',
     es='¡El gran desafío perfecto!',
     option_ids=[142, 258, 259, 260, 261],
 )