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

Make some paths cross-platform compatible (#1543)

Browse Source 
* Make some paths cross-platform compatible

* Fix lint error for Path
This commit is contained in:
Magnus Wolffelt 2021-08-14 21:45:23 +02:00 committed by GitHub
parent b5b0d82a1a
commit 103675e5bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
game/theater/conflicttheater.py
View File

@ -292,7 +292,7 @@ class CaucasusTheater(ConflictTheater):
ReferencePoint(caucasus.Batumi.position, Point(1307, 1205)), ReferencePoint(caucasus.Batumi.position, Point(1307, 1205)),
) )
landmap = load_landmap("resources\\caulandmap.p") landmap = load_landmap(Path("resources/caulandmap.p"))
daytime_map = { daytime_map = {
"dawn": (6, 9), "dawn": (6, 9),
"day": (9, 18), "day": (9, 18),
@ -320,7 +320,7 @@ class PersianGulfTheater(ConflictTheater):
ReferencePoint(persiangulf.Jiroft.position, Point(1692, 1343)), ReferencePoint(persiangulf.Jiroft.position, Point(1692, 1343)),
ReferencePoint(persiangulf.Liwa_AFB.position, Point(358, 3238)), ReferencePoint(persiangulf.Liwa_AFB.position, Point(358, 3238)),
) )
landmap = load_landmap("resources\\gulflandmap.p") landmap = load_landmap(Path("resources/gulflandmap.p"))
daytime_map = { daytime_map = {
"dawn": (6, 8), "dawn": (6, 8),
"day": (8, 16), "day": (8, 16),
@ -348,7 +348,7 @@ class NevadaTheater(ConflictTheater):
ReferencePoint(nevada.Mina_Airport_3Q0.position, Point(252, 295)), ReferencePoint(nevada.Mina_Airport_3Q0.position, Point(252, 295)),
ReferencePoint(nevada.Laughlin_Airport.position, Point(844, 909)), ReferencePoint(nevada.Laughlin_Airport.position, Point(844, 909)),
) )
landmap = load_landmap("resources\\nevlandmap.p") landmap = load_landmap(Path("resources/nevlandmap.p"))
daytime_map = { daytime_map = {
"dawn": (4, 6), "dawn": (4, 6),
"day": (6, 17), "day": (6, 17),
@ -376,7 +376,7 @@ class NormandyTheater(ConflictTheater):
ReferencePoint(normandy.Needs_Oar_Point.position, Point(515, 329)), ReferencePoint(normandy.Needs_Oar_Point.position, Point(515, 329)),
ReferencePoint(normandy.Evreux.position, Point(2029, 1709)), ReferencePoint(normandy.Evreux.position, Point(2029, 1709)),
) )
landmap = load_landmap("resources\\normandylandmap.p") landmap = load_landmap(Path("resources/normandylandmap.p"))
daytime_map = { daytime_map = {
"dawn": (6, 8), "dawn": (6, 8),
"day": (10, 17), "day": (10, 17),
@ -404,7 +404,7 @@ class TheChannelTheater(ConflictTheater):
ReferencePoint(thechannel.Abbeville_Drucat.position, Point(2005, 2390)), ReferencePoint(thechannel.Abbeville_Drucat.position, Point(2005, 2390)),
ReferencePoint(thechannel.Detling.position, Point(706, 382)), ReferencePoint(thechannel.Detling.position, Point(706, 382)),
) )
landmap = load_landmap("resources\\channellandmap.p") landmap = load_landmap(Path("resources/channellandmap.p"))
daytime_map = { daytime_map = {
"dawn": (6, 8), "dawn": (6, 8),
"day": (10, 17), "day": (10, 17),
@ -432,7 +432,7 @@ class SyriaTheater(ConflictTheater):
ReferencePoint(syria.Eyn_Shemer.position, Point(564, 1289)), ReferencePoint(syria.Eyn_Shemer.position, Point(564, 1289)),
ReferencePoint(syria.Tabqa.position, Point(1329, 491)), ReferencePoint(syria.Tabqa.position, Point(1329, 491)),
) )
landmap = load_landmap("resources\\syrialandmap.p") landmap = load_landmap(Path("resources/syrialandmap.p"))
daytime_map = { daytime_map = {
"dawn": (6, 8), "dawn": (6, 8),
"day": (8, 16), "day": (8, 16),
@ -457,7 +457,7 @@ class MarianaIslandsTheater(ConflictTheater):
terrain = marianaislands.MarianaIslands() terrain = marianaislands.MarianaIslands()
overview_image = "marianaislands.gif" overview_image = "marianaislands.gif"
landmap = load_landmap("resources\\marianaislandslandmap.p") landmap = load_landmap(Path("resources/marianaislandslandmap.p"))
daytime_map = { daytime_map = {
"dawn": (6, 8), "dawn": (6, 8),
"day": (8, 16), "day": (8, 16),

3
game/theater/landmap.py
View File

@ -3,6 +3,7 @@ import pickle
from functools import cached_property from functools import cached_property
from typing import Optional, Tuple, Union from typing import Optional, Tuple, Union
import logging import logging
from pathlib import Path
from shapely import geometry from shapely import geometry
from shapely.geometry import MultiPolygon, Polygon from shapely.geometry import MultiPolygon, Polygon
@ -27,7 +28,7 @@ class Landmap:
return self.inclusion_zones - self.exclusion_zones - self.sea_zones return self.inclusion_zones - self.exclusion_zones - self.sea_zones
def load_landmap(filename: str) -> Optional[Landmap]: def load_landmap(filename: Path) -> Optional[Landmap]:
try: try:
with open(filename, "rb") as f: with open(filename, "rb") as f:
return pickle.load(f) return pickle.load(f)

2
qt_ui/windows/newgame/QCampaignList.py
View File

@ -104,7 +104,7 @@ class Campaign:
def load_campaigns() -> List[Campaign]: def load_campaigns() -> List[Campaign]:
campaign_dir = Path("resources\\campaigns") campaign_dir = Path("resources/campaigns")
campaigns = [] campaigns = []
for path in campaign_dir.glob("*.json"): for path in campaign_dir.glob("*.json"):
try: try: