From 84a0f214b653c9d475654ea35eb7e75a9299707d Mon Sep 17 00:00:00 2001 From: Little Cat Date: Thu, 29 Jul 2021 22:00:18 -0300 Subject: [PATCH 1/9] suit: Fix crash when reclaiming old buildings Fixes #42 --- toontown/suit/DistributedSuitPlannerAI.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toontown/suit/DistributedSuitPlannerAI.py b/toontown/suit/DistributedSuitPlannerAI.py index f1620a2..3acff76 100644 --- a/toontown/suit/DistributedSuitPlannerAI.py +++ b/toontown/suit/DistributedSuitPlannerAI.py @@ -633,7 +633,7 @@ class DistributedSuitPlannerAI(DistributedObjectAI.DistributedObjectAI, SuitPlan if oldestAge > timeout: self.notify.info('Street %d has %d buildings; reclaiming %0.2f-hour-old building.' % (self.zoneId, len(suitBuildings), oldestAge / 3600.0)) oldest.b_setVictorList([0, 0, 0, 0]) - oldest.updateSavedBy(None) + oldest.updateSavedBy([]) oldest.toonTakeOver() self.__waitForNextUpkeep() return Task.done From 1179c2099495755f79842f094c218954d8e35b50 Mon Sep 17 00:00:00 2001 From: NathanX-S Date: Fri, 30 Jul 2021 16:22:35 -0400 Subject: [PATCH 2/9] general: "server-data-folder" config fixed --- etc/Configrc.prc | 1 + toontown/ai/ToontownAIRepository.py | 11 +++++++++++ toontown/building/DistributedBuildingMgrAI.py | 3 +-- toontown/racing/RaceManagerAI.py | 3 +-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/etc/Configrc.prc b/etc/Configrc.prc index f076914..32c048c 100644 --- a/etc/Configrc.prc +++ b/etc/Configrc.prc @@ -96,3 +96,4 @@ early-event-sphere 1 accept-clock-skew 1 text-minfilter linear_mipmap_linear gc-save-all 0 +server-data-folder data diff --git a/toontown/ai/ToontownAIRepository.py b/toontown/ai/ToontownAIRepository.py index d08b56a..c6d95bb 100644 --- a/toontown/ai/ToontownAIRepository.py +++ b/toontown/ai/ToontownAIRepository.py @@ -49,6 +49,7 @@ from toontown.suit.SuitInvasionManagerAI import SuitInvasionManagerAI from toontown.toon import NPCToons from toontown.toonbase import ToontownGlobals from toontown.uberdog.DistributedInGameNewsMgrAI import DistributedInGameNewsMgrAI +import os class ToontownAIRepository(ToontownInternalRepository): @@ -60,6 +61,9 @@ class ToontownAIRepository(ToontownInternalRepository): self.doLiveUpdates = config.GetBool('want-live-updates', True) self.wantCogdominiums = config.GetBool('want-cogdominiums', True) self.useAllMinigames = config.GetBool('want-all-minigames', True) + self.dataFolder = config.GetString('server-data-folder', '') + if self.dataFolder: + self.dataFolder = self.dataFolder + '/' self.districtId = None self.district = None self.districtStats = None @@ -107,6 +111,9 @@ class ToontownAIRepository(ToontownInternalRepository): self.notify.info('Declaring ownership...') self.district.setAI(self.ourChannel) + # Setup necessary files and things. + self.setupFiles() + # Create our local objects. self.notify.info('Creating local objects...') self.createLocals() @@ -461,3 +468,7 @@ class ToontownAIRepository(ToontownInternalRepository): def trueUniqueName(self, idString): return self.uniqueName(idString) + + def setupFiles(self): + if not os.path.exists(self.dataFolder): + os.mkdir(self.dataFolder) diff --git a/toontown/building/DistributedBuildingMgrAI.py b/toontown/building/DistributedBuildingMgrAI.py index 9833900..d506656 100644 --- a/toontown/building/DistributedBuildingMgrAI.py +++ b/toontown/building/DistributedBuildingMgrAI.py @@ -11,7 +11,6 @@ import time, random class DistributedBuildingMgrAI: notify = DirectNotifyGlobal.directNotify.newCategory('DistributedBuildingMgrAI') - serverDatafolder = simbase.config.GetString('server-data-folder', '') def __init__(self, air, branchID, dnaStore, trophyMgr): self.branchID = branchID @@ -231,7 +230,7 @@ class DistributedBuildingMgrAI: return building def getFileName(self): - f = '%s%s_%d_buildings.json' % (self.serverDatafolder, self.shard, self.branchID) + f = '%s%s_%d_buildings.json' % (self.air.dataFolder, self.shard, self.branchID) return f def saveTo(self, file): diff --git a/toontown/racing/RaceManagerAI.py b/toontown/racing/RaceManagerAI.py index 3626432..b19e54f 100644 --- a/toontown/racing/RaceManagerAI.py +++ b/toontown/racing/RaceManagerAI.py @@ -9,7 +9,6 @@ import os, pickle class RaceManagerAI(DirectObject.DirectObject): notify = DirectNotifyGlobal.directNotify.newCategory('RaceManagerAI') - serverDataFolder = simbase.config.GetString('server-data-folder', '') def __init__(self, air): DirectObject.DirectObject.__init__(self) @@ -620,7 +619,7 @@ class RaceManagerAI(DirectObject.DirectObject): self.notify.warning(str(sys.exc_info()[1])) def getFilename(self): - return '%s%s.trackRecords' % (self.serverDataFolder, self.shard) + return '%s%s.trackRecords' % (self.air.dataFolder, self.shard) def loadRecords(self): try: From 6d7b5070c5afa1ff95ebd8f7863e196721c38427 Mon Sep 17 00:00:00 2001 From: TheFamiliarScoot <19767826+TheFamiliarScoot@users.noreply.github.com> Date: Fri, 30 Jul 2021 17:27:31 -0400 Subject: [PATCH 3/9] vs code tasks cool B) --- .gitignore | 1 + .vscode/darwin/start-ai-server.sh | 12 ++++ .vscode/darwin/start-astron-server.sh | 4 ++ .vscode/darwin/start-game.sh | 4 ++ .vscode/darwin/start-uberdog-server.sh | 11 +++ .vscode/linux/start-ai-server.sh | 12 ++++ .vscode/linux/start-astron-server.sh | 6 ++ .vscode/linux/start-game.sh | 4 ++ .vscode/linux/start-uberdog-server.sh | 11 +++ .vscode/tasks.json | 99 ++++++++++++++++++++++++++ .vscode/win32/start_ai_server.bat | 11 +++ .vscode/win32/start_astron_server.bat | 3 + .vscode/win32/start_game.bat | 7 ++ .vscode/win32/start_uberdog_server.bat | 9 +++ 14 files changed, 194 insertions(+) create mode 100644 .vscode/darwin/start-ai-server.sh create mode 100644 .vscode/darwin/start-astron-server.sh create mode 100644 .vscode/darwin/start-game.sh create mode 100644 .vscode/darwin/start-uberdog-server.sh create mode 100644 .vscode/linux/start-ai-server.sh create mode 100644 .vscode/linux/start-astron-server.sh create mode 100644 .vscode/linux/start-game.sh create mode 100644 .vscode/linux/start-uberdog-server.sh create mode 100644 .vscode/tasks.json create mode 100644 .vscode/win32/start_ai_server.bat create mode 100644 .vscode/win32/start_astron_server.bat create mode 100644 .vscode/win32/start_game.bat create mode 100644 .vscode/win32/start_uberdog_server.bat diff --git a/.gitignore b/.gitignore index dacef3a..c861623 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ whitelist/ .idea venv/ *.json +!.vscode/tasks.json *.buildings *.trackRecords PPYTHON_PATH diff --git a/.vscode/darwin/start-ai-server.sh b/.vscode/darwin/start-ai-server.sh new file mode 100644 index 0000000..916fc92 --- /dev/null +++ b/.vscode/darwin/start-ai-server.sh @@ -0,0 +1,12 @@ +#!/bin/sh +BASE_CHANNEL=401000000 +MAX_CHANNELS=999999 +STATE_SERVER=4002 +MESSAGE_DIRECTOR_IP="127.0.0.1:7199" +EVENT_LOGGER_IP="127.0.0.1:7197" +DISTRICT_NAME="Toon Valley" + +/usr/local/bin/python3.9 -m toontown.ai.AIStart --base-channel ${BASE_CHANNEL} \ + --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ + --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ + --eventlogger-ip ${EVENT_LOGGER_IP} --district-name "$DISTRICT_NAME" diff --git a/.vscode/darwin/start-astron-server.sh b/.vscode/darwin/start-astron-server.sh new file mode 100644 index 0000000..4fe8a26 --- /dev/null +++ b/.vscode/darwin/start-astron-server.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# This assumes that your astrond build is located in the +# "astron/darwin" directory. +./astrond --loglevel info ../config/astrond.yml diff --git a/.vscode/darwin/start-game.sh b/.vscode/darwin/start-game.sh new file mode 100644 index 0000000..95f2e3f --- /dev/null +++ b/.vscode/darwin/start-game.sh @@ -0,0 +1,4 @@ +#!/bin/sh +export LOGIN_TOKEN=dev + +/usr/local/bin/python3.9 -m toontown.launcher.QuickStartLauncher diff --git a/.vscode/darwin/start-uberdog-server.sh b/.vscode/darwin/start-uberdog-server.sh new file mode 100644 index 0000000..1e05618 --- /dev/null +++ b/.vscode/darwin/start-uberdog-server.sh @@ -0,0 +1,11 @@ +#!/bin/sh +MAX_CHANNELS=999999 +STATE_SERVER=4002 +MESSAGE_DIRECTOR_IP="127.0.0.1:7199" +EVENT_LOGGER_IP="127.0.0.1:7197" +BASE_CHANNEL=1000000 + +/usr/local/bin/python3.9 -m toontown.uberdog.UDStart --base-channel ${BASE_CHANNEL} \ + --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ + --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ + --eventlogger-ip ${EVENT_LOGGER_IP} diff --git a/.vscode/linux/start-ai-server.sh b/.vscode/linux/start-ai-server.sh new file mode 100644 index 0000000..c9d456d --- /dev/null +++ b/.vscode/linux/start-ai-server.sh @@ -0,0 +1,12 @@ +#!/bin/sh +BASE_CHANNEL=401000000 +MAX_CHANNELS=999999 +STATE_SERVER=4002 +MESSAGE_DIRECTOR_IP="127.0.0.1:7199" +EVENT_LOGGER_IP="127.0.0.1:7197" +DISTRICT_NAME="Toon Valley" + +python3 -m toontown.ai.AIStart --base-channel ${BASE_CHANNEL} \ + --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ + --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ + --eventlogger-ip ${EVENT_LOGGER_IP} --district-name "$DISTRICT_NAME" diff --git a/.vscode/linux/start-astron-server.sh b/.vscode/linux/start-astron-server.sh new file mode 100644 index 0000000..5ec5fcf --- /dev/null +++ b/.vscode/linux/start-astron-server.sh @@ -0,0 +1,6 @@ +#!/bin/sh +cd /astron/linux + +# This assumes that your astrond build is located in the +# "astron/linux" directory. +./astrond --loglevel info ../config/astrond.yml diff --git a/.vscode/linux/start-game.sh b/.vscode/linux/start-game.sh new file mode 100644 index 0000000..f00afea --- /dev/null +++ b/.vscode/linux/start-game.sh @@ -0,0 +1,4 @@ +#!/bin/sh +export LOGIN_TOKEN=dev + +python3 -m toontown.launcher.QuickStartLauncher diff --git a/.vscode/linux/start-uberdog-server.sh b/.vscode/linux/start-uberdog-server.sh new file mode 100644 index 0000000..2a5e232 --- /dev/null +++ b/.vscode/linux/start-uberdog-server.sh @@ -0,0 +1,11 @@ +#!/bin/sh +MAX_CHANNELS=999999 +STATE_SERVER=4002 +MESSAGE_DIRECTOR_IP="127.0.0.1:7199" +EVENT_LOGGER_IP="127.0.0.1:7197" +BASE_CHANNEL=1000000 + +python3 -m toontown.uberdog.UDStart --base-channel ${BASE_CHANNEL} \ + --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ + --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ + --eventlogger-ip ${EVENT_LOGGER_IP} diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..2076fb7 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,99 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "Start Game", + "type": "shell", + "command": "./.vscode/linux/start_game.sh", + "windows": { + "command": ".\\.vscode\\win32\\start_game.bat" + }, + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "Start Game (Darwin)", + "type": "shell", + "command": "./.vscode/darwin/start_game.sh", + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "Start AI Server", + "type": "shell", + "command": "./.vscode/linux/start_ai_server.sh", + "windows": { + "command": ".\\.vscode\\win32\\start_ai_server.bat" + }, + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "Start AI Server (Darwin)", + "type": "shell", + "command": "./.vscode/darwin/start_ai_server.sh", + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "Start Astron Server", + "type": "shell", + "command": "./.vscode/linux/start_astron_server.sh", + "windows": { + "command": ".\\.vscode\\win32\\start_astron_server.bat" + }, + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "Start Astron Server (Darwin)", + "type": "shell", + "command": "./.vscode/darwin/start_astron_server.sh", + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "Start UberDOG Server", + "type": "shell", + "command": "./.vscode/linux/start_uberdog_server.sh", + "windows": { + "command": ".\\.vscode\\win32\\start_uberdog_server.bat" + }, + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "Start UberDOG Server (Darwin)", + "type": "shell", + "command": "./.vscode/darwin/start_uberdog_server.sh", + "group": "test", + "presentation": { + "reveal": "always", + "panel": "new" + } + } + ] + } \ No newline at end of file diff --git a/.vscode/win32/start_ai_server.bat b/.vscode/win32/start_ai_server.bat new file mode 100644 index 0000000..81f8251 --- /dev/null +++ b/.vscode/win32/start_ai_server.bat @@ -0,0 +1,11 @@ +@echo off +rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%: +set /P PPYTHON_PATH= Date: Fri, 30 Jul 2021 22:47:38 -0400 Subject: [PATCH 4/9] general: new vsc tasks method added a workspace for tasks relying on the existing scripts --- .gitignore | 4 +- .vscode/darwin/start-ai-server.sh | 12 ---- .vscode/darwin/start-astron-server.sh | 4 -- .vscode/darwin/start-game.sh | 4 -- .vscode/darwin/start-uberdog-server.sh | 11 --- .vscode/linux/start-ai-server.sh | 12 ---- .vscode/linux/start-astron-server.sh | 6 -- .vscode/linux/start-game.sh | 4 -- .vscode/linux/start-uberdog-server.sh | 11 --- .vscode/tasks.json | 99 -------------------------- .vscode/win32/start_ai_server.bat | 11 --- .vscode/win32/start_astron_server.bat | 3 - .vscode/win32/start_game.bat | 7 -- .vscode/win32/start_uberdog_server.bat | 9 --- darwin/.vscode/tasks.json | 47 ++++++++++++ linux/.vscode/tasks.json | 47 ++++++++++++ vscode.code-workspace | 20 ++++++ win32/.vscode/tasks.json | 47 ++++++++++++ 18 files changed, 164 insertions(+), 194 deletions(-) delete mode 100644 .vscode/darwin/start-ai-server.sh delete mode 100644 .vscode/darwin/start-astron-server.sh delete mode 100644 .vscode/darwin/start-game.sh delete mode 100644 .vscode/darwin/start-uberdog-server.sh delete mode 100644 .vscode/linux/start-ai-server.sh delete mode 100644 .vscode/linux/start-astron-server.sh delete mode 100644 .vscode/linux/start-game.sh delete mode 100644 .vscode/linux/start-uberdog-server.sh delete mode 100644 .vscode/tasks.json delete mode 100644 .vscode/win32/start_ai_server.bat delete mode 100644 .vscode/win32/start_astron_server.bat delete mode 100644 .vscode/win32/start_game.bat delete mode 100644 .vscode/win32/start_uberdog_server.bat create mode 100644 darwin/.vscode/tasks.json create mode 100644 linux/.vscode/tasks.json create mode 100644 vscode.code-workspace create mode 100644 win32/.vscode/tasks.json diff --git a/.gitignore b/.gitignore index c861623..fad4562 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,9 @@ whitelist/ .idea venv/ *.json -!.vscode/tasks.json +!win32/.vscode/tasks.json +!linux/.vscode/tasks.json +!darwin/.vscode/tasks.json *.buildings *.trackRecords PPYTHON_PATH diff --git a/.vscode/darwin/start-ai-server.sh b/.vscode/darwin/start-ai-server.sh deleted file mode 100644 index 916fc92..0000000 --- a/.vscode/darwin/start-ai-server.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -BASE_CHANNEL=401000000 -MAX_CHANNELS=999999 -STATE_SERVER=4002 -MESSAGE_DIRECTOR_IP="127.0.0.1:7199" -EVENT_LOGGER_IP="127.0.0.1:7197" -DISTRICT_NAME="Toon Valley" - -/usr/local/bin/python3.9 -m toontown.ai.AIStart --base-channel ${BASE_CHANNEL} \ - --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ - --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ - --eventlogger-ip ${EVENT_LOGGER_IP} --district-name "$DISTRICT_NAME" diff --git a/.vscode/darwin/start-astron-server.sh b/.vscode/darwin/start-astron-server.sh deleted file mode 100644 index 4fe8a26..0000000 --- a/.vscode/darwin/start-astron-server.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# This assumes that your astrond build is located in the -# "astron/darwin" directory. -./astrond --loglevel info ../config/astrond.yml diff --git a/.vscode/darwin/start-game.sh b/.vscode/darwin/start-game.sh deleted file mode 100644 index 95f2e3f..0000000 --- a/.vscode/darwin/start-game.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -export LOGIN_TOKEN=dev - -/usr/local/bin/python3.9 -m toontown.launcher.QuickStartLauncher diff --git a/.vscode/darwin/start-uberdog-server.sh b/.vscode/darwin/start-uberdog-server.sh deleted file mode 100644 index 1e05618..0000000 --- a/.vscode/darwin/start-uberdog-server.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -MAX_CHANNELS=999999 -STATE_SERVER=4002 -MESSAGE_DIRECTOR_IP="127.0.0.1:7199" -EVENT_LOGGER_IP="127.0.0.1:7197" -BASE_CHANNEL=1000000 - -/usr/local/bin/python3.9 -m toontown.uberdog.UDStart --base-channel ${BASE_CHANNEL} \ - --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ - --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ - --eventlogger-ip ${EVENT_LOGGER_IP} diff --git a/.vscode/linux/start-ai-server.sh b/.vscode/linux/start-ai-server.sh deleted file mode 100644 index c9d456d..0000000 --- a/.vscode/linux/start-ai-server.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -BASE_CHANNEL=401000000 -MAX_CHANNELS=999999 -STATE_SERVER=4002 -MESSAGE_DIRECTOR_IP="127.0.0.1:7199" -EVENT_LOGGER_IP="127.0.0.1:7197" -DISTRICT_NAME="Toon Valley" - -python3 -m toontown.ai.AIStart --base-channel ${BASE_CHANNEL} \ - --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ - --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ - --eventlogger-ip ${EVENT_LOGGER_IP} --district-name "$DISTRICT_NAME" diff --git a/.vscode/linux/start-astron-server.sh b/.vscode/linux/start-astron-server.sh deleted file mode 100644 index 5ec5fcf..0000000 --- a/.vscode/linux/start-astron-server.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -cd /astron/linux - -# This assumes that your astrond build is located in the -# "astron/linux" directory. -./astrond --loglevel info ../config/astrond.yml diff --git a/.vscode/linux/start-game.sh b/.vscode/linux/start-game.sh deleted file mode 100644 index f00afea..0000000 --- a/.vscode/linux/start-game.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -export LOGIN_TOKEN=dev - -python3 -m toontown.launcher.QuickStartLauncher diff --git a/.vscode/linux/start-uberdog-server.sh b/.vscode/linux/start-uberdog-server.sh deleted file mode 100644 index 2a5e232..0000000 --- a/.vscode/linux/start-uberdog-server.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -MAX_CHANNELS=999999 -STATE_SERVER=4002 -MESSAGE_DIRECTOR_IP="127.0.0.1:7199" -EVENT_LOGGER_IP="127.0.0.1:7197" -BASE_CHANNEL=1000000 - -python3 -m toontown.uberdog.UDStart --base-channel ${BASE_CHANNEL} \ - --max-channels ${MAX_CHANNELS} --stateserver ${STATE_SERVER} \ - --messagedirector-ip ${MESSAGE_DIRECTOR_IP} \ - --eventlogger-ip ${EVENT_LOGGER_IP} diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index 2076fb7..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "Start Game", - "type": "shell", - "command": "./.vscode/linux/start_game.sh", - "windows": { - "command": ".\\.vscode\\win32\\start_game.bat" - }, - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Start Game (Darwin)", - "type": "shell", - "command": "./.vscode/darwin/start_game.sh", - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Start AI Server", - "type": "shell", - "command": "./.vscode/linux/start_ai_server.sh", - "windows": { - "command": ".\\.vscode\\win32\\start_ai_server.bat" - }, - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Start AI Server (Darwin)", - "type": "shell", - "command": "./.vscode/darwin/start_ai_server.sh", - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Start Astron Server", - "type": "shell", - "command": "./.vscode/linux/start_astron_server.sh", - "windows": { - "command": ".\\.vscode\\win32\\start_astron_server.bat" - }, - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Start Astron Server (Darwin)", - "type": "shell", - "command": "./.vscode/darwin/start_astron_server.sh", - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Start UberDOG Server", - "type": "shell", - "command": "./.vscode/linux/start_uberdog_server.sh", - "windows": { - "command": ".\\.vscode\\win32\\start_uberdog_server.bat" - }, - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - }, - { - "label": "Start UberDOG Server (Darwin)", - "type": "shell", - "command": "./.vscode/darwin/start_uberdog_server.sh", - "group": "test", - "presentation": { - "reveal": "always", - "panel": "new" - } - } - ] - } \ No newline at end of file diff --git a/.vscode/win32/start_ai_server.bat b/.vscode/win32/start_ai_server.bat deleted file mode 100644 index 81f8251..0000000 --- a/.vscode/win32/start_ai_server.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off -rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%: -set /P PPYTHON_PATH= Date: Fri, 30 Jul 2021 23:15:41 -0400 Subject: [PATCH 5/9] general: more vsc stuff added some file exclusions so the workspace looks a bit cleaner --- vscode.code-workspace | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/vscode.code-workspace b/vscode.code-workspace index b9fcf60..18db2f1 100644 --- a/vscode.code-workspace +++ b/vscode.code-workspace @@ -16,5 +16,21 @@ "name": "Darwin Scripts", "path": "darwin" } - ] + ], + "settings": { + "files.exclude": { + "**/__pycache__": true, + "**/.idea": true, + "**/.pyc,**/*.pyo,**/*.pyd": true, + "**/*_buildings.json": true, + "**/darwin": true, + "**/errorCode": true, + "**/linux": true, + "**/news": true, + "**/resources": true, + "**/sign": true, + "**/whitelist": true, + "**/win32": true + } + } } \ No newline at end of file From 9cf234454cf77e627d764d655879686023bf0c75 Mon Sep 17 00:00:00 2001 From: John Cote Date: Sun, 1 Aug 2021 20:24:01 -0400 Subject: [PATCH 6/9] linux: Adjust start script permissions --- linux/start-ai-server.sh | 0 linux/start-astron-server.sh | 0 linux/start-game.sh | 0 linux/start-uberdog-server.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 linux/start-ai-server.sh mode change 100644 => 100755 linux/start-astron-server.sh mode change 100644 => 100755 linux/start-game.sh mode change 100644 => 100755 linux/start-uberdog-server.sh diff --git a/linux/start-ai-server.sh b/linux/start-ai-server.sh old mode 100644 new mode 100755 diff --git a/linux/start-astron-server.sh b/linux/start-astron-server.sh old mode 100644 new mode 100755 diff --git a/linux/start-game.sh b/linux/start-game.sh old mode 100644 new mode 100755 diff --git a/linux/start-uberdog-server.sh b/linux/start-uberdog-server.sh old mode 100644 new mode 100755 From f5d09eb07d867f1d0a33a8ee54aeb0ee90fbbb54 Mon Sep 17 00:00:00 2001 From: John Cote Date: Sun, 1 Aug 2021 20:36:46 -0400 Subject: [PATCH 7/9] linux: Fix VS Code tasks --- linux/.vscode/tasks.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 linux/.vscode/tasks.json diff --git a/linux/.vscode/tasks.json b/linux/.vscode/tasks.json old mode 100644 new mode 100755 index 8a97f37..3169d73 --- a/linux/.vscode/tasks.json +++ b/linux/.vscode/tasks.json @@ -6,7 +6,7 @@ { "label": "Linux - Start Game", "type": "shell", - "command": "./start_game.sh", + "command": "./start-game.sh", "group": "test", "presentation": { "reveal": "always", @@ -16,7 +16,7 @@ { "label": "Linux - Start AI Server", "type": "shell", - "command": "./start_ai_server.sh", + "command": "./start-ai-server.sh", "group": "test", "presentation": { "reveal": "always", @@ -26,7 +26,7 @@ { "label": "Linux - Start Astron Server", "type": "shell", - "command": "./start_astron_server.sh", + "command": "./start-astron-server.sh", "group": "test", "presentation": { "reveal": "always", @@ -36,7 +36,7 @@ { "label": "Linux - Start UberDOG Server", "type": "shell", - "command": "./start_uberdog_server.sh", + "command": "./start-uberdog-server.sh", "group": "test", "presentation": { "reveal": "always", @@ -44,4 +44,4 @@ } }, ] - } \ No newline at end of file +} From 3acdc48f99e9fee983ebf81030f2f78dd0259304 Mon Sep 17 00:00:00 2001 From: John Cote Date: Sun, 1 Aug 2021 20:50:24 -0400 Subject: [PATCH 8/9] darwin: Fix VS Code tasks --- darwin/.vscode/tasks.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/darwin/.vscode/tasks.json b/darwin/.vscode/tasks.json index 2c5e473..a926aee 100644 --- a/darwin/.vscode/tasks.json +++ b/darwin/.vscode/tasks.json @@ -6,7 +6,7 @@ { "label": "Darwin - Start Game", "type": "shell", - "command": "./start_game.sh", + "command": "./start-game.sh", "group": "test", "presentation": { "reveal": "always", @@ -16,7 +16,7 @@ { "label": "Darwin - Start AI Server", "type": "shell", - "command": "./start_ai_server.sh", + "command": "./start-ai-server.sh", "group": "test", "presentation": { "reveal": "always", @@ -26,7 +26,7 @@ { "label": "Darwin - Start Astron Server", "type": "shell", - "command": "./start_astron_server.sh", + "command": "./start-astron-server.sh", "group": "test", "presentation": { "reveal": "always", @@ -36,7 +36,7 @@ { "label": "Darwin - Start UberDOG Server", "type": "shell", - "command": "./start_uberdog_server.sh", + "command": "./start-uberdog-server.sh", "group": "test", "presentation": { "reveal": "always", @@ -44,4 +44,4 @@ } }, ] - } \ No newline at end of file +} From 637956192e966bab011e6ad85c9ca54c9b9b8210 Mon Sep 17 00:00:00 2001 From: loonaticx Date: Fri, 13 Aug 2021 21:33:03 -0500 Subject: [PATCH 9/9] readme: Various grammar adjustments :smile: --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 870c58f..85efb4e 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you install Panda3D outside the default directory (or use the x86 installer), ## macOS 10.9+ [Panda3D Wheel for macOS 10.9+ (Python3.9, x86_64)](https://drive.google.com/file/d/1_6WJxrkNfwisK5pe5ubJJy1psEp0IIft/view?usp=sharing) -Installing the provided Panda3D wheel requires Python 3.9, which is not installed on your system by default whatsoever. We recommand installing Python 3.9 through [Homebrew](https://brew.sh/) (Make sure that the xcode command line tools are installed first `xcode-select --install`): +Installing the provided Panda3D wheel requires Python 3.9, which is not installed on your system by default whatsoever. We recommend installing Python 3.9 through [Homebrew](https://brew.sh/) (Make sure that the xcode command line tools are installed first `xcode-select --install`): ```shell $ brew install python@3.9 ``` @@ -37,12 +37,12 @@ To start the server and run the game locally, go to your platform directory (`wi `Astron Server -> UberDOG (UD) Server -> AI (District) Server -> Game Client` -Be sure to wait till the servers have finished booting before starting the next. If everything's done correctly, you should be able to make your toon and play the game! There is no support for Magic Words (commands) yet, [but it is currently in the works!](https://github.com/open-toontown/open-toontown/projects/1) +Be sure to wait till the servers have finished booting before starting the next. If done correctly, you should be able to make your toon and play the game! There is no support for Magic Words (commands) yet, [but it is currently in the works!](https://github.com/open-toontown/open-toontown/projects/1) # Contributing Submitting issues and Pull Requests are encouraged and welcome. -How you commit changes is your choice, but when committing, please include what you did as well as a basic description, just so we know exactly what you did. Here are some examples: +How you commit changes is your choice, but please include what you did and a basic description so that we know exactly what was modified. Here are some examples: * `minigames: Fix crash when entering the trolley` * `racing: Fix possible race condition when two racers tied`