Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issues/270 show consume #278

Open
wants to merge 2 commits into
base: one-hour-one-life
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions dlgr/griduniverse/experiment.py
Original file line number Diff line number Diff line change
Expand Up @@ -1512,6 +1512,14 @@ def handle_item_consume(self, msg):
for player_to in self.grid.players.values():
player_to.score += player_item.public_good

consumed_msg = {
"type": "item_consumed",
"player_id": player.id,
"player_color": player.color,
"player_item": player_item and player_item.serialize(),
}
self.publish(consumed_msg)

def handle_item_pick_up(self, msg):
player = self.grid.players[msg["player_id"]]
player_item = player.current_item
Expand Down
12 changes: 11 additions & 1 deletion dlgr/griduniverse/static/scripts/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@ var players = playerSet({'ego_id': undefined});

pixels.canvas.style.marginLeft = window.innerWidth * 0.03 / 2 + "px";
pixels.canvas.style.marginTop = window.innerHeight * 0.04 / 2 + "px";
pixels.canvas.style.border = "5px solid #000000"
document.body.style.transition = "0.3s all";
document.body.style.background = "#ffffff";

Expand Down Expand Up @@ -985,6 +986,14 @@ function onMoveRejected(msg) {
}
}

function onItemConsumed(msg) {
console.log("Item consumed by player " + msg.player_id + ": " + msg.player_item.id);
pixels.canvas.style.border = "5px solid " + msg.player_color;
setTimeout(() => {
pixels.canvas.style.border = "5px solid #000000"
}, 1500);
}

function onDonationProcessed(msg) {
var recipient_id = msg.recipient_id,
team_idx,
Expand Down Expand Up @@ -1316,7 +1325,8 @@ $(document).ready(function() {
'new_round': displayLeaderboards,
'stop': gameOverHandler(player_id),
'wall_built': addWall,
'move_rejection': onMoveRejected
'move_rejection': onMoveRejected,
'item_consumed': onItemConsumed
}
};
var socket = new GUSocket(socketSettings);
Expand Down
12 changes: 11 additions & 1 deletion dlgr/griduniverse/static/scripts/dist/bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dlgr/griduniverse/static/scripts/dist/bundle.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dlgr/griduniverse/static/scripts/dist/difi.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dlgr/griduniverse/static/scripts/dist/questionnaire.js.map

Large diffs are not rendered by default.

Loading