Changeset 283

Show
Ignore:
Timestamp:
07/09/2012 11:12:19 AM (22 months ago)
Author:
kvigue
Message:

Fixed some file path things that had the potential to cause problems
Fixed a bug where the cursors on the Bonus intro weren't at the right distance

Location:
src
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • src/bonus.py

    r281 r283  
    2727        self.timeColor = BBUILDER.SALMON_COLOR 
    2828        self.exit = False #Exit flag 
    29         self.introButtons = [GameButton(BBUILDER.BUTTON_0, (460,415), (300,50), "continue"), GameButton(BBUILDER.BUTTON_0, (260, 415), (100, 50), "skip")] 
     29        self.introButtons = [GameButton(BBUILDER.BUTTON_0, (460,415), (200,50), "continue"), GameButton(BBUILDER.BUTTON_0, (260, 415), (200, 50), "skip")] 
    3030        self.cursorTimer = 0 
    3131        self.cursor = "cursor0.png" 
  • src/graphics.py

    r279 r283  
    6666 
    6767    def drawText(self, text, x, y, textSize, color=pygame.Color("black"), 
    68                  drawpos="left", fontName="fonts\goboom.ttf", cursor = False): 
     68                 drawpos="left", fontName='goboom.ttf', cursor = False): 
    6969        """parses a string for certain indicators and draws it""" 
     70        fontName = path.join(path.curdir, path.join('fonts', fontName)) 
    7071        if text != "": 
    7172            textLines = [] #Will contain different lines 
     
    159160    def loadImage(self, imageName): 
    160161        """loads an image either from a file or from the image dictionary""" 
    161         imageName = path.join('images', imageName) 
     162        imageName = path.join(path.curdir, path.join('images', imageName)) 
    162163        if not (imageName in self.imageDict): 
    163164            try: 
  • src/scores.txt

    r278 r283  
    1 (imenu 
    2 HighScores 
    3 p1 
    4 (dp2 
    5 S'story' 
    6 p3 
    7 (lp4 
    8 (I76000 
    9 S'Kevin' 
    10 p5 
    11 tp6 
    12 a(I67000 
    13 S'asda' 
    14 p7 
    15 tp8 
    16 a(I0 
    17 S'n' 
    18 tp9 
    19 asS'survival' 
    20 p10 
    21 (lp11 
    22 sb. 
  • src/sound.py

    r273 r283  
    1919        """plays a sound with filename soundName""" 
    2020        self.loadSound(soundName).play() 
    21          
     21 
    2222    def stopSound(self, soundName, loops): 
    2323        self.loadSound(soundName).stop() 
     
    2525    def loadSound(self, soundName): 
    2626        """loads a sound either from a file or from the sound dictionary""" 
    27         soundName = path.join('sounds', soundName) 
     27        soundName = path.join(path.curdir, path.join('sounds', soundName)) 
    2828        if not (soundName in self.soundDict): 
    2929            try: 
  • src/story.py

    r281 r283  
    9898        else: 
    9999            return self.generatePuzzle() 
    100          
     100 
    101101        #second number is maximum supported puzzle value 
    102102        #randint(0,2)+(1+2*self.puzzlesCompleted) 
     
    227227                self.toggleList[toggle].play = False 
    228228        if valueChange == "Continue": #Mode is Intro, Victory, or End 
    229             print "Getting to the state change" 
    230229            if self.puzzleState == BBUILDER.INTRO: 
    231230                self.puzzleState = BBUILDER.PUZZLE 
     
    318317            # size is changed 
    319318 
    320             self.cursorTimer += 10 
    321             self.cursorTimer = self.cursorTimer % 360 
     319        self.cursorTimer += 10 
     320        self.cursorTimer = self.cursorTimer % 360 
    322321 
    323322