1

HappyTreeFriends · Jun 10, 2024 · 2e49858 · 2e49858
1 parent 8d075e4
commit 2e49858
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/AmiyaBotPlayerRatingServer/GameLogic/CypherChallenge/CypherChallengeManager.cs b/AmiyaBotPlayerRatingServer/GameLogic/CypherChallenge/CypherChallengeManager.cs
@@ -52,9 +52,13 @@ public class CypherChallengeManager(ArknightsMemoryCache memoryCache, GameManage
                 {
                     continue;
                 }
-                foreach (var property in randomProperties)
+
+                foreach (var property in _properties)
                 {
                     question.CharacterProperties[property] = GetPropValue(randomOperator, property)!;
+                }
+                foreach (var property in randomProperties)
+                {
                     question.CharacterPropertiesUsed[property] = true;
                 }
 
@@ -75,16 +79,16 @@ public class CypherChallengeManager(ArknightsMemoryCache memoryCache, GameManage
 
                     var lastQuestion = game.QuestionList.Last();
                     var answers = new Dictionary<String, string>();
-                    foreach (var usedProp in lastQuestion.CharacterPropertiesUsed.Where(k=>k.Value).Select(k=>k.Key))
+                    foreach (var usedProp in question.CharacterPropertiesUsed.Where(k=>k.Value).Select(k=>k.Key))
                     {
                         var lastOp = lastQuestion.CharacterProperties[usedProp];
                         var currOp = question.CharacterProperties[usedProp];
                         var answerJd = JudgeAnswer(usedProp, lastOp, currOp);
                         if(answerJd == "Correct")
                         {
                             question.CharacterPropertiesRevealed[usedProp] = true;
+                            answers.Add(usedProp, answerJd);
                         }
-                        answers.Add(usedProp,answerJd);
                     }
 
                     var answer = new CypherChallengeGame.Answer()