Skip to content

Commit

Permalink
Merge pull request #128 from lxgr-linux/bugfix
Browse files Browse the repository at this point in the history
Fixed notifications beeing displayed on non movemaps
  • Loading branch information
lxgr-linux authored Jun 8, 2022
2 parents 284b904 + 6bf5b54 commit cc15270
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
8 changes: 5 additions & 3 deletions pokete_classes/loops.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
from .notify import notifier


def easy_exit_loop():
"""Loops until q or Esc are pressed"""
def easy_exit_loop(on_mvmp=True):
"""Loops until q or Esc are pressed
ARGS:
on_mvmp: Indicates if the loop is executed on movemap"""
while True:
if _ev.get() in ["'q'", "Key.esc"]:
_ev.clear()
return
std_loop()
std_loop(on_mvmp)


def std_loop(on_mvmp=True, pevm=None):
Expand Down
4 changes: 2 additions & 2 deletions pokete_classes/nature.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def __init__(self, p_n):
text = se.Text(f"Nature: {'very ' if p_n.grade == 2 else ''}") \
+ se.Text(p_n.nature.name, esccode=Color.thicc
+ p_n.nature.esccode) \
+ se.Text(liner(f"\n\nThat means it has {atc} attack, \
+ se.Text(liner(f"\n\n That means it has {atc} attack, \
{defense} defense and {init} initiative points more than normal Poketes \
of its' kind.", 40, pre=""))
super().__init__(text, name="Nature", info="q:close")
Expand All @@ -102,4 +102,4 @@ def __call__(self, _map):
ARGS:
_map: Map to show on"""
with self.center_add(_map):
easy_exit_loop()
easy_exit_loop(False)

0 comments on commit cc15270

Please sign in to comment.