fix Trickster

uhyo · Sep 29, 2020 · 01c0729 · 01c0729
1 parent 89fe857
commit 01c0729
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/language/ja/game_client_form.yaml b/language/ja/game_client_form.yaml
@@ -113,6 +113,7 @@ messages:
   Hitokotonushinokami: '占う相手を選択してください'
   Gambler: '賭けに出るかどうか選択してください'
   Faker: '賭けに出るかどうか選択してください'
+  Trickster: '絆を結ぶ2人を1人ずつ選択してください'
   GameMaster: 'GM用コマンド'
 
 # Texts for GameMaster form.

diff --git a/language/ja/roles.yaml b/language/ja/roles.yaml
@@ -954,6 +954,7 @@ CynthiaWolf:
 Trickster:
   # First select.
   select1: '{{name}}は絆を結ぶ1人目に{{target}}を選びました。'
+  select2: '{{name}}は絆を結ぶ2人目に{{target}}を選びました。'
   # Error: select another player
   noSelectTwice: 'もう一人別の人を選んでください。'
   # Select a target.

diff --git a/server/rpc/game/game.coffee b/server/rpc/game/game.coffee
@@ -10616,10 +10616,19 @@ class Trickster extends Fox
             return game.i18n.t "roles:Trickster.noSelectTwice"
 
         @setTarget playerid
+        log=
+            mode:"skill"
+            to:@id
+            comment: game.i18n.t "roles:Trickster.select2", {name: @name, target: pl.name}
+        splashlog game.id,game,log
         # 二人が決定した
         null
     midnight:(game,midnightSort)->
         plpls=[game.getPlayer(@flag), game.getPlayer(@target)]
+
+        if !plpls[0] || !plpls[1]
+            return
+
         for pl,i in plpls
             # 2人ぶん処理
             pl.touched game,@id