Merge branch 'dev'

This commit is contained in:
Shadow15510 2023-01-06 13:28:22 +01:00
commit 3461399823
2 changed files with 3 additions and 3 deletions

View File

@ -98,7 +98,7 @@ def idk(save_code=None):
print_text("Ainsi s'acheva la premiere guerre du monde. Les Ases garderent la tete de Mimir pour ses conseils avises, mais il n'y eu jamais de represailles. Les Ases et les Vanes se melerent ne formant ainsi qu'une seule et meme grande famille.")
else:
print("idk(\"{}\")".format(encode_save(data, stat[:-1])))
print("idk(\"{}\")".format(encode_save(data, stat)))
# Scenario
@ -718,7 +718,7 @@ def h_29_npc(data, stat, entites, identifiant):
spells_sale = [(i, len(spells_level)) for i in range(n)]
formated_spells = ""
for sp in range(n):
formated_spells += "{0}. {1} {2}\n".format(sp + 1, spells[spells_sale[sp][0]], spells_level[spells_sale[sp][1] - 1])
formated_spells += "{0}. {1} {2}\n".format(sp + 1, spells[spells_sale[sp][0]][0], spells_level[spells_sale[sp][1] - 1])
if not (480 <= stat[4] <= 1140): return [0, "Je suis desolee, nous sommes fermes."]

View File

@ -57,7 +57,7 @@ def inn_interaction(data, stat, nb_choice, text, *events):
def spell_selection(text, spells_to_display):
message = text + "\n" + "\n".join(["{0}. {1} {2}".format(nb + 1, spells[spells_to_display[nb][0]][0], spells_level[spells_to_display[nb][1] - 1]) for nb in range(len(spells_to_display))])
message = text + "\n" + "\n".join(["{0}. {1} {2}".format(nb + 1, spells[sp_id][0], spells_level[sp_lvl - 1]) for sp_id, sp_lvl in spells_to_display])
return print_text(message, 1, len(spells_to_display), 0) - 1