aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbnewbold <bryan@octopart.com>2012-01-29 15:59:10 -0500
committerbnewbold <bryan@octopart.com>2012-01-29 15:59:10 -0500
commit71bb443c2b5d234095365f2c9b5f7286cb7e096d (patch)
treecaf22c96546cc1036fdbaca593650d58d59a575f
parent73f557b7b909bd6a6d15625a8fdbb57bba7e8540 (diff)
downloadsistema_de_aguas-71bb443c2b5d234095365f2c9b5f7286cb7e096d.zip
sistema_de_aguas-71bb443c2b5d234095365f2c9b5f7286cb7e096d.tar.gz
backup
-rw-r--r--sprites/allbg.pngbin2893 -> 0 bytes
-rw-r--r--sprites/allbgtiles.pngbin3653 -> 0 bytes
-rw-r--r--sprites/allgroundbg.pngbin3182 -> 0 bytes
-rw-r--r--sprites/allpipes.pngbin3304 -> 0 bytes
-rw-r--r--sprites/allpipes_big.pngbin2981 -> 0 bytes
-rw-r--r--sprites/allsewage.pngbin2956 -> 0 bytes
-rw-r--r--sprites/allsprites.pngbin8782 -> 133274 bytes
-rw-r--r--sprites/closed_sprite.pngbin3614 -> 0 bytes
-rw-r--r--sprites/explosion1.pngbin4136 -> 0 bytes
-rw-r--r--sprites/ground.pngbin2801 -> 0 bytes
-rw-r--r--sprites/narcdestroyed_sprite.pngbin4512 -> 0 bytes
-rw-r--r--sprites/narcsub_sprite.pngbin4849 -> 0 bytes
-rw-r--r--sprites/open_sprite.pngbin3602 -> 0 bytes
-rw-r--r--sprites/sewage_2x2.pngbin2867 -> 0 bytes
-rw-r--r--sprites/sky.pngbin2802 -> 0 bytes
-rw-r--r--[-rwxr-xr-x]sprites/splash_screen.pngbin11133 -> 18320 bytes
-rw-r--r--sprites/standing_sprite.pngbin3097 -> 0 bytes
-rw-r--r--src/draft/draft.pde14
-rw-r--r--src/draft/graphics.pde21
19 files changed, 21 insertions, 14 deletions
diff --git a/sprites/allbg.png b/sprites/allbg.png
deleted file mode 100644
index 5c96a66..0000000
--- a/sprites/allbg.png
+++ /dev/null
Binary files differ
diff --git a/sprites/allbgtiles.png b/sprites/allbgtiles.png
deleted file mode 100644
index bf10788..0000000
--- a/sprites/allbgtiles.png
+++ /dev/null
Binary files differ
diff --git a/sprites/allgroundbg.png b/sprites/allgroundbg.png
deleted file mode 100644
index 0ab0bd2..0000000
--- a/sprites/allgroundbg.png
+++ /dev/null
Binary files differ
diff --git a/sprites/allpipes.png b/sprites/allpipes.png
deleted file mode 100644
index d310d98..0000000
--- a/sprites/allpipes.png
+++ /dev/null
Binary files differ
diff --git a/sprites/allpipes_big.png b/sprites/allpipes_big.png
deleted file mode 100644
index 8abf442..0000000
--- a/sprites/allpipes_big.png
+++ /dev/null
Binary files differ
diff --git a/sprites/allsewage.png b/sprites/allsewage.png
deleted file mode 100644
index 0cae83d..0000000
--- a/sprites/allsewage.png
+++ /dev/null
Binary files differ
diff --git a/sprites/allsprites.png b/sprites/allsprites.png
index ef95132..5410dff 100644
--- a/sprites/allsprites.png
+++ b/sprites/allsprites.png
Binary files differ
diff --git a/sprites/closed_sprite.png b/sprites/closed_sprite.png
deleted file mode 100644
index ef7fae0..0000000
--- a/sprites/closed_sprite.png
+++ /dev/null
Binary files differ
diff --git a/sprites/explosion1.png b/sprites/explosion1.png
deleted file mode 100644
index fb6fca9..0000000
--- a/sprites/explosion1.png
+++ /dev/null
Binary files differ
diff --git a/sprites/ground.png b/sprites/ground.png
deleted file mode 100644
index d4f22b1..0000000
--- a/sprites/ground.png
+++ /dev/null
Binary files differ
diff --git a/sprites/narcdestroyed_sprite.png b/sprites/narcdestroyed_sprite.png
deleted file mode 100644
index 408d17d..0000000
--- a/sprites/narcdestroyed_sprite.png
+++ /dev/null
Binary files differ
diff --git a/sprites/narcsub_sprite.png b/sprites/narcsub_sprite.png
deleted file mode 100644
index 3c9e905..0000000
--- a/sprites/narcsub_sprite.png
+++ /dev/null
Binary files differ
diff --git a/sprites/open_sprite.png b/sprites/open_sprite.png
deleted file mode 100644
index 0dc7bc2..0000000
--- a/sprites/open_sprite.png
+++ /dev/null
Binary files differ
diff --git a/sprites/sewage_2x2.png b/sprites/sewage_2x2.png
deleted file mode 100644
index 5ba8074..0000000
--- a/sprites/sewage_2x2.png
+++ /dev/null
Binary files differ
diff --git a/sprites/sky.png b/sprites/sky.png
deleted file mode 100644
index 2f489c8..0000000
--- a/sprites/sky.png
+++ /dev/null
Binary files differ
diff --git a/sprites/splash_screen.png b/sprites/splash_screen.png
index 49a27fd..b7557ab 100755..100644
--- a/sprites/splash_screen.png
+++ b/sprites/splash_screen.png
Binary files differ
diff --git a/sprites/standing_sprite.png b/sprites/standing_sprite.png
deleted file mode 100644
index 5252390..0000000
--- a/sprites/standing_sprite.png
+++ /dev/null
Binary files differ
diff --git a/src/draft/draft.pde b/src/draft/draft.pde
index 0852cb5..526faea 100644
--- a/src/draft/draft.pde
+++ b/src/draft/draft.pde
@@ -1,15 +1,17 @@
#include <SPI.h>
#include <GD.h>
-#include "allsewage.h" // http://gameduino.com/results/b2f4c588/
-#include "sprites.h" // http://gameduino.com/results/16fe50de/
+#include "background.h" // http://gameduino.com/results/3514e886/
+#include "splash.h" // http://gameduino.com/results/fe36d9fd/
+#include "allsewage.h" // http://gameduino.com/results/b2f4c588/
+#include "sprites.h" // http://gameduino.com/results/16fe50de/
#define SWIM_SPEED 1
#define WEAPON_GROUP 0
#define TARGET_GROUP 1
-#define NUM_TRASH 20
+#define NUM_TRASH 32 // ugh, redefined
#define KEY_UP(x) ((x >> 7) & 0x01)
#define KEY_DOWN(x) ((x >> 6) & 0x01)
@@ -89,6 +91,9 @@ void setup()
narcoy = 150;
narcovy = -1;
trash_rate = 100;
+ scrollx = 0;
+ scrolly = 3;
+ t = 0;
delay(250);
GD.begin();
@@ -125,10 +130,11 @@ void loop()
// scroll background
GD.wr16(SCROLL_X, scrollx);
+ GD.wr16(SCROLL_Y, scrolly);
GD.__wstartspr(0);
//draw_standing_all(10,270);
draw_all_trash();
- if (t > 72 * 30) {
+ if (t > (72 * 30)) {
draw_narco(narcox, narcoy, narco_sunk);
if (narco_sunk) {
for (uint8 i = 0; i < 5; i++) {
diff --git a/src/draft/graphics.pde b/src/draft/graphics.pde
index b8af1b9..7908b2d 100644
--- a/src/draft/graphics.pde
+++ b/src/draft/graphics.pde
@@ -14,30 +14,31 @@ static void clear_all_sprites() {
}
static void init_splashpage() {
- for (byte y = 0; y < 64; y++)
- GD.copy(RAM_PIC + y * 64, allsewage_pic + y * 64, 64);
- GD.copy(RAM_CHR, allsewage_chr, sizeof(allsewage_chr));
- GD.copy(RAM_PAL, allsewage_pal, sizeof(allsewage_pal));
-
+ for (byte y = 0; y < 37; y++)
+ GD.copy(RAM_PIC + y * 64, splash_pic + y * 49, 49);
+ GD.copy(RAM_CHR, splash_chr, sizeof(splash_chr));
+ GD.copy(RAM_PAL, splash_pal, sizeof(splash_pal));
+ /*
GD.__wstartspr(0);
for (int rand_count = 0; rand_count < 20; rand_count += 1) {
draw_standing_all(random(400),random(300));
}
GD.__end();
+ */
}
static void init_background() {
for (byte y = 0; y < 64; y++)
- GD.copy(RAM_PIC + y * 64, allsewage_pic + y * 64, 64);
- GD.copy(RAM_CHR, allsewage_chr, sizeof(allsewage_chr));
- GD.copy(RAM_PAL, allsewage_pal, sizeof(allsewage_pal));
+ GD.copy(RAM_PIC + y * 64, background_pic + y * 64, 64);
+ GD.copy(RAM_CHR, background_chr, sizeof(background_chr));
+ GD.copy(RAM_PAL, background_pal, sizeof(background_pal));
}
// ================ TRASH MANAGEMENT ===================
#define DEAD_TRASH_SPRID 54
-#define NUM_TRASH 20
+#define NUM_TRASH 32
#define STUCKX 100
struct trash_item {
@@ -87,7 +88,7 @@ static void add_trash() {
for (i = 0; i < NUM_TRASH; i++) {
if(trash_bag[i].sprid == 0xFF) {
trash_bag[i].x = 400;
- trash_bag[i].y = 25 + random(200);
+ trash_bag[i].y = 90 + random(200);
trash_bag[i].vx = 3 + random(5);
trash_bag[i].sprid = 36;
trash_bag[i].collid = 255;