Merge branch 'master' into learningTrack2017

GAIGResearch · May 25, 2017 · 143653a · 143653a
2 parents 58564c1 + 974fe40
commit 143653a
Show file tree

Hide file tree

Showing 136 changed files with 1,807 additions and 1,798 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,15 +23,8 @@ production/
 
 *.ipr
 *.class
-
 *.xml
-
 *.html
-
 *.txt
-
 *.png
-
 *.gif
-
-*.xml
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
diff --git a/clients/GVGAI-JavaClient/GVGAI-JavaClient.iml b/clients/GVGAI-JavaClient/GVGAI-JavaClient.iml
@@ -10,5 +10,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="gson-2.6.2" level="project" />
+
   </component>
 </module>
diff --git a/examples/contphysics/artillery.txt b/examples/contphysics/artillery.txt
@@ -3,8 +3,8 @@ BasicGame
         pad    > Immovable img=oryx/devil1
         bouncey    > Immovable img=oryx/floorTileOrange
         avatar > AimedAvatar stype=bullet img=newset/lasercannon_1
-        bullet > Missile physicstype_id=1 gravity=0.5 friction=0.02 speed=25 singleton=True img=oryx/bullet1 shrinkfactor=4
-        box    > Missile img=newset/cloud2 shrinkfactor=0.8 physicstype_id=1 gravity=0.5 friction=0.02
+        bullet > Missile physicstype=CONT gravity=0.5 friction=0.02 speed=25 singleton=True img=oryx/bullet1 shrinkfactor=4
+        box    > Missile img=newset/cloud2 shrinkfactor=0.8 physicstype=CONT gravity=0.5 friction=0.02
         breakable > Immovable img=oryx/backBrown
 
     TerminationSet

diff --git a/examples/contphysics/asteroids.txt b/examples/contphysics/asteroids.txt
@@ -1,8 +1,8 @@
 BasicGame
     SpriteSet    
         pad    > Immovable img=oryx/alien1
-        avatar > SpaceshipAvatar stype=bullet physicstype_id=1 img=oryx/spaceship3
-        bullet > Missile physicstype_id=1 speed=25 singleton=True img=oryx/bullet2
+        avatar > SpaceshipAvatar stype=bullet physicstype=CONT img=oryx/spaceship3
+        bullet > Missile physicstype=CONT speed=25 singleton=True img=oryx/bullet2
         breakable > Immovable img=oryx/backOrange
 
     TerminationSet

diff --git a/examples/contphysics/bird.txt b/examples/contphysics/bird.txt
@@ -1,6 +1,6 @@
 BasicGame
     SpriteSet 
-        avatar > physicstype_id=1 gravity=1.0 BirdAvatar img=newset/chickenr_0
+        avatar > physicstype=CONT gravity=1.0 BirdAvatar img=newset/chickenr_0
         evil   >  Immovable color=RED
         goal > Immovable color=GREEN
         coin > Immovable img=oryx/gold2

diff --git a/examples/contphysics/bubble.txt b/examples/contphysics/bubble.txt
@@ -1,8 +1,8 @@
 BasicGame
     SpriteSet    
-        avatar > FlakAvatar stype=bullet physicstype_id=1 friction=0.02 img=oryx/spider3
-        bullet > Missile speed=25 singleton=True orientation=DUP physicstype_id=1 img=oryx/bullet1
-        bubble > Missile physicstype_id=1 gravity=0.5
+        avatar > FlakAvatar stype=bullet physicstype=CONT friction=0.02 img=oryx/spider3
+        bullet > Missile speed=25 singleton=True orientation=DUP physicstype=CONT img=oryx/bullet1
+        bubble > Missile physicstype=CONT gravity=0.5
         	bubble1 > speed=4 shrinkfactor=1.2 img=oryx/orb1
         		bubble1a > orientation=DLEFT
         		bubble1b > orientation=DRIGHT

diff --git a/examples/contphysics/candy.txt b/examples/contphysics/candy.txt
@@ -1,17 +1,21 @@
 BasicGame
     SpriteSet
-        elevator > Missile orientation=UP speed=0.1 color=BLUE
-        bullet > Immovable singleton=False img=newset/blockB
-        moving > physicstype_id=1 gravity=1.0 friction=0.02
-            avatar > WizardAvatar color=YELLOW stype=bullet img=newset/chef
+        platforms > solid=True
+            elevator > Missile orientation=UP speed=0.1 color=BLUE
+            bullet > Immovable singleton=False img=newset/blockB
+            ground > Immovable color=DARKGRAY
+
+        moving > physicstype=CONT gravity=1.0 friction=0.02
+            avatar > WizardAvatar color=YELLOW stype=bullet img=newset/chef jump_strength=16 mass=1
             box    > Passive img=newset/cloud2 shrinkfactor=0.8
             evil   >  orientation=LEFT
                 goomba     > Walker img=oryx/rat2
                 paratroopa > WalkerJumper color=RED
+
         goal > Immovable color=GREEN img=newset/cheese
-        switch > Immovable color=GREEN
-        water > Immovable color=BLUE
         coin > Immovable img=newset/egg
+
+        wall > Immovable solid=False color=DARKGRAY
 
     TerminationSet
         SpriteCounter stype=goal  win=True
@@ -22,12 +26,16 @@ BasicGame
         avatar evil > killIfAlive
         moving EOS  > killSprite
         goal avatar > killSprite
-        moving wall > wallStop
+
+        moving wall ground > wallStop
         moving bullet > wallStop
+
         coin avatar > killSprite scoreChange=1
         bullet bullet > killSprite
 
     LevelMapping
         G > goal
         1 > goomba
-        c > coin
+        c > coin
+        . > ground
+        w > wall
diff --git a/examples/contphysics/candy_lvl0.txt b/examples/contphysics/candy_lvl0.txt
@@ -2,12 +2,13 @@ wwwwwwwwwwwwwwwwwwwww
 w                   w
 w           c    G  w
 w                   w
-w             wwwwwww
+w             ......w
 w             wwwwwww
 w     c    c  wwwwwww
 w             wwwwwww
-w        wwwwwwwwwwww
+w        .....wwwwwww
 w        wwwwwwwwwwww
 w    c   wwwwwwwwwwww
 w A      wwwwwwwwwwww
+w........wwwwwwwwwwww
 wwwwwwwwwwwwwwwwwwwww
diff --git a/examples/contphysics/candy_lvl1.txt b/examples/contphysics/candy_lvl1.txt
@@ -10,4 +10,4 @@ w         c         w
 w                   w
 w                   w
 w         A         w
-wwwwwwwwwwwwwwwwwwwww
+w...................w
diff --git a/examples/contphysics/candy_lvl2.txt b/examples/contphysics/candy_lvl2.txt
@@ -2,12 +2,12 @@ wwwwwwwwwwwwwwwwwwwww
 w                   w
 w         G         w
 w  c             c  w
-w      w   1 w      w
-w      wwwwwww      w
+w      .   1 .      w
+w      w.....w      w
 w                   w
 w  c             c  w
-w      w 1   w      w
-w      wwwwwww      w
+w      . 1   .      w
+w      w.....w      w
 w                   w
 w A                 w
-wwwwwwwwwwwwwwwwwwwww
+w...................w
diff --git a/examples/contphysics/candy_lvl3.txt b/examples/contphysics/candy_lvl3.txt
@@ -1,13 +1,13 @@
 wwwwwwwwwwwwwwwwwwwww
 w                   w
 w   c     c      G  w
-w      w          1 w
-w      wwwwwwwwwwwwww
+w      .          1 w
+w      w............w
 w                   w
 w   c     c     c   w
-w  1        w       w
-wwwwwwwwwwwww       w
+w  1        .       w
+w...........w       w
 w                   w
 w         c     c   w
 w A                 w
-wwwwwwwwwwwwwwwwwwwww
+w...................w
diff --git a/examples/contphysics/candy_lvl4.txt b/examples/contphysics/candy_lvl4.txt
@@ -2,12 +2,12 @@ wwwwwwwwwwwwwwwwwwwww
 wwwwwww             w
 wwwww               w
 www      c        A w
-w           wwwwwwwww
-w         www       w
-w   c   www    c    w
-w     www           w
-w   www    c   w    w
+w           ........w
+w         ..w       w
+w   c   ..w    c    w
+w     ..w           w
+w   ..w    c   .    w
 w              w    w
 w  c    c      w    w
 w              w  G w
-wwwwwwwwww     wwwwww
+w.........     w....w
diff --git a/examples/contphysics/lander.txt b/examples/contphysics/lander.txt
@@ -1,7 +1,7 @@
 BasicGame
     SpriteSet 
         pad    > Passive color=BLUE is_static=True
-        avatar > LanderAvatar physicstype_id=1 img=oryx/spaceship3 angle_diff=0.2 gravity=0.1
+        avatar > LanderAvatar physicstype=CONT img=oryx/spaceship3 angle_diff=0.2 gravity=0.3 speed=0.5
 
     TerminationSet
         SpriteCounter stype=pad limit=4 win=True     
@@ -11,7 +11,7 @@ BasicGame
         avatar wall > killSprite 
         avatar EOS > killSprite 
         avatar pad > killIfNotUpright
-        pad avatar  > killIfSlow
+        pad avatar  > killIfSlow limspeed=10
         avatar pad > killSprite
 
     LevelMapping