wer macht was

collect.pde

@@ -1,3 +1,4 @@
+// Tarek
 class Collectable {
   float cwidth, cheight;
   boolean is_attached = false;

files.pde

@@ -1,3 +1,4 @@
+// Marla
 class Files {
 
   boolean checkSaveFile(String filepath) {

kek2.pde

@@ -20,6 +20,7 @@ float checkDistance(Log log, Ship ship) {
 }
 
 // Main Game entry
+// Chris, Julia, Marla, Tarek, Max
 void play() {
   background(75, 105, 47);
   
@@ -92,6 +93,7 @@ void setup() {
   saw_zero = new Saw(-width+100, 100, 20, 50);
   bob = new Bob(500, 400, 20, 40);
 
+  // Marla
   player_sprite = loadImage("./assets/Sprite-robi.png");
   player_sprite_bob = loadImage("./assets/Sprite-robiwithbob.png");
   saw_sprite = loadImage("./assets/Sprite-saege.png");
@@ -100,6 +102,7 @@ void setup() {
   savefile.loadJson("./saves/save.json");
 }
 
+// Chris
 void draw() {
   // time debug
   // println(millis(), " start: ", playtime.startTime, " pause: ", playtime.pauseTime);

keys.pde

@@ -1,4 +1,6 @@
 boolean NORTH, SOUTH, ROTATEL, ROTATER;
+
+// Julia, Max
 void keyPressed() {
   if (key == CODED) {
     if(keyCode == UP) {
@@ -18,6 +20,7 @@ void keyPressed() {
         stats_menu.trees_sawed = stats_menu.trees_sawed + 1;
         }
     }
+    // Marla
   } else if (keyCode == ESC){
     key = 0;
     if (isgame) {
@@ -27,6 +30,7 @@ void keyPressed() {
   }
 }
 
+// Julia
 void keyReleased() {
   if(keyCode == UP) {NORTH = false; }
   else if (keyCode == DOWN) SOUTH = false;

level.pde

@@ -1,3 +1,5 @@
+// Julia
+
 // Outside wall
 Log[] walls = {new Log(-30, 275, 40, 275, false, true), new Log(-30, 600, 40, 275, false, true)};
 
@@ -8,7 +10,7 @@ void create_level(int logcount) {
     logs[i] = new Log((int) random(0, width), (int) random(0, height), 20, 60 + random(0, 40), true, false);
   }
   // 2nd slide entry
-  logs[0] = new Log(-5, 325, 10, 50, false, true);
+  logs[0] = new Log(-15, 325, 10, 50, false, true);
 
   // debug log
   logs[1] = new Log(-300, 100, 20, 100, true, false);

logs.pde

@@ -19,8 +19,8 @@ class Log {
     //draw();
   }
   
+  // Tarek
   void drawLog(int logtext) {
-
     if (sawed) {
       logcolor = color(128, 88, 60);
       if (a > -90) a = a - 1;

menu.pde

@@ -16,6 +16,7 @@ class Menus {
 
 }
 
+// Julia
 class MainMenu extends Menus {
 
   void playButton(float x, float y, float w, float h) {
@@ -59,6 +60,7 @@ class MainMenu extends Menus {
   }
 }
 
+// Julia, Max, Marla, Chris
 class Stats extends Menus {
   int trees_sawed = 0;
   int best_game_time = 0;
@@ -92,50 +94,51 @@ class Stats extends Menus {
   }
 }
 
+// Chris
 class StopWatchTimer {
   int startTime = 0, stopTime = 0, pauseTime = 0;
   boolean running = false;  
   boolean pause = false;
   
     
-    void start() {
-        startTime = millis();
-        running = true;
-    }
-    void stop() {
-        stopTime = millis();
-        running = false;
-    }
+  void start() {
+    startTime = millis();
+    running = true;
+  }
+  void stop() {
+    stopTime = millis();
+    running = false;
+  }
   void pause_start() {
     if (!pause) {
-        pauseTime = millis();
-        pause = true;
+      pauseTime = millis();
+      pause = true;
     }
   }
   void resume() {
     if (pause) {
-        startTime = startTime + (millis() - pauseTime);
-        pauseTime = 0;
-        pause = false;
+      startTime = startTime + (millis() - pauseTime);
+      pauseTime = 0;
+      pause = false;
     }
   }
-    int getElapsedTime() {
-        int elapsed;
-        if (running) {
-             elapsed = (millis() - startTime);
-        }
-        else {
-            elapsed = (stopTime - startTime);
-        }
-        return elapsed;
+  int getElapsedTime() {
+    int elapsed;
+    if (running) {
+      elapsed = (millis() - startTime);
     }
-    int second() {
-      return (getElapsedTime() / 1000) % 60;
-    }
-    int minute() {
-      return (getElapsedTime() / (1000*60)) % 60;
-    }
-    int hour() {
-      return (getElapsedTime() / (1000*60*60)) % 24;
+    else {
+      elapsed = (stopTime - startTime);
     }
+    return elapsed;
+  }
+  int second() {
+    return (getElapsedTime() / 1000) % 60;
+  }
+  int minute() {
+    return (getElapsedTime() / (1000*60)) % 60;
+  }
+  int hour() {
+    return (getElapsedTime() / (1000*60*60)) % 24;
+  }
 }

readme.org

@@ -1,8 +1,8 @@
 ** Ingame
 *** DONE Level mit 2 Bereichen. Erster Bereich Straße und Kettensäge und End/Startpunkt. Zweiter Bereich Wald und Bob
 *** DONE Robi muss noch beschleunigen können
-*** TODO Wir brauchen Geräusche
 *** DONE setze bob auf den Robi
+*** TODO Wir brauchen Geräusche
 *** TODO Richtige Texte am Anfang zum erklären
 *** TODO Abprallen nicht machen, wenn newx nicht erreicht sein kann, sondern wenn Robi tatsächlich die Wand berührt
 *** TODO Roboter muss abprallen, kaputt gehen

ship.pde

@@ -25,6 +25,7 @@ class Ship {
     newY = height/2;
   }
 
+  // Tarek
   void draw() {
     nextLog = returnIndexOfNearestLog();
     
@@ -45,6 +46,7 @@ class Ship {
     colliding_logs = false;
   }
 
+  // Max, julia
   void sawIndicator() {
     if (hasSaw) {
       if (checkDistance(logs[nextLog], ship_zero) < 40) {
@@ -58,6 +60,7 @@ class Ship {
     }
   }
 
+  // Max
   int returnIndexOfNearestLog() {
     float shortest_distance_log_distance = checkDistance(logs[0], ship_zero);
     int shortest_distance_log = 0;
@@ -73,6 +76,7 @@ class Ship {
     return shortest_distance_log;
   }
 
+  // Max
   void simulate() {
     // First do the Math but dont move something
 
@@ -124,6 +128,7 @@ class Ship {
     // println(speed);   
   }
 
+  // Tarek
   void logCollide(Log[] loggers) {
     for(int i = 0; i < loggers.length; i++) {
       if(loggers[i].sawed == false) {
@@ -134,6 +139,7 @@ class Ship {
     }
   }
 
+  // Tarek, Marla
   void collect(Collectable c) {
     if (pos.dist(c.pos) < 20) {
       if (c.getClass() == Saw.class ) hasSaw = true;