diff --git a/pokete.py b/pokete.py index 0a8e1d8a..26d6fd38 100755 --- a/pokete.py +++ b/pokete.py @@ -235,7 +235,7 @@ def __init__(self, poke, xp, _hp="SKIP", _attacks=None, player=True, shiny=False if _hp != "SKIP": self.hp = _hp if _hp <= self.full_hp else self.hp self.health_bar_maker(self.hp) - self.desc = se.Text(liner(self.inf["desc"], se.width-34)) + self.desc = se.Text(liner(self.inf["desc"], se.screen_width-34)) self.ico = se.Box(4, 11) for ico in self.inf["ico"]: self.ico.add_ob(se.Text(ico["txt"], state="float", esccode=eval(ico["esc"]) if ico["esc"] is not None else "", ignore=f'{eval(ico["esc"]) if ico["esc"] is not None else ""} {Color.reset}'), 0, 0) @@ -361,7 +361,7 @@ def move_arch(self): return line = se.Line(Color.thicc+Color.yellow+"-"+Color.reset, self.enem.ico.x-self.ico.x+(-11 if self.player else 11), - self.enem.ico.y-self.ico.y, type="crippled") + self.enem.ico.y-self.ico.y, l_type="crippled") line.add(self.ico.map, self.ico.x+(11 if self.player else -1), self.ico.y+1) self.ico.map.show() time.sleep(1) diff --git a/pokete_classes/classes.py b/pokete_classes/classes.py index 8be85775..30c9f5a4 100644 --- a/pokete_classes/classes.py +++ b/pokete_classes/classes.py @@ -33,8 +33,9 @@ class NoColor(Color): class PlayMap(se.Map): - def __init__(self, height=se.height-1, width=se.width, trainers=None, name="", - pretty_name="", poke_args=None, extra_actions=None): + def __init__(self, height=se.screen_height-1, width=se.screen_width, + trainers=None, name="", pretty_name="", poke_args=None, + extra_actions=None): super().__init__(height=height, width=width, background=" ") self.trainers = trainers self.name = name diff --git a/pokete_classes/ui_elements.py b/pokete_classes/ui_elements.py index 3d85b87f..ac1e9e16 100644 --- a/pokete_classes/ui_elements.py +++ b/pokete_classes/ui_elements.py @@ -7,8 +7,7 @@ def __init__(self): class StdFrame(se.Frame): - def __init__(self, height, width, corner_chars=None, horizontal_chars=None, - vertical_chars=None, state=None, ob_class=None, ob_args=None): + def __init__(self, height, width): super().__init__(width=width, height=height, corner_chars=["┌", "┐", "└", "┘"], horizontal_chars=["─", "─"],