diff --git a/fitg/ai/ai.py b/fitg/ai/ai.py index c60f63d..ab5ff28 100644 --- a/fitg/ai/ai.py +++ b/fitg/ai/ai.py @@ -46,6 +46,8 @@ def run(self): # ASSASSINATION: A # STOP REBELLION: R # GAIN CHARACTERS: G + + # Start game loop environ_list = c.get_state(gameid, "Environ")# = all environs in this scenario # when it's our turn while(True): diff --git a/fitg/client/Data/blue_planet.png b/fitg/client/Data/blue_planet.png index 9c00058..869fd8d 100644 Binary files a/fitg/client/Data/blue_planet.png and b/fitg/client/Data/blue_planet.png differ diff --git a/fitg/client/Data/purple_planet.png b/fitg/client/Data/purple_planet.png index 30b0fbb..6204edc 100644 Binary files a/fitg/client/Data/purple_planet.png and b/fitg/client/Data/purple_planet.png differ diff --git a/fitg/client/entities/environments.py b/fitg/client/entities/environments.py index 9162407..2459cf7 100644 --- a/fitg/client/entities/environments.py +++ b/fitg/client/entities/environments.py @@ -69,7 +69,8 @@ def updatepoints(self): angle = self.startangle while angle < self.endangle: angle = angle + UNITANGLE / 2 - self.collision_points.append((int(self.center[0] + (cos(angle) * self. averadius)), int(self.center[1] - (sin(angle) * self. averadius)))) + self.collision_points.append((int(self.center[0] + (cos(angle) * self. averadius)), + int(self.center[1] - (sin(angle) * self. averadius)))) angle = angle + UNITANGLE / 2 self.stacks = len(self.collision_points) @@ -98,7 +99,8 @@ def __init__(self, parent, planetrect): self.refresh = True self.planet = planetrect self.environ_list = [] - self.envarc = pygame.Rect(planetrect.topleft[0] - 75, planetrect.topleft[1] - 75, planetrect.width + 150, planetrect.height + 150) + self.envarc = pygame.Rect(planetrect.topleft[0] - 75, planetrect.topleft[1] - 75, + planetrect.width + 150, planetrect.height + 150) #def addEnviron(self, idnumber, type, size, race, creature, politics): def addEnviron(self, environdict): diff --git a/fitg/client/gui.py b/fitg/client/gui.py index e57c84e..e91fa0a 100644 --- a/fitg/client/gui.py +++ b/fitg/client/gui.py @@ -14,19 +14,19 @@ import hud.buttons as Menu_Buttons from support.loadimage import load_image -import menubar -from menubar import (MenuBar, planetFontSurface, planet1name, +import hud.planetbar as menubar +from hud.planetbar import (MenuBar, planetFontSurface, planet1name, planet2name, planet3name, planet4name, planet5name, planettextcolor, PlanetName, backgroundcolor) -from menubar import menubar as menubar_ +from hud.planetbar import menubar as menubar_ pygame.init() def main(client, setupinfo=None): gameid = 'test1'#setupinfo["request"]["parameters"]["id"] - height = 720 - width = 1024 + height = 800 + width = 1550 screensize = (width, height) screen = pygame.display.set_mode(screensize) clock = pygame.time.Clock() @@ -35,7 +35,7 @@ def main(client, setupinfo=None): running = True background, background_rect = load_image("stars.jpg") - outer_menu = MenuBar(planet1name, 1, backgroundcolor, True, (90,0)) + outer_menu = MenuBar(planet1name, 1, backgroundcolor, True, (700,0)) menubar.pdb_image, menubar.pdbrect = load_image("pdbup.png", None) menubar.pdbrect.topleft = menubar.pdbboxpostion screen.blit(background, background_rect) diff --git a/fitg/client/menubar.py b/fitg/client/hud/planetbar.py similarity index 99% rename from fitg/client/menubar.py rename to fitg/client/hud/planetbar.py index fc34232..ebe2e36 100644 --- a/fitg/client/menubar.py +++ b/fitg/client/hud/planetbar.py @@ -29,7 +29,7 @@ def load_image(image, colorkey=None): lightbluecolor = (100,149,237) #Marks the position of the Menu Bar relative to the master background screen -MenuBarUpperLeftCorner = (200,0) # For test purposes. The final product will pass these coordinates into the initialization +MenuBarUpperLeftCorner = (450,0) # For test purposes. The final product will pass these coordinates into the initialization x = MenuBarUpperLeftCorner[0] # take out y = MenuBarUpperLeftCorner[1] #take out