zontreck/ToonTownRewritten
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bugfix: import nametags

Browse source
This commit is contained in:
Maverick Mosher 2014-04-07 03:08:46 -07:00
parent 83c5d0dedd
commit 164758e9ed
14 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/battle/DistributedBattle.py
View file

@ -13,6 +13,8 @@ from otp.avatar import Emote
import SuitBattleGlobals
from toontown.distributed import DelayDelete
import random
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
class DistributedBattle(DistributedBattleBase.DistributedBattleBase):
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedBattle')

2
toontown/battle/DistributedBattleBase.py
View file

@ -20,6 +20,8 @@ from toontown.hood import ZoneUtil
from toontown.distributed import DelayDelete
from toontown.toon import TTEmote
from otp.avatar import Emote
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
class DistributedBattleBase(DistributedNode.DistributedNode, BattleBase):
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedBattleBase')

2
toontown/battle/DistributedBattleBldg.py
View file

@ -14,6 +14,8 @@ from toontown.suit import Suit
import SuitBattleGlobals
import random
from toontown.toonbase import ToontownGlobals
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
class DistributedBattleBldg(DistributedBattleBase.DistributedBattleBase):
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedBattleBldg')

2
toontown/battle/DistributedBattleFinal.py
View file

@ -12,6 +12,8 @@ from toontown.toonbase import ToontownBattleGlobals
from toontown.toonbase import ToontownGlobals
from direct.fsm import State
import random
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
class DistributedBattleFinal(DistributedBattleBase.DistributedBattleBase):
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedBattleFinal')

2
toontown/battle/Movie.py
View file

@ -30,6 +30,8 @@ from toontown.toontowngui import TTDialog
import copy
from toontown.toonbase import TTLocalizer
from toontown.toon import NPCToons
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
camPos = Point3(14, 0, 10)
camHpr = Vec3(89, -30, 0)
randomBattleTimestamp = base.config.GetBool('random-battle-timestamp', 0)

2
toontown/battle/MovieHeal.py
View file

@ -14,6 +14,8 @@ from toontown.toon import NPCToons
import MovieNPCSOS
from toontown.effects import Splash
from direct.task import Task
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
notify = DirectNotifyGlobal.directNotify.newCategory('MovieHeal')
soundFiles = ('AA_heal_tickle.ogg', 'AA_heal_telljoke.ogg', 'AA_heal_smooch.ogg', 'AA_heal_happydance.ogg', 'AA_heal_pixiedust.ogg', 'AA_heal_juggle.ogg', 'AA_heal_High_Dive.ogg')
healPos = Point3(0, 0, 0)

2
toontown/battle/MovieNPCSOS.py
View file

@ -10,6 +10,8 @@ import HealJokes
from toontown.toonbase import TTLocalizer
from toontown.toonbase import ToontownBattleGlobals
from toontown.toon import NPCToons
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
notify = DirectNotifyGlobal.directNotify.newCategory('MovieNPCSOS')
soundFiles = ('AA_heal_tickle.ogg', 'AA_heal_telljoke.ogg', 'AA_heal_smooch.ogg', 'AA_heal_happydance.ogg', 'AA_heal_pixiedust.ogg', 'AA_heal_juggle.ogg')
offset = Point3(0, 4.0, 0)

2
toontown/battle/MoviePetSOS.py
View file

@ -10,6 +10,8 @@ import HealJokes
from toontown.toonbase import TTLocalizer
from toontown.toonbase import ToontownBattleGlobals
from toontown.pets import Pet, PetTricks
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
notify = DirectNotifyGlobal.directNotify.newCategory('MoviePetSOS')
soundFiles = ('AA_heal_tickle.ogg', 'AA_heal_telljoke.ogg', 'AA_heal_smooch.ogg', 'AA_heal_happydance.ogg', 'AA_heal_pixiedust.ogg', 'AA_heal_juggle.ogg')
offset = Point3(0, 4.0, 0)

2
toontown/battle/MovieSOS.py
View file

@ -3,6 +3,8 @@ import MovieCamera
from direct.directnotify import DirectNotifyGlobal
from toontown.toonbase import TTLocalizer
from pandac.PandaModules import *
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
notify = DirectNotifyGlobal.directNotify.newCategory('MovieSOS')
def doSOSs(calls):

2
toontown/battle/MovieSuitAttacks.py
View file

@ -13,6 +13,8 @@ from direct.particles import ParticleEffect
import BattleParticles
from toontown.toonbase import ToontownGlobals
from toontown.toonbase import TTLocalizer
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
notify = DirectNotifyGlobal.directNotify.newCategory('MovieSuitAttacks')
def __doDamage(toon, dmg, died):

2
toontown/battle/MovieToonVictory.py
View file

@ -5,6 +5,8 @@ from BattleSounds import *
import MovieCamera
from direct.directnotify import DirectNotifyGlobal
import types
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
notify = DirectNotifyGlobal.directNotify.newCategory('MovieToonVictory')
def __findToonReward(rewards, toon):

2
toontown/suit/DistributedSuit.py
View file

@ -22,6 +22,8 @@ import DistributedSuitBase
from otp.otpbase import OTPLocalizer
import random
from SuitLegList import *
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
STAND_OUTSIDE_DOOR = 2.5
BATTLE_IGNORE_TIME = 6
BATTLE_WAIT_TIME = 3

2
toontown/suit/DistributedSuitBase.py
View file

@ -22,6 +22,8 @@ import SuitDialog
from toontown.battle import BattleProps
import math
import copy
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
class DistributedSuitBase(DistributedAvatar.DistributedAvatar, Suit.Suit, SuitBase.SuitBase):
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedSuitBase')

6
toontown/town/Street.py
View file

@ -19,6 +19,8 @@ from toontown.toon.Toon import teleportDebug
from toontown.estate import HouseGlobals
from toontown.toonbase import TTLocalizer
from direct.interval.IntervalGlobal import *
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
visualizeZones = base.config.GetBool('visualize-zones', 0)
class Street(BattlePlace.BattlePlace):
@ -112,7 +114,7 @@ class Street(BattlePlace.BattlePlace):
base.localAvatar.setGeom(self.loader.geom)
base.localAvatar.setOnLevelGround(1)
self._telemLimiter = TLGatherAllAvs('Street', RotationLimitToH)
#NametagGlobals.setMasterArrowsOn(arrowsOn) #TODO: fix me cfsworks
NametagGlobals.setMasterArrowsOn(arrowsOn) #TODO: fix me cfsworks
def __lightDecorationOn__():
geom = base.cr.playGame.getPlace().loader.geom
@ -184,7 +186,7 @@ class Street(BattlePlace.BattlePlace):
light.reparentTo(hidden)
newsManager = base.cr.newsManager
#NametagGlobals.setMasterArrowsOn(0) #TODO: cfsworks fix me plx
NametagGlobals.setMasterArrowsOn(0) #TODO: cfsworks fix me plx
self.loader.hood.stopSky()
self.loader.music.stop()
base.localAvatar.setGeom(render)