diff --git a/toontown/estate/GardenGlobals.py b/toontown/estate/GardenGlobals.py index 19356069..51d4ad13 100755 --- a/toontown/estate/GardenGlobals.py +++ b/toontown/estate/GardenGlobals.py @@ -681,51 +681,47 @@ def validatePlantAttributes(notify): notify.debug(' %s, beans = %s, color=%s' % (flower[0], flower[1], flower[2])) notify.debug('plant attributes are ok') -#PLOT 0 = Red house DONE -#PLOT 1 = Green house DONE -#PLOT 2 = Blue house DONE -#PLOT 3 = Light-Blue house DONE -#PLOT 4 = Purple house DONE -#PLOT 5 = Brown house DONE -plots0 = [(-62.575, - -52.4983, - 5.144, + + +plots0 = [(0, + 0, + 0.0, FLOWER_TYPE), - (-52.071, - -52.130, - 5.144, + (1, + 0, + 0.0, FLOWER_TYPE), - (-49.018, - -46.6321, - 5.178, + (2, + 0, + 0.0, FLOWER_TYPE), - (-48.875, - -43.2925, - 5.178, + (2, + 1, + 0.0, FLOWER_TYPE), - (-48.572, - -40.1868, - 5.178, + (2, + 2, + 0.0, FLOWER_TYPE), - (-64.631, - -38.778, - 5.158, + (3, + 0, + 0.0, FLOWER_TYPE), - (-64.454, - -41.9345, - 5.158, + (3, + 1, + 0.0, FLOWER_TYPE), - (-64.382, - -45.0799, - 5.158, + (3, + 2, + 0.0, FLOWER_TYPE), - (-55.192, - -32.723, - 5.158, + (4, + 0, + 0.0, FLOWER_TYPE), - (-58.720, - -32.9295, - 5.158, + (4, + 1, + 0.0, FLOWER_TYPE), (-54, -13.5, @@ -771,28 +767,28 @@ plots1 = [(85.0, -72, 0.0, FLOWER_TYPE), - (89.578, - -71., + (89.865, + -71.7725, 0.0, FLOWER_TYPE), (91.0, -74.0, 0.0, FLOWER_TYPE), - (92.622, - -77.2275, + (92.135, + -76.2275, 0.0, FLOWER_TYPE), - (75.2671, - -78.02, + (75.865, + -78.7725, 0.0, FLOWER_TYPE), (77, -81, 0.0, FLOWER_TYPE), - (78.504, - -83.7906, + (78.135, + -83.2275, 0.0, FLOWER_TYPE), (86.6518, @@ -839,44 +835,44 @@ plots1 = [(85.0, -82, -30.0, STATUARY_TYPE)] -plots2 = [(-61.956, - -111.738, +plots2 = [(0, + 0, 0.0, FLOWER_TYPE), - (-71.942, - -109.921, + (1, + 0, 0.0, FLOWER_TYPE), - (-75.6116, - -114.521, + (2, + 0, 0.0, FLOWER_TYPE), - (-76.150, - -117.799, + (2, + 1, 0.0, FLOWER_TYPE), - (-76.772, - -120.659, + (2, + 2, 0.0, FLOWER_TYPE), - (-73.072, - -128.744, + (3, + 0, 0.0, FLOWER_TYPE), - (-69.446, - -129.419, + (3, + 1, 0.0, FLOWER_TYPE), - (-62.743, - -125.292, + (3, + 2, 0.0, FLOWER_TYPE), - (-61.758, - -121.99, + (4, + 0, 0.0, FLOWER_TYPE), - (-61.403, - -119.349, + (4, + 1, 0.0, FLOWER_TYPE), (-40, @@ -915,44 +911,44 @@ plots2 = [(-61.956, -114, -60.0, STATUARY_TYPE)] -plots3 = [(72.67, - 16.13, +plots3 = [(0, + 0, 0.0, FLOWER_TYPE), - (71.93, - 4.97, + (1, + 0, 0.0, FLOWER_TYPE), - (67.75, - 18.9, + (2, + 0, 0.0, FLOWER_TYPE), - (64.09, - 19.001, + (2, + 1, 0.0, FLOWER_TYPE), - (60.53, - 19.355, + (2, + 2, 0.0, FLOWER_TYPE), - (59.44, - 2.807, + (3, + 0, 0.0, FLOWER_TYPE), - (62.90, - 2.83, + (3, + 1, 0.0, FLOWER_TYPE), - (65.85, - 2.753, + (3, + 2, 0.0, FLOWER_TYPE), - (53.97, - 13.995, + (4, + 0, 0.0, FLOWER_TYPE), - (53.99, - 9.85, + (4, + 1, 0.0, FLOWER_TYPE), (59, @@ -991,44 +987,44 @@ plots3 = [(72.67, 27, 102.0, STATUARY_TYPE)] -plots4 = [(35.4771, - 69.97, +plots4 = [(0, + 0, 0.0, FLOWER_TYPE), - (46.039, - 65.9762, + (1, + 0, 0.0, FLOWER_TYPE), - (50.118, - 70.88, + (2, + 0, 0.0, FLOWER_TYPE), - (51.4956, - 73.9103, + (2, + 1, 0.0, FLOWER_TYPE), - (52.6171, - 76.6618, + (2, + 2, 0.0, FLOWER_TYPE), - (48.955, - 85.4584, + (3, + 0, 0.0, FLOWER_TYPE), - (45.402, - 86.652, + (3, + 1, 0.0, FLOWER_TYPE), - (37.499, - 82.5899, + (3, + 2, 0.0, FLOWER_TYPE), - (36.394, - 79.6288, + (4, + 0, 0.0, FLOWER_TYPE), - (35.254, - 76.778, + (4, + 1, 0.0, FLOWER_TYPE), (37, @@ -1067,44 +1063,44 @@ plots4 = [(35.4771, 87, -140.0, STATUARY_TYPE)] -plots5 = [(-26.276, - 37.5757, +plots5 = [(0, + 0, 0.0, FLOWER_TYPE), - (-33.058, - 45.9437, + (1, + 0, 0.0, FLOWER_TYPE), - (-39.405, - 44.1741, + (2, + 0, 0.0, FLOWER_TYPE), - (-42.145, - 42.1331, + (2, + 1, 0.0, FLOWER_TYPE), - (-44.400, - 40.326, + (2, + 2, 0.0, FLOWER_TYPE), - (-46.176, - 32.4361, + (3, + 0, 0.0, FLOWER_TYPE), - (-44.039, - 29.378, + (3, + 1, 0.0, FLOWER_TYPE), - (-34.272, - 27.9571, + (3, + 2, 0.0, FLOWER_TYPE), - (-32.010, - 29.8193, + (4, + 0, 0.0, FLOWER_TYPE), - (-29.712, - 31.6731, + (4, + 1, 0.0, FLOWER_TYPE), (-26,