Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-24 04:02:40 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cogdos 95% done! Time for Daniel to bring in the iron!

Browse source
This commit is contained in:
Loudrob 2015-03-28 13:31:51 -04:00
parent 8374e30b74
commit 00c2bf3db8
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
astron/dclass/united.dc
View file

@ -2161,6 +2161,7 @@ dclass DistCogdoFlyingGame : DistCogdoGame {
dclass DistCogdoBoardroomGame : DistCogdoLevelGame { dclass DistCogdoBoardroomGame : DistCogdoLevelGame {
}; };
dclass DistributedHQInterior : DistributedObject { dclass DistributedHQInterior : DistributedObject {
setZoneIdAndBlock(uint32, uint16) required broadcast ram; setZoneIdAndBlock(uint32, uint16) required broadcast ram;
setLeaderBoard(blob) required broadcast ram; setLeaderBoard(blob) required broadcast ram;

2
toontown/cogdominium/CogdoMazeGameGlobals.py
View file

@ -201,7 +201,7 @@ MapGuiFgColor = (0.5,
0.5, 0.5,
0.5, 0.5,
1) 1)
MapGuiPos = (1.05, 0.0, -0.71) MapGuiPos = (-0.283, 0, 0.29)
MapGuiScale = 0.225 MapGuiScale = 0.225
MapGuiSuitMarkerFlashColor = (1.0, 0.0, 0.0) MapGuiSuitMarkerFlashColor = (1.0, 0.0, 0.0)
MapGuiSuitMarkerSize = 0.075 MapGuiSuitMarkerSize = 0.075

3
toontown/cogdominium/CogdoMazeGameGuis.py
View file

@ -1,5 +1,5 @@
from direct.gui.DirectLabel import DirectLabel from direct.gui.DirectLabel import DirectLabel
from direct.gui.DirectGui import DirectFrame, DGG from direct.gui.DirectGui import *
from direct.task.Task import Task from direct.task.Task import Task
from direct.interval.MetaInterval import Sequence, Parallel from direct.interval.MetaInterval import Sequence, Parallel
from direct.interval.FunctionInterval import Wait, Func from direct.interval.FunctionInterval import Wait, Func
@ -19,6 +19,7 @@ class CogdoMazeMapGui(MazeMapGui):
self._initModel() self._initModel()
self.setPos(*Globals.MapGuiPos) self.setPos(*Globals.MapGuiPos)
self.setScale(Globals.MapGuiScale) self.setScale(Globals.MapGuiScale)
self.reparentTo(base.a2dBottomRight)
def destroy(self): def destroy(self):
for marker in self._suit2marker.values(): for marker in self._suit2marker.values():

4
toontown/safezone/DistributedPicnicTable.py
View file

@ -500,10 +500,10 @@ class DistributedPicnicTable(DistributedNode.DistributedNode):
self.tableclothSphereNode.setCollideMask(BitMask32(0)) self.tableclothSphereNode.setCollideMask(BitMask32(0))
def enterOff(self): def enterOff(self):
base.setCellsAvailable(base.leftCells + base.bottomCells, 0) base.setCellsActive(base.leftCells + base.bottomCells, 0)
def exitOff(self): def exitOff(self):
base.setCellsAvailable(base.bottomCells, 0) base.setCellsActive(base.bottomCells, 0)
def enterChooseMode(self): def enterChooseMode(self):
self.winTrack = Sequence(autoFinish=1) self.winTrack = Sequence(autoFinish=1)

2
toontown/toon/DistributedToonAI.py
View file

@ -5194,8 +5194,10 @@ def summoncogdo(track="s", difficulty=5):
return "No bldg found!" return "No bldg found!"
building.cogdoTakeOver(difficulty, 2, track) building.cogdoTakeOver(difficulty, 2, track)
return 'Successfully spawned cogdo with track %s and difficulty %d' % (track, difficulty)
@magicWord(category=CATEGORY_PROGRAMMER, types=[int, int]) @magicWord(category=CATEGORY_PROGRAMMER, types=[int, int])
def emblems(silver=10, gold=10): def emblems(silver=10, gold=10):
spellbook.getTarget().addEmblems((gold, silver)) spellbook.getTarget().addEmblems((gold, silver))
return 'Restocked with Gold: %s Silver: %d' % (gold, silver)