Nerf fish rarity properly

This commit is contained in:
John 2015-08-13 22:42:29 +03:00
parent a3822b5099
commit ae3a7e7dc5

View file

@ -33,7 +33,7 @@ Rod2JellybeanDict = {0: 10,
HealAmount = 1
JellybeanFishingHolidayScoreMultiplier = 2
MAX_RARITY = 10
GlobalRarityDialBase = 4.3
GlobalRarityDialBase = 3.8
FishingAngleMax = 50.0
OVERALL_VALUE_SCALE = 15
RARITY_VALUE_SCALE = 0.2
@ -334,19 +334,19 @@ __fishDict = {0: ((1,
(Anywhere,)),
(1,
1,
3,
4,
(TTG.ToontownCentral, Anywhere)),
(3,
5,
4,
5,
(TTG.PunchlinePlace, TTG.TheBrrrgh)),
(3,
5,
2,
3,
(TTG.SillyStreet, TTG.DaisyGardens)),
(1,
5,
1,
2,
(TTG.LoopyLane, TTG.ToontownCentral))),
2: ((2,
6,
@ -354,27 +354,27 @@ __fishDict = {0: ((1,
(TTG.DaisyGardens, Anywhere)),
(2,
6,
6,
9,
(TTG.ElmStreet, TTG.DaisyGardens)),
(5,
11,
3,
(TTG.LullabyLane,)),
4,
(TTG.LullabyLane, TTG.BedtimeBoulevard)),
(2,
6,
2,
3,
(TTG.DaisyGardens, TTG.MyEstate, TTG.OutdoorZone)),
(5,
11,
1,
(TTG.DonaldsDreamland, TTG.MyEstate, TTG.OutdoorZone, TTG.BedtimeBoulevard))),
2,
(TTG.DonaldsDreamland, TTG.MyEstate, TTG.OutdoorZone))),
4: ((2,
8,
1,
(TTG.ToontownCentral, Anywhere)),
(2,
8,
3,
4,
(TTG.ToontownCentral, Anywhere)),
(2,
8,
@ -382,7 +382,7 @@ __fishDict = {0: ((1,
(TTG.ToontownCentral, Anywhere)),
(2,
8,
5,
6,
(TTG.ToontownCentral, TTG.MinniesMelodyland))),
6: ((8,
12,
@ -394,23 +394,23 @@ __fishDict = {0: ((1,
(Anywhere,)),
(2,
6,
1,
2,
(TTG.MinniesMelodyland, Anywhere)),
(5,
10,
4,
5,
(TTG.MinniesMelodyland, Anywhere)),
(1,
5,
5,
7,
(TTG.MyEstate, TTG.OutdoorZone, Anywhere)),
(1,
5,
7,
10,
(TTG.MyEstate, TTG.OutdoorZone, Anywhere))),
10: ((6,
10,
7,
9,
(TTG.MyEstate, TTG.OutdoorZone, Anywhere)),),
12: ((7,
15,
@ -418,15 +418,15 @@ __fishDict = {0: ((1,
(TTG.DonaldsDock, Anywhere)),
(18,
20,
5,
6,
(TTG.DonaldsDock, TTG.MyEstate, TTG.OutdoorZone)),
(1,
5,
4,
5,
(TTG.DonaldsDock, TTG.MyEstate, TTG.OutdoorZone)),
(3,
7,
3,
4,
(TTG.DonaldsDock, TTG.MyEstate, TTG.OutdoorZone)),
(1,
2,
@ -437,27 +437,27 @@ __fishDict = {0: ((1,
1,
(TTG.DaisyGardens, TTG.MyEstate, TTG.OutdoorZone, Anywhere)), (2,
6,
2,
3,
(TTG.DaisyGardens, TTG.MyEstate, TTG.OutdoorZone))),
16: ((4,
12,
4,
5,
(TTG.MinniesMelodyland, Anywhere)), (4,
12,
6,
7,
(TTG.BaritoneBoulevard, TTG.MinniesMelodyland)), (4,
12,
6,
8,
(TTG.TenorTerrace, TTG.MinniesMelodyland))),
18: ((2,
4,
2,
3,
(TTG.DonaldsDock, Anywhere)), (5,
8,
6,
7,
(TTG.TheBrrrgh,)), (4,
6,
6,
8,
(TTG.LighthouseLane,))),
20: ((4,
6,
@ -465,11 +465,11 @@ __fishDict = {0: ((1,
(TTG.DonaldsDreamland,)),
(14,
18,
7,
10,
(TTG.DonaldsDreamland,)),
(6,
10,
7,
8,
(TTG.LullabyLane, TTG.BedtimeBoulevard)),
(1,
1,
@ -477,11 +477,11 @@ __fishDict = {0: ((1,
(TTG.DonaldsDreamland,)),
(2,
6,
5,
6,
(TTG.LullabyLane, TTG.BedtimeBoulevard)),
(10,
14,
3,
4,
(TTG.DonaldsDreamland, TTG.DaisyGardens))),
22: ((12,
16,
@ -489,40 +489,36 @@ __fishDict = {0: ((1,
(TTG.MyEstate, TTG.OutdoorZone, TTG.DaisyGardens, Anywhere)),
(14,
18,
2,
3,
(TTG.MyEstate, TTG.OutdoorZone, TTG.DaisyGardens, Anywhere)),
(14,
20,
4,
5,
(TTG.MyEstate, TTG.OutdoorZone, TTG.DaisyGardens)),
(14,
20,
6,
7,
(TTG.MyEstate, TTG.OutdoorZone, TTG.DaisyGardens))),
24: ((9,
11,
2,
3,
(Anywhere,)),
(8,
12,
4,
(TTG.DaisyGardens, TTG.DonaldsDock)),
(8,
12,
5,
(TTG.DaisyGardens, TTG.DonaldsDock)),
(8,
16,
12,
6,
(TTG.DaisyGardens, TTG.DonaldsDock)),
(8,
16,
7,
(TTG.DaisyGardens, TTG.DonaldsDock))),
26: ((10,
18,
2,
(TTG.TheBrrrgh,)),
(10,
18,
2,
(TTG.TheBrrrgh,)),
(10,
18,
3,
@ -531,51 +527,55 @@ __fishDict = {0: ((1,
18,
4,
(TTG.TheBrrrgh,)),
(12,
20,
(10,
18,
5,
(TTG.TheBrrrgh,)),
(14,
(12,
20,
6,
(TTG.TheBrrrgh,)),
(14,
20,
6,
7,
(TTG.TheBrrrgh,)),
(14,
20,
8,
(TTG.SleetStreet, TTG.TheBrrrgh)),
(16,
20,
8,
10,
(TTG.WalrusWay, TTG.TheBrrrgh))),
28: ((2,
10,
2,
(TTG.DonaldsDock, Anywhere)), (4,
10,
5,
6,
(TTG.BarnacleBoulevard, TTG.DonaldsDock)), (4,
10,
6,
7,
(TTG.SeaweedStreet, TTG.DonaldsDock))),
30: ((13,
17,
4,
5,
(TTG.MinniesMelodyland, Anywhere)),
(16,
20,
8,
10,
(TTG.AltoAvenue, TTG.MinniesMelodyland)),
(12,
18,
7,
9,
(TTG.TenorTerrace, TTG.MinniesMelodyland)),
(12,
18,
5,
6,
(TTG.MinniesMelodyland,)),
(12,
18,
6,
7,
(TTG.MinniesMelodyland,))),
32: ((1,
5,
@ -587,19 +587,19 @@ __fishDict = {0: ((1,
(TTG.TheBrrrgh, TTG.MyEstate, TTG.OutdoorZone, Anywhere)),
(1,
5,
3,
4,
(TTG.DaisyGardens, TTG.MyEstate, TTG.OutdoorZone)),
(1,
5,
4,
5,
(TTG.DonaldsDreamland, TTG.MyEstate, TTG.OutdoorZone)),
(1,
5,
7,
10,
(TTG.TheBrrrgh, TTG.DonaldsDreamland))),
34: ((1,
20,
7,
10,
(TTG.DonaldsDreamland, Anywhere)),)}
def getSpecies(genus):