Update app.py

app.py

@@ -25,20 +25,60 @@ weapons = ["Candlestick", "Dagger", "Lead Pipe", "Revolver", "Rope", "Wrench", "
 locations = ["Kitchen", "Ballroom", "Conservatory", "Dining Room", "Library", "Study", "Billiard Room", "Lounge"]
 
 possible_personalities = [
-    {"description": "stern and suspicious", "hot_headed": False, "anger_threshold": 5},
-    {"description": "charming but evasive", "hot_headed": False, "anger_threshold": 7},
-    {"description": "intellectual and nervous", "hot_headed": False, "anger_threshold": 6},
-    {"description": "gracious but secretive", "hot_headed": False, "anger_threshold": 6},
-    {"description": "amiable yet deceptive", "hot_headed": False, "anger_threshold": 8},
-    {"description": "hot-headed and impulsive", "hot_headed": True, "anger_threshold": 3},
-    {"description": "calm and collected", "hot_headed": False, "anger_threshold": 9},
-    {"description": "mysterious and aloof", "hot_headed": False, "anger_threshold": 5},
-    {"description": "jovial but cunning", "hot_headed": False, "anger_threshold": 7},
-    {"description": "nervous and jittery", "hot_headed": False, "anger_threshold": 5},
-    {"description": "sarcastic and witty", "hot_headed": False, "anger_threshold": 6},
-    {"description": "arrogant and dismissive", "hot_headed": True, "anger_threshold": 4}
+    {"description": "stern and suspicious", "hot_headed": False},
+    {"description": "charming but evasive", "hot_headed": False},
+    {"description": "intellectual and nervous", "hot_headed": False},
+    {"description": "gracious but secretive", "hot_headed": False},
+    {"description": "amiable yet deceptive", "hot_headed": False},
+    {"description": "hot-headed and impulsive", "hot_headed": True},
+    {"description": "calm and collected", "hot_headed": False},
+    {"description": "mysterious and aloof", "hot_headed": False},
+    {"description": "jovial but cunning", "hot_headed": False},
+    {"description": "nervous and jittery", "hot_headed": False},
+    {"description": "sarcastic and witty", "hot_headed": False},
+    {"description": "arrogant and dismissive", "hot_headed": True}
 ]
 
+anger_level_descriptions = {
+    0: "calm",
+    1: "slightly annoyed",
+    2: "annoyed",
+    3: "frustrated",
+    4: "angry",
+    5: "very angry",
+    6: "furious"
+}
+
+def get_anger_description(anger_level):
+    if anger_level <= 1:
+        return "calm"
+    elif anger_level == 2:
+        return "slightly annoyed"
+    elif anger_level == 3:
+        return "annoyed"
+    elif anger_level == 4:
+        return "frustrated"
+    elif anger_level == 5:
+        return "angry"
+    elif anger_level == 6:
+        return "very angry"
+    else:
+        return "furious"
+
+def get_trust_description(trust_level):
+    if trust_level <= 2:
+        return "distrustful"
+    elif trust_level <= 4:
+        return "untrusting"
+    elif trust_level == 5:
+        return "neutral"
+    elif trust_level <= 7:
+        return "trusting"
+    elif trust_level <= 9:
+        return "very trusting"
+    else:
+        return "completely trusting"
+
 suspects = {}
 
 game_state = {
@@ -70,19 +110,19 @@ def initialize_game():
     game_state["bluffed"] = False
     game_state["player_questions"] = []
     random.shuffle(possible_personalities)
-    alibi_locations = random.sample(locations, len(suspect_names))
     motives = ["inheritance", "jealousy", "revenge", "secret affair", "business rivalry", "blackmail"]
     relationships = ["friends", "colleagues", "family", "rivals", "acquaintances"]
-    for i, suspect_name in enumerate(suspect_names):
+    non_murderer_names = [name for name in suspect_names if name != game_state["murderer"]]
+    non_murderer_alibi_locations = random.sample(locations, len(non_murderer_names))
+    for i, suspect_name in enumerate(non_murderer_names):
         suspect = {
             "name": suspect_name,
-            "is_murderer": suspect_name == game_state["murderer"],
+            "is_murderer": False,
             "personality": possible_personalities[i % len(possible_personalities)]["description"],
             "hot_headed": possible_personalities[i % len(possible_personalities)]["hot_headed"],
-            "anger_threshold": possible_personalities[i % len(possible_personalities)]["anger_threshold"],
             "anger_level": 0,
             "trust_level": 5,
-            "alibi_location": alibi_locations[i],
+            "alibi_location": non_murderer_alibi_locations[i],
             "alibi_with": [],
             "knowledge": {},
             "motive": random.choice(motives),
@@ -91,8 +131,26 @@ def initialize_game():
             "suspects": None
         }
         suspects[suspect_name] = suspect
+    murderer_alibi_location = random.choice(non_murderer_alibi_locations)
+    murderer = {
+        "name": game_state["murderer"],
+        "is_murderer": True,
+        "personality": possible_personalities[len(non_murderer_names) % len(possible_personalities)]["description"],
+        "hot_headed": possible_personalities[len(non_murderer_names) % len(possible_personalities)]["hot_headed"],
+        "anger_level": 0,
+        "trust_level": 5,
+        "alibi_location": murderer_alibi_location,
+        "alibi_with": [],
+        "knowledge": {},
+        "motive": random.choice(motives),
+        "relationships": {},
+        "backstory": "",
+        "suspects": None
+    }
+    suspects[game_state["murderer"]] = murderer
     for suspect in suspects.values():
-        others_in_same_location = [s["name"] for s in suspects.values() if s["alibi_location"] == suspect["alibi_location"] and s["name"] != suspect["name"]]
+        others_in_same_location = [s["name"] for s in suspects.values()
+                                   if s["alibi_location"] == suspect["alibi_location"] and s["name"] != suspect["name"]]
         suspect["alibi_with"] = others_in_same_location
     for suspect in suspects.values():
         other_suspects = [s["name"] for s in suspects.values() if s["name"] != suspect["name"]]
@@ -110,11 +168,10 @@ def generate_backstory(suspect):
 
 def generate_knowledge(suspect):
     details = f"You have a motive of {suspect['motive']}. {suspect['backstory']}"
-    relationship_details = ". ".join([f"You are {relation} with {other}" for other, relation in suspect["relationships"].items()])
+    relationship_details = ". ".join([f"You are {relation} with {other}"
+                                      for other, relation in suspect["relationships"].items()])
     if suspect["is_murderer"]:
-        suspect["alibi_location"] = random.choice([loc for loc in locations if loc != game_state["location"]])
-        suspect["alibi_with"] = []
-        knowledge = f"You are the murderer. Lie about your alibi and deflect suspicion. {details} {relationship_details}"
+        knowledge = f"You are the murderer. You claim you were in the {suspect['alibi_location']} during the murder, but you were actually committing the crime in the {game_state['location']}. You need to lie about your alibi and deflect suspicion. {details} {relationship_details}"
     else:
         knowledge = f"You were in the {suspect['alibi_location']} with {', '.join(suspect['alibi_with'])} during the murder. {details} {relationship_details}"
         if random.choice([True, False]):
@@ -128,13 +185,16 @@ def generate_others_locations_knowledge(suspect):
     for other in suspects.values():
         if other["name"] == suspect["name"]:
             continue
-        chance = random.random()
-        if chance < 0.5:
-            knowledge[other["name"]] = f"was in the {other['alibi_location']}."
-        elif chance < 0.75:
-            knowledge[other["name"]] = "you are not sure where they were."
+        elif other["name"] == game_state["murderer"]:
+            knowledge[other["name"]] = "You know that they were not in your location."
         else:
-            knowledge[other["name"]] = "you have no idea where they were."
+            chance = random.random()
+            if chance < 0.5:
+                knowledge[other["name"]] = f"was in the {other['alibi_location']}."
+            elif chance < 0.75:
+                knowledge[other["name"]] = "you are not sure where they were."
+            else:
+                knowledge[other["name"]] = "you have no idea where they were."
     return knowledge
 
 def analyze_tone(player_input):
@@ -159,27 +219,23 @@ def get_ai_response(suspect_name, player_input):
         suspect["trust_level"] -= 1
     else:
         suspect["anger_level"] += 1
-    if suspect["anger_level"] >= suspect["anger_threshold"]:
+    if suspect["anger_level"] > 6:
+        suspect["anger_level"] = 6
+    if suspect["anger_level"] >= 3 and suspect["hot_headed"]:
         suspect["personality"] = "agitated and defensive"
     personality = suspect["personality"]
     knowledge = suspect["knowledge"]["self"]
     others_knowledge = suspect["knowledge"]["others_locations"]
-    anger_level = suspect["anger_level"]
-    hot_headed = suspect["hot_headed"]
-    trust_level = suspect["trust_level"]
+    anger_description = get_anger_description(suspect["anger_level"])
+    trust_description = get_trust_description(suspect["trust_level"])
     previous_questions = " ".join(game_state["player_questions"][-3:])
     system_prompt = f"You are {suspect_name}, who is {personality}. {knowledge}"
     for other_name, info in others_knowledge.items():
         system_prompt += f" You know that {other_name} {info}"
     system_prompt += f" You suspect that {suspect['suspects']} might be involved due to {suspect['motive']}."
-    if hot_headed and anger_level >= suspect["anger_threshold"]:
-        system_prompt += f" You are extremely angry and may respond aggressively."
+    system_prompt += f" Your current emotional state is {anger_description}, and your level of trust towards the detective is {trust_description}."
     if suspect["is_murderer"]:
         system_prompt += " You are the murderer and will lie to protect yourself."
-    if trust_level >= 7:
-        system_prompt += " You trust the detective and are willing to share information."
-    elif trust_level <= 3:
-        system_prompt += " You do not trust the detective and may withhold information."
     system_prompt += f" Previously, the detective asked: {previous_questions}"
     user_message = f"The detective asks: \"{player_input}\" As {suspect_name}, respond in first person, staying in character. Provide a detailed response, and consider any previous interactions. If you lie, include subtle hints like hesitations or contradictions."
     messages = [