DjalimSimaila/SAE-A2-TruthInquiry
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

query all npcs at once

Browse Source
This commit is contained in:
Thomas Rubini 2023-03-19 12:18:16 +01:00
parent 04fb04c7df
commit 8041be1fea
No known key found for this signature in database
GPG Key ID: C7D287C8C1CAC373
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
truthinquiry/ext/database/dbutils.py
View File

@ -22,13 +22,13 @@ def get_random_place() -> Place:
""" """
return random.choice(db.session.query(Place).all()) return random.choice(db.session.query(Place).all())
def get_random_npc() -> Npc : def get_random_npcs(n: int = 1) -> Npc :
""" """
Returns a random npc from the database Returns a random npc from the database
:return: a Npc object :return: a Npc object
""" """
return random.choice(db.session.query(Npc).all()) return random.sample(db.session.query(Npc).all(), n)
def get_npc_random_trait_id(npc_id: int) -> int: def get_npc_random_trait_id(npc_id: int) -> int:
""" """

6
truthinquiry/logic/game_logic.py
View File

@ -277,11 +277,7 @@ def generate_game_data(lang: str) -> tuple[dict, dict]:
data = {} data = {}
data["npcs"] = {} data["npcs"] = {}
reactions_table = {} reactions_table = {}
npcs = [] npcs = list(dbutils.get_random_npcs(5))
while len(npcs) != 5:
npc = dbutils.get_random_npc()
if npc not in npcs:
npcs.append(npc)
for npc in npcs: for npc in npcs:
data["npcs"][str(npc.NPC_ID)] = generate_npc_text(npc, lang) data["npcs"][str(npc.NPC_ID)] = generate_npc_text(npc, lang)
reactions_table[str(npc.NPC_ID)] = dbutils.get_npc_random_trait_id(npc) reactions_table[str(npc.NPC_ID)] = dbutils.get_npc_random_trait_id(npc)