Changeset 201

Show
Ignore:
Timestamp:
03/19/2012 01:22:34 AM (2 years ago)
Author:
ecoughlan
Message:

Fixed out of frame response of research values for spinner and detailed description.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • src/game.py

    r200 r201  
    9090            return [self.currentTurn.createBuildMenu(CAT_LUT.index(parsed[1]))] 
    9191        if parsed[0] == 'researchDescription': 
    92             return [self.currentTurn.createResearchDescription(CAT_LUT.index(parsed[1]))] 
     92            return [self.currentTurn.createResearchDescription(CAT_LUT.index(parsed[1])),self.currentTurn.createResearchValues()] 
    9393        if parsed[0] == 'researchValues': 
    9494            return [self.currentTurn.createResearchValues()] 
     
    166166        if signal == 'increment': 
    167167            self.currentTurn.incrementSpinner() 
    168             return [self.currentTurn.updateSpinner()] 
     168            return [self.currentTurn.updateSpinner(),self.currentTurn.createResearchValues()] 
    169169         
    170170        elif signal == 'decrement': 
    171171            self.currentTurn.decrementSpinner() 
    172             return [self.currentTurn.updateSpinner()] 
     172            return [self.currentTurn.updateSpinner(),self.currentTurn.createResearchValues()] 
    173173         
    174174        elif signal == 'cancel': 
    175175            if DEBUG == 0 or DEBUG == 4: 
    176176                print 'research cancelled' 
    177             return [] 
     177            return [self.currentTurn.createResearchValues()] 
    178178         
    179179        elif signal == 'research': 
    180180            self.currentTurn.research() 
    181             return [self.displayStats()] 
     181            return [self.displayStats(),self.currentTurn.createResearchValues()] 
    182182         
    183183        return []