From c42511f670ce46bc9e69ff5124a0bb9b46f2572f Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 20 Apr 2015 18:15:19 +0300 Subject: [PATCH] Enable parties, fix party cost and fix party planner crash --- config/events/grand-opening.prc | 2 +- config/release/dev.prc | 2 +- config/release/test.prc | 2 +- toontown/parties/PartyGlobals.py | 2 +- toontown/parties/PartyPlanner.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/events/grand-opening.prc b/config/events/grand-opening.prc index bf6dc060..6b26c0d8 100644 --- a/config/events/grand-opening.prc +++ b/config/events/grand-opening.prc @@ -32,7 +32,7 @@ punchline-place-building-chance 100.0 want-fishing #f want-housing #f want-pets #f -want-parties #f +want-parties #t # Optional: want-talkative-tyler #f diff --git a/config/release/dev.prc b/config/release/dev.prc index ea637aa7..07fb4ae7 100644 --- a/config/release/dev.prc +++ b/config/release/dev.prc @@ -21,7 +21,7 @@ dc-file astron/dclass/otp.dc # Core features: want-pets #f -want-parties #f +want-parties #t want-cogdominiums #f want-achievements #f diff --git a/config/release/test.prc b/config/release/test.prc index 6b16e214..a7f318d7 100644 --- a/config/release/test.prc +++ b/config/release/test.prc @@ -10,7 +10,7 @@ shard-mid-pop 150 # Core features: want-housing #t want-pets #f -want-parties #f +want-parties #t want-cogdominiums #f want-achievements #f boarding-group-merges #t diff --git a/toontown/parties/PartyGlobals.py b/toontown/parties/PartyGlobals.py index c8d6a2c8..5119c5b2 100644 --- a/toontown/parties/PartyGlobals.py +++ b/toontown/parties/PartyGlobals.py @@ -231,7 +231,7 @@ PlayGroundToPartyClockColors = {'the_burrrgh': (53.0 / 255.0, PartyGridUnitLength = [14.4, 14.6] PartyGridHeadingConverter = 15.0 PartyGridToPandaOffset = (-PartyGridUnitLength[0] * PartyEditorGridSize[0] / 2.0, -PartyGridUnitLength[1] * PartyEditorGridSize[1] / 2.0) -PartyCostMultiplier = 0 # ALPHA ONLY - remove after parties are legit +PartyCostMultiplier = 1 MinimumPartyCost = 100 * PartyCostMultiplier ActivityInformationDict = {ActivityIds.PartyJukebox: {'cost': int(50 * PartyCostMultiplier), 'gridsize': (1, 1), diff --git a/toontown/parties/PartyPlanner.py b/toontown/parties/PartyPlanner.py index 255bbd83..25a7cef2 100644 --- a/toontown/parties/PartyPlanner.py +++ b/toontown/parties/PartyPlanner.py @@ -15,7 +15,7 @@ from otp.otpbase import OTPLocalizer from toontown.friends.FriendsListPanel import determineFriendName from toontown.nametag.Nametag import Nametag from toontown.nametag.NametagFloat2d import * -from toontown.nametag.NametagGlobals import * +from toontown.nametag import NametagGlobals from toontown.nametag.NametagGroup import NametagGroup from toontown.parties import PartyGlobals from toontown.parties import PartyUtils