From 7a8552c10e99f784c58f2c350f9ebdb58d4380c2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 12 Aug 2015 19:14:40 +0300 Subject: [PATCH] More fixes --- toontown/coghq/CogHQLobby.py | 4 ++-- toontown/coghq/FactoryExterior.py | 4 ++-- toontown/estate/Estate.py | 4 ++-- toontown/estate/House.py | 4 ++-- toontown/safezone/Playground.py | 6 ++++-- toontown/town/Street.py | 4 ++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/toontown/coghq/CogHQLobby.py b/toontown/coghq/CogHQLobby.py index fc1377da..a198421c 100755 --- a/toontown/coghq/CogHQLobby.py +++ b/toontown/coghq/CogHQLobby.py @@ -22,8 +22,8 @@ class CogHQLobby(Place.Place): 'doorOut', 'stopped']), State.State('stopped', self.enterStopped, self.exitStopped, ['walk', 'teleportOut', 'elevator']), - State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk']), - State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk']), + State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk', 'stopped']), + State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk', 'stopped']), State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk']), State.State('elevator', self.enterElevator, self.exitElevator, ['walk', 'stopped']), State.State('final', self.enterFinal, self.exitFinal, ['start'])], 'start', 'final') diff --git a/toontown/coghq/FactoryExterior.py b/toontown/coghq/FactoryExterior.py index f29269ec..f1957ada 100755 --- a/toontown/coghq/FactoryExterior.py +++ b/toontown/coghq/FactoryExterior.py @@ -43,8 +43,8 @@ class FactoryExterior(BattlePlace.BattlePlace): State.State('battle', self.enterBattle, self.exitBattle, ['walk', 'teleportOut', 'died']), State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk']), State.State('teleportOut', self.enterTeleportOut, self.exitTeleportOut, ['teleportIn', 'final', 'WaitForBattle']), - State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk']), - State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk']), + State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk', 'stopped']), + State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk', 'stopped']), State.State('died', self.enterDied, self.exitDied, ['quietZone']), State.State('tunnelIn', self.enterTunnelIn, self.exitTunnelIn, ['walk']), State.State('tunnelOut', self.enterTunnelOut, self.exitTunnelOut, ['final']), diff --git a/toontown/estate/Estate.py b/toontown/estate/Estate.py index 8081a66b..7087b9e6 100755 --- a/toontown/estate/Estate.py +++ b/toontown/estate/Estate.py @@ -62,8 +62,8 @@ class Estate(Place.Place): 'activity']), State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk', 'petTutorial']), State.State('teleportOut', self.enterTeleportOut, self.exitTeleportOut, ['teleportIn', 'walk', 'final']), - State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk']), - State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['final', 'walk']), + State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk', 'stopped']), + State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['final', 'walk', 'stopped']), State.State('final', self.enterFinal, self.exitFinal, ['teleportIn']), State.State('quest', self.enterQuest, self.exitQuest, ['walk']), State.State('activity', self.enterActivity, self.exitActivity, ['walk', 'stopped']), diff --git a/toontown/estate/House.py b/toontown/estate/House.py index 9c563998..7e896de7 100755 --- a/toontown/estate/House.py +++ b/toontown/estate/House.py @@ -43,8 +43,8 @@ class House(Place.Place): 'banking', 'phone', 'stopped']), - State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk']), - State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk']), + State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk', 'stopped']), + State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk', 'stopped']), State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk']), State.State('teleportOut', self.enterTeleportOut, self.exitTeleportOut, ['teleportIn']), State.State('quest', self.enterQuest, self.exitQuest, ['walk', 'doorOut']), diff --git a/toontown/safezone/Playground.py b/toontown/safezone/Playground.py index e561689d..3701b780 100755 --- a/toontown/safezone/Playground.py +++ b/toontown/safezone/Playground.py @@ -75,11 +75,13 @@ class Playground(Place.Place): State.State('doorIn', self.enterDoorIn, self.exitDoorIn, [ - 'walk']), + 'walk', + 'stopped']), State.State('doorOut', self.enterDoorOut, self.exitDoorOut, [ - 'walk']), + 'walk', + 'stopped']), State.State('NPCFA', self.enterNPCFA, self.exitNPCFA, [ diff --git a/toontown/town/Street.py b/toontown/town/Street.py index 83bf4a2a..8544a5b0 100755 --- a/toontown/town/Street.py +++ b/toontown/town/Street.py @@ -67,8 +67,8 @@ class Street(BattlePlace.BattlePlace): 'purchase']), State.State('WaitForBattle', self.enterWaitForBattle, self.exitWaitForBattle, ['battle', 'walk']), State.State('battle', self.enterBattle, self.exitBattle, ['walk', 'teleportOut', 'died']), - State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk']), - State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk']), + State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk', 'stopped']), + State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk', 'stopped']), State.State('elevatorIn', self.enterElevatorIn, self.exitElevatorIn, ['walk']), State.State('elevator', self.enterElevator, self.exitElevator, ['walk']), State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk',