Adding support for collectResourceIfHeld and changing cakybaky VGDL d…

…ue to #21

VGDL/Cakybaky/cakybaky.txt

@@ -1,47 +1,45 @@
 BasicGame
  SpriteSet
- floor > Immovable img=newset/floor6 hidden=True
  chef > Chaser img=newset/chef frameRate=8 color=ORANGE stype=avatar speed=0.1 maxDistance=200
 
  table > Immovable img=newset/table1
  inc > Resource shrinkfactor=0.9
- inc1 > img=newset/flour limit=1
- inc2 > img=newset/milk limit=1
- inc3 > img=newset/egg limit=1
- inc4 > img=newset/sugar limit=1
- inc5 > img=newset/butter limit=1
- inc6 > img=newset/cherries limit=1
+ inca > img=newset/flour limit=1
+ incb > img=newset/milk limit=1
+ incc > img=newset/egg limit=1
+ incd > img=newset/sugar limit=1
+ ince > img=newset/butter limit=1
+ incf > img=newset/cherries limit=1
 
  avatar > OrientedAvatar img=newset/man4 rotateInPlace=false frameRate=8
  wall > Immovable color=BLACK img=newset/floor4
 
  LevelMapping
- 1 > inc1 floor
- 2 > inc2 floor
- 3 > inc3 floor
- 4 > inc4 floor
- 5 > inc5 floor
- 6 > inc6 floor
- t > table floor
- C > avatar inc1 inc2 floor
- A > avatar floor
- c > chef floor
- . > floor
+ 1 > inca
+ 2 > incb
+ 3 > incc
+ 4 > incd
+ 5 > ince
+ 6 > incf
+ t > table
+ C > avatar inca incb
+ A > avatar
+ c > chef
 
  TerminationSet
  Timeout limit=1500 win=False
  SpriteCounter stype=avatar win=False
- SpriteCounter stype=inc6 limit=0 win=True
+ SpriteCounter stype=incf limit=0 win=True
 
  InteractionSet
  avatar wall table > stepBack
  chef wall table > stepBack
 
  avatar chef > killSprite scoreChange=-1
 
- inc1 avatar > collectResource scoreChange=1
- inc2 avatar > collectResourceIfHeld heldResource=inc1 scoreChange=1
- inc3 avatar > collectResourceIfHeld heldResource=inc2 scoreChange=1
- inc4 avatar > collectResourceIfHeld heldResource=inc3 scoreChange=1
- inc5 avatar > collectResourceIfHeld heldResource=inc4 scoreChange=1
- inc6 avatar > collectResourceIfHeld heldResource=inc5 scoreChange=1
+ inca avatar > collectResource scoreChange=1
+ incb avatar > collectResourceIfHeld heldResource=inca scoreChange=1
+ incc avatar > collectResourceIfHeld heldResource=incb scoreChange=1
+ incd avatar > collectResourceIfHeld heldResource=incc scoreChange=1
+ ince avatar > collectResourceIfHeld heldResource=incd scoreChange=1
+ incf avatar > collectResourceIfHeld heldResource=ince scoreChange=1

config/simplified-version/cakybaky.yaml

@@ -0,0 +1,67 @@
+domainFile: domains/simplified-version/cakybaky.pddl
+problemFile: problem.pddl
+domainName: VGDLGame
+gameElementsCorrespondence:
+ avatar:
+ - (at ?x ?y ?avatar)
+ chef:
+ - (is-chef ?x ?y)
+ table:
+ - (is-table ?x ?y)
+ inca:
+ - (at ?x ?y ?inca)
+ incb:
+ - (at ?x ?y ?incb)
+ incc:
+ - (at ?x ?y ?incc)
+ incd:
+ - (at ?x ?y ?incd)
+ ince:
+ - (at ?x ?y ?ince)
+ incf:
+ - (at ?x ?y ?incf)
+ wall:
+ - (is-wall ?x ?y)
+variablesTypes:
+ ?inca: inca
+ ?incb: incb
+ ?incc: incc
+ ?incd: incd
+ ?ince: ince
+ ?incf: incf
+ ?avatar: avatar
+ ?x: num
+ ?y: num
+avatarVariable: ?avatar
+orientation:
+ avatar: FIND
+orientationCorrespondence:
+ UP: (oriented-up ?object)
+ DOWN: (oriented-down ?object)
+ LEFT: (oriented-left ?object)
+ RIGHT: (oriented-right ?object)
+fluentsPredicates:
+ next: (next ?n0 ?n1)
+ previous: (previous ?n1 ?n0)
+actionsCorrespondence:
+ AVATAR_ACTION_MOVE_UP: ACTION_UP
+ AVATAR_ACTION_MOVE_DOWN: ACTION_DOWN
+ AVATAR_ACTION_MOVE_LEFT: ACTION_LEFT
+ AVATAR_ACTION_MOVE_RIGHT: ACTION_RIGHT
+ AVATAR_ACTION_TURN_UP: ACTION_UP
+ AVATAR_ACTION_TURN_DOWN: ACTION_DOWN
+ AVATAR_ACTION_TURN_LEFT: ACTION_LEFT
+ AVATAR_ACTION_TURN_RIGHT: ACTION_RIGHT
+additionalPredicates:
+- (turn-avatar)
+- (got-resource-inca n0)
+- (got-resource-incb n0)
+- (got-resource-incc n0)
+- (got-resource-incd n0)
+- (got-resource-ince n0)
+- (got-resource-incf n0)
+addDeadObjects: {}
+goals:
+- goalPredicate: (at n14 n12 avatar)
+ priority: 1
+ saveGoal: no