Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 19:52:37 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

More fixes

Browse source
This commit is contained in:
John 2015-08-12 19:14:40 +03:00
parent 19608959c5
commit 7a8552c10e
6 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toontown/coghq/CogHQLobby.py
View file

@ -22,8 +22,8 @@ class CogHQLobby(Place.Place):
'doorOut', 'doorOut',
'stopped']), 'stopped']),
State.State('stopped', self.enterStopped, self.exitStopped, ['walk', 'teleportOut', 'elevator']), State.State('stopped', self.enterStopped, self.exitStopped, ['walk', 'teleportOut', 'elevator']),
State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk']), State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk', 'stopped']),
State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk']), State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk', 'stopped']),
State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk']), State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk']),
State.State('elevator', self.enterElevator, self.exitElevator, ['walk', 'stopped']), State.State('elevator', self.enterElevator, self.exitElevator, ['walk', 'stopped']),
State.State('final', self.enterFinal, self.exitFinal, ['start'])], 'start', 'final') State.State('final', self.enterFinal, self.exitFinal, ['start'])], 'start', 'final')

4
toontown/coghq/FactoryExterior.py
View file

@ -43,8 +43,8 @@ class FactoryExterior(BattlePlace.BattlePlace):
State.State('battle', self.enterBattle, self.exitBattle, ['walk', 'teleportOut', 'died']), State.State('battle', self.enterBattle, self.exitBattle, ['walk', 'teleportOut', 'died']),
State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk']), State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk']),
State.State('teleportOut', self.enterTeleportOut, self.exitTeleportOut, ['teleportIn', 'final', 'WaitForBattle']), State.State('teleportOut', self.enterTeleportOut, self.exitTeleportOut, ['teleportIn', 'final', 'WaitForBattle']),
State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk']), State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk', 'stopped']),
State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk']), State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk', 'stopped']),
State.State('died', self.enterDied, self.exitDied, ['quietZone']), State.State('died', self.enterDied, self.exitDied, ['quietZone']),
State.State('tunnelIn', self.enterTunnelIn, self.exitTunnelIn, ['walk']), State.State('tunnelIn', self.enterTunnelIn, self.exitTunnelIn, ['walk']),
State.State('tunnelOut', self.enterTunnelOut, self.exitTunnelOut, ['final']), State.State('tunnelOut', self.enterTunnelOut, self.exitTunnelOut, ['final']),

4
toontown/estate/Estate.py
View file

@ -62,8 +62,8 @@ class Estate(Place.Place):
'activity']), 'activity']),
State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk', 'petTutorial']), State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk', 'petTutorial']),
State.State('teleportOut', self.enterTeleportOut, self.exitTeleportOut, ['teleportIn', 'walk', 'final']), State.State('teleportOut', self.enterTeleportOut, self.exitTeleportOut, ['teleportIn', 'walk', 'final']),
State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk']), State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk', 'stopped']),
State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['final', 'walk']), State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['final', 'walk', 'stopped']),
State.State('final', self.enterFinal, self.exitFinal, ['teleportIn']), State.State('final', self.enterFinal, self.exitFinal, ['teleportIn']),
State.State('quest', self.enterQuest, self.exitQuest, ['walk']), State.State('quest', self.enterQuest, self.exitQuest, ['walk']),
State.State('activity', self.enterActivity, self.exitActivity, ['walk', 'stopped']), State.State('activity', self.enterActivity, self.exitActivity, ['walk', 'stopped']),

4
toontown/estate/House.py
View file

@ -43,8 +43,8 @@ class House(Place.Place):
'banking', 'banking',
'phone', 'phone',
'stopped']), 'stopped']),
State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk']), State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk', 'stopped']),
State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk']), State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk', 'stopped']),
State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk']), State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk']),
State.State('teleportOut', self.enterTeleportOut, self.exitTeleportOut, ['teleportIn']), State.State('teleportOut', self.enterTeleportOut, self.exitTeleportOut, ['teleportIn']),
State.State('quest', self.enterQuest, self.exitQuest, ['walk', 'doorOut']), State.State('quest', self.enterQuest, self.exitQuest, ['walk', 'doorOut']),

6
toontown/safezone/Playground.py
View file

@ -75,11 +75,13 @@ class Playground(Place.Place):
State.State('doorIn', State.State('doorIn',
self.enterDoorIn, self.enterDoorIn,
self.exitDoorIn, [ self.exitDoorIn, [
'walk']), 'walk',
'stopped']),
State.State('doorOut', State.State('doorOut',
self.enterDoorOut, self.enterDoorOut,
self.exitDoorOut, [ self.exitDoorOut, [
'walk']), 'walk',
'stopped']),
State.State('NPCFA', State.State('NPCFA',
self.enterNPCFA, self.enterNPCFA,
self.exitNPCFA, [ self.exitNPCFA, [

4
toontown/town/Street.py
View file

@ -67,8 +67,8 @@ class Street(BattlePlace.BattlePlace):
'purchase']), 'purchase']),
State.State('WaitForBattle', self.enterWaitForBattle, self.exitWaitForBattle, ['battle', 'walk']), State.State('WaitForBattle', self.enterWaitForBattle, self.exitWaitForBattle, ['battle', 'walk']),
State.State('battle', self.enterBattle, self.exitBattle, ['walk', 'teleportOut', 'died']), State.State('battle', self.enterBattle, self.exitBattle, ['walk', 'teleportOut', 'died']),
State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk']), State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk', 'stopped']),
State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk']), State.State('doorOut', self.enterDoorOut, self.exitDoorOut, ['walk', 'stopped']),
State.State('elevatorIn', self.enterElevatorIn, self.exitElevatorIn, ['walk']), State.State('elevatorIn', self.enterElevatorIn, self.exitElevatorIn, ['walk']),
State.State('elevator', self.enterElevator, self.exitElevator, ['walk']), State.State('elevator', self.enterElevator, self.exitElevator, ['walk']),
State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk', State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk',