From a3822b50996f051159595c924e500ea9f9943aa1 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 13 Aug 2015 15:41:18 +0300 Subject: [PATCH] Proper resistance toon DNAs + scarecrow fix in CFO battle --- toontown/suit/DistributedBossbotBoss.py | 15 ++------------- toontown/suit/DistributedCashbotBoss.py | 15 ++------------- toontown/toon/NPCToons.py | 2 ++ toontown/toonbase/TTLocalizerEnglish.py | 4 ++-- toontown/toonbase/ToontownBattleGlobals.py | 2 +- 5 files changed, 9 insertions(+), 29 deletions(-) diff --git a/toontown/suit/DistributedBossbotBoss.py b/toontown/suit/DistributedBossbotBoss.py index 132fed89..d9ca6b89 100755 --- a/toontown/suit/DistributedBossbotBoss.py +++ b/toontown/suit/DistributedBossbotBoss.py @@ -18,8 +18,7 @@ from toontown.effects import DustCloud from toontown.suit import DistributedBossCog from toontown.suit import Suit from toontown.suit import SuitDNA -from toontown.toon import Toon -from toontown.toon import ToonDNA +from toontown.toon import Toon, NPCToons from toontown.toonbase import TTLocalizer from toontown.toonbase import ToontownGlobals from toontown.toonbase import ToontownTimer @@ -197,17 +196,7 @@ class DistributedBossbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): def __makeResistanceToon(self): if self.resistanceToon: return - npc = Toon.Toon() - npc.setName(TTLocalizer.BossbotResistanceToonName) - npc.setPickable(0) - npc.setPlayerType(NametagGroup.CCNonPlayer) - dna = ToonDNA.ToonDNA() - dna.newToonRandom(11237, 'm', 1) - dna.head = 'sls' - npc.setDNAString(dna.makeNetString()) - npc.animFSM.request('neutral') - npc.loop('neutral') - self.resistanceToon = npc + self.resistanceToon = NPCToons.createLocalNPC(10002) self.resistanceToon.setPosHpr(*ToontownGlobals.BossbotRTIntroStartPosHpr) state = random.getstate() random.seed(self.doId) diff --git a/toontown/suit/DistributedCashbotBoss.py b/toontown/suit/DistributedCashbotBoss.py index 986214c9..45aa8c19 100755 --- a/toontown/suit/DistributedCashbotBoss.py +++ b/toontown/suit/DistributedCashbotBoss.py @@ -19,8 +19,7 @@ from toontown.building import ElevatorUtils from toontown.chat import ResistanceChat from toontown.coghq import CogDisguiseGlobals from toontown.distributed import DelayDelete -from toontown.toon import Toon -from toontown.toon import ToonDNA +from toontown.toon import Toon, NPCToons from toontown.toonbase import TTLocalizer from toontown.toonbase import ToontownGlobals from otp.nametag import NametagGroup @@ -104,16 +103,7 @@ class DistributedCashbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): def __makeResistanceToon(self): if self.resistanceToon: return - npc = Toon.Toon() - npc.setName(TTLocalizer.ResistanceToonName) - npc.setPickable(0) - npc.setPlayerType(NametagGroup.CCNonPlayer) - dna = ToonDNA.ToonDNA() - dna.newToonRandom(11237, 'f', 1) - dna.head = 'pls' - npc.setDNAString(dna.makeNetString()) - npc.animFSM.request('neutral') - self.resistanceToon = npc + self.resistanceToon = NPCToons.createLocalNPC(12002) self.resistanceToon.setPosHpr(*ToontownGlobals.CashbotRTBattleOneStartPosHpr) state = random.getstate() random.seed(self.doId) @@ -700,7 +690,6 @@ class DistributedCashbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): self.endVault.unstash() self.evWalls.stash() self.midVault.unstash() - self.__showResistanceToon(True) base.playMusic(self.stingMusic, looping=1, volume=0.9) DistributedBossCog.DistributedBossCog.enterIntroduction(self) diff --git a/toontown/toon/NPCToons.py b/toontown/toon/NPCToons.py index 1074b855..db772e0d 100755 --- a/toontown/toon/NPCToons.py +++ b/toontown/toon/NPCToons.py @@ -860,8 +860,10 @@ NPCToonDict = { 7022: (-1, lnames[7022], ('mss', 'sd', 's', 'f', 24, 0, 24, 24, 3, 1, 0, 0, 0, 13), 'f', 0, NPC_REGULAR), 7023: (-1, lnames[7023], ('pss', 'sd', 'l', 'f', 9, 0, 9, 9, 0, 8, 0, 0, 11, 0), 'f', 0, NPC_REGULAR), 10001: (10000, lnames[10001], 'r', 'f', 0, NPC_LAFF_RESTOCK), + 10002: (-1, lnames[10002], ('sls', 'ss', 'm', 'm', 15, 0, 15, 15, 111, 27, 97, 27, 41, 27), 'm', 0, NPC_REGULAR), 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) } diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index 8bc24994..8e997196 100755 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -4741,7 +4741,6 @@ CagedToonBattleThreeMaxTouchCage = 21 CagedToonBattleThreeMaxAdvice = 106 CashbotBossHadEnough = "That's it. I've had enough of these pesky Toons!" CashbotBossOuttaHere = "I've got a train to catch!" -ResistanceToonName = 'Mata Hairy' ResistanceToonCongratulations = "You did it! Congratulations!\x07You're an asset to the Resistance!\x07Here's a special phrase you can use in a tight spot:\x07%s\x07When you say it, %s.\x07But you can only use it once, so choose that time well!" ResistanceToonToonupInstructions = 'all the Toons near you will gain %s Laff points' ResistanceToonToonupAllInstructions = 'all the Toons near you will gain full Laff points' @@ -6268,8 +6267,10 @@ NPCToonNames = {20000: 'Tutorial Tom', 7022: 'Dee Version', 7023: 'Bo Nanapeel', 10001: 'Healer Sara', + 10002: "Good ol' Gil Giggles", 11001: 'Healer Gabriel', 12001: 'Healer Bill', + 12002: 'Mata Hairy', 13001: 'Healer Clover'} zone2TitleDict = {2513: ('Toon Hall', ''), 2514: ('Toontown Bank', ''), @@ -8130,7 +8131,6 @@ BossbotBossPreTwo1 = "What's taking so long?" BossbotBossPreTwo2 = 'Get cracking and serve my banquet!' BossbotRTServeFood1 = 'Hehe, serve the food I place on these conveyor belts.' BossbotRTServeFood2 = 'If you serve a cog three times in a row it will explode.' -BossbotResistanceToonName = "Good ol' Gil Giggles" BossbotPhase3Speech1 = "What's happening here?!" BossbotPhase3Speech2 = 'These waiters are toons!' BossbotPhase3Speech3 = 'Get them!!!' diff --git a/toontown/toonbase/ToontownBattleGlobals.py b/toontown/toonbase/ToontownBattleGlobals.py index 74310f35..fcbea966 100755 --- a/toontown/toonbase/ToontownBattleGlobals.py +++ b/toontown/toonbase/ToontownBattleGlobals.py @@ -192,7 +192,7 @@ CarryLimits = (((10, 15, 15, 10, - 5, + 7, 3, 1)), ((10,