From 8668db65418a3238491d53a1c5b4860d5ad2dd23 Mon Sep 17 00:00:00 2001 From: jlew Date: Sun, 22 Aug 2010 03:55:42 +0000 Subject: Directory Cleanup --- diff --git a/DrawableObjectTests/DrawableObject.py b/DrawableObjectTests/DrawableObject.py deleted file mode 100755 index 07a5613..0000000 --- a/DrawableObjectTests/DrawableObject.py +++ /dev/null @@ -1,156 +0,0 @@ -import pygame - -class DrawableObject(pygame.sprite.Sprite): - - def __init__(self,images,textfileName,fps = 10, x = 0, y = 0, xVelocity = 0, yVelocity = 0): - pygame.sprite.Sprite.__init__(self) - cnt = 0 - - #self._originals = images - #self._images = images - self._images = [] - self._origImages = [] - while cnt < len(images): - self._images.append(images[cnt][0].convert()) - self._origImages.append(images[cnt][0].convert()) - cnt += 1 - self._start = pygame.time.get_ticks() - self.image = self._images[0] - self._delay = 1000 / fps - self._last_update = 0 - self._frame = 0 - self.animations = {} - self._current_anim = "" - self.xPos = x - self.yPos = y - self.xSpeed = xVelocity - self.ySpeed = yVelocity - self.myAngle = 0 - self.xSize = 40 - self.ySize = 40 - - if textfileName != '': - - f = open(textfileName, 'r') - currentLine = f.readline() - while currentLine != '': - - animValues = currentLine.split(",") - self.animations[animValues[0]] = [int(animValues[1]), int(animValues[2])] - currentLine = f.readline() - - - def addImages(self, images): - - self._images.extend(images) - #self._originals.extend(images) - - def goToAnim(self, animName): - - cnt = 0 - while cnt < len(animations): - - if animations[cnt] == animName: - self._current_anim = animName - self._frame = self.animations[animName][0] - self.image = self._images[self._frame] - cnt = len(animations) - cnt += 1 - - def move(self): - - self.xPos += self.xSpeed - self.yPos += self.ySpeed - - self.image[0].get_rect().move(self.xPos,self.yPos) - - def nudge(self, xNudge = 0, yNudge = 0): - - self.xPos += xNudge - self.yPos += yNudge - - self.image[0].get_rect().move(self.xPos,self.yPos) - - def scale(self, newXSize = None, newYSize = None): - - if newXSize != None: self.xSize = newXSize - if newYSize != None: self.ySize = newYSize - - cnt = 0 - while cnt < len(self._images): - - self._origImages[cnt] = pygame.transform.scale(self._origImages[cnt], (self.xSize, self.ySize)) - self._images[cnt] = self._origImages[cnt] - cnt += 1 - - def getXSize(self): - - return self.xSize - - def getYSize(self): - - return self.ySize - - def rotate(self,angle): - - cnt = 0 - - self.myAngle += angle - while cnt < len(self._images): - - self._images[cnt] = pygame.transform.rotate(self._origImages[cnt], self.myAngle) - cnt += 1 - - def getRotation(self): - - return self.myAngle - - def setPosition(self, x = None, y = None): - - if x != None and x >= 0: self.xPos = x - if y != None and y >= 0: self.yPos = y - - def getXPos(self): - - return self.xPos - - def getYPos(self): - - return self.yPos - - def setSpeed(self, xVelocity = None, yVelocity = None): - - if xVelocity != None: self.xSpeed = xVelocity - if yVelocity != None: self.ySpeed = yVelocity - - def getXSpeed(self): - - return self.xSpeed - - def getYSpeed(self): - - return self.ySpeed - - def calcColorKey(self): - - myColorKey = images[0][0].get_at((0,0)) - setColorKey(myColorKey) - - def setColorKey(self, aColor): - - cnt = 0 - while cnt < len(self._images): - self._images[cnt][0].set_colorkey(aColor) - cnt += 1 - - def update(self, t): - pass - - def updateCurrnetAnimation(self, t): - pass - - def nextFrame(self): - pass - - def nextCurrentAnimFrame(self): - pass diff --git a/DrawableObjectTests/Room.gif b/DrawableObjectTests/Room.gif deleted file mode 100644 index 798ebf1..0000000 --- a/DrawableObjectTests/Room.gif +++ /dev/null Binary files differ diff --git a/DrawableObjectTests/TestObject b/DrawableObjectTests/TestObject deleted file mode 100644 index 3dbdc60..0000000 --- a/DrawableObjectTests/TestObject +++ /dev/null @@ -1,16 +0,0 @@ -import pygame -from DrawableObject import DrawableObject - -class TestObject: - - def __init__(self, drawableObject): - - self.myDrawableObject = drawableObject - - def changeSize(self, x, y): - - self.myDrawableObject.scale(x,y) - - def getDrawable(self): - - return self.myDrawableObject \ No newline at end of file diff --git a/DrawableObjectTests/TestObject.py b/DrawableObjectTests/TestObject.py deleted file mode 100644 index 3dbdc60..0000000 --- a/DrawableObjectTests/TestObject.py +++ /dev/null @@ -1,16 +0,0 @@ -import pygame -from DrawableObject import DrawableObject - -class TestObject: - - def __init__(self, drawableObject): - - self.myDrawableObject = drawableObject - - def changeSize(self, x, y): - - self.myDrawableObject.scale(x,y) - - def getDrawable(self): - - return self.myDrawableObject \ No newline at end of file diff --git a/DrawableObjectTests/TestObject.txt b/DrawableObjectTests/TestObject.txt deleted file mode 100644 index 3dbdc60..0000000 --- a/DrawableObjectTests/TestObject.txt +++ /dev/null @@ -1,16 +0,0 @@ -import pygame -from DrawableObject import DrawableObject - -class TestObject: - - def __init__(self, drawableObject): - - self.myDrawableObject = drawableObject - - def changeSize(self, x, y): - - self.myDrawableObject.scale(x,y) - - def getDrawable(self): - - return self.myDrawableObject \ No newline at end of file diff --git a/DrawableObjectTests/boxes.py b/DrawableObjectTests/boxes.py deleted file mode 100644 index 5b444b6..0000000 --- a/DrawableObjectTests/boxes.py +++ /dev/null @@ -1,32 +0,0 @@ -import pygame - -class UpDownBox(pygame.sprite.Sprite): - def __init__(self, imagesList, initial_position): - pygame.sprite.Sprite.__init__(self) - self.images = imagesList - self.listLen = len(imagesList) - self.listPos = 0 - self.image = imagesList[self.listPos] - self.rect = self.image.get_rect() - self.rect.topleft = initial_position - self.going_down = True # Start going downwards - self.next_update_time = 0 # update() hasn't been called yet. - - def update(self, current_time, bottom): - # Update every 10 milliseconds = 1/100th of a second. - if self.next_update_time < current_time: - - # If we're at the top or bottom of the screen, switch directions. - if self.rect.bottom == bottom - 1: self.going_down = False - elif self.rect.top == 0: self.going_down = True - - # Move our position up or down by one pixel - if self.going_down: self.rect.top += 1 - else: self.rect.top -= 1 - - if self.listPos < self.listLen - 1: - self.listPos += 1 - else: - self.listPos = 0 - self.image = self.images[self.listPos] - self.next_update_time = current_time diff --git a/DrawableObjectTests/goblin.png b/DrawableObjectTests/goblin.png deleted file mode 100644 index 6bdca0f..0000000 --- a/DrawableObjectTests/goblin.png +++ /dev/null Binary files differ diff --git a/DrawableObjectTests/renderupdates.py b/DrawableObjectTests/renderupdates.py deleted file mode 100644 index 30ffe5b..0000000 --- a/DrawableObjectTests/renderupdates.py +++ /dev/null @@ -1,71 +0,0 @@ -import pygame -from pygame.locals import * -from boxes import UpDownBox -from time import time - -pygame.init() -boxes = pygame.sprite.RenderUpdates() -boxesTwo = pygame.sprite.RenderUpdates() -boxesThree = pygame.sprite.RenderUpdates() - -switch1 = [ - pygame.image.load("%sa1/1%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/2%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/3%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/4%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/5%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/6%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/7%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/8%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/9%s"%("IndividualFrames/bmp16/",".bmp")) -] - -switch2 = [ - pygame.image.load("%sa1/1%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/2%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/3%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/4%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/5%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/6%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/7%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/8%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/9%s"%("IndividualFrames/bmp16/",".bmp")) -] - -switch3 = [ - pygame.image.load("%sa1/1%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/2%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/3%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/4%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/5%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/6%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/7%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/8%s"%("IndividualFrames/bmp16/",".bmp")), - pygame.image.load("%sa1/9%s"%("IndividualFrames/bmp16/",".bmp")) -] - -boxes.add(UpDownBox(switch1, (0, 0))) -boxes.add(UpDownBox(switch1, (100, 100))) -boxes.add(UpDownBox(switch1, (200, 200))) - - -screen = pygame.display.set_mode([1200, 900]) -boxesTwo.add(UpDownBox([pygame.image.load("goblin.png")], (0,300))) -background = pygame.image.load("Room.gif") -#background.fill(pygame.image.load("Room.gif")) -screen.blit(background, [0, 0]) -pygame.display.flip() -boxesTwo.update(pygame.time.get_ticks(), 700) -rectlist = boxesTwo.draw(screen) -pygame.display.update(rectlist) -start = time() -for i in range(2000): - boxes.update(pygame.time.get_ticks(), 700) - boxesTwo.update(pygame.time.get_ticks(), 700) - rectlist = boxesTwo.draw(screen) - rectlist.extend(boxes.draw(screen)) - pygame.display.update(rectlist) - boxesTwo.clear(screen, background) - boxes.clear(screen, background) - -print 2000/(time() - start) diff --git a/pre-release/BTgauge_bg.gif b/art/pre-release/BTgauge_bg.gif index af9c726..af9c726 100755 --- a/pre-release/BTgauge_bg.gif +++ b/art/pre-release/BTgauge_bg.gif Binary files differ diff --git a/pre-release/Emerald.gif b/art/pre-release/Emerald.gif index 8643421..8643421 100644 --- a/pre-release/Emerald.gif +++ b/art/pre-release/Emerald.gif Binary files differ diff --git a/pre-release/HPgauge_BG.gif b/art/pre-release/HPgauge_BG.gif index c5c2e1a..c5c2e1a 100755 --- a/pre-release/HPgauge_BG.gif +++ b/art/pre-release/HPgauge_BG.gif Binary files differ diff --git a/pre-release/Ruby.gif b/art/pre-release/Ruby.gif index d181454..d181454 100644 --- a/pre-release/Ruby.gif +++ b/art/pre-release/Ruby.gif Binary files differ diff --git a/pre-release/TreasureMap.jpg b/art/pre-release/TreasureMap.jpg index 6edd0d2..6edd0d2 100755 --- a/pre-release/TreasureMap.jpg +++ b/art/pre-release/TreasureMap.jpg Binary files differ diff --git a/pre-release/amulet inset.gif b/art/pre-release/amulet inset.gif index 941ccfb..941ccfb 100644 --- a/pre-release/amulet inset.gif +++ b/art/pre-release/amulet inset.gif Binary files differ diff --git a/pre-release/amulet.psd b/art/pre-release/amulet.psd index 9244129..9244129 100644 --- a/pre-release/amulet.psd +++ b/art/pre-release/amulet.psd Binary files differ diff --git a/pre-release/fire2.gif b/art/pre-release/fire2.gif index fd0b03a..fd0b03a 100644 --- a/pre-release/fire2.gif +++ b/art/pre-release/fire2.gif Binary files differ diff --git a/pre-release/hand_amulet_workinprogress.psd b/art/pre-release/hand_amulet_workinprogress.psd index 08e1fd6..08e1fd6 100644 --- a/pre-release/hand_amulet_workinprogress.psd +++ b/art/pre-release/hand_amulet_workinprogress.psd Binary files differ -- cgit v0.9.1