general: field offices & buildings work
This commit is contained in:
parent
758415b3e9
commit
cb98eab37f
9 changed files with 27 additions and 7 deletions
|
@ -11,6 +11,10 @@ class Settings:
|
||||||
def writeSettings():
|
def writeSettings():
|
||||||
pass # lol not yet
|
pass # lol not yet
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def setWindowedMode(_):
|
||||||
|
pass
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def getWindowedMode():
|
def getWindowedMode():
|
||||||
return 1
|
return 1
|
||||||
|
@ -47,10 +51,18 @@ class Settings:
|
||||||
def getSfxVolume():
|
def getSfxVolume():
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def setResolutionDimensions(_, __):
|
||||||
|
pass
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def getResolution():
|
def getResolution():
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def setEmbeddedMode(_):
|
||||||
|
pass
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def getEmbeddedMode():
|
def getEmbeddedMode():
|
||||||
return 0
|
return 0
|
||||||
|
|
|
@ -229,10 +229,10 @@ class DistributedAvatar(DistributedActor, Avatar):
|
||||||
self.hpTextSeq.start()
|
self.hpTextSeq.start()
|
||||||
|
|
||||||
def hideHpText(self):
|
def hideHpText(self):
|
||||||
|
if self.hpTextSeq:
|
||||||
|
self.hpTextSeq.finish()
|
||||||
|
self.hpTextSeq = None
|
||||||
if self.hpText:
|
if self.hpText:
|
||||||
if self.hpTextSeq:
|
|
||||||
self.hpTextSeq.finish()
|
|
||||||
self.hpTextSeq = None
|
|
||||||
self.hpText.removeNode()
|
self.hpText.removeNode()
|
||||||
self.hpText = None
|
self.hpText = None
|
||||||
return
|
return
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
from pandac.PandaModules import *
|
from pandac.PandaModules import *
|
||||||
|
from libotp import *
|
||||||
from direct.interval.IntervalGlobal import *
|
from direct.interval.IntervalGlobal import *
|
||||||
from BattleBase import *
|
from BattleBase import *
|
||||||
from direct.actor import Actor
|
from direct.actor import Actor
|
||||||
|
|
|
@ -11,7 +11,7 @@ from direct.directnotify import DirectNotifyGlobal
|
||||||
import random
|
import random
|
||||||
from direct.fsm import State
|
from direct.fsm import State
|
||||||
from direct.fsm import ClassicFSM, State
|
from direct.fsm import ClassicFSM, State
|
||||||
from direct.showbase import PythonUtil
|
from otp.otpbase import PythonUtil
|
||||||
|
|
||||||
class DistributedBattleBldgAI(DistributedBattleBaseAI.DistributedBattleBaseAI):
|
class DistributedBattleBldgAI(DistributedBattleBaseAI.DistributedBattleBaseAI):
|
||||||
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedBattleBldgAI')
|
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedBattleBldgAI')
|
||||||
|
|
|
@ -412,7 +412,7 @@ def getSplicedLerpAnimsTrack(object, animName, origDuration, newDuration, startT
|
||||||
numIvals = origDuration * fps
|
numIvals = origDuration * fps
|
||||||
timeInterval = newDuration / numIvals
|
timeInterval = newDuration / numIvals
|
||||||
animInterval = origDuration / numIvals
|
animInterval = origDuration / numIvals
|
||||||
for i in range(0, numIvals):
|
for i in range(0, int(numIvals)):
|
||||||
track.append(Wait(timeInterval))
|
track.append(Wait(timeInterval))
|
||||||
track.append(ActorInterval(object, animName, startTime=startTime + addition, duration=animInterval))
|
track.append(ActorInterval(object, animName, startTime=startTime + addition, duration=animInterval))
|
||||||
addition += animInterval
|
addition += animInterval
|
||||||
|
|
|
@ -760,7 +760,7 @@ def getSplicedLerpAnims(animName, origDuration, newDuration, startTime = 0, fps
|
||||||
animInterval = origDuration / numAnims
|
animInterval = origDuration / numAnims
|
||||||
if reverse == 1:
|
if reverse == 1:
|
||||||
animInterval = -animInterval
|
animInterval = -animInterval
|
||||||
for i in range(0, numAnims):
|
for i in range(0, int(numAnims)):
|
||||||
anims.append([animName,
|
anims.append([animName,
|
||||||
timeInterval,
|
timeInterval,
|
||||||
startTime + addition,
|
startTime + addition,
|
||||||
|
|
|
@ -588,7 +588,7 @@ def createSuitStunInterval(suit, before, after):
|
||||||
stars.adjustAllPriorities(100)
|
stars.adjustAllPriorities(100)
|
||||||
head = suit.getHeadParts()[0]
|
head = suit.getHeadParts()[0]
|
||||||
head.calcTightBounds(p1, p2)
|
head.calcTightBounds(p1, p2)
|
||||||
return Sequence(Wait(before), Func(stars.reparentTo, head), Func(stars.setZ, max(0.0, p2[2] - 1.0)), Func(stars.loop, 'stun'), Wait(after), Func(stars.removeNode))
|
return Sequence(Wait(before), Func(stars.reparentTo, head), Func(stars.setZ, max(0.0, p2[2] - 1.0)), Func(stars.loop, 'stun'), Wait(after), Func(stars.cleanup), Func(stars.removeNode))
|
||||||
|
|
||||||
|
|
||||||
def calcAvgSuitPos(throw):
|
def calcAvgSuitPos(throw):
|
||||||
|
|
|
@ -4,6 +4,7 @@ from direct.distributed.ClockDelta import *
|
||||||
from toontown.building.ElevatorConstants import *
|
from toontown.building.ElevatorConstants import *
|
||||||
from toontown.toon import NPCToons
|
from toontown.toon import NPCToons
|
||||||
from pandac.PandaModules import NodePath
|
from pandac.PandaModules import NodePath
|
||||||
|
from libotp import *
|
||||||
from toontown.building import ElevatorUtils
|
from toontown.building import ElevatorUtils
|
||||||
from toontown.toonbase import ToontownGlobals
|
from toontown.toonbase import ToontownGlobals
|
||||||
from toontown.toonbase import ToontownBattleGlobals
|
from toontown.toonbase import ToontownBattleGlobals
|
||||||
|
|
|
@ -18,3 +18,9 @@ class QuestManagerAI:
|
||||||
|
|
||||||
def hasTailorClothingTicket(self, toon, npc):
|
def hasTailorClothingTicket(self, toon, npc):
|
||||||
return 0 # TODO
|
return 0 # TODO
|
||||||
|
|
||||||
|
def toonKilledBuilding(self, toon, track, difficulty, numFloors, zoneId, activeToons):
|
||||||
|
pass # TODO
|
||||||
|
|
||||||
|
def toonKilledCogdo(self, toon, difficulty, numFloors, zoneId, activeToons):
|
||||||
|
pass # TODO
|
||||||
|
|
Loading…
Reference in a new issue