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

CJ fix

Browse source
This commit is contained in:
John 2015-08-27 14:59:01 +03:00
parent aee605bb19
commit 8e620d589a
3 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
toontown/suit/DistributedLawbotBoss.py
View file

@ -23,10 +23,9 @@ from toontown.building import ElevatorConstants
from toontown.building import ElevatorUtils
from toontown.coghq import CogDisguiseGlobals
from toontown.distributed import DelayDelete
from otp.nametag import NametagGroup
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
from toontown.toon import Toon
from toontown.toon import NPCToons
from toontown.toonbase import TTLocalizer
from toontown.toonbase import ToontownBattleGlobals
from toontown.toonbase import ToontownGlobals
@ -1567,15 +1566,11 @@ class DistributedLawbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
return bossTrack
def __makeWitnessToon(self):
dnaNetString = 't\x1b\x00\x01\x01\x00\x03\x00\x03\x01\x10\x13\x00\x13\x13'
npc = Toon.Toon()
npc.setDNAString(dnaNetString)
npc.setName(TTLocalizer.WitnessToonName)
npc.setPickable(0)
npc.setPlayerType(NametagGroup.CCNonPlayer)
npc.animFSM.request('Sit')
self.witnessToon = npc
if self.witnessToon:
return
self.witnessToon = NPCToons.createLocalNPC(13002)
self.witnessToon.setPosHpr(*ToontownGlobals.LawbotBossWitnessStandPosHpr)
self.witnessToon.animFSM.request('Sit')
def __cleanupWitnessToon(self):
self.__hideWitnessToon()
@ -1583,7 +1578,6 @@ class DistributedLawbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
self.witnessToon.removeActive()
self.witnessToon.delete()
self.witnessToon = None
return
def __showWitnessToon(self):
if not self.witnessToonOnstage:

3
toontown/toon/NPCToons.py
View file

@ -864,7 +864,8 @@ NPCToonDict = {
11001: (11000, lnames[11001], 'r', 'm', 0, NPC_LAFF_RESTOCK),
12001: (12000, lnames[12001], 'r', 'm', 0, NPC_LAFF_RESTOCK),
12002: (-1, lnames[12002], ('pls', 'ls', 'l', 'f', 3, 0, 3, 3, 111, 27, 97, 27, 45, 27), 'f', 0, NPC_REGULAR),
13001: (13000, lnames[13001], 'r', 'f', 0, NPC_LAFF_RESTOCK)
13001: (13000, lnames[13001], 'r', 'f', 0, NPC_LAFF_RESTOCK),
13002: (-1, lnames[13002], ('bss', 'ss', 'm', 'm', 19, 0, 19, 19, 0, 3, 0, 3, 1, 16), 'm', 0, NPC_REGULAR)
}
if config.GetBool('want-new-toonhall', 1):

4
toontown/toonbase/TTLocalizerEnglish.py
View file

@ -6272,7 +6272,8 @@ NPCToonNames = {20000: 'Tutorial Tom',
11001: 'Healer Gabriel',
12001: 'Healer Bill',
12002: 'Mata Hairy',
13001: 'Healer Clover'}
13001: 'Healer Clover',
13002: 'Bumpy Bumblebehr'}
zone2TitleDict = {2513: ('Toon Hall', ''),
2514: ('Toontown Bank', ''),
2516: ('Toontown School House', ''),
@ -7596,7 +7597,6 @@ LawbotBossTaunts = ['%s, I find you in contempt of court!',
'Strike that from the record.',
'Your appeal has been rejected. I sentence you to sadness!',
'Order in the court!']
WitnessToonName = 'Bumpy Bumblebehr'
WitnessToonPrepareBattleTwo = "Oh no! They're putting only Cogs on the jury!\x07Quick, use the cannons and shoot some Toon jurors into the jury chairs.\x07We need %d to get a balanced scale."
WitnessToonNoJuror = 'Oh oh, no Toon jurors. This will be a tough trial.'
WitnessToonOneJuror = 'Cool! There is 1 Toon in the jury!'