Skip to content

Commit 1de8bab

Browse files
committed
fix: messageの救急チーム、民間人、消防隊、警察のダメージ値を10000に制限
1 parent 2638bfd commit 1de8bab

4 files changed

Lines changed: 8 additions & 0 deletions

File tree

src/adf_core_python/core/agent/communication/standard/bundle/information/message_ambulance_team.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ def __init__(
4949
ambulance_team.get_buriedness() or None
5050
)
5151
self._ambulance_team_damage: Optional[int] = ambulance_team.get_damage() or None
52+
if self._ambulance_team_damage is not None and self._ambulance_team_damage > 10000:
53+
self._ambulance_team_damage = 10000
5254
self._ambulance_team_position: Optional[EntityID] = (
5355
ambulance_team.get_position() or None
5456
)

src/adf_core_python/core/agent/communication/standard/bundle/information/message_civilian.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ def __init__(
3838
self._civilian_hp: Optional[int] = civilian.get_hp() or None
3939
self._civilian_buriedness: Optional[int] = civilian.get_buriedness() or None
4040
self._civilian_damage: Optional[int] = civilian.get_damage() or None
41+
if self._civilian_damage is not None and self._civilian_damage > 10000:
42+
self._civilian_damage = 10000
4143
self._civilian_position: Optional[EntityID] = civilian.get_position() or None
4244

4345
def get_civilian_entity_id(self) -> Optional[EntityID]:

src/adf_core_python/core/agent/communication/standard/bundle/information/message_fire_brigade.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ def __init__(
4848
self._fire_brigade_hp: Optional[int] = fire_brigade.get_hp() or None
4949
self._fire_brigade_buriedness: Optional[int] = fire_brigade.get_buriedness() or None
5050
self._fire_brigade_damage: Optional[int] = fire_brigade.get_damage() or None
51+
if self._fire_brigade_damage is not None and self._fire_brigade_damage > 10000:
52+
self._fire_brigade_damage = 10000
5153
self._fire_brigade_position: Optional[EntityID] = (
5254
fire_brigade.get_position() or None
5355
)

src/adf_core_python/core/agent/communication/standard/bundle/information/message_police_force.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ def __init__(
4545
self._police_force_hp: Optional[int] = police_force.get_hp() or None
4646
self._police_force_buriedness: Optional[int] = police_force.get_buriedness() or None
4747
self._police_force_damage: Optional[int] = police_force.get_damage() or None
48+
if self._police_force_damage is not None and self._police_force_damage > 10000:
49+
self._police_force_damage = 10000
4850
self._police_force_position: Optional[EntityID] = (
4951
police_force.get_position() or None
5052
)

0 commit comments

Comments
 (0)