[virtualcommons-svn] commit/irrigation: alllee: switching default chat duration back to 60, adding quiz.enabled before second practice round.

[Bitbucket <com...@bi...>]

1 new commit in irrigation:


https://bitbucket.org/virtualcommons/irrigation/changeset/7de75c20d61a/
changeset:   7de75c20d61a
user:        alllee
date:        2012-03-26 21:29:37
summary:     switching default chat duration back to 60, adding quiz.enabled before second practice round.
affected #:  6 files

diff -r 1efd068282e91649936e0a054962571ca9b45747 -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java
--- a/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java
+++ b/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java
@@ -126,7 +126,7 @@
     }
 
     public boolean isQuizEnabled() {
-        return getBooleanProperty("quiz");
+        return getBooleanProperty("quiz.enabled");
     }
 
     public String getQuizPage() {


diff -r 1efd068282e91649936e0a054962571ca9b45747 -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java
--- a/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java
+++ b/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java
@@ -186,7 +186,7 @@
     }
     
     public int getChatDuration() {
-        return getIntProperty("chat-duration", 5);
+        return getIntProperty("chat-duration", 60);
     }
 
     public String getGameScreenshotInstructions() {


diff -r 1efd068282e91649936e0a054962571ca9b45747 -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 src/main/resources/configuration/asu/2011/t1/round1.xml
--- a/src/main/resources/configuration/asu/2011/t1/round1.xml
+++ b/src/main/resources/configuration/asu/2011/t1/round1.xml
@@ -4,6 +4,7 @@
 <comment>Irrigation experiment round configuration</comment><entry key="practice-round">true</entry><entry key='field-of-vision'>1</entry>
+<entry key='quiz.enabled'>true</entry><entry key="instructions"><![CDATA[


diff -r 1efd068282e91649936e0a054962571ca9b45747 -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 src/main/resources/configuration/asu/2011/t2/round1.xml
--- a/src/main/resources/configuration/asu/2011/t2/round1.xml
+++ b/src/main/resources/configuration/asu/2011/t2/round1.xml
@@ -4,6 +4,7 @@
 <comment>Irrigation experiment round configuration</comment><entry key="practice-round">true</entry><entry key='field-of-vision'>1</entry>
+<entry key='quiz.enabled'>true</entry><entry key="instructions"><![CDATA[


diff -r 1efd068282e91649936e0a054962571ca9b45747 -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 src/main/resources/configuration/asu/2011/t3/round1.xml
--- a/src/main/resources/configuration/asu/2011/t3/round1.xml
+++ b/src/main/resources/configuration/asu/2011/t3/round1.xml
@@ -4,6 +4,7 @@
 <comment>Irrigation experiment round configuration</comment><entry key="practice-round">true</entry><entry key='field-of-vision'>1</entry>
+<entry key='quiz.enabled'>true</entry><entry key="instructions"><![CDATA[


diff -r 1efd068282e91649936e0a054962571ca9b45747 -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 src/main/resources/configuration/asu/2011/t4/round1.xml
--- a/src/main/resources/configuration/asu/2011/t4/round1.xml
+++ b/src/main/resources/configuration/asu/2011/t4/round1.xml
@@ -4,6 +4,7 @@
 <comment>Irrigation experiment round configuration</comment><entry key="practice-round">true</entry><entry key='field-of-vision'>1</entry>
+<entry key='quiz.enabled'>true</entry><entry key="instructions"><![CDATA[

Repository URL: https://bitbucket.org/virtualcommons/irrigation/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.