Skip to content

Sugargaming #197

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

Open
gauravnv wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Sugargaming #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
07fd97c
fixed name inputbox to read consistent length
sor2 Jun 7, 2018
33bf9ec
renders black screen, menu underneath maybe
tonyxdsu Jun 10, 2018
c368331
tried to make metris gamedisplay to get sugar gamedisplay
sor2 Jun 10, 2018
9361fd3
it's working, windows are buggy
tonyxdsu Jun 11, 2018
b27e75f
fixed windows
sor2 Jun 11, 2018
f188a35
IT WORKS ON SUGAR
gauravnv Jun 17, 2018
1d30eec
game now takes up entire screen; keys are all responsive; font size s…
sor2 Jun 19, 2018
eeabcb8
Merge branch 'master' into sugargaming
sor2 Jun 19, 2018
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
161 changes: 93 additions & 68 deletions Block/BlockI.py
View file
Open in desktop

Large diffs are not rendered by default.

68 changes: 43 additions & 25 deletions Block/BlockJ.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def __init__(self, x, y, size):
self.isCurrent = False
self.size = size
self.orientation = 0
self.color = (0,0,139)
self.color = (0,77,255)

## |1|
## |2||0||3|
Expand Down Expand Up @@ -64,32 +64,40 @@ def rotateL(self):
def rotateL2(self):
if self.orientation % 4 == 0:
self.blockList[0].setRelativeX(self.size)
self.blockList[0].setRelativeY(-self.size)
self.blockList[0].setRelativeY(-self.size) # + self.size)
self.blockList[1].setRelativeX(self.size)
self.blockList[1].setRelativeY(self.size)
self.blockList[1].setRelativeY(self.size) # + self.size)
self.blockList[2].setRelativeX(2*self.size)
self.blockList[3].setRelativeY(-2*self.size)
# self.blockList[2].setRelativeY(self.size) ####
self.blockList[3].setRelativeY(-2*self.size) # + self.size)
# move everything down 1
elif self.orientation % 4 == 1:
self.blockList[0].setRelativeX(-self.size)
self.blockList[0].setRelativeY(-self.size)
self.blockList[0].setRelativeY(-self.size) # + self.size)
self.blockList[1].setRelativeX(self.size)
self.blockList[1].setRelativeY(-self.size)
self.blockList[2].setRelativeY(-2 * self.size)
self.blockList[1].setRelativeY(-self.size) # + self.size)
self.blockList[2].setRelativeY(-2 * self.size) # + self.size)
self.blockList[3].setRelativeX(-2 * self.size)
# self.blockList[3].setRelativeY(self.size) ####
# move everything down 1
elif self.orientation % 4 == 2:
self.blockList[0].setRelativeX(-self.size)
self.blockList[0].setRelativeY(self.size)
self.blockList[0].setRelativeY(self.size) # - self.size)
self.blockList[1].setRelativeX(-self.size)
self.blockList[1].setRelativeY(-self.size)
self.blockList[1].setRelativeY(-self.size) # - self.size)
self.blockList[2].setRelativeX(-2 * self.size)
self.blockList[3].setRelativeY(2 * self.size)
# self.blockList[2].setRelativeY(-self.size) ####
self.blockList[3].setRelativeY(2 * self.size) # - self.size)
# move everything up 1
elif self.orientation % 4 == 3:
self.blockList[0].setRelativeX(self.size)
self.blockList[0].setRelativeY(self.size)
self.blockList[0].setRelativeY(self.size) # - self.size)
self.blockList[1].setRelativeX(-self.size)
self.blockList[1].setRelativeY(self.size)
self.blockList[2].setRelativeY(2 * self.size)
self.blockList[1].setRelativeY(self.size) # - self.size)
self.blockList[2].setRelativeY(2 * self.size) # - self.size)
self.blockList[3].setRelativeX(2 * self.size)
# self.blockList[3].setRelativeY(-self.size) ####
# move everything up 1

# if self.orientation % 4 == 0:
# self.blockList[0].setRelativeY(-2*self.size)
Expand Down Expand Up @@ -121,32 +129,40 @@ def rotateL2(self):
def rotateR2(self):
if self.orientation % 4 == 0:
self.blockList[0].setRelativeX(-self.size)
self.blockList[0].setRelativeY(-self.size)
self.blockList[0].setRelativeY(-self.size) # + self.size)
self.blockList[1].setRelativeX(self.size)
self.blockList[1].setRelativeY(-self.size)
self.blockList[2].setRelativeY(-2 * self.size)
self.blockList[1].setRelativeY(-self.size) # + self.size)
self.blockList[2].setRelativeY(-2 * self.size) # + self.size)
self.blockList[3].setRelativeX(-2 * self.size)
# self.blockList[3].setRelativeY(self.size) ####
# move everything down 1
elif self.orientation % 4 == 1:
self.blockList[0].setRelativeX(-self.size)
self.blockList[0].setRelativeY(self.size)
self.blockList[0].setRelativeY(self.size) # - self.size)
self.blockList[1].setRelativeX(-self.size)
self.blockList[1].setRelativeY(-self.size)
self.blockList[1].setRelativeY(-self.size) # - self.size)
self.blockList[2].setRelativeX(-2 * self.size)
self.blockList[3].setRelativeY(2 * self.size)
# self.blockList[2].setRelativeY(-self.size) ####
self.blockList[3].setRelativeY(2 * self.size) # - self.size)
# move everything up 1
elif self.orientation % 4 == 2:
self.blockList[0].setRelativeX(self.size)
self.blockList[0].setRelativeY(self.size)
self.blockList[0].setRelativeY(self.size) # - self.size)
self.blockList[1].setRelativeX(-self.size)
self.blockList[1].setRelativeY(self.size)
self.blockList[2].setRelativeY(2 * self.size)
self.blockList[1].setRelativeY(self.size) # - self.size)
self.blockList[2].setRelativeY(2 * self.size) # - self.size)
self.blockList[3].setRelativeX(2 * self.size)
# self.blockList[3].setRelativeY(-self.size) ####
# move everything up 1
elif self.orientation % 4 == 3:
self.blockList[0].setRelativeX(self.size)
self.blockList[0].setRelativeY(-self.size)
self.blockList[0].setRelativeY(-self.size) # + self.size)
self.blockList[1].setRelativeX(self.size)
self.blockList[1].setRelativeY(self.size)
self.blockList[1].setRelativeY(self.size) # + self.size)
self.blockList[2].setRelativeX(2 * self.size)
self.blockList[3].setRelativeY(-2 * self.size)
# self.blockList[2].setRelativeY(self.size) ####
self.blockList[3].setRelativeY(-2 * self.size) # + self.size)
# move everything down 1

# if self.orientation % 4 == 0:
# self.blockList[0].setRelativeX(-2 * self.size)
Expand Down Expand Up @@ -356,3 +372,5 @@ def setX(self, x):
for i in range(0, len(self.blockList)):
self.blockList[i].setRelativeX(dx)

def getColor(self):
return self.color
80 changes: 50 additions & 30 deletions Block/BlockL.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ def rotateL(self):

self.orientation = self.orientation + 1

def rotateL2(self):
# rotation about index 1
def rotateL3(self):
if self.orientation % 4 == 0:
self.blockList[0].setRelativeX(self.size)
self.blockList[0].setRelativeY(self.size)
Expand Down Expand Up @@ -107,7 +108,8 @@ def rotateL2(self):

self.orientation = self.orientation + 1

def rotateR2(self):
# rotation about index 1
def rotateR3(self):
if self.orientation % 4 == 0:
self.blockList[0].setRelativeX(self.size)
self.blockList[0].setRelativeY(-self.size)
Expand Down Expand Up @@ -139,36 +141,44 @@ def rotateR2(self):

self.orientation = self.orientation - 1


def rotateL3(self):
# center rotation
def rotateL2(self):
if self.orientation % 4 == 0:
self.blockList[0].setRelativeX(self.size)
self.blockList[0].setRelativeY(-self.size)
self.blockList[1].setRelativeY(-2*self.size)
self.blockList[0].setRelativeY(-self.size) # + self.size)
self.blockList[1].setRelativeY(-2*self.size) # + self.size)
self.blockList[2].setRelativeX(-self.size)
self.blockList[2].setRelativeY(-self.size)
self.blockList[2].setRelativeY(-self.size) # + self.size)
self.blockList[3].setRelativeX(2*self.size)
# self.blockList[3].setRelativeY(self.size) ####
# move everything down 1
elif self.orientation % 4 == 1:
self.blockList[0].setRelativeX(-self.size)
self.blockList[0].setRelativeY(-self.size)
self.blockList[0].setRelativeY(-self.size) # + self.size)
self.blockList[1].setRelativeX(-2 * self.size)
# self.blockList[1].setRelativeY(self.size) ####
self.blockList[2].setRelativeX(-self.size)
self.blockList[2].setRelativeY(self.size)
self.blockList[3].setRelativeY(-2 * self.size)
self.blockList[2].setRelativeY(self.size) # + self.size)
self.blockList[3].setRelativeY(-2 * self.size) # + self.size)
# move everything down 1
elif self.orientation % 4 == 2:
self.blockList[0].setRelativeX(-self.size)
self.blockList[0].setRelativeY(self.size)
self.blockList[1].setRelativeY(2 * self.size)
self.blockList[0].setRelativeY(self.size) # - self.size)
self.blockList[1].setRelativeY(2 * self.size) # - self.size)
self.blockList[2].setRelativeX(self.size)
self.blockList[2].setRelativeY(self.size)
self.blockList[2].setRelativeY(self.size) # - self.size)
self.blockList[3].setRelativeX(-2 * self.size)
# self.blockList[3].setRelativeY(-self.size) ####
# move everything up 1
elif self.orientation % 4 == 3:
self.blockList[0].setRelativeX(self.size)
self.blockList[0].setRelativeY(self.size)
self.blockList[0].setRelativeY(self.size) # - self.size)
self.blockList[1].setRelativeX(2 * self.size)
# self.blockList[1].setRelativeY(-self.size) ####
self.blockList[2].setRelativeX(self.size)
self.blockList[2].setRelativeY(-self.size)
self.blockList[3].setRelativeY(2 * self.size)
self.blockList[2].setRelativeY(-self.size) # - self.size)
self.blockList[3].setRelativeY(2 * self.size) # - self.size)
# move everything up 1

# if self.orientation % 4 == 0:
# self.blockList[0].setRelativeX(2*self.size)
Expand Down Expand Up @@ -197,35 +207,44 @@ def rotateL3(self):

self.orientation = self.orientation + 1

def rotateR3(self):
# center rotation
def rotateR2(self):
if self.orientation % 4 == 0:
self.blockList[0].setRelativeX(-self.size)
self.blockList[0].setRelativeY(-self.size)
self.blockList[0].setRelativeY(-self.size) # + self.size)
self.blockList[1].setRelativeX(-2 * self.size)
# self.blockList[1].setRelativeY(self.size) ####
self.blockList[2].setRelativeX(-self.size)
self.blockList[2].setRelativeY(self.size)
self.blockList[3].setRelativeY(-2 * self.size)
self.blockList[2].setRelativeY(self.size) # + self.size)
self.blockList[3].setRelativeY(-2 * self.size) # + self.size)
# move everything down 1
elif self.orientation % 4 == 1:
self.blockList[0].setRelativeX(-self.size)
self.blockList[0].setRelativeY(self.size)
self.blockList[1].setRelativeY(2 * self.size)
self.blockList[0].setRelativeY(self.size) # - self.size)
self.blockList[1].setRelativeY(2 * self.size) # - self.size)
self.blockList[2].setRelativeX(self.size)
self.blockList[2].setRelativeY(self.size)
self.blockList[2].setRelativeY(self.size) # - self.size)
self.blockList[3].setRelativeX(-2 * self.size)
# self.blockList[3].setRelativeY(-self.size) ####
# move everything up 1
elif self.orientation % 4 == 2:
self.blockList[0].setRelativeX(self.size)
self.blockList[0].setRelativeY(self.size)
self.blockList[0].setRelativeY(self.size) # - self.size)
self.blockList[1].setRelativeX(2 * self.size)
# self.blockList[1].setRelativeY(-self.size) ####
self.blockList[2].setRelativeX(self.size)
self.blockList[2].setRelativeY(-self.size)
self.blockList[3].setRelativeY(2 * self.size)
self.blockList[2].setRelativeY(-self.size) # - self.size)
self.blockList[3].setRelativeY(2 * self.size) # - self.size)
# move everything up 1
elif self.orientation % 4 == 3:
self.blockList[0].setRelativeX(self.size)
self.blockList[0].setRelativeY(-self.size)
self.blockList[1].setRelativeY(-2 * self.size)
self.blockList[0].setRelativeY(-self.size) # + self.size)
self.blockList[1].setRelativeY(-2 * self.size) # + self.size)
self.blockList[2].setRelativeX(-self.size)
self.blockList[2].setRelativeY(-self.size)
self.blockList[2].setRelativeY(-self.size) # + self.size)
self.blockList[3].setRelativeX(2 * self.size)
# self.blockList[3].setRelativeY(self.size) ####
# move everything down 1

# if self.orientation % 4 == 0:
# self.blockList[0].setRelativeY(-2 * self.size)
Expand Down Expand Up @@ -369,4 +388,5 @@ def setX(self, x):
for i in range (0, len(self.blockList)):
self.blockList[i].setRelativeX(dx)


def getColor(self):
return self.color
3 changes: 3 additions & 0 deletions Block/BlockO.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,6 @@ def setX(self, x):
self.x = x
for i in range (0, len(self.blockList)):
self.blockList[i].setRelativeX(dx)

def getColor(self):
return self.color
4 changes: 4 additions & 0 deletions Block/BlockS.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,3 +286,7 @@ def setX(self, x):
self.x = x
for i in range(0, len(self.blockList)):
self.blockList[i].setRelativeX(dx)

def getColor(self):
return self.color

3 changes: 3 additions & 0 deletions Block/BlockT.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,3 +293,6 @@ def setX(self, x):
self.x = x
for i in range (0, len(self.blockList)):
self.blockList[i].setRelativeX(dx)

def getColor(self):
return self.color
2 changes: 2 additions & 0 deletions Block/BlockZ.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,3 +296,5 @@ def setX(self, x):
for i in range(0, len(self.blockList)):
self.blockList[i].setRelativeX(dx)

def getColor(self):
return self.color
Loading