v2.2 release

AdsGames · Nov 18, 2017 · 142e774 · 142e774
1 parent 7e33420
commit 142e774
Show file tree

Hide file tree

Showing 15 changed files with 4,628 additions and 5,100 deletions.
diff --git a/bin/Untitled b/bin/Untitled
diff --git a/bin/data/level_0.xml b/bin/data/level_0.xml
diff --git a/bin/data/level_1.xml b/bin/data/level_1.xml
diff --git a/bin/data/level_10.xml b/bin/data/level_10.xml
diff --git a/bin/data/level_11.xml b/bin/data/level_11.xml
diff --git a/bin/data/level_12.xml b/bin/data/level_12.xml
diff --git a/bin/data/level_13.xml b/bin/data/level_13.xml
diff --git a/bin/data/level_14.xml b/bin/data/level_14.xml
diff --git a/bin/data/level_2.xml b/bin/data/level_2.xml
diff --git a/bin/data/level_3.xml b/bin/data/level_3.xml
diff --git a/bin/data/level_4.xml b/bin/data/level_4.xml
diff --git a/bin/data/level_5.xml b/bin/data/level_5.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <data>
-	<Object type="Explosive">
-		<x>8.8</x>
-		<y>-35</y>
-	</Object>
 	<Object type="Tile">
 		<x>21.6</x>
 		<y>-2.4</y>

diff --git a/bin/data/level_9.xml b/bin/data/level_9.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <data>
+	<Object type="Character">
+		<x>10.4</x>
+		<y>-12</y>
+		<bodytype>Character</bodytype>
+	</Object>
 	<Object type="Tile">
 		<x>13.6</x>
 		<y>-5.6</y>
@@ -60,18 +65,6 @@
 		<orientation>1 2 7 8</orientation>
 		<bodytype>Static</bodytype>
 	</Object>
-	<Object type="Tile">
-		<x>18.4</x>
-		<y>-0.8</y>
-		<orientation>0 2 3 5</orientation>
-		<bodytype>Static</bodytype>
-	</Object>
-	<Object type="Tile">
-		<x>18.4</x>
-		<y>-2.4</y>
-		<orientation>3 5 6 8</orientation>
-		<bodytype>Static</bodytype>
-	</Object>
 	<Object type="Tile">
 		<x>0.8</x>
 		<y>-15.2</y>
@@ -234,23 +227,12 @@
 		<orientation>1 1 7 7</orientation>
 		<bodytype>Dynamic</bodytype>
 	</Object>
-	<Object type="Tile">
-		<x>13.6</x>
-		<y>-4</y>
-		<orientation>0 1 6 7</orientation>
-		<bodytype>Dynamic</bodytype>
-	</Object>
 	<Object type="Tile">
 		<x>18.4</x>
 		<y>-4</y>
 		<orientation>1 2 7 8</orientation>
 		<bodytype>Dynamic</bodytype>
 	</Object>
-	<Object type="Character">
-		<x>10.4</x>
-		<y>-12</y>
-		<bodytype>Character</bodytype>
-	</Object>
 	<Object type="Finish">
 		<x>37.6</x>
 		<y>-24.8</y>
@@ -305,13 +287,6 @@
 		<height>1.6</height>
 		<bodytype>Collision</bodytype>
 	</Object>
-	<Object type="Tile">
-		<x>18.4</x>
-		<y>-1.6</y>
-		<width>1.6</width>
-		<height>3.2</height>
-		<bodytype>Collision</bodytype>
-	</Object>
 	<Object type="Tile">
 		<x>36.8</x>
 		<y>-28</y>
@@ -344,5 +319,24 @@
 		<height>1.6</height>
 		<bodytype>Collision</bodytype>
 	</Object>
+	<Object type="Tile">
+		<x>18.4</x>
+		<y>-0.8</y>
+		<orientation>0 2 6 8</orientation>
+		<bodytype>Static</bodytype>
+	</Object>
+	<Object type="Tile">
+		<x>13.6</x>
+		<y>-4</y>
+		<orientation>0 1 6 7</orientation>
+		<bodytype>Dynamic</bodytype>
+	</Object>
+	<Object type="Tile">
+		<x>18.4</x>
+		<y>-0.8</y>
+		<width>1.6</width>
+		<height>1.6</height>
+		<bodytype>Collision</bodytype>
+	</Object>
 </data>
 
diff --git a/src/editor.cpp b/src/editor.cpp
@@ -3,6 +3,10 @@
 // Init editor
 editor::editor(){
 
+  //al_set_new_display_flags(ALLEGRO_WINDOWED);
+  al_set_new_display_flags(ALLEGRO_WINDOWED);
+
+
   editorUI = UIHandler();
 
   std::cout << "Initializing editor\n";
@@ -410,7 +414,7 @@ void editor::update(){
     }
   }
 
-  if(editorUI.getElementById("left_top_toggle") -> mouseReleased() || keyListener::keyPressed[ALLEGRO_KEY_DOWN]){
+  if(editorUI.getElementById("left_top_toggle") -> mouseReleased()){
     editorUI.getElementByText("explosive_up") -> toggleStatus();
     editorUI.getElementByText("explosive_down") -> toggleStatus();
     editorUI.getElementByText("explosive_left") -> toggleStatus();

diff --git a/src/game.cpp b/src/game.cpp
@@ -3,7 +3,7 @@
 #include <allegro5/allegro_audio.h>
 #include <allegro5/allegro_native_dialog.h>
 
-#define danny_wants_to_listen_to_music_while_programming true
+#define danny_wants_to_listen_to_music_while_programming false
 
 
 bool game::testing = false;
@@ -369,7 +369,7 @@ void game::update(){
   // Touching goat
   if( gameGoat != nullptr && gameGoat -> getWinCondition()){
     level ++;
-    if( level > 10){
+    if( level > 14){
       set_next_state(STATE_MENU);
     }
     else{
@@ -465,6 +465,13 @@ void game::draw(){
     al_draw_textf( help_font, al_map_rgb( 255, 255, 255), 500, 75, 1, "Use R to restart the level.");
   }
 
+//  if( level == 11){
+//    al_draw_textf( help_font, al_map_rgb( 255, 255, 255), 500, 75, 1, "Green launcher blocks shoot dynamic blocks. ");
+//    al_draw_textf( help_font, al_map_rgb( 255, 255, 255), 500, 75, 1, "Red launchers launch blocks and the character. ");
+//
+//  }
+
+
   // Draw boxes
   for( unsigned int i = 0; i < gameBoxes.size(); i++){
     gameBoxes[i] -> draw();