foxapi 1.6.2__tar.gz → 1.6.3__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (117) hide show
  1. {foxapi-1.6.2 → foxapi-1.6.3}/PKG-INFO +1 -1
  2. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/foxapi.py +17 -15
  3. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi.egg-info/PKG-INFO +1 -1
  4. {foxapi-1.6.2 → foxapi-1.6.3}/setup.py +1 -1
  5. {foxapi-1.6.2 → foxapi-1.6.3}/LICENSE +0 -0
  6. {foxapi-1.6.2 → foxapi-1.6.3}/README.md +0 -0
  7. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/10.png +0 -0
  8. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/11.png +0 -0
  9. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/12.png +0 -0
  10. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/13.png +0 -0
  11. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/14.png +0 -0
  12. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/15.png +0 -0
  13. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/16.png +0 -0
  14. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/17.png +0 -0
  15. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/18.png +0 -0
  16. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/19.png +0 -0
  17. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/20.png +0 -0
  18. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/21.png +0 -0
  19. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/22.png +0 -0
  20. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/23.png +0 -0
  21. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/27.png +0 -0
  22. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/28.png +0 -0
  23. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/29.png +0 -0
  24. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/30.png +0 -0
  25. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/32.png +0 -0
  26. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/33.png +0 -0
  27. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/34.png +0 -0
  28. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/35.png +0 -0
  29. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/37.png +0 -0
  30. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/38.png +0 -0
  31. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/39.png +0 -0
  32. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/40.png +0 -0
  33. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/41.png +0 -0
  34. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/45.png +0 -0
  35. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/46.png +0 -0
  36. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/47.png +0 -0
  37. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/5.png +0 -0
  38. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/51.png +0 -0
  39. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/52.png +0 -0
  40. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/53.png +0 -0
  41. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/54.png +0 -0
  42. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/56.png +0 -0
  43. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/57.png +0 -0
  44. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/58.png +0 -0
  45. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/59.png +0 -0
  46. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/6.png +0 -0
  47. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/60.png +0 -0
  48. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/61.png +0 -0
  49. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/62.png +0 -0
  50. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/7.png +0 -0
  51. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/70.png +0 -0
  52. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/71.png +0 -0
  53. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/72.png +0 -0
  54. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/75.png +0 -0
  55. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/8.png +0 -0
  56. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/83.png +0 -0
  57. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/84.png +0 -0
  58. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/9.png +0 -0
  59. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/DebugIcon.png +0 -0
  60. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/MapIconCivicCenter.png +0 -0
  61. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/MapIconFortCursed.png +0 -0
  62. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/MapIconForwardBase1.png +0 -0
  63. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/MapIconScorchedTown.png +0 -0
  64. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/MapIconTownHall.png +0 -0
  65. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapIcons/MapIconVictory.png +0 -0
  66. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapAcrithiaHex.png +0 -0
  67. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapAllodsBightHex.png +0 -0
  68. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapAshFieldsHex.png +0 -0
  69. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapBasinSionnachHex.png +0 -0
  70. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapCallahansPassageHex.png +0 -0
  71. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapCallumsCapeHex.png +0 -0
  72. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapClahstraHex.png +0 -0
  73. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapClansheadValleyHex.png +0 -0
  74. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapDeadLandsHex.png +0 -0
  75. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapDrownedValeHex.png +0 -0
  76. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapEndlessShoreHex.png +0 -0
  77. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapFarranacCoastHex.png +0 -0
  78. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapFishermansRowHex.png +0 -0
  79. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapGodcroftsHex.png +0 -0
  80. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapGreatMarchHex.png +0 -0
  81. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapHeartlandsHex.png +0 -0
  82. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapHomeRegionC.png +0 -0
  83. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapHomeRegionW.png +0 -0
  84. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapHowlCountyHex.png +0 -0
  85. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapKalokaiHex.png +0 -0
  86. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapKingsCageHex.png +0 -0
  87. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapLinnMercyHex.png +0 -0
  88. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapLochMorHex.png +0 -0
  89. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapMarbanHollow.png +0 -0
  90. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapMooringCountyHex.png +0 -0
  91. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapMorgensCrossingHex.png +0 -0
  92. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapNevishLineHex.png +0 -0
  93. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapOarbreakerHex.png +0 -0
  94. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapOriginHex.png +0 -0
  95. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapReachingTrailHex.png +0 -0
  96. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapReaversPassHex.png +0 -0
  97. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapRedRiverHex.png +0 -0
  98. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapSableportHex.png +0 -0
  99. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapShackledChasmHex.png +0 -0
  100. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapSpeakingWoodsHex.png +0 -0
  101. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapStemaLandingHex.png +0 -0
  102. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapStlicanShelfHex.png +0 -0
  103. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapStonecradleHex.png +0 -0
  104. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapTempestIslandHex.png +0 -0
  105. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapTerminusHex.png +0 -0
  106. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapTheFingersHex.png +0 -0
  107. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapUmbralWildwoodHex.png +0 -0
  108. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapViperPitHex.png +0 -0
  109. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapWeatheredExpanseHex.png +0 -0
  110. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/Images/MapsHex/MapWestgateHex.png +0 -0
  111. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/__init__.py +0 -0
  112. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi/utils.py +0 -0
  113. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi.egg-info/SOURCES.txt +0 -0
  114. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi.egg-info/dependency_links.txt +0 -0
  115. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi.egg-info/requires.txt +0 -0
  116. {foxapi-1.6.2 → foxapi-1.6.3}/foxapi.egg-info/top_level.txt +0 -0
  117. {foxapi-1.6.2 → foxapi-1.6.3}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: foxapi
3
- Version: 1.6.2
3
+ Version: 1.6.3
4
4
  Summary: A wrapper for the foxhole API
5
5
  Home-page: https://github.com/ThePhoenix78/FoxAPI
6
6
  Download-URL: https://github.com/ThePhoenix78/FoxAPI/tarball/master
@@ -78,7 +78,7 @@ class FoxAPI():
78
78
  REQUESTS SYNC
79
79
  """
80
80
 
81
- def get_data_sync(self, endpoint: str, etag: str = None, use_cache: bool = False) -> APIResponse:
81
+ def get_data_sync(self, endpoint: str, etag: str = None, use_cache: bool = None) -> APIResponse:
82
82
  hexagon: str = self._retrieve_hexagon_from_endpoint(endpoint)
83
83
 
84
84
  if use_cache == True:
@@ -112,7 +112,7 @@ class FoxAPI():
112
112
  REQUESTS ASYNC
113
113
  """
114
114
 
115
- async def get_data(self, endpoint: str, session: aiohttp.ClientSession = None, etag: str = None, use_cache: bool = False):
115
+ async def get_data(self, endpoint: str, session: aiohttp.ClientSession = None, etag: str = None, use_cache: bool = None):
116
116
  hexagon: str = self._retrieve_hexagon_from_endpoint(endpoint)
117
117
 
118
118
  if use_cache == True:
@@ -248,8 +248,10 @@ class FoxAPI():
248
248
  p = pix[x, y]
249
249
 
250
250
  if p[-1] >= 10:
251
- new_color: tuple = (p[0]-g + color[0], p[1]-g + color[1], p[2]-g + color[2])
252
- image.putpixel((x, y), new_color)
251
+ continue
252
+
253
+ new_color: tuple = (p[0]-g + color[0], p[1]-g + color[1], p[2]-g + color[2])
254
+ image.putpixel((x, y), new_color)
253
255
 
254
256
 
255
257
  def color_regions(self, image: Image, dynamic: dict, static: dict) -> Image:
@@ -316,25 +318,25 @@ class FoxAPI():
316
318
  data: APIResponse = await self.get_data(endpoint="/maps", use_cache=use_cache)
317
319
  return data.json
318
320
 
319
- async def get_war(self, use_cache: bool = False):
321
+ async def get_war(self, use_cache: bool = None):
320
322
  data: APIResponse = await self.get_data(endpoint="/war", use_cache=use_cache)
321
323
  return data.json
322
324
 
323
- async def get_static(self, hexagon: str, use_cache: bool = False):
325
+ async def get_static(self, hexagon: str, use_cache: bool = True):
324
326
  if self._safe_mode:
325
327
  hexagon: str = self._format_hexagon(hexagon)
326
328
 
327
329
  data: APIResponse = await self.get_data(endpoint=f"/maps/{hexagon}/static", use_cache=use_cache)
328
330
  return data.json
329
331
 
330
- async def get_dynamic(self, hexagon: str, use_cache: bool = False):
332
+ async def get_dynamic(self, hexagon: str, use_cache: bool = None):
331
333
  if self._safe_mode:
332
334
  hexagon: str = self._format_hexagon(hexagon)
333
335
 
334
336
  data: APIResponse = await self.get_data(endpoint=f"/maps/{hexagon}/dynamic/public", use_cache=use_cache)
335
337
  return data.json
336
338
 
337
- async def get_war_report(self, hexagon: str, use_cache: bool = False):
339
+ async def get_war_report(self, hexagon: str, use_cache: bool = None):
338
340
  if self._safe_mode:
339
341
  hexagon: str = self._format_hexagon(hexagon)
340
342
 
@@ -407,12 +409,12 @@ class FoxAPI():
407
409
 
408
410
  return {"colonials": war_c - self._death_rate_c[hexagon], "wardens": war_w - self._death_rate_w[hexagon], "hexagon": hexagon}
409
411
 
410
- async def get_hexagon_data(self, hexagon: str, use_cache: bool = False):
412
+ async def get_hexagon_data(self, hexagon: str, use_cache: bool = None):
411
413
  if self._safe_mode:
412
414
  hexagon: str = self._format_hexagon(hexagon=hexagon)
413
415
 
414
416
  war_report: dict = await self.get_war_report(hexagon=hexagon, use_cache=use_cache)
415
- static: dict = await self.get_static(hexagon=hexagon, use_cache=use_cache)
417
+ static: dict = await self.get_static(hexagon=hexagon, use_cache=True)
416
418
  dynamic: dict = await self.get_dynamic(hexagon=hexagon, use_cache=use_cache)
417
419
 
418
420
  captured_towns: dict = await self.get_captured_towns(dynamic=dynamic, static=static)
@@ -427,22 +429,22 @@ class FoxAPI():
427
429
  def get_maps_sync(self, use_cache: bool = True):
428
430
  return self.get_data_sync(endpoint="/maps", use_cache=use_cache).json
429
431
 
430
- def get_war_sync(self, use_cache: bool = False):
432
+ def get_war_sync(self, use_cache: bool = None):
431
433
  return self.get_data_sync(endpoint="/war", use_cache=use_cache).json
432
434
 
433
- def get_static_sync(self, hexagon: str, use_cache: bool = False):
435
+ def get_static_sync(self, hexagon: str, use_cache: bool = True):
434
436
  if self._safe_mode:
435
437
  hexagon: str = self._format_hexagon(hexagon)
436
438
 
437
439
  return self.get_data_sync(endpoint=f"/maps/{hexagon}/static", use_cache=use_cache).json
438
440
 
439
- def get_dynamic_sync(self, hexagon: str, use_cache: bool = False):
441
+ def get_dynamic_sync(self, hexagon: str, use_cache: bool = None):
440
442
  if self._safe_mode:
441
443
  hexagon: str = self._format_hexagon(hexagon)
442
444
 
443
445
  return self.get_data_sync(endpoint=f"/maps/{hexagon}/dynamic/public", use_cache=use_cache).json
444
446
 
445
- def get_war_report_sync(self, hexagon: str, use_cache: bool = False):
447
+ def get_war_report_sync(self, hexagon: str, use_cache: bool = None):
446
448
  if self._safe_mode:
447
449
  hexagon: str = self._format_hexagon(hexagon)
448
450
 
@@ -517,7 +519,7 @@ class FoxAPI():
517
519
 
518
520
  return {"colonials": dph_c - self._death_rate_c[hexagon], "wardens": dph_w - self._death_rate_w[hexagon], "hexagon": hexagon}
519
521
 
520
- def get_hexagon_data_sync(self, hexagon: str, use_cache: bool = False):
522
+ def get_hexagon_data_sync(self, hexagon: str, use_cache: bool = None):
521
523
  if self._safe_mode:
522
524
  hexagon: str = self._format_hexagon(hexagon=hexagon)
523
525
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: foxapi
3
- Version: 1.6.2
3
+ Version: 1.6.3
4
4
  Summary: A wrapper for the foxhole API
5
5
  Home-page: https://github.com/ThePhoenix78/FoxAPI
6
6
  Download-URL: https://github.com/ThePhoenix78/FoxAPI/tarball/master
@@ -6,7 +6,7 @@ with open("README.md", "r") as stream:
6
6
 
7
7
  setup(
8
8
  name='foxapi',
9
- version="1.6.2",
9
+ version="1.6.3",
10
10
  url='https://github.com/ThePhoenix78/FoxAPI',
11
11
  download_url='https://github.com/ThePhoenix78/FoxAPI/tarball/master',
12
12
  license='MIT',
File without changes
File without changes
File without changes
File without changes
File without changes