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

Minigame PR #121

Merged
merged 102 commits into from
Mar 26, 2024
Merged

Minigame PR #121

merged 102 commits into from
Mar 26, 2024

Conversation

kywch
Copy link
Collaborator

@kywch kywch commented Mar 7, 2024 •
edited
Loading

Created a PR so that the changes can be reviewed.

  • Created the minigame API and changed the config, so that each episode can run in different config while keeping the obs shape same
  • Speed up the mask generation by reusing the np arrays and cythonizing a few functions
  • Made the env API conform to the new pettingzoo
  • Bumped up the deps (e.g., replaced gym with gymnasium, removed old renderer stuff)
  • Refactored NPC, etc, so that the directory structure is much simpler.

Please feel free to make suggestions. Thank you!

kywch added 30 commits September 26, 2023 22:51
@kywch
fix npc combat bug
bc5b1a0
@kywch
removed legacy logger, websocket, constraint sample
d132d2b
@kywch
edited spawn, replay helper packet
47d1283
@kywch
added config reset, changes in tile, realm tick update
248e08b
@kywch
WIP: added game pack, the default should match 2.0
92e99d7
@kywch
quick fixes on ds limits
052d19b
@kywch
limited to python 3.10 due to pytest bug
f84f7a7
@kywch
fixed pylint
eec3875
@kywch
added config for npc attack each other, fixed map gen
81f2776
@kywch
fixed npc spawn bug
2805983
@kywch
Merge branch 'clean-up' into game-pack
fa42f98
@kywch
cfg matched to 2.0
c611c53
@kywch
tweaked game api, added race to center
fc5811b
@kywch
fixed done, action validation bugs
e016fbe
@kywch
used task tags
9987801
@kywch
refactored mapgen from fractal, deterministic
2971e86
@kywch
added scatter extra resource, fixed fractal save
db62da3
@kywch
allowed flexible team spawn, adaptive difficulty for center race
eb4885b
@kywch
added unfair fight, tweaked horizon, game_api
10f7875
@kywch
refactored mini game tests
c766b09
@kywch
tweaked game api
d732815
@kywch
fixed unfair fight difficulty adj, added grass map cfg
cd0a034
@kywch
added seize tile, king of the hill, tweaks
f2e1032
@kywch
fixed pylint error
1419a85
@kywch
tweaked king of hill
bdb7691
@kywch
fixed king hill bug
daf6a07
@kywch
tweaked minigames
3646a91
@kywch
tweaked unfair fight
b4a9ade
@kywch
tweaked unfair fight score
e15fad3
@kywch
tweaked unfair fight
0b75657
kywch added 26 commits November 24, 2023 18:38
@kywch
refectored observation to reuse gym obs, action targets, cythonized f…
94c33e4 
…uncs
@kywch
made gym obs immutable
3951ffb
@kywch
bug fix, optimized action target clear, get comm obs
11eb31f
@kywch
put all minigames eval in base_predicates
84dab99
@kywch
changed immortal npc type to -1, mini game tweaks
2150612
@kywch
tweaked comm together
b7cb0d4
@kywch
tweaked comm together
34aad7e
@kywch
allowed int player health inc, tweaked mini games
4b087ea
@kywch
few tweaks
f9cf7ad
@kywch
tweaked radio raid
cd39846
@kywch
tamed hash embedding
8f7444b
@kywch
fixed task hash embedding
e720089
@kywch
bump up pettingzoo, gymnasium and conform to the new apis
4dbb118
@kywch
changed test python ver
cc92058
@kywch
add back py for pytest benchmark
e1d1929
@kywch
test python 3.8
1ee9539
@kywch
removed unnecessary comments
6d54bc3
@kywch
made reset faster, fixed pettingzoo error
6530bc2
@kywch
gained some speed
47bee74
@kywch
api clean up
f64a156
@kywch
quick fixes
430521a
@kywch
quick changes
d1153fb
@kywch
paused testing in 3.11
c554cdf
@kywch
made spawn_dangers FIFO
6016352
@kywch
game balacing tweaks
a79a375
@kywch
got rid of mapping proxy obs
7cfd740
daveey
daveey reviewed Mar 9, 2024
View reviewed changes
@kywch
Copy link
Collaborator Author

kywch commented Mar 26, 2024

Thank you for your review, David! I'll yolo-merge this one.

@kywch kywch merged commit 77c55fe into CarperAI:minigame Mar 26, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daveey daveey daveey left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kywch @daveey