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

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

View file

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

View file

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

View file

@ -1,5 +1,5 @@
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.interval.MetaInterval import Sequence, Parallel
from direct.interval.FunctionInterval import Wait, Func
@ -19,6 +19,7 @@ class CogdoMazeMapGui(MazeMapGui):
self._initModel()
self.setPos(*Globals.MapGuiPos)
self.setScale(Globals.MapGuiScale)
self.reparentTo(base.a2dBottomRight)
def destroy(self):
for marker in self._suit2marker.values():

View file

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

View file

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