From a174837a53985efe72654dbda4be4ad063a15fbd Mon Sep 17 00:00:00 2001
From: SlyVTT <pillot.sylvain@gmail.com>
Date: Sat, 22 Apr 2023 12:50:03 +0200
Subject: [PATCH] working on player movements

---
 CMakeLists.txt                   |  34 ++----
 assets-cg/levels/level1.json     |  44 --------
 assets-cg/levels/level1.tmx      |  20 ++--
 assets-cg/levels/level2.json     |  44 --------
 assets-cg/levels/level2.tmx      |  32 +++---
 assets-cg/levels/level3.json     |  44 --------
 assets-cg/levels/level3.tmx      |  48 ++++----
 assets-cg/levels/tileset.png     | Bin 8483 -> 8701 bytes
 assets-cg/levels/tilesetnpp.json |  14 ---
 assets-cg/levels/tilesetnpp.tsx  |   4 +-
 assets-cg/sprites/circle.png     | Bin 0 -> 133 bytes
 assets-cg/sprites/selected.png   | Bin 0 -> 98 bytes
 buildpush                        |   3 +
 src/background.cpp               |  97 ----------------
 src/level.cpp                    | 172 ++++++++++++++++++++++++++++
 src/{background.h => level.h}    |  13 ++-
 src/main.cpp                     |  52 +++++----
 src/player.cpp                   | 187 +++++++++++++++++++++----------
 src/player.h                     |  16 +--
 19 files changed, 407 insertions(+), 417 deletions(-)
 delete mode 100644 assets-cg/levels/level1.json
 delete mode 100644 assets-cg/levels/level2.json
 delete mode 100644 assets-cg/levels/level3.json
 delete mode 100644 assets-cg/levels/tilesetnpp.json
 create mode 100644 assets-cg/sprites/circle.png
 create mode 100644 assets-cg/sprites/selected.png
 create mode 100755 buildpush
 delete mode 100644 src/background.cpp
 create mode 100644 src/level.cpp
 rename src/{background.h => level.h} (71%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be22e43..227736d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,39 +15,27 @@ find_package(LibProf 2.4 REQUIRED)
 fxconv_declare_converters(assets-cg/converters.py)
 
 add_custom_command(
-	OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets-cg/levels/level1.json"
-	COMMENT "Convert Tiled TMX map to usable JSON file"
+  COMMENT "Convert Tiled TMX map to usable JSON file"
 	COMMAND tiled --export-tileset json tilesetnpp.tsx tilesetnpp.json
 	COMMAND find | grep .*.tmx | sed 's/.tmx//g' | xargs -l bash -c 'tiled --export-map json $$0.tmx $$0.json'
-	WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/assets-cg/levels/
-	DEPENDS assets-cg/levels/level1.tmx
-
-	OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets-cg/levels/level2.json"
-	COMMENT "Convert Tiled TMX map to usable JSON file"
-	COMMAND tiled --export-tileset json tilesetnpp.tsx tilesetnpp.json
-	COMMAND find | grep .*.tmx | sed 's/.tmx//g' | xargs -l bash -c 'tiled --export-map json $$0.tmx $$0.json'
-	WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/assets-cg/levels/
-	DEPENDS assets-cg/levels/level2.tmx
+	WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/assets-cg/levels/  
 
+  OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets-cg/levels/level1.json"
+  OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets-cg/levels/level2.json"
 	OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets-cg/levels/level3.json"
-	COMMENT "Convert Tiled TMX map to usable JSON file"
-	COMMAND tiled --export-tileset json tilesetnpp.tsx tilesetnpp.json
-	COMMAND find | grep .*.tmx | sed 's/.tmx//g' | xargs -l bash -c 'tiled --export-map json $$0.tmx $$0.json'
-	WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/assets-cg/levels/
-	DEPENDS assets-cg/levels/level3.tmx
-
-	assets-cg/converters.py
+  DEPENDS assets-cg/converters.py
 	assets-cg/levels/tileset.png 
-	assets-cg/levels/tilesetnpp.tsx)
-
-
+	assets-cg/levels/tilesetnpp.tsx
+  assets-cg/levels/level1.tmx
+  assets-cg/levels/level2.tmx
+  assets-cg/levels/level2.tmx)
 
 set(SOURCES
   src/main.cpp
   src/extrakeyboard.cpp
   src/utilities.cpp
   src/player.cpp
-  src/background.cpp
+  src/level.cpp
   # ...
 )
 # Shared assets, fx-9860G-only assets and fx-CG-50-only assets
@@ -62,6 +50,8 @@ set(ASSETS_cg
   #assets-cg/sprites/running.png
   #assets-cg/sprites/static.png
   assets-cg/sprites/rectangle.png
+  assets-cg/sprites/circle.png
+  assets-cg/sprites/selected.png
 
   assets-cg/levels/tileset.png
   assets-cg/levels/level1.json
diff --git a/assets-cg/levels/level1.json b/assets-cg/levels/level1.json
deleted file mode 100644
index a278493..0000000
--- a/assets-cg/levels/level1.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{ "compressionlevel":-1,
- "height":14,
- "infinite":false,
- "layers":[
-        {
-         "data":[2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2],
-         "height":14,
-         "id":1,
-         "name":"Background",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":25,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":14,
-         "id":2,
-         "name":"Foreground",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":25,
-         "x":0,
-         "y":0
-        }],
- "nextlayerid":3,
- "nextobjectid":1,
- "orientation":"orthogonal",
- "renderorder":"right-down",
- "tiledversion":"1.8.0",
- "tileheight":16,
- "tilesets":[
-        {
-         "firstgid":1,
-         "source":"tilesetnpp.tsx"
-        }],
- "tilewidth":16,
- "type":"map",
- "version":"1.8",
- "width":25
-}
\ No newline at end of file
diff --git a/assets-cg/levels/level1.tmx b/assets-cg/levels/level1.tmx
index 2201472..04f638d 100644
--- a/assets-cg/levels/level1.tmx
+++ b/assets-cg/levels/level1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.0" orientation="orthogonal" renderorder="right-down" width="25" height="14" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="1">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="25" height="14" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="1">
  <tileset firstgid="1" source="tilesetnpp.tsx"/>
  <layer id="1" name="Background" width="25" height="14">
   <data encoding="csv">
@@ -23,17 +23,17 @@
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,0,
+0,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,0,
+0,0,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,42,42,42,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,42,42,42,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,42,42,42,42,0,0,0,0,0,0,0,0,0,0,0,42,42,42,42,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
diff --git a/assets-cg/levels/level2.json b/assets-cg/levels/level2.json
deleted file mode 100644
index 9985cc7..0000000
--- a/assets-cg/levels/level2.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{ "compressionlevel":-1,
- "height":14,
- "infinite":false,
- "layers":[
-        {
-         "data":[2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 0, 0, 0, 0, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 0, 0, 0, 0, 4, 2, 2, 2, 3, 0, 0, 0, 0, 0, 0, 4, 2, 5, 6, 0, 7, 8, 2, 3, 0, 0, 0, 0, 0, 0, 4, 2, 2, 0, 0, 20, 2, 2, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 2, 2, 19, 0, 0, 2, 2, 0, 0, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 2, 2, 0, 0, 2, 2, 2, 2, 0, 0, 0, 23, 24, 2, 21, 22, 0, 0, 0, 2, 2, 2, 2, 0, 0, 2, 2, 1, 0, 2, 2, 2, 2, 0, 0, 0, 2, 2, 2, 2, 2, 0, 0, 0, 2, 2, 2, 2, 0, 0, 2, 2, 0, 0, 2, 2, 2, 2, 0, 0, 0, 2, 3, 1, 4, 2, 0, 0, 0, 2, 2, 2, 2, 0, 0, 2, 2, 0, 0, 2, 2, 2, 2, 19, 0, 20, 2, 1, 0, 1, 2, 19, 0, 20, 2, 2, 2, 2, 0, 0, 2, 2, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 2, 2, 0, 0, 4, 2, 2, 2, 2, 2, 5, 6, 1, 2, 1, 7, 8, 2, 2, 2, 2, 2, 3, 0, 0, 2, 2, 19, 0, 0, 33, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 20, 2, 2, 2, 19, 0, 33, 0, 0, 1, 0, 0, 23, 24, 2, 21, 22, 1, 0, 0, 0, 0, 33, 0, 20, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2],
-         "height":14,
-         "id":1,
-         "name":"Background",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":25,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 35, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 51, 0, 0, 0, 11, 0, 0, 0, 51, 0, 0, 0, 0, 0, 66, 0, 0, 0, 35, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":14,
-         "id":2,
-         "name":"Foreground",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":25,
-         "x":0,
-         "y":0
-        }],
- "nextlayerid":4,
- "nextobjectid":3,
- "orientation":"orthogonal",
- "renderorder":"right-down",
- "tiledversion":"1.8.0",
- "tileheight":16,
- "tilesets":[
-        {
-         "firstgid":1,
-         "source":"tilesetnpp.tsx"
-        }],
- "tilewidth":16,
- "type":"map",
- "version":"1.8",
- "width":25
-}
\ No newline at end of file
diff --git a/assets-cg/levels/level2.tmx b/assets-cg/levels/level2.tmx
index 7dda437..4bffc26 100644
--- a/assets-cg/levels/level2.tmx
+++ b/assets-cg/levels/level2.tmx
@@ -6,33 +6,33 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,3,0,0,0,0,4,2,2,2,2,2,2,2,2,2,3,0,0,0,0,4,2,2,
 2,3,0,0,0,0,0,0,4,2,5,6,0,7,8,2,3,0,0,0,0,0,0,4,2,
-2,0,0,20,2,2,19,0,0,0,0,0,0,0,0,0,0,0,20,2,2,19,0,0,2,
+2,0,0,14,2,2,13,0,0,0,0,0,0,0,0,0,0,0,14,2,2,13,0,0,2,
 2,0,0,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,0,0,2,
-2,0,0,2,2,2,2,0,0,0,23,24,2,21,22,0,0,0,2,2,2,2,0,0,2,
+2,0,0,2,2,2,2,0,0,0,17,18,2,15,16,0,0,0,2,2,2,2,0,0,2,
 2,1,0,2,2,2,2,0,0,0,2,2,2,2,2,0,0,0,2,2,2,2,0,0,2,
 2,0,0,2,2,2,2,0,0,0,2,3,1,4,2,0,0,0,2,2,2,2,0,0,2,
-2,0,0,2,2,2,2,19,0,20,2,1,0,1,2,19,0,20,2,2,2,2,0,0,2,
+2,0,0,2,2,2,2,13,0,14,2,1,0,1,2,13,0,14,2,2,2,2,0,0,2,
 2,0,0,2,2,2,2,2,2,2,2,1,2,1,2,2,2,2,2,2,2,2,0,0,2,
 2,0,0,4,2,2,2,2,2,5,6,1,2,1,7,8,2,2,2,2,2,3,0,0,2,
-2,19,0,0,33,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,33,0,0,20,2,
-2,2,19,0,33,0,0,1,0,0,23,24,2,21,22,1,0,0,0,0,33,0,20,2,2,
+2,13,0,0,22,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,14,2,
+2,2,13,0,22,0,0,1,0,0,17,18,2,15,16,1,0,0,0,0,21,1,14,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
  <layer id="2" name="Foreground" width="25" height="14">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,36,36,0,0,0,0,0,0,0,0,0,0,0,0,0,36,36,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,36,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,67,0,0,0,0,0,67,0,0,0,0,0,0,0,0,0,
-0,0,66,0,0,0,0,0,0,0,0,0,49,0,0,0,0,0,0,0,0,0,66,0,0,
-0,35,66,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,66,0,0,
-0,0,66,0,0,0,0,0,0,52,0,0,0,0,0,35,0,0,0,0,0,0,66,0,0,
-0,0,66,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,66,0,0,
-0,0,66,0,0,0,0,0,51,0,0,0,11,0,0,0,51,0,0,0,0,0,66,0,0,
-0,35,66,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,66,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,65,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,24,24,0,0,0,0,0,0,0,0,0,0,0,0,0,24,24,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,43,0,0,0,0,0,43,0,0,0,0,0,0,0,0,0,
+0,0,42,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,42,0,0,
+0,23,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,34,0,
+0,0,42,0,0,0,0,0,0,34,0,0,0,0,0,23,0,0,0,0,0,0,42,0,0,
+0,0,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,0,0,
+0,0,42,0,0,0,0,0,33,0,0,0,32,0,0,1,33,0,0,0,0,0,42,0,0,
+0,23,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,34,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
diff --git a/assets-cg/levels/level3.json b/assets-cg/levels/level3.json
deleted file mode 100644
index a67d7d3..0000000
--- a/assets-cg/levels/level3.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{ "compressionlevel":-1,
- "height":14,
- "infinite":false,
- "layers":[
-        {
-         "data":[1, 1, 1, 1, 23, 24, 2, 2, 21, 22, 1, 1, 1, 1, 1, 23, 24, 2, 2, 21, 22, 1, 1, 1, 1, 1, 1, 1, 20, 5, 6, 0, 34, 7, 8, 21, 22, 1, 23, 24, 5, 6, 34, 0, 7, 8, 19, 1, 1, 1, 1, 1, 20, 3, 0, 0, 0, 34, 0, 0, 4, 2, 2, 2, 3, 0, 0, 34, 0, 0, 0, 4, 19, 1, 1, 1, 20, 3, 0, 0, 0, 0, 34, 0, 0, 0, 10, 2, 9, 0, 0, 0, 34, 0, 0, 0, 0, 4, 19, 1, 42, 9, 0, 0, 0, 0, 2, 2, 0, 0, 0, 26, 2, 25, 0, 0, 0, 2, 2, 1, 1, 1, 1, 10, 41, 58, 25, 0, 0, 23, 24, 2, 2, 41, 0, 0, 0, 2, 0, 0, 0, 42, 2, 2, 21, 22, 0, 0, 26, 57, 2, 0, 0, 20, 2, 2, 2, 2, 57, 0, 0, 0, 0, 0, 0, 0, 58, 2, 2, 2, 2, 19, 0, 0, 2, 2, 0, 0, 4, 2, 2, 2, 2, 2, 21, 22, 0, 0, 0, 23, 24, 2, 2, 2, 2, 2, 3, 0, 0, 2, 10, 41, 0, 0, 7, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 5, 6, 0, 0, 42, 9, 26, 57, 0, 0, 0, 0, 4, 2, 5, 6, 0, 0, 0, 0, 0, 7, 8, 2, 3, 0, 0, 0, 0, 58, 25, 1, 4, 19, 0, 0, 0, 0, 33, 0, 0, 0, 20, 2, 19, 0, 0, 0, 33, 0, 0, 0, 0, 20, 3, 1, 1, 1, 4, 19, 0, 0, 0, 33, 0, 0, 20, 2, 2, 2, 19, 0, 0, 33, 0, 0, 0, 20, 3, 1, 1, 1, 1, 1, 4, 21, 22, 0, 33, 23, 24, 5, 6, 1, 7, 8, 21, 22, 33, 0, 23, 24, 3, 1, 1, 1, 1, 1, 1, 1, 7, 8, 2, 2, 5, 6, 1, 1, 1, 1, 1, 7, 8, 2, 2, 5, 6, 1, 1, 1, 1],
-         "height":14,
-         "id":1,
-         "name":"Background",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":25,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 66, 0, 0, 0, 66, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 66, 0, 0, 0, 66, 0, 0, 0, 0, 0, 66, 49, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":14,
-         "id":2,
-         "name":"Foreground",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":25,
-         "x":0,
-         "y":0
-        }],
- "nextlayerid":3,
- "nextobjectid":1,
- "orientation":"orthogonal",
- "renderorder":"right-down",
- "tiledversion":"1.8.0",
- "tileheight":16,
- "tilesets":[
-        {
-         "firstgid":1,
-         "source":"tilesetnpp.tsx"
-        }],
- "tilewidth":16,
- "type":"map",
- "version":"1.8",
- "width":25
-}
\ No newline at end of file
diff --git a/assets-cg/levels/level3.tmx b/assets-cg/levels/level3.tmx
index 3984d01..befcba6 100644
--- a/assets-cg/levels/level3.tmx
+++ b/assets-cg/levels/level3.tmx
@@ -3,19 +3,19 @@
  <tileset firstgid="1" source="tilesetnpp.tsx"/>
  <layer id="1" name="Background" width="25" height="14">
   <data encoding="csv">
-1,1,1,1,23,24,2,2,21,22,1,1,1,1,1,23,24,2,2,21,22,1,1,1,1,
-1,1,1,20,5,6,0,34,7,8,21,22,1,23,24,5,6,34,0,7,8,19,1,1,1,
-1,1,20,3,0,0,0,34,0,0,4,2,2,2,3,0,0,34,0,0,0,4,19,1,1,
-1,20,3,0,0,0,0,34,0,0,0,10,2,9,0,0,0,34,0,0,0,0,4,19,1,
-42,9,0,0,0,0,2,2,0,0,0,26,2,25,0,0,0,2,2,1,1,1,1,10,41,
-58,25,0,0,23,24,2,2,41,0,0,0,2,0,0,0,42,2,2,21,22,0,0,26,57,
-2,0,0,20,2,2,2,2,57,0,0,0,0,0,0,0,58,2,2,2,2,19,0,0,2,
-2,0,0,4,2,2,2,2,2,21,22,0,0,0,23,24,2,2,2,2,2,3,0,0,2,
-10,41,0,0,7,8,2,2,2,2,2,2,2,2,2,2,2,2,2,5,6,0,0,42,9,
-26,57,0,0,0,0,4,2,5,6,0,0,0,0,0,7,8,2,3,0,0,0,0,58,25,
-1,4,19,0,0,0,0,33,0,0,0,20,2,19,0,0,0,33,0,0,0,0,20,3,1,
-1,1,4,19,0,0,0,33,0,0,20,2,2,2,19,0,0,33,0,0,0,20,3,1,1,
-1,1,1,4,21,22,0,33,23,24,5,6,1,7,8,21,22,33,0,23,24,3,1,1,1,
+1,1,1,1,17,18,2,2,15,16,1,1,1,1,1,17,18,2,2,15,16,1,1,1,1,
+1,1,1,14,5,6,22,1,7,8,15,16,1,17,18,5,6,22,0,7,8,13,1,1,1,
+1,1,14,3,0,0,22,1,0,0,4,2,2,2,3,0,0,22,0,0,0,4,13,1,1,
+1,14,3,0,0,0,22,1,0,0,0,10,2,9,0,0,0,22,0,0,0,0,4,13,1,
+30,9,0,0,0,0,2,2,0,0,0,20,2,19,0,0,0,2,2,1,0,0,1,10,29,
+40,19,0,0,17,18,2,2,29,0,0,0,2,0,0,0,30,2,2,15,16,0,0,20,39,
+2,0,0,14,2,2,2,2,39,0,0,0,0,0,0,0,40,2,2,2,2,13,0,0,2,
+2,0,0,4,2,2,2,2,2,15,16,0,0,0,17,18,2,2,2,2,2,3,0,0,2,
+10,29,0,0,7,8,2,2,2,2,2,2,2,2,2,2,2,2,2,5,6,0,0,30,9,
+20,39,0,0,0,0,4,2,5,6,0,0,0,0,0,7,8,2,3,0,0,0,0,40,19,
+1,4,13,0,0,0,0,21,0,0,0,14,2,13,0,0,0,21,0,0,0,0,14,3,1,
+1,1,4,13,0,0,0,21,0,0,14,2,2,2,13,0,0,21,0,0,0,14,3,1,1,
+1,1,1,4,15,16,0,21,17,18,5,6,1,7,8,15,16,21,0,17,18,3,1,1,1,
 1,1,1,1,7,8,2,2,5,6,1,1,1,1,1,7,8,2,2,5,6,1,1,1,1
 </data>
  </layer>
@@ -24,17 +24,17 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,66,0,0,0,0,66,0,0,0,66,0,0,0,0,66,0,0,0,0,0,
-0,0,0,0,66,0,0,0,0,0,66,0,0,0,66,0,0,0,0,0,66,49,0,0,0,
-0,0,0,66,0,0,0,0,0,0,66,0,0,0,66,0,0,0,0,0,0,66,0,0,0,
-0,0,66,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,66,0,0,
-0,0,66,0,0,0,0,0,0,0,0,0,65,0,0,0,0,0,0,0,0,0,66,0,0,
-0,0,0,66,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,66,0,0,0,
-0,0,0,0,66,0,0,0,0,0,0,0,11,0,0,0,0,0,0,0,66,0,0,0,0,
-0,0,0,0,0,66,0,0,0,0,1,1,1,1,1,0,0,0,0,66,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0
+0,0,0,0,0,42,0,0,0,0,42,26,0,25,42,0,0,0,0,42,0,0,0,0,0,
+28,25,0,0,42,0,0,0,0,0,42,36,0,35,42,0,0,0,0,0,42,31,0,26,27,
+38,35,0,42,0,0,0,0,27,0,42,0,0,0,42,0,28,0,0,0,0,42,0,36,37,
+0,0,42,0,0,0,0,0,37,0,0,0,0,0,0,0,38,0,0,0,0,0,42,0,0,
+0,0,42,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,0,0,42,0,0,
+26,27,0,42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,0,28,25,
+36,37,0,0,42,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,42,0,0,38,35,
+0,0,0,0,0,42,0,0,0,0,0,0,0,0,0,0,0,0,0,42,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
 </map>
diff --git a/assets-cg/levels/tileset.png b/assets-cg/levels/tileset.png
index 0afb6641732bab40e720176964b2c91ea1ec1c3a..393c424f362f66baedb48229a1e73d6c80a6bff6 100644
GIT binary patch
delta 4760
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

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

diff --git a/assets-cg/levels/tilesetnpp.json b/assets-cg/levels/tilesetnpp.json
deleted file mode 100644
index 73c3fdb..0000000
--- a/assets-cg/levels/tilesetnpp.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{ "columns":16,
- "image":"tileset.png",
- "imageheight":256,
- "imagewidth":256,
- "margin":0,
- "name":"tileset",
- "spacing":0,
- "tilecount":256,
- "tiledversion":"1.8.0",
- "tileheight":16,
- "tilewidth":16,
- "type":"tileset",
- "version":"1.8"
-}
\ No newline at end of file
diff --git a/assets-cg/levels/tilesetnpp.tsx b/assets-cg/levels/tilesetnpp.tsx
index b99293a..55b2c48 100644
--- a/assets-cg/levels/tilesetnpp.tsx
+++ b/assets-cg/levels/tilesetnpp.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.10" tiledversion="1.10.1" name="tileset" tilewidth="16" tileheight="16" tilecount="256" columns="16">
- <image source="tileset.png" width="256" height="256"/>
+<tileset version="1.10" tiledversion="1.10.1" name="tileset" tilewidth="16" tileheight="16" tilecount="50" columns="10">
+ <image source="tileset.png" width="160" height="80"/>
 </tileset>
diff --git a/assets-cg/sprites/circle.png b/assets-cg/sprites/circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..62db1e84627df3d934e65c7eb78fc4bb87bbd8dc
GIT binary patch
literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`KAtX)Ar`&KDF>L=8UOj;?;A6@
zaiU->k1NA;w;HyCl1H-K%v&bPoITNIFmbV<q`{<YYo35NO@Yj8u2v0(8eXTCNHv)n
f3nmL}d&9$^{zmF;w5Tp4&|C&jS3j3^P6<r_i^M1F

literal 0
HcmV?d00001

diff --git a/assets-cg/sprites/selected.png b/assets-cg/sprites/selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f91b92d8624ac0251ec41b410cfca53c0b52aae
GIT binary patch
literal 98
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nw~C>Ar`&Kf6gEHFuzgAp_B2y
vq{Khtz!Ym{=EEx(7qj(9F);Q_NlRy_wBQisUm2|d)WqQF>gTe~DWM4fm&_Vt

literal 0
HcmV?d00001

diff --git a/buildpush b/buildpush
new file mode 100755
index 0000000..9be693f
--- /dev/null
+++ b/buildpush
@@ -0,0 +1,3 @@
+rm -r build-cg
+rm *.g3a
+fxsdk build-cg-push -s VERBOSE=1
diff --git a/src/background.cpp b/src/background.cpp
deleted file mode 100644
index c70e889..0000000
--- a/src/background.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#include "background.h"
-#include "player.h"
-#include <azur/azur.h>
-#include <azur/gint/render.h>
-
-#include <cstdint>
-#include <stdlib.h> 
-
-
-
-extern struct Map map_level1;
-extern struct Map map_level2;
-extern struct Map map_level3;
-
-extern bool drawbackground;
-
-struct Map *map_level;
-
-
-Background::Background( )
-{
-    map_level = &map_level2;
-}
-
-Background::~Background( )
-{
-
-}
-
-void Background::ChangeMap( int level, Player *MyPlayer )
-{
-    if(level==1)          map_level = &map_level1;
-    else if(level==2)     map_level = &map_level2;
-    else if(level==3)     map_level = &map_level3;
-    else                  map_level = &map_level1;   
-
-    UpdateDataMap( MyPlayer );
-}
-
-void Background::UpdateDataMap( Player *MyPlayer )
-{
-    for(int i=0; i<map_level->w; i++)
-    {
-        for(int j=0; j<=map_level->h; j++)
-        {
-            uint16_t index = (j) * map_level->w + (i) % map_level->w;
-            uint16_t currentTile = map_level->layers[1][ index ];
-            if (currentTile==11)
-            {
-                MyPlayer->x = libnum::num( i*16 - 4 + 8 );
-                MyPlayer->y = libnum::num( j*16 + 8 );
-                MyPlayer->vx = 0;
-                MyPlayer->vy = 0;
-                MyPlayer->Update( 0.0f, 0.0f, 0.0f );
-            } 
-        }
-    }
-}
-
-void Background::Render( void )
-{
-    for(int u=!drawbackground; u<map_level->nblayers;u++)
-    {
-        for(int i=0; i<map_level->w; i++)
-        {
-            for(int j=0; j<=map_level->h; j++)
-            {
-                uint16_t index = (j) * map_level->w + (i) % map_level->w;
-                uint16_t currentTile = map_level->layers[u][ index ];
-                if (currentTile!=0 && currentTile!=11)
-                {
-                    uint16_t xtile = ((currentTile % map_level->tileset_size)-1) * 16;
-                    uint16_t ytile = (currentTile / map_level->tileset_size) * 16;
-                    azrp_subimage_p8( i*16-4, j*16, map_level->tileset, xtile, ytile, 16, 16, DIMAGE_NONE );
-                } 
-            }
-        }
-    }
-}
-
-void Background::Update( float dt )
-{
-
-}
-
-bool Background::CanGo( Player *MyPlayer )
-{
-    int tileX = ((int) MyPlayer->x+4) >> 4 ;
-    int tileY = ((int) MyPlayer->y+8) >> 4;
-
-    int tileIndex = tileY*map_level->w + tileX;
-    
-    int tileValue = map_level->layers[0][ tileIndex ];
-
-    if (tileValue==0 || tileValue==1) return true;
-    else return false;
-}
\ No newline at end of file
diff --git a/src/level.cpp b/src/level.cpp
new file mode 100644
index 0000000..e67593f
--- /dev/null
+++ b/src/level.cpp
@@ -0,0 +1,172 @@
+#include "level.h"
+#include "player.h"
+#include <azur/azur.h>
+#include <azur/gint/render.h>
+
+#include <cstdint>
+#include <stdlib.h> 
+
+#define TILESIZE 16
+
+extern struct Map map_level1;
+extern struct Map map_level2;
+extern struct Map map_level3;
+
+extern bool drawbackground;
+
+struct Map *map_level;
+
+
+int tileXmin, tileXmax;
+int tileYmin, tileYmax;
+int XinTile, YinTile;
+
+extern bopti_image_t img_selected;
+
+
+Level::Level( )
+{
+    map_level = &map_level1;
+}
+
+Level::~Level( )
+{
+
+}
+
+void Level::ChangeMap( int level, Player *MyPlayer )
+{
+    if(level==1)          map_level = &map_level1;
+    else if(level==2)     map_level = &map_level2;
+    else if(level==3)     map_level = &map_level3;
+    else                  map_level = &map_level1;   
+
+    this->UpdateDataMap( MyPlayer );
+}
+
+void Level::UpdateDataMap( Player *MyPlayer )
+{
+    for(int i=0; i<map_level->w; i++)
+    {
+        for(int j=0; j<map_level->h; j++)
+        {
+            uint16_t index = j * map_level->w + i;
+            uint16_t currentTile = map_level->layers[1][ index ];
+            if (currentTile==32)
+            {
+                MyPlayer->x = (float) (i*16+8);
+                MyPlayer->y = (float) (j*16);
+                MyPlayer->vx = 0.0f;
+                MyPlayer->vy = 0.0f;
+                MyPlayer->Update( 0.0f );
+            } 
+        }
+    }
+}
+
+void Level::Render( void )
+{
+    for(int u=!drawbackground; u<map_level->nblayers;u++)
+    {
+        for(int i=0; i<map_level->w; i++)
+        {
+            for(int j=0; j<map_level->h; j++)
+            {
+                uint16_t index = j * map_level->w + i;
+                uint16_t currentTile = map_level->layers[u][ index ];
+                if (currentTile!=0 && currentTile!=32)
+                {
+                    uint16_t xtile = ((currentTile % map_level->tileset_size)-1) * 16;
+                    uint16_t ytile = (currentTile / map_level->tileset_size) * 16;
+                    azrp_subimage_p8( i*16, j*16, map_level->tileset, xtile, ytile, 16, 16, DIMAGE_NONE );
+                    
+                    // TODO :
+                    // the last column of tile is not fully drawn cause 4 pixels are missing
+                    // to upgrade the 
+                } 
+            }
+        }
+    }
+}
+
+void Level::RenderSelected( void )
+{
+    for(int i=tileXmin; i<=tileXmax; i++)
+    {
+        for(int j=tileYmin; j<=tileYmax; j++)
+        {
+            azrp_image_p8( i*16, j*16, &img_selected, DIMAGE_NONE );
+        }
+    }
+}
+
+
+void Level::Update( float dt )
+{
+
+}
+
+
+
+
+int Level::GetTileBackground( uint8_t x, uint8_t y )
+{
+    uint8_t tileX = x / 16;
+    uint8_t tileY = y / 16;
+
+    uint16_t index = tileY * map_level->w + tileX % map_level->w;
+    uint16_t currentTile = map_level->layers[0][ index ];
+    return currentTile;
+}
+
+
+int Level::GetTileForeground( uint8_t x, uint8_t y )
+{
+    uint8_t tileX = x / 16;
+    uint8_t tileY = y / 16;
+
+    uint16_t index = tileY * map_level->w + tileX;
+    uint16_t currentTile = map_level->layers[1][ index ];
+    return currentTile;
+}
+
+
+bool Level::CanGo( Player *MyPlayer )
+{
+    int tileX, tileY;
+    int tileIndex, tileValue;
+
+    int xmin = (int) MyPlayer->nextx - 8;
+    int ymin = (int) MyPlayer->nexty - 8;
+    int xmax = (int) MyPlayer->nextx + 8;
+    int ymax = (int) MyPlayer->nexty + 8;
+
+/*
+    tileXmin = xmin / 16;
+    tileXmax = xmax / 16;
+    tileYmin = ymin / 16;
+    tileYmax = ymax / 16;
+
+    XinTile = xmin % 16;
+    YinTile = ymin % 16;
+*/
+
+    if ((MyPlayer->action == RUN || MyPlayer->action == WALK) && MyPlayer->direction == LEFT)
+    {
+        if( GetTileBackground( xmin, ymin ) != 0 || GetTileBackground( xmin, ymax ) != 0) return false;
+    }
+    else if ((MyPlayer->action == RUN || MyPlayer->action == WALK) && MyPlayer->direction == RIGHT)
+    {
+        if( GetTileBackground( xmax, ymax ) != 0 || GetTileBackground( xmin, ymax ) != 0) return false;
+    }
+    else if (MyPlayer->action == JUMP)
+    {
+        if( GetTileBackground( xmin, ymin ) != 0 || GetTileBackground( xmax, ymin ) != 0) return false;
+    }
+    else if (MyPlayer->action == FALL)
+    {
+        if( GetTileBackground( xmin, ymax ) != 0 || GetTileBackground( xmax, ymax ) != 0) return false;
+    }
+
+    return true;
+}
\ No newline at end of file
diff --git a/src/background.h b/src/level.h
similarity index 71%
rename from src/background.h
rename to src/level.h
index 74eeff7..90e934d 100644
--- a/src/background.h
+++ b/src/level.h
@@ -25,19 +25,24 @@ struct Map {
 };
 
 
-class Background
+class Level
 {
     public:
-        Background( );
-        ~Background( );
+        Level( );
+        ~Level( );
 
         void Update( float dt );
-        void Render( );
+        void Render( void );
+        void RenderSelected( void );
 
 		void ChangeMap( int level, Player *MyPlayer );
 		void UpdateDataMap( Player *MyPlayer  );
 
 		bool CanGo( Player *MyPlayer );
+
+	private:
+		int GetTileBackground( uint8_t x, uint8_t y );
+		int GetTileForeground( uint8_t x, uint8_t y );
 };
 
 
diff --git a/src/main.cpp b/src/main.cpp
index 17b2d42..74fb578 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -27,14 +27,14 @@
 #include "utilities.h"
 
 #include "player.h"
-#include "background.h"
+#include "level.h"
 
 
 bool screenshot = false;
 bool record = false;
 bool textoutput = false;
 bool exitToOS = false;
-uint8_t texttodraw=1;
+uint8_t texttodraw=2;
 
 
 #define SCALE_PIXEL 1
@@ -53,7 +53,7 @@ kmalloc_gint_stats_t *extram_stats;
 
 
 KeyboardExtra MyKeyboard;
-Background MyBackground;
+Level MyLevel;
 Player MyPlayer( 198, 180 );
 
 
@@ -95,24 +95,25 @@ static void hook_prefrag(int id, void *fragment, int size)
 
 static void update( float dt )
 {
-    MyPlayer.Update( dt, 0.0f, 1.0f );
+    MyPlayer.Update( dt );
 }
 
 
 static void render( void )
 {
 
-    MyBackground.Render();
+    MyLevel.Render();
+//    MyLevel.RenderSelected();
     MyPlayer.Render();
 
     #if(BIAS)
-        if (texttodraw>=1) Azur_draw_text(1,01, "FPS  = %.0f", (float) (1000000.0f / elapsedTime) );
+        if (texttodraw>=1) Azur_draw_text(1,01, "FPS  = %.0f", (float) (1000.0f / elapsedTime) );
         //if (texttodraw>=1) Azur_draw_text(1,11, "Part.= %d - Bull.= %d", MyParticles.size(), MyPlayerBullets.size() );
         //if (texttodraw>=1 && !MyEnemies.empty()) Azur_draw_text(1,21, "Ennmy Life= %d", MyEnemies[0]->life );
 
         if (texttodraw>=2) Azur_draw_text(1,31, "Update = %.3f ms", (float) time_update / 1000.0f );
         if (texttodraw>=2) Azur_draw_text(1,41, "Render = %.3f ms", (float) time_render / 1000.0f );
-        if (texttodraw>=2) Azur_draw_text(1,51, ">Total = %.0f ms", (float) elapsedTime / 1000.0f );
+        if (texttodraw>=2) Azur_draw_text(1,51, ">Total = %.0f ms", (float) elapsedTime );
 
         if (texttodraw>=3) Azur_draw_text(1,81,  "Mem Used      : %d", _uram_stats->used_memory + extram_stats->used_memory);
         if (texttodraw>=3) Azur_draw_text(1,91,  "Mem Free      : %d", _uram_stats->free_memory + extram_stats->free_memory);
@@ -129,23 +130,23 @@ static void get_inputs( float dt  )
 
 
     #if(DEBUG_MODE)
-        if(MyKeyboard.IsKeyPressed(MYKEY_SHIFT) && MyKeyboard.IsKeyPressedEvent(MYKEY_7) && usb_is_open() )    {screenshot = true;};
-        if(MyKeyboard.IsKeyPressed(MYKEY_SHIFT) && MyKeyboard.IsKeyPressedEvent(MYKEY_8) && usb_is_open())    {record = true; };
-        if(MyKeyboard.IsKeyPressed(MYKEY_SHIFT) && MyKeyboard.IsKeyPressedEvent(MYKEY_9) && usb_is_open())    {record = false; };
+        if( MyKeyboard.IsKeyPressed(MYKEY_OPTN) && MyKeyboard.IsKeyPressedEvent(MYKEY_7) && usb_is_open() )    {screenshot = true;};
+        if( MyKeyboard.IsKeyPressed(MYKEY_OPTN) && MyKeyboard.IsKeyPressedEvent(MYKEY_8) && usb_is_open() )    {record = true; };
+        if( MyKeyboard.IsKeyPressed(MYKEY_OPTN) && MyKeyboard.IsKeyPressedEvent(MYKEY_9) && usb_is_open() )    {record = false; };
 
-        if(MyKeyboard.IsKeyPressedEvent(MYKEY_VARS)) { drawbackground = !drawbackground; }
+        if( MyKeyboard.IsKeyPressed(MYKEY_OPTN) && MyKeyboard.IsKeyPressedEvent(MYKEY_VARS) ) { drawbackground = !drawbackground; }
 
-        if(MyKeyboard.IsKeyPressed(MYKEY_SHIFT) && MyKeyboard.IsKeyPressedEvent(MYKEY_F1))   { texttodraw = 0; }
-        if(MyKeyboard.IsKeyPressed(MYKEY_SHIFT) && MyKeyboard.IsKeyPressedEvent(MYKEY_F2))   { texttodraw = 1; }
-        if(MyKeyboard.IsKeyPressed(MYKEY_SHIFT) && MyKeyboard.IsKeyPressedEvent(MYKEY_F3))   { texttodraw = 2; }
-        if(MyKeyboard.IsKeyPressed(MYKEY_SHIFT) && MyKeyboard.IsKeyPressedEvent(MYKEY_F4))   { texttodraw = 3; }
+        if( MyKeyboard.IsKeyPressed(MYKEY_OPTN) && MyKeyboard.IsKeyPressedEvent(MYKEY_F1) )   { texttodraw = 0; }
+        if( MyKeyboard.IsKeyPressed(MYKEY_OPTN) && MyKeyboard.IsKeyPressedEvent(MYKEY_F2) )   { texttodraw = 1; }
+        if( MyKeyboard.IsKeyPressed(MYKEY_OPTN) && MyKeyboard.IsKeyPressedEvent(MYKEY_F3) )   { texttodraw = 2; }
+        if( MyKeyboard.IsKeyPressed(MYKEY_OPTN) && MyKeyboard.IsKeyPressedEvent(MYKEY_F4) )   { texttodraw = 3; }
 
-        if(MyKeyboard.IsKeyPressedEvent(MYKEY_F1))   { MyBackground.ChangeMap(1, &MyPlayer); }
-        if(MyKeyboard.IsKeyPressedEvent(MYKEY_F2))   { MyBackground.ChangeMap(2, &MyPlayer); }
-        if(MyKeyboard.IsKeyPressedEvent(MYKEY_F3))   { MyBackground.ChangeMap(3, &MyPlayer); }
-        if(MyKeyboard.IsKeyPressedEvent(MYKEY_F4))   { MyBackground.ChangeMap(4, &MyPlayer); }
-        if(MyKeyboard.IsKeyPressedEvent(MYKEY_F5))   { MyBackground.ChangeMap(5, &MyPlayer); }
-        if(MyKeyboard.IsKeyPressedEvent(MYKEY_F6))   { MyBackground.ChangeMap(6, &MyPlayer); }
+        if( MyKeyboard.IsKeyPressedEvent(MYKEY_F1) )   { MyLevel.ChangeMap(1, &MyPlayer); }
+        if( MyKeyboard.IsKeyPressedEvent(MYKEY_F2) )   { MyLevel.ChangeMap(2, &MyPlayer); }
+        if( MyKeyboard.IsKeyPressedEvent(MYKEY_F3) )   { MyLevel.ChangeMap(3, &MyPlayer); }
+//        if( MyKeyboard.IsKeyPressedEvent(MYKEY_F4) )   { MyLevel.ChangeMap(4, &MyPlayer); }
+//        if( MyKeyboard.IsKeyPressedEvent(MYKEY_F5) )   { MyLevel.ChangeMap(5, &MyPlayer); }
+//        if( MyKeyboard.IsKeyPressedEvent(MYKEY_F6) )   { MyLevel.ChangeMap(6, &MyPlayer); }
     #endif
     
 
@@ -170,7 +171,7 @@ static void get_inputs( float dt  )
         MyPlayer.No_Order( dt );
     }
 
-    if(MyKeyboard.IsKeyPressed(MYKEY_SHIFT))
+    if(MyKeyboard.IsKeyPressedEvent(MYKEY_SHIFT))
     {
         MyPlayer.Jump( dt );
     }
@@ -256,6 +257,9 @@ int main(void)
 	usb_interface_t const *interfaces[] = { &usb_ff_bulk, NULL };
     usb_open(interfaces, GINT_CALL_NULL);
 
+
+    //MyLevel.ChangeMap(2, &MyPlayer);
+
 	prof_init();
 
 	do
@@ -269,7 +273,7 @@ int main(void)
 
 				get_inputs( elapsedTime );
 
-				update( elapsedTime );
+//				update( elapsedTime );
 
                 // update the RAM consumption status
                 _uram_stats = kmalloc_get_gint_stats(_uram);
@@ -292,7 +296,7 @@ int main(void)
             prof_leave(perf_render);
             time_render = prof_time(perf_render);
 
-			elapsedTime = ((float) (time_update+time_render));
+			elapsedTime = ((float) (time_update+time_render)) / 1000.0f ;
 
     }
     while (exitToOS==false);
diff --git a/src/player.cpp b/src/player.cpp
index 5bfd271..69e9323 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1,7 +1,7 @@
 #include "player.h"
 #include <num/num.h>
 #include <gint/rtc.h>
-#include "background.h"
+#include "level.h"
 
 /*
 extern bopti_image_t img_walking;
@@ -9,27 +9,41 @@ extern bopti_image_t img_running;
 extern bopti_image_t img_static;
 */
 
-extern bopti_image_t img_rectangle;
-
+extern bopti_image_t img_circle;
 
 static uint32_t framecounter = 0;
 
-extern Background MyBackground;
+extern Level MyLevel;
+
+#define SPEEDWALK 6.0f
+#define SPEEDRUN  12.0f
+#define SPEEDSTATIC 0.0f
+
+#define SPEEDJUMPWALK 4.0f
+#define SPEEDJUMPRUN 12.0f
+#define SPEEDJUMPSTATIC 8.0f
+
+#define MAXFALLSPEED 20.0f
 
 
 Player::Player( int16_t _x, int16_t _y )
 {
-    x = libnum::num(_x);
-    y = libnum::num(_y);
+    this->x = _x;
+    this->y = _y;
 
-    width = 8;
-    height = 8;
-    speed = 10;
+    this->vx = 0.0f;
+    this->vy = 0.0f;
 
-    xmin = (int) x - width;
-    xmax = (int) x + width;
-    ymin = (int) y - height;
-    ymax = (int) y + height;
+    this->ax = 0.0f;
+    this->ay = 1.0f;
+
+    this->width = 8;
+    this->height = 8;
+
+    this->xmin = (int) this->x - this->width;
+    this->xmax = (int) this->x + this->width;
+    this->ymin = (int) this->y - this->height;
+    this->ymax = (int) this->y + this->height;
 
     last_tick = rtc_ticks();
 }
@@ -40,21 +54,48 @@ Player::~Player()
 
 }
 
-void Player::Update( float dt, libnum::num ax, libnum::num ay )
-{
-    libnum::num DeltaTime = libnum::num( dt / 60000.0f );
-    vx += ax * DeltaTime;
-    vy += ay * DeltaTime;
 
-    libnum::num xtemp = x + vx * DeltaTime;
-    libnum::num ytemp = y + vy * DeltaTime;
-    
-    if (MyBackground.CanGo( this ))
+
+
+void Player::Update( float dt )
+{
+    float DeltaTime = dt / 100.0f ;
+
+    //this->vx += this->ax * DeltaTime;             // horizontal acceleration not considered (yet)
+    this->vy += this->ay * DeltaTime;
+
+    if (this->vy >= MAXFALLSPEED) this->vy = MAXFALLSPEED;
+
+    // we were jumping and are reaching the top of the curve or even starting falling
+    if (this->action == JUMP && this->vy >= 0)
     {
-        x = xtemp;
-        y = ytemp;
+        this->action = FALL;
     }
+
+    this->nextx = this->x + this->vx * DeltaTime;
+    this->nexty = this->y + this->vy * DeltaTime;
     
+
+    bool testdestination = MyLevel.CanGo( this );      // true if we can go to the planed position
+    
+    if (testdestination)
+    {
+        this->x = this->nextx;
+        this->y = this->nexty;
+    }
+    else if(this->action == JUMP)
+    {
+        this->vx = 0;
+        this->vy = 0;
+        this->action = FALL;
+    }
+    else 
+    {
+        this->vx = 0;
+        this->vy = 0;
+        this->action = STATIC;
+    }
+
     xmin = (int) x - width;
     xmax = (int) x + width;
     ymin = (int) y - height;
@@ -88,87 +129,111 @@ void Player::Render( void )
     }
     */
 
-    azrp_image_p8_effect(xmin, ymin, &img_rectangle, DIMAGE_NONE); 
+    azrp_image_p8_effect(xmin, ymin, &img_circle, DIMAGE_NONE); 
 
 
 }
 
-void Player::Set_Speed( uint8_t _sp )
-{
-    speed = _sp;
-}
 
 void Player::Walk_Left( float dt )
-{
-    libnum::num a = libnum::num( dt / 60000.0f );
-    
-    x -= a * libnum::num( speed/3 );
+{  
+    this->vx = SPEEDWALK * -1.0f;
 
     this->direction = LEFT;
     this->action = WALK;
+    
+    this->Update( dt );
 }
 
 void Player::Walk_Right( float dt )
 {
-    libnum::num a = libnum::num( dt / 60000.0f );
-    
-    x += a * libnum::num( speed/3 );
-
+    this->vx = SPEEDWALK * 1.0f;
     this->direction = RIGHT;
     this->action = WALK; 
+    
+    this->Update( dt );
 }
 
 void Player::Run_Left( float dt )
 {
-    libnum::num a = libnum::num( dt / 60000.0f );
-
-    x -= a * libnum::num( speed );
-
+    this->vx = SPEEDRUN * -1.0f;
     this->direction = LEFT;
     this->action = RUN;
+    
+    this->Update( dt );
 }
 
 void Player::Run_Right( float dt )
 {
-    libnum::num a = libnum::num( dt / 60000.0f );
-   
-    x += a * libnum::num( speed );
+    this->vx = SPEEDRUN * 1.0f;
 
     this->direction = RIGHT;
     this->action = RUN; 
+    
+    this->Update( dt );
 }
 
 void Player::Jump( float dt )
 {
-    if (this->action==WALK)
+    // check if we are already jumping or not
+    if (this->action != JUMP && this->action != FALL) // not in a jump or in a fall
     {
-        //this->vx = speed / 3;
-        this->vy = -speed / 2;
+        if (this->action==WALK)
+        {
+            this->vy = SPEEDJUMPWALK * -1.0f;
+        }
+        else if (this->action==RUN)
+        {
+            this->vy = SPEEDJUMPRUN * -1.0f;
+        }
+        else
+        {
+            this->vy = SPEEDJUMPSTATIC * -1.0f;
+        }
     }
-    else if (this->action==RUN)
+    else if (this->action == FALL)                     // descending phase (FALL) of a jump, we can start a new small jump
     {
-        //this->vx = speed;
-        this->vy = -speed;
+        this->vy = SPEEDJUMPSTATIC * -1.0f;
     }
     else
     {
-        //this->vx = 0;
-        this->vy = -speed /2;
+
     }
 
-    this->direction = LEFT;
-    this->action = JUMP;
-
-    if (this->direction==LEFT)
-    {
-        this->vx = -this->vx;
-    }
+    this->Update( dt );
 }
 
 void Player::No_Order( float dt )
 {
+/*    
     if (this->action == RUN || this->action == WALK)
     {
-        this->action == BREAK;
-    }  
+        this->action = BREAK;
+    }
+    
+    if (this->direction == LEFT)    // we were going LEFT and we stop moving to the left so we decrease speed till reaching static
+    {
+        this->vx += 1;
+        if (vx>=0)
+        {
+            this->vx = 0;
+            this->action = STATIC;
+            this->direction = STATIC;
+        }
+    } 
+    else if (this->direction == RIGHT) // we were going RIGHT and we stop moving to the left so we decrease speed till reaching static
+    {
+        this->vx -= 1;
+        if (vx<=0)
+        {
+            this->vx = 0;
+            this->action = STATIC;
+            this->direction = STATIC;
+        }
+    } 
+    
+    this->Update( 0.0f, 0.0, 0.0 );
+*/
+
+    this->Update( dt );
 }
diff --git a/src/player.h b/src/player.h
index d40b56b..6f78daa 100644
--- a/src/player.h
+++ b/src/player.h
@@ -29,7 +29,7 @@ class Player
         Player( int16_t _x, int16_t _y );
         ~Player();
 
-        void Update( float dt, libnum::num ax, libnum::num ay );
+        void Update( float dt );
         void Render( );
 
         void Walk_Left( float dt );
@@ -42,21 +42,15 @@ class Player
 
         void Jump( float dt );
         
-        
-        void Go_Up( int action, float dt );
-        void Go_Down( int action, float dt );
 
-
-        void Set_Speed( uint8_t _sp );
-
-        libnum::num x, y;                   // center position of the player
-        libnum::num vx, vy;                 // speed of the player as per x and y coordinates
+        float x, y;                   // center position of the player
+        float nextx, nexty;           // interim x and y position (to be tested to check if they can be actually achieved or not while moving)  
+        float vx, vy;                 // speed of the player as per x and y coordinates
+        float ax, ay;                 // acceleration of the player as per x an y coordinates  
 
         uint8_t width, height;              // width and height - for the hitbox
         int16_t xmin, xmax, ymin, ymax;     // square hitbox (to speed up the impact calculations)
 
-        int16_t life;
-        uint8_t speed;                   // speed of the player
         uint32_t last_tick;
 
         int8_t direction = STATIC;