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

Feature Addition #14

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+57 −22
Open

Feature Addition #14

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d671c45
3 puzzles per level; separate best-time per level
sourabhaa Aug 22, 2021
1bd252e
fixed srting conversion
sourabhaa Aug 26, 2021
9a480f5
minor fix
sourabhaa Aug 26, 2021
3b3e266
minor fix in convert_to_int_list
sourabhaa Aug 26, 2021
f9eeb5f
fixed typo
sourabhaa Aug 29, 2021
2d881fe
testing saving and restoring best-time
sourabhaa Sep 5, 2021
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
79 changes: 57 additions & 22 deletions game.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
import cairo

import os
import time
from math import sqrt
from random import uniform
import time
from gettext import gettext as _

import logging
Expand All @@ -37,6 +37,7 @@
MAX = 7
WHITE = 2
DOT_SIZE = 80
MAX_COUNT = 3


class Game():
Expand Down Expand Up @@ -68,13 +69,15 @@ def __init__(self, canvas, parent=None, colors=['#A0FFA0', '#FF8080']):
self.best_time = self.load_best_time()
self.paused_time = 0
self.gameover_flag = None
self.count = 1

# Generate the sprites we'll need...
self._sprites = Sprites(self._canvas)
self._dots = []
self._gameover = []
self._your_time = []
self._best_time = []
self._levelup = []
self._generate_grid()

def _generate_grid(self):
Expand Down Expand Up @@ -118,14 +121,21 @@ def _all_clear(self):
dot.set_shape(self._new_dot(self._colors[0]))
dot.set_label('')
dot.set_layer(100)
if self.count == 0:
for levelup_shape in self._levelup:
levelup_shape.hide()

def _initiating(self):
return self._activity._collab.props.leader

def more_dots(self):
''' Enlarge the grid '''
if self._edge < MAX:
self._edge += 0
self.count += 1
if self._edge < MAX and self.count > MAX_COUNT:
self._edge += 1
self.count = 0
else:
self._edge = 4
self._generate_grid()
self.new_game()

Expand Down Expand Up @@ -170,9 +180,8 @@ def save_game(self):
return (dot_list, self._move_list, paused_time)

def gameover(self):

best_seconds = self.best_time % 60
best_minutes = self.best_time // 60
best_seconds = (self.best_time[self._edge-4]) % 60
best_minutes = (self.best_time[self._edge-4]) // 60
self.elapsed_time = int(self.game_stop_time
- self.game_start_time) + self.paused_time
second = self.elapsed_time % 60
Expand All @@ -183,7 +192,6 @@ def gameover(self):
xoffset = int((self._width - 6 * self._dot_size -
5 * self._space) / 2.)
y = 1
i = 0
for x in range(2, 6):
self._gameover.append(
Sprite(self._sprites,
Expand All @@ -192,7 +200,6 @@ def gameover(self):
self._new_dot(color=self._colors[0])))
self._gameover[-1].type = -1 # No image
self._gameover[-1].set_label_attributes(72)
i += 1
text = [
"☻",
" Game ",
Expand Down Expand Up @@ -225,16 +232,34 @@ def gameover(self):
self._new_dot(color=self._colors[0])))
self._best_time[-1].type = -1
self._best_time[-1].set_label_attributes(72)
if self.elapsed_time <= self.best_time:
self.best_time = self.elapsed_time
best_seconds = second
best_minutes = minute
if self.elapsed_time <= self.best_time[self._edge-4]:
self.best_time[self._edge-4] = self.elapsed_time
best_seconds = second
best_minutes = minute
text = [
" best ",
" time: ",
(' {:02d}:{:02d} '.format(best_minutes, best_seconds))
]
self.rings(len(text), text, self._best_time)

if self.count == MAX_COUNT:
y = 4
for x in range(2, 6):
self._levelup.append(
Sprite(self._sprites,
xoffset + (x - 0.25) * (self._dot_size - 10),
y * (self._dot_size - 10 + self._space) + yoffset,
self._new_dot(color=self._colors[0])))
self._levelup[-1].type = -1 # No image
self._levelup[-1].set_label_attributes(72)
text = [
"☻",
" Level ",
" Up! ",
"☻"
]
self.rings(len(text), text, self._levelup)
self.save_best_time()
self.paused_time = 0
GObject.timeout_add(3000, self.more_dots)
Expand Down Expand Up @@ -390,31 +415,41 @@ def _footer(self):
return '</svg>\n'

def read_best_time(self):
best_time = [180]
file_path = os.path.join(get_activity_root(), 'data', 'best-time')
best_time = [180, 180, 180, 180]
file_path = os.path.join(get_activity_root(), 'data', 'save_best_time')
if os.path.exists(file_path):
with open(file_path, "r") as fp:
best_time = fp.readlines()
return int(best_time[0])
best_time = fp.readline()
return best_time

def save_best_time(self):
file_path = os.path.join(get_activity_root(), 'data', 'best-time')
int_best_time = self.read_best_time()

if not int_best_time <= self.elapsed_time:
int_best_time = self.elapsed_time
file_path = os.path.join(get_activity_root(), 'data', 'save_best_time')
best_time = self.read_best_time()
if isinstance(best_time, str):
best_time = self.convert_to_int_list(best_time)
if not best_time[self._edge-4] <= self.elapsed_time:
best_time[self._edge-4] = self.elapsed_time
with open(file_path, "w") as fp:
fp.write(str(int_best_time))
fp.write(str(best_time))

def load_best_time(self):
best_time = self.read_best_time()
if isinstance(best_time, str):
best_time = self.convert_to_int_list(best_time)
try:
return best_time
except (ValueError, IndexError) as e:
logging.exception(e)
return 0
return 0

def convert_to_int_list(self, str_data):
list_int = []
str_data = str_data[1:len(str_data)-1].split(", ")
for i in range(len(str_data)):
list_int.append(int(str_data[i]))
return list_int


def svg_str_to_pixbuf(svg_string):
""" Load pixbuf from SVG string """
Expand Down