Fishing just got slapped by my big cock

This commit is contained in:
DenialMC 2015-04-10 15:36:43 +03:00
parent f8d82e356d
commit b691a2e441
5 changed files with 50 additions and 19 deletions

View file

@ -353,11 +353,11 @@ __fishDict = {0: ((1,
(2,
6,
3,
(TTG.DaisyGardens, TTG.MyEstate)),
(TTG.DaisyGardens, TTG.MyEstate, TTG.OutdoorZone)),
(5,
11,
2,
(TTG.DonaldsDreamland, TTG.MyEstate))),
(TTG.DonaldsDreamland, TTG.MyEstate, TTG.OutdoorZone))),
4: ((2,
8,
1,
@ -393,15 +393,15 @@ __fishDict = {0: ((1,
(1,
5,
7,
(TTG.MyEstate, Anywhere)),
(TTG.MyEstate, TTG.OutdoorZone, Anywhere)),
(1,
5,
10,
(TTG.MyEstate, Anywhere))),
(TTG.MyEstate, TTG.OutdoorZone, Anywhere))),
10: ((6,
10,
9,
(TTG.MyEstate, Anywhere)),),
(TTG.MyEstate, TTG.OutdoorZone, Anywhere)),),
12: ((7,
15,
1,
@ -409,15 +409,15 @@ __fishDict = {0: ((1,
(18,
20,
6,
(TTG.DonaldsDock, TTG.MyEstate)),
(TTG.DonaldsDock, TTG.MyEstate, TTG.OutdoorZone)),
(1,
5,
5,
(TTG.DonaldsDock, TTG.MyEstate)),
(TTG.DonaldsDock, TTG.MyEstate, TTG.OutdoorZone)),
(3,
7,
4,
(TTG.DonaldsDock, TTG.MyEstate)),
(TTG.DonaldsDock, TTG.MyEstate, TTG.OutdoorZone)),
(1,
2,
2,
@ -425,10 +425,10 @@ __fishDict = {0: ((1,
14: ((2,
6,
1,
(TTG.DaisyGardens, TTG.MyEstate, Anywhere)), (2,
(TTG.DaisyGardens, TTG.MyEstate, TTG.OutdoorZone, Anywhere)), (2,
6,
3,
(TTG.DaisyGardens, TTG.MyEstate))),
(TTG.DaisyGardens, TTG.MyEstate, TTG.OutdoorZone))),
16: ((4,
12,
5,
@ -476,19 +476,19 @@ __fishDict = {0: ((1,
22: ((12,
16,
2,
(TTG.MyEstate, TTG.DaisyGardens, Anywhere)),
(TTG.MyEstate, TTG.OutdoorZone, TTG.DaisyGardens, Anywhere)),
(14,
18,
3,
(TTG.MyEstate, TTG.DaisyGardens, Anywhere)),
(TTG.MyEstate, TTG.OutdoorZone, TTG.DaisyGardens, Anywhere)),
(14,
20,
5,
(TTG.MyEstate, TTG.DaisyGardens)),
(TTG.MyEstate, TTG.OutdoorZone, TTG.DaisyGardens)),
(14,
20,
7,
(TTG.MyEstate, TTG.DaisyGardens))),
(TTG.MyEstate, TTG.OutdoorZone, TTG.DaisyGardens))),
24: ((9,
11,
3,
@ -570,19 +570,19 @@ __fishDict = {0: ((1,
32: ((1,
5,
2,
(TTG.ToontownCentral, TTG.MyEstate, Anywhere)),
(TTG.ToontownCentral, TTG.MyEstate, TTG.OutdoorZone, Anywhere)),
(1,
5,
3,
(TTG.TheBrrrgh, TTG.MyEstate, Anywhere)),
(TTG.TheBrrrgh, TTG.MyEstate, TTG.OutdoorZone, Anywhere)),
(1,
5,
4,
(TTG.DaisyGardens, TTG.MyEstate)),
(TTG.DaisyGardens, TTG.MyEstate, TTG.OutdoorZone)),
(1,
5,
5,
(TTG.DonaldsDreamland, TTG.MyEstate)),
(TTG.DonaldsDreamland, TTG.MyEstate, TTG.OutdoorZone)),
(1,
5,
10,

View file

@ -151,7 +151,13 @@ __targetInfoDict = {ToontownGlobals.ToontownCentral: (2,
-126,
-0.3,
16,
-0.83)}
-0.83),
ToontownGlobals.OutdoorZone: (3,
-130.8,
-15.5,
-0.025,
15,
-0.5)}
def getNumTargets(zone):
info = __targetInfoDict.get(zone)

View file

@ -5158,6 +5158,11 @@ def getZone():
zone = invoker.zoneId
return 'ZoneID: %s' % (zone)
@magicWord(category=CATEGORY_PROGRAMMER)
def getPos():
invoker = spellbook.getInvoker()
return 'Pos: %s, PosIndex: %s' % (invoker.getPos(), invoker.getPosIndex())
@magicWord(category=CATEGORY_MODERATOR, types=[int])
def nametagStyle(nametagStyle):
currentAccess = spellbook.getInvokerAccess()

View file

@ -9477,6 +9477,25 @@ NPCToonDict = {20000: (-1,
'f',
0,
NPC_FISHERMAN),
6000: (6000,
lnames[6000],
('hsl',
'ms',
'm',
'm',
8,
0,
8,
8,
1,
6,
1,
6,
0,
18),
'm',
0,
NPC_FISHERMAN),
8001: (8501,
lnames[8001],
('psl',

View file

@ -6630,6 +6630,7 @@ NPCToonNames = {20000: 'Tutorial Tom',
5320: 'April',
5321: 'Professor Ivy',
5322: 'Fisherman Rose',
6000: 'Fisherman Melville',
8001: 'Graham Pree',
8002: 'Ivona Race',
8003: 'Anita Winn',