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.

Sign up for GitHub

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

Jump to bottom

incorporate objects defined in yaml configuration into gridworld #248

Merged
merged 38 commits into from
Jul 31, 2023
Merged

incorporate objects defined in yaml configuration into gridworld #248

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
5805389
Make object and transition config accessible to client side
jessesnyder Jul 20, 2023
1aacbf7
Remove unsused var
jessesnyder Jul 20, 2023
61936c2
Hard-code a type_id for food, for now
jessesnyder Jul 21, 2023
9beb69d
Replace Food with generic Resource
jessesnyder Jul 21, 2023
e9654de
Add Food to game config
jessesnyder Jul 21, 2023
1757b62
Add some notes
jessesnyder Jul 21, 2023
2eabd8b
incorporate objects defined in yaml configuration into gridworld
cguardia Jul 21, 2023
a2e7e90
Only consume things immediately if they're non-interactive
jessesnyder Jul 21, 2023
6442db1
Merge branch 'issues/233-participants-see-objects' into issues/232-ne…
jessesnyder Jul 21, 2023
d2c809e
Bugfix: attribute name
jessesnyder Jul 21, 2023
61730ae
Add some logging on grid object spawning
jessesnyder Jul 21, 2023
43c5a73
Use YAML config for Food, and remove other objects for now
jessesnyder Jul 21, 2023
130301c
Update attr names in JS to match python
jessesnyder Jul 21, 2023
17b8f4c
Commit compiled JS
jessesnyder Jul 21, 2023
fe9ef39
Use item rather than object or resource
cguardia Jul 22, 2023
4f88723
Commit compiled JS
jessesnyder Jul 24, 2023
ef257ff
tablib is no longer a dependency, so remove related test
jessesnyder Jul 24, 2023
03b09e7
Mechanical changes to get most tests passing again
jessesnyder Jul 24, 2023
02cbb59
Use a shared reference to item_config across Item instances
jessesnyder Jul 24, 2023
6abf932
Move from hard-coding colors to using a "sprite" definition in game_c…
jessesnyder Jul 25, 2023
a2494ee
Add note about possibly avoidable copy of shared values
jessesnyder Jul 25, 2023
4be6708
Port maturation threshold and speed to item config
jessesnyder Jul 26, 2023
4789d8d
Attempt to blindly update grid item deserialization
jessesnyder Jul 26, 2023
44e8614
add black; first black run updates
cguardia Jul 26, 2023
24a775a
add default item config; use item count and calories instead of globa…
cguardia Jul 26, 2023
8ddd3fe
Fix some bugs with replenish_items(), but some still remain
jessesnyder Jul 26, 2023
b44192a
move away form grid based to item based config and evaluation
cguardia Jul 27, 2023
2b86e49
fix merge conflict
cguardia Jul 27, 2023
2d9e251
Update supported python versions
jessesnyder Jul 28, 2023
c768385
Make Item immutable(ish)
jessesnyder Jul 28, 2023
b831c99
Better test isolation
jessesnyder Jul 28, 2023
a2fcae5
Blacken tests
jessesnyder Jul 28, 2023
7b09115
Make instruction test very basic for now
jessesnyder Jul 28, 2023
31e06c6
Greatly reduce mocking and make sure @property patches are removed on…
jessesnyder Jul 28, 2023
e795dc7
Restore docstring
jessesnyder Jul 28, 2023
3d1419b
Restore config.txt, add docstring, remove spurious comment
jessesnyder Jul 31, 2023
395f571
Optimize replenish_items
jessesnyder Jul 31, 2023
2410991
Add player config with distribution config.
alecpm Jul 31, 2023
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
42 changes: 19 additions & 23 deletions constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# ./scripts/update_dependencies.sh
Expand All @@ -10,8 +10,6 @@ alabaster==0.7.13
# via
# dlgr-griduniverse
# sphinx
appnope==0.1.3
# via ipython
apscheduler==3.10.1
# via dallinger
asttokens==2.2.1
Expand All @@ -26,11 +24,13 @@ babel==2.12.1
# via sphinx
backcall==0.2.0
# via ipython
black==23.7.0
# via dlgr-griduniverse
blinker==1.6.2
# via flask
boto3==1.28.5
boto3==1.28.11
# via dallinger
botocore==1.31.5
botocore==1.31.11
# via
# boto3
# s3transfer
Expand All @@ -42,7 +42,7 @@ cached-property==1.5.2
# via dallinger
cachetools==5.3.1
# via tox
certifi==2023.5.7
certifi==2023.7.22
# via
# requests
# selenium
Expand All @@ -54,6 +54,7 @@ charset-normalizer==3.2.0
# via requests
click==8.1.6
# via
# black
# dallinger
# flask
# pip-tools
Expand Down Expand Up @@ -84,13 +85,10 @@ docutils==0.20.1
# recommonmark
# sphinx
exceptiongroup==1.1.2
# via
# pytest
# trio
# trio-websocket
# via trio-websocket
executing==1.2.0
# via stack-data
faker==19.1.0
faker==19.2.0
# via
# dallinger
# dlgr-griduniverse
Expand Down Expand Up @@ -129,7 +127,7 @@ greenlet==2.0.2
# dallinger
# gevent
# sqlalchemy
gunicorn==21.1.0
gunicorn==21.2.0
# via dallinger
h11==0.14.0
# via wsproto
Expand Down Expand Up @@ -172,6 +170,8 @@ mccabe==0.7.0
# via flake8
mock==5.1.0
# via dlgr-griduniverse
mypy-extensions==1.0.0
# via black
numpy==1.24.4
# via
# dallinger
Expand All @@ -180,6 +180,7 @@ outcome==1.2.0
# via trio
packaging==23.1
# via
# black
# build
# gunicorn
# pyproject-api
Expand All @@ -188,6 +189,8 @@ packaging==23.1
# tox
parso==0.8.3
# via jedi
pathspec==0.11.1
# via black
pexpect==4.8.0
# via
# dallinger
Expand All @@ -200,6 +203,7 @@ pip-tools==7.1.0
# dlgr-griduniverse
platformdirs==3.9.1
# via
# black
# tox
# virtualenv
pluggy==1.2.0
Expand Down Expand Up @@ -280,7 +284,7 @@ snowballstemmer==2.2.0
# via sphinx
sortedcontainers==2.4.0
# via trio
sphinx==7.0.1
sphinx==7.1.0
# via
# dlgr-griduniverse
# recommonmark
Expand Down Expand Up @@ -313,14 +317,6 @@ tenacity==8.2.2
# via dallinger
timeago==1.0.16
# via dallinger
tomli==2.0.1
# via
# build
# pip-tools
# pyproject-api
# pyproject-hooks
# pytest
# tox
tox==4.6.4
# via dlgr-griduniverse
traitlets==5.9.0
Expand Down Expand Up @@ -348,15 +344,15 @@ urllib3==1.26.16
# selenium
user-agents==2.2.0
# via dallinger
virtualenv==20.24.0
virtualenv==20.24.2
# via tox
wcwidth==0.2.6
# via prompt-toolkit
werkzeug==2.3.6
# via
# flask
# flask-login
wheel==0.40.0
wheel==0.41.0
# via pip-tools
wsproto==1.2.0
# via trio-websocket
Expand Down
42 changes: 19 additions & 23 deletions dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# ./scripts/update_dependencies.sh
Expand All @@ -10,8 +10,6 @@ alabaster==0.7.13
# via
# dlgr-griduniverse
# sphinx
appnope==0.1.3
# via ipython
apscheduler==3.10.1
# via dallinger
asttokens==2.2.1
Expand All @@ -26,11 +24,13 @@ babel==2.12.1
# via sphinx
backcall==0.2.0
# via ipython
black==23.7.0
# via dlgr-griduniverse
blinker==1.6.2
# via flask
boto3==1.28.5
boto3==1.28.11
# via dallinger
botocore==1.31.5
botocore==1.31.11
# via
# boto3
# s3transfer
Expand All @@ -42,7 +42,7 @@ cached-property==1.5.2
# via dallinger
cachetools==5.3.1
# via tox
certifi==2023.5.7
certifi==2023.7.22
# via
# requests
# selenium
Expand All @@ -54,6 +54,7 @@ charset-normalizer==3.2.0
# via requests
click==8.1.6
# via
# black
# dallinger
# flask
# pip-tools
Expand Down Expand Up @@ -84,13 +85,10 @@ docutils==0.20.1
# recommonmark
# sphinx
exceptiongroup==1.1.2
# via
# pytest
# trio
# trio-websocket
# via trio-websocket
executing==1.2.0
# via stack-data
faker==19.1.0
faker==19.2.0
# via
# dallinger
# dlgr-griduniverse
Expand Down Expand Up @@ -129,7 +127,7 @@ greenlet==2.0.2
# dallinger
# gevent
# sqlalchemy
gunicorn==21.1.0
gunicorn==21.2.0
# via dallinger
h11==0.14.0
# via wsproto
Expand Down Expand Up @@ -172,6 +170,8 @@ mccabe==0.7.0
# via flake8
mock==5.1.0
# via dlgr-griduniverse
mypy-extensions==1.0.0
# via black
numpy==1.24.4
# via
# dallinger
Expand All @@ -180,6 +180,7 @@ outcome==1.2.0
# via trio
packaging==23.1
# via
# black
# build
# gunicorn
# pyproject-api
Expand All @@ -188,6 +189,8 @@ packaging==23.1
# tox
parso==0.8.3
# via jedi
pathspec==0.11.1
# via black
pexpect==4.8.0
# via
# dallinger
Expand All @@ -200,6 +203,7 @@ pip-tools==7.1.0
# dlgr-griduniverse
platformdirs==3.9.1
# via
# black
# tox
# virtualenv
pluggy==1.2.0
Expand Down Expand Up @@ -280,7 +284,7 @@ snowballstemmer==2.2.0
# via sphinx
sortedcontainers==2.4.0
# via trio
sphinx==7.0.1
sphinx==7.1.0
# via
# dlgr-griduniverse
# recommonmark
Expand Down Expand Up @@ -313,14 +317,6 @@ tenacity==8.2.2
# via dallinger
timeago==1.0.16
# via dallinger
tomli==2.0.1
# via
# build
# pip-tools
# pyproject-api
# pyproject-hooks
# pytest
# tox
tox==4.6.4
# via dlgr-griduniverse
traitlets==5.9.0
Expand Down Expand Up @@ -348,15 +344,15 @@ urllib3==1.26.16
# selenium
user-agents==2.2.0
# via dallinger
virtualenv==20.24.0
virtualenv==20.24.2
# via tox
wcwidth==0.2.6
# via prompt-toolkit
werkzeug==2.3.6
# via
# flask
# flask-login
wheel==0.40.0
wheel==0.41.0
# via pip-tools
wsproto==1.2.0
# via trio-websocket
Expand Down
Loading