Ignore:
Timestamp:
03/03/11 20:49:43 (9 years ago)
Author:
beliar
Message:

Merge branch 'character_creation_logic' into HEAD

Conflicts:

game/parpg/charactercreationcontroller.py

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/active/character_customization/game/parpg/characterstatistics.py

    r774 r776  
    142142        statistic_type = self.statistic_type 
    143143        stat_modifiers = statistic_type.stat_modifiers 
    144         character = statistic_type.character 
     144        character = self.character() 
    145145         
    146146        value = sum( 
    147             character.statistics[name] * modifier for name, modifier in 
     147            character.statistics[name].value * modifier for name, modifier in 
    148148                stat_modifiers.items() 
    149149        ) 
Note: See TracChangeset for help on using the changeset viewer.