Add Switch 2 platform & Game information

amiibo/amiibo.py

@@ -130,7 +130,7 @@ class UnknownMask(Hex):
 
 
 class Amiibo:
-    def __init__(self, manager, head, tail, name, release, games3DS, gamesWiiU, gamesSwitch):
+    def __init__(self, manager, head, tail, name, release, games3DS, gamesWiiU, gamesSwitch, gamesSwitch2):
         self.manager = manager
         self.head = Hex(head)
         self.tail = Hex(tail)
@@ -139,6 +139,7 @@ def __init__(self, manager, head, tail, name, release, games3DS, gamesWiiU, game
         self.games3DS = games3DS
         self.gamesWiiU = gamesWiiU
         self.gamesSwitch = gamesSwitch
+        self.gamesSwitch2 = gamesSwitch2
 
     @cached_property
     def id(self):

amiibo/filterable.py

@@ -164,6 +164,10 @@ def filter_game_series_name(self, value):
     def filter_switch_titleid(self, value):
         return lambda x: any(value in game.get("gameID") for game in x.gamesSwitch)
 
+    @filterable('switch2_titleid')
+    def filter_switch2_titleid(self, value):
+        return lambda x: any(value in game.get("gameID") for game in x.gamesSwitch2)
+
     @filterable('wiiu_titleid')
     def filter_wiiu_titleid(self, value):
         return lambda x: any(value in game.get("gameID") for game in x.gamesWiiU)

amiibo/manager.py

@@ -45,7 +45,8 @@ def to_json(self, file='database/amiibo.json'):
                     },
                     'games3DS': amiibo.games3DS,
                     'gamesWiiU': amiibo.gamesWiiU,
-                    'gamesSwitch': amiibo.gamesSwitch
+                    'gamesSwitch': amiibo.gamesSwitch,
+                    'gamesSwitch2': amiibo.gamesSwitch2
                 }
                 for amiibo in self.amiibosfull
             },
@@ -83,7 +84,7 @@ def from_json(self, file='database/amiibo.json', file1='database/games_info.json
                         jp=AmiiboManager._parse_date(amiibo['release']['jp']),
                         eu=AmiiboManager._parse_date(amiibo['release']['eu']),
                         au=AmiiboManager._parse_date(amiibo['release']['au']),
-                ), data1['amiibos'][id_]['games3DS'], data1['amiibos'][id_]['gamesWiiU'], data1['amiibos'][id_]['gamesSwitch'])
+                ), data1['amiibos'][id_]['games3DS'], data1['amiibos'][id_]['gamesWiiU'], data1['amiibos'][id_]['gamesSwitch'], data1['amiibos'][id_]['gamesSwitch2'])
                 for id_, amiibo in data['amiibos'].items()
         )
 
@@ -93,10 +94,16 @@ def from_json(self, file='database/amiibo.json', file1='database/games_info.json
                         jp=AmiiboManager._parse_date(amiibo['release']['jp']),
                         eu=AmiiboManager._parse_date(amiibo['release']['eu']),
                         au=AmiiboManager._parse_date(amiibo['release']['au']),
-                ), data1['amiibos'][id_]['games3DS'], data1['amiibos'][id_]['gamesWiiU'], data1['amiibos'][id_]['gamesSwitch'])
+                ), data1['amiibos'][id_]['games3DS'], data1['amiibos'][id_]['gamesWiiU'], data1['amiibos'][id_]['gamesSwitch'], data1['amiibos'][id_]['gamesSwitch2'])
                 for id_, amiibo in data['amiibos'].items()
         )
         for amiibo in self.amiibosfullwithoutusage:
+            amiibo.gamesSwitch2 = copy.deepcopy(amiibo.gamesSwitch2)
+            for game in amiibo.gamesSwitch2:
+                try:
+                    del game['amiiboUsage']
+                except:
+                    pass
             amiibo.gamesSwitch = copy.deepcopy(amiibo.gamesSwitch)
             for game in amiibo.gamesSwitch:
                 try:
@@ -123,11 +130,12 @@ def from_json(self, file='database/amiibo.json', file1='database/games_info.json
                         jp=self._parse_date(amiibo['release']['jp']),
                         eu=self._parse_date(amiibo['release']['eu']),
                         au=self._parse_date(amiibo['release']['au']),
-                ), None, None, None) # TODO: add custom Amiibo class that doesn't need the games
+                ), None, None, None, None) # TODO: add custom Amiibo class that doesn't need the games
                 for id_, amiibo in data['amiibos'].items()
         )
         for amiibo in self.amiibos:
             try:
+                del amiibo.gamesSwitch2
                 del amiibo.gamesSwitch
                 del amiibo.games3DS
                 del amiibo.gamesWiiU

checkfulldatabase.py

@@ -257,6 +257,7 @@ def validateGamePlatform(platform, key):
 		validateGamePlatform('games3DS', key)
 		validateGamePlatform('gamesWiiU', key)
 		validateGamePlatform('gamesSwitch', key)
+		validateGamePlatform('gamesSwitch2', key)
 	else:
 		printError(1, 'Formatting error on game info key: ' + key)
 

commons/amiibo_json_encounter.py

@@ -30,7 +30,7 @@ def default(self, obj):
                 'release': obj.release
             }
             try:
-                returner.update({'games3DS': obj.games3DS, 'gamesWiiU': obj.gamesWiiU, 'gamesSwitch': obj.gamesSwitch})
+                returner.update({'games3DS': obj.games3DS, 'gamesWiiU': obj.gamesWiiU, 'gamesSwitch': obj.gamesSwitch, 'gamesSwitch2': obj.gamesSwitch2})
             except AttributeError:
                 pass
             return returner