diff --git a/etc/toon.dc b/etc/toon.dc index 1d27fde..d6a4c6c 100755 --- a/etc/toon.dc +++ b/etc/toon.dc @@ -2817,7 +2817,7 @@ dclass DistributedGolfCourse : DistributedObject { setCurHoleIndex(int8) broadcast ram required; setCurHoleDoId(uint32) broadcast ram required; setDoneReward() airecv clsend; - setReward(uint8[] [4], int8[], uint8[] [4], uint8[] [4], uint8[] [4], uint32, uint32/100, uint32/100, uint32/100, uint32/100) broadcast; + setReward(uint8[] [], int8[], uint8[] [], uint8[] [], uint8[] [], uint32, uint32/100, uint32/100, uint32/100, uint32/100) broadcast; setCourseReady(int8, int16[], int8) broadcast; setHoleStart(int16) broadcast; setCourseExit() broadcast; diff --git a/toontown/golf/DistributedGolfCourseAI.py b/toontown/golf/DistributedGolfCourseAI.py index f9ec4aa..eb6dbd5 100644 --- a/toontown/golf/DistributedGolfCourseAI.py +++ b/toontown/golf/DistributedGolfCourseAI.py @@ -6,6 +6,7 @@ from pandac.PandaModules import * from direct.fsm.FSM import FSM from toontown.ai.ToonBarrier import * from toontown.golf import GolfGlobals +import functools INITIAL = 0 EXITED = 1 EXPECTED = 2 @@ -682,9 +683,9 @@ class DistributedGolfCourseAI(DistributedObjectAI.DistributedObjectAI, FSM): return -1 if GolfGlobals.TIME_TIE_BREAKER: - totalScores.sort(scoreCompareWithTime) + totalScores.sort(key=functools.cmp_to_key(scoreCompareWithTime)) else: - totalScores.sort(scoreCompareNoTime) + totalScores.sort(key=functools.cmp_to_key(scoreCompareNoTime)) curRank = 0 oldScore = 0 oldTime = 0 diff --git a/toontown/golf/GolfGlobals.py b/toontown/golf/GolfGlobals.py index 579fa18..5abc6d3 100644 --- a/toontown/golf/GolfGlobals.py +++ b/toontown/golf/GolfGlobals.py @@ -398,7 +398,7 @@ for key in TrophyRequirements: NumTrophies += len(TrophyRequirements[key]) NumCups = 3 -TrophiesPerCup = NumTrophies / NumCups +TrophiesPerCup = NumTrophies // NumCups def calcTrophyListFromHistory(history): retval = []