From 682f4fb49f00ea12929a3b46aa53e558cfaafddc Mon Sep 17 00:00:00 2001
From: KikooDX <kikoodissident@gmail.com>
Date: Thu, 13 Feb 2020 10:43:45 +0100
Subject: [PATCH] Jump item, erase tile system, improved transfer.sh Made cp
 verbose

---
 assets-cg/img/jitem.png | Bin 0 -> 145 bytes
 levels.lua              |  38 ++++++++++++++++++++++++++++++++++++++
 platform.g3a            | Bin 52156 -> 53876 bytes
 src/draw.c              |  19 ++++++++++++++++++-
 src/draw.h              |   3 ++-
 src/main.c              |  14 ++++++++++----
 transfer.sh             |   3 +--
 7 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 assets-cg/img/jitem.png

diff --git a/assets-cg/img/jitem.png b/assets-cg/img/jitem.png
new file mode 100644
index 0000000000000000000000000000000000000000..d50752a9af34f5c11e82dfde225036e04a2db292
GIT binary patch
literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|yggkULo9le
z|NM9RYtPKu&?$752MBatFh#NFKe$?OHm-S>UV@4Un}PVk+dih^JyH!v8P+zNb1Y+B
pwTnSnRcUvNo}R)Cq0Dzo46e;0^VU5K)dL#K;OXk;vd$@?2>|w@D=7c~

literal 0
HcmV?d00001

diff --git a/levels.lua b/levels.lua
index 9551d5f..6f8b071 100644
--- a/levels.lua
+++ b/levels.lua
@@ -42,6 +42,44 @@ levels = {[[
 -00000000000000000000000000-
 ----------------------------
 ]],
+[[
+----------------------------
+-00000000000000000000000000-
+-00000000000000000000000000-
+000......................00-
+-........................00-
+-........................00-
+000......................00-
+-00......................00-
+-00.....0...0.000.000....00-
+-00.....0...0..0..0.0....00-
+-00.....0.0.0..0..000....00-
+-00.....0.0.0..0..0......00-
+-00......0.0..000.0....vv00-
+-00....................vv00-
+-00000000000000000000000000-
+-00000000000000000000000000-
+----------------------------
+]],
+[[
+----------------------------
+-00000000000000000000000000-
+-00000000000000000000000000-
+-00......................00-
+-00......................00-
+-00......................00-
+-00......................00-
+-00......................00-
+-00......................00-
+-00......................00-
+-00......................00-
+-00......................00-
+-00......................00-
+-00......................00-
+-00000000000000000000000000-
+-00000000000000000000000000-
+----------------------------
+]],
 }
 
 to_write = ""
diff --git a/platform.g3a b/platform.g3a
index ecdfe91e7ff6f4d0036aba2ba650e4d5f6847e3c..b714618c92c2578043f91bd20ef6cccd1f54abb1 100644
GIT binary patch
delta 3604
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
Lvp-4jkKTU(UZ?;<

delta 2484
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

diff --git a/src/draw.c b/src/draw.c
index 34b7a08..b00f272 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -19,12 +19,13 @@ void draw_player(int old_x, int old_y, int x, int y)
   }
 }
 
-void draw_level(char level[])
+void draw_level(char level[], char upgrades[])
 {
   dclear(BG_COLOR);
   extern image_t img_ground; //ground texture, 16x16
   extern image_t img_spike; //spike texture, 16x16
   extern image_t img_elevator; //elevator texture, 16x16
+  extern image_t img_jitem; //jump item texture, 16x16
   unsigned int i = 0;
   unsigned int x = 0;
   unsigned int y = 0;
@@ -41,6 +42,10 @@ void draw_level(char level[])
       case '^':
         dimage(x * 2 + DRAW_OFFSET_X, y * 2 + DRAW_OFFSET_Y, &img_elevator);
         break;
+      case 'j':
+        if (!upgrades[0])
+          dimage(x*2 + DRAW_OFFSET_X, y*2 + DRAW_OFFSET_Y, &img_jitem);
+        else level[i] = '.';
     }
     x += 8;
     if (x == 8*LEVEL_WIDTH)
@@ -51,3 +56,15 @@ void draw_level(char level[])
     i++;
   }
 }
+
+void erase_tile(int x, int y, char level[])
+{
+  x = (int)(x/8);
+  y = (int)(y/8);
+  level[x + y * 28] = '.';
+  x *= 16;
+  y *= 16;
+  drect(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y,
+    x + 15 + DRAW_OFFSET_X,
+    y + 15 + DRAW_OFFSET_Y, BG_COLOR);
+}
diff --git a/src/draw.h b/src/draw.h
index a0e4c57..7945d5d 100644
--- a/src/draw.h
+++ b/src/draw.h
@@ -1,2 +1,3 @@
 void draw_player(int old_x, int old_y, int x, int y);
-void draw_level(char level[]);
+void draw_level(char level[], char upgrades[]);
+void erase_tile(int x, int y, char level[]);
diff --git a/src/main.c b/src/main.c
index 1f7618a..7c2c674 100644
--- a/src/main.c
+++ b/src/main.c
@@ -29,7 +29,7 @@ int main(void)
 	int level_id = 1;
   //start upgrades (mostly bools)
   char upgrades[] = {
-    1 //can jump
+    0 //can jump
   };
   //end   upgrades
 	char jump_pressed = 0; //avoid holding jump
@@ -44,7 +44,7 @@ int main(void)
   int start_y = 9*8 + 2;
 	int old_x, old_y;
 	set_level(level_id, level);
-	draw_level(level);
+	draw_level(level, upgrades);
   player_x = start_x;
   player_y = start_y;
 	old_x = player_x + 1; //offset to draw it on first cycle
@@ -126,7 +126,7 @@ int main(void)
       player_x = 207;
       set_start_pos(&start_x, &start_y, player_x, player_y);
       set_level(level_id, level);
-      draw_level(level);
+      draw_level(level, upgrades);
       reset_old_pos(&old_x, &old_y);
     }
     else if (player_x >= 208)
@@ -135,8 +135,14 @@ int main(void)
       player_x = 12;
       set_start_pos(&start_x, &start_y, player_x, player_y);
       set_level(level_id, level);
-      draw_level(level);
+      draw_level(level, upgrades);
       reset_old_pos(&old_x, &old_y);
+    }
+    //item get
+    if (collide(player_x, player_y, level, 'j'))
+    {
+      UG_CAN_JUMP = 1;
+      erase_tile(player_x, player_y, level);
     }
 		//exit
 		if (keydown(KEY_EXIT)) return 0;
diff --git a/transfer.sh b/transfer.sh
index d1fc482..6c66e40 100755
--- a/transfer.sh
+++ b/transfer.sh
@@ -1,4 +1,3 @@
 #/bin/#!/usr/bin/env bash
-echo cp
-cp platform.g3a /media/user/disk/
+cp platform.g3a /media/user/disk/ -v
 echo done