From d9e946ca405b1aabc50fc82fa765d201d2b3086d Mon Sep 17 00:00:00 2001 From: Shadow15510 Date: Sun, 16 Jan 2022 11:39:20 +0100 Subject: [PATCH] Continue cleaning repository --- idk/alfheim.py | 4 ++-- idk/asci.py | 4 ++-- idk/asgard.py | 24 ++++++++++++------------ idk/idk.py | 2 +- idk/idk_lib.py | 4 +++- idk/jotunheim.py | 12 ++++++------ idk/midgard.py | 2 +- idk/muspellheim.py | 6 +++--- idk/nidavellir.py | 10 +++++----- idk/niflheim.py | 4 ++-- idk/vanaheim.py | 4 ++-- 11 files changed, 39 insertions(+), 37 deletions(-) diff --git a/idk/alfheim.py b/idk/alfheim.py index 0fcb7f5..b6755bd 100644 --- a/idk/alfheim.py +++ b/idk/alfheim.py @@ -104,7 +104,7 @@ h_23 = (r""" | | | | | | | | | | | | | | | | / \______/ \_______|^|______/ \______/ \ """, - (25, 19, 2, 34, 16)) # * : (23, 5) + (25, 19, 2, 34, 16)) h_24 = (r""" @@ -128,4 +128,4 @@ h_24 = (r""" | | |====| |====| |====|^|====| """, - (20, 19, 2, 52, 31)) # * : (12, 3) * : (36, 12) \ No newline at end of file + (20, 19, 2, 52, 31)) \ No newline at end of file diff --git a/idk/asci.py b/idk/asci.py index 7f26b1f..041678d 100644 --- a/idk/asci.py +++ b/idk/asci.py @@ -1,4 +1,4 @@ -# Asci (version 1.6.1) +# Asci (version 1.6.2) class Screen: def __init__(self, screen_width=21, screen_height=6): @@ -283,7 +283,7 @@ def print_text(text, min_value=0, max_value=0, default_value=0): print("\n" * 7) print(paragraphs[index]) - if index + 1 == nb and max_value: + if index + 1 == nb and (min_value or max_value or default_value) and min_value <= max_value: result = input(">") try: result = int(result) except: result = default_value diff --git a/idk/asgard.py b/idk/asgard.py index e9c9ec7..c4022c7 100644 --- a/idk/asgard.py +++ b/idk/asgard.py @@ -118,7 +118,7 @@ h_9 = (r""" |============| |=============| | | ||^|| """, - (15, 13, 0, 30, 11)) # * : (19, 4) + (15, 13, 0, 30, 11)) h_10 = (r""" @@ -147,7 +147,7 @@ h_10 = (r""" |__| |__| |__| |__| |__| |__| /__\ /__\ /__\__^^__/__\ /__\ /__\ """, (29, 23, 0, 116, 14), - (30, 23, 0, 116, 14)) # * : (25, 11) + (30, 23, 0, 116, 14)) h_11 = (r""" @@ -171,7 +171,7 @@ h_11 = (r""" |======================| |======================| |=+<>+=+<>+=+<>+=+<>+==| |==+<>+=+<>+=+<>+=+<>+=| |^| """, - (24, 19, 0, 70, 19)) # * : (34, 7) + (24, 19, 0, 70, 19)) h_12 = (r""" @@ -196,7 +196,7 @@ h_12 = (r""" | - -| |- - | /- - \_____|^^|_____/ - -\ """, (24, 19, 0, 25, 31), - (25, 19, 0, 26, 31)) # * : (19, 4) + (25, 19, 0, 26, 31)) h_13 = (r""" @@ -215,7 +215,7 @@ h_13 = (r""" | | |==================| |==================| |^| """, - (20, 14, 0, 110, 34)) # * : (21, 8) + (20, 14, 0, 110, 34)) h_14 = (r""" @@ -235,7 +235,7 @@ h_14 = (r""" |=|\/|==|\/|=| |=|\/|==|\/|=| |^^| """, (14, 14, 0, 63, 36), - (15, 14, 0, 64, 36)) # * : (26, 2) + (15, 14, 0, 64, 36)) h_15 = (r""" @@ -254,7 +254,7 @@ h_15 = (r""" #### #### | | |^| """, - (14, 14, 0, 120, 41)) # * : (10, 6) + (14, 14, 0, 120, 41)) h_16 = (r""" @@ -288,7 +288,7 @@ h_16 = (r""" |===================| _ | | _ |===================| (_) | | (_) |=| |/^\| |=| """, - (29, 29, 0, 13, 43)) # * : (50, 14) + (29, 29, 0, 13, 43)) h_17 = (r""" @@ -317,7 +317,7 @@ h_17 = (r""" | | |======================| |=======================| |^| """, - (24, 24, 0, 75, 50)) # * : (36, 14) + (24, 24, 0, 75, 50)) h_18 = (r""" @@ -347,7 +347,7 @@ h_18 = (r""" \| |/ /|^^|\ """, (24, 24, 0, 27, 56), - (25, 24, 0, 28, 56)) # * : (30, 9) + (25, 24, 0, 28, 56)) h_19 = (r""" @@ -366,7 +366,7 @@ h_19 = (r""" | | | | |=======================|^|======================|""", - (25, 14, 0, 57, 67)) # * : (28, 7) + (25, 14, 0, 57, 67)) h_20 = (r""" @@ -396,4 +396,4 @@ h_20 = (r""" | | |============|^^|============|""", (34, 24, 0, 10, 69), - (35, 24, 0, 11, 69)) # * : (39, 9) \ No newline at end of file + (35, 24, 0, 11, 69)) \ No newline at end of file diff --git a/idk/idk.py b/idk/idk.py index 29c6fdc..013f065 100644 --- a/idk/idk.py +++ b/idk/idk.py @@ -24,7 +24,7 @@ def npc(data, stat): h_45_npc, h_46_npc, h_47_npc, h_48_npc) - return npc_core(npc_data[data[1]](data, stat), data, stat) + return npc_core(npc_data[data[1]], data, stat) def point_of_interest(data, stat): diff --git a/idk/idk_lib.py b/idk/idk_lib.py index 3ac59d2..85c0349 100644 --- a/idk/idk_lib.py +++ b/idk/idk_lib.py @@ -33,7 +33,9 @@ maps = ( h_45, h_46, h_47, h_48) # Asci functions -def npc_core(event, data, stat): +def npc_core(event_fn, data, stat): + event = event_fn(data, stat) + if not event: sel_choice = print_text("\nChoissez une action :\n1. Attaquer\n2. Voler\n3. Parler\n4. Ne rien faire", 1, 4, 3) diff --git a/idk/jotunheim.py b/idk/jotunheim.py index 04380b5..f2a2fb7 100644 --- a/idk/jotunheim.py +++ b/idk/jotunheim.py @@ -154,7 +154,7 @@ h_31 = (r""" | | | | | | | |============|====|^|====|=============|""", - (19, 14, 5, 29, 11)) # * : (28, 4) + (19, 14, 5, 29, 11)) h_32 = (r""" @@ -183,7 +183,7 @@ h_32 = (r""" | | |============| |==============| |============|^|==============| """, - (14, 24, 5, 88, 25)) # * : (28, 6) + (14, 24, 5, 88, 25)) h_33 = (r""" @@ -212,7 +212,7 @@ h_33 = (r""" | | |============================| |===========================| |=[]=[]=[]=[]=[]=[]=[]=[]=[]=|^|=[]=[]=[]=[]=[]=[]=[]=[]=[]|""", - (30, 24, 5, 89, 45)) # * : (48, 5) * : (24, 7) + (30, 24, 5, 89, 45)) h_34 = (r""" @@ -246,7 +246,7 @@ h_34 = (r""" |==|II|================|II| |II|================|II|==| |II| |II| |II| |II| |II| |II|/|^=|\|II| |II| """, - (34, 29, 5, 60, 50)) # * : (26, 6) + (34, 29, 5, 60, 50)) h_35 = (r""" @@ -271,7 +271,7 @@ h_35 = (r""" |======================\ /======================| |==|/\|=|/\|=|/\|=|/\|=/^^\=|/\|=|/\|=|/\|=|/\|==|""", (24, 19, 5, 64, 85), - (25, 19, 5, 65, 85)) # * : (17, 5) + (25, 19, 5, 65, 85)) h_36 = (r""" @@ -291,4 +291,4 @@ h_36 = (r""" | | | [====] [====] | |=================|^^|=================|""", (19, 14, 5, 23, 88), - (20, 14, 5, 23, 88)) # * : (11, 3) * : (27, 10) * : (9, 12) \ No newline at end of file + (20, 14, 5, 23, 88)) \ No newline at end of file diff --git a/idk/midgard.py b/idk/midgard.py index 5c4b579..fa18798 100644 --- a/idk/midgard.py +++ b/idk/midgard.py @@ -190,4 +190,4 @@ h_28 = (r""" |__+ +__| |\/|^^|\/| """, (24, 14, 3, 60, 69), - (25, 14, 3, 61, 69)) # * : (27, 6) \ No newline at end of file + (25, 14, 3, 61, 69)) \ No newline at end of file diff --git a/idk/muspellheim.py b/idk/muspellheim.py index be3f93e..b88ba7b 100644 --- a/idk/muspellheim.py +++ b/idk/muspellheim.py @@ -146,7 +146,7 @@ h_42 = (r""" | | | | |==============|^|================|""", - (16, 14, 7, 87, 14)) # * : (11, 5) * : (6, 7) * : (31, 9) * : (2, 11) + (16, 14, 7, 87, 14)) h_43 = (r""" @@ -165,7 +165,7 @@ h_43 = (r""" | | | | |[^]|""", - (32, 14, 7, 47, 53)) # * : (24, 4) * : (6, 5) * : (13, 9) + (32, 14, 7, 47, 53)) h_44 = (r""" @@ -195,4 +195,4 @@ h_44 = (r""" |=|/\|==|/\|=|/\|=|/\|=| |=|/\|=|/\|=|/\|==|/\|=| |=|\/|==|\/|=|\/|=|\/|=|^^|=|\/|=|\/|=|\/|==|\/|=|""", (24, 24, 7, 67, 89), - (25, 24, 7, 68, 89)) # * : (13, 2) * : (13, 20) \ No newline at end of file + (25, 24, 7, 68, 89)) \ No newline at end of file diff --git a/idk/nidavellir.py b/idk/nidavellir.py index 40fe990..77071b7 100644 --- a/idk/nidavellir.py +++ b/idk/nidavellir.py @@ -115,7 +115,7 @@ h_37 = (r""" | |__| | | | | | | | |=============|^|============|""", - (15, 14, 6, 69, 26)) # * : (2, 1) * : (26, 1) * : (10, 5) * : (27, 8) * : (3, 10) + (15, 14, 6, 69, 26)) h_38 = (r""" @@ -134,7 +134,7 @@ h_38 = (r""" | | | | |===|^|===| """, - (15, 14, 6, 7, 31)) # * : (12, 3) * : (19, 7) + (15, 14, 6, 7, 31)) h_39 = (r""" @@ -153,7 +153,7 @@ h_39 = (r""" | |_| |_| | | | |=|/\|=|/\|==|^|===|/\|=|/\|=|""", - (14, 14, 6, 35, 38)) # * : (9, 2) * : (9, 4) + (14, 14, 6, 35, 38)) h_40 = (r""" @@ -172,7 +172,7 @@ h_40 = (r""" | | |=========| |==============| |==========|^|===============|""", - (12, 14, 6, 22, 22)) # * : (14, 5) + (12, 14, 6, 22, 22)) h_41 = (r""" @@ -196,4 +196,4 @@ h_41 = (r""" | |_| /|\ | | | |========|^|=======|""", - (10, 19, 6, 23, 51)) # * : (12, 2) * : (10, 8) \ No newline at end of file + (10, 19, 6, 23, 51)) \ No newline at end of file diff --git a/idk/niflheim.py b/idk/niflheim.py index be2d76d..ecec773 100644 --- a/idk/niflheim.py +++ b/idk/niflheim.py @@ -100,7 +100,7 @@ h_29 = (r""" | [===] [=-=] [==] [-==] | | | |=============|^|============|""", - (15, 14, 4, 38, 21)) # * : (5, 5) + (15, 14, 4, 38, 21)) h_30 = (r""" @@ -125,4 +125,4 @@ h_30 = (r""" | |========| |========| | |=============| |^^| |=============|""", (24, 19, 4, 70, 31), - (25, 19, 4, 71, 31)) # * : (37, 4) * : (17, 6) \ No newline at end of file + (25, 19, 4, 71, 31)) \ No newline at end of file diff --git a/idk/vanaheim.py b/idk/vanaheim.py index ae88a7b..b0a6024 100644 --- a/idk/vanaheim.py +++ b/idk/vanaheim.py @@ -72,7 +72,7 @@ h_21 = (r""" | | | | |===|^|=================|""", - (5, 9, 1, 44, 11)) # * : (8, 1) * : (21, 6) + (5, 9, 1, 44, 11)) h_22 = (r""" @@ -96,4 +96,4 @@ h_22 = (r""" | | | | |/\=/\=/\=/\=/\=/\=| |=/\=/\=/\=/\=/\==| |\/=\/=\/=\/=\/=\/=]^[=\/=\/=\/=\/=\/==|""", - (20, 19, 1, 52, 35)) # * : (36, 3) * : (2, 8) + (20, 19, 1, 52, 35))