From 3fca21e09b3f19d09a56029791cdb7c94e3e07a6 Mon Sep 17 00:00:00 2001
From: Jmoose <jmusialowicz@ucvts.tec.nj.us>
Date: Tue, 15 Dec 2015 09:23:44 -0500
Subject: [PATCH 1/5] is in contact with death

---
 raindropGameCode/Raindrop.pde         | 32 +++++++++++++++++++++++++++
 raindropGameCode/raindropGameCode.pde | 15 +++++++------
 2 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 raindropGameCode/Raindrop.pde

diff --git a/raindropGameCode/Raindrop.pde b/raindropGameCode/Raindrop.pde
new file mode 100644
index 0000000..11bfbc1
--- /dev/null
+++ b/raindropGameCode/Raindrop.pde
@@ -0,0 +1,32 @@
+class Raindrop {
+  color c;
+  int diam;
+  PVector loc, vel, g;   //declare a P
+
+  Raindrop(int tdiam) {
+    diam=30;
+    loc = new PVector(width/2, 50);
+    c=color(0, random(255), random(255));
+    vel= PVector.random2D();
+    g= new PVector(0,.25);
+  }
+  void display() {
+    fill(c);
+    noStroke();
+    ellipse(loc.x, loc.y, diam, diam);
+  }
+  void fall() {
+ loc.add(vel);
+ vel.add(g);
+  }
+  void reset() {
+    loc.x=random(width);
+    loc.y=0;
+    vel= PVector.random2D();
+  }
+  boolean isInContactWith(PVector death) {
+ if (loc.dist(death)<diam/2){
+   return true;
+ }else{return false;}
+  }
+}
\ No newline at end of file
diff --git a/raindropGameCode/raindropGameCode.pde b/raindropGameCode/raindropGameCode.pde
index 944de61..c7240f8 100644
--- a/raindropGameCode/raindropGameCode.pde
+++ b/raindropGameCode/raindropGameCode.pde
@@ -1,5 +1,5 @@
-PVector mouse;   //declare a P
-Raindrop r;      //declare a new Raindrop called r
+ PVector mouse;
+ Raindrop r;
 
 // On your own, create an array of Raindrop objects instead of just one
 // Use the array instead of the single object
@@ -7,14 +7,15 @@ Raindrop r;      //declare a new Raindrop called r
 
 
 void setup() {
-  size(1200, 800);
-  mouse = new PVector();                //initialize mouse PVector. value is irrelevant since it will be set at the start of void draw(){}
-  r = new Raindrop(random(width), 0);   //Initialize r. The parameters used are the initial x and y positions
+  size(600, 400);
+
+ mouse = new PVector();                //initialize mouse PVector. value is irrelevant since it will be set at the start of void draw(){}
+  r = new Raindrop (100);   //Initialize r. The parameters used are the initial x and y positions
 }
 
 void draw() {
   mouse.set(mouseX, mouseY);             //set value of mouse as mouseX,mouseY
-  background(0, 200, 255);
+  background(0, 100, 255);
   r.fall();         //make the raindrop fall. It should accelerate as if pulled towards the ground by earth's gravity
   r.display();      //display the raindrop
   if (r.isInContactWith(mouse)) {      //check to see if the raindrop is in contact with the point represented by the PVector called mouse
@@ -23,4 +24,4 @@ void draw() {
   if (r.loc.y > height + r.diam/2) {     //check to see if the raindrop goes below the bottom of the screen
     r.reset();                           //if it does, reset the raindrop
   }
-}
+}
\ No newline at end of file

From 89f87453ec94b3c6ad178f7e25b44d612863855d Mon Sep 17 00:00:00 2001
From: Jmoose <jmusialowicz@ucvts.tec.nj.us>
Date: Thu, 17 Dec 2015 09:17:10 -0500
Subject: [PATCH 2/5] almost a catcher

---
 raindropGameCode/Raindrop.pde         | 21 ++++++++++++++++++-
 raindropGameCode/raindropGameCode.pde | 30 +++++++++++++++++----------
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/raindropGameCode/Raindrop.pde b/raindropGameCode/Raindrop.pde
index 11bfbc1..c0c9266 100644
--- a/raindropGameCode/Raindrop.pde
+++ b/raindropGameCode/Raindrop.pde
@@ -6,7 +6,7 @@ class Raindrop {
   Raindrop(int tdiam) {
     diam=30;
     loc = new PVector(width/2, 50);
-    c=color(0, random(255), random(255));
+    c=color(0, random(150,255), random(10,100));
     vel= PVector.random2D();
     g= new PVector(0,.25);
   }
@@ -29,4 +29,23 @@ class Raindrop {
    return true;
  }else{return false;}
   }
+}
+
+class catcher{
+  color c;
+  int diam;
+  PVector loc;
+   
+   catcher (int tdiam){
+     c=color(0);
+     diam=75;
+     loc.x= mouseX;
+     loc.y=mouseY;
+   }
+   
+   void display(){
+     fill(c);
+     noStroke();
+     ellipse (loc.x,loc.y,diam,diam);
+   }
 }
\ No newline at end of file
diff --git a/raindropGameCode/raindropGameCode.pde b/raindropGameCode/raindropGameCode.pde
index c7240f8..eaa14ad 100644
--- a/raindropGameCode/raindropGameCode.pde
+++ b/raindropGameCode/raindropGameCode.pde
@@ -1,6 +1,7 @@
+int co=20;
  PVector mouse;
- Raindrop r;
-
+ Raindrop[] r = new Raindrop[co];
+catcher bucket=new catcher; 
 // On your own, create an array of Raindrop objects instead of just one
 // Use the array instead of the single object
 // You can start out by just using the single Raindrop as you test
@@ -8,20 +9,27 @@
 
 void setup() {
   size(600, 400);
-
  mouse = new PVector();                //initialize mouse PVector. value is irrelevant since it will be set at the start of void draw(){}
-  r = new Raindrop (100);   //Initialize r. The parameters used are the initial x and y positions
-}
+int i=0;
+while(i<co){
+  r[i]= new Raindrop(100);
+  i++;}
 
+}
 void draw() {
+ int i=0;
   mouse.set(mouseX, mouseY);             //set value of mouse as mouseX,mouseY
   background(0, 100, 255);
-  r.fall();         //make the raindrop fall. It should accelerate as if pulled towards the ground by earth's gravity
-  r.display();      //display the raindrop
-  if (r.isInContactWith(mouse)) {      //check to see if the raindrop is in contact with the point represented by the PVector called mouse
-    r.reset();                         //if it is, reset the raindrop
+ while (i<co){
+r[i].fall();         //make the raindrop fall. It should accelerate as if pulled towards the ground by earth's gravity
+  r[i].display();      //display the raindrop
+  if (r[i].isInContactWith(mouse)) {      //check to see if the raindrop is in contact with the point represented by the PVector called mouse
+    r[i].reset();                         //if it is, reset the raindrop
+  }
+  if (r[i].loc.y > height + r[i].diam/2) {     //check to see if the raindrop goes below the bottom of the screen
+    r[i].reset();  //if it does, reset the raindrop
   }
-  if (r.loc.y > height + r.diam/2) {     //check to see if the raindrop goes below the bottom of the screen
-    r.reset();                           //if it does, reset the raindrop
+  i++;
   }
+  
 }
\ No newline at end of file

From c0722be52670a3428807057aa5fe8555fdad2207 Mon Sep 17 00:00:00 2001
From: Jmoose <jmusialowicz@ucvts.tec.nj.us>
Date: Thu, 17 Dec 2015 09:22:11 -0500
Subject: [PATCH 3/5] stufff ish i need to make a working catcher

---
 raindropGameCode/Raindrop.pde         | 3 ++-
 raindropGameCode/raindropGameCode.pde | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/raindropGameCode/Raindrop.pde b/raindropGameCode/Raindrop.pde
index c0c9266..0a8e252 100644
--- a/raindropGameCode/Raindrop.pde
+++ b/raindropGameCode/Raindrop.pde
@@ -31,7 +31,7 @@ class Raindrop {
   }
 }
 
-class catcher{
+class Catcher{
   color c;
   int diam;
   PVector loc;
@@ -41,6 +41,7 @@ class catcher{
      diam=75;
      loc.x= mouseX;
      loc.y=mouseY;
+     
    }
    
    void display(){
diff --git a/raindropGameCode/raindropGameCode.pde b/raindropGameCode/raindropGameCode.pde
index eaa14ad..af34e1c 100644
--- a/raindropGameCode/raindropGameCode.pde
+++ b/raindropGameCode/raindropGameCode.pde
@@ -1,7 +1,7 @@
 int co=20;
  PVector mouse;
  Raindrop[] r = new Raindrop[co];
-catcher bucket=new catcher; 
+Catcher b =new Catcher(); 
 // On your own, create an array of Raindrop objects instead of just one
 // Use the array instead of the single object
 // You can start out by just using the single Raindrop as you test

From e646526c16c2eed88dbf5e550226e0c075a58370 Mon Sep 17 00:00:00 2001
From: Jmoose <jmusialowicz@ucvts.tec.nj.us>
Date: Tue, 5 Jan 2016 09:23:46 -0500
Subject: [PATCH 4/5] need to add the distance to the object

---
 raindropGameCode/Raindrop.pde         | 21 ++++++----
 raindropGameCode/raindropGameCode.pde | 56 ++++++++++++++++-----------
 2 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/raindropGameCode/Raindrop.pde b/raindropGameCode/Raindrop.pde
index 0a8e252..94b59c2 100644
--- a/raindropGameCode/Raindrop.pde
+++ b/raindropGameCode/Raindrop.pde
@@ -24,10 +24,12 @@ class Raindrop {
     loc.y=0;
     vel= PVector.random2D();
   }
-  boolean isInContactWith(PVector death) {
- if (loc.dist(death)<diam/2){
+  boolean isInContactWith(Catcher death) {
+ if ( loc.dist()<diam/2){//this shit
    return true;
- }else{return false;}
+ }else{
+   return false;
+    }
   }
 }
 
@@ -36,17 +38,20 @@ class Catcher{
   int diam;
   PVector loc;
    
-   catcher (int tdiam){
+   Catcher (int tdiam,float x,float y ){
      c=color(0);
-     diam=75;
-     loc.x= mouseX;
-     loc.y=mouseY;
+     diam=tdiam;
+    loc= new PVector(mouseX,mouseY);
+
      
    }
    
    void display(){
      fill(c);
      noStroke();
-     ellipse (loc.x,loc.y,diam,diam);
+     ellipse (mouseX,380,diam*2,20);
    }
+  void move(){
+    loc.set(mouseX,380);
+  }
 }
\ No newline at end of file
diff --git a/raindropGameCode/raindropGameCode.pde b/raindropGameCode/raindropGameCode.pde
index af34e1c..a79407f 100644
--- a/raindropGameCode/raindropGameCode.pde
+++ b/raindropGameCode/raindropGameCode.pde
@@ -1,7 +1,8 @@
 int co=20;
- PVector mouse;
- Raindrop[] r = new Raindrop[co];
-Catcher b =new Catcher(); 
+PVector mouse;
+int score;
+Raindrop[] r = new Raindrop[co];
+Catcher death;
 // On your own, create an array of Raindrop objects instead of just one
 // Use the array instead of the single object
 // You can start out by just using the single Raindrop as you test
@@ -9,27 +10,36 @@ Catcher b =new Catcher();
 
 void setup() {
   size(600, 400);
- mouse = new PVector();                //initialize mouse PVector. value is irrelevant since it will be set at the start of void draw(){}
-int i=0;
-while(i<co){
-  r[i]= new Raindrop(100);
-  i++;}
-
+  mouse = new PVector(); //initialize mouse PVector. value is irrelevant since it will be set at the start of void draw(){}
+  death = new Catcher(30,mouseX, mouseY);
+  int i=0;
+  while (i<co) {
+    r[i]= new Raindrop(100);
+    i++;
+  }
+  frameRate(50);
 }
 void draw() {
- int i=0;
-  mouse.set(mouseX, mouseY);             //set value of mouse as mouseX,mouseY
+  mouse.set(mouseX, mouseY);
+  int i=0;
+  r[i].reset();
   background(0, 100, 255);
- while (i<co){
-r[i].fall();         //make the raindrop fall. It should accelerate as if pulled towards the ground by earth's gravity
-  r[i].display();      //display the raindrop
-  if (r[i].isInContactWith(mouse)) {      //check to see if the raindrop is in contact with the point represented by the PVector called mouse
-    r[i].reset();                         //if it is, reset the raindrop
-  }
-  if (r[i].loc.y > height + r[i].diam/2) {     //check to see if the raindrop goes below the bottom of the screen
-    r[i].reset();  //if it does, reset the raindrop
-  }
-  i++;
-  }
-  
+  while (i<co) {
+    r[i].fall();         //make the raindrop fall. It should accelerate as if pulled towards the ground by earth's gravity
+    r[i].display();      //display the raindrop
+    if (r[i].isInContactWith(death)) {      //check to see if the raindrop is in contact with the point represented by the Catcher called death
+      r[i].reset();  //if it is, reset the raindrop
+      score++;
+    
+    }
+    if (r[i].loc.y > height + r[i].diam/2) {     //check to see if the raindrop goes below the bottom of the screen
+      r[i].reset();  //if it does, reset the raindrop
+    }
+    i++;
+    fill(0);                        //makes score black
+    textSize(30);                      // asigns score text size
+    text(score, width/2, height/2);      // writes score
+ death.display();
+ death.move();
+}
 }
\ No newline at end of file

From 0c4104200566a4b735c3a1d0c940de75dcb12c16 Mon Sep 17 00:00:00 2001
From: Jmoose <jmusialowicz@ucvts.tec.nj.us>
Date: Wed, 6 Jan 2016 11:14:50 -0500
Subject: [PATCH 5/5] dern

---
 raindropGameCode/Raindrop.pde         | 57 +++++++++++++--------------
 raindropGameCode/raindropGameCode.pde | 48 +++++++++++-----------
 2 files changed, 51 insertions(+), 54 deletions(-)

diff --git a/raindropGameCode/Raindrop.pde b/raindropGameCode/Raindrop.pde
index 94b59c2..b0d9925 100644
--- a/raindropGameCode/Raindrop.pde
+++ b/raindropGameCode/Raindrop.pde
@@ -1,14 +1,15 @@
+ PVector loc, vel, g;   //declare a P
 class Raindrop {
   color c;
   int diam;
-  PVector loc, vel, g;   //declare a P
+ 
 
   Raindrop(int tdiam) {
     diam=30;
     loc = new PVector(width/2, 50);
-    c=color(0, random(150,255), random(10,100));
+    c=color(0, random(150, 255), random(10, 100));
     vel= PVector.random2D();
-    g= new PVector(0,.25);
+    g= new PVector(0, .25);
   }
   void display() {
     fill(c);
@@ -16,42 +17,40 @@ class Raindrop {
     ellipse(loc.x, loc.y, diam, diam);
   }
   void fall() {
- loc.add(vel);
- vel.add(g);
+    loc.add(vel);
+    vel.add(g);
   }
   void reset() {
     loc.x=random(width);
     loc.y=0;
     vel= PVector.random2D();
   }
+}
   boolean isInContactWith(Catcher death) {
- if ( loc.dist()<diam/2){//this shit
-   return true;
- }else{
-   return false;
+    if ( loc.dist(mouse)<diam/2) { //makes the catcher move
+      return true; //makes the catcher do something
+    } else {     //if it is not within the distance to the mouse
+      return false; // then it does not catch
     }
   }
-}
 
-class Catcher{
-  color c;
-  int diam;
-  PVector loc;
-   
-   Catcher (int tdiam,float x,float y ){
-     c=color(0);
-     diam=tdiam;
-    loc= new PVector(mouseX,mouseY);
+class Catcher {  // start the catcher class
+  color c; // insert the variable for the class
+  int diam;// insert the variable for the class
+  PVector loc;// insert the variable for the class
 
-     
-   }
-   
-   void display(){
-     fill(c);
-     noStroke();
-     ellipse (mouseX,380,diam*2,20);
-   }
-  void move(){
-    loc.set(mouseX,380);
+  Catcher (int tdiam, float x, float y ) {//catcher builder
+    c=color(0); // change the color 
+    diam=tdiam; // makes the diam matter
+    loc= new PVector(mouseX, mouseY); // set the pvector as the base for movement
+  }
+
+  void display() { // display function
+    fill(c); // makesd the color to display it
+    noStroke(); // makes the stroke gone so the edge is gone
+    ellipse (mouseX, 380, diam*2, 20); // makes the catcher
+  }
+  void move() { // move function
+    loc.set(mouseX, 380); // makes the catcher able to move
   }
 }
\ No newline at end of file
diff --git a/raindropGameCode/raindropGameCode.pde b/raindropGameCode/raindropGameCode.pde
index a79407f..dd20733 100644
--- a/raindropGameCode/raindropGameCode.pde
+++ b/raindropGameCode/raindropGameCode.pde
@@ -1,45 +1,43 @@
-int co=20;
-PVector mouse;
-int score;
-Raindrop[] r = new Raindrop[co];
-Catcher death;
-// On your own, create an array of Raindrop objects instead of just one
-// Use the array instead of the single object
-// You can start out by just using the single Raindrop as you test
-
+int co=20; //initialize co
+PVector mouse; // initialize mouse
+int score; //initialize score
+Raindrop[] r = new Raindrop[co]; // new raindrop array list
+Catcher death;//makw catcher death
 
 void setup() {
-  size(600, 400);
+  size(600, 400);// size of background
   mouse = new PVector(); //initialize mouse PVector. value is irrelevant since it will be set at the start of void draw(){}
-  death = new Catcher(30,mouseX, mouseY);
-  int i=0;
+  death = new Catcher(30, mouseX, mouseY); // new catcher death is made
+  int i=0;//declare i
   while (i<co) {
-    r[i]= new Raindrop(100);
-    i++;
+    r[i]= new Raindrop(100);// make one hundred raindrops
+    i++;// add new i to keep the raindrops being made every so often frames
   }
-  frameRate(50);
+  frameRate(50);// increase framerate to make the game more fluid
 }
 void draw() {
-  mouse.set(mouseX, mouseY);
-  int i=0;
-  r[i].reset();
-  background(0, 100, 255);
+  mouse.set(mouseX, mouseY); //set mouse as a vector
+  int i=0; //make i a zero for the block of code
+  background(0, 100, 255); //set blue colored background
   while (i<co) {
     r[i].fall();         //make the raindrop fall. It should accelerate as if pulled towards the ground by earth's gravity
     r[i].display();      //display the raindrop
     if (r[i].isInContactWith(death)) {      //check to see if the raindrop is in contact with the point represented by the Catcher called death
       r[i].reset();  //if it is, reset the raindrop
-      score++;
-    
+      score++; // add one to score for every raindrop caught
     }
     if (r[i].loc.y > height + r[i].diam/2) {     //check to see if the raindrop goes below the bottom of the screen
       r[i].reset();  //if it does, reset the raindrop
     }
-    i++;
+    i++; //add one to i to keep the raindrops functioning
     fill(0);                        //makes score black
     textSize(30);                      // asigns score text size
     text(score, width/2, height/2);      // writes score
- death.display();
- death.move();
-}
+    death.display(); // display the shape death
+    death.move(); //make death move 
+    if(score = 30){
+      background(0);
+      text("you win",300,200);
+    }
+  }
 }
\ No newline at end of file