|
From: João <lv...@us...> - 2009-12-24 12:33:46
|
This is an automated email from the git, the tree hashes are:
via 0e645ba9cc5be3230aa02c000a27556b3e8643f0 (commit)
from 6d1d84b351e85b77f8eec32f560a4b75eefeb13a (commit)
- Log -----------------------------------------------------------------
commit 0e645ba9cc5be3230aa02c000a27556b3e8643f0
Author: João <joao@marvim.(none)>
Date: Thu Dec 24 10:33:12 2009 -0200
Adding much cooler backgrounds ;)
diff --git a/code/game.py b/code/game.py
old mode 100644
new mode 100755
index ff63094..30e91f2
--- a/code/game.py
+++ b/code/game.py
@@ -452,7 +452,7 @@ class Game:
self.counter = 0
# creates the background
- self.background = Background("earth.jpg", "320.png","4.png")
+ self.background = Background("bg/layer0_1.png", "bg/layer1_1.png","bg/layer2_1.png")
# creates foreground
self.foreground = Foreground()
diff --git a/data/graphic/bg/fg_1.png b/data/graphic/bg/fg_1.png
new file mode 100755
index 0000000..82f2fe1
Binary files /dev/null and b/data/graphic/bg/fg_1.png differ
diff --git a/data/graphic/bg/fg_2.png b/data/graphic/bg/fg_2.png
new file mode 100755
index 0000000..bda3646
Binary files /dev/null and b/data/graphic/bg/fg_2.png differ
diff --git a/data/graphic/bg/layer0_1.png b/data/graphic/bg/layer0_1.png
new file mode 100644
index 0000000..ec90fa6
Binary files /dev/null and b/data/graphic/bg/layer0_1.png differ
diff --git a/data/graphic/bg/layer1_1.png b/data/graphic/bg/layer1_1.png
new file mode 100644
index 0000000..b9d15ea
Binary files /dev/null and b/data/graphic/bg/layer1_1.png differ
diff --git a/data/graphic/bg/layer1_2.png b/data/graphic/bg/layer1_2.png
new file mode 100644
index 0000000..7fc4334
Binary files /dev/null and b/data/graphic/bg/layer1_2.png differ
diff --git a/data/graphic/bg/layer2_1.png b/data/graphic/bg/layer2_1.png
new file mode 100755
index 0000000..b0df248
Binary files /dev/null and b/data/graphic/bg/layer2_1.png differ
diff --git a/data/graphic/bg/layer2_2.png b/data/graphic/bg/layer2_2.png
new file mode 100644
index 0000000..bfaa9a1
Binary files /dev/null and b/data/graphic/bg/layer2_2.png differ
diff --git a/data/graphic/bg/layer2_3.png b/data/graphic/bg/layer2_3.png
new file mode 100644
index 0000000..f31237c
Binary files /dev/null and b/data/graphic/bg/layer2_3.png differ
diff --git a/data/stage1.xml b/data/stage1.xml
old mode 100644
new mode 100755
index 13c610c..63f8c62
--- a/data/stage1.xml
+++ b/data/stage1.xml
@@ -2,8 +2,14 @@
<fase>
<item>
<type>background</type>
+ <cc>0</cc>
+ <image>bg/layer1_2.png</image>
+ <layer>1</layer>
+</item>
+<item>
+ <type>background</type>
<cc>1</cc>
- <image>4.png</image>
+ <image>bg/layer2_1.png</image>
<layer>2</layer>
</item>
<item>
@@ -21,7 +27,13 @@
<type>foreground</type>
<cc>120</cc>
<pos_y>10</pos_y>
- <image>2.png</image>
+ <image>bg/fg_2.png</image>
+</item>
+<item>
+ <type>background</type>
+ <cc>120</cc>
+ <image>bg/layer1_1.png</image>
+ <layer>1</layer>
</item>
<item>
<type>enemy</type>
@@ -49,7 +61,7 @@
<type>foreground</type>
<cc>240</cc>
<pos_y>80</pos_y>
- <image>2.png</image>
+ <image>bg/fg_2.png</image>
</item>
<item>
<type>enemy</type>
@@ -88,13 +100,13 @@
<type>foreground</type>
<cc>362</cc>
<pos_y>18</pos_y>
- <image>1.png</image>
+ <image>bg/fg_1.png</image>
</item>
<item>
<type>foreground</type>
<cc>370</cc>
<pos_y>30</pos_y>
- <image>2.png</image>
+ <image>bg/fg_2.png</image>
</item>
<item>
<type>enemy</type>
@@ -121,14 +133,20 @@
<item>
<type>background</type>
<cc>500</cc>
- <image>tiles/stars3.jpg</image>
+ <image>bg/layer2_2.png</image>
<layer>2</layer>
</item>
<item>
- <type>foreground</type>
- <cc>500</cc>
- <pos_y>40</pos_y>
- <image>2.png</image>
+ <type>background</type>
+ <cc>510</cc>
+ <image>bg/layer2_3.png</image>
+ <layer>2</layer>
+</item>
+<item>
+ <type>background</type>
+ <cc>520</cc>
+ <image>bg/layer2_2.png</image>
+ <layer>2</layer>
</item>
<item>
<type>sw_mult</type>
@@ -269,13 +287,13 @@
<item>
<type>background</type>
<cc>1000</cc>
- <image>1.png</image>
+ <image>bg/layer2_3.png</image>
<layer>2</layer>
</item>
<item>
<type>background</type>
<cc>1010</cc>
- <image>tiles/stars3.jpg</image>
+ <image>bg/layer2_1.png</image>
<layer>2</layer>
</item>
<item>
-----------------------------------------------------------------------
Summary of changes:
code/game.py | 2 +-
data/graphic/{1.png => bg/fg_1.png} | Bin 14601 -> 14601 bytes
data/graphic/{2.png => bg/fg_2.png} | Bin 33052 -> 33052 bytes
data/graphic/bg/layer0_1.png | Bin 0 -> 62883 bytes
data/graphic/bg/layer1_1.png | Bin 0 -> 3812 bytes
data/graphic/bg/layer1_2.png | Bin 0 -> 4052 bytes
data/graphic/bg/layer2_1.png | Bin 0 -> 340 bytes
data/graphic/bg/layer2_2.png | Bin 0 -> 556 bytes
data/graphic/bg/layer2_3.png | Bin 0 -> 670 bytes
data/stage1.xml | 42 +++++++++++++++++++++++++----------
10 files changed, 31 insertions(+), 13 deletions(-)
mode change 100644 => 100755 code/game.py
copy data/graphic/{1.png => bg/fg_1.png} (100%)
mode change 100644 => 100755
copy data/graphic/{2.png => bg/fg_2.png} (100%)
mode change 100644 => 100755
create mode 100644 data/graphic/bg/layer0_1.png
create mode 100644 data/graphic/bg/layer1_1.png
create mode 100644 data/graphic/bg/layer1_2.png
create mode 100755 data/graphic/bg/layer2_1.png
create mode 100644 data/graphic/bg/layer2_2.png
create mode 100644 data/graphic/bg/layer2_3.png
mode change 100644 => 100755 data/stage1.xml
--
Dead Channel is a sci-fi shoot 'em up game developed using pygame.
|