From b097de593019a845c8f8a1b97da7c27be258d3f9 Mon Sep 17 00:00:00 2001
From: SidaWang <wangs132@mcmaster.ca>
Date: Wed, 12 Feb 2020 15:15:26 -0500
Subject: [PATCH] minor modifications
---
src/.DS_Store | Bin 8196 -> 8196 bytes
src/__pycache__/game.cpython-37.pyc | Bin 10539 -> 10546 bytes
src/__pycache__/loadSource.cpython-37.pyc | Bin 0 -> 723 bytes
src/__pycache__/world.cpython-37.pyc | Bin 8952 -> 8952 bytes
src/game.py | 20 ++++++++++----------
src/load.py | 13 -------------
src/loadSource.py | 13 +++++++++++++
src/main.py | 10 +++++-----
src/{media => source}/.DS_Store | Bin
src/{media => source}/bgmusic.wav | Bin
src/{media => source}/build.wav | Bin
src/{media => source}/destroy.wav | Bin
src/{media => source}/icon.png | Bin
src/texture/{Marbo.png => Marble.png} | Bin
14 files changed, 28 insertions(+), 28 deletions(-)
create mode 100644 src/__pycache__/loadSource.cpython-37.pyc
delete mode 100644 src/load.py
create mode 100644 src/loadSource.py
rename src/{media => source}/.DS_Store (100%)
rename src/{media => source}/bgmusic.wav (100%)
rename src/{media => source}/build.wav (100%)
rename src/{media => source}/destroy.wav (100%)
rename src/{media => source}/icon.png (100%)
rename src/texture/{Marbo.png => Marble.png} (100%)
diff --git a/src/.DS_Store b/src/.DS_Store
index af9d3ebe10f948bd00133c01b476457d34aa42aa..32bc08205f6485f7b0ab66176dbccaa85dc72462 100755
GIT binary patch
delta 321
zcmZp1XmOa}&nUGqU^hRb)MOrk*`mA*i3~Xm=?wV{MGTn?B@7u1xeUdV9|(v}?i3W5
zyj-A1m=`FY4^)-H5DcVCf$EYc-xH8#teC7JXgS$g$jF?Hp%^B^km{L}pPZDFpTxkx
zAi%)Ds0gGd{|5sgi-7@2?c@zY6WNUnbQFw?OecE?I~pL#F{I|C8wMxm=N5o<K?oH2
z+<ceGf<hv^D1wvugv2dTL<%zS8&eisl$VpAmkzXnadMH+d6<JXdkA|oZY<Gb+RQHT
Ojb-w7;X4~kw3z@sJWj*_
delta 260
zcmZp1XmOa}&nUhzU^hRb_+%b|*^?g%^h{nZs3*+Bkjs$BP{NSG;LDKDkiwA4kTZFM
zpvdG40)q9dK)F<)SSCZFXHI@{Qcivn0|SEq0|TQ1kY4g141g>K1|*d^>4w3{`MCvP
zaR`AVo15?A0yT%@`H6`$U;aGkh^jv~KLx5njRA*}f(&FUCSMRVpZrpofAT5ez3gV@
d2098BCY$?2ycsu7<|$#`%r5bbWn%?9GXU0gNs9mg
diff --git a/src/__pycache__/game.cpython-37.pyc b/src/__pycache__/game.cpython-37.pyc
index 36a0a01a8bcd3b94510fe282724ad1092e0631c0..91d47c5255fda0bdd20e02be90bfa616e6750706 100644
GIT binary patch
delta 52
zcmZ1-v?++!iI<m)0SG=uyTt9>$a|NAoz2%V$jQfb^9PQnvfNxb`H3mP`K3k4she-9
H1u_8us-zKE
delta 45
zcmdlKv^t2_iI<m)0SHbkcaEE~k@qeK8>_Elkdy!Bj~q{BSy^)O6H_)nR10JR06UWo
AoB#j-
diff --git a/src/__pycache__/loadSource.cpython-37.pyc b/src/__pycache__/loadSource.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c9fa008d23212787479e4e60ec7fb5b4123d5ab4
GIT binary patch
literal 723
zcmZvZ&u-c<9LH@phJ-(*rQHsFfJy8?_5f2g0u-SZkO&-RO_M_GvCxDdJ6Q|Yo%arK
z+;xxR>n`IJcA9NgCQY@KufIQk;$Qsx#j93JK#f-)Iv;-^0DkJ=X*kNfQ;+zigaQg<
zK=g`Ym>`0n_9yYl1TbrXw*>|k#jQ;(ig#!SiKBK)i}G=|utT&+?Qe)w{v*zjR5jWD
zJ5w^5P8p(QGb?|yRq5#teZ{0^NR6J+^CPJna`w!b3q#JIA(w{KDfB_(#a>klh7BmO
z7pLL9GVrx5h&1OR+t^W<E}N_6eB;dWD5lMa;LA-zRVy;if+SL)OqmMOwMLurY@XyI
z3U$yx9IDht_S%tR#vZervyJ2ND7@EspI*X>E3X$Ld-Zp~#_91uh{N~&EL}2VOM`&V
zV&fYZ5~YIRnZ7#LXQZ=Q&tsM~=dmmtEWuF{%$c;}G@#O21=(k5Ez)Qyt$uqnls0FF
zatTftjRINnrv1B)Kbj6ZveN1Llkw>NA*y+;_HA#h$zbaD+XQ>#e*2c--nixa1pAZG
zuuBSq*4Vr2eh0j+>(TQ2jXM>L3zxG;x08l>!j_qERR>wfgHM?&c<Ac;`KIyB)mqwb
ala%H$yVkuEmr86@fi`*xuhcx~75oD;V!?a>
literal 0
HcmV?d00001
diff --git a/src/__pycache__/world.cpython-37.pyc b/src/__pycache__/world.cpython-37.pyc
index e179e3b99f50aaf95faabd97c24e8897249063fa..217977b8b7501c00f3f2be6ba50f6ed536958946 100644
GIT binary patch
delta 20
acmez2`oopmiI<m)0SN3JT{d#RRRRD$aRqw-
delta 20
acmez2`oopmiI<m)0SKNgcizbTRtW$_VFrf)
diff --git a/src/game.py b/src/game.py
index 837d4d4..3aead84 100755
--- a/src/game.py
+++ b/src/game.py
@@ -9,7 +9,7 @@ from pyglet.gl import *
from pyglet.graphics import TextureGroup
from pyglet.window import key, mouse
-import load
+import loadSource
import time
import os
import sys
@@ -50,11 +50,11 @@ class Game(pyglet.window.Window):
#Blocks intialization
- global BRICK, GRASS, STONE, MARBO
- BRICK = load.BRICK
- GRASS = load.GRASS
- STONE = load.STONE
- MARBO = load.MARBO
+ global BRICK, GRASS, STONE, MARBLE
+ BRICK = loadSource.BRICK
+ GRASS = loadSource.GRASS
+ STONE = loadSource.STONE
+ MARBLE = loadSource.MARBLE
def __init__(self, *args, **kwargs):
@@ -129,13 +129,13 @@ class Game(pyglet.window.Window):
y = 0 # initial y height
for x in xrange(-n, n + 1, s):
for z in xrange(-n, n + 1, s):
- # create a layer MARBO.coordinates an GRASS.coordinates everywhere.
+ # create a layer MARBLE.coordinates an GRASS.coordinates everywhere.
self.world.add_block((x, y - 2, z), GRASS, immediate=False)
- self.world.add_block((x, y - 3, z), MARBO, immediate=False)
+ self.world.add_block((x, y - 3, z), MARBLE, immediate=False)
if x in (-n, n) or z in (-n, n):
# create outer walls.
for dy in xrange(-2, 3):
- self.world.add_block((x, y + dy, z), MARBO, immediate=False)
+ self.world.add_block((x, y + dy, z), MARBLE, immediate=False)
# generate the hills randomly
o = n - 10
@@ -346,7 +346,7 @@ class Game(pyglet.window.Window):
self.buildSound.play()
elif button == pyglet.window.mouse.LEFT and curPos:
block = self.world.world[curPos]
- if block.texture != MARBO.texture:
+ if block.texture != MARBLE.texture:
self.world.remove_block(curPos)
self.destroySound.play()
else:
diff --git a/src/load.py b/src/load.py
deleted file mode 100644
index 47dd6cf..0000000
--- a/src/load.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import os
-
-from block import Block
-from pyglet.gl import *
-
-ICON = pyglet.image.load(os.path.join("media","icon.png"))
-BUILDSOUND = pyglet.resource.media(os.path.join("media","build.wav"),streaming=False)
-DESTROYSOUND = pyglet.resource.media(os.path.join("media",'destroy.wav'),streaming=False)
-BACKGROUNDMUSIC = pyglet.resource.media(os.path.join("media",'bgmusic.wav'))
-BRICK = Block((0, 0), (0, 0), (0, 0), 1, os.path.join("texture","Brick.png"))
-GRASS = Block((0, 0), (0, 1), (1, 1), 2, os.path.join("texture","Grass.png"))
-STONE = Block((0, 0), (0, 0), (0, 0), 1, os.path.join("texture","Stone.png"))
-MARBO = Block((0, 0), (0, 0), (0, 0), 1, os.path.join("texture","Marbo.png"))
diff --git a/src/loadSource.py b/src/loadSource.py
new file mode 100644
index 0000000..3fd1291
--- /dev/null
+++ b/src/loadSource.py
@@ -0,0 +1,13 @@
+import os
+
+from block import Block
+from pyglet.gl import *
+
+ICON = pyglet.image.load(os.path.join("source","icon.png"))
+BUILDSOUND = pyglet.resource.media(os.path.join("source","build.wav"),streaming=False)
+DESTROYSOUND = pyglet.resource.media(os.path.join("source",'destroy.wav'),streaming=False)
+BACKGROUNDMUSIC = pyglet.resource.media(os.path.join("source",'bgmusic.wav'))
+BRICK = Block((0, 0), (0, 0), (0, 0), 1, os.path.join("texture","Brick.png"))
+GRASS = Block((0, 0), (0, 1), (1, 1), 2, os.path.join("texture","Grass.png"))
+STONE = Block((0, 0), (0, 0), (0, 0), 1, os.path.join("texture","Stone.png"))
+MARBLE = Block((0, 0), (0, 0), (0, 0), 1, os.path.join("texture","Marble.png"))
diff --git a/src/main.py b/src/main.py
index 4ddbb26..43c75ff 100755
--- a/src/main.py
+++ b/src/main.py
@@ -1,5 +1,5 @@
import os
-import load
+import loadSource
from pyglet.gl import *
from view import View
@@ -12,10 +12,10 @@ def main():
game = Game(width=WINDOW_WIDTH, height=WINDOW_HEIGHT, caption='CraftMaster', resizable=True)
- game.buildSound = load.BUILDSOUND
- game.destroySound = load.DESTROYSOUND
- game.backgroundMusic = load.BACKGROUNDMUSIC
- game.set_icon(load.ICON)
+ game.buildSound = loadSource.BUILDSOUND
+ game.destroySound = loadSource.DESTROYSOUND
+ game.backgroundMusic = loadSource.BACKGROUNDMUSIC
+ game.set_icon(loadSource.ICON)
# Hide the mouse cursor and prevent the mouse from leaving the window.
game.set_exclusive_mouse(True)
game.backgroundMusic.play()
diff --git a/src/media/.DS_Store b/src/source/.DS_Store
similarity index 100%
rename from src/media/.DS_Store
rename to src/source/.DS_Store
diff --git a/src/media/bgmusic.wav b/src/source/bgmusic.wav
similarity index 100%
rename from src/media/bgmusic.wav
rename to src/source/bgmusic.wav
diff --git a/src/media/build.wav b/src/source/build.wav
similarity index 100%
rename from src/media/build.wav
rename to src/source/build.wav
diff --git a/src/media/destroy.wav b/src/source/destroy.wav
similarity index 100%
rename from src/media/destroy.wav
rename to src/source/destroy.wav
diff --git a/src/media/icon.png b/src/source/icon.png
similarity index 100%
rename from src/media/icon.png
rename to src/source/icon.png
diff --git a/src/texture/Marbo.png b/src/texture/Marble.png
similarity index 100%
rename from src/texture/Marbo.png
rename to src/texture/Marble.png
--
GitLab