Fix json spoiler serialization
Correct shop spoiler Adjust cases for main spoiler sections
This commit is contained in:
		
							parent
							
								
									5d149cabc7
								
							
						
					
					
						commit
						4c6a140af9
					
				| 
						 | 
					@ -881,7 +881,7 @@ class Spoiler(object):
 | 
				
			||||||
            for index, item in enumerate(shop.inventory):
 | 
					            for index, item in enumerate(shop.inventory):
 | 
				
			||||||
                if item is None:
 | 
					                if item is None:
 | 
				
			||||||
                    continue
 | 
					                    continue
 | 
				
			||||||
                shopdata['item_{}'.format(index)] = "{} ({})".format(item['item'], item['price']) if item['price'] else item['item']
 | 
					                shopdata['item_{}'.format(index)] = "{} — {}".format(item['item'], item['price']) if item['price'] else item['item']
 | 
				
			||||||
            self.shops.append(shopdata)
 | 
					            self.shops.append(shopdata)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -906,10 +906,11 @@ class Spoiler(object):
 | 
				
			||||||
    def to_json(self):
 | 
					    def to_json(self):
 | 
				
			||||||
        self.parse_data()
 | 
					        self.parse_data()
 | 
				
			||||||
        out = OrderedDict()
 | 
					        out = OrderedDict()
 | 
				
			||||||
        out['entrances'] = self.entrances.values()
 | 
					        out['Entrances'] = list(self.entrances.values())
 | 
				
			||||||
        out.update(self.locations)
 | 
					        out.update(self.locations)
 | 
				
			||||||
        out['medallions'] = self.medallions
 | 
					        out['Special'] = self.medallions
 | 
				
			||||||
        out['shops'] = self.shops
 | 
					        if self.shops:
 | 
				
			||||||
 | 
					            out['Shops'] = self.shops
 | 
				
			||||||
        out['playthrough'] = self.playthrough
 | 
					        out['playthrough'] = self.playthrough
 | 
				
			||||||
        out['paths'] = self.paths
 | 
					        out['paths'] = self.paths
 | 
				
			||||||
        out['meta'] = self.metadata
 | 
					        out['meta'] = self.metadata
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue