mirror of
https://github.com/Sneed-Group/Poodletooth-iLand
synced 2024-12-23 11:42:39 -06:00
Remove Gag Accuracy tasks
This commit is contained in:
John
parent
fa8cda0e40
commit
0c04d9d876
4 changed files with 21 additions and 40 deletions
|
|
@ -98,14 +98,6 @@ class BattleCalculatorAI:
|
|||
debug = self.notify.getDebug()
|
||||
attack = self.battle.toonAttacks[attackIndex]
|
||||
atkTrack, atkLevel = self.__getActualTrackLevel(attack)
|
||||
|
||||
hasAccuracyBuff = False
|
||||
toon = simbase.air.doId2do.get(attack[TOON_ID_COL])
|
||||
if toon:
|
||||
if toon.hasBuff(BGagAccuracy):
|
||||
if not ZoneUtil.isDynamicZone(toon.zoneId):
|
||||
if ZoneUtil.getWhereName(toon.zoneId, True) in ('street', 'factoryExterior', 'cogHQExterior'):
|
||||
hasAccuracyBuff = True
|
||||
|
||||
if atkTrack == NPCSOS:
|
||||
return (1, 95)
|
||||
|
|
@ -171,8 +163,6 @@ class BattleCalculatorAI:
|
|||
else:
|
||||
randChoice = random.randint(0, 99)
|
||||
propAcc = AvPropAccuracy[atkTrack][atkLevel]
|
||||
if hasAccuracyBuff:
|
||||
propAcc *= BGagAccuracyMultiplier
|
||||
if atkTrack == LURE:
|
||||
treebonus = self.__toonCheckGagBonus(attack[TOON_ID_COL], atkTrack, atkLevel)
|
||||
propBonus = self.__checkPropBonus(atkTrack)
|
||||
|
|
|
|||
|
|
@ -4819,12 +4819,8 @@ RewardDict = {
|
|||
3001: (BuffReward, ToontownGlobals.BMovementSpeed, 30),
|
||||
3002: (BuffReward, ToontownGlobals.BMovementSpeed, 60),
|
||||
3003: (BuffReward, ToontownGlobals.BMovementSpeed, 180),
|
||||
3004: (BuffReward, ToontownGlobals.BMovementSpeed, 360),
|
||||
# Gag Accuracy Increase
|
||||
3005: (BuffReward, ToontownGlobals.BGagAccuracy, 30),
|
||||
3006: (BuffReward, ToontownGlobals.BGagAccuracy, 60),
|
||||
3007: (BuffReward, ToontownGlobals.BGagAccuracy, 180),
|
||||
3008: (BuffReward, ToontownGlobals.BGagAccuracy, 360) }
|
||||
3004: (BuffReward, ToontownGlobals.BMovementSpeed, 360)
|
||||
}
|
||||
|
||||
|
||||
def getNumTiers():
|
||||
|
|
@ -4910,23 +4906,23 @@ RequiredRewardTrackDict = {
|
|||
OptionalRewardTrackDict = {
|
||||
TT_TIER: (),
|
||||
TT_TIER + 1: (),
|
||||
TT_TIER + 2: (1000, 601, 601, 602, 602, 2205, 2206, 2205, 2206, 3001, 3001, 3001, 3001, 3005, 3005, 3005, 3005),
|
||||
TT_TIER + 3: (601, 601, 602, 602, 2205, 2206, 2205, 2206, 3002, 3001, 3001, 3001, 3006, 3005, 3005, 3005),
|
||||
DD_TIER: (1000, 602, 602, 603, 603, 2101, 2102, 2105, 2106, 3002, 3002, 3002, 3001, 3006, 3006, 3006, 3005),
|
||||
DD_TIER + 1: (1000, 602, 602, 603, 603, 2101, 2102, 2105, 2106, 3002, 3002, 3002, 3001, 3006, 3006, 3006, 3005),
|
||||
DD_TIER + 2: (1000, 602, 602, 603, 603, 2101, 2102, 2105, 2106, 3002, 3002, 3002, 3002, 3006, 3006, 3006, 3006),
|
||||
DG_TIER: (1000, 603, 603, 604, 604, 2501, 2502, 2503, 2504, 2505, 2506, 3002, 3002, 3002, 3002, 3006, 3006, 3006, 3006),
|
||||
MM_TIER: (1000, 604, 604, 605, 605, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 3002, 3002, 3002, 3002, 3006, 3006, 3006, 3006),
|
||||
MM_TIER + 1: (1000, 604, 604, 605, 605, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 3003, 3003, 3002, 3002, 3007, 3007, 3007, 3006),
|
||||
MM_TIER + 2: (1000, 604, 604, 605, 605, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 3003, 3003, 3002, 3002, 3007, 3007, 3007, 3006),
|
||||
BR_TIER: (1000, 606, 606, 606, 606, 606, 607, 607, 607, 607, 607, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 3003, 3003, 3003, 3003, 3007, 3007, 3007, 3007),
|
||||
BR_TIER + 1: (1000, 606, 606, 606, 606, 606, 607, 607, 607, 607, 607, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 3003, 3003, 3003, 3003, 3007, 3007, 3007, 3007),
|
||||
BR_TIER + 2: (1000, 606, 606, 606, 606, 606, 607, 607, 607, 607, 607, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 3003, 3003, 3003, 3003, 3007, 3007, 3007, 3007),
|
||||
DL_TIER: (607, 607, 607, 607, 608, 608, 608, 608, 2901, 2902, 2907, 2908, 2909, 2910, 2911, 3003, 3003, 3004, 3004, 3007, 3007, 3008, 3008),
|
||||
DL_TIER + 1: (1000, 607, 607, 607, 607, 608, 608, 608, 608, 2923, 2924, 2927, 2928, 2929, 2930, 2931, 3003, 3003, 3004, 3004, 3007, 3007, 3008, 3008),
|
||||
DL_TIER + 2: (608, 608, 608, 608, 609, 609, 609, 609, 2941, 2942, 2943, 2944, 2947, 2948, 2949, 2950, 2951, 3004, 3004, 3004, 3004, 3008, 3008, 3008, 3008),
|
||||
DL_TIER + 3: (1000, 609, 609, 609, 609, 609, 609, 2961, 2962, 2963, 2964, 2965, 2966, 2967, 2968, 2969, 2970, 2971, 3004, 3004, 3004, 3004, 3008, 3008, 3008, 3008),
|
||||
ELDER_TIER: (1000, 1000, 610, 611, 612, 613, 614, 615, 616, 617, 618, 2961, 2962, 2963, 2964, 2965, 2966, 2967, 2968, 2969, 2970, 2971, 3004, 3004, 3004, 3008, 3008, 3008)
|
||||
TT_TIER + 2: (1000, 601, 601, 602, 602, 2205, 2206, 2205, 2206, 3001, 3001, 3001, 3001),
|
||||
TT_TIER + 3: (601, 601, 602, 602, 2205, 2206, 2205, 2206, 3002, 3001, 3001, 3001),
|
||||
DD_TIER: (1000, 602, 602, 603, 603, 2101, 2102, 2105, 2106, 3002, 3002, 3002, 3001),
|
||||
DD_TIER + 1: (1000, 602, 602, 603, 603, 2101, 2102, 2105, 2106, 3002, 3002, 3002, 3001),
|
||||
DD_TIER + 2: (1000, 602, 602, 603, 603, 2101, 2102, 2105, 2106, 3002, 3002, 3002, 3002),
|
||||
DG_TIER: (1000, 603, 603, 604, 604, 2501, 2502, 2503, 2504, 2505, 2506, 3002, 3002, 3002, 3002),
|
||||
MM_TIER: (1000, 604, 604, 605, 605, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 3002, 3002, 3002, 3002),
|
||||
MM_TIER + 1: (1000, 604, 604, 605, 605, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 3003, 3003, 3002, 3002),
|
||||
MM_TIER + 2: (1000, 604, 604, 605, 605, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 3003, 3003, 3002, 3002),
|
||||
BR_TIER: (1000, 606, 606, 606, 606, 606, 607, 607, 607, 607, 607, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 3003, 3003, 3003, 3003),
|
||||
BR_TIER + 1: (1000, 606, 606, 606, 606, 606, 607, 607, 607, 607, 607, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 3003, 3003, 3003, 3003),
|
||||
BR_TIER + 2: (1000, 606, 606, 606, 606, 606, 607, 607, 607, 607, 607, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 3003, 3003, 3003, 3003),
|
||||
DL_TIER: (607, 607, 607, 607, 608, 608, 608, 608, 2901, 2902, 2907, 2908, 2909, 2910, 2911, 3003, 3003, 3004, 3004),
|
||||
DL_TIER + 1: (1000, 607, 607, 607, 607, 608, 608, 608, 608, 2923, 2924, 2927, 2928, 2929, 2930, 2931, 3003, 3003, 3004, 3004),
|
||||
DL_TIER + 2: (608, 608, 608, 608, 609, 609, 609, 609, 2941, 2942, 2943, 2944, 2947, 2948, 2949, 2950, 2951, 3004, 3004, 3004, 3004),
|
||||
DL_TIER + 3: (1000, 609, 609, 609, 609, 609, 609, 2961, 2962, 2963, 2964, 2965, 2966, 2967, 2968, 2969, 2970, 2971, 3004, 3004, 3004, 3004),
|
||||
ELDER_TIER: (1000, 1000, 610, 611, 612, 613, 614, 615, 616, 617, 618, 2961, 2962, 2963, 2964, 2965, 2966, 2967, 2968, 2969, 2970, 2971, 3004, 3004, 3004)
|
||||
}
|
||||
|
||||
def isRewardOptional(tier, rewardId):
|
||||
|
|
|
|||
|
|
@ -8416,9 +8416,7 @@ BugReportNotice = 'Attention!\n\nThis button will open a browser which will send
|
|||
|
||||
buffIdStrings = {
|
||||
0: ('Your movement speed will be slightly increased for the next %d %s.',
|
||||
'Reward: Increased movement speed'),
|
||||
1: ('Your gag accuracy will be slightly increased for the next %d %s.',
|
||||
'Reward: Increased gag accuracy')
|
||||
'Reward: Increased movement speed')
|
||||
}
|
||||
|
||||
def getBuffString(buffId, buffTime):
|
||||
|
|
|
|||
|
|
@ -1620,9 +1620,6 @@ GloveCost = 2000
|
|||
BMovementSpeed = 0
|
||||
BMovementSpeedMultiplier = 1.3
|
||||
|
||||
BGagAccuracy = 1
|
||||
BGagAccuracyMultiplier = 1.3
|
||||
|
||||
BugReportSite = 'https://bugs.launchpad.net/toontown-united/+filebug'
|
||||
CostPerLaffRestock = 3
|
||||
FISHSALE_NONE = 0
|
||||
|
|
@ -1630,4 +1627,4 @@ FISHSALE_COMPLETE = 1
|
|||
FISHSALE_TROPHY = 2
|
||||
NPCCollisionDelay = 2.5
|
||||
KnockKnockHeal = 12
|
||||
KnockKnockCooldown = 600
|
||||
KnockKnockCooldown = 600
|
||||
Loading…
Reference in a new issue