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

Doom - Same Action Space Across Environments #157

Merged
merged 20 commits into from
Jun 14, 2016
Merged

Doom - Same Action Space Across Environments #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6149858
Doom - Added reward_threshold and timestep_limit for all environments
ppaquette Jun 2, 2016
abdb03d
Doom - Returning all available game variables
ppaquette Jun 2, 2016
c39a7a6
Doom - Moved _seed to doom_env to avoid repetition in every environment
ppaquette Jun 2, 2016
6ab318b
Doom - Added ALT_ATTACK and made all action_space equivalent (same co…
ppaquette Jun 2, 2016
98b0081
Doom - Actions can either be a short list of allowed actions or the f…
ppaquette Jun 3, 2016
8b75c34
Doom - Returning black observation space on error or is_finished, rat…
ppaquette Jun 3, 2016
749b752
Doom - HighLow.sample() returns the small list.
ppaquette Jun 4, 2016
8a8bc66
Doom - Updated difficulty for some missions
ppaquette Jun 4, 2016
e8a3640
Doom - Fixed inconsistency between controls.md and deathmatch.cfg
ppaquette Jun 4, 2016
e0c8bc4
Doom - Issue #168 - Remove sleep statement from DoomEnv render
ppaquette Jun 10, 2016
c68a18d
Doom - Only using full action space (43 keys)
ppaquette Jun 10, 2016
46a4b3b
Replaced warnings.warn by logger.warn
ppaquette Jun 10, 2016
cdfe07b
Doom - Added NUM_ACTIONS and action_idx instead of x
ppaquette Jun 10, 2016
8a213fb
Doom - Added NUM_ACTIONS and action_idx instead of x
ppaquette Jun 10, 2016
2ff230b
Doom - reset() only calls game.new_episode() after first call
ppaquette Jun 10, 2016
25c64bd
Doom is now deterministic
ppaquette Jun 11, 2016
ffdd73b
Doom - Partial fix for issue #167 - DoomDeathmatch environment crashe…
ppaquette Jun 11, 2016
775ecbf
Doom - Standardized envs, simplified _reset
ppaquette Jun 14, 2016
d07b653
Doom - Removed temporary fix for issue #167
ppaquette Jun 14, 2016
7706e9c
Doom - Added scoreboard summary and description
ppaquette Jun 14, 2016
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
18 changes: 18 additions & 0 deletions gym/envs/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,46 +299,64 @@
register(
id='DoomBasic-v0',
entry_point='gym.envs.doom:DoomBasicEnv',
timestep_limit=10000,
reward_threshold=10.0,
)

register(
id='DoomCorridor-v0',
entry_point='gym.envs.doom:DoomCorridorEnv',
timestep_limit=10000,
reward_threshold=1000.0,
)

register(
id='DoomDefendCenter-v0',
entry_point='gym.envs.doom:DoomDefendCenterEnv',
timestep_limit=10000,
reward_threshold=10.0,
)

register(
id='DoomDefendLine-v0',
entry_point='gym.envs.doom:DoomDefendLineEnv',
timestep_limit=10000,
reward_threshold=15.0,
)

register(
id='DoomHealthGathering-v0',
entry_point='gym.envs.doom:DoomHealthGatheringEnv',
timestep_limit=10000,
reward_threshold=1000.0,
)

register(
id='DoomMyWayHome-v0',
entry_point='gym.envs.doom:DoomMyWayHomeEnv',
timestep_limit=10000,
reward_threshold=0.5,
)

register(
id='DoomPredictPosition-v0',
entry_point='gym.envs.doom:DoomPredictPositionEnv',
timestep_limit=10000,
reward_threshold=0.5,
)

register(
id='DoomTakeCover-v0',
entry_point='gym.envs.doom:DoomTakeCoverEnv',
timestep_limit=10000,
reward_threshold=750.0,
)

register(
id='DoomDeathmatch-v0',
entry_point='gym.envs.doom:DoomDeathmatchEnv',
timestep_limit=10000,
reward_threshold=20.0,
)

# Debugging
Expand Down
20 changes: 18 additions & 2 deletions gym/envs/doom/assets/basic.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,29 @@ available_buttons =
available_game_variables =
{
KILLCOUNT
ITEMCOUNT
SECRETCOUNT
FRAGCOUNT
HEALTH
ARMOR
DEAD
ON_GROUND
ATTACK_READY
ALTATTACK_READY

SELECTED_WEAPON
SELECTED_WEAPON_AMMO

AMMO1
AMMO2
AMMO3
AMMO4
AMMO5
AMMO6
AMMO7
AMMO8
AMMO9
AMMO0
}

mode = PLAYER
doom_skill = 5
sound_enabled = false
20 changes: 18 additions & 2 deletions gym/envs/doom/assets/deadly_corridor.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,29 @@ available_buttons =
available_game_variables =
{
KILLCOUNT
ITEMCOUNT
SECRETCOUNT
FRAGCOUNT
HEALTH
ARMOR
DEAD
ON_GROUND
ATTACK_READY
ALTATTACK_READY

SELECTED_WEAPON
SELECTED_WEAPON_AMMO

AMMO1
AMMO2
AMMO3
AMMO4
AMMO5
AMMO6
AMMO7
AMMO8
AMMO9
AMMO0
}

mode = PLAYER
doom_skill = 5
sound_enabled = false
13 changes: 11 additions & 2 deletions gym/envs/doom/assets/deathmatch.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,15 @@ available_buttons =
available_game_variables =
{
KILLCOUNT
ITEMCOUNT
SECRETCOUNT
FRAGCOUNT
HEALTH
ARMOR
DEAD
ON_GROUND
ATTACK_READY
ALTATTACK_READY

SELECTED_WEAPON
SELECTED_WEAPON_AMMO
Expand All @@ -88,8 +95,10 @@ available_game_variables =
AMMO4
AMMO5
AMMO6
AMMO7
AMMO8
AMMO9
AMMO0
}

mode = PLAYER
doom_skill = 5
sound_enabled = false
20 changes: 18 additions & 2 deletions gym/envs/doom/assets/defend_the_center.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,29 @@ available_buttons =
available_game_variables =
{
KILLCOUNT
ITEMCOUNT
SECRETCOUNT
FRAGCOUNT
HEALTH
ARMOR
DEAD
ON_GROUND
ATTACK_READY
ALTATTACK_READY

SELECTED_WEAPON
SELECTED_WEAPON_AMMO

AMMO1
AMMO2
AMMO3
AMMO4
AMMO5
AMMO6
AMMO7
AMMO8
AMMO9
AMMO0
}

mode = PLAYER
doom_skill = 3
sound_enabled = false
20 changes: 18 additions & 2 deletions gym/envs/doom/assets/defend_the_line.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,29 @@ available_buttons =
available_game_variables =
{
KILLCOUNT
ITEMCOUNT
SECRETCOUNT
FRAGCOUNT
HEALTH
ARMOR
DEAD
ON_GROUND
ATTACK_READY
ALTATTACK_READY

SELECTED_WEAPON
SELECTED_WEAPON_AMMO

AMMO1
AMMO2
AMMO3
AMMO4
AMMO5
AMMO6
AMMO7
AMMO8
AMMO9
AMMO0
}

mode = PLAYER
doom_skill = 5
sound_enabled = false
20 changes: 18 additions & 2 deletions gym/envs/doom/assets/health_gathering.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,30 @@ available_buttons =
available_game_variables =
{
KILLCOUNT
ITEMCOUNT
SECRETCOUNT
FRAGCOUNT
HEALTH
ARMOR
DEAD
ON_GROUND
ATTACK_READY
ALTATTACK_READY

SELECTED_WEAPON
SELECTED_WEAPON_AMMO

AMMO1
AMMO2
AMMO3
AMMO4
AMMO5
AMMO6
AMMO7
AMMO8
AMMO9
AMMO0
}

mode = PLAYER
doom_skill = 5
sound_enabled = false

25 changes: 20 additions & 5 deletions gym/envs/doom/assets/my_way_home.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ render_particles = false
# make episodes start after 14 tics (after unholstering the gun) (35 tics per seconds)
episode_start_time = 14

# Make episodes finish after 4200 tics (2 minutes)
episode_timeout = 4200
# Make episodes finish after 2100 tics (1 minutes)
episode_timeout = 2100

# Available buttons
available_buttons =
Expand All @@ -32,14 +32,29 @@ available_buttons =
available_game_variables =
{
KILLCOUNT
ITEMCOUNT
SECRETCOUNT
FRAGCOUNT
HEALTH
ARMOR
DEAD
ON_GROUND
ATTACK_READY
ALTATTACK_READY

SELECTED_WEAPON
SELECTED_WEAPON_AMMO
AMMO0

AMMO1
AMMO2
AMMO3
AMMO4
AMMO5
AMMO6
AMMO7
AMMO8
AMMO9
AMMO0
}

mode = PLAYER
doom_skill = 5
sound_enabled = false
20 changes: 18 additions & 2 deletions gym/envs/doom/assets/predict_position.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,30 @@ available_buttons =
available_game_variables =
{
KILLCOUNT
ITEMCOUNT
SECRETCOUNT
FRAGCOUNT
HEALTH
ARMOR
DEAD
ON_GROUND
ATTACK_READY
ALTATTACK_READY

SELECTED_WEAPON
SELECTED_WEAPON_AMMO

AMMO1
AMMO2
AMMO3
AMMO4
AMMO5
AMMO6
AMMO7
AMMO8
AMMO9
AMMO0
}

mode = PLAYER
doom_skill = 3
sound_enabled = false

20 changes: 18 additions & 2 deletions gym/envs/doom/assets/take_cover.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,29 @@ available_buttons =
available_game_variables =
{
KILLCOUNT
ITEMCOUNT
SECRETCOUNT
FRAGCOUNT
HEALTH
ARMOR
DEAD
ON_GROUND
ATTACK_READY
ALTATTACK_READY

SELECTED_WEAPON
SELECTED_WEAPON_AMMO

AMMO1
AMMO2
AMMO3
AMMO4
AMMO5
AMMO6
AMMO7
AMMO8
AMMO9
AMMO0
}

mode = PLAYER
doom_skill = 5
sound_enabled = false
Loading