Menu
▾
▴
saim-svn — SAIM SVN commits
You can subscribe to this list here.
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(26) |
Oct
(69) |
Nov
(21) |
Dec
(69) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2011 |
Jan
(34) |
Feb
(11) |
Mar
(4) |
Apr
(31) |
May
(26) |
Jun
(12) |
Jul
(21) |
Aug
(12) |
Sep
(24) |
Oct
(14) |
Nov
(1) |
Dec
(7) |
| 2012 |
Jan
(13) |
Feb
(13) |
Mar
(6) |
Apr
(8) |
May
(15) |
Jun
(39) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: <q1N...@us...> - 2012-09-20 00:40:36
|
Revision: 480
http://saim.svn.sourceforge.net/saim/?rev=480&view=rev
Author: q1Nguyen
Date: 2012-09-20 00:40:27 +0000 (Thu, 20 Sep 2012)
Log Message:
-----------
- change template and task system
- change database schema for instances
- http requests:
*getUserdata
*getHighscore
*getLinksets
*getLink
*getUserstrength
*commitVerification
*postScore
*postLevelStats
Modified Paths:
--------------
trunk/saim-game/pom.xml
trunk/saim-game/src/main/java/net/saim/game/client/Application.java
trunk/saim-game/src/main/java/net/saim/game/client/Service.java
trunk/saim-game/src/main/java/net/saim/game/client/panels/AdminPanel.java
trunk/saim-game/src/main/java/net/saim/game/client/panels/TaskTable.java
trunk/saim-game/src/main/java/net/saim/game/client/verify/BothMapsPanel.java
trunk/saim-game/src/main/java/net/saim/game/client/verify/InstancePanel.java
trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java
trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java
trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyPanel.java
trunk/saim-game/src/main/java/net/saim/game/server/DBTool.java
trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java
trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
trunk/saim-game/src/main/java/net/saim/game/server/TemplateUploadServlet.java
trunk/saim-game/src/main/java/net/saim/game/server/XMLTool.java
trunk/saim-game/src/main/java/net/saim/game/shared/Linkset.java
trunk/saim-game/src/main/java/net/saim/game/shared/PropertyConstants.java
trunk/saim-game/src/main/java/net/saim/game/shared/Task.java
trunk/saim-game/src/main/java/net/saim/game/shared/rdfInstance.java
trunk/saim-game/src/main/resources/net/saim/game/resources/linkFiles/task.tk
trunk/saim-game/src/main/webapp/WEB-INF/web.xml
Added Paths:
-----------
trunk/saim-game/src/main/java/net/saim/game/server/RestServlet.java
trunk/saim-game/src/main/java/net/saim/game/shared/json/
trunk/saim-game/src/main/java/net/saim/game/shared/json/Instance.java
trunk/saim-game/src/main/java/net/saim/game/shared/json/Link.java
trunk/saim-game/src/main/java/net/saim/game/shared/json/Property.java
trunk/saim-game/src/main/java/net/saim/game/shared/json/Score.java
trunk/saim-game/src/main/java/net/saim/game/shared/json/Userdata.java
trunk/saim-game/src/main/java/net/saim/game/shared/templates/
trunk/saim-game/src/main/java/net/saim/game/shared/templates/TemplateInstance.java
trunk/saim-game/src/main/java/net/saim/game/shared/templates/TemplateLinkset.java
trunk/saim-game/src/main/java/net/saim/game/shared/templates/TemplateProperty.java
trunk/saim-game/src/main/resources/net/saim/game/resources/LinkTemplates.xml
Modified: trunk/saim-game/pom.xml
===================================================================
--- trunk/saim-game/pom.xml 2012-06-22 05:35:03 UTC (rev 479)
+++ trunk/saim-game/pom.xml 2012-09-20 00:40:27 UTC (rev 480)
@@ -150,6 +150,27 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.fusesource.restygwt</groupId>
+ <artifactId>restygwt</artifactId>
+ <version>1.2</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>2.0-m09</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20090211</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
Modified: trunk/saim-game/src/main/java/net/saim/game/client/Application.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-22 05:35:03 UTC (rev 479)
+++ trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-09-20 00:40:27 UTC (rev 480)
@@ -1,15 +1,7 @@
package net.saim.game.client;
-import com.google.gwt.query.client.GQuery;
-import com.google.gwt.query.client.Function;
-import com.google.gwt.query.client.Selector;
-import com.google.gwt.query.client.Selectors;
-import static com.google.gwt.query.client.GQuery.*;
-import static com.google.gwt.query.client.css.CSS.*;
-
import java.util.ArrayList;
-import org.jfree.ui.HorizontalAlignment;
import playn.core.PlayN;
import playn.html.HtmlAssetManager;
@@ -32,7 +24,6 @@
import net.saim.game.shared.Configuration;
import net.saim.game.shared.Balancing;
import net.saim.game.shared.FacebookFriends;
-import net.saim.game.shared.FacebookFriendsEntry;
import net.saim.game.shared.FacebookUser;
import net.saim.game.shared.GameConstants;
import net.saim.game.shared.GoogleUser;
@@ -45,9 +36,9 @@
import net.saim.game.shared.Verification;
import net.saim.game.shared.VerificationStatistics;
import net.saim.game.shared.rdfStatement;
+import net.saim.game.shared.templates.TemplateLinkset;
+
import com.google.gwt.core.client.GWT;
-import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.dom.client.Style.Position;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
@@ -64,7 +55,6 @@
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HasAlignment;
-import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HasVerticalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
@@ -72,11 +62,17 @@
import com.google.gwt.user.client.ui.PopupPanel;
import com.google.gwt.user.client.ui.PushButton;
import com.google.gwt.user.client.ui.RootPanel;
-import com.google.gwt.user.client.ui.TabLayoutPanel;
import com.google.gwt.user.client.ui.TabPanel;
import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
-
+import com.google.gwt.http.client.Request;
+import com.google.gwt.http.client.RequestBuilder;
+import com.google.gwt.http.client.RequestCallback;
+import com.google.gwt.http.client.RequestException;
+import com.google.gwt.http.client.Response;
+import com.google.gwt.http.client.URL;
+import com.google.gwt.json.client.JSONObject;
+import com.google.gwt.json.client.JSONParser;
+import com.google.gwt.json.client.JSONValue;
import com.google.gwt.jsonp.client.JsonpRequestBuilder;
import com.google.gwt.maps.client.LoadApi;
import com.google.gwt.maps.client.LoadApi.LoadLibrary;
@@ -121,6 +117,8 @@
private AsyncCallback<String[]> callbackGetScore;
private AsyncCallback<Template> callbackGetTemplateSubject;
private AsyncCallback<Template> callbackGetTemplateObject;
+ private AsyncCallback<TemplateLinkset> callbackGetTemplate;
+
private AsyncCallback<ArrayList<Linkset>> callbackGetLinkset;
private AsyncCallback<ArrayList<Task>> callbackGetTask;
private AsyncCallback<String> callbackCommitVerifications;
@@ -207,6 +205,8 @@
/** Template of object ontology **/
private Template objectTemplate;
+ private TemplateLinkset template;
+
//Task
private TaskPanel taskPanel;
@@ -398,12 +398,73 @@
kongregateLogin();
}});
-// landingPanel.add(asd);
+
+ Button asd2=new Button("kongregate");
+ asd2.addClickHandler(new ClickHandler(){
+
+ public void onClick(ClickEvent arg0) {
+ echo("rest test");
+ restTest();
+// Window.Location.replace("/Application/rest?service=getUserScore");
+
+ }});
+
+ // hurr test
+// landingPanel.add(asd2);
// landingPanel.add(butt);
}
+ private void restTest(){
+ String url = "/Application/rest?service=commitVerifications";
+ String data = "{ "+'"'+"verifiTest"+'"'+":"+'"'+"Test"+'"'+"}";
+ echo(data);
+
+ RequestBuilder builder = new RequestBuilder(RequestBuilder.POST, URL.encode(url));
+// builder.setHeader("Content-Type",
+// "application/x-www-form-urlencoded");
+// builder.setHeader("Access-Control-Allow-Origin", "*");
+ echo("REST: "+url);
+ try {
+ Request request = builder.sendRequest(data, new RequestCallback() {
+ public void onError(Request request, Throwable exception) {
+ // Couldn't connect to server (could be timeout, SOP violation, etc.)
+ echo("ERROR rest");
+ }
+
+ public void onResponseReceived(Request request, Response response) {
+ // TODO Auto-generated method stub
+ echo("SUCCESS rest");
+ Window.alert(response.getText());
+ }
+ });
+ } catch (RequestException e) {
+ // Couldn't connect to server
+ echo("ERROR!");
+ }
+// -------------------------------------------------------------------------------
+// try{
+// JsonpRequestBuilder builder = new JsonpRequestBuilder();
+// builder.requestObject(url, new AsyncCallback<JavaScriptObject>(){
+//
+// public void onSuccess(JavaScriptObject fbUser) {
+// //Window.alert("Retrieving identity -> success!");
+// echo("SUCCESS");
+// Window.alert(fbUser.toString());
+//
+// }
+//
+// public void onFailure(Throwable e) {
+// displayError("ERROR: Couldn't retrieve JSON -> "+e.getMessage());
+// }});
+// }catch (Exception e) {
+// displayError("ERROR: Couldn't retrieve JSON!");
+// }
+
+ }
+
+
private void kongregateLogin(){
echo("Client: Kongregate Request");
@@ -663,7 +724,7 @@
*/
private void initGUI() {
echo("Client: Init GUI");
- this.verifyComponent = new VerifyComponent(subjectTemplate,objectTemplate,config);
+ this.verifyComponent = new VerifyComponent(template,config);
// VerifyComponent Button handler
PushButton trueButton = verifyComponent.getTrueButton();
@@ -794,7 +855,7 @@
// updae linkMsg
linkMsg.setText("Link difficulty: "+Balancing.getStringLinkDifficulty(stmt.getDifficulty()));
// Update VerifyComponent
- updateTable(link,subjectTemplate,objectTemplate);
+ updateTable(link,template);
DeferredCommand.addCommand(new Command()
{
public void execute()
@@ -810,9 +871,11 @@
echo("subject label: "+link.getSubject().getLabel());
echo("subject latitude: "+link.getSubject().getLatitude());
echo("subject longitude: "+link.getSubject().getLongitude());
+ echo("subject option: "+link.getSubject().getOptional());
echo("object label: "+link.getObject().getLabel());
echo("object latitude: "+link.getObject().getLatitude());
echo("object longitude: "+link.getObject().getLongitude());
+ echo("object option: "+link.getSubject().getOptional());
echo("object instanceType: "+link.getObject().getInstanceType());
echo("predi: "+link.getPredicate());
echo("counter: "+link.getCounter());
@@ -1888,37 +1951,65 @@
final String objectName = linkset.getObject();
System.out.println("Names: "+subjectName+"-"+objectName);
- // Init Callbacks
- callbackGetTemplateSubject = new AsyncCallback<Template>() {
- public void onFailure(Throwable caught) {
- // TODO: Do something with errors.
- System.out.println("Client: Callback get Template-Subject error!");
- }
- public void onSuccess(Template stmt) {
- //deflatten
- System.out.println("Client: Callback get Template-Subject success: "+stmt.getName());
- subjectTemplate=stmt;
-
- service.templateRequest(objectName, callbackGetTemplateObject);
- }
- };
+// // Init Callbacks
+// callbackGetTemplateSubject = new AsyncCallback<Template>() {
+// public void onFailure(Throwable caught) {
+// // TODO: Do something with errors.
+// System.out.println("Client: Callback get Template-Subject error!");
+// }
+// public void onSuccess(Template stmt) {
+// //deflatten
+// System.out.println("Client: Callback get Template-Subject success: "+stmt.getName());
+// subjectTemplate=stmt;
+//
+// service.templateRequest(objectName, callbackGetTemplateObject);
+// }
+// };
+// // Receive highscore from server
+// callbackGetTemplateObject = new AsyncCallback<Template>() {
+// public void onFailure(Throwable caught) {
+// // TODO: Do something with errors.
+// verifyButton.setText("Error: "+caught.getMessage());
+// System.out.println("Client: Callback get Template-Object error!");
+// }
+// public void onSuccess(Template stmt) {
+// //deflatten
+// System.out.println("Client: Callback get Template-Object success: "+stmt.getName());
+// echo("Receiving Template:");
+// echo("name: "+stmt.getName());
+// echo("type: "+stmt.getType());
+// echo("%%%%%%%%%%%%");
+//
+// objectTemplate=stmt;
+//
+// // template set in instancePanel is still null -> set new template
+//
+// initGUI();
+// initCallback();
+// initHandler();
+// sendUser();
+//
+// }
+// };
+
// Receive highscore from server
- callbackGetTemplateObject = new AsyncCallback<Template>() {
+ callbackGetTemplate = new AsyncCallback<TemplateLinkset>() {
public void onFailure(Throwable caught) {
// TODO: Do something with errors.
verifyButton.setText("Error: "+caught.getMessage());
- System.out.println("Client: Callback get Template-Object error!");
+ System.out.println("Client: Callback get Template error!");
}
- public void onSuccess(Template stmt) {
+ public void onSuccess(TemplateLinkset stmt) {
//deflatten
- System.out.println("Client: Callback get Template-Object success: "+stmt.getName());
+ System.out.println("Client: Callback get Template success: "+stmt.getSubject().getOntology()+"-"+stmt.getObject().getOntology());
echo("Receiving Template:");
- echo("name: "+stmt.getName());
- echo("type: "+stmt.getType());
+ echo("predicate: "+stmt.getPredicate());
+ echo("subject type: "+stmt.getSubject().getType());
+ echo("subject prop size: "+stmt.getSubject().getProperties().size());
echo("%%%%%%%%%%%%");
-
- objectTemplate=stmt;
+ Window.alert("Client: Callback get Template success: "+stmt.getSubject().getOntology()+"-"+stmt.getObject().getOntology()+" Pred: "+stmt.getPredicate());
+ template=stmt;
// template set in instancePanel is still null -> set new template
@@ -1930,9 +2021,10 @@
}
};
+ // TODO hurr: template in templatelinkset umaendern uebrall -> especially updateTable
// subject template first, afterwards object template
- service.templateRequest(subjectName, callbackGetTemplateSubject);
+ service.templateRequest(subjectName+"-"+objectName, callbackGetTemplate);
}
/**
@@ -2049,8 +2141,8 @@
* Update VerifyComponent's tables
* @param stmt new rdfStatement to verify
*/
- private void updateTable(rdfStatement stmt, Template subjectTemplate, Template objectTemplate) {
- verifyComponent.updateStatement(stmt, subjectTemplate, objectTemplate);
+ private void updateTable(rdfStatement stmt, TemplateLinkset template) {
+ verifyComponent.updateStatement(stmt, template);
}
public void key1Pressed() {
Modified: trunk/saim-game/src/main/java/net/saim/game/client/Service.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/Service.java 2012-06-22 05:35:03 UTC (rev 479)
+++ trunk/saim-game/src/main/java/net/saim/game/client/Service.java 2012-09-20 00:40:27 UTC (rev 480)
@@ -9,6 +9,7 @@
import net.saim.game.shared.User;
import net.saim.game.shared.Verification;
import net.saim.game.shared.rdfStatement;
+import net.saim.game.shared.templates.TemplateLinkset;
import com.google.gwt.user.client.rpc.RemoteService;
import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
@@ -74,9 +75,9 @@
* Method used to send the template
* @return ArrayList of properties of ontology template
*
- * @gwt.typeArgs <java.lang.String, java.lang.String>
+ * @gwt.typeArgs <net.saim.game.shared.templates.TemplateLinkset>
*/
- public Template templateRequest(String name);
+ public TemplateLinkset templateRequest(String name);
/**
* Method used to get linkset
Modified: trunk/saim-game/src/main/java/net/saim/game/client/panels/AdminPanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/panels/AdminPanel.java 2012-06-22 05:35:03 UTC (rev 479)
+++ trunk/saim-game/src/main/java/net/saim/game/client/panels/AdminPanel.java 2012-09-20 00:40:27 UTC (rev 480)
@@ -41,7 +41,7 @@
+ "attempting to contact the server. Please check your network "
+ "connection and try again.";
-
+ public final static String LINKSET = "linksetElement";
public final static String NAME = "nameElement";
public final static String ENDPOINT = "endpointElement";
public final static String PROP0 = "prop0Element";
@@ -66,6 +66,8 @@
public final static String PREDICATE = "predicateElement";
public final static String DESCRIPTION = "descriptionElement";
+ private TextBox linksetBox;
+
private TextBox nameBox;
private String endpoint;
private TextBox endpointBox;
@@ -80,6 +82,12 @@
private String image;
private TextBox imageBox;
private ListBox typeBox;
+ private CheckBox cb0_1;
+ private CheckBox cb1_1;
+ private CheckBox cb2_1;
+ private CheckBox cb3_1;
+ private CheckBox cbImage_1;
+
// private TextBox longBox;
// private TextBox langBox;
@@ -92,11 +100,15 @@
private TextBox prop3Box2;
private TextBox imageBox2;
private ListBox typeBox2;
+ private CheckBox cb0_2;
+ private CheckBox cb1_2;
+ private CheckBox cb2_2;
+ private CheckBox cb3_2;
+ private CheckBox cbImage_2;
// private TextBox longBox2;
// private TextBox langBox2;
//
- private CheckBox checkBoxSubject;
- private CheckBox checkBoxObject;
+ private CheckBox checkBoxTemplate;
private Button addBtn;
private Button quitBtn;
@@ -118,23 +130,39 @@
form.setEncoding(FormPanel.ENCODING_MULTIPART);
form.setMethod(FormPanel.METHOD_POST);
+ // Linkset
+ HTML linksetHeadLabel = new HTML("<b><i>2.Linkset</i></b>");
+ HTML linksetDescrLabel = new HTML("ID of linkset");
+ linksetHeadLabel.addStyleName("AdminPanel_Label");
+ linksetDescrLabel.addStyleName("AdminPanel_Label");
+ linksetBox = new TextBox();
+ linksetBox.setStyleName("AdminPanel_Box");
+ DOM.setStyleAttribute(linksetBox.getElement(), "width", "310px");
+ linksetBox.setName(LINKSET);
+
+ VerticalPanel linksetPanel = new VerticalPanel();
+ linksetPanel.add(linksetHeadLabel);
+ linksetPanel.add(linksetDescrLabel);
+ linksetPanel.add(linksetBox);
+ DOM.setStyleAttribute(linksetPanel.getElement(), "marginLeft", "40px");
+
// Create a FileUpload widget.
- HTML uploadDescribtionLabel = new HTML("Upload rdf or n-triple file");
+ HTML uploadDescribtionLabel = new HTML("Upload rdf file");
// uploadDescribtionLabel.addStyleName("AdminPanel_Spacing");
VerticalPanel uploadPanel = new VerticalPanel();
uploadPanel.setStyleName("adminPanel_upload");
upload = new FileUpload();
upload.setName(FILE);
- uploadPanel.add(new HTML("<b><i>1.Linkresource-File</i></b>"));
+ uploadPanel.add(new HTML("<b><i>1.Resource File</i></b>"));
uploadPanel.add(uploadDescribtionLabel);
uploadPanel.add(upload);
// uploadPanel.addStyleName("adminPanel_margin");
- DOM.setStyleAttribute(uploadPanel.getElement(), "marginLeft", "70px");
+ DOM.setStyleAttribute(uploadPanel.getElement(), "marginLeft", "110px");
// Create a panel to hold all of the form widgets.
- checkBoxSubject = new CheckBox("Select if first ontology (subject) exists in veri-links' template file");
- checkBoxSubject.addClickHandler(new ClickHandler(){
+ checkBoxTemplate = new CheckBox("Template already exists");
+ checkBoxTemplate.addClickHandler(new ClickHandler(){
public void onClick(ClickEvent event) {
boolean check = ((CheckBox)event.getSource()).isChecked();
@@ -154,28 +182,6 @@
imageBox.setEnabled(bool);
typeBox.setEnabled(bool);
- // both selected
-// if(!check || !checkBoxObject.isChecked())
-// bool=true;
-// else
-// bool=false;
-// difficultyBox.setEnabled(bool);
- }
-
- });
- checkBoxObject = new CheckBox("Select if second ontology (ontology) exists in veri-links' template file");
- checkBoxObject.addClickHandler(new ClickHandler(){
-
- public void onClick(ClickEvent event) {
- boolean check = ((CheckBox)event.getSource()).isChecked();
- boolean bool = false;
- if (check) {
- bool=false;
- }
- else {
- bool =true;
- }
- //nameBox2.setEnabled(bool);
endpointBox2.setEnabled(bool);
prop0Box2.setEnabled(bool);
prop1Box2.setEnabled(bool);
@@ -184,30 +190,12 @@
imageBox2.setEnabled(bool);
typeBox2.setEnabled(bool);
- // both selected
-// if(!check || !checkBoxSubject.isChecked())
+ // both selected
+// if(!check || !checkBoxObject.isChecked())
// bool=true;
// else
// bool=false;
// difficultyBox.setEnabled(bool);
-
-// if (bool){
-// endpointBox.setStyleName("AdminPanel_Box-disable");
-// prop0Box.setStyleName("AdminPanel_Box-disable");
-// prop1Box.setStyleName("AdminPanel_Box-disable");
-// prop2Box.setStyleName("AdminPanel_Box-disable");
-// prop3Box.setStyleName("AdminPanel_Box-disable");
-// imageBox.setStyleName("AdminPanel_Box-disable");
-// }
-// if (bool){
-// endpointBox.setStyleName("AdminPanel_Box");
-// prop0Box.setStyleName("AdminPanel_Box");
-// prop1Box.setStyleName("AdminPanel_Box");
-// prop2Box.setStyleName("AdminPanel_Box");
-// prop3Box.setStyleName("AdminPanel_Box");
-// imageBox.setStyleName("AdminPanel_Box");
-// }
-
}
});
@@ -216,8 +204,8 @@
showTemplateBtn.addStyleName("myButton");
DOM.setStyleAttribute(showTemplateBtn.getElement(), "marginLeft", "20px");
VerticalPanel vCheckBoxPanel = new VerticalPanel();
- vCheckBoxPanel.add(checkBoxSubject);
- vCheckBoxPanel.add(checkBoxObject);
+ vCheckBoxPanel.add(checkBoxTemplate);
+// vCheckBoxPanel.add(checkBoxObject);
HorizontalPanel checkBoxPanel = new HorizontalPanel();
checkBoxPanel.add(vCheckBoxPanel);
@@ -228,6 +216,7 @@
HorizontalPanel upperPanel = new HorizontalPanel();
upperPanel.add(checkBoxPanel);
upperPanel.add(uploadPanel);
+ upperPanel.add(linksetPanel);
VerticalPanel panelLeft = initLeftGUI();
VerticalPanel panelRight = initRightGUI();
@@ -241,7 +230,7 @@
horizontal.add(panelMiddle);
horizontal.add(panelRight);
- HTML descriptionLabel = new HTML("Add new links (and associated ontology-template) to veri-links:");
+ HTML descriptionLabel = new HTML("Add new linkset to Veri-Links:");
descriptionLabel.addStyleName("adminPanel_headerText");
@@ -347,23 +336,54 @@
"<span>A 'mapType' instance will be displayed as a map.<br>A 'normalType' instance will be displayed as plain text.</span></a>");
typeLabel.addStyleName("AdminPanel_Label");
-
+ // CB
+ cb0_1 = new CheckBox();
+ cb1_1 = new CheckBox();
+ cb2_1 = new CheckBox();
+ cb3_1 = new CheckBox();
+ cbImage_1 = new CheckBox();
+
+ HorizontalPanel p0_1 = new HorizontalPanel();
+ HorizontalPanel p1_1 = new HorizontalPanel();
+ HorizontalPanel p2_1 = new HorizontalPanel();
+ HorizontalPanel p3_1 = new HorizontalPanel();
+ HorizontalPanel pImage_1 = new HorizontalPanel();
+
+ p0_1.add(prop0Box);
+ p0_1.add(cb0_1);
+ p1_1.add(prop1Box);
+ p1_1.add(cb1_1);
+ p2_1.add(prop2Box);
+ p2_1.add(cb2_1);
+ p3_1.add(prop3Box);
+ p3_1.add(cb3_1);
+ pImage_1.add(imageBox);
+ pImage_1.add(cbImage_1);
+
+
//panel.add(space);
- panel.add(new HTML("<strong><i>2.Subject</i></strong>"));
+ panel.add(new HTML("<strong><i>4.Subject</i></strong>"));
panel.add(nameLabel);
panel.add(nameBox);
panel.add(endpointLabel);
panel.add(endpointBox);
panel.add(prop0Label);
- panel.add(prop0Box);
- panel.add(prop1Label);
- panel.add(prop1Box);
- panel.add(prop2Label);
- panel.add(prop2Box);
- panel.add(prop3Label);
- panel.add(prop3Box);
- panel.add(imageLabel);
- panel.add(imageBox);
+ panel.add(p0_1);
+
+ HorizontalPanel h_1 = new HorizontalPanel();
+ h_1.add(new Button("Add Property"));
+ h_1.add(new Button("Remove Property"));
+
+ panel.add(h_1);
+
+// panel.add(prop1Label);
+// panel.add(p1_1);
+// panel.add(prop2Label);
+// panel.add(p2_1);
+// panel.add(prop3Label);
+// panel.add(p3_1);
+// panel.add(imageLabel);
+// panel.add(pImage_1);
panel.add(typeLabel);
panel.add(typeBox);
//panel.add(boxPanel);
@@ -426,23 +446,53 @@
typeLabel.addStyleName("AdminPanel_Label");
+ cb0_2 = new CheckBox();
+ cb1_2 = new CheckBox();
+ cb2_2 = new CheckBox();
+ cb3_2 = new CheckBox();
+ cbImage_2 = new CheckBox();
+
+ HorizontalPanel p0_2 = new HorizontalPanel();
+ HorizontalPanel p1_2 = new HorizontalPanel();
+ HorizontalPanel p2_2 = new HorizontalPanel();
+ HorizontalPanel p3_2 = new HorizontalPanel();
+ HorizontalPanel pImage_2 = new HorizontalPanel();
+
+ p0_2.add(prop0Box2);
+ p0_2.add(cb0_2);
+ p1_2.add(prop1Box2);
+ p1_2.add(cb1_2);
+ p2_2.add(prop2Box2);
+ p2_2.add(cb2_2);
+ p3_2.add(prop3Box2);
+ p3_2.add(cb3_2);
+ pImage_2.add(imageBox2);
+ pImage_2.add(cbImage_2);
+
+
VerticalPanel panel = new VerticalPanel();
- panel.add(new HTML("<strong><i>4.Object</i></strong>"));
+ panel.add(new HTML("<strong><i>5.Object</i></strong>"));
panel.add(nameLabel);
panel.add(nameBox2);
panel.add(endpointLabel);
panel.add(endpointBox2);
panel.add(prop0Label);
- panel.add(prop0Box2);
- panel.add(prop1Label);
- panel.add(prop1Box2);
- panel.add(prop2Label);
- panel.add(prop2Box2);
- panel.add(prop3Label);
- panel.add(prop3Box2);
- panel.add(imageLabel);
- panel.add(imageBox2);
+ panel.add(p0_2);
+
+ HorizontalPanel h_2 = new HorizontalPanel();
+ h_2.add(new Button("Add Property"));
+ h_2.add(new Button("Remove Property"));
+
+ panel.add(h_2);
+// panel.add(prop1Label);
+// panel.add(p1_2);
+// panel.add(prop2Label);
+// panel.add(p2_2);
+// panel.add(prop3Label);
+// panel.add(p3_2);
+// panel.add(imageLabel);
+// panel.add(pImage_2);
panel.add(typeLabel);
panel.add(typeBox2);
// panel.add(uploadPanel);
@@ -467,7 +517,7 @@
fillDifficultyBox(difficultyBox);
HTML difficultyLabel = new HTML("Choose game difficulty for this linkset");
difficultyLabel.addStyleName("adminPanel_label");
- difficultyPanel.add(new HTML("<b><i>6.Difficulty</i></b>"));
+ difficultyPanel.add(new HTML("<b><i>7.Difficulty</i></b>"));
difficultyPanel.add(difficultyLabel);
difficultyPanel.add(difficultyBox);
// difficultyPanel.addStyleName("adminPanel_margin");
@@ -488,7 +538,7 @@
this.descriptionBox.setWidth("250px");
this.descriptionBox.setHeight("100px");
VerticalPanel descPanel = new VerticalPanel();
- descPanel.add(new HTML("<b><i>5.Description</i></b>"));
+ descPanel.add(new HTML("<b><i>6.Description</i></b>"));
descPanel.add(new HTML("Short comment on the linkset"));
descPanel.add(descriptionBox);
DOM.setStyleAttribute(descPanel.getElement(), "margin", "20px 0px");
@@ -542,7 +592,7 @@
status =false;
errorMsg+="\nName";
}
- if(!checkBoxSubject.getValue()) {
+ if(!checkBoxTemplate.getValue()) {
if(endpointBox.getText().isEmpty()) {
status =false;
errorMsg+="\nEndpoint";
@@ -560,13 +610,6 @@
status =false;
errorMsg+="\nType[1]";
}
- }
- if(nameBox2.getText().isEmpty()) {
- status =false;
- errorMsg+="\nName[2]";
- }
- if (!checkBoxObject.getValue()) {
-
if(endpointBox2.getText().isEmpty()) {
status =false;
errorMsg+="\nEndpoint[2]";
@@ -579,17 +622,21 @@
status =false;
errorMsg+="\nProperty1[2]";
}
- int selected = typeBox2.getSelectedIndex();
+ selected = typeBox2.getSelectedIndex();
if(typeBox2.getItemText(selected).isEmpty()) {
status =false;
errorMsg+="\nType[2]";
}
}
+ if(nameBox2.getText().isEmpty()) {
+ status =false;
+ errorMsg+="\nName[2]";
+ }
if(!( upload.getFilename().endsWith(".xml") || upload.getFilename().endsWith(".nt")) ) {
status=false;
errorMsg+="\n\nInvalid file format. ";
- //System.out.println("name: "+upload.getFilename());
+ System.out.println("name: "+upload.getFilename());
}
return status;
}
Modified: trunk/saim-game/src/main/java/net/saim/game/client/panels/TaskTable.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/panels/TaskTable.java 2012-06-22 05:35:03 UTC (rev 479)
+++ trunk/saim-game/src/main/java/net/saim/game/client/panels/TaskTable.java 2012-09-20 00:40:27 UTC (rev 480)
@@ -32,7 +32,9 @@
difficulty.setStyleName("taskTableColumn");
TaskTableColumn file = new TaskTableColumn("File");
file.setStyleName("taskTableColumn");
-
+ TaskTableColumn linkset = new TaskTableColumn("Linkset");
+ linkset.setStyleName("taskTableColumn");
+
for(int i=0;i<tasks.size();i++){
subject.addValue(new HTML(tasks.get(i).getSubject()));
object.addValue(new HTML(tasks.get(i).getObject()));
@@ -40,6 +42,7 @@
description.addValue(new HTML(tasks.get(i).getDescription()));
difficulty.addValue(new HTML(tasks.get(i).getDifficulty()));
file.addValue(new HTML(tasks.get(i).getFile()));
+ linkset.addValue(new HTML(tasks.get(i).getLinkset()));
}
add(subject);
add(object);
@@ -47,5 +50,6 @@
add(description);
add(difficulty);
add(file);
+ add(linkset);
}
}
Modified: trunk/saim-game/src/main/java/net/saim/game/client/verify/BothMapsPanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/verify/BothMapsPanel.java 2012-06-22 05:35:03 UTC (rev 479)
+++ trunk/saim-game/src/main/java/net/saim/game/client/verify/BothMapsPanel.java 2012-09-20 00:40:27 UTC (rev 480)
@@ -4,6 +4,8 @@
import net.saim.game.shared.Template;
import net.saim.game.shared.rdfInstance;
import net.saim.game.shared.rdfStatement;
+import net.saim.game.shared.templates.TemplateInstance;
+import net.saim.game.shared.templates.TemplateLinkset;
import com.google.gwt.ajaxloader.client.ArrayHelper;
import com.google.gwt.core.client.JsArray;
@@ -80,8 +82,8 @@
public final int top = 438;
public final int left = 38;
- public BothMapsPanel(Template subjectTemplate, Template objectTemplate, Configuration config) {
- super(subjectTemplate, objectTemplate, config);
+ public BothMapsPanel(TemplateLinkset template, Configuration config) {
+ super(template, config);
this.lat = 0;
this.longi = 0;
@@ -359,7 +361,7 @@
}
- private HTML parseInstance(Template template,
+ private HTML parseInstance(TemplateInstance template,
rdfInstance instance) {
String uri=null;
String label=null;
@@ -369,21 +371,21 @@
if(config.getKnowledgeMode().equals(Configuration.KNOWLEDGE_EXPERT)){
uri = new String("<b>URI</b> >> <a href="+instance.getUri()+" target="+'"'+"_blank"+'"'+">"+instance.getUri()+"</a>");
- label = new String("<i><b>"+template.getProp0()+"</b></i>"+
+ label = new String("<i><b>"+template.getProperties().get(1).getProperty()+"</b></i>"+
" >> "+instance.getLabel());
- type = new String("<i><b>"+template.getProp1()+"</b></i>" +
+ type = new String("<i><b>"+template.getProperties().get(2).getProperty()+"</b></i>" +
" >> "+instance.getType());
if (instance.getOptional().length() >0)
- specific = new String("<i><b>"+template.getProp2()+">> </b></i>"+instance.getOptional());
+ specific = new String("<i><b>"+template.getProperties().get(3).getProperty()+">> </b></i>"+instance.getOptional());
else
- specific = new String("<i><b>"+template.getProp2()+">> </b></i>"+"no value");
+ specific = new String("<i><b>"+template.getProperties().get(3).getProperty()+">> </b></i>"+"no value");
parsed=new HTML(uri+"<br>"+label+"<br>"+type+"<br>"+specific);
}else{
uri = new String("<b>Label:</b> <a href="+instance.getUri()+" target="+'"'+"_blank"+'"'+">"+instance.getLabel()+"</a>");
type = new String("<i><b>Type:</b></i> "+instance.getType());
if(!instance.getOptional().isEmpty()){
- specific = new String("<i><b>"+template.getProp2()+": </b></i>"+instance.getOptional());
+ specific = new String("<i><b>"+template.getProperties().get(3).getProperty()+": </b></i>"+instance.getOptional());
parsed=new HTML(uri+"<br>"+type+"<br>"+specific);
}
else
@@ -398,24 +400,24 @@
sUri = new HTML("<b>URI</b> >> <a href=" + subjectInstance.getUri()
+ " target=" + '"' + "_blank" + '"' + ">" + subjectInstance.getUri()
+ "</a>");
- sLabel = new HTML("<i><b>" + subjectTemplate.getProp0() + "</b></i>"
+ sLabel = new HTML("<i><b>" + subjectTemplate.getProperties().get(1).getProperty() + "</b></i>"
+ " >> " + subjectInstance.getLabel());
oUri = new HTML("<b>URI</b> >> <a href=" + objectInstance.getUri()
+ " target=" + '"' + "_blank" + '"' + ">" + objectInstance.getUri()
+ "</a>");
- oLabel = new HTML("<i><b>" + objectTemplate.getProp0() + "</b></i>"
+ oLabel = new HTML("<i><b>" + objectTemplate.getProperties().get(1).getProperty() + "</b></i>"
+ " >> " + objectInstance.getLabel());
}
else{
sUri = new HTML("<b>Label:</b> <a href=" + subjectInstance.getUri()
+ " target=" + '"' + "_blank" + '"' + ">" + subjectInstance.getLabel()
+ "</a>");
- sLabel = new HTML("<i><b>" + subjectTemplate.getProp0() + "</b></i>"
+ sLabel = new HTML("<i><b>" + subjectTemplate.getProperties().get(1).getProperty() + "</b></i>"
+ " >> " + subjectInstance.getLabel());
oUri = new HTML("<b>Label:</b> <a href=" + objectInstance.getUri()
+ " target=" + '"' + "_blank" + '"' + ">" + objectInstance.getLabel()
+ "</a>");
- oLabel = new HTML("<i><b>" + objectTemplate.getProp0() + "</b></i>"
+ oLabel = new HTML("<i><b>" + objectTemplate.getProperties().get(1).getProperty() + "</b></i>"
+ " >> " + objectInstance.getLabel());
}
Modified: trunk/saim-game/src/main/java/net/saim/game/client/verify/InstancePanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/verify/InstancePanel.java 2012-06-22 05:35:03 UTC (rev 479)
+++ trunk/saim-game/src/main/java/net/saim/game/client/verify/InstancePanel.java 2012-09-20 00:40:27 UTC (rev 480)
@@ -3,6 +3,7 @@
import net.saim.game.shared.Configuration;
import net.saim.game.shared.PropertyConstants;
import net.saim.game.shared.Template;
+import net.saim.game.shared.templates.TemplateInstance;
import com.google.gwt.maps.client.MapOptions;
import com.google.gwt.maps.client.MapTypeId;
@@ -20,17 +21,10 @@
import com.google.gwt.maps.client.overlays.Marker;
import com.google.gwt.maps.client.overlays.MarkerOptions;
import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.ui.DecoratorPanel;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.HTMLPanel;
-import com.google.gwt.user.client.ui.HasAlignment;
-import com.google.gwt.user.client.ui.HasHorizontalAlignment;
-import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.RootPanel;
-import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.ui.VerticalPanel;
public class InstancePanel extends FlowPanel{
@@ -47,7 +41,7 @@
private String image;
private VerticalPanel imagePanel;
private boolean subject;
- private Template template;
+ private TemplateInstance template;
private double latitude;
private double longitude;
private VerticalPanel mapInfoPanel;
@@ -63,13 +57,13 @@
* @param temp template
* @param subject if instance is subject then true, else false
*/
- public InstancePanel(Template temp, boolean subject, Configuration config) {
+ public InstancePanel(TemplateInstance temp, boolean subject, Configuration config) {
super();
this.template=temp;
this.config=config;
this.uri = new HTML("<b>URI</b>");
- this.label = new HTML("<b>"+temp.getProp0()+"</b>");
- this.type = new HTML("<b>"+temp.getProp1()+"</b>");
+ this.label = new HTML("<b>"+temp.getProperties().get(1).getProperty()+"</b>");
+ this.type = new HTML("<b>"+temp.getProperties().get(2).getProperty()+"</b>");
this.specificUri = "<b>Specific Uri</b>";
this.specific = "";
this.subject=subject;
@@ -127,7 +121,9 @@
final MapOptions options = MapOptions.newInstance();
// Zoom level. Required
- options.setZoom(Integer.parseInt(template.getZoom()));
+// options.setZoom(Integer.parseInt(template.getZoom())); // hurr
+ options.setZoom(2); // hurr
+
// Open a map centered on Cawker City, KS USA. Required
options.setCenter(CENTER);
// Map type. Required.
@@ -195,7 +191,7 @@
if (marker == null || mouseEvent == null) {
return;
}
- specificUri=parseUri(template.getProp2());
+ specificUri=parseUri(template.getProperties().get(3).getProperty());
// System.out.println("specificUri: "+template.getProp2());
// HTML html = new HTML(uri+"<br>"+label+"<br>"+type+"<br>"+"<b><i>"+specificUri+" >></b></i> "+specific+"<br><br>"+"<b><i>coordinates >> </i></b>" + mouseEvent.getLatLng().getToString()+"<br>" +
// "");
@@ -290,9 +286,9 @@
specificValuePanel.setStyleName("specificValuePanel");
FlowPanel specificPanel = new FlowPanel();
HTML specificHTML;
- String specificBuffer = parseUri(template.getProp2());
+ String specificBuffer = parseUri(template.getProperties().get(3).getProperty());
if(config.getKnowledgeMode().equals(Configuration.KNOWLEDGE_EXPERT))
- specificHTML = new HTML("<i><b>"+parseUri(template.getProp2())+"</b></i>");
+ specificHTML = new HTML("<i><b>"+parseUri(template.getProperties().get(3).getProperty())+"</b></i>");
else{
specificBuffer = specificBuffer.substring(specificBuffer.indexOf(':')+1);
echo("%%%%%%: 1:"+specificBuffer);
@@ -352,7 +348,7 @@
*/
public void setLabel(String label) {
if(config.getKnowledgeMode().equals(Configuration.KNOWLEDGE_EXPERT))
- this.label=new HTML("<i><b>"+parseUri(template.getProp0())+"</b></i>"+
+ this.label=new HTML("<i><b>"+parseUri(template.getProperties().get(1).getProperty())+"</b></i>"+
" >> "+label);
else
this.label=new HTML("<i><b>label:</i></b> "+label);
@@ -372,7 +368,7 @@
public void setType(String type) {
//this.type = new HTML(parsePropertyValue(type));
if(config.getKnowledgeMode().equals(Configuration.KNOWLEDGE_EXPERT))
- this.type=new HTML("<i><b>"+parseUri(template.getProp1())+"</b></i>" +
+ this.type=new HTML("<i><b>"+parseUri(template.getProperties().get(2).getProperty())+"</b></i>" +
" >> "+type);
else
this.type=new HTML("<i><b>Type:</i></b> "+type);
@@ -439,7 +435,7 @@
this.imagePanel.add(img);
}
- public void setTemplate(Template tmp) {
+ public void setTemplate(TemplateInstance tmp) {
this.template=tmp;
}
Modified: trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java 2012-06-22 05:35:03 UTC (rev 479)
+++ trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java 2012-09-20 00:40:27 UTC (rev 480)
@@ -6,6 +6,8 @@
import net.saim.game.shared.Template;
import net.saim.game.shared.rdfInstance;
import net.saim.game.shared.rdfStatement;
+import net.saim.game.shared.templates.TemplateInstance;
+import net.saim.game.shared.templates.TemplateLinkset;
import com.google.gwt.event.dom.client.ErrorEvent;
import com.google.gwt.event.dom.client.ErrorHandler;
@@ -61,9 +63,9 @@
private HTML linkDifficulty;
- public KongregatePanel(Template subjectTemplate, Template objectTemplate,
+ public KongregatePanel(TemplateLinkset template,
Configuration config) {
- super(subjectTemplate, objectTemplate, config);
+ super(template, config);
initGUI();
@@ -170,11 +172,11 @@
wholeQuestionPanel.add(qMark);
HTML head = new HTML("Quiz:");
- if(subjectTemplate.getName().equals("dbpedia") && objectTemplate.getName().equals("linkedgeodata"))
+ if(subjectTemplate.getOntology().equals("dbpedia") && objectTemplate.getOntology().equals("linkedgeodata"))
head.setHTML("Does this flag/image belong to this country?");
- if(subjectTemplate.getName().equals("dbpedia") && objectTemplate.getName().equals("factbook"))
+ if(subjectTemplate.getOntology().equals("dbpedia") && objectTemplate.getOntology().equals("factbook"))
head.setHTML("Is this language spoken in this country?");
- if(subjectTemplate.getName().equals("dbpedia") && objectTemplate.getName().equals("bbcwildlife"))
+ if(subjectTemplate.getOntology().equals("dbpedia") && objectTemplate.getOntology().equals("bbcwildlife"))
head.setHTML("Are these the same animals?");
head.setStyleName("kongregateHead");
DOM.setStyleAttribute(head.getElement(), "marginBottom", "8px");
@@ -331,6 +333,8 @@
}
private String parseImage(String image) {
+ if(image == null)
+ return image;
image = image.replaceAll("<", "");
image = image.replaceAll(">", "");
System.out.println("parseImage q: " + image);
@@ -393,13 +397,14 @@
return ("<b>" + parsed + "</b>");
}
- private void initializeMap(Template template, double latitude,
+ private void initializeMap(TemplateInstance template, double latitude,
double longitude) {
LatLng CENTER = LatLng.newInstance(latitude, longitude);
final MapOptions options = MapOptions.newInstance();
// Zoom level. Required
- options.setZoom(Integer.parseInt(template.getZoom()));
+// options.setZoom(Integer.parseInt(template.getZoom())); hurr
+ options.setZoom(6);
// Open a map centered on Cawker City, KS USA. Required
options.setCenter(CENTER);
// Map type. Required.
Modified: trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java 2012-06-22 05:35:03 UTC (rev 479)
+++ trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java 2012-09-20 00:40:27 UTC (rev 480)
@@ -1,9 +1,5 @@
package net.saim.game.client.verify;
-import java.util.ArrayList;
-
-import com.google.gwt.maps.client.LoadApi;
-import com.google.gwt.maps.client.LoadApi.LoadLibrary;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.HTML;
@@ -11,15 +7,16 @@
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.PushButton;
-import com.google.gwt.user.client.ui.RadioButton;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.VerticalPanel;
import net.saim.game.shared.Configuration;
import net.saim.game.shared.PropertyConstants;
-import net.saim.game.shared.Template;
+//import net.saim.game.shared.Template;
import net.saim.game.shared.rdfInstance;
import net.saim.game.shared.rdfStatement;
+import net.saim.game.shared.templates.TemplateInstance;
+import net.saim.game.shared.templates.TemplateLinkset;
public class VerifyComponent extends HorizontalPanel {
@@ -44,9 +41,10 @@
private VerticalPanel objectImagePanel;
private final String noImage = "Application/images/noImage.png";
- private Template subjectTemplate;
- private Template objectTemplate;
-
+ private TemplateInstance subjectTemplate;
+ private TemplateInstance objectTemplate;
+ private TemplateLinkset template;
+
private boolean isBothMapInstances = false;
private BothMapsPanel bothMapsPanel;
@@ -57,13 +55,14 @@
*
* @param model
*/
- public VerifyComponent(Template subjectTemplate, Template objectTemplate,
+ public VerifyComponent(TemplateLinkset template,
Configuration config) {
super();
- this.subjectTemplate = subjectTemplate;
- this.objectTemplate = objectTemplate;
+ this.template=template;
+ this.subjectTemplate = template.getSubject();
+ this.objectTemplate = template.getObject();
this.config = config;
init();
@@ -71,13 +70,12 @@
}
- public void updateStatement(rdfStatement link, Template tempSubject,
- Template tempObject) {
+ public void updateStatement(rdfStatement link, TemplateLinkset temp) {
System.out.println("\n##VerifyComponent: Update Table##");
- System.out.println("Using templates: Subject '" + tempSubject.getName()
- + "' Object '" + tempSubject.getProp0() + "'");
+ System.out.println("Using templates: "+temp.getSubject().getOntology()+
+ "-"+temp.getObject().getOntology() + "'");
rdfInstance instanceSubject = link.getSubject();
rdfInstance instanceObject = link.getObject();
@@ -103,7 +101,11 @@
System.out.println("Image Size: " + instanceSubject.getImage().length());
// TODO length of NO_DECLARATION ?
- if (instanceSubject.getImage().length() > 10
+ if(sParsedImage == null)
+ // No image available
+ subjectImagePanel.add(new HTML("<img class='image' src='" + noImage
+ + "' title='no image available' />"));
+ else if (instanceSubject.getImage().length() > 10
&& !sParsedImage.equals(PropertyConstants.NO_DECLARATION)) // Image
// available
{
@@ -121,7 +123,12 @@
objectImagePanel.clear();
String oParsedImage = parseImage(instanceObject.getImage());
// Image available
- if (oParsedImage.length() > 10
+ if(oParsedImage == null){
+ // No image available
+ objectImagePanel.add(new HTML("<img class='image' src='" + noImage
+ + "' title='no image available' />"));
+ }
+ else if (oParsedImage.length() > 10
&& !oParsedImage.equals(PropertyConstants.NO_DECLARATION)) {
buffer = "<a class='small' href='#nogo' title='small object image'>"
+ "<img src='" + oParsedImage + "' title='object image' />"
@@ -491,7 +498,7 @@
this.setSpacing(2);
// Kongregate Panel
- kongregate = new KongregatePanel(subjectTemplate, objectTemplate, config);
+ kongregate = new KongregatePanel(template, config);
// predicate (middlePanel)
initMiddlePanel();
@@ -507,7 +514,7 @@
*/
private void initBothMapInstances() {
echo("Init both maps");
- bothMapsPanel = new BothMapsPanel(subjectTemplate, objectTemplate, config);
+ bothMapsPanel = new BothMapsPanel(template, config);
initMiddlePanel();
@@ -600,6 +607,9 @@
* @return parsed String
*/
public String parseImage(String image) {
+ System.out.println("PARSE IMAGE: "+image);
+ if (image == null || image.length()<3)
+ return null;
if (image.equals(PropertyConstants.NO_DECLARATION))
return image;
String end = image.substring(1, image.length() - 1);
Modified: trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyPanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyPanel.java 2012-06-22 05:35:03 UTC (rev 479)
+++ trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyPanel.java 2012-09-20 00:40:27 UTC (rev 480)
@@ -4,6 +4,8 @@
import net.saim.game.shared.Template;
import net.saim.game.shared.rdfInstance;
import net.saim.game.shared.rdfStatement;
+import net.saim.game.shared.templates.TemplateInstance;
+import net.saim.game.shared.templates.TemplateLinkset;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.RootPanel;
@@ -11,8 +13,8 @@
public abstract class VerifyPanel extends VerticalPanel{
protected Configuration config;
- protected Template subjectTemplate;
- protected Template objectTemplate;
+ protected TemplateInstance subjectTemplate;
+ protected TemplateInstance objectTemplate;
protected rdfInstance subjectInstance;
protected rdfInstance objectInstance;
@@ -22,10 +24,10 @@
protected VerticalPanel sInfoPanel;
protected VerticalPanel oInfoPanel;
- public VerifyPanel(Template subjectTemplate, Template objectTemplate, Configuration config){
+ public VerifyPanel(TemplateLinkset template, Configuration config){
super();
- this.subjectTemplate = subjectTemplate;
- this.objectTemplate = objectTemplate;
+ this.subjectTemplate = template.getSubject();
+ this.objectTemplate = template.getObject();
this.config=config;
RootPanel.get("subject").add(this);
}
Modified: trunk/saim-game/src/main/java/net/saim/game/server/DBTool.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/server/DBTool.java 2012-06-22 05:35:03 UTC (rev 479)
+++ trunk/saim-game/src/main/java/net/saim/game/server/DBTool.java 2012-09-20 00:40:27 UTC (rev 480)
@@ -239,16 +239,10 @@
String createInstanceTable = "CREATE TABLE "+PropertyConstants.DB_TABLE_NAME_INSTANCES + " ( " +
PropertyConstants.DB_TABLE_INSTANCES_PROPERTY_URI + " VARCHAR(150), " +
- PropertyConstants.DB_TABLE_INSTANCES_PROPERTY_PROP0 + " VARCHAR(150), " +
- PropertyConstants.DB_TABLE_INSTANCES_PROPERTY_PROP1 + " VARCHAR(150), " +
- PropertyConstants.DB_TABLE_INSTANCES_PROPERTY_PROP2 + " TEXT, " +
- PropertyConstants.DB_TABLE_INSTANCES_PROPERTY_PROP3 + " VARCHAR(150), " +
- PropertyConstants.DB_TABLE_INSTANCES_PROPERTY_ONTOLOGY + " VARCHAR(50) , " +
- PropertyConstants.DB_TABLE_INSTANCES_PROPERTY_IMAGE +" VARCHAR(150), " +
- PropertyConstants.DB_TABLE_INSTANCES_PROPERTY_TYPE + " VARCHAR(150), "+
- PropertyConstants.DB_TABLE_INSTANCES_PROPERTY_LAT + " DOUBLE, "+
- PropertyConstants.DB_TABLE_INSTANCES_PROPERTY_LONG + " DOUBLE, "+
- "PRIMARY KEY("+PropertyConstants.DB_TABLE_INSTANCES_PROPERTY_URI+") );";
+ PropertyConstants.DB_TABLE_INSTANCES_PROPERTY_NAME + " VARCHAR(150), " +
+ PropertyConstants.DB_TABLE_INSTANCES_PROPERTY_VALUE + " VARCHAR(600), " +
+ "PRIMARY KEY("+PropertyConstants.DB_TABLE_INSTANCES_PROPERTY_URI+","+
+ PropertyConstants.DB_TABLE_INSTANCES_PROPERTY_NAME+") );";
String createHighscoreTable= "CREATE TABLE "+PropertyConstants.DB_TABLE_NAME_HIGHSCORES + " ( " +
PropertyConstants.DB_TABLE_HIGHSCORES_PLAYER + " VARCHAR(15), " +
@@ -316,14 +310,14 @@
"PRIMARY KEY("+PropertyConstants.DB_TABLE_TEMPLATES_PROPERTY_NAME+") );";
String createLinkedOntologiesTable= "CREATE TABLE "+PropertyConstants.DB_TABLE_NAME_LINKEDONTOLOGIES + " ( " +
+ PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_ID+ " VARCHAR(50), " +
PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_SUBJECT+ " VARCHAR(50), " +
PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_PREDICATE +" VARCHAR(100),"+
PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_OBJECT + " VARCHAR(50)," +
PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_DESCRIPTION + " VARCHAR(200)," +
PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_DIFFICULTY + " VARCHAR(20)," +
PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_READY + " TINYINT(1)," +
- "PRIMARY KEY ("+PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_SUBJECT +","+
- PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_OBJECT + ") );";
+ "PRIMARY KEY ("+PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_ID+") );";
Modified: trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java 2012-06-22 05:35:03 UTC (rev 479)
+++ trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java 2012-09-20 00:40:27 UTC (rev 480)
@@ -1,6 +1,5 @@
package net.saim.game.server;
-import java.awt.Image;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -10,27 +9,32 @@
import java.net.URL;
import java.sql.Connection;
import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
-import javax.imageio.ImageIO;
import javax.xml.parsers.ParserConfigurationException;
import org.xml.sax.SAXException;
-import jena.dbcreate;
-
import net.saim.game.shared.PropertyConstants;
import net.saim.game.shared.Task;
-import net.saim.game.shared.Template;
+import net.saim.game.shared.templates.TemplateInstance;
+import net.saim.game.shared.templates.TemplateLinkset;
+import net.saim.game.shared.templates.TemplateProperty;
+
+import com.hp.hpl.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.arp.JenaReader;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.NodeIterator;
-import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.Statement;
import com.hp.hpl.jena.rdf.model.StmtIterator;
+import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
import com.hp.hpl.jena.util.FileManager;
/**
@@ -56,7 +60,7 @@
private Task task;
- private String linkedOntologies;
+ private String linkset;
// Get name of templates
private String ontologyNameSubject;
@@ -73,22 +77,15 @@
private String object;
private double confidence;
- // Amount of properties that should be queued
- private final int numberOfProperties = PropertyConstants.LIMIT_NUMBER_OF_PROPERTIES;
- private final int limit = PropertyConstants.LIMIT_NUMBER_OF_TYPES;
+ private TemplateInstance subjectTemplate;
+ private TemplateInstance objectTemplate;
- // SPARQL queries for every property
- private String[] querySubject = new String[numberOfProperties];
- private String[] queryObject = new String[numberOfProperties];
+ private List<String> subjectSparql = new ArrayList<String>();
+ private List<String> objectSparql = new ArrayList<String>();
- // Are properties important?
- private String[] importantSubject = new String[numberOfProperties];
- private String[] importantObject = new String[numberOfProperties];
+ private List<String> subjectText = new ArrayList<String>();
+ private List<String> objectText = new ArrayList<String>();
- // Results of SPARQL queries
- private String[] textSubject = new String[numberOfProperties];
- private String[] textObject = new String[numberOfProperties];
-
// SQL query to add results into database
private String sqlQuerySubject;
private String sqlQueryObject;
@@ -105,9 +102,9 @@
private int linkSuccess = 0;
private int linkFailure = 0;
private int linkAdded = 0;
- private int linkConfidencePositive =0;
- private int linkConfidenceNegative =0;
-
+ private int linkConfidencePositive = 0;
+ private int linkConfidenceNegative = 0;
+
public RDFHandler(String fileName) {
this.fileName = fileName;
}
@@ -118,10 +115,8 @@
this.dbIniPath = dbIniPath;
this.templateFile = templateFile;
this.task = t;
- echo("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! " + templateFile);
-
}
-
+
/**
* Remove invalid characters and invalid/unnecessary sub-strings of String s
*
@@ -167,11 +162,11 @@
public String parseURL(String s) {
// alles ausserhalb anfuehrungsstriche rauswerfen
echo("parseURL");
- echo("raw: "+s);
+ echo("raw: " + s);
int beginIndex = s.indexOf('<');
int endIndex = s.indexOf('>');
String dummy = s.substring(beginIndex + 1, endIndex);
- echo("parsed: "+dummy);
+ echo("parsed: " + dummy);
return dummy;
}
@@ -208,71 +203,11 @@
}
// read the RDF/XML file
model.read(in, null);
-// model.write(System.out);
+ // model.write(System.out);
}
/**
- * SPARQL Query Method, returns a Single Result as String. If failure method
- * returns ""
- *
- * @param query
- * String of the SPARQL query
- * @param endPoint
- * String of the SPARQL endpoint
- * @return endString
- */
- public String sparqlQueryText(String query, String endPoint) {
- if (query.isEmpty())
- return "";
- String text = "";
- String endText = "";
- String parsedText = "";
- QueryExecution qExec = QueryExecutionFactory.sparqlService(endPoint, query);
-
- int limitCounter = 0;
- QuerySolution binding = null;
- // How many values of a property should be queried
- try {
- com.hp.hpl.jena.query.ResultSet rs = qExec.execSelect();
- // binding = rs.nextSolution();
- // text = binding.toString();
- // endText = parseRDF(text);
-
- while (rs.hasNext()) { // if query is successful
- if (limit <= limitCounter)
- break;
- binding = rs.nextSolution();
- text = binding.toString();
- // parse String
- parsedText = parseRDF(text);
- // parsedText = parseURL(parsedText);
- // echo("parsedText: "+parsedText);
- if (parsedText.contentEquals("owl:Thing")) {
- // echo("@@@@@@@@@@@@@@@@@@@@@@@ owl:Thing!");
- continue;
- } else if (endText.isEmpty())
- endText = parsedText;
- else
- endText = endText + PropertyConstants.SEPERATOR_PROPERTY_VALUE
- + parsedText;
- // echo("SPARQLquery Ergebnis "+limitCounter +": "
- // +parsedText);
- limitCounter++;
- }
- echo(endText);
-
- } catch (Exception e) {
- echo("Query Execution failure! " + e.getMessage());
- } finally {
- qExec.close();
- }
-
- return endText; // if not successful it returns ""
-
- }
-
- /**
* SPARQL Query Method with limit parameter, returns a Single Result as
* String. If failure method returns ""
*
@@ -284,9 +219,21 @@
* limit for amount of properties to be queried
* @return endString
*/
- public String sparqlQueryText(String query, String endPoint, int limit) {
+ public String sparqlQueryText(String uri, String query, String endPoint,
+ String queryLimit) {
if (query.isEmpty())
return "";
+ if (query.equals("verli:uri")) {
+ echo(uri);
+ return uri;
+ }
+ if (query.equals("verli:image"))
+ return query;
+
+ int limit = 3;
+ if (queryLimit != null)
+ limit = I...
[truncated message content] |
|
From: <q1N...@us...> - 2012-06-22 05:35:10
|
Revision: 479
http://saim.svn.sourceforge.net/saim/?rev=479&view=rev
Author: q1Nguyen
Date: 2012-06-22 05:35:03 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/Application.java
Modified: trunk/saim-game/src/main/java/net/saim/game/client/Application.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-22 05:30:46 UTC (rev 478)
+++ trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-22 05:35:03 UTC (rev 479)
@@ -1148,7 +1148,7 @@
HTML prizeHTML = new HTML("<h2>Coin Distributions</h2></p>" +
"<i>Reward for answering a question:</i></br><img src='Application/images/verification/true.png' />/<img src='Application/images/verification/false.png'/>: <font color='green'> + 40</font> Coins" +
"</br><img src='Application/images/verification/unsure.png'/>: <font color='green'> + 20</font> Coins</p>" +
- "<p><i>Bonus:</i></br>Disagreement = 0 Coins</br>Agreements = <font color='green'> + 10</font> to <font color='green'> + 1000</font> Coins (Depending on question difficulty)" +
+ "<p><i>Bonus:</i></br>Disagreement = 0 Coins</br>Agreement = <font color='green'> + 10</font> to <font color='green'> + 1000</font> Coins (Depending on question difficulty)" +
"</br>Penalty = <font color='red'> - 400 </font>Coins</p>");
prize.add(prizeHTML);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-22 05:30:53
|
Revision: 478
http://saim.svn.sourceforge.net/saim/?rev=478&view=rev
Author: q1Nguyen
Date: 2012-06-22 05:30:46 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/Application.java
trunk/saim-game/src/main/java/net/saim/game/client/panels/LandingPanel.java
trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java
trunk/saim-game/src/main/java/net/saim/game/client/verify/InstancePanel.java
trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java
trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java
Modified: trunk/saim-game/src/main/java/net/saim/game/client/Application.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-21 15:32:18 UTC (rev 477)
+++ trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-22 05:30:46 UTC (rev 478)
@@ -64,11 +64,16 @@
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HasAlignment;
+import com.google.gwt.user.client.ui.HasHorizontalAlignment;
+import com.google.gwt.user.client.ui.HasVerticalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.PopupPanel;
import com.google.gwt.user.client.ui.PushButton;
import com.google.gwt.user.client.ui.RootPanel;
+import com.google.gwt.user.client.ui.TabLayoutPanel;
+import com.google.gwt.user.client.ui.TabPanel;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
@@ -726,17 +731,16 @@
showTutorial();
}});
+
+
Button showOverview = new Button ("Quick Overview");
- showTut.addStyleName("myButton");
- showTut.addClickHandler(new ClickHandler(){
-
- public void onClick(ClickEvent event) {
- showOverview();
-
- }});
+ showOverview.addStyleName("myButton");
+ initOverview(showOverview);
+
HorizontalPanel bottom = new HorizontalPanel();
bottom.add(showTut);
+ bottom.add(showOverview);
bottom.setHorizontalAlignment(HasAlignment.ALIGN_RIGHT);
RootPanel.get("bottomButtons").add(bottom);
@@ -1098,44 +1102,86 @@
tutorialPanel.setGlassPanel(pop);
}
- private void showOverview(){
- // Pause game
- if(!game.world.isPaused())
- game.pause();
+ private void initOverview(Button pop){
+
+ VerticalPanel enemies = new VerticalPanel();
+ DOM.setStyleAttribute(enemies.getElement(), "padding", "20px");
+ HTML head = new HTML("<h2>Enemies</h2>");
+ HTML html = new HTML("" +
+ "<p><img src='Application/images/pea/enemy.png'/> Your everyday invader. Big, round and clumsy. He can roll around all day.</p>" +
+ "<p><img src='Application/images/pea/enemyShooter2.png'/> This guy is on a strict diet. He's become so light that he overcame gravity, don't let him crash into the village.</p>" +
+ "<p><img src='Application/images/pea/enemyCashier.png'/> Well known across the whole universe. The Cashier loves your coins, he will steal them on a regular basis. </p>" );
+ Image enemyNormal = new Image("Application/images/pea/enemy.png");
+ Image enemyPilot = new Image("Application/images/pea/enemyShooter2.png");
+ Image enemyCashier = new Image("Application/images/pea/enemyCashier.png");
+ HTML h1 = new HTML("Your everyday invader. Big, round and clumsy. His speciality is rolling.");
+ HTML h2 = new HTML("This guy has the ability to fly. But he's not really good at it. Sometimes he just runs out of gas in midair.");
+ HTML h3 = new HTML("The Cashier loves coins, especially your coins. He will steal them on a regular basis.");
- // Glass panel behind popUp
- glass = new PopupPanel(false);
- glass.setStyleName("rx-glass");
- DOM.setStyleAttribute(glass.getElement(), "width", "100%");
- DOM.setStyleAttribute(glass.getElement(), "height", "100%");
- DOM.setStyleAttribute(glass.getElement(),
- "backgroundColor", "#000");
- DOM.setStyleAttribute(glass.getElement(),
- "opacity", "0.30");
+ HorizontalPanel p1 = new HorizontalPanel();
+ p1.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
+ p1.add(enemyNormal);
+ p1.add(h1);
+ p1.setSpacing(5);
- final PopupPanel pop = new PopupPanel(false);
+ HorizontalPanel p2 = new HorizontalPanel();
+ p2.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
+ p2.add(enemyPilot);
+ p2.add(h2);
+ p2.setSpacing(5);
- TutorialPanel tutorialPanel = new TutorialPanel();
+ HorizontalPanel p3 = new HorizontalPanel();
+ p3.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
+ p3.add(enemyCashier);
+ p3.add(h3);
+ p3.setSpacing(5);
- // Change next text
- tutorialPanel.setNextText();
+ enemies.setSpacing(20);
+ enemies.add(head);
+ enemies.add(p1);
+ enemies.add(p2);
+ enemies.add(p3);
+// overview.add(enemyCashier);
- ClickHandler skipHandler = new ClickHandler(){
-
- public void onClick(ClickEvent arg0) {
- glass.hide();
- pop.hide();
- game.resume();
- }};
- tutorialPanel.setSkipClickHandler(skipHandler);
+ VerticalPanel prize = new VerticalPanel();
+ DOM.setStyleAttribute(prize.getElement(), "padding", "20px");
+ HTML prizeHTML = new HTML("<h2>Coin Distributions</h2></p>" +
+ "<i>Reward for answering a question:</i></br><img src='Application/images/verification/true.png' />/<img src='Application/images/verification/false.png'/>: <font color='green'> + 40</font> Coins" +
+ "</br><img src='Application/images/verification/unsure.png'/>: <font color='green'> + 20</font> Coins</p>" +
+ "<p><i>Bonus:</i></br>Disagreement = 0 Coins</br>Agreements = <font color='green'> + 10</font> to <font color='green'> + 1000</font> Coins (Depending on question difficulty)" +
+ "</br>Penalty = <font color='red'> - 400 </font>Coins</p>");
+ prize.add(prizeHTML);
- pop.add(tutorialPanel);
- glass.add(pop);
+ final TabPanel tab = new TabPanel();
+// tab.setAnimationDuration(1000);
+ tab.add(enemies, new HTML("Enemies"));
+ tab.add(prize, new HTML("Coins"));
+ tab.selectTab(0);
+ tab.setSize("600px","400px");
+ tab.getDeckPanel().setStyleName("no-border-style");
+ DOM.setStyleAttribute(tab.getElement(), "backgroundColor", "black");
+ DOM.setStyleAttribute(tab.getElement(), "color", "white");
+ DOM.setStyleAttribute(tab.getElement(), "fontWeight", "bolder");
+
+ final PopupPanel popUp = new PopupPanel(true);
+ popUp.setAnimationEnabled(true);
+ popUp.add(tab);
+ popUp.setAnimationEnabled(true);
+ pop.addClickHandler(new ClickHandler(){
+ public void onClick(ClickEvent event) {
+ showOverview(popUp);
+ }});
- glass.show();
- pop.center();
+ }
+
+ private void showOverview(PopupPanel pop){
+ // Pause game
+ if(!game.world.isPaused())
+ game.pause();
+
+ pop.center();
pop.setStyleName("noBorder");
- tutorialPanel.setGlassPanel(pop);
+ pop.show();
}
@@ -1784,25 +1830,6 @@
*/
public void firstQueryRequest() {
echo("Client: First Query Request");
-// String url = "http://127.0.0.1:8888/Application/service?first_query="+linkset;
-// try{
-// JsonpRequestBuilder builder = new JsonpRequestBuilder();
-// builder.requestObject(url, new AsyncCallback<JavaScriptObject>(){
-//
-//
-// public void onSuccess(JavaScriptObject fbUser) {
-// Window.alert("Success: "+fbUser.toString());
-//
-// }
-//
-// public void onFailure(Throwable e) {
-// displayError("ERROR: Couldn't retrieve JSON -> "+e.getMessage());
-// }});
-// }catch (Exception e) {
-// displayError("ERROR: Couldn't retrieve JSON!");
-// }
-
- //msgButton.setEnabled(false);
service.firstRequest(user,linkset.getName(),callbackGetLink);
this.disableInput = false;
@@ -1857,12 +1884,6 @@
*/
public void templateRequest() {
System.out.println("####Template Request###");
- //Template template = new Template();
- //XMLTool xml = new XMLTool();
- //xml.readTemplateFile("d://Templates.xml");
- //template = xml.getTemplate("dbpedia");
- //template.setName("booya");
-// int index = linkset.indexOf('-');
String subjectName = linkset.getSubject();
final String objectName = linkset.getObject();
System.out.println("Names: "+subjectName+"-"+objectName);
@@ -1871,14 +1892,11 @@
callbackGetTemplateSubject = new AsyncCallback<Template>() {
public void onFailure(Throwable caught) {
// TODO: Do something with errors.
- //verifyButton.setText("Client: Callback get Template-Subject error: "+caught.getMessage());
System.out.println("Client: Callback get Template-Subject error!");
}
public void onSuccess(Template stmt) {
//deflatten
System.out.println("Client: Callback get Template-Subject success: "+stmt.getName());
- //verifyButton.setText("Client: get Template Success: "+stmt.getName()+","+stmt.getEndpoint());
- //showHighscore(stmt);
subjectTemplate=stmt;
service.templateRequest(objectName, callbackGetTemplateObject);
@@ -1899,8 +1917,7 @@
echo("name: "+stmt.getName());
echo("type: "+stmt.getType());
echo("%%%%%%%%%%%%");
- //msgButton.setText("Client: get Template Success"+stmt.getName()+","+stmt.getEndpoint());
- //showHighscore(stmt);
+
objectTemplate=stmt;
// template set in instancePanel is still null -> set new template
@@ -1909,15 +1926,6 @@
initCallback();
initHandler();
sendUser();
-
-// DOM.setStyleAttribute(RootPanel.getBodyElement(), "borderLeft", "1px solid black");
-// DOM.setStyleAttribute(RootPanel.getBodyElement(), "borderRight", "1px solid black");
-
-// initGame();
-// initHighscore();
-// glass.hide();
-// menu.hide();
-// initTutorial();
}
};
@@ -1964,9 +1972,6 @@
}
public void onSuccess(ArrayList<Task> stmt) {
//deflatten
- //System.out.println("Task get: "+stmt.get(0).getSubject());
- //System.out.println("Task get: "+stmt.get(0).getObject());
- //System.out.println("Task get: "+stmt.get(0).getFile());
initTaskPanel(stmt);
glass.hide();
menu.hide();
@@ -2049,30 +2054,15 @@
}
public void key1Pressed() {
-// if(numKeyCache==1 && !verifyLock())
-// this.sendVerificationToServer();
-// else {
-// this.verifyComponent.setValidRadioButton(true);
-// setNumKeyCache(1);
-// }
if(!verifyLock()){
DOM.setStyleAttribute(this.verifyComponent.getTrueButton().getElement(),"border","2px solid black");
- this.verifyComponent.setValidRadioButton(true);
this.sendVerificationToServer(GameConstants.TRUE);
}
}
public void key2Pressed() {
-// if(numKeyCache==2 && !verifyLock())
-// this.sendVerificationToServer();
-// else {
-// this.verifyComponent.setNotValidRadioButton(true);
-// setNumKeyCache(2);
-// }
if(!verifyLock()){
DOM.setStyleAttribute(this.verifyComponent.getFalseButton().getElement(),"border","2px solid black");
-
-// this.verifyComponent.setNotValidRadioButton(true);
this.sendVerificationToServer(GameConstants.FALSE);
}
}
@@ -2320,16 +2310,13 @@
}
public void onSuccess(String str) {
- //Window.alert("Success: "+arg0);
echo("SendUser Success. Strength: "+str);
user.setStrength(str);
-// difficultyRequest();
setDifficulty(linkset.getDifficulty());
startOfGame=false;
initGame();
initStartTime();
initLeavePage();
-// initHighscore();
glass.hide();
menu.hide();
// Check if user tutorial should be skipped
@@ -2338,8 +2325,6 @@
else{
firstQueryRequest();
}
-
-
}};
service.sendUser(user, callbackSendUser);
}
@@ -2381,7 +2366,6 @@
final PopupPanel pop = new PopupPanel(false);
pop.setStyleName("statisticsPanel");
- //pop.setStyleName("application_statisticsPanel");
// Button
Button next = new Button("Continue");
next.addStyleName("myButton");
Modified: trunk/saim-game/src/main/java/net/saim/game/client/panels/LandingPanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/panels/LandingPanel.java 2012-06-21 15:32:18 UTC (rev 477)
+++ trunk/saim-game/src/main/java/net/saim/game/client/panels/LandingPanel.java 2012-06-22 05:30:46 UTC (rev 478)
@@ -63,10 +63,9 @@
HTML info = new HTML("<b>Veri-Links</b> belongs to the <i>Games With A Purpose</i> <a href='http://en.wikipedia.org/wiki/Human-based_computation_game' target='_blank'>(GWAP)</a> genre. " +
"Playing Veri-Links means turning this world in to a better place.. well.. kind of.. " +
"<br><br>While playing this game, you'll generate useful data as a byproduct - which will be used to improve the semantic web. " +
- "The data are collected when you <a href='#' class='infoBlack'><b>answer the quiz</b>" +
+ "The data is collected when you answer the questions in the <a href='#' class='infoBlack'><b>quiz</b>" +
"<span><b><i>Note:</i><br>You will verify links of the semantic web. Compare 2 instances of 2 different ontologies and decide whether their relation is valid or not.</b></span></a>. " +
- "You can also skip difficult questions, please answer them only if you're certain :)" );
-
+ "You can also skip difficult questions, so please answer them only if you're certain :)" );
HTML goal = new HTML("<b>Goal</b>");
goal.setStyleName("landingPanel_goalText");
DOM.setStyleAttribute(goal.getElement(), "marginTop", "10px");
Modified: trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java 2012-06-21 15:32:18 UTC (rev 477)
+++ trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java 2012-06-22 05:30:46 UTC (rev 478)
@@ -356,7 +356,7 @@
textHTML
.setHTML("Decide whether this statement is True <img src='Application/images/verification/true.png'/> or False <img src='Application/images/verification/false.png'/>. If you don't have a clue, choose Unsure <img src='Application/images/verification/unsure.png'/>." +
"</br></br>You earn coins for answering questions correctly, which you can use to buy new units. " +
- "</br>The more difficult the questions are, the higher your reward." +
+ "</br>The more difficult the questions are, the higher your reward. " +
"If you incorrectly answer a question, you get a penalty. " +
"</br>If the player community has no agreement on the answer of a question, " +
"you get only few coins as bonus for answering the questions (we do not know the correct answer - it is all up to the players). " +
Modified: trunk/saim-game/src/main/java/net/saim/game/client/verify/InstancePanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/verify/InstancePanel.java 2012-06-21 15:32:18 UTC (rev 477)
+++ trunk/saim-game/src/main/java/net/saim/game/client/verify/InstancePanel.java 2012-06-22 05:30:46 UTC (rev 478)
@@ -78,7 +78,7 @@
this.imagePanel=new VerticalPanel();
echo("label: "+label);
echo("rawLabel: "+rawLabel);
- echo("$$$ff$$$$$$$$$$$$$"+temp.getType()+"&&&&&");
+ echo("tempType: "+temp.getType());
if(temp.getType().equals(PropertyConstants.TEMPLATE_TYPE_MAP))
initMapGUI();
@@ -210,7 +210,6 @@
infoWindowHTML = new HTML(""+uri+type+"<b><i>"+specificUri+" >></b></i> "+specific+"<br>");
}
infoWindowHTML.setStyleName("infoWindowHTML");
-// DOM.setStyleAttribute(html.getElement(), "color", "red");
DOM.setStyleAttribute(infoWindowHTML.getElement(), "textAlign", "left");
InfoWindowOptions options = InfoWindowOptions.newInstance();
options.setContent(infoWindowHTML);
@@ -227,7 +226,7 @@
private String parseLabel(String newLabel) {
echo("\n\n\nnewLabel: "+newLabel);
echo("rawLabel: "+this.rawLabel);
- String end="booya";
+ String end="";
if(newLabel==null)
return "none";
if(newLabel.contains("<FONT style='BACKGROUND-COLOR: yellow'>")){
@@ -246,11 +245,6 @@
}
echo("endLabel: "+end);
- String test="<FONT style='BACKGROUND-COLOR: yellow'><FONT style='BACKGROUND-COLOR: yellow'><FONT style='BACKGROUND-COLOR: yellow'><FONT style='BACKGROUND-COLOR: yellow'><FONT style='BACKGROUND-COLOR: yellow'><FONT style='BACKGROUND-COLOR: yellow'><FONT style='BACKGROUND-COLOR: yellow'><FONT style='BACKGROUND-COLOR: yellow'><FONT style='BACKGROUND-COLOR: yellow'><FONT style='BACKGROUND-COLOR: yellow'>Republic of Chile</FONT></FONT></FONT></FONT></FONT></FONT></FONT></FONT></FONT></FONT>";
- echo("\n\n\n1.: "+test);
-
- test=test.replace("<FONT style='BACKGROUND-COLOR: yellow'>", "back");
- echo("2: "+test+"\n\n");
return end;
}
@@ -357,8 +351,6 @@
* @param label the label to set
*/
public void setLabel(String label) {
- //this.label = new HTML(parsePropertyValue(label));
- //this.label = new HTML(label);
if(config.getKnowledgeMode().equals(Configuration.KNOWLEDGE_EXPERT))
this.label=new HTML("<i><b>"+parseUri(template.getProp0())+"</b></i>"+
" >> "+label);
Modified: trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java 2012-06-21 15:32:18 UTC (rev 477)
+++ trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java 2012-06-22 05:30:46 UTC (rev 478)
@@ -29,15 +29,6 @@
private PushButton trueButton;
private PushButton falseButton;
private PushButton unsureButton;
-
- // RadioButtons
-// private RadioButton rdbtnValid;
-// private RadioButton rdbtnNotValid;
-// private RadioButton rdbtnNotSure;
-//
-// public static final int SIMILAR = 1;
-// public static final int NOT_SIMILAR = 0;
-// public static final int NOT_SURE = -1;
private static final CharSequence SEPERATOR = PropertyConstants.SEPERATOR_PROPERTY_VALUE;
@@ -103,33 +94,23 @@
predicateHTML.addStyleName("predicateHTML");
predicatePanel.clear();
predicatePanel.add(predicateHTML);
- // this.predicate.setText("<b>"+link.getPredicate()+"</b>");
// Image panel
// Subject image
subjectImagePanel.clear();
- // subjectImagePanel.add(new
- // HTML("<img class='image' src='http://upload.wikimedia.org/wikipedia/commons/thumb/7/73/Dallas_Downtown.jpg/298px-Dallas_Downtown.jpg' />"));
String buffer = null;
String sParsedImage = parseImage(instanceSubject.getImage());
System.out.println("Image Size: " + instanceSubject.getImage().length());
- // String bla = "_"+instanceSubject.getImage();
- // this.box.setText(parsedImage);//dummy
+
// TODO length of NO_DECLARATION ?
if (instanceSubject.getImage().length() > 10
&& !sParsedImage.equals(PropertyConstants.NO_DECLARATION)) // Image
// available
{
- /*
- * Image sImage = new Image(sParsedImage); //sImage.setVisible(true);
- * scaleImage(sImage); subjectPanel.addImage(sImage);
- */
buffer = "<a class='small' href='#nogo'>" + "<img src='" + sParsedImage
+ "' title='subject image' />" + "<img class='large' src='"
+ sParsedImage + "' /></a>";
subjectImagePanel.add(new HTML(buffer));
- // System.out.println("CMON: <img class='image' src='"+
- // sParsedImage+"'/>");
System.out.println("CMON: " + buffer);
} else
// No image available
@@ -329,7 +310,7 @@
* @return
*/
private rdfStatement highlight(rdfStatement link) {
- System.out.println("Client: highlight matches -------------------------");
+ System.out.println("Client: highlight matches");
rdfInstance subject = link.getSubject();
rdfInstance object = link.getObject();
@@ -546,14 +527,6 @@
predicatePanel.add(predicateHTML);
predicatePanel.setStyleName("predicatePanel");
- // RadioButtons
-// rdbtnValid = new RadioButton("selectionGroup");
-// rdbtnNotValid = new RadioButton("selectionGroup");
-// rdbtnNotSure = new RadioButton("selectionGroup");
-// rdbtnValid.setVisible(true);
-// rdbtnNotValid.setVisible(true);
-// rdbtnNotSure.setVisible(true);
-
// ButtonGroup
HorizontalPanel r1Panel = new HorizontalPanel();
r1Panel.setHorizontalAlignment(ALIGN_CENTER);
@@ -580,9 +553,6 @@
VerticalPanel rdbtnPanel = new VerticalPanel();
rdbtnPanel.setStyleName("RdbtnPanel");
rdbtnPanel.setVerticalAlignment(ALIGN_MIDDLE);
-// rdbtnPanel.add(rdbtnValid);
-// rdbtnPanel.add(rdbtnNotValid);
-// rdbtnPanel.add(rdbtnNotSure);
rdbtnPanel.add(r1Panel);
rdbtnPanel.add(r2Panel);
rdbtnPanel.add(r3Panel);
@@ -665,23 +635,6 @@
+ " nuW " + newWidth);
}
- /**
- * Get Selected RadioButton
- *
- * @return 0=NOT_SIMILAR, 1=SIMILAR, -1=NOT_SURE
- */
- public int getSelection() {
- int value = 100;
-// if (this.rdbtnValid.isChecked())
-// value = SIMILAR; // similiar
-// else if (this.rdbtnNotValid.isChecked())
-// value = NOT_SIMILAR; // not similiar
-// else if (this.rdbtnNotSure.isChecked())
-// value = NOT_SURE; // not sure
-
- return value;
- }
-
public Button getOkButton() {
// TODO Auto-generated method stub
return this.verifyButton;
@@ -703,24 +656,6 @@
return ("<b>" + parsed + "</b>");
}
- public void setValidRadioButton(boolean b) {
-// this.rdbtnNotValid.setChecked(!b);
-// this.rdbtnNotSure.setChecked(!b);
-// this.rdbtnValid.setChecked(b);
- }
-
- public void setNotValidRadioButton(boolean b) {
-// this.rdbtnValid.setChecked(!b);
-// this.rdbtnNotSure.setChecked(!b);
-// this.rdbtnNotValid.setChecked(b);
- }
-
- public void setNotSureRadioButton(boolean b) {
-// this.rdbtnValid.setChecked(!b);
-// this.rdbtnNotValid.setChecked(!b);
-// this.rdbtnNotSure.setChecked(b);
- }
-
public PushButton getTrueButton() {
return trueButton;
}
Modified: trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java 2012-06-21 15:32:18 UTC (rev 477)
+++ trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java 2012-06-22 05:30:46 UTC (rev 478)
@@ -44,17 +44,17 @@
public static double getUserStrength(double str){
// Novice
- if(str<=0.76)
+ if(str<=0.60)
return random(0,0.3);
- else if(0.77<=str && str<0.84)
+ else if(0.61<=str && str<0.71)
return random(0,0.6);
- else if(0.85<=str && str<0.9)
+ else if(0.72<=str && str<0.76)
return random(0,0.75);
- else if(0.91<=str && str <0.94)
+ else if(0.77<=str && str <0.81)
return random(0,0.9);
- else if(0.95<=str && str <0.97)
+ else if(0.82<=str && str <0.95)
return random(0,1);
- else if(0.98<=str && str <0.9)
+ else if(0.96<=str && str <0.9)
return random(0.2,1);
else if(str == 1)
return random(0.5,1);
@@ -62,6 +62,69 @@
return -1;
}
+ public static String getStringUserStrength(double str) {
+ // Novice
+ if(str<=0.60)
+ return NOVICE;
+ else if(0.61<=str && str<0.71)
+ return APPRENTICE;
+ else if(0.72<=str && str<0.76)
+ return VETERAN;
+ else if(0.77<=str && str <0.81)
+ return MASTER;
+ else if(0.82<=str && str <0.95)
+ return HERO;
+ else if(0.96<=str && str <0.9)
+ return LEGEND;
+ else if(str == 1)
+ return ETERNAL;
+ else
+ return "unknwon";
+ }
+
+// public static double getUserStrength(double str){
+// // Novice
+// if(str<=0.76)
+// return random(0,0.3);
+// else if(0.77<=str && str<0.84)
+// return random(0,0.6);
+// else if(0.85<=str && str<0.9)
+// return random(0,0.75);
+// else if(0.91<=str && str <0.94)
+// return random(0,0.9);
+// else if(0.95<=str && str <0.97)
+// return random(0,1);
+// else if(0.98<=str && str <0.9)
+// return random(0.2,1);
+// else if(str == 1)
+// return random(0.5,1);
+// else
+// return -1;
+// }
+
+//
+// public static String getStringUserStrength(double str) {
+// // Novice
+// if(str<=0.76)
+// return NOVICE;
+// else if(0.77<=str && str<0.84)
+// return APPRENTICE;
+// else if(0.85<=str && str<0.9)
+// return VETERAN;
+// else if(0.91<=str && str <0.94)
+// return MASTER;
+// else if(0.95<=str && str <0.97)
+// return HERO;
+// else if(0.98<=str && str <0.9)
+// return LEGEND;
+// else if(str == 1)
+// return ETERNAL;
+// else
+// return "unknwon";
+// }
+//
+
+
private static double random(double minValue, double maxValue) {
double min = minValue *100;
double max = (maxValue-0.01) *100;
@@ -95,23 +158,5 @@
}
- public static String getStringUserStrength(double str) {
- // Novice
- if(str<=0.76)
- return NOVICE;
- else if(0.77<=str && str<0.84)
- return APPRENTICE;
- else if(0.85<=str && str<0.9)
- return VETERAN;
- else if(0.91<=str && str <0.94)
- return MASTER;
- else if(0.95<=str && str <0.97)
- return HERO;
- else if(0.98<=str && str <0.9)
- return LEGEND;
- else if(str == 1)
- return ETERNAL;
- else
- return "unknwon";
- }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-21 15:32:29
|
Revision: 477
http://saim.svn.sourceforge.net/saim/?rev=477&view=rev
Author: q1Nguyen
Date: 2012-06-21 15:32:18 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/Application.java
trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java
trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java
trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java
trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java
trunk/saim-game/src/main/java/net/saim/game/shared/User.java
trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl1.json
trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl2.json
trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl3.json
trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl4.json
Added Paths:
-----------
trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/falseButton.png
trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/trueButton.png
trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/unsureButton.png
Modified: trunk/saim-game/src/main/java/net/saim/game/client/Application.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-20 18:50:48 UTC (rev 476)
+++ trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-21 15:32:18 UTC (rev 477)
@@ -67,6 +67,7 @@
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.PopupPanel;
+import com.google.gwt.user.client.ui.PushButton;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
@@ -91,7 +92,7 @@
public static final int MONEY_FOR_VERIFICATION = 40;
private static final double ERROR_LIMIT = 0.125;
-
+// private static final double ERROR_LIMIT = 0.0;
/**
* Create a remote service proxy to talk to the server-side Greeting service.
*/
@@ -658,6 +659,32 @@
private void initGUI() {
echo("Client: Init GUI");
this.verifyComponent = new VerifyComponent(subjectTemplate,objectTemplate,config);
+
+ // VerifyComponent Button handler
+ PushButton trueButton = verifyComponent.getTrueButton();
+ trueButton.addClickHandler(new ClickHandler(){
+
+ public void onClick(ClickEvent event) {
+ key1Pressed();
+
+ }});
+
+ PushButton falseButton = verifyComponent.getFalseButton();
+ falseButton.addClickHandler(new ClickHandler(){
+
+ public void onClick(ClickEvent event) {
+ key2Pressed();
+
+ }});
+
+ PushButton unsureButton = verifyComponent.getUnsureButton();
+ unsureButton.addClickHandler(new ClickHandler(){
+
+ public void onClick(ClickEvent event) {
+ key3Pressed();
+
+ }});
+
this.verifyButton = verifyComponent.getOkButton();
//TODO GameMessage
msgButton = new Button( "Game Messages" );
@@ -877,28 +904,27 @@
private void initHandler() {
echo("Client: Init Handler");
echo("MyHandler");
- class MyHandler implements ClickHandler{
- /**
- * Fired when the user clicks on the verifyButton.
- */
- public void onClick(ClickEvent event) {
- if( !game.world.isPaused())
- {
- if(verifyComponent.getSelection() == 100)
- verifyButton.setText("Choose first");
- else {
- sendVerificationToServer();
-
- }
- }
-
- }
- }
+// class MyHandler implements ClickHandler{
+// /**
+// * Fired when the user clicks on the verifyButton.
+// */
+// public void onClick(ClickEvent event) {
+// if( !game.world.isPaused())
+// {
+// if(verifyComponent.getSelection() == 100)
+// verifyButton.setText("Choose first");
+// else {
+// sendVerificationToServer();
+//
+// }
+// }
+//
+// }
+// }
- echo("MyHandler2");
// Add EventHandler
- MyHandler handler = new MyHandler();
- verifyButton.addClickHandler(handler);
+// MyHandler handler = new MyHandler();
+// verifyButton.addClickHandler(handler);
msgButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
//dialogBox.hide();
@@ -1647,8 +1673,13 @@
* Asynchronous call of server's userVerification method.
* Send verification and linkset information to the server and wait for a response.
*/
- private void sendVerificationToServer() {
+ private void sendVerificationToServer(int selection) {
echo("\n### Client: Send verification to server ###");
+
+ // disable verify buttons
+ verifyComponent.disableButtons();
+ this.verifyLock = true;
+
// Check if users credibility should be checked
checkUserCredibility();
@@ -1657,7 +1688,7 @@
// Add temp. money for verification
int money=MONEY_FOR_VERIFICATION; // VALID, NOT VALID
- if(verifyComponent.getSelection() == -1) { // NOT SURE
+ if(selection == GameConstants.UNSURE) { // NOT SURE
money=MONEY_FOR_NOT_SURE;
notSure=true;
}
@@ -1668,14 +1699,14 @@
verifyButton.setText("Verification send to server!");
// Get Verification
- verification = new Verification(link.getId(),verifyComponent.getSelection());
+ verification = new Verification(link.getId(),selection);
verificationStats.addVerification(verification);
// Callback
service.userVerification(verificationStats.getCompleteList(),linkset.getName(),user, thisLink,nextLink,callbackGetLink);
echo("CLIENT: thisLink = "+thisLink);
echo("CLIENT: nextLink = "+nextLink);
- this.verifyLock = true;
+
timeOut();
echo("### Client: Send verification to server done. ###");
}
@@ -1708,15 +1739,17 @@
int penalty = verificationStats.getCountPenalty();
int unsure = verificationStats.getCountUnsure();
echo("agree: "+agree+" disagree: "+disagree+"penalty: "+penalty+" unsure:"+unsure);
- echo("LIMIT: "+ERROR_LIMIT);
+ echo("Error limit: "+ERROR_LIMIT);
echo("CalcErrorRate: "+calcErrorRate());
if(calcErrorRate()<= ERROR_LIMIT){
- service.commitVerifications(this.verificationStats.getList(),agree,disagree,unsure,penalty,this.user,callbackCommitVerifications);
- echo("Commit Verification!");
+ this.user.setCredible(true);
+ echo("Commit Link Verifications!");
}else {
- service.commitVerifications(null,0,0,0,0,this.user,callbackCommitVerifications);
- echo("Too many false verifications! Verifications won't be commited!");
+ this.user.setCredible(false);
+ echo("Too many false verifications! Link Verifications won't be commited!");
}
+ service.commitVerifications(this.verificationStats.getList(),agree,disagree,unsure,penalty,this.user,callbackCommitVerifications);
+
// Submit verificaqtions stats to kongregate
if(config.isKongregate()==true)
submitVerifyStatsToKongregate(verificationStats.getList().size()+"",
@@ -2023,9 +2056,9 @@
// setNumKeyCache(1);
// }
if(!verifyLock()){
-
+ DOM.setStyleAttribute(this.verifyComponent.getTrueButton().getElement(),"border","2px solid black");
this.verifyComponent.setValidRadioButton(true);
- this.sendVerificationToServer();
+ this.sendVerificationToServer(GameConstants.TRUE);
}
}
@@ -2037,9 +2070,10 @@
// setNumKeyCache(2);
// }
if(!verifyLock()){
-
- this.verifyComponent.setNotValidRadioButton(true);
- this.sendVerificationToServer();
+ DOM.setStyleAttribute(this.verifyComponent.getFalseButton().getElement(),"border","2px solid black");
+
+// this.verifyComponent.setNotValidRadioButton(true);
+ this.sendVerificationToServer(GameConstants.FALSE);
}
}
@@ -2051,9 +2085,10 @@
// setNumKeyCache(3);
// }
if(!verifyLock()){
-
- this.verifyComponent.setNotSureRadioButton(true);
- this.sendVerificationToServer();
+ DOM.setStyleAttribute(this.verifyComponent.getUnsureButton().getElement(),"border","2px solid black");
+
+// this.verifyComponent.setNotSureRadioButton(true);
+ this.sendVerificationToServer(GameConstants.UNSURE);
}
}
@@ -2259,6 +2294,8 @@
verifyButton.setEnabled(true);
verifyButton.setText("VERIFY");
verifyLock=false;
+ // disable verify buttons
+ verifyComponent.enableButtons();
}
};
t.schedule(1800);
Modified: trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java 2012-06-20 18:50:48 UTC (rev 476)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java 2012-06-21 15:32:18 UTC (rev 477)
@@ -621,7 +621,7 @@
public int calcDifficulty() {
int diff = 1;
if (difficulty.equals(PropertyConstants.DIFFICULTY_EASY))
- diff = 4;
+ diff = 3;
else if (difficulty.equals(PropertyConstants.DIFFICULTY_MEDIUM))
diff = 2;
if (difficulty.equals(PropertyConstants.DIFFICULTY_HARD))
Modified: trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java 2012-06-20 18:50:48 UTC (rev 476)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java 2012-06-21 15:32:18 UTC (rev 477)
@@ -21,7 +21,7 @@
public EnemyShooter(GameWorld gameWorld, World world, float x, float y, float angle) {
super(gameWorld, world, x, y, angle);
// TODO Auto-generated constructor stub
- this.hp =4;
+ this.hp =3;
this.setSpeed(MY_SPEED);
veloY=2f;
fallPosition = random(1,6);
@@ -89,15 +89,15 @@
if(fallPosition > body.getPosition().x ){
// System.out.println("fallPosition: "+fallPosition);
// System.out.println("pos: "+body.getPosition().x);
- this.setAngularVelocity(-3.5f);
+ this.setAngularVelocity(-3f);
}else {
if(this.prevY<1)
moveDown();
if (this.prevX == body.getPosition().x ){
- this.setLinearVelocity(0f,4f);
+ this.setLinearVelocity(0f,3f);
}else
this.setLinearVelocity(-1f, veloY);
- this.setAngularVelocity(-3.5f);
+ this.setAngularVelocity(-3f);
}
//System.out.println(x+ " , " +y);
// store state for interpolation in paint()
Modified: trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java 2012-06-20 18:50:48 UTC (rev 476)
+++ trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java 2012-06-21 15:32:18 UTC (rev 477)
@@ -10,6 +10,7 @@
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.PushButton;
import com.google.gwt.user.client.ui.RadioButton;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.VerticalPanel;
@@ -25,15 +26,19 @@
private Configuration config;
private Button verifyButton;
+ private PushButton trueButton;
+ private PushButton falseButton;
+ private PushButton unsureButton;
+
// RadioButtons
- private RadioButton rdbtnValid;
- private RadioButton rdbtnNotValid;
- private RadioButton rdbtnNotSure;
+// private RadioButton rdbtnValid;
+// private RadioButton rdbtnNotValid;
+// private RadioButton rdbtnNotSure;
+//
+// public static final int SIMILAR = 1;
+// public static final int NOT_SIMILAR = 0;
+// public static final int NOT_SURE = -1;
- public static final int SIMILAR = 1;
- public static final int NOT_SIMILAR = 0;
- public static final int NOT_SURE = -1;
-
private static final CharSequence SEPERATOR = PropertyConstants.SEPERATOR_PROPERTY_VALUE;
private HTML predicateHTML;
@@ -542,45 +547,36 @@
predicatePanel.setStyleName("predicatePanel");
// RadioButtons
- rdbtnValid = new RadioButton("selectionGroup");
- rdbtnNotValid = new RadioButton("selectionGroup");
- rdbtnNotSure = new RadioButton("selectionGroup");
- rdbtnValid.setVisible(true);
- rdbtnNotValid.setVisible(true);
- rdbtnNotSure.setVisible(true);
+// rdbtnValid = new RadioButton("selectionGroup");
+// rdbtnNotValid = new RadioButton("selectionGroup");
+// rdbtnNotSure = new RadioButton("selectionGroup");
+// rdbtnValid.setVisible(true);
+// rdbtnNotValid.setVisible(true);
+// rdbtnNotSure.setVisible(true);
// ButtonGroup
HorizontalPanel r1Panel = new HorizontalPanel();
r1Panel.setHorizontalAlignment(ALIGN_CENTER);
- r1Panel.add(rdbtnValid);
- Image i1 = new Image("Application/images/verification/true.png");
- Image k1 = new Image("Application/images/verification/key1.png");
-// i1.setSize("25px", "25px");
- r1Panel.add(k1);
- r1Panel.add(i1);
- r1Panel.setSpacing(2);
+ trueButton = new PushButton(new Image("Application/images/verification/trueButton.png"));
+ r1Panel.add(trueButton);
+ falseButton = new PushButton(new Image("Application/images/verification/falseButton.png"));
HorizontalPanel r2Panel = new HorizontalPanel();
r2Panel.setHorizontalAlignment(ALIGN_CENTER);
- r2Panel.add(rdbtnNotValid);
- Image i2 = new Image("Application/images/verification/false.png");
-// i2.setSize("25px", "25px");
- Image k2 = new Image("Application/images/verification/key2.png");
- r2Panel.add(k2);
- r2Panel.add(i2);
- r2Panel.setSpacing(2);
+ r2Panel.add(falseButton);
HorizontalPanel r3Panel = new HorizontalPanel();
r3Panel.setHorizontalAlignment(ALIGN_CENTER);
- r3Panel.add(rdbtnNotSure);
- Image i3 = new Image("Application/images/verification/unsure.png");
-// i3.setSize("25px", "25px");
- Image k3 = new Image("Application/images/verification/key3.png");
- r3Panel.add(k3);
- r3Panel.add(i3);
- r3Panel.setSpacing(2);
+//// r3Panel.add(rdbtnNotSure);
+// Image i3 = new Image("Application/images/verification/unsure.png");
+//// i3.setSize("25px", "25px");
+// Image k3 = new Image("Application/images/verification/key3.png");
+// r3Panel.add(k3);
+// r3Panel.add(i3);
+// r3Panel.setSpacing(2);
+ unsureButton = new PushButton(new Image("Application/images/verification/unsureButton.png"));
+ r3Panel.add(unsureButton);
-
VerticalPanel rdbtnPanel = new VerticalPanel();
rdbtnPanel.setStyleName("RdbtnPanel");
rdbtnPanel.setVerticalAlignment(ALIGN_MIDDLE);
@@ -676,12 +672,12 @@
*/
public int getSelection() {
int value = 100;
- if (this.rdbtnValid.isChecked())
- value = SIMILAR; // similiar
- else if (this.rdbtnNotValid.isChecked())
- value = NOT_SIMILAR; // not similiar
- else if (this.rdbtnNotSure.isChecked())
- value = NOT_SURE; // not sure
+// if (this.rdbtnValid.isChecked())
+// value = SIMILAR; // similiar
+// else if (this.rdbtnNotValid.isChecked())
+// value = NOT_SIMILAR; // not similiar
+// else if (this.rdbtnNotSure.isChecked())
+// value = NOT_SURE; // not sure
return value;
}
@@ -708,21 +704,48 @@
}
public void setValidRadioButton(boolean b) {
- this.rdbtnNotValid.setChecked(!b);
- this.rdbtnNotSure.setChecked(!b);
- this.rdbtnValid.setChecked(b);
+// this.rdbtnNotValid.setChecked(!b);
+// this.rdbtnNotSure.setChecked(!b);
+// this.rdbtnValid.setChecked(b);
}
public void setNotValidRadioButton(boolean b) {
- this.rdbtnValid.setChecked(!b);
- this.rdbtnNotSure.setChecked(!b);
- this.rdbtnNotValid.setChecked(b);
+// this.rdbtnValid.setChecked(!b);
+// this.rdbtnNotSure.setChecked(!b);
+// this.rdbtnNotValid.setChecked(b);
}
public void setNotSureRadioButton(boolean b) {
- this.rdbtnValid.setChecked(!b);
- this.rdbtnNotValid.setChecked(!b);
- this.rdbtnNotSure.setChecked(b);
+// this.rdbtnValid.setChecked(!b);
+// this.rdbtnNotValid.setChecked(!b);
+// this.rdbtnNotSure.setChecked(b);
}
+ public PushButton getTrueButton() {
+ return trueButton;
+ }
+
+ public PushButton getFalseButton() {
+ return falseButton;
+ }
+
+ public PushButton getUnsureButton() {
+ return unsureButton;
+ }
+
+ public void enableButtons(){
+ this.trueButton.setEnabled(true);
+ this.falseButton.setEnabled(true);
+ this.unsureButton.setEnabled(true);
+ DOM.setStyleAttribute(trueButton.getElement(),"border","none");
+ DOM.setStyleAttribute(falseButton.getElement(),"border","none");
+ DOM.setStyleAttribute(unsureButton.getElement(),"border","none");
+
+ }
+
+ public void disableButtons(){
+ this.trueButton.setEnabled(false);
+ this.falseButton.setEnabled(false);
+ this.unsureButton.setEnabled(false);
+ }
}
Modified: trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-20 18:50:48 UTC (rev 476)
+++ trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-21 15:32:18 UTC (rev 477)
@@ -1545,22 +1545,30 @@
* @param user
* @return userStrength
*/
- private String updateDB(Connection con,
- ArrayList<Verification> verifications, int agree, int disagree, int unsure, int penalty, User user) {
+ private void updateDB(Connection con,
+ ArrayList<Verification> verifications, int agree, int disagree, int unsure, int penalty, User user, boolean credible) {
echo("##Server: Commit Verifications of User " + user.getName() + "####");
- String msg = null;
- String sqlQuery, sqlQueryVerify;
- Statement dbStmt;
- rdfStatement rdfStmt;
- Verification veri;
+
- // update game stats
+ // Links statistics
+ updateLinksStatistics(con, verifications, user, credible);
+
+ // User statistics
+ updateUserStatistics(con, verifications, agree, disagree, unsure, penalty, user);
+
+
+// return msg;
+ }
+
+ private void updateUserStatistics(Connection con, ArrayList<Verification> verifications, int agree, int disagree, int unsure, int penalty, User user) {
+ String sqlQuery=null;
+ Statement dbStmt=null;
+
+ // Gaming stats
if(user.getCurrentLevel()<4){
try {
-
echo("\n>>>>Update GameStats for user '" + user.getName() + "'");
-
// Level cleared
sqlQuery = "UPDATE user SET `Level"
+ user.getCurrentLevel() + "Cleared` = (`Level"+user.getCurrentLevel()+"Cleared` +1) "
@@ -1580,13 +1588,10 @@
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
-
}
}
- if(verifications ==null)
- return "Verification is null! User has too many penalties!";
- // User decision evaluation
+ // Verification stats
try {
// Agree
String sqlAgree = "update user set Agreement = (Agreement + "+agree+") where UserName= '"+user.getName()+"' AND UserID='"+user.getId()+"'";
@@ -1603,7 +1608,6 @@
// All
String sqlAll = "update user set Verified = (Verified + "+verifications.size()+") where UserName= '"+user.getName()+"' AND UserID='"+user.getId()+"'";
echo(sqlAll);
-
dbStmt = con.createStatement();
if(agree!=0)
dbStmt.executeUpdate(sqlAgree);
@@ -1618,19 +1622,30 @@
// TODO Auto-generated catch block
e1.printStackTrace();
}
+
+ }
+
+
+ private void updateLinksStatistics(Connection con, ArrayList<Verification> verifications, User user, boolean credible) {
+ if (credible== false){
+ echo("User: "+user.getName()+" had too many false verifications! Don't save decisions!");
+ return;
+ }
+ String msg = null;
+ String sqlQuery, sqlQueryVerify;
+ Statement dbStmt;
+ rdfStatement rdfStmt;
+ Verification veri;
int id;
int selection;
for (int i = 0; i < verifications.size(); i++) {
-
veri = verifications.get(i);
id = veri.getId();
selection = veri.getSelection();
// update counter in db
try {
-
echo("\n>>>>Update statements with ID '" + id + "'");
-
sqlQuery = "UPDATE links SET `"
+ PropertyConstants.DB_TABLE_LINKS_PROPERTY_COUNTER + "`= `"
+ PropertyConstants.DB_TABLE_LINKS_PROPERTY_COUNTER
@@ -1638,14 +1653,11 @@
+ "` = " + id;
dbStmt = con.createStatement();
dbStmt.executeUpdate(sqlQuery);
-
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
-
}
-
// update selection
if (selection != NOT_SURE) {
try {
@@ -1669,28 +1681,22 @@
+ PropertyConstants.DB_TABLE_NAME_NEGATIVE + "` VALUES ('" + id
+ "' , '" + user.getId() + "','"+user.getName()+"')";
}
-
dbStmt = con.createStatement();
dbStmt.executeUpdate(sqlQuery);
dbStmt.executeUpdate(sqlQueryVerify);
-
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
} else{ //if not sure do nothing in db, just inc norSureCounter of statement
- echo("Evaluation: -1 ---> Do Nothing in DB");
+ echo("Evaluation: Unsure(-1) ---> Do Nothing in links table");
}
msg = "Commit verifications of user " + user.getName() + " successful";
}
- if (msg == null)
+ if (msg == null){
msg = "Commit verifications of user " + user.getName() + " failed";
-
-
- // Get user strength
- String strength = getUserStrength(con,user);
- return strength;
-// return msg;
+ }
+ echo(msg);
}
private String getUserStrength(Connection con, User user) {
@@ -2631,18 +2637,19 @@
public String commitVerifications(ArrayList<Verification> verifications, int agree, int disagree, int unsure, int penalty,
User user) {
echo("###Server: Commit Verifications###");
- if(verifications==null){
- echo("User: "+user.getName()+" had too many false verifications! No Commit!");
- return "verification is null";
- }
- echo("VerificationsList size: " + verifications.size());
+ if(verifications != null)
+ echo("VerificationsList size: " + verifications.size());
echo("User: " + user.getName());
// Connect to db
DBTool db = new DBTool(resourcePath + dbIniFile);
Connection con = db.getConnection();
// add into db
- String userStrength = updateDB(con, verifications, agree, disagree, unsure, penalty, user);
+ updateDB(con, verifications, agree, disagree, unsure, penalty, user, user.isCredible());
+
+ // Get user strength
+ String userStrength = getUserStrength(con,user);
+
// Close db connection
try {
con.close();
@@ -2781,7 +2788,7 @@
}
}
}else{
- msg = "Server Error: User = "+user.getName()+" wasn't found!";
+ msg = "Server Error: User = "+user.getName()+" wasn't found! Couldn't calculate play time!";
echo(msg);
}
}
Modified: trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java 2012-06-20 18:50:48 UTC (rev 476)
+++ trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java 2012-06-21 15:32:18 UTC (rev 477)
@@ -6,9 +6,13 @@
public static final String MODE_MEDIUM ="medium";
public static final String MODE_HARD ="hard";
- public static final int VALID = 1;
- public static final int NOT_VALID = 0;
- public static final int NOT_SURE = 2;
+ public static final int TRUE = 1;
+ public static final int FALSE = 0;
+ public static final int UNSURE = -1;
+//
+// public static final int VALID = 1;
+// public static final int NOT_VALID = 0;
+// public static final int NOT_SURE = 2;
public static final int COST_PEA =10;
public static final int COST_PEA_BIG =25;
Modified: trunk/saim-game/src/main/java/net/saim/game/shared/User.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/shared/User.java 2012-06-20 18:50:48 UTC (rev 476)
+++ trunk/saim-game/src/main/java/net/saim/game/shared/User.java 2012-06-21 15:32:18 UTC (rev 477)
@@ -12,6 +12,7 @@
private long currentLevelTime=0;
private long currentLevelStartTime=0;
private String strength="unknown";
+ private boolean credible=true;
public User(){
@@ -118,4 +119,12 @@
return this.strength;
}
+
+ public void setCredible(boolean credible) {
+ this.credible = credible;
+ }
+
+ public boolean isCredible() {
+ return credible;
+ }
}
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/falseButton.png
===================================================================
(Binary files differ)
Property changes on: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/falseButton.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/trueButton.png
===================================================================
(Binary files differ)
Property changes on: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/trueButton.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/unsureButton.png
===================================================================
(Binary files differ)
Property changes on: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/unsureButton.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl1.json
===================================================================
--- trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl1.json 2012-06-20 18:50:48 UTC (rev 476)
+++ trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl1.json 2012-06-21 15:32:18 UTC (rev 477)
@@ -123,7 +123,7 @@
{"type": "NextLevel", "a":1000},
- {"type": "Timer", "a":290}
+ {"type": "Timer", "a":310}
]
}
Modified: trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl2.json
===================================================================
--- trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl2.json 2012-06-20 18:50:48 UTC (rev 476)
+++ trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl2.json 2012-06-21 15:32:18 UTC (rev 477)
@@ -153,6 +153,6 @@
{"type": "NextLevel", "x": 0, "y":0, "a":2300},
- {"type": "Timer", "a":260}
+ {"type": "Timer", "a":280}
]
}
Modified: trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl3.json
===================================================================
--- trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl3.json 2012-06-20 18:50:48 UTC (rev 476)
+++ trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl3.json 2012-06-21 15:32:18 UTC (rev 477)
@@ -186,6 +186,6 @@
{"type": "NextLevel", "x": 0, "y":0, "a":4200},
- {"type": "Timer", "a":230}
+ {"type": "Timer", "a":250}
]
}
Modified: trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl4.json
===================================================================
--- trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl4.json 2012-06-20 18:50:48 UTC (rev 476)
+++ trunk/saim-game/src/main/resources/net/saim/game/resources/levels/lvl4.json 2012-06-21 15:32:18 UTC (rev 477)
@@ -79,7 +79,7 @@
{"type": "Marker", "x": 5, "y":7, "a":0},
{"type": "Marker", "x": 8, "y":1, "a":0},
- {"type": "NextLevel", "x": 0, "y":0, "a":20000},
+ {"type": "NextLevel", "x": 0, "y":0, "a":50000},
{"type": "Timer", "a":180}
]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-20 18:50:57
|
Revision: 476
http://saim.svn.sourceforge.net/saim/?rev=476&view=rev
Author: q1Nguyen
Date: 2012-06-20 18:50:48 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/Application.java
trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java
trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java
trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
Modified: trunk/saim-game/src/main/java/net/saim/game/client/Application.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-20 17:27:22 UTC (rev 475)
+++ trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-20 18:50:48 UTC (rev 476)
@@ -699,6 +699,14 @@
showTutorial();
}});
+ Button showOverview = new Button ("Quick Overview");
+ showTut.addStyleName("myButton");
+ showTut.addClickHandler(new ClickHandler(){
+
+ public void onClick(ClickEvent event) {
+ showOverview();
+
+ }});
HorizontalPanel bottom = new HorizontalPanel();
bottom.add(showTut);
@@ -1064,7 +1072,48 @@
tutorialPanel.setGlassPanel(pop);
}
+ private void showOverview(){
+ // Pause game
+ if(!game.world.isPaused())
+ game.pause();
+
+ // Glass panel behind popUp
+ glass = new PopupPanel(false);
+ glass.setStyleName("rx-glass");
+ DOM.setStyleAttribute(glass.getElement(), "width", "100%");
+ DOM.setStyleAttribute(glass.getElement(), "height", "100%");
+ DOM.setStyleAttribute(glass.getElement(),
+ "backgroundColor", "#000");
+ DOM.setStyleAttribute(glass.getElement(),
+ "opacity", "0.30");
+
+ final PopupPanel pop = new PopupPanel(false);
+
+ TutorialPanel tutorialPanel = new TutorialPanel();
+
+ // Change next text
+ tutorialPanel.setNextText();
+
+ ClickHandler skipHandler = new ClickHandler(){
+
+ public void onClick(ClickEvent arg0) {
+ glass.hide();
+ pop.hide();
+ game.resume();
+ }};
+ tutorialPanel.setSkipClickHandler(skipHandler);
+
+ pop.add(tutorialPanel);
+ glass.add(pop);
+
+ glass.show();
+ pop.center();
+ pop.setStyleName("noBorder");
+ tutorialPanel.setGlassPanel(pop);
+ }
+
+
/**
* Initialize start menu for selecting linkset.
* Do autologin if needed.
Modified: trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java 2012-06-20 17:27:22 UTC (rev 475)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java 2012-06-20 18:50:48 UTC (rev 476)
@@ -621,9 +621,9 @@
public int calcDifficulty() {
int diff = 1;
if (difficulty.equals(PropertyConstants.DIFFICULTY_EASY))
- diff = 6;
+ diff = 4;
else if (difficulty.equals(PropertyConstants.DIFFICULTY_MEDIUM))
- diff = 3;
+ diff = 2;
if (difficulty.equals(PropertyConstants.DIFFICULTY_HARD))
diff = 1;
return diff;
@@ -710,7 +710,7 @@
// TODO change name
public void removeMostLeftEnemy() {
System.out.println("Remove most left enemy!");
- if(enemyCounter < 4)
+ if(enemyCounter < 5)
return;
for (Entity e : entities) {
if(e instanceof Enemy){
Modified: trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java 2012-06-20 17:27:22 UTC (rev 475)
+++ trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java 2012-06-20 18:50:48 UTC (rev 476)
@@ -360,7 +360,7 @@
"If you incorrectly answer a question, you get a penalty. " +
"</br>If the player community has no agreement on the answer of a question, " +
"you get only few coins as bonus for answering the questions (we do not know the correct answer - it is all up to the players). " +
- "</br></br><b>Shortcut-Keys:</b> Push <img src='Application/images/verification/key1.png'/> for True, <img src='Application/images/verification/key1.png'/> for False and <img src='Application/images/verification/key1.png'/> for Unsure. " +
+ "</br></br><b>Shortcut-Keys:</b> Push <img src='Application/images/verification/key1.png'/> for True, <img src='Application/images/verification/key2.png'/> for False and <img src='Application/images/verification/key3.png'/> for Unsure. " +
"</br></br>Thanks for your attention. Now have some fun and start playing! :)");
DOM.setStyleAttribute(textHTML.getElement(), "width", "850px");
Modified: trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-20 17:27:22 UTC (rev 475)
+++ trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-20 18:50:48 UTC (rev 476)
@@ -2631,8 +2631,10 @@
public String commitVerifications(ArrayList<Verification> verifications, int agree, int disagree, int unsure, int penalty,
User user) {
echo("###Server: Commit Verifications###");
- if(verifications==null)
+ if(verifications==null){
+ echo("User: "+user.getName()+" had too many false verifications! No Commit!");
return "verification is null";
+ }
echo("VerificationsList size: " + verifications.size());
echo("User: " + user.getName());
// Connect to db
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-20 17:27:28
|
Revision: 475
http://saim.svn.sourceforge.net/saim/?rev=475&view=rev
Author: q1Nguyen
Date: 2012-06-20 17:27:22 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java
Modified: trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java 2012-06-20 17:14:43 UTC (rev 474)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java 2012-06-20 17:27:22 UTC (rev 475)
@@ -710,7 +710,7 @@
// TODO change name
public void removeMostLeftEnemy() {
System.out.println("Remove most left enemy!");
- if(enemyCounter < 7)
+ if(enemyCounter < 4)
return;
for (Entity e : entities) {
if(e instanceof Enemy){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-20 17:14:54
|
Revision: 474
http://saim.svn.sourceforge.net/saim/?rev=474&view=rev
Author: q1Nguyen
Date: 2012-06-20 17:14:43 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java
Modified: trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java 2012-06-20 17:11:55 UTC (rev 473)
+++ trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java 2012-06-20 17:14:43 UTC (rev 474)
@@ -23,7 +23,7 @@
public static final int BONUS_FIRST = 5;
public static final int BONUS_NOT_SURE = 0;
- public static final int BONUS_HUGE = 200;
+ public static final int BONUS_HUGE = 300;
public static final int BONUS_MEDIUM = 100;
public static final int BONUS_NONE = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-20 17:12:06
|
Revision: 473
http://saim.svn.sourceforge.net/saim/?rev=473&view=rev
Author: q1Nguyen
Date: 2012-06-20 17:11:55 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
- tutorial screenshot
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java
Added Paths:
-----------
trunk/saim-game/src/main/resources/net/saim/game/resources/images/tutorial/tutorialVerify2.png
Modified: trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java 2012-06-20 17:00:50 UTC (rev 472)
+++ trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java 2012-06-20 17:11:55 UTC (rev 473)
@@ -374,7 +374,7 @@
// Topic
topicHTML.setHTML("Verification");
// Image
- picURL = "Application/images/tutorial/tutorialVerify.png";
+ picURL = "Application/images/tutorial/tutorialVerify2.png";
pic.setUrl(picURL);
// Text
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/tutorial/tutorialVerify2.png
===================================================================
(Binary files differ)
Property changes on: trunk/saim-game/src/main/resources/net/saim/game/resources/images/tutorial/tutorialVerify2.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-20 17:01:01
|
Revision: 472
http://saim.svn.sourceforge.net/saim/?rev=472&view=rev
Author: q1Nguyen
Date: 2012-06-20 17:00:50 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/Application.java
trunk/saim-game/src/main/java/net/saim/game/client/core/GameComponent.java
trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java
trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java
trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java
Added Paths:
-----------
trunk/saim-game/src/main/resources/net/saim/game/resources/images/pea/enemyShooter2.png
trunk/saim-game/src/main/resources/net/saim/game/resources/images/pea/enemyShooter_hit2.png
Modified: trunk/saim-game/src/main/java/net/saim/game/client/Application.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-20 14:25:11 UTC (rev 471)
+++ trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-20 17:00:50 UTC (rev 472)
@@ -1633,7 +1633,7 @@
private void checkUserCredibility(){
int min = 4;
- int max =6;
+ int max =5;
int rnd = min + (int)(Math.random() * ((max - min) + 1));
echo("rnd: "+rnd);
// int rnd = 7;
@@ -1661,7 +1661,7 @@
echo("agree: "+agree+" disagree: "+disagree+"penalty: "+penalty+" unsure:"+unsure);
echo("LIMIT: "+ERROR_LIMIT);
echo("CalcErrorRate: "+calcErrorRate());
- if(calcErrorRate()< ERROR_LIMIT){
+ if(calcErrorRate()<= ERROR_LIMIT){
service.commitVerifications(this.verificationStats.getList(),agree,disagree,unsure,penalty,this.user,callbackCommitVerifications);
echo("Commit Verification!");
}else {
@@ -1680,7 +1680,9 @@
}
private double calcErrorRate(){
- double errorRate = verificationStats.getCountPenalty()/ verificationStats.getList().size();
+ double errorRate = ((double) verificationStats.getCountPenalty() )/((double) verificationStats.getList().size());
+ echo("pen: "+verificationStats.getCountPenalty()+ ", verified: "+verificationStats.getList().size()+" , error: "+errorRate);
+
return errorRate;
}
@@ -2030,7 +2032,7 @@
game.agreement();
if(game.isSpecialEvent()){
bonus = 2*bonus;
- msg="Agreement! << "+bonus+" Coins >> Bonus! "+game.SPECIAL_REACHED+" agreements in a row! Big-Daddy is on his way!";
+ msg="Agreement! << "+bonus+" Coins >> Bonus! "+game.SPECIAL_REACHED+" agreements in a row! Big Daddy is on his way!";
}
msgButton.setText(msg);
Modified: trunk/saim-game/src/main/java/net/saim/game/client/core/GameComponent.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/GameComponent.java 2012-06-20 14:25:11 UTC (rev 471)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/GameComponent.java 2012-06-20 17:00:50 UTC (rev 472)
@@ -365,7 +365,7 @@
}
public void onPointerStart(playn.core.Pointer.Event event) {
- //*--here
+ /*--here
// TODO Auto-generated method stub
if(worldLoaded){
// EnemyShooter pea = new EnemyShooter(world, world.world, physUnitPerScreenUnit * event.x(),physUnitPerScreenUnit * event.y(), 0);
Modified: trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java 2012-06-20 14:25:11 UTC (rev 471)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java 2012-06-20 17:00:50 UTC (rev 472)
@@ -710,7 +710,7 @@
// TODO change name
public void removeMostLeftEnemy() {
System.out.println("Remove most left enemy!");
- if(enemyCounter < 4)
+ if(enemyCounter < 7)
return;
for (Entity e : entities) {
if(e instanceof Enemy){
Modified: trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java 2012-06-20 14:25:11 UTC (rev 471)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java 2012-06-20 17:00:50 UTC (rev 472)
@@ -34,12 +34,12 @@
@Override
public String getImagePath() {
- return "Application/images/pea/enemyShooter.png";
+ return "Application/images/pea/enemyShooter2.png";
//return "images/pea.png";
}
public String getImagePathHit() {
- return "Application/images/pea/enemyShooter_hit.png";
+ return "Application/images/pea/enemyShooter_hit2.png";
//return "images/pea.png";
}
Modified: trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java 2012-06-20 14:25:11 UTC (rev 471)
+++ trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java 2012-06-20 17:00:50 UTC (rev 472)
@@ -23,7 +23,7 @@
public static final int BONUS_FIRST = 5;
public static final int BONUS_NOT_SURE = 0;
- public static final int BONUS_HUGE = 300;
+ public static final int BONUS_HUGE = 200;
public static final int BONUS_MEDIUM = 100;
public static final int BONUS_NONE = 0;
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/pea/enemyShooter2.png
===================================================================
(Binary files differ)
Property changes on: trunk/saim-game/src/main/resources/net/saim/game/resources/images/pea/enemyShooter2.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/pea/enemyShooter_hit2.png
===================================================================
(Binary files differ)
Property changes on: trunk/saim-game/src/main/resources/net/saim/game/resources/images/pea/enemyShooter_hit2.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-20 14:25:21
|
Revision: 471
http://saim.svn.sourceforge.net/saim/?rev=471&view=rev
Author: q1Nguyen
Date: 2012-06-20 14:25:11 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
- kleinigkeiten
- new enemy
- agree/disagree
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/Application.java
trunk/saim-game/src/main/java/net/saim/game/client/core/GameComponent.java
trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java
trunk/saim-game/src/main/java/net/saim/game/client/core/entities/Coin.java
trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java
trunk/saim-game/src/main/java/net/saim/game/client/panels/LandingPanel.java
trunk/saim-game/src/main/java/net/saim/game/client/panels/StartPanel.java
trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java
trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java
trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
Added Paths:
-----------
trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyCashier.java
trunk/saim-game/src/main/resources/net/saim/game/resources/images/pea/enemyCashier.png
trunk/saim-game/src/main/resources/net/saim/game/resources/images/pea/enemyCashier_fell.png
trunk/saim-game/src/main/resources/net/saim/game/resources/images/pea/enemyCashier_hit.png
Modified: trunk/saim-game/src/main/java/net/saim/game/client/Application.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-20 07:25:52 UTC (rev 470)
+++ trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-20 14:25:11 UTC (rev 471)
@@ -2048,7 +2048,7 @@
private void setPenalty(){
echo("Process Link-Evaluation: Penalty");
String msg="False Verification! << "+GameConstants.BONUS_PENALTY+" Coins >> Penalty!";
- game.disagreement();
+ game.penalty();
msgButton.setText(msg);
msgButton.setStyleName("gameMessagePenalty");
}
Modified: trunk/saim-game/src/main/java/net/saim/game/client/core/GameComponent.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/GameComponent.java 2012-06-20 07:25:52 UTC (rev 470)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/GameComponent.java 2012-06-20 14:25:11 UTC (rev 471)
@@ -230,7 +230,6 @@
if (world.getMoney() >= getCost()) { // If enough money
// Decrease Money
world.addMoney((-1)*getCost());
- world.getInfoText().updateMoney(world.getMoney());
// Add Sprite
posX = (float) world.getMarker().getPoint().getX();
posY = (float) world.getMarker().getPoint().getY();
@@ -366,13 +365,13 @@
}
public void onPointerStart(playn.core.Pointer.Event event) {
- /*--here
+ //*--here
// TODO Auto-generated method stub
if(worldLoaded){
- EnemyShooter pea = new EnemyShooter(world, world.world, physUnitPerScreenUnit * event.x(),physUnitPerScreenUnit * event.y(), 0);
- //PeaYellow pea = new PeaYellow(world, world.world, physUnitPerScreenUnit * event.x(),physUnitPerScreenUnit * event.y(), 0);
- //pea.setLinearVelocity(5, 0);
- //pea.getBody().applyForce(new Vec2(1,0), new Vec2(0,0));
+// EnemyShooter pea = new EnemyShooter(world, world.world, physUnitPerScreenUnit * event.x(),physUnitPerScreenUnit * event.y(), 0);
+ PeaYellow pea = new PeaYellow(world, world.world, physUnitPerScreenUnit * event.x(),physUnitPerScreenUnit * event.y(), 0);
+// pea.setLinearVelocity(5, 0);
+// pea.getBody().applyForce(new Vec2(1,0), new Vec2(0,0));
world.addPea(pea);
}
//*/
@@ -427,6 +426,9 @@
public void agreement(){
// Play Sound
this.sound.playAgree();
+ // Remove Enemy
+ world.removeMostLeftEnemy();
+
System.out.println("SpecialCounter Before: "+specialCounter);
specialCounter++;
System.out.println("SpecialCounter After: "+specialCounter);
@@ -443,11 +445,24 @@
public void disagreement(){
// Play Sound
this.sound.playDisagree();
+ // Send Enemy
+ world.sendEnemy();
System.out.println("SpecialCounter Before: "+specialCounter);
specialCounter=0;
System.out.println("SpecialCounter After: "+specialCounter);
}
+ public void penalty(){
+ // Play Sound
+ this.sound.playDisagree();
+ // Send Enemy
+ world.sendEnemy();
+ System.out.println("SpecialCounter Before: "+specialCounter);
+ specialCounter=0;
+ System.out.println("SpecialCounter After: "+specialCounter);
+ world.sendEnemy();
+ }
+
public void firstVerification(){
// Play Sound
this.sound.playFirst();
Modified: trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java 2012-06-20 07:25:52 UTC (rev 470)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/GameWorld.java 2012-06-20 14:25:11 UTC (rev 471)
@@ -2,6 +2,7 @@
import net.saim.game.client.core.entities.Coin;
import net.saim.game.client.core.entities.Enemy;
+import net.saim.game.client.core.entities.EnemyCashier;
import net.saim.game.client.core.entities.EnemyPea;
import net.saim.game.client.core.entities.EnemyShooter;
import net.saim.game.client.core.entities.Entity;
@@ -100,6 +101,8 @@
private double timerDifference;
private String difficulty = PropertyConstants.DIFFICULTY_EASY;
+ private EnemyCashier cashier = null;
+ private int enemyCounter = 0;
private GameSound sound;
public GameWorld(GroupLayer scaledLayer) {
@@ -248,8 +251,9 @@
// Pea Reset
for (Entity e : entities) {
- if (e instanceof Mine || e instanceof Enemy)
+ if (e instanceof Mine || e instanceof Enemy){
remove(e);
+ }
}
}
@@ -368,6 +372,10 @@
public void addMoney(int money) {
this.money += money;
+ if(this.money < 0){
+ this.money = 0;
+ }
+ getInfoText().updateMoney(this.money);
}
public InfoText getInfoText() {
@@ -384,18 +392,25 @@
PhysicsEntity physicsEntity = (PhysicsEntity) entity;
bodyEntityLUT.put(physicsEntity.getBody(), physicsEntity);
}
+ if(entity instanceof Enemy)
+ enemyCounter++;
}
+ // pre remove
public void remove(Entity entity) {
entitiesToRemove.push(entity);
}
- // Pre Remove
+ // do Remove
private void doRemove(Entity entity) {
if (entity instanceof Enemy) { // increase score for enemy kill
Enemy e = (Enemy) entity;
e.dead();
+ if(enemyCounter > 0)
+ enemyCounter--;
}
+ if(entity instanceof EnemyCashier)
+ cashier = null;
if (entity instanceof PhysicsEntity) {
PhysicsEntity physicsEntity = (PhysicsEntity) entity;
Body body = physicsEntity.getBody();
@@ -404,6 +419,7 @@
}
entities.remove(entity);
entity.getLayer().destroy();
+
}
@@ -535,18 +551,29 @@
// Sound
this.sound.playEnemyWave();
+ // Cashier
+ cashier();
+
int i = (int) (Math.random() * enemyDropList.size());
// System.out.println("Send New Wave!! "+i);
// Enemy enemy = new Enemy(this,world,23,i*6,0);
Point pos = enemyDropList.get(i);
Enemy enemy;
- int j = (int) (Math.random() * 2);
- if(j != 1)
+ int j = (int) (Math.random() * 3);
+ if(j == 0)
enemy = new EnemyPea(this, world, (int) pos.getX(), (int) pos.getY(),
0);
else
+ {
+ if(cashier== null && j==1){
+ enemy = new EnemyCashier(this, world, 42, 12,
+ 0);
+ cashier = (EnemyCashier) enemy;
+ }else
enemy = new EnemyShooter(this, world, (int) pos.getX(), (int) pos.getY(),
0);
+
+ }
this.add(enemy);
newWave = false;
@@ -615,6 +642,12 @@
addCoin(coin);
}
+ public void drawCoin(Entity entity, boolean isReverse){
+ Coin coin = new Coin(this, entity,isReverse);
+ // TODO delayed add??
+ addCoin(coin);
+ }
+
private void addCoin(Coin coin){
coinsToAdd.push(coin);
coinLayer.add(coin.getLayer());
@@ -671,7 +704,59 @@
// worldLayer = graphics().createGroupLayer();
// worldLayer.setScale(1f / physUnitPerScreenUnit);
// graphics().rootLayer().add(worldLayer);
-// graphics().setSize(width, height);
}
+
+ // TODO change name
+ public void removeMostLeftEnemy() {
+ System.out.println("Remove most left enemy!");
+ if(enemyCounter < 4)
+ return;
+ for (Entity e : entities) {
+ if(e instanceof Enemy){
+ doRemove(e);
+ System.out.println("Agree remove!");
+ break;
+ }
+ }
+ }
+
+
+ public void sendEnemy() {
+ // Sound
+ this.sound.playEnemyWave();
+
+
+ int i = (int) (Math.random() * enemyDropList.size());
+ Point pos = enemyDropList.get(i);
+ Enemy enemy;
+ int j = (int) (Math.random() * 3);
+ if(j == 0)
+ enemy = new EnemyPea(this, world, (int) pos.getX(), (int) pos.getY(),
+ 0);
+ else
+ {
+ if(cashier== null && j==1){
+ enemy = new EnemyCashier(this, world, 42, 12,
+ 0);
+ cashier = (EnemyCashier) enemy;
+ }else
+ enemy = new EnemyShooter(this, world, (int) pos.getX(), (int) pos.getY(),
+ 0);
+
+ }
+ this.add(enemy);
+ }
+
+ private void cashier(){
+ if(cashier != null && getMoney()!=0){
+// echo("Got cashier!");
+ // Decrease Money
+ addMoney(-10);
+// getInfoText().updateMoney(getMoney());
+ drawCoin(cashier,true);
+ }
+// else
+// echo("No cashier!");
+ }
}
Modified: trunk/saim-game/src/main/java/net/saim/game/client/core/entities/Coin.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/entities/Coin.java 2012-06-20 07:25:52 UTC (rev 470)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/entities/Coin.java 2012-06-20 14:25:11 UTC (rev 471)
@@ -20,8 +20,10 @@
public float y;
public float alpha;
public float counter;
+ public float speed;
public final static float LIMIT = 5f;
private boolean destroy;
+ private boolean isCashier;
public Coin(GameWorld gameWorld, Entity entity){
Image img = assetManager().getImage("Application/images/info/coin.png");
@@ -32,15 +34,42 @@
Enemy e = (Enemy) entity;
this.x=e.getBody().getPosition().x;
this.y=e.getBody().getPosition().y;
+ this.speed=(-0.2f);
+
alpha=1f;
counter=LIMIT;
destroy=false;
}
+ public Coin(GameWorld gameWorld, Entity entity, boolean isReverse){
+ Image img = assetManager().getImage("Application/images/info/coin.png");
+ layer= graphics().createImageLayer(img);
+ layer.setTranslation(x, y);
+ layer.setScale(0.015f);
+ this.entity = entity;
+ Enemy e = (Enemy) entity;
+ this.x=e.getBody().getPosition().x-1;
+ if(isReverse){
+ this.y=e.getBody().getPosition().y - 6;
+ this.speed = (0.2f);
+ }else{
+ this.y=e.getBody().getPosition().y;
+ this.speed=(-0.2f);
+ }
+ alpha=1f;
+ counter=LIMIT;
+ destroy=false;
+ }
+
public void update(){
- y-=0.2f;
+
+
+
+
+ y+=speed;
alpha-=0.025f;
counter-=0.2f;
+
layer.setTranslation(x, y);
layer.setAlpha(alpha);
if(counter<1){
Added: trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyCashier.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyCashier.java (rev 0)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyCashier.java 2012-06-20 14:25:11 UTC (rev 471)
@@ -0,0 +1,193 @@
+package net.saim.game.client.core.entities;
+
+import static playn.core.PlayN.assetManager;
+import static playn.core.PlayN.graphics;
+import net.saim.game.client.core.GameWorld;
+
+import org.jbox2d.collision.shapes.CircleShape;
+import org.jbox2d.collision.shapes.PolygonShape;
+import org.jbox2d.common.Vec2;
+import org.jbox2d.dynamics.Body;
+import org.jbox2d.dynamics.BodyDef;
+import org.jbox2d.dynamics.BodyType;
+import org.jbox2d.dynamics.FixtureDef;
+import org.jbox2d.dynamics.World;
+
+import playn.core.Image;
+import playn.core.PlayN;
+import playn.core.ResourceCallback;
+
+
+public class EnemyCashier extends Enemy{
+
+ public static String TYPE = "EnemyShooter";
+ public static int MY_SPEED=0;
+
+ public EnemyCashier(GameWorld gameWorld, World world, float x, float y, float angle) {
+ super(gameWorld, world, x, y, angle);
+ this.hp =4;
+ this.setSpeed(MY_SPEED);
+ }
+
+ @Override
+ public String getImagePath() {
+ return "Application/images/pea/enemyCashier.png";
+ //return "images/pea.png";
+ }
+
+ public String getImagePathHit() {
+ return "Application/images/pea/enemyCashier_hit.png";
+ //return "images/pea.png";
+ }
+
+ public String getImagePathFell() {
+ return "Application/images/pea/enemyCashier_fell.png";
+ //return "images/pea.png";
+ }
+
+
+ public void contact(PhysicsEntity other) {
+
+ }
+
+ @Override
+ float getWidth() {
+ return 2.3f;
+ }
+
+ @Override
+ float getHeight() {
+ return 2.8f;
+ }
+
+ @Override
+ Body initPhysicsBody(World world, float x, float y, float angle) {
+ FixtureDef fixtureDef = new FixtureDef();
+ BodyDef bodyDef = new BodyDef();
+ bodyDef.type = BodyType.DYNAMIC;
+ bodyDef.position = new Vec2(0, 0);
+ bodyDef.angle=0;
+ Body body = world.createBody(bodyDef);
+
+ PolygonShape polygonShape = new PolygonShape();
+ Vec2[] polygon = new Vec2[4];
+ polygon[0] = new Vec2(-getWidth()/2f, -getHeight()/2f);
+ polygon[1] = new Vec2(getWidth()/2f, -getHeight()/2f );
+ polygon[2] = new Vec2(getWidth()/2f, getHeight()/2f);
+ polygon[3] = new Vec2(-getWidth()/2f, getHeight()/2f);
+ polygonShape.set(polygon, polygon.length);
+ fixtureDef.shape = polygonShape;
+ fixtureDef.density = 3f;
+ fixtureDef.friction = 1f;
+ fixtureDef.restitution = 0f;
+ body.createFixture(fixtureDef);
+ body.setTransform(new Vec2(x, y), angle);
+ return body;
+ }
+
+ @Override
+ public void paint(float alpha) {
+ // interpolate based on previous state
+ float x = (body.getPosition().x * alpha) + (prevX * (1f - alpha));
+ float y = (body.getPosition().y * alpha) + (prevY * (1f - alpha));
+ float a = (body.getAngle() * alpha) + (prevA * (1f - alpha));
+
+ //getLayer().setTranslation(prevX, prevY);
+ getLayer().setTranslation(x, y);
+ getLayer().setRotation(0);
+
+ }
+
+ @Override
+ public void update(float delta) {
+ if( this.prevX > rightBorder || this.isDead()==true)
+ destroy();
+// if(prevY<4)
+// moveDown();
+// if (prevX < body.getPosition().x ){
+// this.setLinearVelocity(0f,3f);
+// System.out.println("null!!");
+// }else
+// this.setLinearVelocity(-1.5f, veloY);
+// this.setAngularVelocity(-1f);
+
+ //System.out.println(x+ " , " +y);
+ // store state for interpolation in paint()
+ prevX = body.getPosition().x;
+ prevY = body.getPosition().y;
+ prevA = body.getAngle();
+
+ }
+
+@Override
+float getRadius() {
+ // TODO Auto-generated method stub
+ return 0;
+}
+
+public void fell() {
+ // TODO Auto-generated method stub
+ gameWorld.dynamicLayer.remove(layer);
+ image = assetManager().getImage(getImagePathFell());
+ layer = graphics().createImageLayer(image);
+ initPreLoad(gameWorld);
+ image.addCallback(new ResourceCallback<Image>() {
+ public void done(Image image) {
+ // since the image is loaded, we can use its width and height
+ layer.setWidth(image.width());
+ layer.setHeight(image.height());
+ layer.setOrigin(image.width() / 2f, image.height() / 2f);
+ layer.setScale(getWidth() / image.width(), getHeight() / image.height());
+ layer.setTranslation(x, y);
+ layer.setRotation(angle);
+ initPostLoad(gameWorld);
+ }
+
+ public void error(Throwable err) {
+ PlayN.log().error("Error loading image: " + err.getMessage());
+ }
+ });
+
+ }
+
+public void normal() {
+ // TODO Auto-generated method stub
+ gameWorld.dynamicLayer.remove(layer);
+ image = assetManager().getImage(getImagePath());
+ layer = graphics().createImageLayer(image);
+ initPreLoad(gameWorld);
+ image.addCallback(new ResourceCallback<Image>() {
+ public void done(Image image) {
+ // since the image is loaded, we can use its width and height
+ layer.setWidth(image.width());
+ layer.setHeight(image.height());
+ layer.setOrigin(image.width() / 2f, image.height() / 2f);
+ layer.setScale(getWidth() / image.width(), getHeight() / image.height());
+ layer.setTranslation(x, y);
+ layer.setRotation(angle);
+ initPostLoad(gameWorld);
+ }
+
+ public void error(Throwable err) {
+ PlayN.log().error("Error loading image: " + err.getMessage());
+ }
+ });
+
+ }
+
+@Override
+public void addScore() {
+ this.gameWorld.addScore(100);
+
+}
+
+@Override
+public void dead() {
+//this.gameWorld.getSound().playCoin();
+ this.gameWorld.drawCoin(this);
+ addScore();
+
+}
+
+}
+
Modified: trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java 2012-06-20 07:25:52 UTC (rev 470)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java 2012-06-20 14:25:11 UTC (rev 471)
@@ -87,8 +87,8 @@
if( this.prevX > rightBorder || this.isDead()==true)
destroy();
if(fallPosition > body.getPosition().x ){
- System.out.println("fallPosition: "+fallPosition);
- System.out.println("pos: "+body.getPosition().x);
+// System.out.println("fallPosition: "+fallPosition);
+// System.out.println("pos: "+body.getPosition().x);
this.setAngularVelocity(-3.5f);
}else {
if(this.prevY<1)
Modified: trunk/saim-game/src/main/java/net/saim/game/client/panels/LandingPanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/panels/LandingPanel.java 2012-06-20 07:25:52 UTC (rev 470)
+++ trunk/saim-game/src/main/java/net/saim/game/client/panels/LandingPanel.java 2012-06-20 14:25:11 UTC (rev 471)
@@ -220,7 +220,7 @@
body.add(creditsHead);
body.setHorizontalAlignment(ALIGN_CENTER);
- body.add(newbieCheckBox);
+// body.add(newbieCheckBox);
body.add(continueButton);
body.addStyleName("landingPanel_body");
DOM.setStyleAttribute(body.getElement(), "padding", "10px 15px");
@@ -307,7 +307,14 @@
}
public boolean getNewbie(){
- return !this.newbieCheckBox.getValue();
+// return !this.newbieCheckBox.getValue();
+ String urlParam = com.google.gwt.user.client.Window.Location.getParameter("pro");
+// Window.alert("urlParam: "+urlParam);
+ if(urlParam!=null && urlParam.equals("true")){
+ return false;
+ }
+ else
+ return true;
}
}
Modified: trunk/saim-game/src/main/java/net/saim/game/client/panels/StartPanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/panels/StartPanel.java 2012-06-20 07:25:52 UTC (rev 470)
+++ trunk/saim-game/src/main/java/net/saim/game/client/panels/StartPanel.java 2012-06-20 14:25:11 UTC (rev 471)
@@ -13,6 +13,10 @@
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.dom.client.KeyDownEvent;
+import com.google.gwt.event.dom.client.KeyDownHandler;
+import com.google.gwt.event.dom.client.KeyPressEvent;
+import com.google.gwt.event.dom.client.KeyPressHandler;
import com.google.gwt.event.dom.client.MouseDownEvent;
import com.google.gwt.event.dom.client.MouseDownHandler;
import com.google.gwt.user.cellview.client.CellTable;
@@ -118,7 +122,7 @@
return object.getPredicate();
}
};
- linksetTable.addColumn(predicateColumn,"Relation");
+// linksetTable.addColumn(predicateColumn,"Relation");
Column<Linkset, String> descrColumn = new Column<Linkset, String>(
new TextCell()) {
@@ -227,6 +231,7 @@
logoutButton = new Button("Logout");
logoutButton.addStyleName("myButton");
logoutButton.setEnabled(false);
+ logoutButton.setVisible(false);
Image googleImage = new Image("http://www.supportnet.de/articleimage/2398219/01-Google-Logo.jpg");
googleImage.setStyleName("startPanel_loginImage");
@@ -282,7 +287,17 @@
loginButton.setText("Enter your username");
selectedLogin=USERNAME_LOGIN;
}});
+ nameInput.addKeyPressHandler(new KeyPressHandler(){
+
+ public void onKeyPress(KeyPressEvent event) {
+ System.out.println("keyyy: "+nameInput.getText().length());
+ if(nameInput.getText().length()>1)
+ loginButton.setText("Login");
+ else
+ loginButton.setText("Enter your username");
+ }});
+
// LoginPanel
VerticalPanel socialLoginPanel = new VerticalPanel();
socialLoginPanel.add(loginInfoSocial);
@@ -428,6 +443,7 @@
loginButton.setText("Logged in as '"+userName+"'");
loginButton.setEnabled(false);
logoutButton.setEnabled(true);
+ logoutButton.setVisible(true);
logoutButton.setText("Logout '"+userName+"'");
google.setEnabled(false);
fb.setEnabled(false);
@@ -442,6 +458,7 @@
loginButton.setText("Select Login");
loginButton.setEnabled(true);
logoutButton.setEnabled(false);
+ logoutButton.setVisible(false);
logoutButton.setText("Logout");
google.setEnabled(true);
fb.setEnabled(true);
Modified: trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java 2012-06-20 07:25:52 UTC (rev 470)
+++ trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java 2012-06-20 14:25:11 UTC (rev 471)
@@ -4,6 +4,7 @@
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HorizontalPanel;
@@ -116,7 +117,7 @@
image5 = new Image("Application/images/tutorial/tutorialGoal2.png");
image6 = new Image("Application/images/tutorial/tutorialGoal3.png");
image7 = new Image("Application/images/tutorial/tutorialUnits.png");
- image8 = new Image("Application/images/tutorial/tutorialVerify.png");
+ image8 = new Image("Application/images/tutorial/tutorialVerify2.png");
image0.setStyleName("tutorialPanel_image");
image1.setStyleName("tutorialPanel_image");
@@ -127,7 +128,7 @@
image6.setStyleName("tutorialPanel_image");
image7.setStyleName("tutorialPanel_image");
image8.setStyleName("tutorialPanel_image");
-
+ DOM.setStyleAttribute(image8.getElement(), "height", "200px");
}
@@ -222,14 +223,14 @@
// Head
headHTML.setHTML("Tutorial: Controls");
// Topic
- topicHTML.setHTML("Change drop-position");
+ topicHTML.setHTML("Change drop position");
// Image
picPanel.clear();
picPanel.add(image1);
// Text
textHTML
.setHTML("Use the <b>LEFT</b> and <b>RIGHT</b> arrow key to switch "
- + "between drop-positions.");
+ + "between drop positions.");
}
public void controls2() {
@@ -237,13 +238,13 @@
// Head
headHTML.setHTML("Tutorial: Controls");
// Topic
- topicHTML.setHTML("Change drop-position");
+ topicHTML.setHTML("Change drop position");
// Image
picPanel.clear();
picPanel.add(image2);
// Text
textHTML
- .setHTML("Each level has a <b>fixed</b> amount of <b>drop-positions</b>.");
+ .setHTML("Each level has a <b>fixed</b> amount of <b>drop positions</b>.");
}
public void controls3() {
@@ -265,13 +266,13 @@
// Head
headHTML.setHTML("Tutorial: Goal");
// Topic
- topicHTML.setHTML("Hit Enemy-Peas");
+ topicHTML.setHTML("Hit Enemy Peas");
// Image
picPanel.clear();
picPanel.add(image4);
// Text
textHTML
- .setHTML("Try to <b>hit</b> the <b>enemy-peas</b> with your own pea.");
+ .setHTML("Try to <b>hit</b> the <b>enemy peas</b> with your own pea. ");
}
public void goal2() {
@@ -280,14 +281,14 @@
// Head
headHTML.setHTML("Tutorial: Goal");
// Topic
- topicHTML.setHTML("Hit Enemy-Peas");
+ topicHTML.setHTML("Hit Enemy Peas");
// Image
picPanel.clear();
picPanel.add(image5);
// Text
textHTML
.setHTML("Weakened peas will change their color. "
- + "Your <b>score</b> increases</b> with every <b>eliminated enemy-pea</b>.");
+ + "Your <b>score</b> increases</b> with every <b>eliminated enemy pea</b>.");
}
public void goal3() {
@@ -302,7 +303,7 @@
picPanel.add(image6);
// Text
textHTML
- .setHTML("Enemy-peas <b>must not</b> reach your side! Defend your village!");
+ .setHTML("Enemy peas <b>must not</b> reach your side! Defend your village!");
}
public void units() {
@@ -334,9 +335,9 @@
picPanel.add(image8);
// Text
textHTML
- .setHTML("Decide whether this statement is <b>Valid</b> or <b>Not Valid</b>. "
+ .setHTML("Decide whether this statement is <b>True</b> or <b>Not False</b>. "
+ "If you don't have a clue, choose <b>Not Sure</b>. <br>For each verified statement, you'll be rewarded with coins - which you can use to buy new units."
- + "<br><br><b>Shortcut-Keys:</b> Push key <b>[1]</b> for <b>Valid</b>, key <b>[2]</b> for <b>Not Valid</b> and key <b>[3]</b> for <b>Not Sure</b>."
+ + "<br><br><b>Shortcut-Keys:</b> Push key <b>[1]</b> for <b>Valid</b>, key <b>[2]</b> for <b>Not Valid</b> and key <b>[3]</b> for <b>Not Sure</b>. "
+ "<br><br>Please mark a statement as valid or not valid <b>only</b> if you're <b>secure</b> in your decision."
+ "<br>If your verification <b>corresponds</b> to the verification of the majority of the players, you will get a <b>bonus</b>."
+ "<br>But watch out: False verifications will be <b>punished</b>! So avoid making random decisions."
@@ -344,6 +345,26 @@
// + "<br>and if you have the slightest doubt, better choose 'Not Sure' or click the <b>http-links</b> for further information."
+ "<br><br>Thanks for your attention. Now have some fun and start playing! :)<br>");
+// textHTML
+// .setHTML("Decide whether this statement is True <img src='Application/images/verification/true.png'/> or False <img src='Application/images/verification/false.png'/>. If you don't have a clue, choose Unsure <img src='Application/images/verification/unsure.png'/>." +
+// "</br></br>You earn coins for answering questions correctly, which you can use to buy new units. " +
+// "</br>The more difficult the questions are, the higher your reward." +
+// "</br>If you incorrectly answer a question, you get a penalty." +
+// "</br>If the player community has no agreement on the answer of a question," +
+// "</br>you get only few coins as bonus for answering the questions (we do not know the correct answer - it is all up to the players). " +
+// "</br></br>Shortcut-Keys: Push <img src='Application/images/verification/key1.png'/> for True, <img src='Application/images/verification/key1.png'/> for False and <img src='Application/images/verification/key1.png'/> for Unsure. </br>Thanks for your attention. Now have some fun and start playing! :)");
+ textHTML
+ .setHTML("Decide whether this statement is True <img src='Application/images/verification/true.png'/> or False <img src='Application/images/verification/false.png'/>. If you don't have a clue, choose Unsure <img src='Application/images/verification/unsure.png'/>." +
+ "</br></br>You earn coins for answering questions correctly, which you can use to buy new units. " +
+ "</br>The more difficult the questions are, the higher your reward." +
+ "If you incorrectly answer a question, you get a penalty. " +
+ "</br>If the player community has no agreement on the answer of a question, " +
+ "you get only few coins as bonus for answering the questions (we do not know the correct answer - it is all up to the players). " +
+ "</br></br><b>Shortcut-Keys:</b> Push <img src='Application/images/verification/key1.png'/> for True, <img src='Application/images/verification/key1.png'/> for False and <img src='Application/images/verification/key1.png'/> for Unsure. " +
+ "</br></br>Thanks for your attention. Now have some fun and start playing! :)");
+
+ DOM.setStyleAttribute(textHTML.getElement(), "width", "850px");
+ DOM.setStyleAttribute(textHTML.getElement(), "padding", "6px");
}
public void verify2() {
Modified: trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java 2012-06-20 07:25:52 UTC (rev 470)
+++ trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java 2012-06-20 14:25:11 UTC (rev 471)
@@ -542,9 +542,9 @@
predicatePanel.setStyleName("predicatePanel");
// RadioButtons
- rdbtnValid = new RadioButton("selectionGroup", "1",true);
- rdbtnNotValid = new RadioButton("selectionGroup","2",true);
- rdbtnNotSure = new RadioButton("selectionGroup","3",true);
+ rdbtnValid = new RadioButton("selectionGroup");
+ rdbtnNotValid = new RadioButton("selectionGroup");
+ rdbtnNotSure = new RadioButton("selectionGroup");
rdbtnValid.setVisible(true);
rdbtnNotValid.setVisible(true);
rdbtnNotSure.setVisible(true);
@@ -554,7 +554,9 @@
r1Panel.setHorizontalAlignment(ALIGN_CENTER);
r1Panel.add(rdbtnValid);
Image i1 = new Image("Application/images/verification/true.png");
+ Image k1 = new Image("Application/images/verification/key1.png");
// i1.setSize("25px", "25px");
+ r1Panel.add(k1);
r1Panel.add(i1);
r1Panel.setSpacing(2);
@@ -563,6 +565,8 @@
r2Panel.add(rdbtnNotValid);
Image i2 = new Image("Application/images/verification/false.png");
// i2.setSize("25px", "25px");
+ Image k2 = new Image("Application/images/verification/key2.png");
+ r2Panel.add(k2);
r2Panel.add(i2);
r2Panel.setSpacing(2);
@@ -571,6 +575,8 @@
r3Panel.add(rdbtnNotSure);
Image i3 = new Image("Application/images/verification/unsure.png");
// i3.setSize("25px", "25px");
+ Image k3 = new Image("Application/images/verification/key3.png");
+ r3Panel.add(k3);
r3Panel.add(i3);
r3Panel.setSpacing(2);
@@ -596,7 +602,7 @@
if(config.isSimple()==false)
middlePanel.add(predicatePanel);
middlePanel.add(rdbtnPanel);
- middlePanel.add(verifyButton);
+// middlePanel.add(verifyButton);
middlePanel.setStyleName("middlePanel");
RootPanel.get("predicate").add(middlePanel);
Modified: trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-20 07:25:52 UTC (rev 470)
+++ trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-20 14:25:11 UTC (rev 471)
@@ -923,7 +923,7 @@
verifications = new ArrayList<Verification>();
}
// normal
- if(verifications.size() < 4){
+ if(verifications.size() < 3){
echo("Get Easy Link! Number of verifications: "+verifications.size());
// SQLqueryLinks = "select * from links, difficulty where links.ID = difficulty.ID AND links.linkedOntologies='"+linkset+"' and links.Confidence not in (1,-1,-2) "+notIn+" and difficulty.Difficulty is not null order by abs(difficulty.Difficulty -0) limit 1";
// SQLqueryLinks="SELECT * FROM easy_questions WHERE linkedOntologies='"+linkset+"' order by Counter limit 1";
@@ -974,6 +974,7 @@
}
}// eval
else if (nextLink == Message.EVAL_LINK) {
+ echo("Get Evaluation link!");
SQLqueryLinks = "select * from links, difficulty where links.ID = difficulty.ID AND links.linkedOntologies='"+linkset+"' and links.Confidence in (1,-2) "+ notIn +" order by links.Counter limit 1";
}
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/pea/enemyCashier.png
===================================================================
(Binary files differ)
Property changes on: trunk/saim-game/src/main/resources/net/saim/game/resources/images/pea/enemyCashier.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/pea/enemyCashier_fell.png
===================================================================
(Binary files differ)
Property changes on: trunk/saim-game/src/main/resources/net/saim/game/resources/images/pea/enemyCashier_fell.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/pea/enemyCashier_hit.png
===================================================================
(Binary files differ)
Property changes on: trunk/saim-game/src/main/resources/net/saim/game/resources/images/pea/enemyCashier_hit.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jen...@us...> - 2012-06-20 07:26:01
|
Revision: 470
http://saim.svn.sourceforge.net/saim/?rev=470&view=rev
Author: jenslehmann
Date: 2012-06-20 07:25:52 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
images for player levels
Added Paths:
-----------
trunk/saim-game/src/main/resources/net/saim/game/resources/images/levels/
trunk/saim-game/src/main/resources/net/saim/game/resources/images/levels/bronze.svg
trunk/saim-game/src/main/resources/net/saim/game/resources/images/levels/gold.svg
trunk/saim-game/src/main/resources/net/saim/game/resources/images/levels/silver.svg
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/levels/bronze.svg
===================================================================
--- trunk/saim-game/src/main/resources/net/saim/game/resources/images/levels/bronze.svg (rev 0)
+++ trunk/saim-game/src/main/resources/net/saim/game/resources/images/levels/bronze.svg 2012-06-20 07:25:52 UTC (rev 470)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg2776" sodipodi:version="0.32" inkscape:version="0.45" width="282.83398" height="366.73691" sodipodi:docbase="/home/evans/Desktop" sodipodi:docname="PeterM_Medallion.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" sodipodi:modified="true" version="1.0">
+ <metadata id="metadata2781">
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs id="defs2779">
+ <linearGradient id="linearGradient3960">
+ <stop id="stop3962" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+ <stop id="stop3964" offset="1" style="stop-color:#ffffff;stop-opacity:0;"/>
+ </linearGradient>
+ <radialGradient inkscape:collect="always" xlink:href="#linearGradient3960" id="radialGradient2709" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.2793654,0.6548739,-0.6588766,-8.7737761e-2,657.02488,359.2947)" cx="259.8519" cy="485.57144" fx="259.8519" fy="485.57144" r="13.5"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4142" id="linearGradient2707" gradientUnits="userSpaceOnUse" x1="361.19095" y1="80.282722" x2="360.27524" y2="444.9689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4142" id="linearGradient2705" gradientUnits="userSpaceOnUse" x1="361.19095" y1="110.5407" x2="360.27524" y2="444.9689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4142" id="linearGradient2703" gradientUnits="userSpaceOnUse" x1="357.9162" y1="152.25885" x2="357.00049" y2="440.06088"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4142" id="linearGradient2701" gradientUnits="userSpaceOnUse" x1="353.58734" y1="493.62003" x2="359.00797" y2="180.48428"/>
+ <linearGradient id="linearGradient4142">
+ <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop4144"/>
+ <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop4146"/>
+ </linearGradient>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4142" id="linearGradient2699" gradientUnits="userSpaceOnUse" x1="353.58734" y1="493.62003" x2="359.00797" y2="180.48428"/>
+ <linearGradient id="linearGradient8560">
+ <stop style="stop-color:#c2590e;stop-opacity:1;" offset="0" id="stop8562"/>
+ <stop id="stop8564" offset="0.5" style="stop-color:#e2792e;stop-opacity:1;"/>
+ <stop style="stop-color:#c2590e;stop-opacity:1;" offset="1" id="stop8566"/>
+ </linearGradient>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient8560" id="linearGradient2727" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.3670583,0,0,0.3670583,377.49448,57.028857)" x1="171.83858" y1="381.28146" x2="577.02722" y2="381.28146"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3517" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3515" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3513" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3935" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient9646" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient9644" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient9642" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3933" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3847" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3845" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3843" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3931" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3839" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3837" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3835" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient id="linearGradient3391">
+ <stop style="stop-color:#ffffff;stop-opacity:0" offset="0" id="stop3393"/>
+ <stop id="stop3399" offset="0.5" style="stop-color:#000000;stop-opacity:1;"/>
+ <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3395"/>
+ </linearGradient>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3929" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient8560" id="linearGradient4374" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.3670583,0,0,0.3670583,-40.33993,-43.910063)" x1="171.83858" y1="381.28146" x2="577.02722" y2="381.28146"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient8560" id="linearGradient2262" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.3670583,0,0,0.3670583,-40.33993,-43.910063)" x1="171.83858" y1="381.28146" x2="577.02722" y2="381.28146"/>
+ </defs>
+ <sodipodi:namedview inkscape:window-height="694" inkscape:window-width="1020" inkscape:pageshadow="2" inkscape:pageopacity="0.0" guidetolerance="10.0" gridtolerance="10.0" objecttolerance="10.0" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" id="base" inkscape:zoom="1.3061134" inkscape:cx="141.41699" inkscape:cy="183.36845" inkscape:window-x="0" inkscape:window-y="24" inkscape:current-layer="svg2776" inkscape:showpageshadow="false"/>
+ <g id="g2300" transform="translate(-12.179455,-10.342186)">
+ <g id="g3799" transform="matrix(1.2465306,0.5256859,-0.5256859,1.2465306,-549.51988,-509.13289)">
+ <g id="g3801" transform="matrix(9.6887094e-2,0.1390946,7.5379123e-2,-5.2505733e-2,646.96658,345.93557)">
+ <path style="opacity:1;fill:#d2691e;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M -569.1042,283.05305 C -19.326927,281.66471 -570.4235,407.76552 -17.797661,406.37717 C -18.454324,488.08697 -20.209958,376.99083 -19.536859,542.84819 C -567.36497,544.23653 -23.284898,417.99619 -570.21357,419.38453 C -570.21358,268.05541 -569.1042,467.70235 -569.1042,283.05305 z " id="path3803" sodipodi:nodetypes="ccccc"/>
+ <path sodipodi:nodetypes="ccccc" id="path3805" d="M -569.1042,419.05305 C -19.326927,417.66471 -570.4235,543.76552 -17.797661,542.37717 C -18.454324,624.08697 -20.209958,512.99083 -19.536859,678.84819 C -567.36497,680.23653 -23.284898,553.99619 -570.21357,555.38453 C -570.21358,404.05541 -569.1042,603.70235 -569.1042,419.05305 z " style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="opacity:1;fill:#f2893e;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M -569.1042,555.05305 C -19.326927,553.66471 -570.4235,679.76552 -17.797661,678.37717 C -18.454324,760.08697 -20.209958,648.99083 -19.536859,814.84819 C -567.36497,816.23653 -23.284898,689.99619 -570.21357,691.38453 C -570.21358,540.05541 -569.1042,739.70235 -569.1042,555.05305 z " id="path3807" sodipodi:nodetypes="ccccc"/>
+ </g>
+ <g id="g3809" style="opacity:0.39901476;fill:url(#linearGradient3929);fill-opacity:1;stroke:none" transform="matrix(9.6887094e-2,0.1390946,7.5379123e-2,-5.2505733e-2,567.02256,270.61064)">
+ <path sodipodi:nodetypes="ccccc" id="path3811" d="M 65.077269,528.47932 C 614.85454,527.09098 63.757969,653.19179 616.38381,651.80344 C 615.72715,733.51324 613.97151,622.4171 614.64461,788.27446 C 66.816499,789.6628 610.89657,663.42246 63.967899,664.8108 C 63.967889,513.48168 65.077269,713.12862 65.077269,528.47932 z " style="opacity:1;fill:url(#linearGradient3835);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="opacity:1;fill:url(#linearGradient3837);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 65.077269,664.47932 C 614.85454,663.09098 63.757969,789.19179 616.38381,787.80344 C 615.72715,869.51324 613.97151,758.4171 614.64461,924.27446 C 66.816499,925.6628 610.89657,799.42246 63.967899,800.8108 C 63.967889,649.48168 65.077269,849.12862 65.077269,664.47932 z " id="path3813" sodipodi:nodetypes="ccccc"/>
+ <path sodipodi:nodetypes="ccccc" id="path3815" d="M 65.077269,800.47932 C 614.85454,799.09098 63.757969,925.19179 616.38381,923.80344 C 615.72715,1005.5132 613.97151,894.4171 614.64461,1060.2745 C 66.816499,1061.6628 610.89657,935.42246 63.967899,936.8108 C 63.967889,785.48168 65.077269,985.12862 65.077269,800.47932 z " style="opacity:1;fill:url(#linearGradient3839);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ </g>
+ <g id="g3817" transform="matrix(1.0546877,1.5141477,0.8205576,-0.5715638,-17.973682,-654.24584)">
+ <path sodipodi:nodetypes="cccsssssscc" id="path3819" d="M 697.85542,0.0010472667 C 647.35107,-0.12649022 697.97661,11.457545 647.21058,11.330007 C 647.2709,18.836138 647.43218,8.6304811 647.37035,23.866684 C 653.66101,23.882626 658.38439,23.715375 661.93214,23.410728 C 665.47989,23.106082 667.85201,22.66404 669.44017,22.130401 C 671.02833,21.596763 671.83253,20.971527 672.24441,20.300493 C 672.6563,19.62946 672.67588,18.912627 672.69482,18.195795 C 672.71376,17.478963 672.73205,16.76213 673.14136,16.091097 C 673.55067,15.420063 674.35099,14.794827 675.93398,14.261189 C 677.51698,13.72755 679.88265,13.285508 683.42265,12.980862 C 683.4831,12.969175 698.05928,0.012719816 697.85542,0.0010472667 z " style="fill:#d2691e;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 683.2612,12.94986 C 679.71292,13.254156 677.34924,13.695698 675.77461,14.228735 C 674.19999,14.761773 673.41442,15.386308 673.02236,16.05659 C 672.63029,16.726873 672.63173,17.442904 672.63113,18.158935 C 672.63053,18.874966 672.62788,19.590998 672.22764,20.26128 C 671.8274,20.931563 671.02956,21.556097 669.43858,22.089135 C 667.8476,22.622173 665.46348,23.063714 661.89066,23.36801 C 658.31784,23.672306 653.55633,23.839357 647.21058,23.823415 C 647.2709,31.329546 647.43218,21.123889 647.37035,36.360092 C 653.66101,36.376034 658.38439,36.208783 661.93214,35.904136 C 665.47989,35.59949 667.85201,35.157448 669.44017,34.623809 C 671.02833,34.090171 671.83253,33.464935 672.24441,32.793901 C 672.6563,32.122867 672.67588,31.406035 672.69482,30.689203 C 672.71376,29.972371 672.73205,29.255539 673.14136,28.584505 C 673.55067,27.913471 674.35099,27.288235 675.93398,26.754597 C 677.51698,26.220958 679.88265,25.778916 683.42265,25.47427 C 675.30408,20.669029 675.30111,20.763783 683.2612,12.94986 z " id="path3821" sodipodi:nodetypes="cssssssccsssssscc"/>
+ <path sodipodi:nodetypes="csssssscccc" id="path3823" d="M 683.2612,25.443268 C 679.71292,25.747564 677.34924,26.189105 675.77461,26.722143 C 674.19999,27.255181 673.41442,27.879715 673.02236,28.549998 C 672.63029,29.220281 672.63173,29.936312 672.63113,30.652343 C 672.63053,31.368374 672.62788,32.084405 672.22764,32.754688 C 671.8274,33.424971 671.02956,34.049505 669.43858,34.582543 C 667.8476,35.115581 665.46348,35.557122 661.89066,35.861418 C 658.31784,36.165714 653.55633,36.332765 647.21058,36.316823 C 647.2709,43.822954 647.43218,33.617297 647.37035,48.8535 C 697.69564,48.981038 647.71466,37.384184 697.95733,37.511722 C 697.82669,37.320383 683.17246,25.284264 683.2612,25.443268 z " style="fill:#f2893e;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ </g>
+ <g id="g3825" style="opacity:0.39899998;fill:url(#linearGradient3931);fill-opacity:1" transform="matrix(1.0546877,1.5141477,0.8205576,-0.5715638,-80.772018,-741.89288)">
+ <path style="opacity:0.39899998;fill:url(#linearGradient3843);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 756.282,1.4348285 C 705.77765,1.307291 756.40319,12.891326 705.63716,12.763788 C 705.69748,20.269919 705.85876,10.064262 705.79693,25.300465 C 712.08759,25.316407 716.81097,25.149156 720.35872,24.844509 C 723.90647,24.539863 726.27859,24.097821 727.86675,23.564182 C 729.45491,23.030544 730.25911,22.405308 730.67099,21.734274 C 731.08288,21.063241 731.10246,20.346408 731.1214,19.629576 C 731.14034,18.912744 731.15863,18.195911 731.56794,17.524878 C 731.97725,16.853844 732.77757,16.228608 734.36056,15.69497 C 735.94356,15.161331 738.30923,14.719289 741.84923,14.414643 C 741.90968,14.402956 756.48586,1.446501 756.282,1.4348285 z " id="path3827" sodipodi:nodetypes="cccsssssscc"/>
+ <path sodipodi:nodetypes="cssssssccsssssscc" id="path3829" d="M 741.68778,14.383641 C 738.1395,14.687937 735.77582,15.129479 734.20119,15.662516 C 732.62657,16.195554 731.841,16.820089 731.44894,17.490371 C 731.05687,18.160654 731.05831,18.876685 731.05771,19.592716 C 731.05711,20.308747 731.05446,21.024779 730.65422,21.695061 C 730.25398,22.365344 729.45614,22.989878 727.86516,23.522916 C 726.27418,24.055954 723.89006,24.497495 720.31724,24.801791 C 716.74442,25.106087 711.98291,25.273138 705.63716,25.257196 C 705.69748,32.763327 705.85876,22.55767 705.79693,37.793873 C 712.08759,37.809815 716.81097,37.642564 720.35872,37.337917 C 723.90647,37.033271 726.27859,36.591229 727.86675,36.05759 C 729.45491,35.523952 730.25911,34.898716 730.67099,34.227682 C 731.08288,33.556648 731.10246,32.839816 731.1214,32.122984 C 731.14034,31.406152 731.15863,30.68932 731.56794,30.018286 C 731.97725,29.347252 732.77757,28.722016 734.36056,28.188378 C 735.94356,27.654739 738.30923,27.212697 741.84923,26.908051 C 733.73066,22.10281 733.72769,22.197564 741.68778,14.383641 z " style="opacity:0.39899998;fill:url(#linearGradient3845);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="opacity:0.39899998;fill:url(#linearGradient3847);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 741.68778,26.877049 C 738.1395,27.181345 735.77582,27.622886 734.20119,28.155924 C 732.62657,28.688962 731.841,29.313496 731.44894,29.983779 C 731.05687,30.654062 731.05831,31.370093 731.05771,32.086124 C 731.05711,32.802155 731.05446,33.518186 730.65422,34.188469 C 730.25398,34.858752 729.45614,35.483286 727.86516,36.016324 C 726.27418,36.549362 723.89006,36.990903 720.31724,37.295199 C 716.74442,37.599495 711.98291,37.766546 705.63716,37.750604 C 705.69748,45.256735 705.85876,35.051078 705.79693,50.287281 C 756.12222,50.414819 706.14124,38.817965 756.38391,38.945503 C 756.25327,38.754164 741.59904,26.718045 741.68778,26.877049 z " id="path3831" sodipodi:nodetypes="csssssscccc"/>
+ </g>
+ </g>
+ <g transform="matrix(1.3528429,0,0,1.3528429,-730.48976,-211.65696)" id="g3777">
+ <g transform="matrix(9.6887094e-2,0.1390946,7.5379123e-2,-5.2505733e-2,646.96658,345.93557)" id="g3444">
+ <path sodipodi:nodetypes="ccccc" id="path3446" d="M -569.1042,283.05305 C -19.326927,281.66471 -570.4235,407.76552 -17.797661,406.37717 C -18.454324,488.08697 -20.209958,376.99083 -19.536859,542.84819 C -567.36497,544.23653 -23.284898,417.99619 -570.21357,419.38453 C -570.21358,268.05541 -569.1042,467.70235 -569.1042,283.05305 z " style="opacity:1;fill:#d2691e;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M -569.1042,419.05305 C -19.326927,417.66471 -570.4235,543.76552 -17.797661,542.37717 C -18.454324,624.08697 -20.209958,512.99083 -19.536859,678.84819 C -567.36497,680.23653 -23.284898,553.99619 -570.21357,555.38453 C -570.21358,404.05541 -569.1042,603.70235 -569.1042,419.05305 z " id="path3448" sodipodi:nodetypes="ccccc"/>
+ <path sodipodi:nodetypes="ccccc" id="path3450" d="M -569.1042,555.05305 C -19.326927,553.66471 -570.4235,679.76552 -17.797661,678.37717 C -18.454324,760.08697 -20.209958,648.99083 -19.536859,814.84819 C -567.36497,816.23653 -23.284898,689.99619 -570.21357,691.38453 C -570.21358,540.05541 -569.1042,739.70235 -569.1042,555.05305 z " style="opacity:1;fill:#f2893e;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ </g>
+ <g transform="matrix(9.6887094e-2,0.1390946,7.5379123e-2,-5.2505733e-2,567.02256,270.61064)" style="opacity:0.39901476;fill:url(#linearGradient3933);fill-opacity:1;stroke:none" id="g3452">
+ <path style="opacity:1;fill:url(#linearGradient9642);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 65.077269,528.47932 C 614.85454,527.09098 63.757969,653.19179 616.38381,651.80344 C 615.72715,733.51324 613.97151,622.4171 614.64461,788.27446 C 66.816499,789.6628 610.89657,663.42246 63.967899,664.8108 C 63.967889,513.48168 65.077269,713.12862 65.077269,528.47932 z " id="path3454" sodipodi:nodetypes="ccccc"/>
+ <path sodipodi:nodetypes="ccccc" id="path3456" d="M 65.077269,664.47932 C 614.85454,663.09098 63.757969,789.19179 616.38381,787.80344 C 615.72715,869.51324 613.97151,758.4171 614.64461,924.27446 C 66.816499,925.6628 610.89657,799.42246 63.967899,800.8108 C 63.967889,649.48168 65.077269,849.12862 65.077269,664.47932 z " style="opacity:1;fill:url(#linearGradient9644);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="opacity:1;fill:url(#linearGradient9646);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 65.077269,800.47932 C 614.85454,799.09098 63.757969,925.19179 616.38381,923.80344 C 615.72715,1005.5132 613.97151,894.4171 614.64461,1060.2745 C 66.816499,1061.6628 610.89657,935.42246 63.967899,936.8108 C 63.967889,785.48168 65.077269,985.12862 65.077269,800.47932 z " id="path3458" sodipodi:nodetypes="ccccc"/>
+ </g>
+ <g transform="matrix(1.0546877,1.5141477,0.8205576,-0.5715638,-17.973682,-654.24584)" id="g9451">
+ <path style="fill:#d2691e;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 697.85542,0.0010472667 C 647.35107,-0.12649022 697.97661,11.457545 647.21058,11.330007 C 647.2709,18.836138 647.43218,8.6304811 647.37035,23.866684 C 653.66101,23.882626 658.38439,23.715375 661.93214,23.410728 C 665.47989,23.106082 667.85201,22.66404 669.44017,22.130401 C 671.02833,21.596763 671.83253,20.971527 672.24441,20.300493 C 672.6563,19.62946 672.67588,18.912627 672.69482,18.195795 C 672.71376,17.478963 672.73205,16.76213 673.14136,16.091097 C 673.55067,15.420063 674.35099,14.794827 675.93398,14.261189 C 677.51698,13.72755 679.88265,13.285508 683.42265,12.980862 C 683.4831,12.969175 698.05928,0.012719816 697.85542,0.0010472667 z " id="path9453" sodipodi:nodetypes="cccsssssscc"/>
+ <path sodipodi:nodetypes="cssssssccsssssscc" id="path9455" d="M 683.2612,12.94986 C 679.71292,13.254156 677.34924,13.695698 675.77461,14.228735 C 674.19999,14.761773 673.41442,15.386308 673.02236,16.05659 C 672.63029,16.726873 672.63173,17.442904 672.63113,18.158935 C 672.63053,18.874966 672.62788,19.590998 672.22764,20.26128 C 671.8274,20.931563 671.02956,21.556097 669.43858,22.089135 C 667.8476,22.622173 665.46348,23.063714 661.89066,23.36801 C 658.31784,23.672306 653.55633,23.839357 647.21058,23.823415 C 647.2709,31.329546 647.43218,21.123889 647.37035,36.360092 C 653.66101,36.376034 658.38439,36.208783 661.93214,35.904136 C 665.47989,35.59949 667.85201,35.157448 669.44017,34.623809 C 671.02833,34.090171 671.83253,33.464935 672.24441,32.793901 C 672.6563,32.122867 672.67588,31.406035 672.69482,30.689203 C 672.71376,29.972371 672.73205,29.255539 673.14136,28.584505 C 673.55067,27.913471 674.35099,27.288235 675.93398,26.754597 C 677.51698,26.220958 679.88265,25.778916 683.42265,25.47427 C 675.30408,20.669029 675.30111,20.763783 683.2612,12.94986 z " style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="fill:#f2893e;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 683.2612,25.443268 C 679.71292,25.747564 677.34924,26.189105 675.77461,26.722143 C 674.19999,27.255181 673.41442,27.879715 673.02236,28.549998 C 672.63029,29.220281 672.63173,29.936312 672.63113,30.652343 C 672.63053,31.368374 672.62788,32.084405 672.22764,32.754688 C 671.8274,33.424971 671.02956,34.049505 669.43858,34.582543 C 667.8476,35.115581 665.46348,35.557122 661.89066,35.861418 C 658.31784,36.165714 653.55633,36.332765 647.21058,36.316823 C 647.2709,43.822954 647.43218,33.617297 647.37035,48.8535 C 697.69564,48.981038 647.71466,37.384184 697.95733,37.511722 C 697.82669,37.320383 683.17246,25.284264 683.2612,25.443268 z " id="path9457" sodipodi:nodetypes="csssssscccc"/>
+ </g>
+ <g transform="matrix(1.0546877,1.5141477,0.8205576,-0.5715638,-80.772018,-741.89288)" style="opacity:0.39899998;fill:url(#linearGradient3935);fill-opacity:1" id="g9459">
+ <path sodipodi:nodetypes="cccsssssscc" id="path9461" d="M 756.282,1.4348285 C 705.77765,1.307291 756.40319,12.891326 705.63716,12.763788 C 705.69748,20.269919 705.85876,10.064262 705.79693,25.300465 C 712.08759,25.316407 716.81097,25.149156 720.35872,24.844509 C 723.90647,24.539863 726.27859,24.097821 727.86675,23.564182 C 729.45491,23.030544 730.25911,22.405308 730.67099,21.734274 C 731.08288,21.063241 731.10246,20.346408 731.1214,19.629576 C 731.14034,18.912744 731.15863,18.195911 731.56794,17.524878 C 731.97725,16.853844 732.77757,16.228608 734.36056,15.69497 C 735.94356,15.161331 738.30923,14.719289 741.84923,14.414643 C 741.90968,14.402956 756.48586,1.446501 756.282,1.4348285 z " style="opacity:0.39899998;fill:url(#linearGradient3513);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="opacity:0.39899998;fill:url(#linearGradient3515);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 741.68778,14.383641 C 738.1395,14.687937 735.77582,15.129479 734.20119,15.662516 C 732.62657,16.195554 731.841,16.820089 731.44894,17.490371 C 731.05687,18.160654 731.05831,18.876685 731.05771,19.592716 C 731.05711,20.308747 731.05446,21.024779 730.65422,21.695061 C 730.25398,22.365344 729.45614,22.989878 727.86516,23.522916 C 726.27418,24.055954 723.89006,24.497495 720.31724,24.801791 C 716.74442,25.106087 711.98291,25.273138 705.63716,25.257196 C 705.69748,32.763327 705.85876,22.55767 705.79693,37.793873 C 712.08759,37.809815 716.81097,37.642564 720.35872,37.337917 C 723.90647,37.033271 726.27859,36.591229 727.86675,36.05759 C 729.45491,35.523952 730.25911,34.898716 730.67099,34.227682 C 731.08288,33.556648 731.10246,32.839816 731.1214,32.122984 C 731.14034,31.406152 731.15863,30.68932 731.56794,30.018286 C 731.97725,29.347252 732.77757,28.722016 734.36056,28.188378 C 735.94356,27.654739 738.30923,27.212697 741.84923,26.908051 C 733.73066,22.10281 733.72769,22.197564 741.68778,14.383641 z " id="path9463" sodipodi:nodetypes="cssssssccsssssscc"/>
+ <path sodipodi:nodetypes="csssssscccc" id="path9465" d="M 741.68778,26.877049 C 738.1395,27.181345 735.77582,27.622886 734.20119,28.155924 C 732.62657,28.688962 731.841,29.313496 731.44894,29.983779 C 731.05687,30.654062 731.05831,31.370093 731.05771,32.086124 C 731.05711,32.802155 731.05446,33.518186 730.65422,34.188469 C 730.25398,34.858752 729.45614,35.483286 727.86516,36.016324 C 726.27418,36.549362 723.89006,36.990903 720.31724,37.295199 C 716.74442,37.599495 711.98291,37.766546 705.63716,37.750604 C 705.69748,45.256735 705.85876,35.051078 705.79693,50.287281 C 756.12222,50.414819 706.14124,38.817965 756.38391,38.945503 C 756.25327,38.754164 741.59904,26.718045 741.68778,26.877049 z " style="opacity:0.39899998;fill:url(#linearGradient3517);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ </g>
+ </g>
+ <path sodipodi:nodetypes="ccccscccc" id="path2596" d="M 97.09876,45.09771 C 68.61784,45.09771 43.87173,56.48995 31.42552,73.17707 L 22.73485,73.17707 L 23.01331,100.87354 C 22.06341,122.5818 58.36501,146.98718 97.82778,146.98718 C 137.29056,146.98718 171.78121,126.22684 171.19583,100.87354 L 171.46269,73.17707 L 162.77202,73.17707 C 150.32514,56.4914 125.57816,45.09771 97.09876,45.09771 z " style="fill:url(#linearGradient2262);fill-opacity:1;stroke:none;stroke-width:1.46061051;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+ <path sodipodi:type="arc" style="opacity:0.18719213;fill:url(#linearGradient2699);fill-opacity:1;stroke:none;stroke-width:2.20433664;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path2598" sodipodi:cx="372.07529" sodipodi:cy="322.09503" sodipodi:rx="199.92105" sodipodi:ry="141.61075" d="M 571.99634 322.09503 A 199.92105 141.61075 0 1 1 172.15424,322.09503 A 199.92105 141.61075 0 1 1 571.99634 322.09503 z" transform="matrix(0.269873,0,0,0.2056604,-2.15261,49.8295)"/>
+ <path d="M 571.99634 322.09503 A 199.92105 141.61075 0 1 1 172.15424,322.09503 A 199.92105 141.61075 0 1 1 571.99634 322.09503 z" sodipodi:ry="141.61075" sodipodi:rx="199.92105" sodipodi:cy="322.09503" sodipodi:cx="372.07529" id="path2600" style="fill:#d3701f;fill-opacity:1;stroke:none;stroke-width:18.86700058;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:type="arc" transform="matrix(0.3716173,0,0,0.3716173,-41.12478,-48.290529)"/>
+ <path transform="matrix(0.3643546,0,0,0.3643546,-38.53343,-44.09698)" sodipodi:type="arc" style="fill:#d1681d;fill-opacity:1;stroke:none;stroke-width:18.86700058;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path2602" sodipodi:cx="372.07529" sodipodi:cy="322.09503" sodipodi:rx="199.92105" sodipodi:ry="141.61075" d="M 571.99634 322.09503 A 199.92105 141.61075 0 1 1 172.15424,322.09503 A 199.92105 141.61075 0 1 1 571.99634 322.09503 z"/>
+ <path transform="matrix(0.269873,0,0,0.2056604,-2.64856,29.496)" d="M 571.99634 322.09503 A 199.92105 141.61075 0 1 1 172.15424,322.09503 A 199.92105 141.61075 0 1 1 571.99634 322.09503 z" sodipodi:ry="141.61075" sodipodi:rx="199.92105" sodipodi:cy="322.09503" sodipodi:cx="372.07529" id="path2604" style="opacity:0.18719213;fill:url(#linearGradient2701);fill-opacity:1;stroke:none;stroke-width:2.20433664;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:type="arc"/>
+ <path sodipodi:type="arc" style="opacity:0.34004929;fill:url(#linearGradient2703);fill-opacity:1;stroke:none;stroke-width:2.20433664;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path2606" sodipodi:cx="372.07529" sodipodi:cy="322.09503" sodipodi:rx="199.92105" sodipodi:ry="141.61075" d="M 571.99634 322.09503 A 199.92105 141.61075 0 1 1 172.15424,322.09503 A 199.92105 141.61075 0 1 1 571.99634 322.09503 z" transform="matrix(0.3301116,0,0,-0.2936769,-25.29124,164.15877)"/>
+ <path id="path2608" d="M 571.99634,322.09503 C 571.99634,400.26416 482.43171,463.70578 372.07529,463.70578 C 261.71887,463.70578 172.15424,400.26416 172.15424,322.09503 C 172.15424,243.9259 261.71887,180.48428 372.07529,180.48428 C 482.43171,180.48428 571.99634,243.9259 571.99634,322.09503 z " style="opacity:0.63054187;fill:url(#linearGradient2705);fill-opacity:1;stroke:none;stroke-width:2.20433664;stroke-miterlimit:4;stroke-opacity:1" transform="matrix(0.2843468,0,0,0.2529634,-8.76452,-19.528226)"/>
+ <path transform="matrix(0.2757666,0,0,0.2757666,-5.07082,-20.63823)" d="M 571.99634 322.09503 A 199.92105 141.61075 0 1 1 172.15424,322.09503 A 199.92105 141.61075 0 1 1 571.99634 322.09503 z" sodipodi:ry="141.61075" sodipodi:rx="199.92105" sodipodi:cy="322.09503" sodipodi:cx="372.07529" id="path2610" style="fill:#d3701f;fill-opacity:1;stroke:none;stroke-width:2.20433664;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:type="arc"/>
+ <path id="text2884" d="M 123.49544,76.395161 L 96.413671,85.596688 L 105.82432,112.46933 L 84.388948,93.648025 L 65.672204,115.39709 L 71.318596,87.374256 L 43.1912,82.041553 L 70.272968,72.840025 L 60.862315,45.967382 L 82.297692,64.788689 L 101.01444,43.039624 L 95.368043,71.062457 L 123.49544,76.395161 M 99.34143,46.385634 L 83.552445,77.440789 L 94.008727,70.853332 L 99.34143,46.385634 M 119.52205,76.708849 L 85.22545,77.85904 L 95.99542,83.819121 L 119.52205,76.708849 M 103.94219,109.7507 L 84.388948,79.845734 L 85.434576,92.811523 L 103.94219,109.7507 M 67.658898,112.05108 L 83.552445,79.113794 L 73.200727,88.106196 L 67.658898,112.05108 M 46.641773,81.832427 L 46.850898,81.832427 C 48.175357,81.832455 53.333783,81.483913 62.326194,80.786799 C 66.71781,80.507994 73.270407,79.950326 81.984003,79.113794 L 70.691219,73.990216 C 54.797661,79.218387 46.781187,81.832455 46.641773,81.832427 M 62.744446,49.313392 L 82.925069,78.172729 L 81.356626,65.416066 L 62.744446,49.313392" style="font-size:104.56281281px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#e5893e;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Font in a Red Suit" transform="scale(1.1817624,0.8461938)"/>
+ <g id="g2620" style="opacity:0.79310345" transform="matrix(2.0207243,0,0,2.0207243,-379.39675,-423.54671)">
+ <path transform="matrix(0.1106868,0,0,9.847027e-2,194.83289,206.81914)" d="M 571.99634 322.09503 A 199.92105 141.61075 0 1 1 172.15424,322.09503 A 199.92105 141.61075 0 1 1 571.99634 322.09503 z" sodipodi:ry="141.61075" sodipodi:rx="199.92105" sodipodi:cy="322.09503" sodipodi:cx="372.07529" id="path2622" style="fill:url(#linearGradient2707);fill-opacity:1;stroke:none;stroke-width:2.20433664;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" sodipodi:type="arc"/>
+ <path inkscape:export-ydpi="47.93037" inkscape:export-xdpi="47.93037" inkscape:export-filename="/home/peterm/Foto's/afbeeldingen/svg/Mandriva/mcnlivelogo/mcnlivelogowithtext.png" sodipodi:type="arc" style="opacity:0.5;fill:url(#radialGradient2709);fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" id="path2624" sodipodi:cx="264.5" sodipodi:cy="486.86218" sodipodi:rx="13.5" sodipodi:ry="13.5" d="M 278 486.86218 A 13.5 13.5 0 1 1 251,486.86218 A 13.5 13.5 0 1 1 278 486.86218 z" transform="matrix(-2.0144401e-2,-0.5361465,0.9380584,-4.2136674e-2,-215.63022,415.62989)"/>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/levels/gold.svg
===================================================================
--- trunk/saim-game/src/main/resources/net/saim/game/resources/images/levels/gold.svg (rev 0)
+++ trunk/saim-game/src/main/resources/net/saim/game/resources/images/levels/gold.svg 2012-06-20 07:25:52 UTC (rev 470)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="svg2776" sodipodi:version="0.32" inkscape:version="0.45" width="282.83398" height="366.73691" sodipodi:docbase="/home/evans/Desktop" sodipodi:docname="PeterM_Medallion.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" sodipodi:modified="true" version="1.0">
+ <metadata id="metadata2781">
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs id="defs2779">
+ <linearGradient id="linearGradient3960">
+ <stop id="stop3962" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+ <stop id="stop3964" offset="1" style="stop-color:#ffffff;stop-opacity:0;"/>
+ </linearGradient>
+ <radialGradient inkscape:collect="always" xlink:href="#linearGradient3960" id="radialGradient2709" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.2793654,0.6548739,-0.6588766,-8.7737761e-2,657.02488,359.2947)" cx="259.8519" cy="485.57144" fx="259.8519" fy="485.57144" r="13.5"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4142" id="linearGradient2707" gradientUnits="userSpaceOnUse" x1="361.19095" y1="80.282722" x2="360.27524" y2="444.9689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4142" id="linearGradient2705" gradientUnits="userSpaceOnUse" x1="361.19095" y1="110.5407" x2="360.27524" y2="444.9689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4142" id="linearGradient2703" gradientUnits="userSpaceOnUse" x1="357.9162" y1="152.25885" x2="357.00049" y2="440.06088"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4142" id="linearGradient2701" gradientUnits="userSpaceOnUse" x1="353.58734" y1="493.62003" x2="359.00797" y2="180.48428"/>
+ <linearGradient id="linearGradient4142">
+ <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop4144"/>
+ <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop4146"/>
+ </linearGradient>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4142" id="linearGradient2699" gradientUnits="userSpaceOnUse" x1="353.58734" y1="493.62003" x2="359.00797" y2="180.48428"/>
+ <linearGradient id="linearGradient8560">
+ <stop style="stop-color:#bfb800;stop-opacity:1;" offset="0" id="stop8562"/>
+ <stop id="stop8564" offset="0.5" style="stop-color:#f8fe05;stop-opacity:1;"/>
+ <stop style="stop-color:#bfb800;stop-opacity:1;" offset="1" id="stop8566"/>
+ </linearGradient>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient8560" id="linearGradient2727" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.3670583,0,0,0.3670583,377.49448,57.028857)" x1="171.83858" y1="381.28146" x2="577.02722" y2="381.28146"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3517" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3515" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3513" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3935" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient9646" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient9644" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient9642" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3933" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3847" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3845" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3843" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3931" gradientUnits="userSpaceOnUse" x1="705.63715" y1="25.861053" x2="756.38391" y2="25.861053"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3839" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3837" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3835" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient id="linearGradient3391">
+ <stop style="stop-color:#ffffff;stop-opacity:0" offset="0" id="stop3393"/>
+ <stop id="stop3399" offset="0.5" style="stop-color:#000000;stop-opacity:1;"/>
+ <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3395"/>
+ </linearGradient>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3391" id="linearGradient3929" gradientUnits="userSpaceOnUse" x1="61.585899" y1="794.37689" x2="618.76581" y2="794.37689"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient8560" id="linearGradient4374" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.3670583,0,0,0.3670583,-40.33993,-43.910063)" x1="171.83858" y1="381.28146" x2="577.02722" y2="381.28146"/>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient8560" id="linearGradient2262" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.3670583,0,0,0.3670583,-40.33993,-43.910063)" x1="171.83858" y1="381.28146" x2="577.02722" y2="381.28146"/>
+ </defs>
+ <sodipodi:namedview inkscape:window-height="694" inkscape:window-width="1020" inkscape:pageshadow="2" inkscape:pageopacity="0.0" guidetolerance="10.0" gridtolerance="10.0" objecttolerance="10.0" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" id="base" inkscape:zoom="1.3061134" inkscape:cx="141.41699" inkscape:cy="183.36845" inkscape:window-x="0" inkscape:window-y="24" inkscape:current-layer="svg2776" inkscape:showpageshadow="false"/>
+ <g id="g2300" transform="translate(-12.179455,-10.342186)">
+ <g id="g3799" transform="matrix(1.2465306,0.5256859,-0.5256859,1.2465306,-549.51988,-509.13289)">
+ <g id="g3801" transform="matrix(9.6887094e-2,0.1390946,7.5379123e-2,-5.2505733e-2,646.96658,345.93557)">
+ <path style="opacity:1;fill:#ffd700;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M -569.1042,283.05305 C -19.326927,281.66471 -570.4235,407.76552 -17.797661,406.37717 C -18.454324,488.08697 -20.209958,376.99083 -19.536859,542.84819 C -567.36497,544.23653 -23.284898,417.99619 -570.21357,419.38453 C -570.21358,268.05541 -569.1042,467.70235 -569.1042,283.05305 z " id="path3803" sodipodi:nodetypes="ccccc"/>
+ <path sodipodi:nodetypes="ccccc" id="path3805" d="M -569.1042,419.05305 C -19.326927,417.66471 -570.4235,543.76552 -17.797661,542.37717 C -18.454324,624.08697 -20.209958,512.99083 -19.536859,678.84819 C -567.36497,680.23653 -23.284898,553.99619 -570.21357,555.38453 C -570.21358,404.05541 -569.1042,603.70235 -569.1042,419.05305 z " style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="opacity:1;fill:#ffff20;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M -569.1042,555.05305 C -19.326927,553.66471 -570.4235,679.76552 -17.797661,678.37717 C -18.454324,760.08697 -20.209958,648.99083 -19.536859,814.84819 C -567.36497,816.23653 -23.284898,689.99619 -570.21357,691.38453 C -570.21358,540.05541 -569.1042,739.70235 -569.1042,555.05305 z " id="path3807" sodipodi:nodetypes="ccccc"/>
+ </g>
+ <g id="g3809" style="opacity:0.39901476;fill:url(#linearGradient3929);fill-opacity:1;stroke:none" transform="matrix(9.6887094e-2,0.1390946,7.5379123e-2,-5.2505733e-2,567.02256,270.61064)">
+ <path sodipodi:nodetypes="ccccc" id="path3811" d="M 65.077269,528.47932 C 614.85454,527.09098 63.757969,653.19179 616.38381,651.80344 C 615.72715,733.51324 613.97151,622.4171 614.64461,788.27446 C 66.816499,789.6628 610.89657,663.42246 63.967899,664.8108 C 63.967889,513.48168 65.077269,713.12862 65.077269,528.47932 z " style="opacity:1;fill:url(#linearGradient3835);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="opacity:1;fill:url(#linearGradient3837);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 65.077269,664.47932 C 614.85454,663.09098 63.757969,789.19179 616.38381,787.80344 C 615.72715,869.51324 613.97151,758.4171 614.64461,924.27446 C 66.816499,925.6628 610.89657,799.42246 63.967899,800.8108 C 63.967889,649.48168 65.077269,849.12862 65.077269,664.47932 z " id="path3813" sodipodi:nodetypes="ccccc"/>
+ <path sodipodi:nodetypes="ccccc" id="path3815" d="M 65.077269,800.47932 C 614.85454,799.09098 63.757969,925.19179 616.38381,923.80344 C 615.72715,1005.5132 613.97151,894.4171 614.64461,1060.2745 C 66.816499,1061.6628 610.89657,935.42246 63.967899,936.8108 C 63.967889,785.48168 65.077269,985.12862 65.077269,800.47932 z " style="opacity:1;fill:url(#linearGradient3839);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ </g>
+ <g id="g3817" transform="matrix(1.0546877,1.5141477,0.8205576,-0.5715638,-17.973682,-654.24584)">
+ <path sodipodi:nodetypes="cccsssssscc" id="path3819" d="M 697.85542,0.0010472667 C 647.35107,-0.12649022 697.97661,11.457545 647.21058,11.330007 C 647.2709,18.836138 647.43218,8.6304811 647.37035,23.866684 C 653.66101,23.882626 658.38439,23.715375 661.93214,23.410728 C 665.47989,23.106082 667.85201,22.66404 669.44017,22.130401 C 671.02833,21.596763 671.83253,20.971527 672.24441,20.300493 C 672.6563,19.62946 672.67588,18.912627 672.69482,18.195795 C 672.71376,17.478963 672.73205,16.76213 673.14136,16.091097 C 673.55067,15.420063 674.35099,14.794827 675.93398,14.261189 C 677.51698,13.72755 679.88265,13.285508 683.42265,12.980862 C 683.4831,12.969175 698.05928,0.012719816 697.85542,0.0010472667 z " style="fill:#ffd700;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 683.2612,12.94986 C 679.71292,13.254156 677.34924,13.695698 675.77461,14.228735 C 674.19999,14.761773 673.41442,15.386308 673.02236,16.05659 C 672.63029,16.726873 672.63173,17.442904 672.63113,18.158935 C 672.63053,18.874966 672.62788,19.590998 672.22764,20.26128 C 671.8274,20.931563 671.02956,21.556097 669.43858,22.089135 C 667.8476,22.622173 665.46348,23.063714 661.89066,23.36801 C 658.31784,23.672306 653.55633,23.839357 647.21058,23.823415 C 647.2709,31.329546 647.43218,21.123889 647.37035,36.360092 C 653.66101,36.376034 658.38439,36.208783 661.93214,35.904136 C 665.47989,35.59949 667.85201,35.157448 669.44017,34.623809 C 671.02833,34.090171 671.83253,33.464935 672.24441,32.793901 C 672.6563,32.122867 672.67588,31.406035 672.69482,30.689203 C 672.71376,29.972371 672.73205,29.255539 673.14136,28.584505 C 673.55067,27.913471 674.35099,27.288235 675.93398,26.754597 C 677.51698,26.220958 679.88265,25.778916 683.42265,25.47427 C 675.30408,20.669029 675.30111,20.763783 683.2612,12.94986 z " id="path3821" sodipodi:nodetypes="cssssssccsssssscc"/>
+ <path sodipodi:nodetypes="csssssscccc" id="path3823" d="M 683.2612,25.443268 C 679.71292,25.747564 677.34924,26.189105 675.77461,26.722143 C 674.19999,27.255181 673.41442,27.879715 673.02236,28.549998 C 672.63029,29.220281 672.63173,29.936312 672.63113,30.652343 C 672.63053,31.368374 672.62788,32.084405 672.22764,32.754688 C 671.8274,33.424971 671.02956,34.049505 669.43858,34.582543 C 667.8476,35.115581 665.46348,35.557122 661.89066,35.861418 C 658.31784,36.165714 653.55633,36.332765 647.21058,36.316823 C 647.2709,43.822954 647.43218,33.617297 647.37035,48.8535 C 697.69564,48.981038 647.71466,37.384184 697.95733,37.511722 C 697.82669,37.320383 683.17246,25.284264 683.2612,25.443268 z " style="fill:#ffff20;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ </g>
+ <g id="g3825" style="opacity:0.39899998;fill:url(#linearGradient3931);fill-opacity:1" transform="matrix(1.0546877,1.5141477,0.8205576,-0.5715638,-80.772018,-741.89288)">
+ <path style="opacity:0.39899998;fill:url(#linearGradient3843);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 756.282,1.4348285 C 705.77765,1.307291 756.40319,12.891326 705.63716,12.763788 C 705.69748,20.269919 705.85876,10.064262 705.79693,25.300465 C 712.08759,25.316407 716.81097,25.149156 720.35872,24.844509 C 723.90647,24.539863 726.27859,24.097821 727.86675,23.564182 C 729.45491,23.030544 730.25911,22.405308 730.67099,21.734274 C 731.08288,21.063241 731.10246,20.346408 731.1214,19.629576 C 731.14034,18.912744 731.15863,18.195911 731.56794,17.524878 C 731.97725,16.853844 732.77757,16.228608 734.36056,15.69497 C 735.94356,15.161331 738.30923,14.719289 741.84923,14.414643 C 741.90968,14.402956 756.48586,1.446501 756.282,1.4348285 z " id="path3827" sodipodi:nodetypes="cccsssssscc"/>
+ <path sodipodi:nodetypes="cssssssccsssssscc" id="path3829" d="M 741.68778,14.383641 C 738.1395,14.687937 735.77582,15.129479 734.20119,15.662516 C 732.62657,16.195554 731.841,16.820089 731.44894,17.490371 C 731.05687,18.160654 731.05831,18.876685 731.05771,19.592716 C 731.05711,20.308747 731.05446,21.024779 730.65422,21.695061 C 730.25398,22.365344 729.45614,22.989878 727.86516,23.522916 C 726.27418,24.055954 723.89006,24.497495 720.31724,24.801791 C 716.74442,25.106087 711.98291,25.273138 705.63716,25.257196 C 705.69748,32.763327 705.85876,22.55767 705.79693,37.793873 C 712.08759,37.809815 716.81097,37.642564 720.35872,37.337917 C 723.90647,37.033271 726.27859,36.591229 727.86675,36.05759 C 729.45491,35.523952 730.25911,34.898716 730.67099,34.227682 C 731.08288,33.556648 731.10246,32.839816 731.1214,32.122984 C 731.14034,31.406152 731.15863,30.68932 731.56794,30.018286 C 731.97725,29.347252 732.77757,28.722016 734.36056,28.188378 C 735.94356,27.654739 738.30923,27.212697 741.84923,26.908051 C 733.73066,22.10281 733.72769,22.197564 741.68778,14.383641 z " style="opacity:0.39899998;fill:url(#linearGradient3845);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="opacity:0.39899998;fill:url(#linearGradient3847);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 741.68778,26.877049 C 738.1395,27.181345 735.77582,27.622886 734.20119,28.155924 C 732.62657,28.688962 731.841,29.313496 731.44894,29.983779 C 731.05687,30.654062 731.05831,31.370093 731.05771,32.086124 C 731.05711,32.802155 731.05446,33.518186 730.65422,34.188469 C 730.25398,34.858752 729.45614,35.483286 727.86516,36.016324 C 726.27418,36.549362 723.89006,36.990903 720.31724,37.295199 C 716.74442,37.599495 711.98291,37.766546 705.63716,37.750604 C 705.69748,45.256735 705.85876,35.051078 705.79693,50.287281 C 756.12222,50.414819 706.14124,38.817965 756.38391,38.945503 C 756.25327,38.754164 741.59904,26.718045 741.68778,26.877049 z " id="path3831" sodipodi:nodetypes="csssssscccc"/>
+ </g>
+ </g>
+ <g transform="matrix(1.3528429,0,0,1.3528429,-730.48976,-211.65696)" id="g3777">
+ <g transform="matrix(9.6887094e-2,0.1390946,7.5379123e-2,-5.2505733e-2,646.96658,345.93557)" id="g3444">
+ <path sodipodi:nodetypes="ccccc" id="path3446" d="M -569.1042,283.05305 C -19.326927,281.66471 -570.4235,407.76552 -17.797661,406.37717 C -18.454324,488.08697 -20.209958,376.99083 -19.536859,542.84819 C -567.36497,544.23653 -23.284898,417.99619 -570.21357,419.38453 C -570.21358,268.05541 -569.1042,467.70235 -569.1042,283.05305 z " style="opacity:1;fill:#ffd700;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M -569.1042,419.05305 C -19.326927,417.66471 -570.4235,543.76552 -17.797661,542.37717 C -18.454324,624.08697 -20.209958,512.99083 -19.536859,678.84819 C -567.36497,680.23653 -23.284898,553.99619 -570.21357,555.38453 C -570.21358,404.05541 -569.1042,603.70235 -569.1042,419.05305 z " id="path3448" sodipodi:nodetypes="ccccc"/>
+ <path sodipodi:nodetypes="ccccc" id="path3450" d="M -569.1042,555.05305 C -19.326927,553.66471 -570.4235,679.76552 -17.797661,678.37717 C -18.454324,760.08697 -20.209958,648.99083 -19.536859,814.84819 C -567.36497,816.23653 -23.284898,689.99619 -570.21357,691.38453 C -570.21358,540.05541 -569.1042,739.70235 -569.1042,555.05305 z " style="opacity:1;fill:#ffff20;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ </g>
+ <g transform="matrix(9.6887094e-2,0.1390946,7.5379123e-2,-5.2505733e-2,567.02256,270.61064)" style="opacity:0.39901476;fill:url(#linearGradient3933);fill-opacity:1;stroke:none" id="g3452">
+ <path style="opacity:1;fill:url(#linearGradient9642);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 65.077269,528.47932 C 614.85454,527.09098 63.757969,653.19179 616.38381,651.80344 C 615.72715,733.51324 613.97151,622.4171 614.64461,788.27446 C 66.816499,789.6628 610.89657,663.42246 63.967899,664.8108 C 63.967889,513.48168 65.077269,713.12862 65.077269,528.47932 z " id="path3454" sodipodi:nodetypes="ccccc"/>
+ <path sodipodi:nodetypes="ccccc" id="path3456" d="M 65.077269,664.47932 C 614.85454,663.09098 63.757969,789.19179 616.38381,787.80344 C 615.72715,869.51324 613.97151,758.4171 614.64461,924.27446 C 66.816499,925.6628 610.89657,799.42246 63.967899,800.8108 C 63.967889,649.48168 65.077269,849.12862 65.077269,664.47932 z " style="opacity:1;fill:url(#linearGradient9644);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="opacity:1;fill:url(#linearGradient9646);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 65.077269,800.47932 C 614.85454,799.09098 63.757969,925.19179 616.38381,923.80344 C 615.72715,1005.5132 613.97151,894.4171 614.64461,1060.2745 C 66.816499,1061.6628 610.89657,935.42246 63.967899,936.8108 C 63.967889,785.48168 65.077269,985.12862 65.077269,800.47932 z " id="path3458" sodipodi:nodetypes="ccccc"/>
+ </g>
+ <g transform="matrix(1.0546877,1.5141477,0.8205576,-0.5715638,-17.973682,-654.24584)" id="g9451">
+ <path style="fill:#ffd700;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 697.85542,0.0010472667 C 647.35107,-0.12649022 697.97661,11.457545 647.21058,11.330007 C 647.2709,18.836138 647.43218,8.6304811 647.37035,23.866684 C 653.66101,23.882626 658.38439,23.715375 661.93214,23.410728 C 665.47989,23.106082 667.85201,22.66404 669.44017,22.130401 C 671.02833,21.596763 671.83253,20.971527 672.24441,20.300493 C 672.6563,19.62946 672.67588,18.912627 672.69482,18.195795 C 672.71376,17.478963 672.73205,16.76213 673.14136,16.091097 C 673.55067,15.420063 674.35099,14.794827 675.93398,14.261189 C 677.51698,13.72755 679.88265,13.285508 683.42265,12.980862 C 683.4831,12.969175 698.05928,0.012719816 697.85542,0.0010472667 z " id="path9453" sodipodi:nodetypes="cccsssssscc"/>
+ <path sodipodi:nodetypes="cssssssccsssssscc" id="path9455" d="M 683.2612,12.94986 C 679.71292,13.254156 677.34924,13.695698 675.77461,14.228735 C 674.19999,14.761773 673.41442,15.386308 673.02236,16.05659 C 672.63029,16.726873 672.63173,17.442904 672.63113,18.158935 C 672.63053,18.874966 672.62788,19.590998 672.22764,20.26128 C 671.8274,20.931563 671.02956,21.556097 669.43858,22.089135 C 667.8476,22.622173 665.46348,23.063714 661.89066,23.36801 C 658.31784,23.672306 653.55633,23.839357 647.21058,23.823415 C 647.2709,31.329546 647.43218,21.123889 647.37035,36.360092 C 653.66101,36.376034 658.38439,36.208783 661.93214,35.904136 C 665.47989,35.59949 667.85201,35.157448 669.44017,34.623809 C 671.02833,34.090171 671.83253,33.464935 672.24441,32.793901 C 672.6563,32.122867 672.67588,31.406035 672.69482,30.689203 C 672.71376,29.972371 672.73205,29.255539 673.14136,28.584505 C 673.55067,27.913471 674.35099,27.288235 675.93398,26.754597 C 677.51698,26.220958 679.88265,25.778916 683.42265,25.47427 C 675.30408,20.669029 675.30111,20.763783 683.2612,12.94986 z " style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="fill:#ffff20;fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 683.2612,25.443268 C 679.71292,25.747564 677.34924,26.189105 675.77461,26.722143 C 674.19999,27.255181 673.41442,27.879715 673.02236,28.549998 C 672.63029,29.220281 672.63173,29.936312 672.63113,30.652343 C 672.63053,31.368374 672.62788,32.084405 672.22764,32.754688 C 671.8274,33.424971 671.02956,34.049505 669.43858,34.582543 C 667.8476,35.115581 665.46348,35.557122 661.89066,35.861418 C 658.31784,36.165714 653.55633,36.332765 647.21058,36.316823 C 647.2709,43.822954 647.43218,33.617297 647.37035,48.8535 C 697.69564,48.981038 647.71466,37.384184 697.95733,37.511722 C 697.82669,37.320383 683.17246,25.284264 683.2612,25.443268 z " id="path9457" sodipodi:nodetypes="csssssscccc"/>
+ </g>
+ <g transform="matrix(1.0546877,1.5141477,0.8205576,-0.5715638,-80.772018,-741.89288)" style="opacity:0.39899998;fill:url(#linearGradient3935);fill-opacity:1" id="g9459">
+ <path sodipodi:nodetypes="cccsssssscc" id="path9461" d="M 756.282,1.4348285 C 705.77765,1.307291 756.40319,12.891326 705.63716,12.763788 C 705.69748,20.269919 705.85876,10.064262 705.79693,25.300465 C 712.08759,25.316407 716.81097,25.149156 720.35872,24.844509 C 723.90647,24.539863 726.27859,24.097821 727.86675,23.564182 C 729.45491,23.030544 730.25911,22.405308 730.67099,21.734274 C 731.08288,21.063241 731.10246,20.346408 731.1214,19.629576 C 731.14034,18.912744 731.15863,18.195911 731.56794,17.524878 C 731.97725,16.853844 732.77757,16.228608 734.36056,15.69497 C 735.94356,15.161331 738.30923,14.719289 741.84923,14.414643 C 741.90968,14.402956 756.48586,1.446501 756.282,1.4348285 z " style="opacity:0.39899998;fill:url(#linearGradient3513);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1"/>
+ <path style="opacity:0.39899998;fill:url(#linearGradient3515);fill-opacity:1;stroke:none;stroke-width:4.76399994;stroke-miterlimit:4;stroke-opacity:1" d="M 741.68778,14.383641 C 738.1395,14.687937 735.77582,15.129479 734.20119,15.662516 C 732.62657,16.195554 731.841,16.820089 731.44894,17.490371 C 731.05687,18.160654 731.05831,18.876685 731.05771,19.592716 C 731.05711,20.308747 731.05446,21.024779 730.65422,21.695061 C 730.25398,22.365344 729.45614,22.989878 727.86516,23.522916 C 726.27418,24.055954 723.89006,24.497495 720.31724,24.801791 C 716.74442,25.106087 711.98291,25.273138 705.63716,25.257196 C 705.69748,32.763327 705.85876,22.55767 705.79693,37.793873 C 712.08759,37.809815 716.81097,37.642564 720.35872,37.337917 C 723.90647,37.033271 726.27859,36.591229 727.86675,36.05759 C 729.45491,35.523952 730.25911,34.898716 730.67099,34.227682 C 731.08288,33.556648 731.10246,32.839816 731.1214,32.122984 C 731.14034,31.406152 731.15863,30.68932 731.56794,30.018286 C 731.97725,29.347252 732.77757,28.722016 734.36056,28.188378 C 735.94356,27.654739 738.30923,27.212697 741.84923,26.908051 C 733.73066,22.10281 733.72769,22.197564 741.68778,14.383641 z " id="path9463" sodipodi:nodetypes="cssssssccsssssscc"/>
+ <path sodipodi:nodetypes="csssssscccc" id="path9465" d="M 741.68778,26.877049 C 738.1395,27.181345 735.77582,27.622886 734.20119,28.155924 C 732.62657,28.688962 731.841,29.313496 731.44894,29.983779 C 731.05687,30.654062 731.05831,31.370093 731.05771,32.086124 C 731.05711,32.802155 731.05446,33.518186 730.65422,34.188469 C 730.25398,34.858752 729.45614,35.483286 727.86516,36.016324 C 726.27418,36.549362 723.89006,36.990903 720.31724,37.295199 C 716.74442,37.599495 711.98291...
[truncated message content] |
|
From: <jen...@us...> - 2012-06-20 06:43:28
|
Revision: 469
http://saim.svn.sourceforge.net/saim/?rev=469&view=rev
Author: jenslehmann
Date: 2012-06-20 06:43:14 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
images for pea destruction
Added Paths:
-----------
trunk/saim-game/src/main/resources/net/saim/game/resources/images/black_bomb.svg
trunk/saim-game/src/main/resources/net/saim/game/resources/images/dynamite.svg
trunk/saim-game/src/main/resources/net/saim/game/resources/images/explosion.svg
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/black_bomb.svg
===================================================================
--- trunk/saim-game/src/main/resources/net/saim/game/resources/images/black_bomb.svg (rev 0)
+++ trunk/saim-game/src/main/resources/net/saim/game/resources/images/black_bomb.svg 2012-06-20 06:43:14 UTC (rev 469)
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="400" height="400" id="svg11772" version="1.1" inkscape:version="0.48.0 r9654" sodipodi:docname="glossy_red_button.svg">
+ <defs id="defs11774">
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4156" id="linearGradient11748" gradientUnits="userSpaceOnUse" x1="241.40979" y1="287.49377" x2="315.47369" y2="367.88477"/>
+ <linearGradient id="linearGradient4156" inkscape:collect="always">
+ <stop id="stop4158" offset="0" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"/>
+ <stop id="stop4160" offset="1" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"/>
+ </linearGradient>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient7171" id="linearGradient11750" gradientUnits="userSpaceOnUse" x1="275.60828" y1="300.86383" x2="341.99622" y2="391.44925"/>
+ <linearGradient id="linearGradient7171">
+ <stop id="stop7173" offset="0" style="stop-color: rgb(0, 17, 43); stop-opacity: 1;"/>
+ <stop id="stop7175" offset="1" style="stop-color: rgb(0, 85, 212); stop-opacity: 1;"/>
+ </linearGradient>
+ <radialGradient inkscape:collect="always" xlink:href="#linearGradient7111" id="radialGradient11752" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-0.593266, -0.593266, 0.715046, -0.715049, 243.27, 849.034)" cx="312.78131" cy="386.57211" fx="312.78131" fy="386.57211" r="53.035713"/>
+ <linearGradient id="linearGradient7111">
+ <stop id="stop7113" offset="0" style="stop-color: rgb(255, 255, 255); stop-opacity: 0.408163;"/>
+ <stop id="stop7115" offset="1" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"/>
+ </linearGradient>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4148" id="linearGradient11754" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.955335, 0, 0, 0.955335, 55.1032, 472.672)" x1="255.31609" y1="286.66653" x2="300.26785" y2="338.81863"/>
+ <linearGradient id="linearGradient4148" inkscape:collect="always">
+ <stop id="stop4150" offset="0" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"/>
+ <stop id="stop4152" offset="1" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"/>
+ </linearGradient>
+ <linearGradient y2="338.81863" x2="300.26785" y1="286.66653" x1="255.31609" gradientTransform="matrix(0.955335, 0, 0, 0.955335, 55.1032, 472.672)" gradientUnits="userSpaceOnUse" id="linearGradient11820" xlink:href="#linearGradient4148" inkscape:collect="always"/>
+ <linearGradient id="linearGradient7199">
+ <stop style="stop-color: rgb(85, 0, 0); stop-opacity: 1;" offset="0" id="stop7201"/>
+ <stop style="stop-color: rgb(255, 0, 0); stop-opacity: 1;" offset="1" id="stop7203"/>
+ </linearGradient>
+ <linearGradient id="linearGradient7111-1">
+ <stop id="stop7113-1" offset="0" style="stop-color: rgb(255, 255, 255); stop-opacity: 0.408163;"/>
+ <stop id="stop7115-8" offset="1" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"/>
+ </linearGradient>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4148-9" id="linearGradient11738" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.955335, 0, 0, 0.955335, -84.8968, 472.672)" x1="255.31609" y1="286.66653" x2="300.26785" y2="338.81863"/>
+ <linearGradient id="linearGradient4148-9" inkscape:collect="always">
+ <stop id="stop4150-3" offset="0" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"/>
+ <stop id="stop4152-8" offset="1" style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter6469" x="-0.12398447" width="1.2479689" y="-0.12398447" height="1.2479689">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="4.6214502" id="feGaussianBlur6471"/>
+ </filter>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath6307">
+ <path sodipodi:type="arc" style="fill:#1a1a1a;fill-opacity:1;stroke:none" id="path6309" sodipodi:cx="501.29279" sodipodi:cy="289.18274" sodipodi:rx="44.729313" sodipodi:ry="44.729313" d="m 546.0221,289.18274 a 44.729313,44.729313 0 1 1 -89.45863,0 44.729313,44.729313 0 1 1 89.45863,0 z" transform="matrix(2.0736921,0.66917142,-0.66917142,2.0736921,-443.13306,-223.63944)"/>
+ </clipPath>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter6273">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="0.6942192" id="feGaussianBlur6275"/>
+ </filter>
+ <radialGradient inkscape:collect="always" xlink:href="#linearGradient3955" id="radialGradient6303" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.80127956,0.46261963,-0.47046132,0.8148626,419.61442,-94.547893)" cx="483.42368" cy="690.37976" fx="483.42368" fy="690.37976" r="15.667972"/>
+ <linearGradient id="linearGradient3955">
+ <stop id="stop3957" offset="0" style="stop-color:#ddb100;stop-opacity:1;"/>
+ <stop style="stop-color:#ffa000;stop-opacity:1;" offset="0.5" id="stop3965"/>
+ <stop id="stop3967" offset="0.75" style="stop-color:#a26001;stop-opacity:1;"/>
+ <stop id="stop3959" offset="1" style="stop-color:#c7b00f;stop-opacity:1;"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" id="filter3989" inkscape:collect="always">
+ <feGaussianBlur id="feGaussianBlur3991" stdDeviation="0.31390347" inkscape:collect="always"/>
+ </filter>
+ <radialGradient inkscape:collect="always" xlink:href="#linearGradient3955" id="radialGradient6305" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.80127956,0.46261963,-0.47046132,0.8148626,419.61442,-94.547893)" cx="483.42368" cy="690.37976" fx="483.42368" fy="690.37976" r="15.667972"/>
+ <linearGradient id="linearGradient6528">
+ <stop id="stop6530" offset="0" style="stop-color:#ddb100;stop-opacity:1;"/>
+ <stop style="stop-color:#ffa000;stop-opacity:1;" offset="0.5" id="stop6532"/>
+ <stop id="stop6534" offset="0.75" style="stop-color:#a26001;stop-opacity:1;"/>
+ <stop id="stop6536" offset="1" style="stop-color:#c7b00f;stop-opacity:1;"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" id="filter3973" inkscape:collect="always">
+ <feGaussianBlur id="feGaussianBlur3975" stdDeviation="1.0246751" inkscape:collect="always"/>
+ </filter>
+ <filter color-interpolation-filters="sRGB" height="1.5530435" y="-0.27652177" width="1.5530435" x="-0.27652177" id="filter4339" inkscape:collect="always">
+ <feGaussianBlur id="feGaussianBlur4341" stdDeviation="10.30719" inkscape:collect="always"/>
+ </filter>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter6333" x="-0.052392676" width="1.1047854" y="-0.11505969" height="1.2301193">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="0.2549428" id="feGaussianBlur6335"/>
+ </filter>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter6197">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="0.33393088" id="feGaussianBlur6199"/>
+ </filter>
+ <linearGradient y2="344.96054" x2="482.79929" y1="229.9653" x1="518.12231" gradientUnits="userSpaceOnUse" id="linearGradient3942" xlink:href="#linearGradient4279" inkscape:collect="always"/>
+ <linearGradient id="linearGradient4279" inkscape:collect="always">
+ <stop id="stop4281" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
+ <stop id="stop4283" offset="1" style="stop-color:#ffffff;stop-opacity:0;"/>
+ </linearGradient>
+ <linearGradient y2="241.86218" x2="446.5" y1="283.86218" x1="431.5" gradientTransform="translate(-13.47897,520.04372)" gradientUnits="userSpaceOnUse" id="linearGradient3944" xlink:href="#linearGradient4287" inkscape:collect="always"/>
+ <linearGradient id="linearGradient4287" inkscape:collect="always">
+ <stop id="stop4289" offset="0" style="stop-color:#666666;stop-opacity:1;"/>
+ <stop id="stop4291" offset="1" style="stop-color:#666666;stop-opacity:0;"/>
+ </linearGradient>
+ <linearGradient y2="640.62073" x2="278.06339" y1="590.65369" x1="288.44614" gradientTransform="matrix(0.76421949,0,0,0.76421949,184.88703,282.36344)" gradientUnits="userSpaceOnUse" id="linearGradient3946" xlink:href="#linearGradient3849" inkscape:collect="always"/>
+ <linearGradient id="linearGradient3849" inkscape:collect="always">
+ <stop id="stop3851" offset="0" style="stop-color:#cccccc;stop-opacity:1;"/>
+ <stop id="stop3853" offset="1" style="stop-color:#cccccc;stop-opacity:0;"/>
+ </linearGradient>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4549" id="linearGradient4555" x1="454.1875" y1="722.67468" x2="457.9375" y2="724.48718" gradientUnits="userSpaceOnUse"/>
+ <linearGradient id="linearGradient4549">
+ <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop4551"/>
+ <stop style="stop-color:#3c3c3c;stop-opacity:1;" offset="1" id="stop4553"/>
+ </linearGradient>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4534" id="linearGradient4540" x1="429.48706" y1="559.35339" x2="460.69858" y2="560.15198" gradientUnits="userSpaceOnUse"/>
+ <linearGradient id="linearGradient4534">
+ <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop4536"/>
+ <stop style="stop-color:#464646;stop-opacity:1;" offset="1" id="stop4538"/>
+ </linearGradient>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4534" id="linearGradient4583" x1="449.59293" y1="711.88519" x2="461.65897" y2="719.11096" gradientUnits="userSpaceOnUse"/>
+ <linearGradient id="linearGradient6567">
+ <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop6569"/>
+ <stop style="stop-color:#464646;stop-opacity:1;" offset="1" id="stop6571"/>
+ </linearGradient>
+ <radialGradient inkscape:collect="always" xlink:href="#linearGradient3955" id="radialGradient6379" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.80127956,0.46261963,-0.47046132,0.8148626,419.61442,-94.547893)" cx="483.42368" cy="690.37976" fx="483.42368" fy="690.37976" r="15.667972"/>
+ <linearGradient id="linearGradient6574">
+ <stop id="stop6576" offset="0" style="stop-color:#ddb100;stop-opacity:1;"/>
+ <stop style="stop-color:#ffa000;stop-opacity:1;" offset="0.5" id="stop6578"/>
+ <stop id="stop6580" offset="0.75" style="stop-color:#a26001;stop-opacity:1;"/>
+ <stop id="stop6582" offset="1" style="stop-color:#c7b00f;stop-opacity:1;"/>
+ </linearGradient>
+ </defs>
+ <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.0787109" inkscape:cx="304.09184" inkscape:cy="168.24225" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1680" inkscape:window-height="988" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1"/>
+ <metadata id="metadata11777">
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0, -652.362)">
+ <g transform="matrix(3.0460407,0,0,3.0460407,-1158.8057,-1451.581)" id="g6473">
+ <path sodipodi:type="arc" style="fill:#666666;fill-opacity:1;stroke:none;filter:url(#filter6469)" id="path6407" sodipodi:cx="501.29279" sodipodi:cy="289.18274" sodipodi:rx="44.729313" sodipodi:ry="44.729313" d="m 546.0221,289.18274 c 0,24.70332 -20.026,44.72931 -44.72931,44.72931 -24.70332,0 -44.72932,-20.02599 -44.72932,-44.72931 0,-24.70332 20.026,-44.72931 44.72932,-44.72931 24.70331,0 44.72931,20.02599 44.72931,44.72931 z" transform="matrix(1.0687457,0,0,0.41664902,-86.354551,668.7998)"/>
+ <path sodipodi:type="arc" style="fill:#1a1a1a;fill-opacity:1;stroke:none" id="path3918" sodipodi:cx="501.29279" sodipodi:cy="289.18274" sodipodi:rx="44.729313" sodipodi:ry="44.729313" d="m 546.0221,289.18274 c 0,24.70332 -20.026,44.72931 -44.72931,44.72931 -24.70332,0 -44.72932,-20.02599 -44.72932,-44.72931 0,-24.70332 20.026,-44.72931 44.72932,-44.72931 24.70331,0 44.72931,20.02599 44.72931,44.72931 z" transform="matrix(0.9776433,0,0,0.9776433,-57.681386,475.98716)"/>
+ <path transform="matrix(0.95854922,0,0,0.95854922,-48.10966,481.50884)" d="m 546.0221,289.18274 c 0,24.70332 -20.026,44.72931 -44.72931,44.72931 -24.70332,0 -44.72932,-20.02599 -44.72932,-44.72931 0,-24.70332 20.026,-44.72931 44.72932,-44.72931 24.70331,0 44.72931,20.02599 44.72931,44.72931 z" sodipodi:ry="44.729313" sodipodi:rx="44.729313" sodipodi:cy="289.18274" sodipodi:cx="501.29279" id="path3920" style="fill:#000000;fill-opacity:1;stroke:none" sodipodi:type="arc"/>
+ <g clip-path="url(#clipPath6307)" style="opacity:0.18584068;filter:url(#filter6273)" transform="matrix(0.43675163,-0.14093785,0.14093785,0.43675163,154.35721,505.18016)" id="g6149">
+ <path transform="matrix(0.32730892,0.19669772,-0.19669772,0.32730892,476.51189,378.32381)" inkscape:transform-center-y="0.15864112" inkscape:transform-center-x="0.13589183" d="m 490.71741,704.88106 -8.30185,-8.68716 -5.64395,10.60817 1.61577,-11.907 -11.81275,2.20146 10.31669,-6.16063 -9.0863,-7.86299 11.24892,4.22482 0.48232,-12.00645 3.7105,11.4289 9.68773,-7.10881 -6.62201,10.02678 11.5981,3.14191 -11.96802,1.07429 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="1.4339095" sodipodi:arg1="0.98511054" sodipodi:r2="4.877346" sodipodi:r1="16.222656" sodipodi:cy="691.36218" sodipodi:cx="481.75" sodipodi:sides="7" id="path6151" style="fill:url(#radialGradient6303);fill-opacity:1;stroke:none;filter:url(#filter3989)" sodipodi:type="star"/>
+ <path sodipodi:type="star" style="fill:url(#radialGradient6305);fill-opacity:1;stroke:none;filter:url(#filter3973)" id="path6153" sodipodi:sides="7" sodipodi:cx="481.75" sodipodi:cy="691.36218" sodipodi:r1="16.222656" sodipodi:r2="4.877346" sodipodi:arg1="0.98511054" sodipodi:arg2="1.4339095" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 490.71741,704.88106 -8.30185,-8.68716 -5.64395,10.60817 1.61577,-11.907 -11.81275,2.20146 10.31669,-6.16063 -9.0863,-7.86299 11.24892,4.22482 0.48232,-12.00645 3.7105,11.4289 9.68773,-7.10881 -6.62201,10.02678 11.5981,3.14191 -11.96802,1.07429 z" inkscape:transform-center-x="-0.265432" inkscape:transform-center-y="-0.27662885" transform="matrix(0.35708394,0.42374853,-0.42374853,0.35708394,619.1556,248.28897)"/>
+ </g>
+ <path transform="matrix(0.13447331,0,0,0.13447331,388.86864,697.44235)" d="m 546.0221,289.18274 c 0,24.70332 -20.026,44.72931 -44.72931,44.72931 -24.70332,0 -44.72932,-20.02599 -44.72932,-44.72931 0,-24.70332 20.026,-44.72931 44.72932,-44.72931 24.70331,0 44.72931,20.02599 44.72931,44.72931 z" sodipodi:ry="44.729313" sodipodi:rx="44.729313" sodipodi:cy="289.18274" sodipodi:cx="501.29279" id="path3922" style="fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter4339)" sodipodi:type="arc"/>
+ <path style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#2b1100;fill-opacity:1;stroke:none;stroke-width:3.98795199;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" d="m 466.45261,712.38177 c -5.52945,-0.47024 -9.4247,-1.94412 -11.93696,2.25276 -1.32073,1.99668 -1.8619,4.08602 1.86993,4.48493 0.22462,0.0195 0.60387,0.66165 0.57364,0.88214 -0.19722,1.43867 1.55423,-1.9351 1.5912,-2.79385 -0.043,0.47216 -0.0289,0.15492 0.0625,-0.0625 0.0914,-0.21742 0.22278,-0.50259 0.375,-0.78125 0.13962,-0.2556 0.29532,-0.50133 0.40625,-0.65625 8.79251,-4.00447 8.00194,3.71281 12.95895,4.95803 4.957,1.24522 9.40352,2.20541 12.4473,-1.17678 0.66287,-0.80992 0.52897,-2.15 -0.28105,-2.81274 -0.81002,-0.66275 -2.15008,-0.52864 -2.8127,0.28149 -5.38085,3.53072 -6.65516,1.49496 -8.98647,0.64471 -2.06131,-1.32799 -4.8245,-4.11168 -6.26759,-5.22069 z" id="path4320" inkscape:connector-curvature="0" sodipodi:nodetypes="cccscssczcsccc"/>
+ <path inkscape:transform-center-y="-0.82976616" inkscape:transform-center-x="1.9455736" sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" id="path6311" d="m 464.54312,738.93827 c -1.53895,-0.56843 -4.96939,-2.47967 -4.51024,-3.90248 0.67388,-0.46663 3.39622,3.74892 7.93768,2.45427 1.56858,0.29211 2.93963,0.59554 2.95163,1.86981 0.9857,0.48437 0.83126,0.88393 0.46958,0.95745 -1.37514,-0.98492 -1.96276,-2.33243 -4.02885,-1.97248 -0.83811,0.0925 -2.19177,0.48135 -2.81962,0.59341 z" style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.85283179;color:#000000;fill:#28170b;fill-opacity:1;stroke:none;stroke-width:3.98795199;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6333);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"/>
+ <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path6163" d="m 456.35095,726.03635 6.75,8.83839 c -0.25331,0.93439 -0.81987,1.80613 -3.40012,2.27513 L 447.5,726.23718 z" style="fill:#1a1a1a;stroke:none;filter:url(#filter6197)"/>
+ <path sodipodi:type="arc" style="fill:url(#linearGradient3942);fill-opacity:1;stroke:none" id="path3924" sodipodi:cx="501.29279" sodipodi:cy="289.18274" sodipodi:rx="44.729313" sodipodi:ry="44.729313" d="m 546.0221,289.18274 c 0,24.70332 -20.026,44.72931 -44.72931,44.72931 -24.70332,0 -44.72932,-20.02599 -44.72932,-44.72931 0,-24.70332 20.026,-44.72931 44.72932,-44.72931 24.70331,0 44.72931,20.02599 44.72931,44.72931 z" transform="matrix(0.69026878,0,0,0.47788009,86.377392,601.51006)"/>
+ <path style="fill:url(#linearGradient3944);fill-opacity:1;stroke:none" d="m 462.41733,784.73122 c -8.32807,6.75534 -18.94615,10.79897 -30.50513,10.79897 -10.27913,0 -19.79974,-3.21116 -27.64117,-8.67071 6.60222,8.35268 16.79826,13.71549 28.27177,13.71549 12.4226,0 23.39204,-6.28161 29.87453,-15.84375 z" id="path3926" inkscape:connector-curvature="0"/>
+ <path inkscape:connector-curvature="0" id="path3928" d="m 397.45547,741.38554 c -2.28379,4.48031 -3.56067,8.51566 -4.0838,12.20363 1.02782,0.13595 2.0904,0.31245 3.17629,0.54928 0.79872,-4.70226 2.45255,-8.45744 4.48979,-11.32 -1.22938,-0.26808 -2.42892,-0.70877 -3.58228,-1.43291 z m 13.13502,1.5762 c -2.75545,0.064 -5.54919,0.42397 -8.23924,0.0955 -2.12648,2.74589 -4.03026,6.48696 -5.01519,11.27224 1.25973,0.30039 2.56233,0.65613 3.89274,1.09856 1.43904,-3.95458 4.13578,-8.03025 9.36169,-12.46633 z m -17.31434,11.39165 c -0.66073,5.74693 0.48252,10.67913 2.41206,15.26051 l 1.26574,0.42987 c -1.08693,-5.8368 -1.15089,-10.91483 -0.50152,-15.23663 -1.08695,-0.20488 -2.14957,-0.35418 -3.17628,-0.45375 z m 3.9405,0.62093 c -0.79531,4.28973 -0.84322,9.38578 0.2627,15.2605 l 1.7195,0.59705 c 0.40515,-5.12083 0.1959,-9.89631 1.86278,-14.85452 -1.31429,-0.40706 -2.60314,-0.7424 -3.84498,-1.00303 z" style="fill:url(#linearGradient3946);fill-opacity:1;stroke:none"/>
+ <path sodipodi:type="arc" style="fill:#000000;fill-opacity:1;stroke:none" id="path3932" sodipodi:cx="435.7019" sodipodi:cy="557.4054" sodipodi:rx="11.38944" sodipodi:ry="3.7964799" d="m 447.09134,557.4054 c 0,2.09673 -5.09922,3.79648 -11.38944,3.79648 -6.29021,0 -11.38944,-1.69975 -11.38944,-3.79648 0,-2.09674 5.09923,-3.79648 11.38944,-3.79648 6.29022,0 11.38944,1.69974 11.38944,3.79648 z" transform="matrix(0.47712852,0.26843002,-0.26843002,0.47712852,392.99788,343.38849)"/>
+ <path inkscape:connector-curvature="0" id="rect3934" d="m 452.25,713.9375 -5.25,9.375 0.0625,0.0312 c -0.0862,0.0588 -0.17077,0.13346 -0.21875,0.21875 -0.47459,0.84358 1.188,2.66997 3.71875,4.09375 2.53075,1.42378 4.99416,1.90608 5.46875,1.0625 0.0445,-0.0791 0.0546,-0.18584 0.0625,-0.28125 l 0.0625,0.0312 5.28125,-9.375 c -3.0722,1.06924 -9.66579,-3.34064 -9.1875,-5.15625 z" style="fill:url(#linearGradient4555);fill-opacity:1;stroke:none"/>
+ <path transform="matrix(0.36502427,0.20536074,-0.17371328,0.30877159,394.64372,454.86715)" d="m 447.09134,557.4054 c 0,2.09673 -5.09922,3.79648 -11.38944,3.79648 -6.29021,0 -11.38944,-1.69975 -11.38944,-3.79648 0,-2.09674 5.09923,-3.79648 11.38944,-3.79648 6.29022,0 11.38944,1.69974 11.38944,3.79648 z" sodipodi:ry="3.7964799" sodipodi:rx="11.38944" sodipodi:cy="557.4054" sodipodi:cx="435.7019" id="path3940" style="fill:url(#linearGradient4540);fill-opacity:1;stroke:none" sodipodi:type="arc"/>
+ <path inkscape:connector-curvature="0" id="path4503" d="m 454.86736,714.08459 c -0.12305,0.17157 -0.22672,0.367 -0.34375,0.5625 -0.28675,0.43351 -0.54125,0.85725 -0.71875,1.28125 0.61512,0.54526 1.42463,1.15283 2.375,1.6875 0.67647,0.38058 1.32752,0.66948 1.9375,0.90625 0.18901,-0.43144 0.34733,-0.80683 0.40625,-1.09375 0.01,-0.0475 0.0481,-0.17254 0.0937,-0.28125 0.0914,-0.21742 0.22278,-0.50259 0.375,-0.78125 0.0204,-0.0373 0.0416,-0.0571 0.0625,-0.0937 -0.46401,-0.33915 -0.98848,-0.67706 -1.5625,-1 -0.94051,-0.52913 -1.84489,-0.94408 -2.625,-1.1875 z" style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#2b1100;fill-opacity:1;stroke:none;stroke-width:3.98795199;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"/>
+ <path inkscape:connector-curvature="0" id="path3938" d="m 453.5625,713.46875 c -0.63124,-0.0342 -1.10328,0.0899 -1.28125,0.40625 -0.47459,0.84358 1.188,2.70122 3.71875,4.125 2.53075,1.42378 4.99416,1.87483 5.46875,1.03125 0.47459,-0.84358 -1.21925,-2.66997 -3.75,-4.09375 -1.58172,-0.88987 -3.10419,-1.41177 -4.15625,-1.46875 z m -0.1875,0.4375 c 0.84851,-0.0642 2.47254,0.459 4.15625,1.40625 2.24495,1.263 3.76237,2.8045 3.40625,3.4375 -0.35612,0.633 -2.4738,0.138 -4.71875,-1.125 -2.24495,-1.263 -3.76237,-2.8045 -3.40625,-3.4375 0.089,-0.15825 0.27966,-0.25985 0.5625,-0.28125 z" style="fill:url(#linearGradient4583);fill-opacity:1;stroke:none"/>
+ <path sodipodi:type="star" style="fill:url(#radialGradient6379);fill-opacity:1;stroke:none;filter:url(#filter3973)" id="path3948" sodipodi:sides="7" sodipodi:cx="481.75" sodipodi:cy="691.36218" sodipodi:r1="16.222656" sodipodi:r2="4.877346" sodipodi:arg1="0.98511054" sodipodi:arg2="1.4339095" inkscape:flatsided="false" inkscape:rounded="0.01" inkscape:randomized="0" d="m 490.71741,704.88106 c -0.10013,0.0664 -8.18281,-8.70355 -8.30185,-8.68716 -0.11904,0.0164 -5.52959,10.64505 -5.64395,10.60817 -0.11437,-0.0369 1.70281,-11.82416 1.61577,-11.907 -0.087,-0.0829 -11.77027,2.31387 -11.81275,2.20146 -0.0425,-0.1124 10.30619,-6.04093 10.31669,-6.16063 0.0105,-0.1197 -9.1477,-7.7597 -9.0863,-7.86299 0.0614,-0.10329 11.14879,4.29124 11.24892,4.22482 0.10014,-0.0664 0.36328,-11.99005 0.48232,-12.00645 0.11904,-0.0164 3.59613,11.39202 3.7105,11.4289 0.11436,0.0369 9.6007,-7.19166 9.68773,-7.10881 0.087,0.0828 -6.66449,9.91438 -6.62201,10.02678 0.0425,0.1124 11.6086,3.02221 11.5981,3.14191 -0.0105,0.1197 -11.90662,0.971 -11.96802,1.07429 -0.0614,0.1033 4.87499,10.96029 4.77485,11.02671 z" inkscape:transform-center-x="-0.20769473" inkscape:transform-center-y="-0.21645186" transform="matrix(0.50274552,0.31409175,-0.31409175,0.50274552,459.46613,218.90656)"/>
+ <path sodipodi:nodetypes="ccsccsc" inkscape:connector-curvature="0" id="path4516" d="m 455.08988,713.76279 c -0.0788,0.10087 -0.14235,0.23383 -0.21875,0.34375 0.77017,0.23736 1.66894,0.63596 2.59375,1.15625 0.59204,0.33308 1.10049,0.68901 1.57031,1.03906 0.0737,-0.13492 0.13332,-0.27338 0.20703,-0.3909 -0.48615,-0.36226 -0.99322,-0.6875 -1.58984,-1.02316 -0.90273,-0.50788 -1.7748,-0.87487 -2.5625,-1.125 z" style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#2b1100;fill-opacity:1;stroke:none;stroke-width:3.98795199;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"/>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/dynamite.svg
===================================================================
--- trunk/saim-game/src/main/resources/net/saim/game/resources/images/dynamite.svg (rev 0)
+++ trunk/saim-game/src/main/resources/net/saim/game/resources/images/dynamite.svg 2012-06-20 06:43:14 UTC (rev 469)
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="300" height="600" id="svg5977" version="1.1" inkscape:version="0.48.2 r9819" sodipodi:docname="Nowy dokument 21">
+ <defs id="defs5979">
+ <radialGradient r="83.494591" fy="430.93362" fx="904.28571" cy="430.93362" cx="904.28571" gradientTransform="matrix(1,0,0,1.0037852,0,-1.6311789)" gradientUnits="userSpaceOnUse" id="radialGradient4522-6" xlink:href="#linearGradient4465-6-8" inkscape:collect="always"/>
+ <linearGradient id="linearGradient4465-6-8">
+ <stop style="stop-color:#ff4b18;stop-opacity:1;" offset="0" id="stop4467-3-0"/>
+ <stop style="stop-color:#ff4b0b;stop-opacity:0;" offset="1" id="stop4469-2-7"/>
+ </linearGradient>
+ <radialGradient inkscape:collect="always" xlink:href="#linearGradient4465-61" id="radialGradient4471-5" cx="904.28571" cy="430.93362" fx="904.28571" fy="430.93362" r="83.494591" gradientTransform="matrix(1,0,0,1.0037852,0,-1.6311789)" gradientUnits="userSpaceOnUse"/>
+ <linearGradient inkscape:collect="always" id="linearGradient4465-61">
+ <stop style="stop-color:#ffd65c;stop-opacity:1;" offset="0" id="stop4467-80"/>
+ <stop style="stop-color:#ffd65c;stop-opacity:0;" offset="1" id="stop4469-8"/>
+ </linearGradient>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3803-61-6-4-1" id="linearGradient3989-0-7" x1="600.71875" y1="483.1875" x2="679.28125" y2="483.1875" gradientUnits="userSpaceOnUse" gradientTransform="translate(-0.21591098,0)"/>
+ <linearGradient id="linearGradient3803-61-6-4-1">
+ <stop style="stop-color:#ff6855;stop-opacity:1;" offset="0" id="stop3805-3-9-6-3"/>
+ <stop style="stop-color:#620c00;stop-opacity:1;" offset="1" id="stop3807-4-1-72-2"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4078-7-8" x="-0.53164089" width="2.0632818" y="-0.011384173" height="1.0227683">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="1.5822645" id="feGaussianBlur4080-2-0"/>
+ </filter>
+ <radialGradient inkscape:collect="always" xlink:href="#linearGradient4048-6-9" id="radialGradient4054-7-4" cx="639.10712" cy="358.59753" fx="639.10712" fy="358.59753" r="39.265625" gradientTransform="matrix(1,0,0,0.94264111,0,-24.059455)" gradientUnits="userSpaceOnUse"/>
+ <linearGradient id="linearGradient4048-6-9">
+ <stop style="stop-color:#231400;stop-opacity:1;" offset="0" id="stop4050-20-3"/>
+ <stop style="stop-color:#985600;stop-opacity:0.67080748;" offset="1" id="stop4052-5-1"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4094-0-5" x="-0.29145509" width="1.5829102" y="-0.017735604" height="1.0354712">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="2.6022777" id="feGaussianBlur4096-1-0"/>
+ </filter>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3803-61-6-9-1" id="linearGradient3989-6-0" x1="600.71875" y1="483.1875" x2="679.28125" y2="483.1875" gradientUnits="userSpaceOnUse" gradientTransform="translate(-0.21591098,0)"/>
+ <linearGradient id="linearGradient3803-61-6-9-1">
+ <stop style="stop-color:#ff6855;stop-opacity:1;" offset="0" id="stop3805-3-9-5-1"/>
+ <stop style="stop-color:#620c00;stop-opacity:1;" offset="1" id="stop3807-4-1-7-7"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4078-2-5" x="-0.53164089" width="2.0632818" y="-0.011384173" height="1.0227683">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="1.5822645" id="feGaussianBlur4080-1-8"/>
+ </filter>
+ <radialGradient inkscape:collect="always" xlink:href="#linearGradient4048-2-8" id="radialGradient4054-3-3" cx="639.10712" cy="358.59753" fx="639.10712" fy="358.59753" r="39.265625" gradientTransform="matrix(1,0,0,0.94264111,0,-24.059455)" gradientUnits="userSpaceOnUse"/>
+ <linearGradient id="linearGradient4048-2-8">
+ <stop style="stop-color:#231400;stop-opacity:1;" offset="0" id="stop4050-7-4"/>
+ <stop style="stop-color:#985600;stop-opacity:0.67080748;" offset="1" id="stop4052-6-1"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4094-1-8" x="-0.29145509" width="1.5829102" y="-0.017735604" height="1.0354712">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="2.6022777" id="feGaussianBlur4096-7-7"/>
+ </filter>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3803-61-6-7-4" id="linearGradient3989-1-8" x1="600.71875" y1="483.1875" x2="679.28125" y2="483.1875" gradientUnits="userSpaceOnUse" gradientTransform="translate(-0.21591098,0)"/>
+ <linearGradient id="linearGradient3803-61-6-7-4">
+ <stop style="stop-color:#ff6855;stop-opacity:1;" offset="0" id="stop3805-3-9-8-5"/>
+ <stop style="stop-color:#620c00;stop-opacity:1;" offset="1" id="stop3807-4-1-9-1"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4078-1-2" x="-0.53164089" width="2.0632818" y="-0.011384173" height="1.0227683">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="1.5822645" id="feGaussianBlur4080-3-6"/>
+ </filter>
+ <radialGradient inkscape:collect="always" xlink:href="#linearGradient4048-28-0" id="radialGradient4054-9-0" cx="639.10712" cy="358.59753" fx="639.10712" fy="358.59753" r="39.265625" gradientTransform="matrix(1,0,0,0.94264111,0,-24.059455)" gradientUnits="userSpaceOnUse"/>
+ <linearGradient id="linearGradient4048-28-0">
+ <stop style="stop-color:#231400;stop-opacity:1;" offset="0" id="stop4050-2-9"/>
+ <stop style="stop-color:#985600;stop-opacity:0.67080748;" offset="1" id="stop4052-0-3"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4094-6-2" x="-0.29145509" width="1.5829102" y="-0.017735604" height="1.0354712">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="2.6022777" id="feGaussianBlur4096-5-8"/>
+ </filter>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3803-61-6-0-7-8" id="linearGradient3989-2-4-5" x1="600.71875" y1="483.1875" x2="679.28125" y2="483.1875" gradientUnits="userSpaceOnUse" gradientTransform="translate(-0.21591098,0)"/>
+ <linearGradient id="linearGradient3803-61-6-0-7-8">
+ <stop style="stop-color:#ff6855;stop-opacity:1;" offset="0" id="stop3805-3-9-7-4-9"/>
+ <stop style="stop-color:#620c00;stop-opacity:1;" offset="1" id="stop3807-4-1-2-7-0"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4078-24-7-9" x="-0.53164089" width="2.0632818" y="-0.011384173" height="1.0227683">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="1.5822645" id="feGaussianBlur4080-4-6-6"/>
+ </filter>
+ <radialGradient inkscape:collect="always" xlink:href="#linearGradient4048-3-2-2" id="radialGradient4054-5-2-1" cx="639.10712" cy="358.59753" fx="639.10712" fy="358.59753" r="39.265625" gradientTransform="matrix(1,0,0,0.94264111,0,-24.059455)" gradientUnits="userSpaceOnUse"/>
+ <linearGradient id="linearGradient4048-3-2-2">
+ <stop style="stop-color:#231400;stop-opacity:1;" offset="0" id="stop4050-9-3-8"/>
+ <stop style="stop-color:#985600;stop-opacity:0.67080748;" offset="1" id="stop4052-59-0-4"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4094-7-0-1" x="-0.29145509" width="1.5829102" y="-0.017735604" height="1.0354712">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="2.6022777" id="feGaussianBlur4096-2-0-3"/>
+ </filter>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3803-61-6-0-3" id="linearGradient3989-2-44" x1="600.71875" y1="483.1875" x2="679.28125" y2="483.1875" gradientUnits="userSpaceOnUse" gradientTransform="translate(-0.21591098,0)"/>
+ <linearGradient id="linearGradient3803-61-6-0-3">
+ <stop style="stop-color:#ff6855;stop-opacity:1;" offset="0" id="stop3805-3-9-7-9"/>
+ <stop style="stop-color:#620c00;stop-opacity:1;" offset="1" id="stop3807-4-1-2-6"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4078-24-2" x="-0.53164089" width="2.0632818" y="-0.011384173" height="1.0227683">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="1.5822645" id="feGaussianBlur4080-4-8"/>
+ </filter>
+ <radialGradient inkscape:collect="always" xlink:href="#linearGradient4048-3-8" id="radialGradient4054-5-6" cx="639.10712" cy="358.59753" fx="639.10712" fy="358.59753" r="39.265625" gradientTransform="matrix(1,0,0,0.94264111,0,-24.059455)" gradientUnits="userSpaceOnUse"/>
+ <linearGradient id="linearGradient4048-3-8">
+ <stop style="stop-color:#231400;stop-opacity:1;" offset="0" id="stop4050-9-38"/>
+ <stop style="stop-color:#985600;stop-opacity:0.67080748;" offset="1" id="stop4052-59-2"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4094-7-1" x="-0.29145509" width="1.5829102" y="-0.017735604" height="1.0354712">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="2.6022777" id="feGaussianBlur4096-2-02"/>
+ </filter>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3803-61-6-0-6-5" id="linearGradient3989-2-8-1" x1="600.71875" y1="483.1875" x2="679.28125" y2="483.1875" gradientUnits="userSpaceOnUse" gradientTransform="translate(-0.21591098,0)"/>
+ <linearGradient id="linearGradient3803-61-6-0-6-5">
+ <stop style="stop-color:#ff6855;stop-opacity:1;" offset="0" id="stop3805-3-9-7-0-6"/>
+ <stop style="stop-color:#620c00;stop-opacity:1;" offset="1" id="stop3807-4-1-2-76-9"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4078-24-6-0" x="-0.53164089" width="2.0632818" y="-0.011384173" height="1.0227683">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="1.5822645" id="feGaussianBlur4080-4-0-7"/>
+ </filter>
+ <radialGradient inkscape:collect="always" xlink:href="#linearGradient4048-3-0-1" id="radialGradient4054-5-8-0" cx="639.10712" cy="358.59753" fx="639.10712" fy="358.59753" r="39.265625" gradientTransform="matrix(1,0,0,0.94264111,0,-24.059455)" gradientUnits="userSpaceOnUse"/>
+ <linearGradient id="linearGradient4048-3-0-1">
+ <stop style="stop-color:#231400;stop-opacity:1;" offset="0" id="stop4050-9-4-6"/>
+ <stop style="stop-color:#985600;stop-opacity:0.67080748;" offset="1" id="stop4052-59-8-6"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4094-7-9-4" x="-0.29145509" width="1.5829102" y="-0.017735604" height="1.0354712">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="2.6022777" id="feGaussianBlur4096-2-2-8"/>
+ </filter>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient3803-61-6-2-0" id="linearGradient3989-8-4" x1="600.71875" y1="483.1875" x2="679.28125" y2="483.1875" gradientUnits="userSpaceOnUse" gradientTransform="translate(-0.21591098,0)"/>
+ <linearGradient id="linearGradient3803-61-6-2-0">
+ <stop style="stop-color:#ff6855;stop-opacity:1;" offset="0" id="stop3805-3-9-57-9"/>
+ <stop style="stop-color:#620c00;stop-opacity:1;" offset="1" id="stop3807-4-1-0-9"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4078-8-5" x="-0.53164089" width="2.0632818" y="-0.011384173" height="1.0227683">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="1.5822645" id="feGaussianBlur4080-8-6"/>
+ </filter>
+ <radialGradient inkscape:collect="always" xlink:href="#linearGradient4048-5-6" id="radialGradient4054-4-5" cx="639.10712" cy="358.59753" fx="639.10712" fy="358.59753" r="39.265625" gradientTransform="matrix(1,0,0,0.94264111,0,-24.059455)" gradientUnits="userSpaceOnUse"/>
+ <linearGradient id="linearGradient4048-5-6">
+ <stop style="stop-color:#231400;stop-opacity:1;" offset="0" id="stop4050-1-4"/>
+ <stop style="stop-color:#985600;stop-opacity:0.67080748;" offset="1" id="stop4052-8-7"/>
+ </linearGradient>
+ <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter4094-8-4" x="-0.29145509" width="1.5829102" y="-0.017735604" height="1.0354712">
+ <feGaussianBlur inkscape:collect="always" stdDeviation="2.6022777" id="feGaussianBlur4096-0-0"/>
+ </filter>
+ <linearGradient inkscape:collect="always" xlink:href="#linearGradient4544-9" id="linearGradient4550-7" x1="828.57141" y1="658.02911" x2="1077.1428" y2="658.02911" gradientUnits="userSpaceOnUse"/>
+ <linearGradient id="linearGradient4544-9">
+ <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop4546-0"/>
+ <stop id="stop4558-9" offset="0.0625" style="stop-color:#000000;stop-opacity:1;"/>
+ <stop id="stop4556-1" offset="0.125" style="stop-color:#545454;stop-opacity:1;"/>
+ <stop id="stop4554-04" offset="0.25" style="stop-color:#000000;stop-opacity:1;"/>
+ <stop id="stop4552-2" offset="0.5" style="stop-color:#000000;stop-opacity:1;"/>
+ <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop4548-5"/>
+ </linearGradient>
+ <linearGradient y2="658.02911" x2="1077.1428" y1="658.02911" x1="828.57141" gradientTransform="translate(1.4286031,175.76163)" gradientUnits="userSpaceOnUse" id="linearGradient4832" xlink:href="#linearGradient4544-2-3" inkscape:collect="always"/>
+ <linearGradient id="linearGradient4544-2-3">
+ <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop4546-9-8"/>
+ <stop id="stop4558-0-9" offset="0.0625" style="stop-color:#000000;stop-opacity:1;"/>
+ <stop id="stop4556-6-3" offset="0.125" style="stop-color:#545454;stop-opacity:1;"/>
+ <stop id="stop4554-0-1" offset="0.25" style="stop-color:#000000;stop-opacity:1;"/>
+ <stop id="stop4552-0-6" offset="0.5" style="stop-color:#000000;stop-opacity:1;"/>
+ <stop style="stop-color:#000000;stop-opacity:1;" offset="1" id="stop4548-2-1"/>
+ </linearGradient>
+ <linearGradient y2="658.02911" x2="1077.1428" y1="658.02911" x1="828.57141" gradientTransform="translate(1.4286031,175.76163)" gradientUnits="userSpaceOnUse" id="linearGradient5975" xlink:href="#linearGradient4544-2-3" inkscape:collect="always"/>
+ </defs>
+ <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="-16.428571" inkscape:cy="520" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1854" inkscape:window-height="1056" inkscape:window-x="66" inkscape:window-y="24" inkscape:window-maximized="1"/>
+ <metadata id="metadata5982">
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-452.36214)">
+ <g transform="translate(-804.38288,81.686521)" id="g4617-7">
+ <path transform="matrix(0.39284688,0.13002867,-0.13003469,0.39286505,608.20032,145.31848)" d="m 959.99999,488.07648 -55.36099,-56.42723 11.13278,78.26195 -11.62089,-78.19096 -36.99461,69.85893 36.558,-70.0884 -70.99132,34.77217 70.77297,-35.21445 -77.87175,-13.59637 77.95507,13.11021 -55.00783,-56.77156 55.36099,56.42723 -11.13278,-78.26195 11.62089,78.19096 36.99461,-69.85893 -36.558,70.0884 70.99132,-34.77217 -70.77297,35.21445 77.87176,13.59637 -77.95508,-13.11021 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="1.112215" sodipodi:arg1="0.79805572" sodipodi:r2="0.79808444" sodipodi:r1="79.808441" sodipodi:cy="430.93362" sodipodi:cx="904.28571" sodipodi:sides="10" id="path4452-1-6" style="color:#000000;fill:#ffe006;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient4522-6);stroke-width:9.66612148;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star"/>
+ <path transform="matrix(0.41380687,0,0,0.41382601,533.21018,253.86877)" d="m 959.99999,488.07648 -55.36099,-56.42723 11.13278,78.26195 -11.62089,-78.19096 -36.99461,69.85893 36.558,-70.0884 -70.99132,34.77217 70.77297,-35.21445 -77.87175,-13.59637 77.95507,13.11021 -55.00783,-56.77156 55.36099,56.42723 -11.13278,-78.26195 11.62089,78.19096 36.99461,-69.85893 -36.558,70.0884 70.99132,-34.77217 -70.77297,35.21445 77.87176,13.59637 -77.95508,-13.11021 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="1.112215" sodipodi:arg1="0.79805572" sodipodi:r2="0.79808444" sodipodi:r1="79.808441" sodipodi:cy="430.93362" sodipodi:cx="904.28571" sodipodi:sides="10" id="path4452-8" style="color:#000000;fill:#ffe006;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient4471-5);stroke-width:9.66612148;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star"/>
+ <g id="g4098-8-7" transform="translate(359.87747,231.15533)">
+ <path style="color:#000000;fill:url(#linearGradient3989-0-7);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 676.28409,295.625 c 0.23945,0.44853 0.375,0.90917 0.375,1.375 0,5.42054 -16.75846,9.8125 -37.4375,9.8125 -20.67904,0 -37.4375,-4.39196 -37.4375,-9.8125 0,-0.0794 -0.007,-0.17101 0,-0.25 -0.79651,0.92309 -1.28125,2.18865 -1.28125,3.59375 l 0,358.3125 c 0,2.71334 1.82408,4.89668 4.15625,5.09375 4.63725,4.03972 18.92134,7 35.84375,7 18.43218,0 33.73189,-3.49641 36.84375,-8.09375 1.04152,-0.93859 1.71875,-2.36121 1.71875,-4 l 0,-358.3125 c 0,-2.1445 -1.15109,-3.95106 -2.78125,-4.71875 z" id="rect3929-6-8" inkscape:connector-curvature="0"/>
+ <path transform="matrix(0.8886821,0,0,0.96519246,432.84811,97.624645)" d="m 277.14286,208.79076 c 0,5.91733 -19.82739,10.71428 -44.28571,10.71428 -24.45833,0 -44.28572,-4.79695 -44.28572,-10.71428 0,-5.91734 19.82739,-10.71429 44.28572,-10.71429 24.45832,0 44.28571,4.79695 44.28571,10.71429 z" sodipodi:ry="10.714286" sodipodi:rx="44.285713" sodipodi:cy="208.79076" sodipodi:cx="232.85715" id="path4125-9-31-7" style="fill:#decd87;stroke:#000000;stroke-width:1.07974148;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+ <rect style="opacity:0.2351097;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#b7b7b7;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4078-7-8);enable-background:accumulate" id="rect3991-4-4" width="7.1428571" height="333.57144" x="607.85712" y="333.07648" rx="4.4985533" ry="5.133379"/>
+ <path inkscape:connector-curvature="0" style="opacity:0.23197494;fill:url(#radialGradient4054-7-4);fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:0.34915257;stroke-dasharray:none" d="m 640.08705,291.74165 c -20.15644,0 -36.72295,3.99169 -39.03125,9.125 3.81549,4.66226 19.58528,8.1875 38.46875,8.1875 20.12248,0 36.70998,-3.97297 39.0625,-9.09375 -3.7673,-4.67897 -19.57145,-8.21875 -38.5,-8.21875 z" id="path4125-9-3-5-4"/>
+ <rect style="opacity:0.2351097;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#b7b7b7;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4094-0-5);enable-background:accumulate" id="rect3991-8-1-2" width="21.428572" height="352.14285" x="655" y="312.00504" rx="4.4985533" ry="5.133379"/>
+ </g>
+ <g id="g4098-5-0" transform="translate(278.44889,231.15533)">
+ <path style="color:#000000;fill:url(#linearGradient3989-6-0);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 676.28409,295.625 c 0.23945,0.44853 0.375,0.90917 0.375,1.375 0,5.42054 -16.75846,9.8125 -37.4375,9.8125 -20.67904,0 -37.4375,-4.39196 -37.4375,-9.8125 0,-0.0794 -0.007,-0.17101 0,-0.25 -0.79651,0.92309 -1.28125,2.18865 -1.28125,3.59375 l 0,358.3125 c 0,2.71334 1.82408,4.89668 4.15625,5.09375 4.63725,4.03972 18.92134,7 35.84375,7 18.43218,0 33.73189,-3.49641 36.84375,-8.09375 1.04152,-0.93859 1.71875,-2.36121 1.71875,-4 l 0,-358.3125 c 0,-2.1445 -1.15109,-3.95106 -2.78125,-4.71875 z" id="rect3929-1-0" inkscape:connector-curvature="0"/>
+ <path transform="matrix(0.8886821,0,0,0.96519246,432.84811,97.624645)" d="m 277.14286,208.79076 c 0,5.91733 -19.82739,10.71428 -44.28571,10.71428 -24.45833,0 -44.28572,-4.79695 -44.28572,-10.71428 0,-5.91734 19.82739,-10.71429 44.28572,-10.71429 24.45832,0 44.28571,4.79695 44.28571,10.71429 z" sodipodi:ry="10.714286" sodipodi:rx="44.285713" sodipodi:cy="208.79076" sodipodi:cx="232.85715" id="path4125-9-5-1" style="fill:#decd87;stroke:#000000;stroke-width:1.07974148;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+ <rect style="opacity:0.2351097;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#b7b7b7;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4078-2-5);enable-background:accumulate" id="rect3991-5-6" width="7.1428571" height="333.57144" x="607.85712" y="333.07648" rx="4.4985533" ry="5.133379"/>
+ <path inkscape:connector-curvature="0" style="opacity:0.23197494;fill:url(#radialGradient4054-3-3);fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:0.34915257;stroke-dasharray:none" d="m 640.08705,291.74165 c -20.15644,0 -36.72295,3.99169 -39.03125,9.125 3.81549,4.66226 19.58528,8.1875 38.46875,8.1875 20.12248,0 36.70998,-3.97297 39.0625,-9.09375 -3.7673,-4.67897 -19.57145,-8.21875 -38.5,-8.21875 z" id="path4125-9-3-7-0"/>
+ <rect style="opacity:0.2351097;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#b7b7b7;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4094-1-8);enable-background:accumulate" id="rect3991-8-8-8" width="21.428572" height="352.14285" x="655" y="312.00504" rx="4.4985533" ry="5.133379"/>
+ </g>
+ <g id="g4098-6-8" transform="translate(315.59175,249.72676)">
+ <path style="color:#000000;fill:url(#linearGradient3989-1-8);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 676.28409,295.625 c 0.23945,0.44853 0.375,0.90917 0.375,1.375 0,5.42054 -16.75846,9.8125 -37.4375,9.8125 -20.67904,0 -37.4375,-4.39196 -37.4375,-9.8125 0,-0.0794 -0.007,-0.17101 0,-0.25 -0.79651,0.92309 -1.28125,2.18865 -1.28125,3.59375 l 0,358.3125 c 0,2.71334 1.82408,4.89668 4.15625,5.09375 4.63725,4.03972 18.92134,7 35.84375,7 18.43218,0 33.73189,-3.49641 36.84375,-8.09375 1.04152,-0.93859 1.71875,-2.36121 1.71875,-4 l 0,-358.3125 c 0,-2.1445 -1.15109,-3.95106 -2.78125,-4.71875 z" id="rect3929-8-1" inkscape:connector-curvature="0"/>
+ <path transform="matrix(0.8886821,0,0,0.96519246,432.84811,97.624645)" d="m 277.14286,208.79076 c 0,5.91733 -19.82739,10.71428 -44.28571,10.71428 -24.45833,0 -44.28572,-4.79695 -44.28572,-10.71428 0,-5.91734 19.82739,-10.71429 44.28572,-10.71429 24.45832,0 44.28571,4.79695 44.28571,10.71429 z" sodipodi:ry="10.714286" sodipodi:rx="44.285713" sodipodi:cy="208.79076" sodipodi:cx="232.85715" id="path4125-9-0-0" style="fill:#decd87;stroke:#000000;stroke-width:1.07974148;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+ <rect style="opacity:0.2351097;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#b7b7b7;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4078-1-2);enable-background:accumulate" id="rect3991-52-9" width="7.1428571" height="333.57144" x="607.85712" y="333.07648" rx="4.4985533" ry="5.133379"/>
+ <path inkscape:connector-curvature="0" style="opacity:0.23197494;fill:url(#radialGradient4054-9-0);fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:0.34915257;stroke-dasharray:none" d="m 640.08705,291.74165 c -20.15644,0 -36.72295,3.99169 -39.03125,9.125 3.81549,4.66226 19.58528,8.1875 38.46875,8.1875 20.12248,0 36.70998,-3.97297 39.0625,-9.09375 -3.7673,-4.67897 -19.57145,-8.21875 -38.5,-8.21875 z" id="path4125-9-3-1-3"/>
+ <rect style="opacity:0.2351097;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#b7b7b7;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4094-6-2);enable-background:accumulate" id="rect3991-8-84-4" width="21.428572" height="352.14285" x="655" y="312.00504" rx="4.4985533" ry="5.133379"/>
+ </g>
+ <g id="g4098-1-5-3" transform="translate(231.30604,251.15534)">
+ <path style="color:#000000;fill:url(#linearGradient3989-2-4-5);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 676.28409,295.625 c 0.23945,0.44853 0.375,0.90917 0.375,1.375 0,5.42054 -16.75846,9.8125 -37.4375,9.8125 -20.67904,0 -37.4375,-4.39196 -37.4375,-9.8125 0,-0.0794 -0.007,-0.17101 0,-0.25 -0.79651,0.92309 -1.28125,2.18865 -1.28125,3.59375 l 0,358.3125 c 0,2.71334 1.82408,4.89668 4.15625,5.09375 4.63725,4.03972 18.92134,7 35.84375,7 18.43218,0 33.73189,-3.49641 36.84375,-8.09375 1.04152,-0.93859 1.71875,-2.36121 1.71875,-4 l 0,-358.3125 c 0,-2.1445 -1.15109,-3.95106 -2.78125,-4.71875 z" id="rect3929-4-7-1" inkscape:connector-curvature="0"/>
+ <path transform="matrix(0.8886821,0,0,0.96519246,432.84811,97.624645)" d="m 277.14286,208.79076 c 0,5.91733 -19.82739,10.71428 -44.28571,10.71428 -24.45833,0 -44.28572,-4.79695 -44.28572,-10.71428 0,-5.91734 19.82739,-10.71429 44.28572,-10.71429 24.45832,0 44.28571,4.79695 44.28571,10.71429 z" sodipodi:ry="10.714286" sodipodi:rx="44.285713" sodipodi:cy="208.79076" sodipodi:cx="232.85715" id="path4125-9-7-0-8" style="fill:#decd87;stroke:#000000;stroke-width:1.07974148;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+ <rect style="opacity:0.2351097;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#b7b7b7;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4078-24-7-9);enable-background:accumulate" id="rect3991-1-6-8" width="7.1428571" height="333.57144" x="607.85712" y="333.07648" rx="4.4985533" ry="5.133379"/>
+ <path inkscape:connector-curvature="0" style="opacity:0.23197494;fill:url(#radialGradient4054-5-2-1);fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:0.34915257;stroke-dasharray:none" d="m 640.08705,291.74165 c -20.15644,0 -36.72295,3.99169 -39.03125,9.125 3.81549,4.66226 19.58528,8.1875 38.46875,8.1875 20.12248,0 36.70998,-3.97297 39.0625,-9.09375 -3.7673,-4.67897 -19.57145,-8.21875 -38.5,-8.21875 z" id="path4125-9-3-3-1-9"/>
+ <rect style="opacity:0.2351097;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#b7b7b7;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4094-7-0-1);enable-background:accumulate" id="rect3991-8-13-6-8" width="21.428572" height="352.14285" x="655" y="312.00504" rx="4.4985533" ry="5.133379"/>
+ </g>
+ <g id="g4098-1-3" transform="translate(278.44889,272.5839)">
+ <path style="color:#000000;fill:url(#linearGradient3989-2-44);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 676.28409,295.625 c 0.23945,0.44853 0.375,0.90917 0.375,1.375 0,5.42054 -16.75846,9.8125 -37.4375,9.8125 -20.67904,0 -37.4375,-4.39196 -37.4375,-9.8125 0,-0.0794 -0.007,-0.17101 0,-0.25 -0.79651,0.92309 -1.28125,2.18865 -1.28125,3.59375 l 0,358.3125 c 0,2.71334 1.82408,4.89668 4.15625,5.09375 4.63725,4.03972 18.92134,7 35.84375,7 18.43218,0 33.73189,-3.49641 36.84375,-8.09375 1.04152,-0.93859 1.71875,-2.36121 1.71875,-4 l 0,-358.3125 c 0,-2.1445 -1.15109,-3.95106 -2.78125,-4.71875 z" id="rect3929-4-0" inkscape:connector-curvature="0"/>
+ <path transform="matrix(0.8886821,0,0,0.96519246,432.84811,97.624645)" d="m 277.14286,208.79076 c 0,5.91733 -19.82739,10.71428 -44.28571,10.71428 -24.45833,0 -44.28572,-4.79695 -44.28572,-10.71428 0,-5.91734 19.82739,-10.71429 44.28572,-10.71429 24.45832,0 44.28571,4.79695 44.28571,10.71429 z" sodipodi:ry="10.714286" sodipodi:rx="44.285713" sodipodi:cy="208.79076" sodipodi:cx="232.85715" id="path4125-9-7-6" style="fill:#decd87;stroke:#000000;stroke-width:1.07974148;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+ <rect style="opacity:0.2351097;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#b7b7b7;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4078-24-2);enable-background:accumulate" id="rect3991-1-4" width="7.1428571" height="333.57144" x="607.85712" y="333.07648" rx="4.4985533" ry="5.133379"/>
+ <path inkscape:connector-curvature="0" style="opacity:0.23197494;fill:url(#radialGradient4054-5-6);fill-opacity:1;stroke:#000000;stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:0.34915257;stroke-dasharray:none" d="m 640.08705,291.74165 c -20.15644,0 -36.72295,3.99169 -39.03125,9.125 3.81549,4.66226 19.58528,8.1875 38.46875,8.1875 20.12248,0 36.70998,-3.97297 39.0625,-9.09375 -3.7673,-4.67897 -19.57145,-8.21875 -38.5,-8.21875 z" id="path4125-9-3-3-9"/>
+ <rect style="opacity:0.2351097;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#b7b7b7;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4094-7-1);enable-background:accumulate" id="rect3991-8-13-2" width="21.428572" height="352.14285" x="655" y="312.00504" rx="4.4985533" ry="5.133379"/>
+ </g>
+ <g id="g4098-1-4-2" transform="translate(397.02031,252.58391)">
+ <path style="color:#000000;fill:url(#linearGradient3989-2-8-1);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 676.28409,295.625 c 0.23945,0.44853 0.375,0.90917 0.375,1.375 0,5.42054 -16.75846,9.8125 -37.4375,9.8125 -20.67904,0 -37.4375,-4.39196 -37.4375,-9.8125 0,-0.0794 -0.007,-0.17101 0,-0.25 -0.79651,0.92309 -1.28125,2.18865 -1.28125,3.59375 l 0,358.3125 c 0,2.71334 1.82408,4.89668 4.15625,5.09375 4.63725,4.03972 18.92134,7 35.84375,7 18.43218,0 33.73189,-3.49641 36.84375,-8.09375 1.04152,-0.93859 1.71875,-2.36121 1.71875,-4 l 0,-358.3125 c 0,-2.1445 -1.15109,-3.95106 -2.78125,-4.71875 z" id="rect3...
[truncated message content] |
|
From: <jen...@us...> - 2012-06-20 06:33:29
|
Revision: 468
http://saim.svn.sourceforge.net/saim/?rev=468&view=rev
Author: jenslehmann
Date: 2012-06-20 06:33:22 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
added keys 1,2,3
Added Paths:
-----------
trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/Keyboard_Keys.svg
trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/key1.png
trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/key2.png
trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/key3.png
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/Keyboard_Keys.svg
===================================================================
--- trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/Keyboard_Keys.svg (rev 0)
+++ trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/Keyboard_Keys.svg 2012-06-20 06:33:22 UTC (rev 468)
@@ -0,0 +1,747 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ width="700"
+ height="450"
+ id="svg2"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="Keyboard_Keys.svg">
+ <metadata
+ id="metadata88">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1600"
+ inkscape:window-height="841"
+ id="namedview86"
+ showgrid="false"
+ inkscape:zoom="0.45285714"
+ inkscape:cx="350"
+ inkscape:cy="225"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <title
+ id="title2885">Keyboard Keys</title>
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient3165">
+ <stop
+ id="stop3171"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3173"
+ style="stop-color:#e7e7e7;stop-opacity:1"
+ offset="0.5" />
+ <stop
+ id="stop3169"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3141">
+ <stop
+ id="stop3143"
+ style="stop-color:#d8d8d8;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3145"
+ style="stop-color:#a3a3a3;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="168.57144"
+ y1="200.43361"
+ x2="168.57144"
+ y2="384.29077"
+ id="linearGradient2905"
+ xlink:href="#linearGradient3141"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ x1="90.58992"
+ y1="292.36218"
+ x2="250.18001"
+ y2="292.36218"
+ id="linearGradient2907"
+ xlink:href="#linearGradient3165"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8317353,0,0,0.8368438,27.650334,44.986416)" />
+ <linearGradient
+ x1="168.57144"
+ y1="200.43361"
+ x2="168.57144"
+ y2="384.29077"
+ id="linearGradient3700"
+ xlink:href="#linearGradient3141"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ x1="90.58992"
+ y1="292.36218"
+ x2="250.18001"
+ y2="292.36218"
+ id="linearGradient3702"
+ xlink:href="#linearGradient3165"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8317353,0,0,0.8368438,27.650334,44.986416)" />
+ <linearGradient
+ x1="168.57144"
+ y1="200.43361"
+ x2="168.57144"
+ y2="384.29077"
+ id="linearGradient2905-3"
+ xlink:href="#linearGradient3141-0"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3141-0">
+ <stop
+ id="stop3143-2"
+ style="stop-color:#d8d8d8;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3145-9"
+ style="stop-color:#a3a3a3;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="90.58992"
+ y1="292.36218"
+ x2="250.18001"
+ y2="292.36218"
+ id="linearGradient2907-6"
+ xlink:href="#linearGradient3165-0"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8317353,0,0,0.8368438,27.650334,44.986416)" />
+ <linearGradient
+ id="linearGradient3165-0">
+ <stop
+ id="stop3171-9"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3173-3"
+ style="stop-color:#e7e7e7;stop-opacity:1"
+ offset="0.5" />
+ <stop
+ id="stop3169-5"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="168.57144"
+ y1="200.43361"
+ x2="168.57144"
+ y2="384.29077"
+ id="linearGradient3700-4"
+ xlink:href="#linearGradient3141-0"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3734">
+ <stop
+ id="stop3736"
+ style="stop-color:#d8d8d8;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3738"
+ style="stop-color:#a3a3a3;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="90.58992"
+ y1="292.36218"
+ x2="250.18001"
+ y2="292.36218"
+ id="linearGradient3702-3"
+ xlink:href="#linearGradient3165-0"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8317353,0,0,0.8368438,27.650334,44.986416)" />
+ <linearGradient
+ id="linearGradient3741">
+ <stop
+ id="stop3743"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3745"
+ style="stop-color:#e7e7e7;stop-opacity:1"
+ offset="0.5" />
+ <stop
+ id="stop3747"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="90.58992"
+ y1="292.36218"
+ x2="250.18001"
+ y2="292.36218"
+ id="linearGradient3760"
+ xlink:href="#linearGradient3165-0"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8317353,0,0,0.8368438,27.650334,44.986416)" />
+ <linearGradient
+ x1="168.57144"
+ y1="200.43361"
+ x2="168.57144"
+ y2="384.29077"
+ id="linearGradient2905-3-7"
+ xlink:href="#linearGradient3141-0-2"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3141-0-2">
+ <stop
+ id="stop3143-2-3"
+ style="stop-color:#d8d8d8;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3145-9-5"
+ style="stop-color:#a3a3a3;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="90.58992"
+ y1="292.36218"
+ x2="250.18001"
+ y2="292.36218"
+ id="linearGradient2907-6-1"
+ xlink:href="#linearGradient3165-0-7"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8317353,0,0,0.8368438,27.650334,44.986416)" />
+ <linearGradient
+ id="linearGradient3165-0-7">
+ <stop
+ id="stop3171-9-8"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3173-3-9"
+ style="stop-color:#e7e7e7;stop-opacity:1"
+ offset="0.5" />
+ <stop
+ id="stop3169-5-4"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="168.57144"
+ y1="200.43361"
+ x2="168.57144"
+ y2="384.29077"
+ id="linearGradient2905-1"
+ xlink:href="#linearGradient3141-6"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3141-6">
+ <stop
+ id="stop3143-4"
+ style="stop-color:#d8d8d8;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3145-3"
+ style="stop-color:#a3a3a3;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="90.58992"
+ y1="292.36218"
+ x2="250.18001"
+ y2="292.36218"
+ id="linearGradient2907-5"
+ xlink:href="#linearGradient3165-4"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8317353,0,0,0.8368438,27.650334,44.986416)" />
+ <linearGradient
+ id="linearGradient3165-4">
+ <stop
+ id="stop3171-8"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3173-7"
+ style="stop-color:#e7e7e7;stop-opacity:1"
+ offset="0.5" />
+ <stop
+ id="stop3169-3"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="90.58992"
+ y1="292.36218"
+ x2="250.18001"
+ y2="292.36218"
+ id="linearGradient3904"
+ xlink:href="#linearGradient3165-4"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8317353,0,0,0.8368438,27.650334,44.986416)" />
+ <linearGradient
+ x1="168.57144"
+ y1="200.43361"
+ x2="168.57144"
+ y2="384.29077"
+ id="linearGradient2905-3-7-1"
+ xlink:href="#linearGradient3141-0-2-4"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3141-0-2-4">
+ <stop
+ id="stop3143-2-3-3"
+ style="stop-color:#d8d8d8;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3145-9-5-4"
+ style="stop-color:#a3a3a3;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="90.58992"
+ y1="292.36218"
+ x2="250.18001"
+ y2="292.36218"
+ id="linearGradient2907-6-1-6"
+ xlink:href="#linearGradient3165-0-7-3"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8317353,0,0,0.8368438,27.650334,44.986416)" />
+ <linearGradient
+ id="linearGradient3165-0-7-3">
+ <stop
+ id="stop3171-9-8-5"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3173-3-9-8"
+ style="stop-color:#e7e7e7;stop-opacity:1"
+ offset="0.5" />
+ <stop
+ id="stop3169-5-4-5"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ y2="292.36218"
+ x2="250.18001"
+ y1="292.36218"
+ x1="90.58992"
+ gradientTransform="matrix(0.8317353,0,0,0.8368438,27.650334,44.986416)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3118"
+ xlink:href="#linearGradient3165-0-7-3"
+ inkscape:collect="always" />
+ <linearGradient
+ x1="168.57144"
+ y1="200.43361"
+ x2="168.57144"
+ y2="384.29077"
+ id="linearGradient2905-3-7-1-5"
+ xlink:href="#linearGradient3141-0-2-4-3"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3141-0-2-4-3">
+ <stop
+ id="stop3143-2-3-3-5"
+ style="stop-color:#d8d8d8;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3145-9-5-4-0"
+ style="stop-color:#a3a3a3;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ y2="292.36218"
+ x2="250.18001"
+ y1="292.36218"
+ x1="90.58992"
+ gradientTransform="matrix(0.8317353,0,0,0.8368438,27.650334,44.986416)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3118-3"
+ xlink:href="#linearGradient3165-0-7-3-2"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient3165-0-7-3-2">
+ <stop
+ id="stop3171-9-8-5-7"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3173-3-9-8-4"
+ style="stop-color:#e7e7e7;stop-opacity:1"
+ offset="0.5" />
+ <stop
+ id="stop3169-5-4-5-7"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ y2="292.36218"
+ x2="250.18001"
+ y1="292.36218"
+ x1="90.58992"
+ gradientTransform="matrix(0.8317353,0,0,0.8368438,27.650334,44.986416)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3179"
+ xlink:href="#linearGradient3165-0-7-3-2"
+ inkscape:collect="always" />
+ <linearGradient
+ x1="168.57144"
+ y1="200.43361"
+ x2="168.57144"
+ y2="384.29077"
+ id="linearGradient2905-3-7-1-6"
+ xlink:href="#linearGradient3141-0-2-4-0"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3141-0-2-4-0">
+ <stop
+ id="stop3143-2-3-3-1"
+ style="stop-color:#d8d8d8;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3145-9-5-4-3"
+ style="stop-color:#a3a3a3;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ y2="292.36218"
+ x2="250.18001"
+ y1="292.36218"
+ x1="90.58992"
+ gradientTransform="matrix(0.8317353,0,0,0.8368438,27.650334,44.986416)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3118-4"
+ xlink:href="#linearGradient3165-0-7-3-6"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient3165-0-7-3-6">
+ <stop
+ id="stop3171-9-8-5-5"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3173-3-9-8-1"
+ style="stop-color:#e7e7e7;stop-opacity:1"
+ offset="0.5" />
+ <stop
+ id="stop3169-5-4-5-4"
+ style="stop-color:#d7d7d7;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ y2="292.36218"
+ x2="250.18001"
+ y1="292.36218"
+ x1="90.58992"
+ gradientTransform="matrix(0.8317353,0,0,0.8368438,27.650334,44.986416)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3179-6"
+ xlink:href="#linearGradient3165-0-7-3-6"
+ inkscape:collect="always" />
+ </defs>
+ <g
+ id="g3175"
+ transform="translate(-38.603689,-167.636)">
+ <rect
+ style="fill:url(#linearGradient3700);fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect2168"
+ y="200.93361"
+ x="71.428574"
+ ry="21.428572"
+ height="182.85715"
+ width="194.28572" />
+ <rect
+ style="fill:url(#linearGradient3702);fill-opacity:1;fill-rule:evenodd;stroke:#f8f8f8;stroke-width:0.83428556px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect3157"
+ y="213.13647"
+ x="87.059998"
+ ry="17.932365"
+ height="153.02286"
+ width="161.59431" />
+ </g>
+ <g
+ id="g4174"
+ transform="translate(179.08384,-168.28087)">
+ <rect
+ style="fill:url(#linearGradient2905);fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect4176"
+ y="200.93361"
+ x="71.428574"
+ ry="21.428572"
+ height="182.85715"
+ width="194.28572" />
+ <rect
+ style="fill:url(#linearGradient2907);fill-opacity:1;fill-rule:evenodd;stroke:#f8f8f8;stroke-width:0.83428556px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect4178"
+ y="213.13647"
+ x="87.059998"
+ ry="17.932365"
+ height="153.02286"
+ width="161.59431" />
+ </g>
+ <g
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#515151;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ id="flowRoot2909"
+ transform="matrix(1.4243588,0,0,1.4243588,-95.606721,-415.50108)">
+ <path
+ inkscape:connector-curvature="0"
+ style="font-style:oblique;font-variant:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#515151;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Oblique"
+ id="path4026"
+ d="m 275.44531,388.30356 18.4375,0 -0.64453,3.32031 -14.51172,0 -1.67969,8.63282 13.92579,0 -0.64454,3.32031 -13.92578,0 -2.03125,10.5664 14.84375,0 -0.64453,3.32032 -18.80859,0 5.68359,-29.16016" />
+ </g>
+ <g
+ id="g3175-6"
+ transform="translate(-38.603693,37.42497)">
+ <rect
+ style="fill:url(#linearGradient3700-4);fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect2168-4"
+ y="200.93361"
+ x="71.428574"
+ ry="21.428572"
+ height="182.85715"
+ width="194.28572" />
+ <rect
+ style="fill:url(#linearGradient3760);fill-opacity:1;fill-rule:evenodd;stroke:#f8f8f8;stroke-width:0.83428556px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect3157-3"
+ y="213.13647"
+ x="87.059998"
+ ry="17.932365"
+ height="153.02286"
+ width="161.59431" />
+ </g>
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#515151;fill-opacity:1"
+ id="flowRoot3179-1"
+ d="m 85.183144,375.06786 4.24219,0.44531 c -1.06253,3.10938 -2.57815,5.42188 -4.54688,6.9375 -1.95314,1.5 -4.1797,2.25 -6.67969,2.25 -2.70313,0 -4.89844,-0.875 -6.58593,-2.625 -1.67188,-1.75 -2.50782,-4.19531 -2.50782,-7.33594 0,-2.71874 0.53906,-5.39061 1.61719,-8.01562 1.07812,-2.62498 2.61718,-4.61717 4.61719,-5.97657 2.01561,-1.37497 4.31248,-2.06247 6.89062,-2.0625 2.67186,3e-5 4.78904,0.75784 6.35156,2.27344 1.56248,1.50002 2.34373,3.49221 2.34376,5.97656 l -4.17188,0.28125 c -0.0156,-1.5781 -0.47658,-2.81248 -1.38281,-3.70312 -0.89065,-0.8906 -2.07033,-1.33592 -3.53907,-1.33594 -1.70313,2e-5 -3.17969,0.53909 -4.42968,1.61719 -1.25001,1.07814 -2.23439,2.71877 -2.95313,4.92187 -0.70313,2.18752 -1.05469,4.29689 -1.05469,6.32813 0,2.12501 0.46875,3.71875 1.40626,4.78125 0.93749,1.0625 2.09373,1.59375 3.46874,1.59375 1.37499,0 2.68749,-0.52344 3.9375,-1.57031 1.26561,-1.04687 2.2578,-2.64062 2.97657,-4.78125 m 16.734356,5.625 -0.70312,3.46875 c -1.01564,0.26562 -2.000006,0.39843 -2.953116,0.39843 -1.6875,0 -3.03125,-0.41406 -4.03125,-1.24218 -0.75,-0.625 -1.125,-1.47656 -1.125,-2.55469 0,-0.54687 0.20312,-1.80468 0.60938,-3.77344 l 3.02344,-14.46094 -3.35157,0 0.67969,-3.28125 3.35156,0 1.28906,-6.11718 4.851556,-2.92969 -1.89844,9.04687 4.17187,0 -0.70312,3.28125 -4.14844,0 -2.882796,13.75782 c -0.35938,1.75 -0.53907,2.79688 -0.53906,3.14062 -1e-5,0.50001 0.14062,0.88282 0.42187,1.14844 0.29687,0.26563 0.77343,0.39844 1.42968,0.39844 0.937486,0 1.773426,-0.0937 2.507806,-0.28125 m 3.39844,3.44531 5.20312,-24.89063 3.75,0 -1.05468,5.08594 c 1.28124,-1.92185 2.53124,-3.34373 3.75,-4.26562 1.23436,-0.92185 2.49217,-1.38279 3.77344,-1.38282 0.84373,3e-5 1.88279,0.30472 3.11718,0.91407 l -1.73437,3.9375 c -0.7344,-0.53123 -1.53908,-0.79686 -2.41407,-0.79688 -1.48438,2e-5 -3.00782,0.82815 -4.57031,2.48438 -1.56251,1.65626 -2.78907,4.63282 -3.67969,8.92968 l -2.10937,9.98438 -4.03125,0 m 15.70312,0 7.17188,-34.35938 4.24219,0 -7.17188,34.35938 -4.24219,0" />
+ <g
+ id="g4174-9"
+ transform="translate(179.08384,36.7801)">
+ <rect
+ style="fill:url(#linearGradient2905-3);fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect4176-1"
+ y="200.93361"
+ x="71.428574"
+ ry="21.428572"
+ height="182.85715"
+ width="194.28572" />
+ <rect
+ style="fill:url(#linearGradient2907-6);fill-opacity:1;fill-rule:evenodd;stroke:#f8f8f8;stroke-width:0.83428556px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect4178-0"
+ y="213.13647"
+ x="87.059998"
+ ry="17.932365"
+ height="153.02286"
+ width="161.59431" />
+ </g>
+ <g
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#515151;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ id="flowRoot2909-9"
+ transform="matrix(1.4243588,0,0,1.4243588,-95.606729,-210.44011)">
+ <path
+ inkscape:connector-curvature="0"
+ style="font-style:oblique;font-variant:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#515151;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Oblique"
+ id="path4011"
+ d="m 292.80859,389.26059 -0.76172,3.84766 c -1.31512,-0.7031 -2.62371,-1.23045 -3.92578,-1.58203 -1.28908,-0.36456 -2.53908,-0.54685 -3.75,-0.54688 -2.35678,3e-5 -4.23178,0.51435 -5.625,1.54297 -1.39323,1.02867 -2.08985,2.39586 -2.08984,4.10156 -10e-6,0.93752 0.2539,1.66018 0.76172,2.16797 0.52082,0.49481 1.84895,1.02866 3.98437,1.60156 l 2.36328,0.58594 c 2.66926,0.69012 4.52472,1.56903 5.56641,2.63672 1.04165,1.0547 1.56248,2.53907 1.5625,4.45313 -2e-5,2.94271 -1.15887,5.33854 -3.47656,7.1875 -2.30471,1.84895 -5.34507,2.77343 -9.1211,2.77343 -1.54948,0 -3.10547,-0.15625 -4.66796,-0.46875 -1.56251,-0.29948 -3.13152,-0.76172 -4.70704,-1.38672 l 0.80079,-4.0625 c 1.44531,0.89845 2.89062,1.57553 4.33593,2.03125 1.45833,0.45574 2.91015,0.6836 4.35547,0.6836 2.46093,0 4.43358,-0.54687 5.91797,-1.64063 1.48436,-1.09374 2.22655,-2.51952 2.22656,-4.27734 -10e-6,-1.17187 -0.29949,-2.05728 -0.89843,-2.65625 -0.58596,-0.61197 -1.85549,-1.16535 -3.8086,-1.66016 l -2.36328,-0.60547 c -2.69532,-0.70311 -4.53777,-1.5104 -5.52734,-2.42187 -0.97657,-0.92446 -1.46485,-2.21352 -1.46485,-3.86719 0,-2.90362 1.11328,-5.27992 3.33985,-7.1289 2.23957,-1.86196 5.14972,-2.79294 8.73047,-2.79297 1.39321,3e-5 2.77342,0.12372 4.14062,0.37109 1.36717,0.24743 2.73435,0.61852 4.10156,1.11328" />
+ </g>
+ <g
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#515151;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ id="flowRoot2909-7"
+ transform="matrix(1.4243588,0,0,1.4243588,-316.87075,-415.50108)">
+ <path
+ inkscape:connector-curvature="0"
+ style="font-style:oblique;font-variant:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#515151;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Oblique"
+ id="path4023"
+ d="m 275.44531,388.30356 3.96485,0 -2.40235,12.28516 15.3125,-12.28516 5.25391,0 -17.32422,13.92578 12.67578,15.23438 -4.80469,0 -11.64062,-14.19922 -2.75391,14.19922 -3.96484,0 5.68359,-29.16016" />
+ </g>
+ <g
+ id="g4174-3"
+ transform="translate(395.25649,-168.28087)">
+ <rect
+ style="fill:url(#linearGradient2905-1);fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect4176-5"
+ y="200.93361"
+ x="71.428574"
+ ry="21.428572"
+ height="182.85715"
+ width="194.28572" />
+ <rect
+ style="fill:url(#linearGradient3904);fill-opacity:1;fill-rule:evenodd;stroke:#f8f8f8;stroke-width:0.83428556px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect4178-01"
+ y="213.13647"
+ x="87.059998"
+ ry="17.932365"
+ height="153.02286"
+ width="161.59431" />
+ </g>
+ <g
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#515151;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ id="flowRoot2909-4"
+ transform="matrix(1.4243588,0,0,1.4243588,120.56592,-415.50108)">
+ <path
+ inkscape:connector-curvature="0"
+ style="font-style:oblique;font-variant:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#515151;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Oblique"
+ id="path4020"
+ d="m 271.20703,388.30356 4.23828,0 5.44922,11.99219 10.39063,-11.99219 4.43359,0 -13.22266,15.27344 -2.69531,13.88672 -3.94531,0 2.67578,-13.88672 -7.32422,-15.27344" />
+ </g>
+ <g
+ id="g4174-9-7"
+ transform="translate(395.25649,36.78011)">
+ <rect
+ style="fill:url(#linearGradient2905-3-7);fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect4176-1-8"
+ y="200.93361"
+ x="71.428574"
+ ry="21.428572"
+ height="182.85715"
+ width="194.28572" />
+ <rect
+ style="fill:url(#linearGradient2907-6-1);fill-opacity:1;fill-rule:evenodd;stroke:#f8f8f8;stroke-width:0.83428556px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect4178-0-9"
+ y="213.13647"
+ x="87.059998"
+ ry="17.932365"
+ height="153.02286"
+ width="161.59431" />
+ </g>
+ <g
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#515151;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ id="flowRoot2909-9-9"
+ transform="matrix(1.4243588,0,0,1.4243588,120.56591,-210.44011)">
+ <path
+ inkscape:connector-curvature="0"
+ style="font-style:oblique;font-variant:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#515151;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Oblique"
+ id="path4014"
+ d="m 271.28516,414.1434 6.44531,0 4.35547,-22.4414 -7.28516,1.40625 0.68359,-3.39844 7.2461,-1.40625 3.96484,0 -5.03906,25.83984 6.42578,0 -0.625,3.32032 -16.81641,0 0.64454,-3.32032" />
+ </g>
+ <g
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#515151;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ id="flowRoot2909-9-9-9"
+ transform="matrix(1.4243588,0,0,1.4243588,126.62683,-281.15079)">
+ <path
+ inkscape:connector-curvature="0"
+ style="font-style:oblique;font-variant:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#515151;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Oblique"
+ id="path4017"
+ d="m 277.53516,388.30356 3.94531,0 -2.48047,12.79297 -1.75781,6.97266 -3.16407,0 0.97657,-6.97266 2.48047,-12.79297 m -4.6875,24.19922 3.96484,0 -0.95703,4.96094 -4.00391,0 0.9961,-4.96094" />
+ </g>
+ <g
+ id="g4174-9-7-1"
+ transform="translate(-625.66923,33.978511)">
+ <rect
+ style="fill:url(#linearGradient2905-3-7-1);fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect4176-1-8-5"
+ y="200.93361"
+ x="71.428574"
+ ry="21.428572"
+ height="182.85715"
+ width="194.28572" />
+ <rect
+ style="fill:url(#linearGradient3118);fill-opacity:1;fill-rule:evenodd;stroke:#f8f8f8;stroke-width:0.83428556px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect4178-0-9-4"
+ y="213.13647"
+ x="87.059998"
+ ry="17.932365"
+ height="153.02286"
+ width="161.59431" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="-523.34387"
+ y="372.29654"
+ id="text3151"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3153"
+ x="-523.34387"
+ y="372.29654"
+ style="font-size:70px;font-style:italic;fill:#1a1a1a;-inkscape-font-specification:Sans Italic">1</tspan></text>
+ <g
+ id="g4174-9-7-1-2"
+ transform="translate(-400.43263,254.7987)">
+ <rect
+ style="fill:url(#linearGradient2905-3-7-1-5);fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect4176-1-8-5-3"
+ y="200.93361"
+ x="71.428574"
+ ry="21.428572"
+ height="182.85715"
+ width="194.28572" />
+ <rect
+ style="fill:url(#linearGradient3179);fill-opacity:1;fill-rule:evenodd;stroke:#f8f8f8;stroke-width:0.83428556px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect4178-0-9-4-1"
+ y="213.13647"
+ x="87.059998"
+ ry="17.932365"
+ height="153.02286"
+ width="161.59431" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="-298.10727"
+ y="593.1167"
+ id="text3151-7"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3153-8"
+ x="-298.10727"
+ y="593.1167"
+ style="font-size:70px;font-style:italic;fill:#1a1a1a;-inkscape-font-specification:Sans Italic">3</tspan></text>
+ <g
+ id="g4174-9-7-1-8"
+ transform="translate(-751.53673,261.42331)">
+ <rect
+ style="fill:url(#linearGradient2905-3-7-1-6);fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect4176-1-8-5-0"
+ y="200.93361"
+ x="71.428574"
+ ry="21.428572"
+ height="182.85715"
+ width="194.28572" />
+ <rect
+ style="fill:url(#linearGradient3179-6);fill-opacity:1;fill-rule:evenodd;stroke:#f8f8f8;stroke-width:0.83428556px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect4178-0-9-4-2"
+ y="213.13647"
+ x="87.059998"
+ ry="17.932365"
+ height="153.02286"
+ width="161.59431" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="-649.21136"
+ y="599.74133"
+ id="text3151-3"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3153-1"
+ x="-649.21136"
+ y="599.74133"
+ style="font-size:70px;font-style:italic;fill:#1a1a1a;-inkscape-font-specification:Sans Italic">2</tspan></text>
+</svg>
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/key1.png
===================================================================
(Binary files differ)
Property changes on: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/key1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/key2.png
===================================================================
(Binary files differ)
Property changes on: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/key2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/key3.png
===================================================================
(Binary files differ)
Property changes on: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/key3.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-20 03:24:21
|
Revision: 467
http://saim.svn.sourceforge.net/saim/?rev=467&view=rev
Author: q1Nguyen
Date: 2012-06-20 03:24:14 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/Application.java
trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java
trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java
trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java
Modified: trunk/saim-game/src/main/java/net/saim/game/client/Application.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-19 12:57:50 UTC (rev 466)
+++ trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-20 03:24:14 UTC (rev 467)
@@ -1569,7 +1569,7 @@
setNotSure(bonus);
}
else if (bonus==GameConstants.BONUS_PENALTY) {// False
- setPenalty(bonus);
+ setPenalty();
}
else if (bonus == GameConstants.BONUS_HUGE || bonus == GameConstants.BONUS_MEDIUM) {// Bonus
setAgreement(finalBonus);
@@ -2045,9 +2045,9 @@
msgButton.setStyleName("gameMessageDisagreement");
}
- private void setPenalty(int bonus){
+ private void setPenalty(){
echo("Process Link-Evaluation: Penalty");
- String msg="False Verification! << "+bonus+" Coins >> Penalty!";
+ String msg="False Verification! << "+GameConstants.BONUS_PENALTY+" Coins >> Penalty!";
game.disagreement();
msgButton.setText(msg);
msgButton.setStyleName("gameMessagePenalty");
Modified: trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java 2012-06-19 12:57:50 UTC (rev 466)
+++ trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java 2012-06-20 03:24:14 UTC (rev 467)
@@ -447,7 +447,12 @@
// Read model from XML or NT file
if (fileFormat == formatNT) {
this.readNT(model, this.fileName);
- msg = this.dbInsertFromNT(ontoSubject, ontoObject);
+ int conf = 0;
+ if(this.fileName.contains("positive"))
+ conf = 1;
+ else if(this.fileName.contains("negative"))
+ conf= -2;
+ msg = this.dbInsertFromNT(ontoSubject, ontoObject, conf);
} else if (fileFormat == formatXML) {
echo("@@XML format");
this.readXML(model, this.fileName);
@@ -459,7 +464,7 @@
return msg;
}
- private String dbInsertFromNT(Template ontoSubject, Template ontoObject) {
+ private String dbInsertFromNT(Template ontoSubject, Template ontoObject, int conf) {
echo("##Insert from nt-file");
// Subject, predicate and object taken from the RDF model, which the
// link-spec-file generated .
@@ -500,6 +505,8 @@
PropertyConstants.PROP3, "important");
importantSubject[4] = xml.getAttribute(ontoSubject.getName(),
PropertyConstants.IMAGE, "important");
+ if(ontoObject.getName().equals("bbcwildlife") || ontoObject.getName().equals("linkedgeodata"))
+ importantSubject[4] = "yes";
String imp;
if (ontoSubject.getType().equals(PropertyConstants.TEMPLATE_TYPE_MAP))
imp = "yes";
@@ -554,7 +561,7 @@
linkCounter++;
// Standard SPARQL Query for a Property
- querySubject[0] = createSparqlQuery(subject, ontoSubject.getProp0());
+ querySubject[0] = createSparqlQuery(subject, ontoSubject.getProp0(),"en");
querySubject[1] = createSparqlQuery(subject, ontoSubject.getProp1());
// querySubject[2]= createSparqlQuery(subject,
// ontoSubject.getProp2(),"en");
@@ -603,6 +610,8 @@
+ xml.getAttribute(ontoSubject.getName(),
PropertyConstants.IMAGE, "linkedData"));
textSubject[i] = linkedData(subject);
+ if(checkUrl(textSubject[i])==false)
+ textSubject[i]="";
} else
textSubject[i] = sparqlQueryText(querySubject[i],
endPointSubject, 1);
@@ -621,6 +630,8 @@
+ xml.getAttribute(ontoObject.getName(),
PropertyConstants.IMAGE, "linkedData"));
textObject[i] = linkedData(object);
+ if(checkUrl(textObject[i])==false)
+ textObject[i]="";
} else
textObject[i] = sparqlQueryText(queryObject[i], endPointObject,
1);
@@ -700,8 +711,8 @@
+ "," + PropertyConstants.DB_TABLE_LINKS_PROPERTY_CONFIDENCE
+ ") VALUES ('" + subject + "','" + predicate + "','" + object
+ "','" + linkedOntologies + "',"
- + PropertyConstants.CONFIDENCE_NOT_SPECIFIED + " )";
- // ???
+ + conf + " )";
+ // ??? PropertyConstants.CONFIDENCE_NOT_SPECIFIED
db.queryUpdate(sqlQueryStatements, con);
} else {// Invalid RDF Result. Method sparqlQueryText returns "".
@@ -1913,6 +1924,9 @@
String path ="/home/q1/Desktop/linkFiles/final/dbpedia_factbook/dbpedia_factbook_lang_links_verify.xml";
// path ="/home/q1/Desktop/linkFiles/spec/silk_2.5.3/spec/output/final/dbpedia-factbook-check-links.xml";
path ="/home/q1/Desktop/linkFiles/final/dbpedia_factbook/1.dbpedia_factbook_lang_links_verify.xml";
+ path ="/home/q1/Desktop/linkFiles/final/dbpedia_factbook/dbpedia-factbooklang_negative.nt";
+ path ="/home/q1/Desktop/linkFiles/final/dbpedia_factbook/dbpedia-factbooklang_positive.nt";
+
// path="/home/q1/Desktop/linkFiles/final/dbpedia_bbcwildlife/1.dbpedia_bbcwildlife_links_accepted.xml";
// path="/home/q1/Desktop/linkFiles/final/dbpedia_bbcwildlife/2.BBCwildlife_links_verify_final.xml";
// path="/home/q1/Desktop/linkFiles/final/dbpedia_bbcwildlife/3.BBCwildlife_links_accepted_new.xml";
Modified: trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java 2012-06-19 12:57:50 UTC (rev 466)
+++ trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java 2012-06-20 03:24:14 UTC (rev 467)
@@ -71,6 +71,8 @@
}
public static int getBonus(int bonus, double difficulty) {
+ if (bonus == GameConstants.BONUS_PENALTY)
+ return bonus;
double diff = getLinkDifficulty(difficulty);
return (int) (bonus*diff);
}
Modified: trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java 2012-06-19 12:57:50 UTC (rev 466)
+++ trunk/saim-game/src/main/java/net/saim/game/shared/GameConstants.java 2012-06-20 03:24:14 UTC (rev 467)
@@ -10,14 +10,14 @@
public static final int NOT_VALID = 0;
public static final int NOT_SURE = 2;
- public static final int COST_PEA =5;
+ public static final int COST_PEA =10;
public static final int COST_PEA_BIG =25;
public static final int REWARD_ENEMY_PEA =25;
public static final int REWARD_ENEMY_SHOOTER =25;
public static final int REWARD_ENEMY_BOSS =25;
- public static final int BONUS_PENALTY = -200;
+ public static final int BONUS_PENALTY = -400;
public static final int BONUS_DISAGREE = 0;
public static final int BONUS_AGREE = 20;
public static final int BONUS_FIRST = 5;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-19 12:58:01
|
Revision: 466
http://saim.svn.sourceforge.net/saim/?rev=466&view=rev
Author: q1Nguyen
Date: 2012-06-19 12:57:50 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
trunk/saim-game/src/main/java/net/saim/game/shared/VerificationStatistics.java
Modified: trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-19 12:09:18 UTC (rev 465)
+++ trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-19 12:57:50 UTC (rev 466)
@@ -2364,6 +2364,7 @@
public rdfStatement userVerification(ArrayList<Verification> verifications, String linkset,
User user, boolean thisLink, boolean nextLink) {
echo("\n####Server: UserVerification Request####");
+ echo("User: "+user.getName()+" , linkSet: "+linkset+" , countVerifications: "+verifications.size());
Bonus bonus = handleVerification(verifications.get(verifications.size()-1).getArray(), linkset, user, thisLink);
echo("handleVerification method end. bonus = " + bonus.getBonus()+" , difficulty= "+bonus.getDifficulty());
rdfStatement stmt = getNewStatement(verifications,user,linkset, nextLink);
Modified: trunk/saim-game/src/main/java/net/saim/game/shared/VerificationStatistics.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/shared/VerificationStatistics.java 2012-06-19 12:09:18 UTC (rev 465)
+++ trunk/saim-game/src/main/java/net/saim/game/shared/VerificationStatistics.java 2012-06-19 12:57:50 UTC (rev 466)
@@ -35,8 +35,8 @@
/** Add Verification to lists*/
public void addVerification(Verification ver){
- list.add(ver);
- completeList.add(ver);
+ this.list.add(ver);
+ this.completeList.add(ver);
}
/** Add Verification Evaluation to latest added verification*/
@@ -62,19 +62,22 @@
}
public void reset(){
+ System.out.println("Before: VerifyStats list size: "+list.size()+ " , completeListSize: "+completeList.size());
list=new ArrayList<Verification>();
countAgreed=0;
countDisagreed=0;
countPenalty=0;
countUnsure=0;
+ System.out.println("After: VerifyStats list size: "+list.size()+ " , completeListSize: "+completeList.size());
+
}
public ArrayList<Verification> getList() {
- return list;
+ return this.list;
}
public ArrayList<Verification> getCompleteList() {
- return completeList;
+ return this.completeList;
}
public int getCountAgreed() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-19 12:09:29
|
Revision: 465
http://saim.svn.sourceforge.net/saim/?rev=465&view=rev
Author: q1Nguyen
Date: 2012-06-19 12:09:18 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/shared/VerificationStatistics.java
Modified: trunk/saim-game/src/main/java/net/saim/game/shared/VerificationStatistics.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/shared/VerificationStatistics.java 2012-06-19 11:44:45 UTC (rev 464)
+++ trunk/saim-game/src/main/java/net/saim/game/shared/VerificationStatistics.java 2012-06-19 12:09:18 UTC (rev 465)
@@ -74,7 +74,7 @@
}
public ArrayList<Verification> getCompleteList() {
- return list;
+ return completeList;
}
public int getCountAgreed() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-19 11:44:54
|
Revision: 464
http://saim.svn.sourceforge.net/saim/?rev=464&view=rev
Author: q1Nguyen
Date: 2012-06-19 11:44:45 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
- balancing fix
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/Application.java
trunk/saim-game/src/main/java/net/saim/game/server/DBTool.java
trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
Modified: trunk/saim-game/src/main/java/net/saim/game/client/Application.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-19 10:34:01 UTC (rev 463)
+++ trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-19 11:44:45 UTC (rev 464)
@@ -2030,7 +2030,7 @@
game.agreement();
if(game.isSpecialEvent()){
bonus = 2*bonus;
- msg="Agreement! << "+bonus+" Coins >> Bonus!"+game.SPECIAL_REACHED+" agreements in a row! Big-Daddy is on his way!";
+ msg="Agreement! << "+bonus+" Coins >> Bonus! "+game.SPECIAL_REACHED+" agreements in a row! Big-Daddy is on his way!";
}
msgButton.setText(msg);
Modified: trunk/saim-game/src/main/java/net/saim/game/server/DBTool.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/server/DBTool.java 2012-06-19 10:34:01 UTC (rev 463)
+++ trunk/saim-game/src/main/java/net/saim/game/server/DBTool.java 2012-06-19 11:44:45 UTC (rev 464)
@@ -352,6 +352,11 @@
"SELECT ID, if(Counter = -2, -1,round( ((Positive/Counter + 1.48/(2*Counter))/ (1+1.48/Counter)),2)) as Threshold, Confidence " +
"from links";
+ String createEasyQuestions ="create view easy_questions as " +
+ "select links.ID as ID, links.linkedOntologies as linkedOntologies, links.Counter as Counter, difficulty.Difficulty as Difficulty " +
+ "from links, difficulty " +
+ "where links.ID=difficulty.ID and difficulty.Difficulty < 0.2 " +
+ "order by links.Counter";
// String createDifficultyTable= "CREATE TABLE "+PropertyConstants.DB_TABLE_NAME_DIFFICULTY + " ( " +
// PropertyConstants.DB_TABLE_DIFFICULTY_LINKEDONTOLOGIES +" VARCHAR(100),"+
@@ -405,7 +410,7 @@
db.queryUpdate(createUserStrengthView, con);
db.queryUpdate(createEvalNegView, con);
db.queryUpdate(createEvalPosView, con);
-
+ db.queryUpdate(createEasyQuestions, con);
// db.queryUpdate(createDifficultyTable, con);
con.close();
System.out.println("##Done");
Modified: trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-19 10:34:01 UTC (rev 463)
+++ trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-19 11:44:45 UTC (rev 464)
@@ -925,7 +925,9 @@
// normal
if(verifications.size() < 4){
echo("Get Easy Link! Number of verifications: "+verifications.size());
- SQLqueryLinks = "select * from links, difficulty where links.ID = difficulty.ID AND links.linkedOntologies='"+linkset+"' and links.Confidence not in (1,-1,-2) "+notIn+" and difficulty.Difficulty is not null order by abs(difficulty.Difficulty -0) limit 1";
+// SQLqueryLinks = "select * from links, difficulty where links.ID = difficulty.ID AND links.linkedOntologies='"+linkset+"' and links.Confidence not in (1,-1,-2) "+notIn+" and difficulty.Difficulty is not null order by abs(difficulty.Difficulty -0) limit 1";
+// SQLqueryLinks="SELECT * FROM easy_questions WHERE linkedOntologies='"+linkset+"' order by Counter limit 1";
+ SQLqueryLinks ="SELECT * FROM easy_questions,links WHERE easy_questions.ID=links.ID and easy_questions.linkedOntologies='"+linkset+"' "+notIn+" order by easy_questions.Counter limit 1";
}
else if(nextLink == Message.NORMAL_LINK){
boolean isVerifiedLink = isVerifiedLink();
@@ -996,6 +998,10 @@
}
else{ // If no result, query again
echo("Get new statement fail. Query again!");
+ if(verifications.size() < 4){
+ echo("Again.. but with slightly more difficult Link! Number of verifications: "+verifications.size());
+ SQLqueryLinks = "select * from links, difficulty where links.ID = difficulty.ID AND links.linkedOntologies='"+linkset+"' and links.Confidence not in (1,-1,-2) "+notIn+" and difficulty.Difficulty is not null order by abs(difficulty.Difficulty -0) limit 1";
+ }
SQLqueryLinks = "select * from links, difficulty where links.ID=difficulty.ID AND links.linkedOntologies='"+linkset+"' and links.Confidence not in (1,-1,-2) "+notIn+ " order by links.Counter limit 1";
echo("SQLqueryLinks: "+SQLqueryLinks);
rs = stmt.executeQuery(SQLqueryLinks);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-19 10:34:12
|
Revision: 463
http://saim.svn.sourceforge.net/saim/?rev=463&view=rev
Author: q1Nguyen
Date: 2012-06-19 10:34:01 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java
Modified: trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java 2012-06-19 10:14:07 UTC (rev 462)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java 2012-06-19 10:34:01 UTC (rev 463)
@@ -16,12 +16,15 @@
public static String TYPE = "EnemyShooter";
public static int MY_SPEED=0;
private float veloY;
+ private int fallPosition;
+
public EnemyShooter(GameWorld gameWorld, World world, float x, float y, float angle) {
super(gameWorld, world, x, y, angle);
// TODO Auto-generated constructor stub
this.hp =4;
this.setSpeed(MY_SPEED);
veloY=2f;
+ fallPosition = random(1,6);
}
float getRadius() {
@@ -83,15 +86,19 @@
public void update(float delta) {
if( this.prevX > rightBorder || this.isDead()==true)
destroy();
- if(this.prevY<1)
- moveDown();
- if (this.prevX == body.getPosition().x ){
- this.setLinearVelocity(0f,4f);
-// System.out.println("null!!");
- }else
- this.setLinearVelocity(-1f, veloY);
- this.setAngularVelocity(-4f);
-
+ if(fallPosition > body.getPosition().x ){
+ System.out.println("fallPosition: "+fallPosition);
+ System.out.println("pos: "+body.getPosition().x);
+ this.setAngularVelocity(-3.5f);
+ }else {
+ if(this.prevY<1)
+ moveDown();
+ if (this.prevX == body.getPosition().x ){
+ this.setLinearVelocity(0f,4f);
+ }else
+ this.setLinearVelocity(-1f, veloY);
+ this.setAngularVelocity(-3.5f);
+ }
//System.out.println(x+ " , " +y);
// store state for interpolation in paint()
this.prevX = body.getPosition().x;
@@ -108,5 +115,10 @@
veloY=2f;
}
+ private int random(int min, int max) {
+ int r = min + (int)(Math.random() * ((max - min) + 1));
+ System.out.println("Fall position: "+r);
+ return r;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-19 10:14:18
|
Revision: 462
http://saim.svn.sourceforge.net/saim/?rev=462&view=rev
Author: q1Nguyen
Date: 2012-06-19 10:14:07 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
- balancing
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/Application.java
trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java
trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java
trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
Modified: trunk/saim-game/src/main/java/net/saim/game/client/Application.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-19 03:40:09 UTC (rev 461)
+++ trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-19 10:14:07 UTC (rev 462)
@@ -2210,7 +2210,7 @@
verifyLock=false;
}
};
- t.schedule(2500);
+ t.schedule(1800);
}
/** Is verification mechanism locked? */
Modified: trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java 2012-06-19 03:40:09 UTC (rev 461)
+++ trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java 2012-06-19 10:14:07 UTC (rev 462)
@@ -171,7 +171,7 @@
HTML head = new HTML("Quiz:");
if(subjectTemplate.getName().equals("dbpedia") && objectTemplate.getName().equals("linkedgeodata"))
- head.setHTML("Does this flag belong to this country?");
+ head.setHTML("Does this flag/image belong to this country?");
if(subjectTemplate.getName().equals("dbpedia") && objectTemplate.getName().equals("factbook"))
head.setHTML("Is this language spoken in this country?");
if(subjectTemplate.getName().equals("dbpedia") && objectTemplate.getName().equals("bbcwildlife"))
Modified: trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java 2012-06-19 03:40:09 UTC (rev 461)
+++ trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java 2012-06-19 10:14:07 UTC (rev 462)
@@ -1912,8 +1912,8 @@
// String path = "/home/q1/Desktop/linkFiles/factbooklang_links_verify131.xml";
String path ="/home/q1/Desktop/linkFiles/final/dbpedia_factbook/dbpedia_factbook_lang_links_verify.xml";
// path ="/home/q1/Desktop/linkFiles/spec/silk_2.5.3/spec/output/final/dbpedia-factbook-check-links.xml";
-
- path="/home/q1/Desktop/linkFiles/final/dbpedia_bbcwildlife/1.dbpedia_bbcwildlife_links_accepted.xml";
+ path ="/home/q1/Desktop/linkFiles/final/dbpedia_factbook/1.dbpedia_factbook_lang_links_verify.xml";
+// path="/home/q1/Desktop/linkFiles/final/dbpedia_bbcwildlife/1.dbpedia_bbcwildlife_links_accepted.xml";
// path="/home/q1/Desktop/linkFiles/final/dbpedia_bbcwildlife/2.BBCwildlife_links_verify_final.xml";
// path="/home/q1/Desktop/linkFiles/final/dbpedia_bbcwildlife/3.BBCwildlife_links_accepted_new.xml";
@@ -1943,7 +1943,7 @@
t.setSubject("dbpedia");
t.setPredicate("spoken in");
RDFHandler rdf = new RDFHandler(path, db,temp,t);
- rdf.start(xml.getTemplate("dbpedia"), xml.getTemplate("bbcwildlife"), RDFHandler.formatXML);
+ rdf.start(xml.getTemplate("dbpedia"), xml.getTemplate("factbook"), RDFHandler.formatXML);
// Test Start ------------------------------------------------------------
Modified: trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-19 03:40:09 UTC (rev 461)
+++ trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-19 10:14:07 UTC (rev 462)
@@ -917,12 +917,23 @@
ResultSet rs = null;
String SQLqueryLinks = null;
+ // firstQuery
+ if(verifications == null){
+ echo("First Query! Set empty verifications list..");
+ verifications = new ArrayList<Verification>();
+ }
// normal
- if(nextLink == Message.NORMAL_LINK){
+ if(verifications.size() < 4){
+ echo("Get Easy Link! Number of verifications: "+verifications.size());
+ SQLqueryLinks = "select * from links, difficulty where links.ID = difficulty.ID AND links.linkedOntologies='"+linkset+"' and links.Confidence not in (1,-1,-2) "+notIn+" and difficulty.Difficulty is not null order by abs(difficulty.Difficulty -0) limit 1";
+ }
+ else if(nextLink == Message.NORMAL_LINK){
boolean isVerifiedLink = isVerifiedLink();
- if(isVerifiedLink == false) // Minimum
+ if(isVerifiedLink == false) {// Minimum
+ echo("Get Minimum Link!");
SQLqueryLinks = "select * from links, difficulty where links.ID = difficulty.ID AND links.linkedOntologies='"+linkset+"' and links.Confidence not in (1,-1,-2) "+ notIn +" order by links.Counter limit 1";
- else { // Already validated
+ }else { // Already validated
+ echo("Get Verified Link!");
// SQLqueryLinks = "select * from links where linkedOntologies='"+linkset+"' and Confidence not in (1,-1,-2) and Counter>0 "+ notIn +" order by Counter limit 1";
// take: link Difficulty, user strength, not already verified links
try{
@@ -1002,7 +1013,7 @@
}
else{
echo("Query after previous error... still error..");
- SQLqueryLinks = "select * from links, difficulty where links.ID = difficulty.ID and links.linkedOntologies='"+linkset+"' and links.Confidence not in (1,-1,-2) order by rand(links.Counter) limit 1";
+ SQLqueryLinks = "select * from links, difficulty where links.ID = difficulty.ID and links.linkedOntologies='"+linkset+"' and links.Confidence not in (-1) "+notIn+ " order by rand() limit 1";
echo("SQLqueryLinks: "+SQLqueryLinks);
rs = stmt.executeQuery(SQLqueryLinks);
if(rs.next()){
@@ -2586,8 +2597,8 @@
String sqlQuery = "INSERT IGNORE INTO `"
+ PropertyConstants.DB_TABLE_NAME_USER + "` VALUES ('" + user.getId()
+ "' , '" + user.getName() +
- "', 0,0,0,0,0," + //agree, disagree, unsure, penalty, allVerif
- "0,0," +
+ "', 15,5,0,0,0," + //agree, disagree, unsure, penalty, allVerif (init a:15,d:5 => 15/20 richtigen)
+ "0,0," +// gamesplayed, gametime
"0,0,0,0,0,0)"; // level
echo("Query: " + sqlQuery);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-19 03:40:16
|
Revision: 461
http://saim.svn.sourceforge.net/saim/?rev=461&view=rev
Author: q1Nguyen
Date: 2012-06-19 03:40:09 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java
trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java
trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java
trunk/saim-game/src/main/webapp/Application.css
Modified: trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java 2012-06-19 00:47:42 UTC (rev 460)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/entities/EnemyShooter.java 2012-06-19 03:40:09 UTC (rev 461)
@@ -89,7 +89,7 @@
this.setLinearVelocity(0f,4f);
// System.out.println("null!!");
}else
- this.setLinearVelocity(-2f, veloY);
+ this.setLinearVelocity(-1f, veloY);
this.setAngularVelocity(-4f);
//System.out.println(x+ " , " +y);
Modified: trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java 2012-06-19 00:47:42 UTC (rev 460)
+++ trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java 2012-06-19 03:40:09 UTC (rev 461)
@@ -85,7 +85,7 @@
// Image
pic = image0;
picPanel = new VerticalPanel();
- picPanel.setStyleName("tutorialPanel_image");
+// picPanel.setStyleName("tutorialPanel_image");
picPanel.add(pic);
// Text
textHTML = new HTML();
@@ -117,6 +117,18 @@
image6 = new Image("Application/images/tutorial/tutorialGoal3.png");
image7 = new Image("Application/images/tutorial/tutorialUnits.png");
image8 = new Image("Application/images/tutorial/tutorialVerify.png");
+
+ image0.setStyleName("tutorialPanel_image");
+ image1.setStyleName("tutorialPanel_image");
+ image2.setStyleName("tutorialPanel_image");
+ image3.setStyleName("tutorialPanel_image");
+ image4.setStyleName("tutorialPanel_image");
+ image5.setStyleName("tutorialPanel_image");
+ image6.setStyleName("tutorialPanel_image");
+ image7.setStyleName("tutorialPanel_image");
+ image8.setStyleName("tutorialPanel_image");
+
+
}
public void setNextClickHandler(ClickHandler handler) {
@@ -245,7 +257,7 @@
picPanel.add(image3);
// Text
textHTML.setHTML("Use the <b>ENTER</b> key to drop your pea. "
- + "Each dropped pea will <b>cost</b> your <b>coins</b>.");
+ + "Each dropped pea will <b>cost coins</b>.");
}
public void goal() {
@@ -324,11 +336,11 @@
textHTML
.setHTML("Decide whether this statement is <b>Valid</b> or <b>Not Valid</b>. "
+ "If you don't have a clue, choose <b>Not Sure</b>. <br>For each verified statement, you'll be rewarded with coins - which you can use to buy new units."
- + "<br><br><b>Shortcut-Keys:</b> Push 2 times <b>[1]</b> for <b>Valid</b>, 2 times <b>[2]</b> for <b>Not Valid</b> and 2 times <b>[3]</b> for <b>Not Sure</b>."
+ + "<br><br><b>Shortcut-Keys:</b> Push key <b>[1]</b> for <b>Valid</b>, key <b>[2]</b> for <b>Not Valid</b> and key <b>[3]</b> for <b>Not Sure</b>."
+ "<br><br>Please mark a statement as valid or not valid <b>only</b> if you're <b>secure</b> in your decision."
+ "<br>If your verification <b>corresponds</b> to the verification of the majority of the players, you will get a <b>bonus</b>."
+ "<br>But watch out: False verifications will be <b>punished</b>! So avoid making random decisions."
- +"<br>The actually displayed quiz varies from game to game."
+ +"<br>The actually displayed quiz may vary from game to game."
// + "<br>and if you have the slightest doubt, better choose 'Not Sure' or click the <b>http-links</b> for further information."
+ "<br><br>Thanks for your attention. Now have some fun and start playing! :)<br>");
Modified: trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java 2012-06-19 00:47:42 UTC (rev 460)
+++ trunk/saim-game/src/main/java/net/saim/game/server/RDFHandler.java 2012-06-19 03:40:09 UTC (rev 461)
@@ -1,11 +1,17 @@
package net.saim.game.server;
+import java.awt.Image;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.ProtocolException;
+import java.net.URL;
import java.sql.Connection;
import java.sql.SQLException;
+import javax.imageio.ImageIO;
import javax.xml.parsers.ParserConfigurationException;
import org.xml.sax.SAXException;
@@ -839,13 +845,13 @@
// Standard SPARQL Query for a Property
- querySubject[0] = createSparqlQuery(subject, ontoSubject.getProp0());
+ querySubject[0] = createSparqlQuery(subject, ontoSubject.getProp0(), "en");
querySubject[1] = createSparqlQuery(subject, ontoSubject.getProp1());
querySubject[2] = createSparqlQuery(subject, ontoSubject.getProp2(), "en");
querySubject[3] = createSparqlQuery(subject, ontoSubject.getProp3());
querySubject[4] = createSparqlQuery(subject, ontoSubject.getImage());
- queryObject[0] = createSparqlQuery(object, ontoObject.getProp0());
+ queryObject[0] = createSparqlQuery(object, ontoObject.getProp0(), "en");
queryObject[1] = createSparqlQuery(object, ontoObject.getProp1());
queryObject[2] = createSparqlQuery(object, ontoObject.getProp2());
queryObject[3] = createSparqlQuery(object, ontoObject.getProp3());
@@ -1026,7 +1032,7 @@
}
- private String dbInsertFromXML(Template ontoSubject, Template ontoObject) {
+ private String dbInsertFromXML3(Template ontoSubject, Template ontoObject) {
echo("##Insert from xml-file");
// String subject, predicate, object;
@@ -1363,6 +1369,355 @@
}
+ private String dbInsertFromXML(Template ontoSubject, Template ontoObject) {
+ echo("##Insert from xml-file");
+ // String subject, predicate, object;
+
+ // status of querying and adding links
+ linkCounter = 0;
+ linkSuccess = 0;
+ linkFailure = 0;
+ linkAdded= 0;
+ linkConfidencePositive = 0;
+ linkConfidenceNegative = 0;
+
+ Image subImage=null;
+ Image obImage=null;
+
+ String msg = null;
+
+ String rdfQuery = "PREFIX align: <http://knowledgeweb.semanticweb.org/heterogeneity/alignment#.>"
+ + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> "
+ + "SELECT ?entity1 ?rel ?entity2 ?measure WHERE { "
+ + "?cell rdf:type <http://knowledgeweb.semanticweb.org/heterogeneity/alignment#Cell> ."
+ + "?cell <http://knowledgeweb.semanticweb.org/heterogeneity/alignment#entity1> ?entity1 ."
+ + "?cell <http://knowledgeweb.semanticweb.org/heterogeneity/alignment#entity2> ?entity2 ."
+ + "?cell <http://knowledgeweb.semanticweb.org/heterogeneity/alignment#measure> ?measure ."
+ + "?cell <http://knowledgeweb.semanticweb.org/heterogeneity/alignment#relation> ?rel ."
+ + "}";
+
+ echo("rdfQuery: "+rdfQuery);
+ // Init DBTool. Parameters: (server, database, user, pass)
+ // DBTool db = new DBTool("localhost","veri_links", "root", ""); // <---
+ // Change this
+ DBTool db = new DBTool(dbIniPath);
+ Connection con = db.getConnection(); // Connect to db
+ echo("Create XMLTool");
+ XMLTool xml = new XMLTool(templateFile);
+ try {
+ xml.readTemplateFile();
+ } catch (ParserConfigurationException e1) {
+ echo("XMLTool Error: "+e1.getMessage());
+ e1.printStackTrace();
+ } catch (SAXException e1) {
+ echo("XMLTool Error: "+e1.getMessage());
+ e1.printStackTrace();
+ } catch (IOException e1) {
+ echo("XMLTool Error: "+e1.getMessage());
+ e1.printStackTrace();
+ }
+ echo("Create XMLTool done.");
+ echo("Get important attributes.");
+ // Important
+ importantSubject[0] = xml.getAttribute(ontoSubject.getName(),
+ PropertyConstants.PROP0, "important");
+ importantSubject[1] = xml.getAttribute(ontoSubject.getName(),
+ PropertyConstants.PROP1, "important");
+ importantSubject[2] = xml.getAttribute(ontoSubject.getName(),
+ PropertyConstants.PROP2, "important");
+ importantSubject[3] = xml.getAttribute(ontoSubject.getName(),
+ PropertyConstants.PROP3, "important");
+ importantSubject[4] = xml.getAttribute(ontoSubject.getName(),
+ PropertyConstants.IMAGE, "important");
+ if(ontoObject.getName().equals("bbcwildlife") || ontoObject.getName().equals("linkedgeodata"))
+ importantSubject[4] = "yes";
+
+ String imp;
+ if (ontoSubject.getType().equals(PropertyConstants.TEMPLATE_TYPE_MAP))
+ imp = "yes";
+ else
+ imp = "no";
+ importantSubject[5] = imp;
+ importantSubject[6] = imp;
+
+ echo("ImportantSubject:");
+ for (int i = 0; i < importantSubject.length; i++)
+ echo(importantSubject[i]);
+
+ importantObject[0] = xml.getAttribute(ontoObject.getName(),
+ PropertyConstants.PROP0, "important");
+ importantObject[1] = xml.getAttribute(ontoObject.getName(),
+ PropertyConstants.PROP1, "important");
+ importantObject[2] = xml.getAttribute(ontoObject.getName(),
+ PropertyConstants.PROP2, "important");
+ importantObject[3] = xml.getAttribute(ontoObject.getName(),
+ PropertyConstants.PROP3, "important");
+ importantObject[4] = xml.getAttribute(ontoObject.getName(),
+ PropertyConstants.IMAGE, "important");
+ if (ontoObject.getType().equals(PropertyConstants.TEMPLATE_TYPE_MAP))
+ imp = "yes";
+ else
+ imp = "no";
+ importantObject[5] = imp;
+ importantObject[6] = imp;
+
+ echo("ImportantObject:");
+ for (int i = 0; i < importantObject.length; i++)
+ echo(importantObject[i]);
+ echo("Get important attributes done.");
+
+ echo("Query model");
+ String rdfResult = "";
+
+ QueryExecution qExec = QueryExecutionFactory.create(rdfQuery, model);
+
+ com.hp.hpl.jena.query.ResultSet rs = qExec.execSelect();
+ // QuerySolution binding = rs.nextSolution();
+ // text = binding.toString();
+ while (rs.hasNext()) { // if query is successful
+
+ // When stop?
+ if(linkAdded >200)
+ break;
+
+ echo("Result hasNext..");
+ statusSubject = true;
+ statusObject = true;
+
+ QuerySolution binding = rs.nextSolution();
+ rdfResult = binding.toString();
+// processResult(rdfResult);
+ processResult(binding);
+// echo(processResult(rdfResult));
+
+ linkCounter++;
+
+ // Should add?
+ if(confidence == 1 || confidence ==-2){
+ if((linkConfidencePositive + linkConfidenceNegative ) > 60)
+ continue;
+ else if(linkConfidencePositive > 30 && confidence==1)
+ continue;
+ else if(linkConfidenceNegative > 30 && confidence==-2)
+ continue;
+ }
+
+ // Standard SPARQL Query for a Property
+ querySubject[0] = createSparqlQuery(subject, ontoSubject.getProp0(),"en");
+ querySubject[1] = createSparqlQuery(subject, ontoSubject.getProp1());
+ querySubject[2] = createSparqlQuery(subject, ontoSubject.getProp2(),
+ xml.getAttribute(ontoSubject.getName(), PropertyConstants.PROP2,
+ "filter"));
+ querySubject[3] = createSparqlQuery(subject, ontoSubject.getProp3());
+ querySubject[4] = createSparqlQuery(subject, ontoSubject.getImage());
+ querySubject[5] = createSparqlQuery(subject, ontoSubject.getLat());
+ querySubject[6] = createSparqlQuery(subject, ontoSubject.getLong());
+
+ queryObject[0] = createSparqlQuery(object, ontoObject.getProp0());
+ queryObject[1] = createSparqlQuery(object, ontoObject.getProp1());
+ queryObject[2] = createSparqlQuery(object, ontoObject.getProp2(),
+ xml.getAttribute(ontoObject.getName(), PropertyConstants.PROP2,
+ "filter"));
+ queryObject[3] = createSparqlQuery(object, ontoObject.getProp3());
+ queryObject[4] = createSparqlQuery(object, ontoObject.getImage());
+ queryObject[5] = createSparqlQuery(object, ontoObject.getLat());
+ queryObject[6] = createSparqlQuery(object, ontoObject.getLong());
+
+// // Test
+// for (int k = 0; k < numberOfProperties; k++) {
+// echo(k + ".QUERY SUB : " + querySubject[k]
+// + ". Length : " + querySubject[k].length());
+// echo(k + ". QUERY OB : " + queryObject[k]
+// + ".Length : " + queryObject[k].length());
+// }
+
+ // Execute SPARQL query
+ try {
+ echo("Execute sparql query");
+ for (int i = 0; i < numberOfProperties; i++) { // No query for image
+ echo("####" + i + ". Property####");
+ echo("(Value Subject) = ");
+ if (querySubject[i].isEmpty()) {
+ textSubject[i] = PropertyConstants.NO_DECLARATION;
+ echo("\n");
+ } else {
+ if (i == 4) { // Image -> limit to 1 image
+ if (xml.getAttribute(ontoSubject.getName(),
+ PropertyConstants.IMAGE, "linkedData").contains("yes")) {
+ echo("Subject: Found image with special case! "
+ + xml.getAttribute(ontoSubject.getName(),
+ PropertyConstants.IMAGE, "linkedData"));
+ textSubject[i] = linkedData(subject);
+ if(checkUrl(textSubject[i])==false)
+ textSubject[i]="";
+
+ } else
+ textSubject[i] = sparqlQueryText(querySubject[i],
+ endPointSubject, 1);
+ } else
+ textSubject[i] = sparqlQueryText(querySubject[i], endPointSubject);
+ }
+ echo("(Value Object) = ");
+ if (queryObject[i].isEmpty()) {
+ textObject[i] = PropertyConstants.NO_DECLARATION;
+ echo("\n");
+ } else {
+ if (i == 4) {
+ if (xml.getAttribute(ontoObject.getName(),
+ PropertyConstants.IMAGE, "linkedData").equals("yes")) {
+ echo("Object: Found image with special case: "
+ + xml.getAttribute(ontoObject.getName(),
+ PropertyConstants.IMAGE, "linkedData"));
+ textObject[i] = linkedData(object);
+ if(checkUrl(textObject[i])==false)
+ textObject[i]="";
+
+ } else
+ textObject[i] = sparqlQueryText(queryObject[i], endPointObject,
+ 1);
+ } else
+ textObject[i] = sparqlQueryText(queryObject[i], endPointObject);
+ }
+ // If SPARQL query execution returns an empty set for subject query.
+ // Set status false and stop querying each property of this subject
+ // (not!!)
+ if (textSubject[i].isEmpty() && importantSubject[i].equals("yes")) {
+ statusSubject = false;
+ echo(subject
+ + "\nError: Null result for SPARQL query. Subject " + i + " "
+ + textSubject[i]);
+ // break;
+ }
+ // If SPARQL QueryExecution returns an empty set for object query ->
+ // status = false and break
+ if (textObject[i].isEmpty() && importantObject[i].equals("yes")) {
+ statusObject = false;
+ echo(object
+ + "\nError: Null result for SPARQL query. Object " + i + " "
+ + textObject[i]);
+ // break;
+ }
+
+ }
+ // Insert parsed SPARQL results into database
+ if ((statusSubject && statusObject) == true) { // If subject and object
+ // are valid
+ // Stats
+ linkSuccess++;
+ if(confidence==1)
+ linkConfidencePositive++;
+ if(confidence==-2){ // transfrom to verli value
+ linkConfidenceNegative++;
+ }
+
+
+ linkAdded++;
+
+ System.out.println("\n[[[[[[ Success ]]]]]]");
+ System.out.println("linkAdded: "+linkAdded);
+ // Resource
+ sqlQuerySubject = "INSERT IGNORE INTO instances VALUES ('" + subject
+ + "','" + textSubject[0] + "','" + textSubject[1] + "','"
+ + textSubject[2] + "','" + textSubject[3] + "','"
+ + ontologyNameSubject + "','" + textSubject[4] + "','"
+ + ontoSubject.getType() + "','" + textSubject[5] + "','"
+ + textSubject[6] + "' )";
+ db.queryUpdate(sqlQuerySubject, con);
+
+ sqlQueryObject = "INSERT IGNORE INTO instances VALUES ('" + object
+ + "','" + textObject[0] + "','" + textObject[1] + "','"
+ + textObject[2] + "','" + textObject[3] + "','"
+ + ontologyNameObject + "','" + textObject[4] + "','"
+ + ontoObject.getType() + "','" + textObject[5] + "','"
+ + textObject[6] + "' )";
+ db.queryUpdate(sqlQueryObject, con);
+
+ // SQL query for inserting (subject, predicate, object, confidence)
+ // into table links
+ sqlQueryStatements = "INSERT IGNORE INTO links ("
+ + PropertyConstants.DB_TABLE_LINKS_PROPERTY_SUBJECT + ", "
+ + PropertyConstants.DB_TABLE_LINKS_PROPERTY_PREDICATE + ","
+ + PropertyConstants.DB_TABLE_LINKS_PROPERTY_OBJECT + ","
+ + PropertyConstants.DB_TABLE_LINKS_PROPERTY_LINKED_ONTOLOGIES
+ + "," + PropertyConstants.DB_TABLE_LINKS_PROPERTY_CONFIDENCE
+ + ") VALUES ('" + subject + "','" + predicate + "','" + object
+ + "','" + linkedOntologies + "'," + confidence + " )";
+
+ // SQL query execution: Insert into table links
+ db.queryUpdate(sqlQueryStatements, con);
+
+
+ } else {// Invalid RDF Result. Method sparqlQueryText returns "".
+ // Therefore, set confidence -1.
+ linkFailure++;
+ System.out.println("\n[[[[[[ FAIL ]]]]]]");
+ System.out.println("linkFailure: "+linkFailure);
+// sqlQueryStatements = "INSERT IGNORE INTO links ("
+// + PropertyConstants.DB_TABLE_LINKS_PROPERTY_SUBJECT + ", "
+// + PropertyConstants.DB_TABLE_LINKS_PROPERTY_PREDICATE + ","
+// + PropertyConstants.DB_TABLE_LINKS_PROPERTY_OBJECT + ","
+// + PropertyConstants.DB_TABLE_LINKS_PROPERTY_LINKED_ONTOLOGIES
+// + "," + PropertyConstants.DB_TABLE_LINKS_PROPERTY_CONFIDENCE
+// + ") VALUES ('" + subject + "','" + predicate + "','" + object
+// + "','" + linkedOntologies + "',"
+// + PropertyConstants.CONFIDENCE_ERROR + " )";
+ // SQL query execution: Insert into table links
+// db.queryUpdate(sqlQueryStatements, con);
+ }
+
+
+
+ } catch (Exception e) {
+ echo("Error: " + e.getMessage());
+ }
+
+ // Ausgabe
+ echo(linkCounter+".link s:"+ subject + " p: "+predicate + "o: "+object+"\n\n");
+
+ }
+ echo("Querying rdf statements done");
+
+ // Insert linkedOntologies into table linkedOntologies
+ String sqlLinkedOntologies = "REPLACE INTO "
+ + PropertyConstants.DB_TABLE_NAME_LINKEDONTOLOGIES + "("
+ + PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_SUBJECT + ","
+ + PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_PREDICATE + ","
+ + PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_OBJECT + ","
+ + PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_DESCRIPTION + ","
+ + PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_DIFFICULTY + ","
+ + PropertyConstants.DB_TABLE_LINKEDONTOLOGIES_READY + ") VALUES ('"
+ + ontologyNameSubject + "','" + this.task.getPredicate() + "','"
+ + ontologyNameObject + "','" + this.task.getDescription() + "','"
+ + this.task.getDifficulty() + "','" + "1" + "')";
+ if (linkSuccess > 3) {
+ db.queryUpdate(sqlLinkedOntologies, con);
+ } else
+ msg += "RDFHandler: "
+ + ontologyNameSubject
+ + " and "
+ + ontologyNameObject
+ + " have less than 5 succesful links. Won't be added tp linkedOntologies table!\n";
+
+ // Close db Connection
+ try {
+ echo("Close DB Connection..");
+ con.close();
+ echo("Done.");
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ msg += "RDFHandler: Querying and inserting rdf-statements done. "
+ + "Links queried: " + linkCounter + ". Successful: " + linkSuccess
+ + ". Failure: " + linkFailure+", positiveConfidence: "
+ +linkConfidencePositive+", negativeConfidence: "+linkConfidenceNegative+" LinksAdded: "+linkAdded;
+ System.out.println("\n\n\n___________________" + msg + "\n\n\n");
+ return msg;
+
+ }
+
+
public void processResult(QuerySolution binding) {
echo("Process results: "+binding);
@@ -1504,6 +1859,43 @@
return null;
}
+
+ private boolean checkUrl(String url){
+ System.out.println("Check Url: "+url);
+ if(url.contains("<"))
+ url=url.replace("<", "");
+ if(url.contains(">"))
+ url=url.replace(">", "");
+ URL u;
+ int code=0;
+ try {
+// u = new URL ( "http://static.bbci.co.uk/naturelibrary/3.1.1.0/images/ic/maps/366x217/species/European_Stonechat.gif");
+ u = new URL(url);
+ HttpURLConnection huc = ( HttpURLConnection ) u.openConnection ();
+ huc.setRequestMethod ("GET"); //OR huc.setRequestMethod ("HEAD");
+ huc.connect () ;
+ code = huc.getResponseCode() ;
+ System.out.println(code);
+ } catch (MalformedURLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (ProtocolException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ if (code == 200){
+ System.out.println("Check Url Succes");
+ return true;
+ }
+ else{
+ System.out.println("Check Url Fail. Code: "+code);
+ return false;
+ }
+ }
+
public static void main(String args[]) {
// Test current dir
@@ -1518,36 +1910,41 @@
// // Test Start method------------------------------------------------------------
// String path = "/home/q1/Desktop/linkFiles/factbooklang_links_verify131.xml";
-// String path ="/home/q1/Desktop/linkFiles/spec/silk_2.5.3/spec/output/final/factbooklang_links_accepted.xml";
-// String path ="/home/q1/Desktop/linkFiles/spec/silk_2.5.3/spec/output/final/dbpedia-factbook-check-links.xml";
-// path="/home/q1/Desktop/linkFiles/final/dbpedia_bbcwildlife/dbpedia_bbcwildlife_links_accepted.xml";
+ String path ="/home/q1/Desktop/linkFiles/final/dbpedia_factbook/dbpedia_factbook_lang_links_verify.xml";
+// path ="/home/q1/Desktop/linkFiles/spec/silk_2.5.3/spec/output/final/dbpedia-factbook-check-links.xml";
+
+ path="/home/q1/Desktop/linkFiles/final/dbpedia_bbcwildlife/1.dbpedia_bbcwildlife_links_accepted.xml";
+// path="/home/q1/Desktop/linkFiles/final/dbpedia_bbcwildlife/2.BBCwildlife_links_verify_final.xml";
+// path="/home/q1/Desktop/linkFiles/final/dbpedia_bbcwildlife/3.BBCwildlife_links_accepted_new.xml";
+
// path="/home/q1/Desktop/linkFiles/final/dbpedia_lgd/dbpedia_lgd_countries.xml";
-// String db = "/home/q1/workspace/saim/saim-game/target/saim-game-0.1-SNAPSHOT/Application/db_settings.ini";
-// String temp = "/home/q1/workspace/saim/saim-game/target/saim-game-0.1-SNAPSHOT/Application/Templates.xml";
-// System.out.println("Create XMLTool");
-// XMLTool xml = new XMLTool(temp);
-// try {
-// xml.readTemplateFile();
-// } catch (ParserConfigurationException e1) {
-// // TODO Auto-generated catch block
-// e1.printStackTrace();
-// } catch (SAXException e1) {
-// // TODO Auto-generated catch block
-// e1.printStackTrace();
-// } catch (IOException e1) {
-// // TODO Auto-generated catch block
-// e1.printStackTrace();
-// }
-// System.out.println("Create XMLTool done");
-// Task t = new Task();
-// t.setDescription("descr");
-// t.setDifficulty("hard");
-// t.setObject("factbook");
-// t.setSubject("dbpedia");
-// t.setPredicate("spoken in");
-// RDFHandler rdf = new RDFHandler(path, db,temp,t);
-// rdf.start(xml.getTemplate("dbpedia"), xml.getTemplate("linkedgeodata"), RDFHandler.formatXML);
-// // Test Start ------------------------------------------------------------
+// path="/home/q1/Desktop/linkFiles/final/dbpedia_lgd/dbpedia_lgd_countries_new.xml";
+ String db = "/home/q1/workspace/saim/saim-game/target/saim-game-0.1-SNAPSHOT/Application/db_settings.ini";
+ String temp = "/home/q1/workspace/saim/saim-game/target/saim-game-0.1-SNAPSHOT/Application/Templates.xml";
+ System.out.println("Create XMLTool");
+ XMLTool xml = new XMLTool(temp);
+ try {
+ xml.readTemplateFile();
+ } catch (ParserConfigurationException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ } catch (SAXException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ System.out.println("Create XMLTool done");
+ Task t = new Task();
+ t.setDescription("descr");
+ t.setDifficulty("hard");
+ t.setObject("factbook");
+ t.setSubject("dbpedia");
+ t.setPredicate("spoken in");
+ RDFHandler rdf = new RDFHandler(path, db,temp,t);
+ rdf.start(xml.getTemplate("dbpedia"), xml.getTemplate("bbcwildlife"), RDFHandler.formatXML);
+ // Test Start ------------------------------------------------------------
// Set path of the link file, which holds the semantic web links
@@ -1582,32 +1979,32 @@
// Query Test
- String query ="Select * where { <http://www.bbc.co.uk/nature/species/Mountain_Hare#species> <http://purl.org/dc/terms/description> ?x}";
- query ="SELECT ?x WHERE {<http://linkedgeodata.org/triplify/node424311641> <http://www.w3.org/2000/01/rdf-schema#label> ?x }";
- String text = "";
- String endText = "";
- String parsedText = "";
- QueryExecution qExec = QueryExecutionFactory.sparqlService("http://linkedgeodata.org/sparql/", query);
-
- int limitCounter = 0;
- QuerySolution binding = null;
- // How many values of a property should be queried
- try {
- com.hp.hpl.jena.query.ResultSet rs = qExec.execSelect();
- // binding = rs.nextSolution();
- // text = binding.toString();
- // endText = parseRDF(text);
-
- System.out.println("echo: ");
- while (rs.hasNext()) { // if query is successful
-
- binding = rs.nextSolution();
- text = binding.toString();
- System.out.println("results: "+text);
- }
- }catch(Exception e){
- System.out.println(e.getMessage());
- }
+// String query ="Select * where { <http://www.bbc.co.uk/nature/species/Mountain_Hare#species> <http://purl.org/dc/terms/description> ?x}";
+// query ="SELECT ?x WHERE {<http://linkedgeodata.org/triplify/node424311641> <http://www.w3.org/2000/01/rdf-schema#label> ?x }";
+// String text = "";
+// String endText = "";
+// String parsedText = "";
+// QueryExecution qExec = QueryExecutionFactory.sparqlService("http://linkedgeodata.org/sparql/", query);
+//
+// int limitCounter = 0;
+// QuerySolution binding = null;
+// // How many values of a property should be queried
+// try {
+// com.hp.hpl.jena.query.ResultSet rs = qExec.execSelect();
+// // binding = rs.nextSolution();
+// // text = binding.toString();
+// // endText = parseRDF(text);
+//
+// System.out.println("echo: ");
+// while (rs.hasNext()) { // if query is successful
+//
+// binding = rs.nextSolution();
+// text = binding.toString();
+// System.out.println("results: "+text);
+// }
+// }catch(Exception e){
+// System.out.println(e.getMessage());
+// }
}
}
Modified: trunk/saim-game/src/main/webapp/Application.css
===================================================================
--- trunk/saim-game/src/main/webapp/Application.css 2012-06-19 00:47:42 UTC (rev 460)
+++ trunk/saim-game/src/main/webapp/Application.css 2012-06-19 03:40:09 UTC (rev 461)
@@ -840,10 +840,13 @@
width: 800px;
height: 290px;
margin: 0px 5px 5px;
- padding: 0px 5px 5px;
+
border-bottom-width: 1px;
border-bottom-style: dashed;
border-bottom-color: #5c525c;
+ -moz-box-shadow: 1px 2px 5px 2px #ccc;
+ -webkit-box-shadow: 1px 2px 5px 2px #ccc;
+ box-shadow: 1px 2px 5px 2px #ccc;
}
.tutorialPanel_headPanel {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-19 00:47:48
|
Revision: 460
http://saim.svn.sourceforge.net/saim/?rev=460&view=rev
Author: q1Nguyen
Date: 2012-06-19 00:47:42 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/Application.java
trunk/saim-game/src/main/java/net/saim/game/client/core/GameComponent.java
trunk/saim-game/src/main/java/net/saim/game/client/core/info/InfoText.java
trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java
trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java
trunk/saim-game/src/main/java/net/saim/game/shared/User.java
Modified: trunk/saim-game/src/main/java/net/saim/game/client/Application.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-19 00:12:42 UTC (rev 459)
+++ trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-19 00:47:42 UTC (rev 460)
@@ -809,9 +809,10 @@
//msgButton.setText("ERROR Commit Verifications Failure: "+caught.getMessage());
}
- public void onSuccess(String result) {
+ public void onSuccess(String strength) {
//Window.alert("WIN Commit Verifications: "+result);
- echo("WIN Commit Verifications: "+result);
+ echo(" Commit Verifications success! userStrength: "+strength);
+ user.setStrength(strength);
//msgButton.setText("WIN Commit Verifications: "+result);
}};
@@ -2230,9 +2231,10 @@
echo("SendUser Error: "+arg0.getMessage());
}
- public void onSuccess(String arg0) {
+ public void onSuccess(String str) {
//Window.alert("Success: "+arg0);
- echo("SendUser Success "+arg0);
+ echo("SendUser Success. Strength: "+str);
+ user.setStrength(str);
// difficultyRequest();
setDifficulty(linkset.getDifficulty());
startOfGame=false;
@@ -2446,6 +2448,11 @@
private double calcDifficulty(double difficulty){
return Balancing.getLinkDifficulty(difficulty);
}
+
+ public User getUser() {
+ // TODO Auto-generated method stub
+ return this.user;
+ }
}
Modified: trunk/saim-game/src/main/java/net/saim/game/client/core/GameComponent.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/GameComponent.java 2012-06-19 00:12:42 UTC (rev 459)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/GameComponent.java 2012-06-19 00:47:42 UTC (rev 460)
@@ -127,9 +127,10 @@
worldLoaded = true;
world.setGame(game);
world.setDifficulty(getDifficulty());
- loadInfoText(money,score,lvl,getDifficulty());
+ loadInfoText(money,score,lvl,getDifficulty(),application.getUser().getStrength());
// Set user current level
application.setUserCurrentLevel(lvl);
+
loadMsg("start");
//System.out.println("Next LVL: "+world.getNextLevelScore() );
@@ -142,12 +143,13 @@
});
}
- public void loadInfoText(int money,int score, int level, String diff) {
+ public void loadInfoText(int money,int score, int level, String diff, String userStrength) {
InfoText infoText = new InfoText(world.dynamicLayer);
infoText.updateLevel(level);
infoText.updateMoney(money);
infoText.updateScore(score);
infoText.updateDifficulty(diff);
+ infoText.updateStrength(userStrength);
world.setInfo(infoText);
// Set FpsCounter
FpsCounter fpsCounter = new FpsCounter(infoText);
Modified: trunk/saim-game/src/main/java/net/saim/game/client/core/info/InfoText.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/core/info/InfoText.java 2012-06-19 00:12:42 UTC (rev 459)
+++ trunk/saim-game/src/main/java/net/saim/game/client/core/info/InfoText.java 2012-06-19 00:47:42 UTC (rev 460)
@@ -27,6 +27,7 @@
private int score;
private int level;
private String difficulty;
+ private String strength;
//private int newGameListeners;
@@ -64,11 +65,18 @@
modeLayer.setScale(0.03f);
modeLayer.setTranslation(42f, 1.5f);
+// Image str = assetManager().getImage("Application/images/info/strength.png");
+// System.out.println("WIDTH: "+str.width());
+// ImageLayer strLayer = graphics().createImageLayer(mode);
+// strLayer.setScale(0.03f);
+// strLayer.setTranslation(42f, 1.5f);
+
GroupLayer infoImageLayer = graphics().createGroupLayer();
infoImageLayer.add(scoreLayer);
infoImageLayer.add(goldLayer);
infoImageLayer.add(levelLayer);
infoImageLayer.add(modeLayer);
+// infoImageLayer.add(strLayer);
peaLayer.add(infoImageLayer);
}
@@ -87,7 +95,7 @@
canvas.drawText("" + money, posX, y + 21);
canvas.drawText("" + level, 745, y );
canvas.drawText("" + difficulty, 745, y + 22);
-
+ canvas.drawText("" + strength, 745, y + 44);
}
}
@@ -157,6 +165,14 @@
public String getDifficulty(){
return this.difficulty;
}
+
+ public void updateStrength(String userStrength) {
+ if (this.strength != userStrength) {
+ textDataChanged = true;
+ this.strength=userStrength;
+ }
+
+ }
Modified: trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java 2012-06-19 00:12:42 UTC (rev 459)
+++ trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java 2012-06-19 00:47:42 UTC (rev 460)
@@ -320,7 +320,7 @@
this.predicate.setHTML(parsePredicate(link.getPredicate()));
- this.linkDifficulty.setHTML("Difficulty: <b><i>"+Balancing.getStringLinkDifficulty(link.getDifficulty())+"</i></b>");
+ this.linkDifficulty.setHTML("<b>Difficulty: <i>"+Balancing.getStringLinkDifficulty(link.getDifficulty())+"</i></b>");
// question.clear();
// question.add(subject);
// question.add(predicate);
Modified: trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-19 00:12:42 UTC (rev 459)
+++ trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-19 00:47:42 UTC (rev 460)
@@ -1525,7 +1525,7 @@
* @param unsure
* @param penalty
* @param user
- * @return
+ * @return userStrength
*/
private String updateDB(Connection con,
ArrayList<Verification> verifications, int agree, int disagree, int unsure, int penalty, User user) {
@@ -1669,11 +1669,43 @@
msg = "Commit verifications of user " + user.getName() + " failed";
-
-
- return msg;
+ // Get user strength
+ String strength = getUserStrength(con,user);
+ return strength;
+// return msg;
}
+ private String getUserStrength(Connection con, User user) {
+ echo("Get User Strength");
+ String strength=null;
+ double userStrength=0;
+ String sqlUserStrength = "(Select strength " +
+ "from user_strength " +
+ "where UserName='"+user.getName()+"' " +
+ "And UserID= '"+user.getId()+"' )";
+ echo("sqlUserStrength: "+sqlUserStrength);
+ Statement stmt;
+ try {
+ stmt = con.createStatement();
+
+ ResultSet rs = stmt.executeQuery(sqlUserStrength);
+ if (rs.next()) {
+ echo("Query userStrength success");
+ userStrength= rs.getDouble("strength");
+ echo("Got userStrength: "+userStrength);
+ }
+ else{
+ echo("Query userStrength failed!");
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ strength = Balancing.getStringUserStrength(userStrength);
+ echo("Get User Strength done: "+strength);
+ return strength;
+ }
+
/**
* Update database with new verification information.
*
@@ -2539,15 +2571,16 @@
public String sendUser(User user) {
echo("###Server: Receiving User from client");
echo("User: " + user.getName());
- addUser(user);
+ String strength =addUser(user);
echo("###Server: Receiving User from client End");
- return userList.get(user.getId()).getName();
+ return strength;
+// return userList.get(user.getId()).getName();
}
- private void addUser(User user) {
+ private String addUser(User user) {
echo("##Add User##");
userList.put(user.getId(), user);
-
+ String strength=null;
DBTool db = new DBTool(resourcePath + dbIniFile);
Connection con = db.getConnection();
String sqlQuery = "INSERT IGNORE INTO `"
@@ -2561,10 +2594,15 @@
try {
Statement stmt = con.createStatement();
stmt.executeUpdate(sqlQuery);
+
+ strength = getUserStrength(con,user);
+
+
con.close();
} catch (Exception e) {
echo("Server Error: Couldn't insert User into db.");
}
+ return strength;
}
private HashMap<String, User> getUserList() {
@@ -2583,7 +2621,7 @@
Connection con = db.getConnection();
// add into db
- String msg = updateDB(con, verifications, agree, disagree, unsure, penalty, user);
+ String userStrength = updateDB(con, verifications, agree, disagree, unsure, penalty, user);
// Close db connection
try {
con.close();
@@ -2592,7 +2630,7 @@
e.printStackTrace();
}
echo("###Server: Commit Verifications End###");
- return msg;
+ return userStrength;
}
/**Request linkset difficulty*/
Modified: trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java 2012-06-19 00:12:42 UTC (rev 459)
+++ trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java 2012-06-19 00:47:42 UTC (rev 460)
@@ -10,6 +10,15 @@
public static final String ULTIMATE="ultimate";
public static final String UNKNWON = "unknown";
+ public static final String NOVICE="novice";
+ public static final String APPRENTICE="apprentice";
+ public static final String VETERAN="veteran";
+ public static final String MASTER="master";
+ public static final String HERO="hero";
+ public static final String LEGEND = "legend";
+ public static final String ETERNAL = "eternal";
+
+
public static final double EXPLORATION_FACTOR = 0.6;
public static double getLinkDifficulty(double difficulty) {
@@ -83,4 +92,24 @@
return "difficultyError";
}
+
+ public static String getStringUserStrength(double str) {
+ // Novice
+ if(str<=0.76)
+ return NOVICE;
+ else if(0.77<=str && str<0.84)
+ return APPRENTICE;
+ else if(0.85<=str && str<0.9)
+ return VETERAN;
+ else if(0.91<=str && str <0.94)
+ return MASTER;
+ else if(0.95<=str && str <0.97)
+ return HERO;
+ else if(0.98<=str && str <0.9)
+ return LEGEND;
+ else if(str == 1)
+ return ETERNAL;
+ else
+ return "unknwon";
+ }
}
Modified: trunk/saim-game/src/main/java/net/saim/game/shared/User.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/shared/User.java 2012-06-19 00:12:42 UTC (rev 459)
+++ trunk/saim-game/src/main/java/net/saim/game/shared/User.java 2012-06-19 00:47:42 UTC (rev 460)
@@ -11,6 +11,7 @@
private int currentLevel=0;
private long currentLevelTime=0;
private long currentLevelStartTime=0;
+ private String strength="unknown";
public User(){
@@ -107,4 +108,14 @@
public void setCurrentLevelStartTime(long time){
this.currentLevelStartTime=time;
}
+
+ public void setStrength(String strength) {
+ this.strength=strength;
+
+ }
+
+ public String getStrength() {
+ return this.strength;
+
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-19 00:12:48
|
Revision: 459
http://saim.svn.sourceforge.net/saim/?rev=459&view=rev
Author: q1Nguyen
Date: 2012-06-19 00:12:42 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/Application.java
trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java
trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java
trunk/saim-game/src/main/java/net/saim/game/shared/rdfStatement.java
Modified: trunk/saim-game/src/main/java/net/saim/game/client/Application.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-18 23:17:36 UTC (rev 458)
+++ trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-19 00:12:42 UTC (rev 459)
@@ -136,6 +136,7 @@
//Test
private Button msgButton;
+ private Button linkMsg;
private Button testButton;
/** Users verification */
@@ -663,6 +664,10 @@
msgButton.setStyleName("gameMessage");
msgButton.setEnabled(false);
+ // Link message
+ linkMsg = new Button( "Link Messages" );
+ linkMsg.setStyleName("gameMessage");
+ linkMsg.setEnabled(false);
testButton = new Button( "Test2" );
//testButton.setEnabled(false);
@@ -681,6 +686,7 @@
//rootPanel.add(verifyComponent,650,50);
//RootPanel.get("verifyContent").add(verifyComponent);
RootPanel.get().add(msgButton,0,399);
+// RootPanel.get().add(linkMsg,RootPanel.get().getOffsetWidth()-350,399);
//rootPanel.add(testButton,90,680);
// Bottom Buttons
@@ -745,8 +751,10 @@
isFirstStatement=false;
echo("Set first false for stmt id: "+stmt.getId());
}
+ link = stmt;
+ // updae linkMsg
+ linkMsg.setText("Link difficulty: "+Balancing.getStringLinkDifficulty(stmt.getDifficulty()));
// Update VerifyComponent
- link = stmt;
updateTable(link,subjectTemplate,objectTemplate);
DeferredCommand.addCommand(new Command()
{
@@ -1963,8 +1971,9 @@
// setNumKeyCache(1);
// }
if(!verifyLock()){
+
+ this.verifyComponent.setValidRadioButton(true);
this.sendVerificationToServer();
- this.verifyComponent.setValidRadioButton(true);
}
}
@@ -1976,8 +1985,9 @@
// setNumKeyCache(2);
// }
if(!verifyLock()){
+
+ this.verifyComponent.setNotValidRadioButton(true);
this.sendVerificationToServer();
- this.verifyComponent.setNotValidRadioButton(true);
}
}
@@ -1989,8 +1999,9 @@
// setNumKeyCache(3);
// }
if(!verifyLock()){
+
+ this.verifyComponent.setNotSureRadioButton(true);
this.sendVerificationToServer();
- this.verifyComponent.setNotSureRadioButton(true);
}
}
Modified: trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java 2012-06-18 23:17:36 UTC (rev 458)
+++ trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java 2012-06-19 00:12:42 UTC (rev 459)
@@ -1,6 +1,7 @@
package net.saim.game.client.verify;
import net.saim.game.client.panels.DetailsPanel;
+import net.saim.game.shared.Balancing;
import net.saim.game.shared.Configuration;
import net.saim.game.shared.Template;
import net.saim.game.shared.rdfInstance;
@@ -58,6 +59,8 @@
private VerticalPanel mapInfoPanel;
private MapWidget mapWidget;
+ private HTML linkDifficulty;
+
public KongregatePanel(Template subjectTemplate, Template objectTemplate,
Configuration config) {
super(subjectTemplate, objectTemplate, config);
@@ -174,8 +177,18 @@
if(subjectTemplate.getName().equals("dbpedia") && objectTemplate.getName().equals("bbcwildlife"))
head.setHTML("Are these the same animals?");
head.setStyleName("kongregateHead");
- DOM.setStyleAttribute(head.getElement(), "marginBottom", "8px");
- add(head);
+ DOM.setStyleAttribute(head.getElement(), "marginBottom", "8px");
+
+ linkDifficulty = new HTML("Link Difficulty");
+// DOM.setStyleAttribute(linkDifficulty.getElement(), "fontStyle", "italic");
+ DOM.setStyleAttribute(linkDifficulty.getElement(), "margin", "5px 20px");
+// DOM.setStyleAttribute(linkDifficulty.getElement(), "fontWeight", "bold");
+
+ HorizontalPanel questionHeadPanel = new HorizontalPanel();
+ questionHeadPanel.add(head);
+ questionHeadPanel.add(linkDifficulty);
+
+ add(questionHeadPanel);
add(wholeQuestionPanel);
// DOM.setStyleAttribute(qMark.getElement(), "paddingTop", "15px");
// DOM.setStyleAttribute(is.getElement(), "paddingTop", "15px");
@@ -306,6 +319,8 @@
}
this.predicate.setHTML(parsePredicate(link.getPredicate()));
+
+ this.linkDifficulty.setHTML("Difficulty: <b><i>"+Balancing.getStringLinkDifficulty(link.getDifficulty())+"</i></b>");
// question.clear();
// question.add(subject);
// question.add(predicate);
Modified: trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-18 23:17:36 UTC (rev 458)
+++ trunk/saim-game/src/main/java/net/saim/game/server/ServiceImpl.java 2012-06-19 00:12:42 UTC (rev 459)
@@ -921,7 +921,7 @@
if(nextLink == Message.NORMAL_LINK){
boolean isVerifiedLink = isVerifiedLink();
if(isVerifiedLink == false) // Minimum
- SQLqueryLinks = "select * from links where linkedOntologies='"+linkset+"' and Confidence not in (1,-1,-2) "+ notIn +" order by Counter limit 1";
+ SQLqueryLinks = "select * from links, difficulty where links.ID = difficulty.ID AND links.linkedOntologies='"+linkset+"' and links.Confidence not in (1,-1,-2) "+ notIn +" order by links.Counter limit 1";
else { // Already validated
// SQLqueryLinks = "select * from links where linkedOntologies='"+linkset+"' and Confidence not in (1,-1,-2) and Counter>0 "+ notIn +" order by Counter limit 1";
// take: link Difficulty, user strength, not already verified links
@@ -961,7 +961,7 @@
}
}// eval
else if (nextLink == Message.EVAL_LINK) {
- SQLqueryLinks = "select * from links where linkedOntologies='"+linkset+"' and Confidence in (1,-2) "+ notIn +" order by Counter limit 1";
+ SQLqueryLinks = "select * from links, difficulty where links.ID = difficulty.ID AND links.linkedOntologies='"+linkset+"' and links.Confidence in (1,-2) "+ notIn +" order by links.Counter limit 1";
}
// Start query
@@ -980,11 +980,12 @@
echo("link: " + rs.getInt("ID") + " , " + rs.getString("Subject")
+ " , " + rs.getString("Predicate") + " , "
+ rs.getString("Object") + " , " + rs.getDouble("Confidence")
- + " , " + rs.getInt("Counter"));
+ + " , " + rs.getInt("Counter")+ " , "+rs.getDouble("Difficulty"));
+ statement.setDifficulty(rs.getDouble("Difficulty"));
}
else{ // If no result, query again
echo("Get new statement fail. Query again!");
- SQLqueryLinks = "select * from links where linkedOntologies='"+linkset+"' and Confidence not in (1,-1,-2) "+notIn+ " order by Counter limit 1";
+ SQLqueryLinks = "select * from links, difficulty where links.ID=difficulty.ID AND links.linkedOntologies='"+linkset+"' and links.Confidence not in (1,-1,-2) "+notIn+ " order by links.Counter limit 1";
echo("SQLqueryLinks: "+SQLqueryLinks);
rs = stmt.executeQuery(SQLqueryLinks);
if(rs.next()){
@@ -996,11 +997,12 @@
echo("link: " + rs.getInt("ID") + " , " + rs.getString("Subject")
+ " , " + rs.getString("Predicate") + " , "
+ rs.getString("Object") + " , " + rs.getDouble("Confidence")
- + " , " + rs.getInt("Counter"));
+ + " , " + rs.getInt("Counter")+ " , "+rs.getDouble("Difficulty"));
+ statement.setDifficulty(rs.getDouble("Difficulty"));
}
else{
echo("Query after previous error... still error..");
- SQLqueryLinks = "select * from links where linkedOntologies='"+linkset+"' and Confidence not in (1,-1,-2) order by rand(Counter) limit 1";
+ SQLqueryLinks = "select * from links, difficulty where links.ID = difficulty.ID and links.linkedOntologies='"+linkset+"' and links.Confidence not in (1,-1,-2) order by rand(links.Counter) limit 1";
echo("SQLqueryLinks: "+SQLqueryLinks);
rs = stmt.executeQuery(SQLqueryLinks);
if(rs.next()){
@@ -1012,7 +1014,8 @@
echo("link: " + rs.getInt("ID") + " , " + rs.getString("Subject")
+ " , " + rs.getString("Predicate") + " , "
+ rs.getString("Object") + " , " + rs.getDouble("Confidence")
- + " , " + rs.getInt("Counter"));
+ + " , " + rs.getInt("Counter")+ " , "+rs.getDouble("Difficulty"));
+ statement.setDifficulty(rs.getDouble("Difficulty"));
}
}
}
@@ -1367,7 +1370,7 @@
int bonus = 0;
Bonus eval = null;
// Query verificationInformation
- try {
+
Statement dbStmt=null;
String sqlQuery=null;
ResultSet rs = null;
@@ -1377,8 +1380,9 @@
else if(select==NOT_VALID)
sqlQuery = "SELECT * from evaluate_negative WHERE ID="+id;
else if(select==NOT_SURE)
- return new Bonus(0,0);
+ return new Bonus(0,0);
echo("Eval query: "+sqlQuery);
+ try {
dbStmt = con.createStatement();
rs = dbStmt.executeQuery(sqlQuery);
if (rs.next()) {
Modified: trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java 2012-06-18 23:17:36 UTC (rev 458)
+++ trunk/saim-game/src/main/java/net/saim/game/shared/Balancing.java 2012-06-19 00:12:42 UTC (rev 459)
@@ -8,6 +8,7 @@
public static final String HARD="hard";
public static final String VERY_HARD="very hard";
public static final String ULTIMATE="ultimate";
+ public static final String UNKNWON = "unknown";
public static final double EXPLORATION_FACTOR = 0.6;
@@ -64,4 +65,22 @@
double diff = getLinkDifficulty(difficulty);
return (int) (bonus*diff);
}
+
+ public static String getStringLinkDifficulty(double difficulty) {
+ if(difficulty==0)
+ return UNKNWON;
+ else if(0<difficulty && difficulty <0.2)
+ return EASY;
+ else if(0.2<=difficulty && difficulty <0.5)
+ return MEDIUM;
+ else if(0.5<=difficulty && difficulty <0.7)
+ return HARD;
+ else if(0.7<=difficulty && difficulty <0.9)
+ return VERY_HARD;
+ else if(0.9<=difficulty && difficulty <1.0)
+ return ULTIMATE;
+ else
+ return "difficultyError";
+
+ }
}
Modified: trunk/saim-game/src/main/java/net/saim/game/shared/rdfStatement.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/shared/rdfStatement.java 2012-06-18 23:17:36 UTC (rev 458)
+++ trunk/saim-game/src/main/java/net/saim/game/shared/rdfStatement.java 2012-06-19 00:12:42 UTC (rev 459)
@@ -30,6 +30,7 @@
private String uriObject;
private Bonus bonus;
+ private double difficulty;
private boolean first=false;
public rdfStatement(){
@@ -65,6 +66,7 @@
this.linkSpecification = linkSpecification;
this.counter = counter;
this.notSure=notSure;
+ this.difficulty=0;
}
public rdfStatement(int id, rdfInstance instanceSubject, String predicate,
@@ -78,6 +80,7 @@
this.linkSpecification = linkSpecification;
this.counter = counter;
this.notSure=notSure;
+ this.difficulty=0;
}
public int getId() {
@@ -164,6 +167,14 @@
public void incNotSure() {
notSure++;
}
+
+ public double getDifficulty() {
+ return difficulty;
+ }
+
+ public void setDifficulty(double difficulty) {
+ this.difficulty = difficulty;
+ }
// public void setFirst(boolean b){
// this.first=b;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-18 23:17:42
|
Revision: 458
http://saim.svn.sourceforge.net/saim/?rev=458&view=rev
Author: q1Nguyen
Date: 2012-06-18 23:17:36 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/shared/Configuration.java
Modified: trunk/saim-game/src/main/java/net/saim/game/shared/Configuration.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/shared/Configuration.java 2012-06-18 23:15:59 UTC (rev 457)
+++ trunk/saim-game/src/main/java/net/saim/game/shared/Configuration.java 2012-06-18 23:17:36 UTC (rev 458)
@@ -43,8 +43,8 @@
}
// here
public boolean getLoginNeeded(){
-// return this.loginNeeded;
- return true;
+ return this.loginNeeded;
+// return true;
}
public boolean isKongregate(){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-18 23:16:06
|
Revision: 457
http://saim.svn.sourceforge.net/saim/?rev=457&view=rev
Author: q1Nguyen
Date: 2012-06-18 23:15:59 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
- todos from ttps://docs.google.com/document/d/19x2tgUDpoIhrpQgSnYQsMCzrfXBxrYNhK-Lp2LcmoA0/edit#
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/Application.java
trunk/saim-game/src/main/java/net/saim/game/client/panels/StartPanel.java
trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java
trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java
trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java
trunk/saim-game/src/main/java/net/saim/game/shared/Configuration.java
trunk/saim-game/src/main/webapp/Application.css
Added Paths:
-----------
trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/
trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/false.png
trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/true.png
trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/unsure.png
Modified: trunk/saim-game/src/main/java/net/saim/game/client/Application.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-18 16:30:32 UTC (rev 456)
+++ trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-18 23:15:59 UTC (rev 457)
@@ -208,6 +208,7 @@
*/
@Override
public void start() {
+// DOM.setStyleAttribute(RootPanel.getBodyElement(), "margin", "0px auto");
this.startOfGame=true;
this.isFirstStatement=true;
this.disableInput = true;
@@ -226,8 +227,15 @@
config.setKongregate(true);
DOM.setStyleAttribute(RootPanel.getBodyElement(), "width", "1030px");
// DOM.setStyleAttribute(RootPanel.getBodyElement(), "-moz-transform", "50%");
- }else
- config.setKongregate(false);
+ DOM.setStyleAttribute(RootPanel.getBodyElement(), "margin", "0px auto");
+ }else if(urlParam == null){
+ config.setSimple(true);
+ DOM.setStyleAttribute(RootPanel.getBodyElement(), "width", "1030px");
+ DOM.setStyleAttribute(RootPanel.getBodyElement(), "margin", "0px auto");
+// DOM.setStyleAttribute(RootPanel.getBodyElement(), "borderLeft", "1px solid grey");
+// DOM.setStyleAttribute(RootPanel.getBodyElement(), "borderRight", "1px solid grey");
+ config.setKongregate(false);
+ }
this.serverRunning=false;
this.subjectTemplate = new Template();
this.objectTemplate = new Template();
@@ -663,16 +671,16 @@
// Use RootPanel.get() to get the entire body element
- RootPanel rootPanel = RootPanel.get();
+// RootPanel rootPanel = RootPanel.get();
// Format
//rootPanel.setSize("1600", "800");
- rootPanel.getElement().getStyle().setPosition(Position.RELATIVE);
- rootPanel.setStyleName("root");
+// rootPanel.getElement().getStyle().setPosition(Position.RELATIVE);
+// rootPanel.setStyleName("root");
// Add to rootPanel
//rootPanel.add(verifyComponent,650,50);
//RootPanel.get("verifyContent").add(verifyComponent);
- rootPanel.add(msgButton,0,399);
+ RootPanel.get().add(msgButton,0,399);
//rootPanel.add(testButton,90,680);
// Bottom Buttons
@@ -977,10 +985,11 @@
pop.add(tutorialPanel);
glass.add(pop);
- glass.show();
+
pop.center();
pop.setStyleName("noBorder");
tutorialPanel.setGlassPanel(pop);
+ glass.show();
}
@@ -1069,6 +1078,8 @@
menu = new PopupPanel(false);
menu.add(tabPanel);
+ DOM.setStyleAttribute(menu.getElement(), "border", "1px black solid");
+ DOM.setStyleAttribute(menu.getElement(), "padding", "0px");
glass.show();
menu.center();
@@ -1596,7 +1607,7 @@
// Change verifyButton
verifyButton.setEnabled(false);
- verifyButton.setText("VERIFIED!");
+ verifyButton.setText("Verification send to server!");
// Get Verification
verification = new Verification(link.getId(),verifyComponent.getSelection());
@@ -1805,6 +1816,10 @@
initCallback();
initHandler();
sendUser();
+
+// DOM.setStyleAttribute(RootPanel.getBodyElement(), "borderLeft", "1px solid black");
+// DOM.setStyleAttribute(RootPanel.getBodyElement(), "borderRight", "1px solid black");
+
// initGame();
// initHighscore();
// glass.hide();
@@ -1941,31 +1956,42 @@
}
public void key1Pressed() {
- if(numKeyCache==1 && !verifyLock())
+// if(numKeyCache==1 && !verifyLock())
+// this.sendVerificationToServer();
+// else {
+// this.verifyComponent.setValidRadioButton(true);
+// setNumKeyCache(1);
+// }
+ if(!verifyLock()){
this.sendVerificationToServer();
- else {
this.verifyComponent.setValidRadioButton(true);
- setNumKeyCache(1);
- }
+ }
}
public void key2Pressed() {
- if(numKeyCache==2 && !verifyLock())
+// if(numKeyCache==2 && !verifyLock())
+// this.sendVerificationToServer();
+// else {
+// this.verifyComponent.setNotValidRadioButton(true);
+// setNumKeyCache(2);
+// }
+ if(!verifyLock()){
this.sendVerificationToServer();
- else {
this.verifyComponent.setNotValidRadioButton(true);
- setNumKeyCache(2);
- }
-
+ }
}
public void key3Pressed() {
- if(numKeyCache==3 && !verifyLock())
+// if(numKeyCache==3 && !verifyLock())
+// this.sendVerificationToServer();
+// else {
+// this.verifyComponent.setNotSureRadioButton(true);
+// setNumKeyCache(3);
+// }
+ if(!verifyLock()){
this.sendVerificationToServer();
- else {
this.verifyComponent.setNotSureRadioButton(true);
- setNumKeyCache(3);
- }
+ }
}
/**
@@ -2172,7 +2198,7 @@
verifyLock=false;
}
};
- t.schedule(4000);
+ t.schedule(2500);
}
/** Is verification mechanism locked? */
Modified: trunk/saim-game/src/main/java/net/saim/game/client/panels/StartPanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/panels/StartPanel.java 2012-06-18 16:30:32 UTC (rev 456)
+++ trunk/saim-game/src/main/java/net/saim/game/client/panels/StartPanel.java 2012-06-18 23:15:59 UTC (rev 457)
@@ -23,6 +23,7 @@
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HasVerticalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
@@ -63,6 +64,12 @@
public StartPanel(double barHeight, Unit barUnit, Configuration config) {
super();
this.config=config;
+ this.getDeckPanel().setStyleName("no-border-style");
+ DOM.setStyleAttribute(this.getElement(), "backgroundColor", "#39538E");
+ DOM.setStyleAttribute(this.getElement(), "paddingTop", "5px");
+ DOM.setStyleAttribute(this.getElement(), "border", "1px solid black");
+
+
// TODO Auto-generated constructor stub
}
@@ -280,7 +287,7 @@
VerticalPanel socialLoginPanel = new VerticalPanel();
socialLoginPanel.add(loginInfoSocial);
socialLoginPanel.add(imagePanel);
-
+
VerticalPanel normalLoginPanel = new VerticalPanel();
normalLoginPanel.add(infoName);
normalLoginPanel.add(nameInput);
@@ -290,11 +297,14 @@
HorizontalPanel hLoginPanel = new HorizontalPanel();
hLoginPanel.add(socialLoginPanel);
hLoginPanel.add(normalLoginPanel);
- hLoginPanel.addStyleName("hLoginPanel");
- DOM.setStyleAttribute(hLoginPanel.getElement(), "border", "1px solid lightGray");
+ hLoginPanel.addStyleName("startPanel_hLoginPanel");
+ DOM.setStyleAttribute(hLoginPanel.getElement(), "border", "1px solid grey");
DOM.setStyleAttribute(hLoginPanel.getElement(), "padding", "10px");
DOM.setStyleAttribute(hLoginPanel.getElement(), "marginBottom", "5px");
DOM.setStyleAttribute(hLoginPanel.getElement(), "marginTop", "8px");
+// DOM.setStyleAttribute(hLoginPanel.getElement(), "backgroundColor", "#F1F1F2");
+
+
loginPanel = new VerticalPanel();
loginPanel.add(loginInfoHead);
loginPanel.add(hLoginPanel);
@@ -305,11 +315,12 @@
// Linkset
VerticalPanel linksetPanel = new VerticalPanel();
- linksetPanel.setStyleName("startPanel_linkset");
+ linksetPanel.setStyleName("startPanel_linksetPanel");
linksetPanel.add(linksetTable);
linksetPanel.add(pager);
- DOM.setStyleAttribute(linksetPanel.getElement(), "border", "1px solid lightGray");
+ DOM.setStyleAttribute(linksetPanel.getElement(), "border", "1px solid grey");
DOM.setStyleAttribute(linksetPanel.getElement(), "padding", "5px");
+ DOM.setStyleAttribute(linksetPanel.getElement(), "backgroundColor", "white");
VerticalPanel infoPanelGame = new VerticalPanel();
infoPanelGame.setSpacing(8);
@@ -335,8 +346,11 @@
HorizontalPanel gamePanel = new HorizontalPanel();
gamePanel.add(vPanel);
+ gamePanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
gamePanel.add(highscorePanel);
+
+
// Tab 2
HTML head = new HTML("<b>Start Admin Panel</b>");
addLinksButton = new Button("Add Links");
@@ -365,22 +379,28 @@
infoPanel.add(processTaskButton);
infoPanel.setSpacing(8);
VerticalPanel adminPanel = new VerticalPanel();
+ DOM.setStyleAttribute(adminPanel.getElement(), "backgroundColor", "white");
+ DOM.setStyleAttribute(adminPanel.getElement(), "padding", "10px");
+
//adminPanel.setStyleName("Menu_AdminPanel");
adminPanel.add(head);
adminPanel.add(infoPanel);
adminPanel.setWidth("400px");
// TabPanel
- TabPanel tabPanel = this;
+// TabPanel tabPanel = this;
- tabPanel.add(gamePanel, "Game");
+ DOM.setStyleAttribute(gamePanel.getElement(), "backgroundColor", "white");
+ DOM.setStyleAttribute(highscorePanel.getElement(), "border", "1px solid grey");
+ DOM.setStyleAttribute(gamePanel.getElement(), "padding", "5px");
+ this.add(gamePanel, "Game");
if(config.getKnowledgeMode().equals(Configuration.KNOWLEDGE_EXPERT))
- tabPanel.add(adminPanel, "Admin");
+ this.add(adminPanel, "Admin");
// tabPanel.addStyleName("noBorder");
// tabPanel.setWidth("900px");
// tabPanel.setHeight("500px");
- tabPanel.selectTab(0);
+ this.selectTab(0);
}
Modified: trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java 2012-06-18 16:30:32 UTC (rev 456)
+++ trunk/saim-game/src/main/java/net/saim/game/client/panels/TutorialPanel.java 2012-06-18 23:15:59 UTC (rev 457)
@@ -244,8 +244,8 @@
picPanel.clear();
picPanel.add(image3);
// Text
- textHTML.setHTML("Use the <b>ENTER</b> key to drop your Pea. "
- + "Each dropped Pea will <b>reduce</b> your <b>money</b>.");
+ textHTML.setHTML("Use the <b>ENTER</b> key to drop your pea. "
+ + "Each dropped pea will <b>cost</b> your <b>coins</b>.");
}
public void goal() {
@@ -259,7 +259,7 @@
picPanel.add(image4);
// Text
textHTML
- .setHTML("Try to <b>hit</b> the <b>Enemy-Peas</b> with your own Pea.");
+ .setHTML("Try to <b>hit</b> the <b>enemy-peas</b> with your own pea.");
}
public void goal2() {
@@ -274,8 +274,8 @@
picPanel.add(image5);
// Text
textHTML
- .setHTML("Weakened Peas will change their color. "
- + "Your <b>score</b> increases</b> with every <b>eliminated Enemy-Pea</b>.");
+ .setHTML("Weakened peas will change their color. "
+ + "Your <b>score</b> increases</b> with every <b>eliminated enemy-pea</b>.");
}
public void goal3() {
@@ -290,7 +290,7 @@
picPanel.add(image6);
// Text
textHTML
- .setHTML("Enemy-Peas <b>must not</b> reach your side! Defend your village!");
+ .setHTML("Enemy-peas <b>must not</b> reach your side! Defend your village!");
}
public void units() {
@@ -323,12 +323,13 @@
// Text
textHTML
.setHTML("Decide whether this statement is <b>Valid</b> or <b>Not Valid</b>. "
- + "If you don't have a clue, choose <b>Not Sure</b>. <br>For each verified statement, you'll be rewarded with money - which you can use to buy new units."
+ + "If you don't have a clue, choose <b>Not Sure</b>. <br>For each verified statement, you'll be rewarded with coins - which you can use to buy new units."
+ "<br><br><b>Shortcut-Keys:</b> Push 2 times <b>[1]</b> for <b>Valid</b>, 2 times <b>[2]</b> for <b>Not Valid</b> and 2 times <b>[3]</b> for <b>Not Sure</b>."
+ "<br><br>Please mark a statement as valid or not valid <b>only</b> if you're <b>secure</b> in your decision."
+ "<br>If your verification <b>corresponds</b> to the verification of the majority of the players, you will get a <b>bonus</b>."
- + "<br>But watch out: False verifications will be <b>punished</b>! So avoid making random decisions "
- + "<br>and if you have the slightest doubt, better choose 'Not Sure' or click the <b>http-links</b> for further information."
+ + "<br>But watch out: False verifications will be <b>punished</b>! So avoid making random decisions."
+ +"<br>The actually displayed quiz varies from game to game."
+// + "<br>and if you have the slightest doubt, better choose 'Not Sure' or click the <b>http-links</b> for further information."
+ "<br><br>Thanks for your attention. Now have some fun and start playing! :)<br>");
}
@@ -347,8 +348,8 @@
textHTML
.setHTML("Decide whether this statement is <b>Valid</b> or <b>Not Valid</b>. "
+ "If you don't have a clue, choose <b>Not Sure</b>. "
- + "<br><b>Shortcut-Keys:</b> Push 2 times <b>[1]</b> for <b>Valid</b>, 2 times <b>[2]</b> for <b>Not Valid</b> and 2 times <b>[3]</b> for <b>Not Sure</b>."
- + "<br>Each verification will increase your money."
+ + "<br><b>Shortcut-Keys:</b> Push key <b>[1]</b> for <b>Valid</b>, key <b>[2]</b> for <b>Not Valid</b> and key <b>[3]</b> for <b>Not Sure</b>."
+ + "<br>Each verification will increase your coins."
+ "<br><br>Please mark a statement as valid or not valid only if you're secure in your decision. Thanks :)"
+ "<br>Now have some fun and start playing!");
}
Modified: trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java 2012-06-18 16:30:32 UTC (rev 456)
+++ trunk/saim-game/src/main/java/net/saim/game/client/verify/KongregatePanel.java 2012-06-18 23:15:59 UTC (rev 457)
@@ -67,7 +67,7 @@
}
private void initGUI() {
-
+ echo("##Konngregate init gui");
DOM.setStyleAttribute(RootPanel.get("predicate").getElement(),
"borderLeft", "1px outset black");
this.subject = new HTML("Subject");
@@ -141,7 +141,8 @@
question.add(subject);
question.add(predicate);
question.add(object);
- // DOM.setStyleAttribute(question.getElement(), "backgroundColor", "white");
+ DOM.setStyleAttribute(question.getElement(), "margin", "auto");
+
// DOM.setStyleAttribute(question.getElement(), "border",
// "1px solid lightgrey");
DOM.setStyleAttribute(DOM.getElementById("subject"), "border", "none");
@@ -161,11 +162,19 @@
qMark.setStyleName("kongregateWholeQuestion");
wholeQuestionPanel = new HorizontalPanel();
wholeQuestionPanel.setVerticalAlignment(ALIGN_MIDDLE);
- // wholeQuestionPanel.add(is);
+// wholeQuestionPanel.add(is);
wholeQuestionPanel.add(question);
wholeQuestionPanel.add(qMark);
+
HTML head = new HTML("Quiz:");
+ if(subjectTemplate.getName().equals("dbpedia") && objectTemplate.getName().equals("linkedgeodata"))
+ head.setHTML("Does this flag belong to this country?");
+ if(subjectTemplate.getName().equals("dbpedia") && objectTemplate.getName().equals("factbook"))
+ head.setHTML("Is this language spoken in this country?");
+ if(subjectTemplate.getName().equals("dbpedia") && objectTemplate.getName().equals("bbcwildlife"))
+ head.setHTML("Are these the same animals?");
head.setStyleName("kongregateHead");
+ DOM.setStyleAttribute(head.getElement(), "marginBottom", "8px");
add(head);
add(wholeQuestionPanel);
// DOM.setStyleAttribute(qMark.getElement(), "paddingTop", "15px");
@@ -358,6 +367,8 @@
// TODO here
if (parsed.equals("sameAs"))
parsed = "same as";
+ else if (parsed.equals("owl:sameAs"))
+ parsed = "same as";
else if (parsed.equals("spokenIn"))
parsed = "spoken in";
else if (parsed.equals("owl#sameAs"))
@@ -387,7 +398,7 @@
options.setMapTypeControl(true);
this.mapWidget = new MapWidget(options);
mapWidget.setStyleName("kongregateMap");
- mapWidget.setSize("490px", "270px");
+ mapWidget.setSize("460px", "270px");
DOM.setStyleAttribute(mapWidget.getElement(), "border", "1px solid black");
DOM.setStyleAttribute(mapWidget.getElement(), "margin", "10px");
MarkerOptions markerOptions = MarkerOptions.newInstance();
Modified: trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java 2012-06-18 16:30:32 UTC (rev 456)
+++ trunk/saim-game/src/main/java/net/saim/game/client/verify/VerifyComponent.java 2012-06-18 23:15:59 UTC (rev 457)
@@ -4,6 +4,7 @@
import com.google.gwt.maps.client.LoadApi;
import com.google.gwt.maps.client.LoadApi.LoadLibrary;
+import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
@@ -85,7 +86,7 @@
rdfInstance instanceSubject = link.getSubject();
rdfInstance instanceObject = link.getObject();
- if(config.isKongregate())
+ if(config.isKongregate() || config.isSimple())
updateKongregate(link);
else if (!isBothMapInstances)
updateNormal(link);
@@ -162,7 +163,7 @@
System.out.println("Set subject panel");
subjectPanel.clear();
subjectPanel.setTemplate(subjectTemplate);
- subjectPanel.setLabel(instanceSubject.getLabel());
+ subjectPanel.setLabel(removeDuplicate(instanceSubject.getLabel()));
subjectPanel.setUri(instanceSubject.getUri());
// Remove namespace for semantic-web newbies
if (config.getKnowledgeMode().equals(Configuration.KNOWLEDGE_EXPERT))
@@ -183,7 +184,7 @@
System.out.println("Set object panel");
objectPanel.clear();
objectPanel.setTemplate(objectTemplate);
- objectPanel.setLabel(instanceObject.getLabel());
+ objectPanel.setLabel(removeDuplicate(instanceObject.getLabel()));
objectPanel.setUri(instanceObject.getUri());
if (config.getKnowledgeMode().equals(Configuration.KNOWLEDGE_EXPERT))
objectPanel.setType(instanceObject.getType());
@@ -246,6 +247,36 @@
this.kongregate.update(stmt);
}
+ private String removeDuplicate(String value){
+ String delimiter = " \\| ";
+ String seperator = " | ";
+ String dummy = "";
+ String parsed = "";
+ int size = value.split(delimiter).length;
+// echo("VerifyComponent: removeNamespace size: " + size);
+
+ String[] split = new String[size];
+ split = value.split(delimiter);
+ // 0
+ parsed = findDuplicate(split[0], "");
+ // 1
+ for (int i = 1; i < size; i++) {
+ dummy = findDuplicate(split[i], parsed);
+ if (!dummy.isEmpty())
+ parsed += seperator+dummy;
+ echo("parsed: "+parsed);
+ }
+
+ return parsed;
+ }
+ private String findDuplicate(String value, String endString) {
+ echo("VerifyComponent: findNamespace value: " + value);
+ String parsed = value;
+ if (endString.contains(parsed))
+ return "";
+ return parsed;
+ }
+
private String removeNamespace(String value) {
// echo("VerifyComponent: removeNamespace orignal: " + value);
String delimiter = " \\| ";
@@ -272,7 +303,11 @@
private String findNamespace(String value, String endString) {
echo("VerifyComponent: findNamespace value: " + value);
- String parsed = value.substring(value.indexOf(":") + 1);
+ String parsed;
+ if(value.contains(":"))
+ parsed = value.substring(value.indexOf(":") + 1);
+ else
+ parsed = value;
echo("VerifyComponent: findNamespace parsed: " + parsed);
if (endString.contains(parsed))
return "";
@@ -424,7 +459,7 @@
echo("subjectTemplate type: " + subjectTemplate.getType());
echo("objectTemplate type: " + objectTemplate.getType());
// Subject and object Both map-type instances
- if (config.isKongregate()){
+ if (config.isKongregate() || config.isSimple()){
initKongregate();
}
else{
@@ -497,6 +532,7 @@
private void initMiddlePanel() {
echo("Init middle panel");
+
this.predicatePanel = new VerticalPanel();
HTML predicateHeader = new HTML("<b>Predicate</b>");
String predicateString = "<i>Predicate</i>";
@@ -506,26 +542,58 @@
predicatePanel.setStyleName("predicatePanel");
// RadioButtons
- rdbtnValid = new RadioButton("selectionGroup", "[1] Valid");
- rdbtnNotValid = new RadioButton("selectionGroup", "[2] Not Valid");
- rdbtnNotSure = new RadioButton("selectionGroup", "[3] Not Sure");
+ rdbtnValid = new RadioButton("selectionGroup", "1",true);
+ rdbtnNotValid = new RadioButton("selectionGroup","2",true);
+ rdbtnNotSure = new RadioButton("selectionGroup","3",true);
rdbtnValid.setVisible(true);
rdbtnNotValid.setVisible(true);
rdbtnNotSure.setVisible(true);
// ButtonGroup
+ HorizontalPanel r1Panel = new HorizontalPanel();
+ r1Panel.setHorizontalAlignment(ALIGN_CENTER);
+ r1Panel.add(rdbtnValid);
+ Image i1 = new Image("Application/images/verification/true.png");
+// i1.setSize("25px", "25px");
+ r1Panel.add(i1);
+ r1Panel.setSpacing(2);
+
+ HorizontalPanel r2Panel = new HorizontalPanel();
+ r2Panel.setHorizontalAlignment(ALIGN_CENTER);
+ r2Panel.add(rdbtnNotValid);
+ Image i2 = new Image("Application/images/verification/false.png");
+// i2.setSize("25px", "25px");
+ r2Panel.add(i2);
+ r2Panel.setSpacing(2);
+
+ HorizontalPanel r3Panel = new HorizontalPanel();
+ r3Panel.setHorizontalAlignment(ALIGN_CENTER);
+ r3Panel.add(rdbtnNotSure);
+ Image i3 = new Image("Application/images/verification/unsure.png");
+// i3.setSize("25px", "25px");
+ r3Panel.add(i3);
+ r3Panel.setSpacing(2);
+
+
VerticalPanel rdbtnPanel = new VerticalPanel();
rdbtnPanel.setStyleName("RdbtnPanel");
- rdbtnPanel.add(rdbtnValid);
- rdbtnPanel.add(rdbtnNotValid);
- rdbtnPanel.add(rdbtnNotSure);
+ rdbtnPanel.setVerticalAlignment(ALIGN_MIDDLE);
+// rdbtnPanel.add(rdbtnValid);
+// rdbtnPanel.add(rdbtnNotValid);
+// rdbtnPanel.add(rdbtnNotSure);
+ rdbtnPanel.add(r1Panel);
+ rdbtnPanel.add(r2Panel);
+ rdbtnPanel.add(r3Panel);
+
+ rdbtnPanel.setSpacing(5);
+ DOM.setStyleAttribute(rdbtnPanel.getElement(), "marginBottom", "3px");
// verifyButton
verifyButton = new Button("VERIFY");
verifyButton.addStyleName("myButton");
VerticalPanel middlePanel = new VerticalPanel();
middlePanel.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
- if(config.isKongregate()==false)
+ if(config.isSimple()==false)
middlePanel.add(predicatePanel);
middlePanel.add(rdbtnPanel);
middlePanel.add(verifyButton);
@@ -547,7 +615,7 @@
objectImagePanel
.add(new HTML("<img class='image' src='" + noImage + "'/>"));
- if(!config.isKongregate()){
+ if(!config.isSimple()){
RootPanel.get("imageSubject").add(subjectImagePanel);
RootPanel.get("imageObject").add(objectImagePanel);
}
Modified: trunk/saim-game/src/main/java/net/saim/game/shared/Configuration.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/shared/Configuration.java 2012-06-18 16:30:32 UTC (rev 456)
+++ trunk/saim-game/src/main/java/net/saim/game/shared/Configuration.java 2012-06-18 23:15:59 UTC (rev 457)
@@ -18,12 +18,15 @@
private String knowledgeMode;
private boolean loginNeeded;
private boolean kongregate;
+ private boolean simple;
+
public Configuration(){
this.knowledgeMode=KNOWLEDGE_EXPERT;
// this.knowledgeMode=KNOWLEDGE_NORMAL;
this.loginNeeded = true;
this.kongregate=false;
+ this.simple=true;
}
public Configuration(String mode, boolean login){
@@ -53,4 +56,13 @@
this.loginNeeded=!b;
}
+ public boolean isSimple(){
+ return this.simple;
+ }
+ /** If called from kongregate page, no login needed*/
+ public void setSimple(boolean b) {
+ this.simple=b;
+ this.loginNeeded=b;
+ }
+
}
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/false.png
===================================================================
(Binary files differ)
Property changes on: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/false.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/true.png
===================================================================
(Binary files differ)
Property changes on: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/true.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/unsure.png
===================================================================
(Binary files differ)
Property changes on: trunk/saim-game/src/main/resources/net/saim/game/resources/images/verification/unsure.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: trunk/saim-game/src/main/webapp/Application.css
===================================================================
--- trunk/saim-game/src/main/webapp/Application.css 2012-06-18 16:30:32 UTC (rev 456)
+++ trunk/saim-game/src/main/webapp/Application.css 2012-06-18 23:15:59 UTC (rev 457)
@@ -1,7 +1,9 @@
/** Add css rules here for your application. */
body {
- height: 100%;
- width: 100%
+
+ margin: 0px auto;
+ border-left: 1px solid black;
+ border-right: 1px solid black;
}
h1 {
@@ -18,9 +20,6 @@
box-shadow: 0 8px 6px -10px black;
}
-.root {
- background-color: white;
-}
table.upperContent {
margin: 0px auto 7px;
@@ -655,6 +654,18 @@
z-index: 25
}
+.startPanel_linksetPanel{
+ -moz-box-shadow: 1px 2px 5px 2px #ccc;
+ -webkit-box-shadow: 1px 2px 5px 2px #ccc;
+ box-shadow: 1px 2px 5px 2px #ccc;
+}
+
+.startPanel_hLoginPanel{
+ -moz-box-shadow: 1px 2px 5px 2px #ccc;
+ -webkit-box-shadow: 1px 2px 5px 2px #ccc;
+ box-shadow: 1px 2px 5px 2px #ccc;
+}
+
.startPanel_loginPanel-disabled {
opacity: 0.4;
}
@@ -1097,4 +1108,8 @@
.bottom_margin {
margin-bottom: 8px;
+}
+
+.gwt-TabPanelBottom {
+ border: none;
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <q1N...@us...> - 2012-06-18 16:30:42
|
Revision: 456
http://saim.svn.sourceforge.net/saim/?rev=456&view=rev
Author: q1Nguyen
Date: 2012-06-18 16:30:32 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/saim-game/src/main/java/net/saim/game/client/Application.java
Modified: trunk/saim-game/src/main/java/net/saim/game/client/Application.java
===================================================================
--- trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-18 16:27:38 UTC (rev 455)
+++ trunk/saim-game/src/main/java/net/saim/game/client/Application.java 2012-06-18 16:30:32 UTC (rev 456)
@@ -1990,8 +1990,11 @@
echo("Process Link-Evaluation: Agreement");
String msg="Agreement! << "+bonus+" Coins >> Bonus!";
game.agreement();
- if(game.isSpecialEvent())
- msg+=" "+game.SPECIAL_REACHED+" agreements in a row! Big-Daddy is on his way! :-3";
+ if(game.isSpecialEvent()){
+ bonus = 2*bonus;
+ msg="Agreement! << "+bonus+" Coins >> Bonus!"+game.SPECIAL_REACHED+" agreements in a row! Big-Daddy is on his way!";
+
+ }
msgButton.setText(msg);
msgButton.setStyleName("gameMessage");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
![http://www.supportnet.de/articleimage/2398219/01-Google-Logo.jpg");](http://www.supportnet.de/articleimage/2398219/01-Google-Logo.jpg");){kind=link}
![http://static.bbci.co.uk/naturelibrary/3.1.1.0/images/ic/maps/366x217/species/European_Stonechat.gif");](http://static.bbci.co.uk/naturelibrary/3.1.1.0/images/ic/maps/366x217/species/European_Stonechat.gif");){kind=link}