Mehr Level.

diff --git a/badge/jumpnrun/levels.txt b/badge/jumpnrun/levels.txt
index d8436f3..2c90833 100644 (file)
--- a/badge/jumpnrun/levels.txt
+++ b/badge/jumpnrun/levels.txt
@@ -4,5 +4,7 @@ wrongtrn
 lubiXOXO
 lubilove
 gnobbel
-foo
-mean
+sleazy
+slsky
+slsnake
+sltwice

diff --git a/badge/jumpnrun/sleazy.lv b/badge/jumpnrun/sleazy.lv
new file mode 100644 (file)
index 0000000..95c7a6e
--- /dev/null
+++ b/badge/jumpnrun/sleazy.lv
@@ -0,0 +1,45 @@
+                                                        23^^^^^^^^^^^                                                                                      
+ P                                            01        23???????????                                                                                      
+                                              23        23          ?                                                 W                        W           
+                  W                   W    H  23        23      c  ?              W                                                                                01
+                                           ?  23 S      23     01   ?                              W                                                               23
+                                              23??????  23 H   23  ?                                                                                               23
+                                       B      23        23??   23   ?           ?#?#?                                                                              23
+                     01                ?      23    W   23     23  ?                                                                                               23
+                     23                       23        23     23   ?                                                                                          d   23
+         ?     01    23    01      M      S   23        23   S 23  ?      ?    M    D  S   B  ?       B       S  S                           M?                ##  23
+               23    23    23      ?      ?   23  ????????   ??23   ?   ##########################          ^        01       01             ??          B?        23
+               23    23    23                 23               23       ##########################          ?        23       23           M???          ??        23
+        M      23  S 23   S23                 23   M           23       ##########################  M       ?        23       23S          ????        B???        23
+#####################################################################################################################23       23###############      ################
+
+[tiles]
+0 tube_top_left
+1 tube_top_right
+2 tube_left
+3 tube_right
+# brick
+? square
+^ spike_up
+v spike_down
+> spike_right
+< spike_left
+
+[items]
+d doc
+c checkpoint
+k key
+e doc_encrypted
+
+[enemies]
+C cat
+M mushroom
+B bunny
+S snake
+@ spiral
+R rotor
+H dog
+G giraffe
+V bird
+W bird_straight
+X bird_dip

diff --git a/badge/jumpnrun/slsky.lv b/badge/jumpnrun/slsky.lv
new file mode 100644 (file)
index 0000000..eaa3c42
--- /dev/null
+++ b/badge/jumpnrun/slsky.lv
@@ -0,0 +1,45 @@
+                                                                                                                             01                                      
+  P          W                                  W         W                    c                           W      W     W    23W                W                    
+                                   W                                           ??                  W                 W     W 23       W W                    W       
+                                                                                         W                                   23                                      
+010101                                  01    ?    ?     01                  W      ?                                       W23          W          01       W       
+232323              ???                 23               23W                                         01       ?????       01 23      W W            23     W         
+232323                                  23 W             23                               01        W23                   23 23                     23               
+232323     ???                 ???      23               23                    01        W23         23             W     23 23           01        23  W            
+232323                                  23               23         01        W23         23         23                   23 23           23    W  ?23              
+232323W                 W               23W              23         23         23         23?????????23     W             23 ?? 0101      23        23              
+232323                                  23             W 23        W23         23?????????23         23                   23    2323      23        23           d   
+232323          W                     W 23               23         23?????????23         23         23             W     23    2323      23        23           01  
+232323                                  23W              23         23         23         23         23                   23????2323      23        23           23  
+232323                                  23               23         23         23         23         23                   23    2323      23        23           23 
+
+[tiles]
+0 tube_top_left
+1 tube_top_right
+2 tube_left
+3 tube_right
+# brick
+? square
+^ spike_up
+v spike_down
+> spike_right
+< spike_left
+
+[items]
+d doc
+c checkpoint
+k key
+e doc_encrypted
+
+[enemies]
+C cat
+M mushroom
+B bunny
+S snake
+@ spiral
+R rotor
+H dog
+G giraffe
+V bird
+W bird_straight
+X bird_dip

diff --git a/badge/jumpnrun/slsnake.lv b/badge/jumpnrun/slsnake.lv
new file mode 100644 (file)
index 0000000..1b3524e
--- /dev/null
+++ b/badge/jumpnrun/slsnake.lv
@@ -0,0 +1,45 @@
+???????????????????                    ^^^^^^^^^^                 ?                                             ^^^^^^^^^^^^^^                                   
+?                 ?           S   S    ??????????                 ?            S                                ??????????????                     d            
+?                 ?          ???????????                          ?    c     ??????       ?        ?                                                            
+?    S     S      ?     ??   ?                                    ?    ??    ^^^^^^^^^^^^^^^^^^^^^^^^^              S   S   S                                   
+?  ?????????????  ?     ??   ?                      S             ?    ??                                      ???????????????             ??                   
+?         ?       ??    ??   ?                     ???         ^  ?    ??                                                                                       
+?  S      ?             ??   ?  ?            S                 ?  ?    ??                                           S   S   S                                   
+??????    ?             ??   ?  ?           ???             S  ?  v  ????                                     ????????????????         ??                      
+?        ??             ??   ?  ?                          ??? ?     ?  ?                                                                                       
+?       ???         ??????      ?      S                       ?     ?  ?     ??    ??    ??    ??    ??            S   S   S                              
+?      ????         ?    ?     ??     ???                      ?     ?  ?     ??    ??    ??    ??    ??     ?????????????????      ??                     
+?     ?????  ???    ?    ????????                              ????????????????? @     @     @     @  ??                                                        
+?P   ??????^^???^^^^?           ?^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^?               ?^^^^^^^^^^^^^^^^^^^^^^??            S   S   S   ?                    
+##################################################################################################################################################^^^^^^
+
+[tiles]
+0 tube_top_left
+1 tube_top_right
+2 tube_left
+3 tube_right
+# brick
+? square
+^ spike_up
+v spike_down
+> spike_right
+< spike_left
+
+[items]
+d doc
+c checkpoint
+k key
+e doc_encrypted
+
+[enemies]
+C cat
+M mushroom
+B bunny
+S snake
+@ spiral
+R rotor
+H dog
+G giraffe
+V bird
+W bird_straight
+X bird_dip

diff --git a/badge/jumpnrun/sltwice.lv b/badge/jumpnrun/sltwice.lv
new file mode 100644 (file)
index 0000000..c0931d2
--- /dev/null
+++ b/badge/jumpnrun/sltwice.lv
@@ -0,0 +1,44 @@
+############################################################23#########################################################################                                                              
+#        #                      #                           23                    >                 >                 >               #                                                              
+#P       #                      #                           23                    >                 >                 >               #                         
+#??????> #  ??????????????????> #                           23                    #  #############  #  #############  #  ############ #  ??????               e 
+#        #  ?        vvvv       #        ?                  23                       >           >     >           >     >          # #                       01
+#        # ??                   #       ?    01   01   01   23      0101             >           >     >           >     >          # #                       23
+#  <?????#  ? ??????       ?????#      ?     23   23   23   ??      2323         #####  #######  #######  #######  #######  ####### #k#???   ?        ??      23
+#  <     #  ? ?    ?      ^?    #     ?      23   23   23           2323                >     >           >     >           >     # # #     ??        vv      23
+#  <     #  ? ?    ?????????    #    ?       23   23   23           2323                >     >           >     >           >     # #^#    ???                23
+#  <  >  #v ? ?  # vvvvvvvvv #  #   ?        23   23   23010101 01  2323        #########  #  #############  #  #############  #  # ###   ?????               23
+#     >     ?    >           >     ?         23   23   23232323 23  2323                   >                 >                 >  <      ??????               23
+#     >     ?    >           >    ?          23   23   23232323 23  2323                   >                 >                 >^^<     ???????               23
+##################################           23   23   23232323 23  2323       ###############################################################################23
+
+[tiles]
+0 tube_top_left
+1 tube_top_right
+2 tube_left
+3 tube_right
+# brick
+? square
+^ spike_up
+v spike_down
+> spike_right
+< spike_left
+
+[items]
+d doc
+c checkpoint
+k key
+e doc_encrypted
+
+[enemies]
+C cat
+M mushroom
+B bunny
+S snake
+@ spiral
+R rotor
+H dog
+G giraffe
+V bird
+W bird_straight
+X bird_dip

diff --git a/badge/main.c b/badge/main.c
index 852cb6b..a712686 100644 (file)
--- a/badge/main.c
+++ b/badge/main.c
@@ -205,79 +205,20 @@ int main(void)
   badge_init();
 #endif
 
-  /*
-  nrf_init();
-
-  for(uint8_t i = 1; ; ++i) {
-    badge_framebuffer fb = { { { 0 } } };
-
-    fb.data[2][86] = 0xff;
-    fb.data[3][87] = nrf_read_reg(R_CONFIG);
-    fb.data[4][86] = 0xff;
-    for(uint8_t j = 0; j < i; j += 3) {
-      fb.data[3][j / 3] = 0xff;
-    }
-
-    SCB_CLKOUTCLKDIV = i;
-    badge_framebuffer_flush(&fb);
-    systickDelay(200);
-  }
-  */
-
   FATFS fs;
   f_mount(0, &fs);
 
-  {
+  if(badge_input_raw() & BADGE_EVENT_KEY_DOWN) {
     badge_framebuffer fb = { { { 0 } } };
 
-    fb.data[0][0] = badge_framebuffer_render_text(&fb, 2, 10, "foobar");
-    fb.data[0][1] = badge_framebuffer_render_number(&fb, 10, 18, 99);
-
+    fb.data[0][0] = badge_framebuffer_render_text(&fb, 23, 30, "USB-Modus");
     badge_framebuffer_flush(&fb);
-  }
-
-  if(badge_input_raw() & BADGE_EVENT_KEY_DOWN) {
     usbMSCInit();
     for(;;);
   }
 
   badge_event_start();
-
   jumpnrun_play();
 
-  for(;;) {
-    if(JUMPNRUN_ERROR == jumpnrun_play_level("smb.lvl")) {
-      break;
-    }
-  }
-
-  uint8_t buttons = 0;
-
-  for(uint8_t i = 0; ; ++i) {
-    badge_event_t event = badge_event_wait();
-
-    switch(badge_event_type(event)) {
-    case BADGE_EVENT_USER_INPUT: {
-      buttons = badge_event_current_input_state();
-      break;
-    }
-    case BADGE_EVENT_GAME_TICK: {
-      badge_sprite const sp = { 4, 4, (uint8_t const *) "\xff\xff" };
-      badge_framebuffer fb = { { { 0x80 } } };
-
-      if(buttons & BADGE_EVENT_KEY_UP)    { badge_framebuffer_blt(&fb, 30, 10, &sp, 0); }
-      if(buttons & BADGE_EVENT_KEY_DOWN)  { badge_framebuffer_blt(&fb, 30, 50, &sp, 0); }
-      if(buttons & BADGE_EVENT_KEY_LEFT)  { badge_framebuffer_blt(&fb, 10, 30, &sp, 0); }
-      if(buttons & BADGE_EVENT_KEY_RIGHT) { badge_framebuffer_blt(&fb, 50, 30, &sp, 0); }
-      if(buttons & BADGE_EVENT_KEY_CENTER){ badge_framebuffer_blt(&fb, 30, 30, &sp, 0); }
-      if(buttons & BADGE_EVENT_KEY_BTN_A) { badge_framebuffer_blt(&fb, 70, 10, &sp, 0); }
-      if(buttons & BADGE_EVENT_KEY_BTN_B) { badge_framebuffer_blt(&fb, 70, 50, &sp, 0); }
-
-      badge_framebuffer_flush(&fb);
-      break;
-    }
-    }
-  }
-
   return 0;
 }