Skip to content

Exotic maps implemented #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bondeulv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Exotic maps implemented #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 39 additions & 2 deletions cogs/pug.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,34 @@
'AS-TheDungeon]l[AL',
]

REGULAR_MAP_LIST = [
'AS-AsthenosphereSE',
'AS-AutoRip',
'AS-AutoRipSE_beta5',
'AS-Ballistic',
'AS-Bridge',
'AS-BridgePV_beta6c',
'AS-Desertstorm',
'AS-Desolate][',
'AS-Frigate',
'AS-GolgothaAL',
'AS-Golgotha][AL',
'AS-Guardia',
'AS-GuardiaAL',
'AS-HiSpeed',
'AS-Mazon',
'AS-OceanFloor',
'AS-OceanFloorAL',
'AS-Overlord',
'AS-RiverbedSE',
'AS-Riverbed]l[AL',
'AS-Riverbed]l[PE_beta3',
'AS-Rook',
'AS-Siege][',
'AS-Submarinebase][',
'AS-TheDungeon]l[AL',
]

# Server list:
# List of Tuples, first element is the API reference, second element is the placeholder
# Name / Description of the server, which is updated after a successful check.
Expand Down Expand Up @@ -231,6 +259,8 @@ def __init__(self, maxMaps, pickMode, mapList):
self.pickMode = pickMode
self.availableMapsList = mapList
self.maps = []
# List of non regular maps in a maplist
self.exoticMaps = 0

def __contains__(self, map):
return map in self.maps
Expand Down Expand Up @@ -325,7 +355,14 @@ def addMap(self, index: int):
return False
map = self.getMapFromAvailableList(index)
if map and map not in self:
self.maps.append(map)
# Check if 7 maps and if map chosen is non-regular.
if (map not in REGULAR_MAP_LIST) and (self.maxMaps == 7) and (self.exoticMaps != 2):
self.exoticMaps += 1
self.maps.append(map)
elif (self.maxMaps == 7) and (self.exoticMaps == 2):
return False
else:
self.maps.append(map)
return True
return False

Expand Down Expand Up @@ -1855,7 +1892,7 @@ async def map(self, ctx, idx: int):
return

if not self.pugInfo.pickMap(captain, mapIndex):
await ctx.send('Map already picked. Please, pick a different map.')
await ctx.send('Map already picked or maximum number of non-regular maps reached. Please, pick a different map.')

msg = ['Maps chosen **({0} of {1})**:'.format(len(self.pugInfo.maps), self.pugInfo.maps.maxMaps)]
msg.append(self.pugInfo.maps.format_current_maplist)
Expand Down