dodox/Columbus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implemented aux penalty (enemys can radiate damage)

Browse Source
This commit is contained in:
Dominik Moritz Roth 2022-06-29 18:49:28 +02:00
parent 5b0157bfc9
commit 88fc8a8067
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
columbus/entities.py
View File

@ -91,6 +91,7 @@ class Enemy(Entity):
super(Enemy, self).__init__(env) super(Enemy, self).__init__(env)
self.col = (255, 0, 0) self.col = (255, 0, 0)
self.damage = 100 self.damage = 100
self.radiateDamage = True
def on_collision(self, other, depth): def on_collision(self, other, depth):
super().on_collision(other, depth) super().on_collision(other, depth)

11
columbus/env.py
View File

@ -37,6 +37,7 @@ class ColumbusEnv(gym.Env):
self.controll_type = 'SPEED' # one of SPEED, ACC self.controll_type = 'SPEED' # one of SPEED, ACC
self.limit_inp_to_unit_circle = True self.limit_inp_to_unit_circle = True
self.aux_reward_max = 0 # 0 = off self.aux_reward_max = 0 # 0 = off
self.aux_penalty_max = 0 # 0 = off
self.aux_reward_discretize = 0 # 0 = dont discretize self.aux_reward_discretize = 0 # 0 = dont discretize
self.draw_observable = True self.draw_observable = True
self.draw_joystick = True self.draw_joystick = True
@ -109,6 +110,16 @@ class ColumbusEnv(gym.Env):
self.aux_reward_discretize / 2 self.aux_reward_discretize / 2
aux_reward += reward aux_reward += reward
elif isinstance(entity, entities.Enemy):
if entity.radiateDamage:
penalty = self.aux_penalty_max / \
(1 + self.sq_dist(entity.pos, self.agent.pos))
if self.aux_reward_discretize:
penalty = int(penalty*self.aux_reward_discretize*2) / \
self.aux_reward_discretize / 2
aux_reward -= penalty
return aux_reward return aux_reward
def step(self, action): def step(self, action):