incorporate objects defined in yaml configuration into gridworld

dlgr/griduniverse/experiment.py

@@ -887,6 +887,7 @@ def __init__(self, **kwargs):
  def serialize(self):
  return {
  "id": self.id,
+ "type_id": 9,
  "position": self.position,
  "maturity": self.maturity,
  "color": self.color or self._maturity_to_rgb(self.maturity),
@@ -1154,6 +1155,11 @@ def configure(self):
  self.transition_config = {
  (t['actor_start'], t['target_start']): t for t in self.game_config.get('transitions', ())
  }
+ # This is accessed by the grid.html template to load the configuration on the client side:
+ self.object_config_json = json.dumps(self.object_config)
+ self.transition_config_json = json.dumps(
+ {"{}_{}".format(k[0], k[1]): v for k, v in self.transition_config.items()}
+ )
 
  @classmethod
  def extra_parameters(cls):
@@ -1239,7 +1245,7 @@ def bonus_reason(self):
  )
 
  def dispatch(self, msg):
- """Route to the appropriate method based on message type"""
+ """Route incoming messages to the appropriate method based on message type"""
  mapping = {
  'connect': self.handle_connect,
  'disconnect': self.handle_disconnect,

dlgr/griduniverse/static/scripts/demo.js

@@ -121,8 +121,8 @@ var mouse = position(pixels.canvas);
 
 var isSpectator = false;
 var start = performance.now();
-var food = [];
-var foodConsumed = [];
+var resources = [];
+var resourcesConsumed = [];
 var walls = [];
 var wall_map = {};
 var row, column, rand;
@@ -151,15 +151,23 @@ var color2name = function (color) {
  return settings.player_color_names[idx];
 };
 
-var Food = function (settings) {
- if (!(this instanceof Food)) {
- return new Food();
- }
- this.id = settings.id;
- this.position = settings.position;
- this.color = settings.color;
- return this;
-};
+/**
+ * Representation of a game resource, which for the moment is limited to a
+ * simple Food type.
+ *
+ * @param {*} data Information passed from the server, including the type ID
+ * @returns Object with merged server state + object definition values
+ */
+function Resource(data) {
+ obj = {
+ type_id: data.type_id,
+ id: data.id,
+ position: data.position,
+ color: data.color,
+ };
+
+ return Object.assign(obj, settings.object_config[obj.type_id]);
+}
 
 var Wall = function (settings) {
  if (!(this instanceof Wall)) {
@@ -561,7 +569,6 @@ pixels.frame(function() {
  // Update the background.
  var ego = players.ego(),
  w = getWindowPosition(),
- limitVisibility,
  dimness,
  rescaling,
  i, j, x, y;
@@ -575,15 +582,13 @@ pixels.frame(function() {
  return newColor;
  });
 
- for (i = 0; i < food.length; i++) {
- // Players digest the food.
- var cur_food = food[i];
- if (players.isPlayerAt(cur_food.position)) {
- foodConsumed.push(food.splice(i, 1));
+ for (i = 0; i < resources.length; i++) {
+ // Players digests the resource if possible.
+ var currentResource = resources[i];
+ if (players.isPlayerAt(currentResource.position)) {
+ resourcesConsumed.push(resources.splice(i, 1)); // XXX this does nothing, AFAICT (Jesse)
  } else {
- if (settings.food_visible) {
- section.plot(cur_food.position[1], cur_food.position[0], cur_food.color);
- }
+ section.plot(currentResource.position[1], currentResource.position[0], currentResource.color);
  }
  }
 
@@ -952,13 +957,14 @@ function onGameStateChange(msg) {
 
  updateDonationStatus(state.donation_active);
 
- // Update food.
+ // Update resources
  if (state.food !== undefined && state.food !== null) {
- food = [];
+ resources = [];
  for (j = 0; j < state.food.length; j++) {
- food.push(
- new Food({
+ resources.push(
+ Resource({
  id: state.food[j].id,
+ type_id: state.food[j].type_id,
  position: state.food[j].position,
  color: state.food[j].color
  })