jerry-rigged 2023 gpsr grammar for kassel 2024

psGrammar/tasks/gpsr/eegpsr23.jsgf

@@ -174,15 +174,18 @@ public <sentence> 		= [could you | robot | tobi | tiago] [please] <command> [ple
 <N_gesture>         = (waving) | (raising their left arm) | (raising their right arm) | (pointing to the left) | (pointing to the right);
 <N_clothed>         = (dressed in);
 
-<N_object>                  	= sponge | cleanser | (red wine) | (juice pack) | (cola) | (tropical juice) | (milk) | (iced tea) | (orange juice) | (tuna) | (tomato soup) | spam | mustard | (strawberry jello) | (chocolate jello) | (coffee grounds) | sugar | pear | plum | peach | lemon | orange | strawberry | banana | apple | (tennis ball) | (soccer ball) | (rubiks cube) | dice | baseball | pringles | cornflakes | cheezit | spoon | plate | cup | fork | bowl | knife;
-<N_category>                	= (cleaning supplies) | drinks | food | fruits | toys | snacks | dishes;
-<N_room>                    	= kitchen | (living room) | bedroom | study;
+<N_object>                  	= (dice | (tennis ball) | baseball | (rubiks cube) | (soccer ball) | bowl | spoon | cup | fork | plate | knife | cheezit | nuts | pretzels | (peanut puffs) | 
+                            pringles | sugar | (tomato soup) | tuna | corn | (strawberry jello) | (chocolate jello) | cornflakes | (coffee grounds) | spam | mustard | ketchup | sponge |
+                            (laundry cleaner) | cleanser | (sponge cloth) | (dish soap) | pear | banana | orange | apple | plum | lemon | peach | strawberry | (apple juice) | (orange juice) |
+                            coke | (ice tea) | fanata | milk) ;
+<N_category>                	= (toys | dishes | snacks | food | (cleaning supplies) | fruits | drinks) ;
+<N_room>                    	= kitchen | (living room) | bedroom | office | corridor;
 <N_roomTwo> 			= kitchen | (living room) | bedroom | study;
-<N_placement>               	= (bedside table) | shelf | trashbin | dishwasher | kitchen table | pantry | cabinet | desk | (tv stand) | (storage rack) | (bookshelf) | (side tables) | sink;
-<N_placementTwo>            	= (bedside table) | shelf | trashbin | dishwasher | kitchen table | pantry | cabinet | desk | (tv stand) | (storage rack) | (bookshelf) | (side tables) | sink;
-<N_beacon>                  	= (bedside table) | shelf | trashbin | dishwasher | kitchen table | pantry | cabinet | desk | (tv stand) | (storage rack) | (bookshelf) | bed | (potted plant) | chairs | refrigerator | sink | coatrack | armchair | (desk lamp) | lamp | (side tables) | (sofa) | exit | entrance;
-<N_beaconTwo>               	= (bedside table) | shelf | trashbin | dishwasher | kitchen table | pantry | cabinet | desk | (tv stand) | (storage rack) | (bookshelf) | bed | (potted plant) | chairs | refrigerator | sink | coatrack | armchair | (desk lamp) | lamp | (side tables) | (sofa) | exit | entrance;
-<N_name>                    	= adel | angel | axel | charlie | jane | john | jules | morgan | paris | robin | simone;
+<N_placement>               	= (bed | (bedside table) | dresser | armchair | cabinet | desk | fridge | dishwasher | (kitchen table) | bookshelf | (coffee table) | bar | (tv sideboard)) ;
+<N_placementTwo>            	= (bed | (bedside table) | dresser | armchair | cabinet | desk | fridge | dishwasher | (kitchen table) | bookshelf | (coffee table) | bar | (tv sideboard)) ;
+<N_beacon>                  	= (bed | (bedside table) | dresser | armchair | cabinet | desk | fridge | dishwasher | (kitchen table) | bookshelf | (coffee table) | bar | (tv sideboard) | (desk chair) | sink | (trash bin) | sofa | wardrobe | entrance | exit) ;
+<N_beaconTwo>               	= (bed | (bedside table) | dresser | armchair | cabinet | desk | fridge | dishwasher | (kitchen table) | bookshelf | (coffee table) | bar | (tv sideboard) | (desk chair) | sink | (trash bin) | sofa | wardrobe | entrance | exit) ;
+<N_name>                    	= kai | noah | unique | luca | evelyn| jayden | james | riley | harper | quinn | avery | remi | river | atlas;
 <N_taxi> 			= taxi | cab | uber;
 <N_partyfood>			= snacks | drinks;
 <N_door>       		= ( front | back | main | rear ) (entrance | door);