Merge pull request #4 from RCMgames/dq-dev

add DQ feature

Author: joshua1024

ScoreWindow/RefPWindow.pde

@@ -31,11 +31,10 @@ class refPWindow extends PApplet {
       fill(0);
       text("CONNECTION LOST", width*.56, 40);
     }
-
-    String[] bmsg={"score", "ownership score", "penalty score", "ownership %", "switch own time", "scale own time", "climbs"};
-    String[] bval={str(int(blueScore)), str(int(blueOwnershipScore)), str(int(bluePenaltyScore)), nf(blueOwnershipPercent, 3, 1)+(blueOwnershipPercent>=ownershipRPPercent?"   (RP)":""), str(int(blueSwitchOwnershipTime)), str(int(blueScaleOwnershipTime)), blueClimbs==maxClimbs?str(blueClimbs)+"         (RP)":str(blueClimbs)};
-    String[] rmsg={"score", "ownership score", "penalty score", "ownership %", "switch own time", "scale own time", "climbs"};
-    String[] rval={str(int(redScore)), str(int(redOwnershipScore)), str(int(redPenaltyScore)), nf(redOwnershipPercent, 3, 1)+(redOwnershipPercent>=ownershipRPPercent?"   (RP)":""), str(int(redSwitchOwnershipTime)), str(int(redScaleOwnershipTime)), redClimbs==maxClimbs?str(redClimbs)+"         (RP)":str(redClimbs)};
+    String[] bmsg={"score", "ownership score", "penalty score", "ownership %", "switch own time", "scale own time", "climbs", (blueSide==Left?"(v) ":"(n) ")+"DQ"};
+    String[] bval={str(int(blueScore)), str(int(blueOwnershipScore)), str(int(bluePenaltyScore)), nf(blueOwnershipPercent, 3, 1)+(blueOwnershipPercent>=ownershipRPPercent?"   (RP)":""), str(int(blueSwitchOwnershipTime)), str(int(blueScaleOwnershipTime)), blueClimbs==maxClimbs?str(blueClimbs)+"         (RP)":str(blueClimbs), DQBlue?"YES :(":"no"};
+    String[] rmsg={"score", "ownership score", "penalty score", "ownership %", "switch own time", "scale own time", "climbs", (blueSide==Right?"(v) ":"(n) ")+"DQ"};
+    String[] rval={str(int(redScore)), str(int(redOwnershipScore)), str(int(redPenaltyScore)), nf(redOwnershipPercent, 3, 1)+(redOwnershipPercent>=ownershipRPPercent?"   (RP)":""), str(int(redSwitchOwnershipTime)), str(int(redScaleOwnershipTime)), redClimbs==maxClimbs?str(redClimbs)+"         (RP)":str(redClimbs), DQRed?"YES :(":"no"};
     if (blueSide==Left) {
       dispData(color(0, 0, 100), bmsg, bval, 0, 0, width*.25, height, 35);
       dispData(color(100, 0, 0), rmsg, rval, width*.75, 0, width*.25, height, 35);
@@ -48,7 +47,7 @@ class refPWindow extends PApplet {
       nextState=false;
       state++;
       if (state==2) {//post match
-        String strToSave=str(year())+"/"+str(month())+"/"+str(day())+" "+str(hour())+":"+str(minute())+":"+str(second())+","+str(int(blueScore))+","+str(int(redScore))+","+str(blueRP)+","+str(int(redRP))+","+str(bluePenaltyScore)+","+str(redPenaltyScore)+","+str(blueClimbs)+","+str(redClimbs)+","+nf(blueOwnershipPercent, 3, 1)+","+nf(redOwnershipPercent, 3, 1)+","+int(blueSwitchOwnershipTime)+","+int(redSwitchOwnershipTime)+","+int(blueScaleOwnershipTime)+","+int(redScaleOwnershipTime) +","+str(int(totalMatchTime-matchTime));
+        String strToSave=str(year())+"/"+str(month())+"/"+str(day())+" "+str(hour())+":"+str(minute())+":"+str(second())+","+str(int(blueScore))+","+str(int(redScore))+","+str(blueRP)+","+str(int(redRP))+","+str(bluePenaltyScore)+","+str(redPenaltyScore)+","+str(blueClimbs)+","+str(redClimbs)+","+nf(blueOwnershipPercent, 3, 1)+","+nf(redOwnershipPercent, 3, 1)+","+int(blueSwitchOwnershipTime)+","+int(redSwitchOwnershipTime)+","+int(blueScaleOwnershipTime)+","+int(redScaleOwnershipTime) +","+str(int(totalMatchTime-matchTime))+","+str(int(DQBlue))+","+str(int(DQRed));
         try {        
           String[] stringsToSave=loadStrings(filename);
           stringsToSave=append(stringsToSave, strToSave);                  
@@ -353,6 +352,21 @@ class refPWindow extends PApplet {
           blueClimbs++;
         }
       }
+
+      if (key=='v') {
+        if (blueSide==Right) {
+          DQRed=!DQRed;
+        } else {
+          DQBlue=!DQBlue;
+        }
+      }
+      if (key=='n') {
+        if (blueSide==Left) {
+          DQRed=!DQRed;
+        } else {
+          DQBlue=!DQBlue;
+        }
+      }
       if (redClimbs>maxClimbs)
         redClimbs=0;
       if (blueClimbs>maxClimbs)

ScoreWindow/ScoreWindow.pde

@@ -47,6 +47,9 @@ int blueClimbs=0;
 
 int state=-1;
 
+boolean DQRed=false;
+boolean DQBlue=false;
+
 float matchTime=0;
 int totalMatchTime=5*60;/////
 int matchStartMillis=0;
@@ -141,6 +144,8 @@ void draw() {
     blueOwnershipPercent=0;
     redRP=0;
     blueRP=0;
+    DQRed=false;
+    DQBlue=false;
     matchStartMillis=millis();
   }
   if (state==-1) {
@@ -247,8 +252,20 @@ void draw() {
     text("final scores are being reviewed", width/4, height/2);
     redScore=redOwnershipScore+redPenaltyScore+climbPoints*redClimbs;
     blueScore=blueOwnershipScore+bluePenaltyScore+climbPoints*blueClimbs;
+    if (DQBlue) {
+      blueScore=-9999;
+    }
+    if (DQRed) {
+      redScore=-9999;
+    }
     redRP=2*int(int(redScore)>int(blueScore)+int(int(redScore)==int(blueScore)))+int(redOwnershipPercent>=ownershipRPPercent)+int(redClimbs==maxClimbs);
     blueRP=2*int(int(blueScore)>int(redScore)+int(int(blueScore)==int(redScore)))+int(blueOwnershipPercent>=ownershipRPPercent)+int(blueClimbs==maxClimbs);
+    if (DQBlue) {
+      blueRP=0;
+    }
+    if (DQRed) {
+      redRP=0;
+    }
   }
 }
 
@@ -348,12 +365,12 @@ void drawScores(float y, float h, float w) {
 
   fill(100, 100, 255);
   rect(width*.5, y, width*w*blueSide, h);
-  fill(255);
+  fill(DQBlue?color(255, 155, 0):color(255));
   text(str(int(blueScore)), width/2-w/2*width+w*blueSide*width/2, y, width*w, h);
 
   fill(100, 0, 0);
   rect(width*.5, y, width*-w*blueSide, h);
-  fill(255);
+  fill(DQRed?color(255, 155, 0):color(255));
   text(str(int(redScore)), width/2-w/2*width-w*blueSide*width/2, y, width*w, h);
 
   popStyle();