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

Merge branch 'master' of https://github.com/stevetts/tts_src

Browse source 
Conflicts:
	toontown/toonbase/ToontownGlobals.py
This commit is contained in:
Loudrob 2015-06-17 11:26:10 -04:00
commit 4a5f177318
1 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
toontown/toonbase/ToontownGlobals.py
View file

@ -179,7 +179,6 @@ HoodHierarchy = {ToontownCentral: (SillyStreet, LoopyLane, PunchlinePlace),
DaisyGardens: (ElmStreet, MapleStreet, OakStreet),
DonaldsDreamland: (LullabyLane, PajamaPlace),
GoofySpeedway: ()}
WelcomeValleyToken = 0
BossbotHQ = 10000
BossbotLobby = 10100
BossbotCountryClubIntA = 10500
@ -208,7 +207,7 @@ MyEstate = 16000
GolfZone = 17000
PartyHood = 18000
HoodsAlwaysVisited = [17000, 18000]
DynamicZonesBegin = 22001
DynamicZonesBegin = 22000
DynamicZonesEnd = 1 << 20
cogDept2index = {'c': 0,
'l': 1,
@ -510,6 +509,7 @@ PieCodeBossInsides = 4
PieCodeDefensePan = 5
PieCodeProsecutionPan = 6
PieCodeLawyer = 7
PieCodeInvasionSuit = 8
PieCodeColors = {PieCodeBossCog: None,
PieCodeNotBossCog: (0.8,
0.8,
@ -1373,6 +1373,15 @@ LawbotBossBonusDuration = 20
LawbotBossBonusToonup = 10
LawbotBossBonusWeightMultiplier = 2
LawbotBossChanceToDoAreaAttack = 11
LOW_POP_JP = 0
MID_POP_JP = 100
HIGH_POP_JP = 200
LOW_POP_INTL = 399
MID_POP_INTL = 499
HIGH_POP_INTL = -1
LOW_POP = 100
MID_POP = 200
HIGH_POP = -1
PinballCannonBumper = 0
PinballCloudBumperLow = 1
PinballCloudBumperMed = 2
@ -1401,6 +1410,30 @@ GlitchKillerZones = [13300,
13400,
13500,
13600]
ColorPlayer = (0.3,
0.7,
0.3,
1)
ColorAvatar = (0.3,
0.3,
0.7,
1)
ColorPet = (0.6,
0.4,
0.2,
1)
ColorFreeChat = (0.3,
0.3,
0.8,
1)
ColorSpeedChat = (0.2,
0.6,
0.4,
1)
ColorNoChat = (0.8,
0.5,
0.1,
1)
FactoryLaffMinimums = [(0, 31, 0),
(0, 66, 71),
(0,
@ -1603,4 +1636,4 @@ CostPerLaffRestock = 3
FISHSALE_NONE = 0
FISHSALE_COMPLETE = 1
FISHSALE_TROPHY = 2
NPCCollisionDelay = 2.5
NPCCollisionDelay = 2.5