weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor of previous commits

Browse Source 
refactor to enum

typing and many other fixes

fix tests

attempt to fix some typescript

more typescript fixes

more typescript test fixes

revert all API changes

update to pydcs

mypy fixes

Use properties to check if player is blue/red/neutral

update requirements.txt

black -_-

bump pydcs and fix mypy

add opponent property

bump pydcs
This commit is contained in:
Eclipse/Druss99
2025-01-17 17:02:07 -05:00
committed by Raffson
parent 362ce66f80
commit 31c80dfd02
78 changed files with 739 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tests/theater/test_controlpoint.py
View File

@@ -17,6 +17,7 @@ from game.theater.controlpoint import (
OffMapSpawn,
Fob,
ParkingType,
Player,
)
from game.utils import Heading
@@ -30,8 +31,8 @@ def test_mission_types_friendly(mocker: Any) -> None:
mocker.patch("game.theater.controlpoint.Airfield.is_friendly", return_value=True)
airport = Airport(None, None) # type: ignore
airport.name = "test" # required for Airfield.__init__
airfield = Airfield(airport, theater=None, starts_blue=True) # type: ignore
mission_types = list(airfield.mission_types(for_player=True))
airfield = Airfield(airport, theater=None, starts_blue=Player.BLUE) # type: ignore
mission_types = list(airfield.mission_types(for_player=Player.BLUE))
assert len(mission_types) == 3
assert FlightType.AEWC in mission_types
assert FlightType.REFUELING in mission_types
@@ -39,8 +40,8 @@ def test_mission_types_friendly(mocker: Any) -> None:
# Carrier
mocker.patch("game.theater.controlpoint.Carrier.is_friendly", return_value=True)
carrier = Carrier(name="test", at=None, theater=None, starts_blue=True) # type: ignore
mission_types = list(carrier.mission_types(for_player=True))
carrier = Carrier(name="test", at=None, theater=None, starts_blue=Player.BLUE) # type: ignore
mission_types = list(carrier.mission_types(for_player=Player.BLUE))
assert len(mission_types) == 3
assert FlightType.AEWC in mission_types
assert FlightType.REFUELING in mission_types
@@ -48,8 +49,8 @@ def test_mission_types_friendly(mocker: Any) -> None:
# LHA
mocker.patch("game.theater.controlpoint.Lha.is_friendly", return_value=True)
lha = Lha(name="test", at=None, theater=None, starts_blue=True) # type: ignore
mission_types = list(lha.mission_types(for_player=True))
lha = Lha(name="test", at=None, theater=None, starts_blue=Player.BLUE) # type: ignore
mission_types = list(lha.mission_types(for_player=Player.BLUE))
assert len(mission_types) == 3
assert FlightType.AEWC in mission_types
assert FlightType.REFUELING in mission_types
@@ -57,16 +58,16 @@ def test_mission_types_friendly(mocker: Any) -> None:
# Fob
mocker.patch("game.theater.controlpoint.Fob.is_friendly", return_value=True)
fob = Fob(name="test", at=None, theater=None, starts_blue=True) # type: ignore
mission_types = list(fob.mission_types(for_player=True))
fob = Fob(name="test", at=None, theater=None, starts_blue=Player.BLUE) # type: ignore
mission_types = list(fob.mission_types(for_player=Player.BLUE))
assert len(mission_types) == 2
assert FlightType.AEWC in mission_types
assert FlightType.BARCAP in mission_types
# Off map spawn
mocker.patch("game.theater.controlpoint.OffMapSpawn.is_friendly", return_value=True)
off_map_spawn = OffMapSpawn(name="test", position=None, theater=None, starts_blue=True) # type: ignore
mission_types = list(off_map_spawn.mission_types(for_player=True))
off_map_spawn = OffMapSpawn(name="test", position=None, theater=None, starts_blue=Player.BLUE) # type: ignore
mission_types = list(off_map_spawn.mission_types(for_player=Player.BLUE))
assert len(mission_types) == 0
@@ -79,8 +80,8 @@ def test_mission_types_enemy(mocker: Any) -> None:
mocker.patch("game.theater.controlpoint.Airfield.is_friendly", return_value=False)
airport = Airport(None, None) # type: ignore
airport.name = "test" # required for Airfield.__init__
airfield = Airfield(airport, theater=None, starts_blue=True) # type: ignore
mission_types = list(airfield.mission_types(for_player=True))
airfield = Airfield(airport, theater=None, starts_blue=Player.BLUE) # type: ignore
mission_types = list(airfield.mission_types(for_player=Player.BLUE))
assert len(mission_types) == 8
assert FlightType.OCA_AIRCRAFT in mission_types
assert FlightType.OCA_RUNWAY in mission_types
@@ -93,8 +94,8 @@ def test_mission_types_enemy(mocker: Any) -> None:
# Carrier
mocker.patch("game.theater.controlpoint.Carrier.is_friendly", return_value=False)
carrier = Carrier(name="test", at=None, theater=None, starts_blue=True) # type: ignore
mission_types = list(carrier.mission_types(for_player=True))
carrier = Carrier(name="test", at=None, theater=None, starts_blue=Player.BLUE) # type: ignore
mission_types = list(carrier.mission_types(for_player=Player.BLUE))
assert len(mission_types) == 5
assert FlightType.ANTISHIP in mission_types
assert FlightType.ESCORT in mission_types
@@ -104,8 +105,8 @@ def test_mission_types_enemy(mocker: Any) -> None:
# LHA
mocker.patch("game.theater.controlpoint.Lha.is_friendly", return_value=False)
lha = Lha(name="test", at=None, theater=None, starts_blue=True) # type: ignore
mission_types = list(lha.mission_types(for_player=True))
lha = Lha(name="test", at=None, theater=None, starts_blue=Player.BLUE) # type: ignore
mission_types = list(lha.mission_types(for_player=Player.BLUE))
assert len(mission_types) == 5
assert FlightType.ANTISHIP in mission_types
assert FlightType.ESCORT in mission_types
@@ -115,8 +116,8 @@ def test_mission_types_enemy(mocker: Any) -> None:
# Fob
mocker.patch("game.theater.controlpoint.Fob.is_friendly", return_value=False)
fob = Fob(name="test", at=None, theater=None, starts_blue=True) # type: ignore
mission_types = list(fob.mission_types(for_player=True))
fob = Fob(name="test", at=None, theater=None, starts_blue=Player.BLUE) # type: ignore
mission_types = list(fob.mission_types(for_player=Player.BLUE))
assert len(mission_types) == 6
assert FlightType.AIR_ASSAULT in mission_types
assert FlightType.ESCORT in mission_types
@@ -129,8 +130,8 @@ def test_mission_types_enemy(mocker: Any) -> None:
mocker.patch(
"game.theater.controlpoint.OffMapSpawn.is_friendly", return_value=False
)
off_map_spawn = OffMapSpawn(name="test", position=None, theater=None, starts_blue=True) # type: ignore
mission_types = list(off_map_spawn.mission_types(for_player=True))
off_map_spawn = OffMapSpawn(name="test", position=None, theater=None, starts_blue=Player.BLUE) # type: ignore
mission_types = list(off_map_spawn.mission_types(for_player=Player.BLUE))
assert len(mission_types) == 0
@@ -144,7 +145,7 @@ def test_control_point_parking(mocker: Any) -> None:
airport = Airport(None, None) # type: ignore
airport.name = "test" # required for Airfield.__init__
point = Point(0, 0, None) # type: ignore
control_point = Airfield(airport, theater=None, starts_blue=True) # type: ignore
control_point = Airfield(airport, theater=None, starts_blue=Player.BLUE) # type: ignore
parking_type_ground_start = ParkingType(
fixed_wing=False, fixed_wing_stol=True, rotary_wing=False
)

24
tests/theater/test_theatergroundobject.py
View File

@@ -4,7 +4,7 @@ import pytest
from dcs.mapping import Point
from game.ato.flighttype import FlightType
from game.theater.controlpoint import OffMapSpawn
from game.theater.controlpoint import OffMapSpawn, Player
from game.theater.presetlocation import PresetLocation
from game.theater.theatergroundobject import (
BuildingGroundObject,
@@ -34,7 +34,7 @@ def test_mission_types_friendly(mocker: Any) -> None:
name="dummy_control_point",
position=Point(0, 0, None), # type: ignore
theater=None, # type: ignore
starts_blue=True,
starts_blue=Player.BLUE,
)
# Patch is_friendly as it's difficult to set up a proper ControlPoint
@@ -56,7 +56,7 @@ def test_mission_types_friendly(mocker: Any) -> None:
control_point=dummy_control_point,
task=None,
)
mission_types = list(ground_object.mission_types(for_player=True))
mission_types = list(ground_object.mission_types(for_player=Player.BLUE))
assert mission_types == [FlightType.BARCAP]
for ground_object_type in [BuildingGroundObject, IadsBuildingGroundObject]:
@@ -67,7 +67,7 @@ def test_mission_types_friendly(mocker: Any) -> None:
control_point=dummy_control_point,
task=None,
)
mission_types = list(ground_object.mission_types(for_player=True))
mission_types = list(ground_object.mission_types(for_player=Player.BLUE))
assert mission_types == [FlightType.BARCAP]
@@ -84,7 +84,7 @@ def test_mission_types_enemy(mocker: Any) -> None:
name="dummy_control_point",
position=Point(0, 0, None), # type: ignore
theater=None, # type: ignore
starts_blue=True,
starts_blue=Player.BLUE,
)
# Patch is_friendly as it's difficult to set up a proper ControlPoint
@@ -99,7 +99,7 @@ def test_mission_types_enemy(mocker: Any) -> None:
control_point=dummy_control_point,
task=None,
)
mission_types = list(building.mission_types(for_player=False))
mission_types = list(building.mission_types(for_player=Player.RED))
assert len(mission_types) == 6
assert FlightType.STRIKE in mission_types
assert FlightType.REFUELING in mission_types
@@ -115,7 +115,7 @@ def test_mission_types_enemy(mocker: Any) -> None:
control_point=dummy_control_point,
task=None,
)
mission_types = list(iads_building.mission_types(for_player=False))
mission_types = list(iads_building.mission_types(for_player=Player.RED))
assert len(mission_types) == 7
assert FlightType.STRIKE in mission_types
assert FlightType.REFUELING in mission_types
@@ -136,7 +136,7 @@ def test_mission_types_enemy(mocker: Any) -> None:
control_point=dummy_control_point,
task=None,
)
mission_types = list(ground_object.mission_types(for_player=False))
mission_types = list(ground_object.mission_types(for_player=Player.RED))
assert len(mission_types) == 7
assert FlightType.ANTISHIP in mission_types
assert FlightType.STRIKE in mission_types
@@ -152,7 +152,7 @@ def test_mission_types_enemy(mocker: Any) -> None:
control_point=dummy_control_point,
task=None,
)
mission_types = list(sam.mission_types(for_player=False))
mission_types = list(sam.mission_types(for_player=Player.RED))
assert len(mission_types) == 8
assert FlightType.DEAD in mission_types
assert FlightType.SEAD in mission_types
@@ -168,7 +168,7 @@ def test_mission_types_enemy(mocker: Any) -> None:
location=dummy_location,
control_point=dummy_control_point,
)
mission_types = list(ewr.mission_types(for_player=False))
mission_types = list(ewr.mission_types(for_player=Player.RED))
assert len(mission_types) == 7
assert FlightType.DEAD in mission_types
assert FlightType.STRIKE in mission_types
@@ -187,7 +187,7 @@ def test_mission_types_enemy(mocker: Any) -> None:
location=dummy_location,
control_point=dummy_control_point,
)
mission_types = list(ground_object.mission_types(for_player=False))
mission_types = list(ground_object.mission_types(for_player=Player.RED))
assert len(mission_types) == 7
assert FlightType.BAI in mission_types
assert FlightType.STRIKE in mission_types
@@ -203,7 +203,7 @@ def test_mission_types_enemy(mocker: Any) -> None:
control_point=dummy_control_point,
task=None,
)
mission_types = list(vehicles.mission_types(for_player=False))
mission_types = list(vehicles.mission_types(for_player=Player.RED))
assert len(mission_types) == 7
assert FlightType.BAI in mission_types
assert FlightType.STRIKE in mission_types