mirror of
https://github.com/Sneed-Group/Poodletooth-iLand
synced 2024-12-23 11:42:39 -06:00
More work
This commit is contained in:
parent
167c5c5736
commit
c568a632f1
7 changed files with 13 additions and 13 deletions
|
@ -19,7 +19,7 @@ import DistributedAvatar
|
|||
from otp.ai.MagicWordGlobal import *
|
||||
from otp.otpbase import OTPGlobals
|
||||
from otp.otpbase import OTPLocalizer
|
||||
from toontown.chat.ChatGlobals import *
|
||||
from otp.nametag.NametagConstants import *
|
||||
from toontown.toonbase import ToontownGlobals
|
||||
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ from direct.gui.DirectGui import *
|
|||
from direct.showbase import DirectObject
|
||||
from panda3d.core import *
|
||||
from otp.otpbase import OTPLocalizer
|
||||
from toontown.chat.ChatGlobals import *
|
||||
from otp.nametag.NametagConstants import *
|
||||
import ChatUtil
|
||||
|
||||
ChatEvent = 'ChatEvent'
|
||||
|
|
|
@ -4,7 +4,7 @@ from direct.fsm import StateData
|
|||
from toontown.toon import ToonAvatarPanel
|
||||
from toontown.toonbase import ToontownGlobals
|
||||
from toontown.toonbase import TTLocalizer
|
||||
from toontown.nametag.NametagGlobals import *
|
||||
from otp.nametag.NametagGroup import *
|
||||
from otp.otpbase import OTPGlobals
|
||||
FLPPets = 1
|
||||
FLPOnline = 2
|
||||
|
|
|
@ -16,7 +16,7 @@ from MakeAToonGlobals import *
|
|||
import MakeClothesGUI
|
||||
import NameShop
|
||||
from otp.avatar import Avatar
|
||||
from toontown.chat.ChatGlobals import *
|
||||
from otp.nametag.NametagConstants import *
|
||||
from toontown.distributed.ToontownMsgTypes import *
|
||||
from toontown.toon import LocalToon
|
||||
from toontown.toon import Toon
|
||||
|
|
|
@ -27,8 +27,9 @@ Component2IconDict = {'boredom': 'Bored',
|
|||
'surprise': 'Surprised',
|
||||
'affection': 'Love'}
|
||||
|
||||
from toontown.nametag import *
|
||||
from toontown.nametag.NametagGlobals import *
|
||||
from otp.nametag import *
|
||||
from otp.nametag.NametagConstants import *
|
||||
from otp.nametag.NametagGroup import *
|
||||
|
||||
class Pet(Avatar.Avatar):
|
||||
notify = DirectNotifyGlobal.directNotify.newCategory('Pet')
|
||||
|
@ -45,7 +46,7 @@ class Pet(Avatar.Avatar):
|
|||
Pet.SerialNum += 1
|
||||
self.lockedDown = 0
|
||||
self.setPickable(1)
|
||||
self.setPlayerType(NametagGlobals.CCNonPlayer)
|
||||
self.setPlayerType(NametagGroup.CCNonPlayer)
|
||||
self.animFSM = ClassicFSM('petAnimFSM', [State('off', self.enterOff, self.exitOff),
|
||||
State('neutral', self.enterNeutral, self.exitNeutral),
|
||||
State('neutralHappy', self.enterNeutralHappy, self.exitNeutralHappy),
|
||||
|
|
|
@ -3,7 +3,7 @@ from direct.directnotify import DirectNotifyGlobal
|
|||
from direct.interval.IntervalGlobal import *
|
||||
from direct.showbase import DirectObject
|
||||
from otp.speedchat import SpeedChatGlobals
|
||||
from toontown.chat.ChatGlobals import *
|
||||
from otp.nametag.NametagConstants import *
|
||||
from toontown.suit import Suit, SuitDNA
|
||||
from toontown.toon import ToonHeadFrame
|
||||
from toontown.toonbase import TTLocalizer, ToontownBattleGlobals
|
||||
|
|
|
@ -25,10 +25,9 @@ from toontown.battle.BattleSounds import *
|
|||
from toontown.catalog import CatalogNotifyDialog
|
||||
from toontown.chat import TTTalkAssistant
|
||||
from toontown.chat import ToontownChatManager
|
||||
from toontown.chat.ChatGlobals import *
|
||||
from toontown.chat.WhisperPopup import *
|
||||
from otp.nametag.NametagConstants import *
|
||||
from otp.margins.WhisperPopup import *
|
||||
from toontown.estate import GardenGlobals
|
||||
from toontown.nametag.NametagGlobals import *
|
||||
from toontown.parties import PartyGlobals
|
||||
from toontown.quest import QuestMap
|
||||
from toontown.quest import QuestParser
|
||||
|
@ -1211,12 +1210,12 @@ class LocalToon(DistributedToon.DistributedToon, LocalAvatar.LocalAvatar):
|
|||
def showGardeningGui(self):
|
||||
self.loadGardeningGui()
|
||||
self.__gardeningGui.show()
|
||||
base.setCellsActive([base.leftCells[2]], 0)
|
||||
base.setCellsAvailable([base.leftCells[2]], 0)
|
||||
|
||||
def hideGardeningGui(self):
|
||||
if self.__gardeningGui:
|
||||
self.__gardeningGui.hide()
|
||||
base.setCellsActive([base.leftCells[2]], 1)
|
||||
base.setCellsAvailable([base.leftCells[2]], 1)
|
||||
|
||||
def showShovelButton(self, add = 0):
|
||||
if add:
|
||||
|
|
Loading…
Reference in a new issue