Skip to content

Commit

Permalink
Keep juego.py independent of sugar3.* libraries
Browse files Browse the repository at this point in the history
activity_root which has the path returned by get_activity_root(), is passed as an argument to the functions
  • Loading branch information
JuiP authored and quozl committed Aug 11, 2020
1 parent 597cfbb commit d32644b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 18 deletions.
5 changes: 3 additions & 2 deletions JAMath.py
Expand Up @@ -10,6 +10,7 @@
from juego import Game

from sugar3.activity.activity import Activity
from sugar3.activity.activity import get_activity_root
from sugar3.graphics.toolbarbox import ToolbarBox
from sugar3.activity.widgets import ActivityToolbarButton
from sugar3.activity.widgets import StopButton
Expand All @@ -21,8 +22,8 @@ def __init__(self, handle):
Activity.__init__(self, handle)

self.max_participants = 1
self.jamath_activity = Game()

self.jamath_activity = Game(get_activity_root())
self.build_toolbar()
self._pygamecanvas = sugargame.canvas.PygameCanvas(self,
main=self.jamath_activity.run,
Expand Down
30 changes: 14 additions & 16 deletions juego.py
Expand Up @@ -9,8 +9,6 @@
import pygame
from pygame.locals import *

from sugar3.activity.activity import get_activity_root


class number(pygame.sprite.Sprite):

Expand Down Expand Up @@ -67,8 +65,8 @@ def cargar_imagen(nombre,trasnparent=False):

class Game():

def __init__(self):

def __init__(self, get_activity_root):
self.activity_root = get_activity_root
pass


Expand All @@ -80,7 +78,7 @@ def sy(coord_y):
return coord_y * scale_y

def main(self):
sonido_menu = load_sound("menu.ogg")
sonido_menu = load_sound("menu.ogg", self.activity_root)
jugar = self.fuente_130.render("JUGAR",True,(0,0,255))
level = self.fuente_130.render("NIVEL",True,(0,0,255))
quit = self.fuente_130.render("SALIR",True,(0,0,255))
Expand Down Expand Up @@ -134,7 +132,7 @@ def main(self):

def choose_level(self):

sonido_menu = load_sound("menu.ogg")
sonido_menu = load_sound("menu.ogg", self.activity_root)
facil = self.fuente_130.render("facil",True,(0,0,255))
medio = self.fuente_130.render("medio",True,(0,0,255))
dificil = self.fuente_130.render("dificil",True,(0,0,255))
Expand Down Expand Up @@ -201,11 +199,11 @@ def play(self, level):

another_quest = True

right_sound = load_sound("right.ogg")
wrong_sound = load_sound("wrong.ogg")
right_sound = load_sound("right.ogg", self.activity_root)
wrong_sound = load_sound("wrong.ogg", self.activity_root)
fondo = load_image(str(1) + ".jpg")
score = 0
puntuacionalta = load_puntuacionalta()
puntuacionalta = load_puntuacionalta(self.activity_root)

while self.running:
time = self.clock.tick(30) / 1000.
Expand Down Expand Up @@ -235,7 +233,7 @@ def play(self, level):
break
for event in pygame.event.get():
if event.type == QUIT:
save_puntuacionalta(score)
save_puntuacionalta(score, self.activity_root)
self.running = False
return
if event.type == MOUSEBUTTONDOWN:
Expand Down Expand Up @@ -294,17 +292,17 @@ def load_image(name):
return pygame.image.load(path).convert_alpha()

# Funcion para cargar Sonidos
def load_sound(name):
path = os.path.join(get_activity_root(),'data',name)
def load_sound(name, activity_root):
path = os.path.join(activity_root,'data',name)
try:
sound = pygame.mixer.Sound(path)
return sound
except:
print 'Warning, unable to load: ',path

# Funcion para guardar puntuaciones altas
def save_puntuacionalta(score):
file_path = os.path.join(get_activity_root(),'data', 'PuntajeAlto')
def save_puntuacionalta(score, activity_root):
file_path = os.path.join(activity_root,'data', 'PuntajeAlto')
print file_path
puntuacionalta = []
puntuacionalta.append(0)
Expand All @@ -318,8 +316,8 @@ def save_puntuacionalta(score):
File.write(str(score))
File.close()

def load_puntuacionalta():
file_path = os.path.join(get_activity_root(),'data', 'PuntajeAlto')
def load_puntuacionalta(activity_root):
file_path = os.path.join(activity_root,'data', 'PuntajeAlto')
print file_path
if os.path.exists(file_path):
try:
Expand Down

0 comments on commit d32644b

Please sign in to comment.