Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added DEFAULT_STATE #14

Merged
merged 1 commit into from
Jan 4, 2022
Merged

Added DEFAULT_STATE #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions scrap_engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
MAXCACHE_LINE = 512
MAXCACHE_FRAME = 64

DEFAULT_STATE = "solid"

try:
screen_width, screen_height = os.get_terminal_size()
except OSError:
Expand Down Expand Up @@ -216,7 +218,10 @@ def __init__(self, state=None):
self.ry = None
self.added = False
self.group = None
self.state = state
if state is None:
self.state = DEFAULT_STATE
else:
self.state = state
self.map = None


Expand All @@ -225,7 +230,7 @@ class Object(AddableObject):
An object, containing a character, that can be added to a map.
"""

def __init__(self, char, state="solid", arg_proto=None):
def __init__(self, char, state=None, arg_proto=None):
if arg_proto is None:
arg_proto = {}
super().__init__(state)
Expand Down Expand Up @@ -456,7 +461,7 @@ class Text(ObjectGroup):
Different Texts can be added together with the '+' operator.
"""

def __init__(self, text, state="solid", esccode="", ob_class=Object,
def __init__(self, text, state=None, esccode="", ob_class=Object,
ob_args=None, ignore=""):
super().__init__([], state)
if ob_args is None:
Expand Down Expand Up @@ -529,7 +534,7 @@ class Square(ObjectGroup):
A rectangle, that can be added to a map.
"""

def __init__(self, char, width, height, state="solid", ob_class=Object,
def __init__(self, char, width, height, state=None, ob_class=Object,
ob_args=None, threads=False):
super().__init__([], state)
if ob_args is None:
Expand Down Expand Up @@ -621,7 +626,7 @@ class Frame(ObjectGroup):

def __init__(self, height, width, corner_chars=None,
horizontal_chars=None, vertical_chars=None,
state="solid", ob_class=Object, ob_args=None):
state=None, ob_class=Object, ob_args=None):
super().__init__([], state)
if ob_args is None:
ob_args = {}
Expand Down Expand Up @@ -783,15 +788,16 @@ class Circle(Box):
A circle, that can be added to a map.
"""

def __init__(self, char, radius, state="solid", ob_class=Object,
def __init__(self, char, radius, state=None, ob_class=Object,
ob_args=None):
super().__init__(0, 0)
if ob_args is None:
ob_args = {}
self.char = char
self.ob_class = ob_class
self.ob_args = ob_args
self.state = state
if state is not None:
self.state = state
self.__gen(radius)

def __gen(self, radius):
Expand Down Expand Up @@ -827,15 +833,16 @@ class Line(Box):
A line described by a vector, that cam be added to map.
"""

def __init__(self, char, cx, cy, l_type="straight", state="solid",
def __init__(self, char, cx, cy, l_type="straight", state=None,
ob_class=Object, ob_args=None):
super().__init__(0, 0)
if ob_args is None:
ob_args = {}
self.char = char
self.ob_class = ob_class
self.ob_args = ob_args
self.state = state
if state is not None:
self.state = state
self.type = l_type
self.__gen(cx, cy)

Expand Down