diff --git a/src/.DS_Store b/src/.DS_Store
index af9d3ebe10f948bd00133c01b476457d34aa42aa..32bc08205f6485f7b0ab66176dbccaa85dc72462 100755
Binary files a/src/.DS_Store and b/src/.DS_Store differ
diff --git a/src/__pycache__/game.cpython-37.pyc b/src/__pycache__/game.cpython-37.pyc
index 36a0a01a8bcd3b94510fe282724ad1092e0631c0..91d47c5255fda0bdd20e02be90bfa616e6750706 100644
Binary files a/src/__pycache__/game.cpython-37.pyc and b/src/__pycache__/game.cpython-37.pyc differ
diff --git a/src/__pycache__/loadSource.cpython-37.pyc b/src/__pycache__/loadSource.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c9fa008d23212787479e4e60ec7fb5b4123d5ab4
Binary files /dev/null and b/src/__pycache__/loadSource.cpython-37.pyc differ
diff --git a/src/__pycache__/world.cpython-37.pyc b/src/__pycache__/world.cpython-37.pyc
index e179e3b99f50aaf95faabd97c24e8897249063fa..217977b8b7501c00f3f2be6ba50f6ed536958946 100644
Binary files a/src/__pycache__/world.cpython-37.pyc and b/src/__pycache__/world.cpython-37.pyc differ
diff --git a/src/game.py b/src/game.py
index 837d4d4ee17633caa604018dfe74a65e3e575426..3aead8424784d36a4f5229f37528b4c00d0b591b 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 47dd6cffd4a27953b8d9151d6381b0db73366847..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..3fd129116ba12cd1bafccbd73e86898cf80d6dce
--- /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 4ddbb2660307beedd517a450eb54919fd03ff6c6..43c75ffc21c96c00f3471294ecfab27d8f7f5a2d 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