[1/2] Customers #35

lsuyean · 2024-07-17T07:02:55Z

Overview

In this PR, I implement Gamemodes and Customers into Robotouille.

Previously, stepping in the environment was controlled using the step() function within the State class. However, this was problematic because it was controlling more than just updates to the state, especially with new modules like Movement. Now, there is a new module called GameMode that controls all modules within Robotouille.

The GameMode class also lets Robotouille have win conditions. In this PR, I implement a basic gamemode called `Classic' where the player must serve a number of customers within a certain amount of time.

Changes Made

Customers

Added new assets for customers, the customer table, and customer spawn
- Customer spawn asset is temporary, is currently a screenshot of the floor tiling. Should be replaced by a transparent asset in the future so that it does not render in game.
Implemented Customer class which keeps track about information about the customers and steps them in the environment
Edited domain.py and domain_builder.py to now keep track of npc_actions, all actions that the npc can do as defined in the domain
Edited movement.py to also move customers
Edited state.py to keep track of customers and customer_actions
Added recipes.json where recipes can be specified
Edited robotouille.json to include Customer type, predicates, and actions
Edited builder.py and object_enmus.py to include Customer type
Added new environments customer.json and multi_customer.json to test customers
Edited renderer.py, canvas.py, robotouille_env.py and robotouille_config.json to render customers

GameMode

Implemented GameMode class that serves as the overall control of the game, keeps track of win conditions, and steps all the modules in the game
Implemented Classic subclass where a player must satisfy all recipes before a given time
Moved stepping logic of the Movement class from state.py to classic.py
Edited all environments to now also specify the gamemode
Added a new file env_utils.py to prevent circular imports when creating the GameMode and Customers
Edited robotouille_simulator.py to pass pygame.time into the gamemode class
Gamemode now also contains all information that was previously stored as class variables in the Player, Station, and Customer class

Changes to Containers

Added new actions for stacking in robotouille.json so that containers can now be picked up and placed with items on it
Added new inputs for new stacking actions in input.json
Edited canvas.py to properly render containers and items stacked on containers

Changes to Robotouille Domain

Implemented a new predicate based deletion effect, where for a predicate and one argument, all objects where the predicate is true for that argument is deleted

Test Coverage

Tested with all environments

Next Steps

Find a nicer solution for customers leaving the game (should reach the edge of the environment)

Screenshots

…s for container to robotouille.py, made new env json

…ng still buggy regarding stacking predicates

…ete yet

chalo2000

thank you for the immense effort on this! I've left a couple of comments and have requested changes just so I can take another look at your responses and minor changes.

chalo2000 · 2024-12-06T19:42:05Z

backend/customer.py

+    order to them. 
+    """
+
+    customers = {}


turn these into instance variables so we don't have networking issues

chalo2000 · 2024-12-06T19:43:57Z

backend/domain.py

            if not self._are_valid_types(pred.types, object_types):
                raise ValueError(f"Predicate {pred.name} has invalid types.")

-        for action in self.actions:
+        for action in action_def:


combine for loop into 1 more for loop

for action_def in [action_def, npc_action_def]: ...

edited accordingly

chalo2000 · 2024-12-06T19:45:57Z

backend/gamemode.py

@@ -0,0 +1,52 @@
+from backend.customer import Customer
+class GameMode(object):


for future, you can import ABC class to make abstract class. look at this reference

used ABC for Gamemode and SpecialEffect

chalo2000 · 2024-12-06T19:47:32Z

backend/movement/movement.py

-        player_destinations = [data.path[-1] for name, data in Movement.metadata.items() if data.path and name != player.name]
+        player_customer_locations = [p.pos for p in Player.players.values() if p != player]
+        player_customer_locations += [c.pos for c in Customer.customers.values() if c != customer and c.in_game]
+        # player_customer_destinations = [data.path[-1] for name, data in Movement.metadata.items() if data.path and name != player.name and name != customer.name]


chalo2000 · 2024-12-06T19:49:09Z

backend/movement/movement.py

+        player_customer_locations += [c.pos for c in Customer.customers.values() if c != customer and c.in_game]
+        # player_customer_destinations = [data.path[-1] for name, data in Movement.metadata.items() if data.path and name != player.name and name != customer.name]
+        player_customer_destinations = []
+        for name, data in Movement.metadata.items():


this is unclear, comment more and make it clearer

chalo2000 · 2024-12-07T06:09:23Z

renderer/canvas.py

@@ -500,30 +524,33 @@ def _get_player_sprite(self, direction):
            AssertionError: If the direction is invalid
        """
        if direction == (0, 1):
-            return self.config["player"]["robot"]["back"]
+            return self.config[type]["robot"]["back"]


so ['customer']['robot'][...] is a customer asset? customer isn't a robot. regardless we are hardcoding the "robot" asset anyways; either make this clearer that we are hardcoding by removing ["robot"] and renaming assets or put a TODO to fix this.

Changed the function to take in a name argument

chalo2000 · 2024-12-07T06:10:50Z

renderer/canvas.py

@@ -486,12 +509,13 @@ def _draw_stations(self, surface):
                        self._draw_image(surface, asset_info["name"], np.array([j, i - offset]) * self.pix_square_size, self.pix_square_size)


-    def _get_player_sprite(self, direction):
+    def _get_player_or_customer_image_name(self, direction, type):


looking throughout the codebase and repeatedly seeing player_or_customer is tiring. it would be good for us to rename this to some catch all like character (customer is a non-playable character while player is a playable character).

replaced with character

chalo2000 · 2024-12-07T07:07:08Z

renderer/configuration/robotouille_config.json

@@ -10,6 +10,15 @@
        }
    },

+    "customer": {
+        "robot": {


may as well remove the "robot" key for the time being until we have different assets to make this hardcoding more evident.

changed it to girl so that the choose_character_image_name() function can take in a name

chalo2000 · 2024-12-07T07:09:36Z

robotouille/env.py

 from domain.domain_builder import build_domain
-from utils.robotouille_utils import trim_item_ID
+from backend.gamemodes.classic import Classic
+from .env_utils import build_identity_predicates, build_location_predicates, build_stacking_predicates, build_goal


thank you for organizing this better. we'll eventually want to reintegrate PDDL and since these are used by builder.py it's good to keep them in one place and switch between creating PDDL predicates or our State predicates.

chalo2000 · 2024-12-07T07:09:56Z

robotouille/env.py

+        animate (bool): Whether or not to animate the movement of the players.
+
+    Returns:
+        gamemode(GameMode): The gamemmode of the environment


space between gamemode (GameMode) and misspelled gamemode.

added space and fixed typo

chalo2000

Leaving additional comment after testing the customer environments.

chalo2000 · 2024-12-07T07:21:36Z

environments/env_generator/examples/multi_customer.json

+    "goal": [
+        {
+            "predicate": "iscookable",
+            "args": ["lettuce"],


I also just played through these and realized the goal is unrealizable. What is the plan for checking that these environments are done?

My bad, did this to make it easier to debug. Edited the goals accordingly to close when all customers have finished eating.

lsuyean added 3 commits July 17, 2024 00:01

basic implementation of gamemode and customer class, added new action…

216919f

…s for container to robotouille.py, made new env json

Initial implementation of customers, gamemode, and rendering. Renderi…

3f589df

…ng still buggy regarding stacking predicates

temp commit

8f52fbe

chalo2000 force-pushed the main branch from 0f9a050 to 8fcc19b Compare September 20, 2024 21:24

lsuyean and others added 7 commits October 26, 2024 00:23

Merge branch 'main' into customers

35a8c6b

finished first draft of customers

6ed8ba6

added customer asset and started debugging rendering issue, not compl…

a127e0b

…ete yet

fixed rendering issues

ff06f32

added multiple customers, made customers spawn and despawn

36cb38d

removed unnecessary code

7ae9b7d

fixed environments and state bug

9cb76b3

lsuyean requested a review from chalo2000 November 10, 2024 21:17

lsuyean changed the title ~~Customers~~ [1/2] Customers Nov 16, 2024

lsuyean added 2 commits November 29, 2024 18:51

finished customers

0810f1e

removed class variables, made improvements to movement module

03f7842

chalo2000 requested changes Dec 7, 2024

View reviewed changes

chalo2000 reviewed Dec 7, 2024

View reviewed changes

edited based on comments

5132b29

lsuyean requested a review from chalo2000 December 10, 2024 05:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[1/2] Customers #35

[1/2] Customers #35

lsuyean commented Jul 17, 2024 •

edited

Loading

chalo2000 left a comment

chalo2000 Dec 6, 2024

chalo2000 Dec 6, 2024

lsuyean Dec 10, 2024

chalo2000 Dec 6, 2024

lsuyean Dec 10, 2024

chalo2000 Dec 6, 2024

chalo2000 Dec 6, 2024

chalo2000 Dec 7, 2024

lsuyean Dec 10, 2024

chalo2000 Dec 7, 2024

lsuyean Dec 10, 2024

chalo2000 Dec 7, 2024

lsuyean Dec 10, 2024

chalo2000 Dec 7, 2024

lsuyean Dec 10, 2024

chalo2000 Dec 7, 2024

lsuyean Dec 10, 2024

chalo2000 left a comment

chalo2000 Dec 7, 2024

lsuyean Dec 10, 2024 •

edited

Loading

		@@ -0,0 +1,52 @@
		from backend.customer import Customer
		class GameMode(object):

[1/2] Customers #35

Are you sure you want to change the base?

[1/2] Customers #35

Conversation

lsuyean commented Jul 17, 2024 • edited Loading

Overview

Changes Made

Test Coverage

Next Steps

Screenshots

chalo2000 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chalo2000 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lsuyean Dec 10, 2024 • edited Loading

Choose a reason for hiding this comment

lsuyean commented Jul 17, 2024 •

edited

Loading

lsuyean Dec 10, 2024 •

edited

Loading