Diff: Levels/Levels.cpp

Revision:

44:e29458976114

Parent:

43:1ec6b6293c6b

Child:

45:bad704c546d4

--- a/Levels/Levels.cpp	Wed Apr 17 02:00:31 2019 +0000
+++ b/Levels/Levels.cpp	Wed Apr 17 19:57:33 2019 +0000
@@ -22,8 +22,6 @@
     lcd.drawRect(53,9,32,2,FILL_BLACK);
 }
 
-
-
 void Levels::trap_pos1()
 {
     trap1.tx[0] = 25;
@@ -57,7 +55,7 @@
     sol1.bx[0] = 49;
     sol1.by[0] = 36;
     
-    sol2.bx[0] = 38;
+    sol2.bx[0] = 42;
     sol2.by[0] = 22;
     
     sol3.bx[0] = -10;
@@ -76,7 +74,7 @@
     sof1.sy[0] = 36;
     sof1.sx2[0] = 65;
     
-    sof2.sx1[0] = 27;
+    sof2.sx1[0] = 28;
     sof2.sy[0] = 9;
     sof2.sx2[0] = 39;
     
@@ -128,51 +126,69 @@
 
 void Levels::level_platforms2(N5110 &lcd)
 {
-    lcd.drawLine(0,47,83,47,1);
-    lcd.drawRect(4,35, 12, 2, FILL_BLACK);
+    lcd.drawLine(0, 47, 83, 47, 1);
+    lcd.drawRect(4, 33, 12, 2, FILL_BLACK);
+    lcd.drawRect(20, 41, 12, 2, FILL_BLACK);
+    lcd.drawRect(36, 37, 12, 2, FILL_BLACK);
+    lcd.drawRect(48, 29, 12, 2, FILL_BLACK);
+    lcd.drawRect(20, 21, 24, 2, FILL_BLACK);
+    lcd.drawRect(0, 10, 49, 2, FILL_BLACK);
+    lcd.drawRect(54, 14, 12, 2, FILL_BLACK);
+    lcd.drawRect(66, 8, 12, 2, FILL_BLACK);
     
 }
 void Levels::key_pos2()
 {
-    key1.kx[1] = 10;
-    key1.ky[1] = 44;
-    key2.kx[1] = 18;
-    key2.ky[1] = 44;
-    key3.kx[1] = 22;
-    key3.ky[1] = 44;
-    key4.kx[1] = 26;
-    key4.ky[1] = 44;
-    key5.kx[1] = 30;
-    key5.ky[1] = 44;
+    key1.kx[1] = 51;
+    key1.ky[1] = 39;
+    
+    key2.kx[1] = 79;
+    key2.ky[1] = 35;
+    
+    key3.kx[1] = 72;
+    key3.ky[1] = 23;
+    
+    key4.kx[1] = 24;
+    key4.ky[1] = 0;
+    
+    key5.kx[1] = 69;
+    key5.ky[1] = 5;
 }
 
 void Levels::trap_pos2()
 {
-    trap1.tx[1] = 25;
-    trap1.ty[1] = 44;
-    trap2.tx[1] = 58;
-    trap2.ty[1] = 6;
-    trap3.tx[1] = 75;
-    trap3.ty[1] = 6;
-    trap4.tx[1] = 23;
-    trap4.ty[1] = 6;
-    trap5.tx[1] = -10;
-    trap5.ty[1] = -10;
+    trap1.tx[1] = 30;
+    trap1.ty[1] = 7;
+    
+    trap2.tx[1] = 72;
+    trap2.ty[1] = 17;
+    
+    trap3.tx[1] = 51;
+    trap3.ty[1] = 44;
+    
+    trap4.tx[1] = 42;
+    trap4.ty[1] = 7;
+    
+    trap5.tx[1] = 11;
+    trap5.ty[1] = 69;
 }
 
 void Levels::enem_pos2()
 {
-    enem1.f[1] = 0;
-    enem1.ex[1] = 22;
-    enem1.ey[1] = 20;
-    enem1.d[1] = 36;
+    enem1.ex[1] = 20;
+    enem1.ey[1] = 16;
+    enem1.d[1] = 44;
     enem1.v[1] = 0.5;
     
-    enem2.f[1] = 1;
-    enem2.ex[1] = 10;
-    enem2.ey[1] = 4;
-    enem2.d[1] = 26;
+    enem2.ex[1] = 0;
+    enem2.ey[1] = 5;
+    enem2.d[1] = 38;
     enem2.v[1] = 1;
+    
+    enem3.ex[1] = 54;
+    enem3.ey[1] = 42;
+    enem3.d[1] = 30;
+    enem3.v[1] = 1;
 }
 
 void Levels::block_pos2()
@@ -181,16 +197,16 @@
     sol1.by[1] = 38;
     
     sol2.bx[1] = 66;
-    sol2.by[1] = 33;
+    sol2.by[1] = 32;
     
     sol3.bx[1] = 66;
-    sol3.by[1] = 28;
+    sol3.by[1] = 26;
     
     sol4.bx[1] = 66;
-    sol4.by[1] = 23;
+    sol4.by[1] = 20;
     
     sol5.bx[1] = 66;
-    sol5.by[1] = 18;
+    sol5.by[1] = 14;
 }
 
 void Levels::soft_pos2()
@@ -200,20 +216,124 @@
     sof1.sx2[1] = 84; 
        
     sof2.sx1[1] = 72;
-    sof2.sy[1] = 33;
+    sof2.sy[1] = 32;
     sof2.sx2[1] = 84;   
      
     sof3.sx1[1] = 72;
-    sof3.sy[1] = 28;
+    sof3.sy[1] = 26;
     sof3.sx2[1] = 84; 
        
     sof4.sx1[1] = 72;
-    sof4.sy[1] = 23;
+    sof4.sy[1] = 20;
     sof4.sx2[1] = 84;   
      
     sof5.sx1[1] = 72;
-    sof5.sy[1] = 18;
+    sof5.sy[1] = 14;
     sof5.sx2[1] = 84;
 }
 
+void Levels::level_platforms3(N5110 &lcd)
+{
+    lcd.drawLine(0, 47, 83, 47, 1);
+    lcd.drawRect(36, 31, 6, 2, FILL_BLACK);
+    lcd.drawRect(30, 10, 42, 2, FILL_BLACK);
+    lcd.drawRect(78, 20, 6, 2, FILL_BLACK);
+    lcd.drawRect(66, 26, 10, 2, FILL_BLACK);
+    lcd.drawRect(54, 30, 10, 2, FILL_BLACK);
+    
+}
+void Levels::key_pos3()
+{
+    key1.kx[2] = 38;
+    key1.ky[2] = 7;
+    
+    key2.kx[2] = 66;
+    key2.ky[2] = 7;
+    
+    key3.kx[2] = 0;
+    key3.ky[2] = 5;
+    
+    key4.kx[2] = 57;
+    key4.ky[2] = 27;
+    
+    key5.kx[2] = 69;
+    key5.ky[2] = 23;
+}
 
+void Levels::trap_pos3()
+{
+    trap1.tx[2] = 54;
+    trap1.ty[2] = 27;
+    
+    trap2.tx[2] = 66;
+    trap2.ty[2] = 23;
+    
+    trap3.tx[2] = 61;
+    trap3.ty[2] = 27;
+    
+    trap4.tx[2] = 73;
+    trap4.ty[2] = 23;
+    
+    trap5.tx[2] = 52;
+    trap5.ty[2] = 7;
+}
+
+void Levels::enem_pos3()
+{
+    enem1.ex[2] = 49;
+    enem1.ey[2] = 5;
+    enem1.d[2] = 33;
+    enem1.v[2] = 1;
+    
+    enem2.ex[2] = 30;
+    enem2.ey[2] = 5;
+    enem2.d[2] = 42;
+    enem2.v[2] = 1.25;
+    
+    enem3.ex[2] = 35;
+    enem3.ey[2] = 5;
+    enem3.d[2] = 20;
+    enem3.v[2] = 1;
+}
+
+void Levels::block_pos3()
+{
+    sol1.bx[2] = 15;
+    sol1.by[2] = 39;
+    
+    sol2.bx[2] = 30;
+    sol2.by[2] = 31;
+    
+    sol3.bx[2] = 15;
+    sol3.by[2] = 23;
+    
+    sol4.bx[2] = 0;
+    sol4.by[2] = 8;
+    
+    sol5.bx[2] = 0;
+    sol5.by[2] = 16;
+}
+
+void Levels::soft_pos3()
+{
+    sof1.sx1[2] = 12;
+    sof1.sy[2] = 16;
+    sof1.sx2[2] = 24; 
+       
+    sof2.sx1[2] = 72;
+    sof2.sy[2] = 10;
+    sof2.sx2[2] = 84;   
+     
+    sof3.sx1[2] = 0;
+    sof3.sy[2] = 0;
+    sof3.sx2[2] = 0; 
+       
+    sof4.sx1[2] = 0;
+    sof4.sy[2] = 0;
+    sof4.sx2[2] = 0;   
+     
+    sof5.sx1[2] = 0;
+    sof5.sy[2] = 0;
+    sof5.sx2[2] = 0;
+}
+