mirror of
				https://github.com/Nioux/AideDeJeu.git
				synced 2025-11-04 01:00:23 +00:00 
			
		
		
		
	Ajout nom et id vo dans json h&d
This commit is contained in:
		
							parent
							
								
									9aa9002884
								
							
						
					
					
						commit
						b3405ca541
					
				
					 3 changed files with 10 additions and 2 deletions
				
			
		| 
						 | 
					@ -47,7 +47,7 @@ namespace AideDeJeu.ViewModels
 | 
				
			||||||
            new KeyValuePair<string, string>("abjuration", "Abjuration"),
 | 
					            new KeyValuePair<string, string>("abjuration", "Abjuration"),
 | 
				
			||||||
            new KeyValuePair<string, string>("divination", "Divination"),
 | 
					            new KeyValuePair<string, string>("divination", "Divination"),
 | 
				
			||||||
            new KeyValuePair<string, string>("enchantement", "Enchantement"),
 | 
					            new KeyValuePair<string, string>("enchantement", "Enchantement"),
 | 
				
			||||||
            new KeyValuePair<string, string>("vocation", "Évocation"),
 | 
					            new KeyValuePair<string, string>("évocation", "Évocation"),
 | 
				
			||||||
            new KeyValuePair<string, string>("illusion", "Illusion"),
 | 
					            new KeyValuePair<string, string>("illusion", "Illusion"),
 | 
				
			||||||
            new KeyValuePair<string, string>("invocation", "Invocation"),
 | 
					            new KeyValuePair<string, string>("invocation", "Invocation"),
 | 
				
			||||||
            new KeyValuePair<string, string>("cromancie", "Nécromancie"),
 | 
					            new KeyValuePair<string, string>("cromancie", "Nécromancie"),
 | 
				
			||||||
| 
						 | 
					@ -190,6 +190,8 @@ namespace AideDeJeu.ViewModels
 | 
				
			||||||
                    var assembly = typeof(AboutViewModel).GetTypeInfo().Assembly;
 | 
					                    var assembly = typeof(AboutViewModel).GetTypeInfo().Assembly;
 | 
				
			||||||
                    //var names = assembly.GetManifestResourceNames();
 | 
					                    //var names = assembly.GetManifestResourceNames();
 | 
				
			||||||
                    using (var stream = assembly.GetManifestResourceStream("AideDeJeu.Data.spells_hd.json"))
 | 
					                    using (var stream = assembly.GetManifestResourceStream("AideDeJeu.Data.spells_hd.json"))
 | 
				
			||||||
 | 
					                    //using (var stream = assembly.GetManifestResourceStream("AideDeJeu.Data.spells_vf.json"))
 | 
				
			||||||
 | 
					                    //using (var stream = assembly.GetManifestResourceStream("AideDeJeu.Data.spells_vo.json"))
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        _AllSpells = serializer.ReadObject(stream) as IEnumerable<Spell>;
 | 
					                        _AllSpells = serializer.ReadObject(stream) as IEnumerable<Spell>;
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -100,6 +100,12 @@ namespace AideDeJeuCmd
 | 
				
			||||||
                            if(spVF.Source.Contains("(SRD)"))
 | 
					                            if(spVF.Source.Contains("(SRD)"))
 | 
				
			||||||
                            {
 | 
					                            {
 | 
				
			||||||
                                spell.Source += "(SRD)";
 | 
					                                spell.Source += "(SRD)";
 | 
				
			||||||
 | 
					                                var spVO = spellsVO.SingleOrDefault(sp => sp.IdVO == spVF.IdVO);
 | 
				
			||||||
 | 
					                                if (spVO != null)
 | 
				
			||||||
 | 
					                                {
 | 
				
			||||||
 | 
					                                    spell.NameVO = spVO.Name;
 | 
				
			||||||
 | 
					                                    spell.IdVO = spVO.IdVO;
 | 
				
			||||||
 | 
					                                }
 | 
				
			||||||
                            }
 | 
					                            }
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
                        foreach (var spellList in spellLists)
 | 
					                        foreach (var spellList in spellLists)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue