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

UGH WHEN WILL THIS END

Browse source
This commit is contained in:
John Cote 2015-06-26 00:32:17 -04:00
parent dd45d7d7be
commit 9b52f82419
11 changed files with 27 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/battle/MovieHeal.py
View file

@ -10,7 +10,7 @@ from BattleSounds import *
import MovieCamera
import MovieNPCSOS
import MovieUtil
from toontown.chat.ChatGlobals import *
from otp.nametag.NametagConstants import *
from toontown.effects import Splash
from toontown.toon import NPCToons
from toontown.toonbase import TTLocalizer

2
toontown/battle/MoviePetSOS.py
View file

@ -7,7 +7,7 @@ from BattleProps import *
from BattleSounds import *
import MovieCamera
import MovieUtil
from toontown.chat.ChatGlobals import *
from otp.nametag.NametagConstants import *
from toontown.pets import Pet, PetTricks
from toontown.toonbase import TTLocalizer
from toontown.toonbase import ToontownBattleGlobals

4
toontown/building/DistributedBoardingParty.py
View file

@ -6,8 +6,8 @@ from panda3d.core import *
import BoardingGroupShow
from toontown.building import BoardingPartyBase
from toontown.chat.ChatGlobals import *
from toontown.chat.WhisperPopup import *
from otp.nametag.NametagConstants import *
from otp.margins.WhisperPopup import *
from toontown.hood import ZoneUtil
from toontown.toon import BoardingGroupInviterPanels
from toontown.toon import GroupInvitee

2
toontown/building/DistributedTutorialInterior.py
View file

@ -15,7 +15,7 @@ from toontown.suit import Suit
from toontown.quest import QuestParser
from toontown.toon import DistributedNPCSpecialQuestGiver
from toontown.toonbase import TTLocalizer
from toontown.chat.ChatGlobals import CFSpeech
from otp.nametag.NametagConstants import CFSpeech
class DistributedTutorialInterior(DistributedObject.DistributedObject):

12
toontown/suit/DistributedCashbotBoss.py
View file

@ -17,15 +17,15 @@ from toontown.battle import SuitBattleGlobals
from toontown.building import ElevatorConstants
from toontown.building import ElevatorUtils
from toontown.chat import ResistanceChat
from toontown.chat.ChatGlobals import *
from toontown.coghq import CogDisguiseGlobals
from toontown.distributed import DelayDelete
from toontown.nametag import NametagGlobals
from toontown.nametag.NametagGlobals import *
from toontown.toon import Toon
from toontown.toon import ToonDNA
from toontown.toonbase import TTLocalizer
from toontown.toonbase import ToontownGlobals
from otp.nametag import NametagGroup
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
OneBossCog = None
@ -105,7 +105,7 @@ class DistributedCashbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
npc = Toon.Toon()
npc.setName(TTLocalizer.ResistanceToonName)
npc.setPickable(0)
npc.setPlayerType(NametagGlobals.CCNonPlayer)
npc.setPlayerType(NametagGroup.CCNonPlayer)
dna = ToonDNA.ToonDNA()
dna.newToonRandom(11237, 'f', 1)
dna.head = 'pls'
@ -716,7 +716,7 @@ class DistributedCashbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
def enterPrepareBattleThree(self):
self.controlToons()
NametagGlobals.setWant2dNametags(False)
NametagGlobals.setMasterArrowsOn(0)
intervalName = 'PrepareBattleThreeMovie'
delayDeletes = []
self.movieCrane = self.cranes[0]
@ -745,7 +745,7 @@ class DistributedCashbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
if self.newState == 'BattleThree':
self.movieCrane.request('Free')
self.movieSafe.request('Initial')
NametagGlobals.setWant2dNametags(True)
NametagGlobals.setMasterArrowsOn(1)
ElevatorUtils.closeDoors(self.leftDoor, self.rightDoor, ElevatorConstants.ELEVATOR_CFO)
taskMgr.remove(self.uniqueName('physics'))

11
toontown/suit/DistributedLawbotBoss.py
View file

@ -21,12 +21,11 @@ from toontown.battle import SuitBattleGlobals
from toontown.battle.BattleProps import *
from toontown.building import ElevatorConstants
from toontown.building import ElevatorUtils
from toontown.chat.ChatGlobals import *
from toontown.coghq import CogDisguiseGlobals
from toontown.distributed import DelayDelete
from toontown.nametag import NametagGlobals
from toontown.nametag import NametagGroup
from toontown.nametag.NametagGlobals import *
from otp.nametag import NametagGroup
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
from toontown.toon import Toon
from toontown.toonbase import TTLocalizer
from toontown.toonbase import ToontownBattleGlobals
@ -976,7 +975,7 @@ class DistributedLawbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
def exitBattleThree(self):
self.notify.debug('----- exitBattleThree')
DistributedBossCog.DistributedBossCog.exitBattleThree(self)
NametagGlobals.setWant2dNametags(True)
NametagGlobals.setMasterArrowsOn(1)
bossDoneEventName = self.uniqueName('DestroyedBoss')
self.ignore(bossDoneEventName)
taskMgr.remove(self.uniqueName('StandUp'))
@ -1597,7 +1596,7 @@ class DistributedLawbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
npc.setDNAString(dnaNetString)
npc.setName(TTLocalizer.WitnessToonName)
npc.setPickable(0)
npc.setPlayerType(NametagGlobals.CCNonPlayer)
npc.setPlayerType(NametagGroup.CCNonPlayer)
npc.animFSM.request('Sit')
self.witnessToon = npc
self.witnessToon.setPosHpr(*ToontownGlobals.LawbotBossWitnessStandPosHpr)

4
toontown/suit/DistributedSellbotBoss.py
View file

@ -19,15 +19,15 @@ from toontown.battle import MovieToonVictory
from toontown.battle import RewardPanel
from toontown.battle import SuitBattleGlobals
from toontown.battle.BattleProps import *
from toontown.chat.ChatGlobals import *
from toontown.coghq import CogDisguiseGlobals
from toontown.distributed import DelayDelete
from toontown.nametag.NametagGlobals import *
from toontown.suit import SellbotBossGlobals
from toontown.toon import NPCToons
from toontown.toonbase import TTLocalizer
from toontown.toonbase import ToontownBattleGlobals
from toontown.toonbase import ToontownGlobals
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
OneBossCog = None

11
toontown/suit/DistributedSuit.py
View file

@ -20,10 +20,9 @@ from otp.avatar import DistributedAvatar
from otp.otpbase import OTPLocalizer
from toontown.battle import BattleProps
from toontown.battle import DistributedBattle
from toontown.chat.ChatGlobals import *
from toontown.distributed.DelayDeletable import DelayDeletable
from toontown.nametag import NametagGlobals
from toontown.nametag.NametagGlobals import *
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
from libpandadna import *
from toontown.toonbase import ToontownGlobals
@ -632,11 +631,11 @@ class DistributedSuit(DistributedSuitBase.DistributedSuitBase, DelayDeletable):
base.playSfx(dialogue, node=self)
elif chatFlags & CFSpeech != 0:
if self.nametag.getNumChatPages() > 0:
self.playDialogueForString(self.nametag.getChatText())
self.playDialogueForString(self.nametag.getChat())
if self.soundChatBubble != None:
base.playSfx(self.soundChatBubble, node=self)
elif self.nametag.getStompChatText():
self.playDialogueForString(self.nametag.getStompChatText(), self.nametag.CHAT_STOMP_DELAY)
elif self.nametag.getChatStomp() > 0:
self.playDialogueForString(self.nametag.getStompText(), self.nametag.getStompDelay())
def playDialogueForString(self, chatString, delay = 0.0):
if len(chatString) == 0:

4
toontown/suit/DistributedSuitBase.py
View file

@ -6,9 +6,9 @@ from direct.interval.IntervalGlobal import *
from direct.task import Task
from otp.avatar import DistributedAvatar
from otp.otpbase import OTPGlobals
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
from toontown.battle import BattleProps
from toontown.chat.ChatGlobals import *
from toontown.nametag.NametagGlobals import *
from toontown.toonbase import TTLocalizer, ToontownGlobals
import Suit, SuitBase, SuitDialog, SuitTimings
import random

3
toontown/toon/DistributedNPCClerk.py
View file

@ -4,12 +4,11 @@ from panda3d.core import *
from DistributedNPCToonBase import *
import NPCToons
from toontown.chat.ChatGlobals import *
from toontown.hood import ZoneUtil
from toontown.minigame import ClerkPurchase
from toontown.nametag.NametagGlobals import *
from toontown.shtiker.PurchaseManagerConstants import *
from toontown.toonbase import TTLocalizer
from otp.nametag.NametagConstants import *
class DistributedNPCClerk(DistributedNPCToonBase):

3
toontown/toon/DistributedNPCToon.py
View file

@ -2,9 +2,8 @@ from direct.interval.IntervalGlobal import *
from panda3d.core import *
import time
from DistributedNPCToonBase import *
from toontown.chat.ChatGlobals import *
from toontown.hood import ZoneUtil
from toontown.nametag.NametagGlobals import *
from otp.nametag.NametagConstants import *
from toontown.quest import QuestChoiceGui
from toontown.quest import QuestParser
from toontown.quest import TrackChoiceGui