diff --git a/src/Controllers/Common/ProfileController.cs b/src/Controllers/Common/ProfileController.cs index 1c8873e..28cc54d 100644 --- a/src/Controllers/Common/ProfileController.cs +++ b/src/Controllers/Common/ProfileController.cs @@ -155,7 +155,7 @@ public class ProfileController : Controller { FirstName = viking.Name, MultiplayerEnabled = ClientVersion.IsMultiplayerSupported(apiKey), Locale = "en-US", // placeholder - GenderID = viking.Gender, + GenderID = avatarData.GenderType, OpenChatEnabled = true, IsApproved = true, RegistrationDate = new DateTime(DateTime.Now.Ticks), // placeholder diff --git a/src/Model/DBContext.cs b/src/Model/DBContext.cs index 1abaf55..6448fb5 100644 --- a/src/Model/DBContext.cs +++ b/src/Model/DBContext.cs @@ -112,6 +112,9 @@ public class DBContext : DbContext { builder.Entity().HasMany(v => v.GameData) .WithOne(e => e.Viking); + builder.Entity().HasMany(v => v.ProfileAnswers) + .WithOne(e => e.Viking); + // Dragons builder.Entity().HasOne(d => d.Viking) .WithMany(e => e.Dragons) diff --git a/src/Resources/questiondata.xml b/src/Resources/questiondata.xml index 965c1d4..8274cd8 100644 --- a/src/Resources/questiondata.xml +++ b/src/Resources/questiondata.xml @@ -4,7 +4,7 @@ 1 1 - https://jsmedia.alanmoon.net/Content/PlayerData/Favs/IconColor.png + RS_DATA/Content/PlayerData/Favs/IconColor.png true en-US 1 @@ -205,7 +205,7 @@ 1 - https://jsmedia.alanmoon.net/Content/PlayerData/Favs/IconFood.png + RS_DATA/Content/PlayerData/Favs/IconFood.png true en-US 2 @@ -518,7 +518,7 @@ 1 - https://jsmedia.alanmoon.net/Content/PlayerData/Favs/IconMusic.png + RS_DATA/Content/PlayerData/Favs/IconMusic.png true en-US 3 @@ -887,7 +887,7 @@ 1 - https://jsmedia.alanmoon.net/Content/PlayerData/Favs/IconAnimal.png + RS_DATA/Content/PlayerData/Favs/IconAnimal.png true en-US 4 @@ -1168,7 +1168,7 @@ 1 - https://jsmedia.alanmoon.net/Content/PlayerData/Favs/IconMovies.png + RS_DATA/Content/PlayerData/Favs/IconMovies.png true en-US 5 @@ -1313,7 +1313,7 @@ 1 - https://jsmedia.alanmoon.net/Content/PlayerData/Favs/IconSport.png + RS_DATA/Content/PlayerData/Favs/IconSport.png true en-US 6 @@ -1542,7 +1542,7 @@ 227 Boy - https://jsmedia.alanmoon.net/Content/PlayerData/Gender/IconGenderBoy.png + RS_DATA/Content/PlayerData/Gender/IconGenderBoy.png en-US 1 32 @@ -1550,7 +1550,7 @@ 228 Girl - https://jsmedia.alanmoon.net/Content/PlayerData/Gender/IconGenderGirl.png + RS_DATA/Content/PlayerData/Gender/IconGenderGirl.png en-US 2 32 @@ -1567,7 +1567,7 @@ 231 United States - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryUSA.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryUSA.png en-US 1 33 @@ -1575,7 +1575,7 @@ 256 Mexico - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryMexico.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryMexico.png en-US 2 33 @@ -1583,7 +1583,7 @@ 237 Canada - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryCanada.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryCanada.png en-US 3 33 @@ -1591,7 +1591,7 @@ 230 United Kingdom - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryUK.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryUK.png en-US 4 33 @@ -1599,7 +1599,7 @@ 233 Australia - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryAustralia.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryAustralia.png en-US 5 33 @@ -1607,7 +1607,7 @@ 232 Argentina - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryArgentina.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryArgentina.png en-US 6 33 @@ -1615,7 +1615,7 @@ 234 Austria - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryAustria.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryAustria.png en-US 7 33 @@ -1623,7 +1623,7 @@ 235 Belgium - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryBelgium.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryBelgium.png en-US 8 33 @@ -1631,7 +1631,7 @@ 236 Brazil - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryBrazil.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryBrazil.png en-US 9 33 @@ -1639,7 +1639,7 @@ 238 Chile - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryChile.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryChile.png en-US 10 33 @@ -1647,7 +1647,7 @@ 239 China - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryChina.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryChina.png en-US 11 33 @@ -1655,7 +1655,7 @@ 311 Columbia - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryColumbia.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryColumbia.png en-US 12 33 @@ -1663,7 +1663,7 @@ 240 Costa Rica - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryCostaRica.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryCostaRica.png en-US 13 33 @@ -1671,7 +1671,7 @@ 241 Croatia - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryCroatia.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryCroatia.png en-US 14 33 @@ -1679,7 +1679,7 @@ 312 Czech Republic - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryCzechRep.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryCzechRep.png en-US 15 33 @@ -1687,7 +1687,7 @@ 242 Denmark - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryDenmark.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryDenmark.png en-US 16 33 @@ -1695,7 +1695,7 @@ 276 Dominican Republic - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryDomRep.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryDomRep.png en-US 17 33 @@ -1703,7 +1703,7 @@ 313 Ecuador - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryEcuador.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryEcuador.png en-US 18 33 @@ -1711,7 +1711,7 @@ 243 Egypt - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryEgypt.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryEgypt.png en-US 19 33 @@ -1719,7 +1719,7 @@ 244 Finland - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryFinland.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryFinland.png en-US 20 33 @@ -1727,7 +1727,7 @@ 245 France - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryFrance.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryFrance.png en-US 21 33 @@ -1735,7 +1735,7 @@ 246 Germany - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryGermany.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryGermany.png en-US 22 33 @@ -1743,7 +1743,7 @@ 247 Greece - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryGreece.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryGreece.png en-US 23 33 @@ -1751,7 +1751,7 @@ 248 Guam - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryGuam.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryGuam.png en-US 24 33 @@ -1759,7 +1759,7 @@ 249 Guatemala - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryGuatemala.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryGuatemala.png en-US 25 33 @@ -1767,7 +1767,7 @@ 250 Hong Kong - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryHongKong.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryHongKong.png en-US 26 33 @@ -1775,7 +1775,7 @@ 251 Hungary - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryHungary.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryHungary.png en-US 27 33 @@ -1783,7 +1783,7 @@ 277 Iceland - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryIceland.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryIceland.png en-US 28 33 @@ -1791,7 +1791,7 @@ 252 India - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryIndia.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryIndia.png en-US 29 33 @@ -1799,7 +1799,7 @@ 314 Indonesia - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryIndonesia.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryIndonesia.png en-US 30 33 @@ -1807,7 +1807,7 @@ 253 Ireland - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryIreland.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryIreland.png en-US 31 33 @@ -1815,7 +1815,7 @@ 278 Israel - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryIsrael.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryIsrael.png en-US 32 33 @@ -1823,7 +1823,7 @@ 254 Italy - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryItaly.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryItaly.png en-US 33 33 @@ -1831,7 +1831,7 @@ 279 Jamaica - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryJamaica.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryJamaica.png en-US 34 33 @@ -1839,7 +1839,7 @@ 255 Japan - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryJapan.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryJapan.png en-US 35 33 @@ -1847,7 +1847,7 @@ 315 Lithuania - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryLithuania.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryLithuania.png en-US 36 33 @@ -1855,7 +1855,7 @@ 280 Madagascar - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryMadagascar.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryMadagascar.png en-US 37 33 @@ -1863,7 +1863,7 @@ 316 Malaysia - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryMalaysia.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryMalaysia.png en-US 38 33 @@ -1871,7 +1871,7 @@ 317 Morocco - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryMorocco.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryMorocco.png en-US 39 33 @@ -1879,7 +1879,7 @@ 257 Netherlands - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryNetherlands.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryNetherlands.png en-US 40 33 @@ -1887,7 +1887,7 @@ 258 New Zealand - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryNewZ.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryNewZ.png en-US 41 33 @@ -1895,7 +1895,7 @@ 259 Nigeria - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryNigeria.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryNigeria.png en-US 42 33 @@ -1903,7 +1903,7 @@ 281 Norway - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryNorway.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryNorway.png en-US 43 33 @@ -1911,7 +1911,7 @@ 282 Pakistan - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryPakistan.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryPakistan.png en-US 44 33 @@ -1919,7 +1919,7 @@ 283 Paraguay - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryParaguay.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryParaguay.png en-US 45 33 @@ -1927,7 +1927,7 @@ 260 Peru - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryPeru.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryPeru.png en-US 46 33 @@ -1935,7 +1935,7 @@ 261 Philippines - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryPhilippines.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryPhilippines.png en-US 47 33 @@ -1943,7 +1943,7 @@ 262 Poland - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryPoland.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryPoland.png en-US 48 33 @@ -1951,7 +1951,7 @@ 263 Portugal - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryPortugal.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryPortugal.png en-US 49 33 @@ -1959,7 +1959,7 @@ 264 Puerto Rico - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryPuertoRico.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryPuertoRico.png en-US 50 33 @@ -1967,7 +1967,7 @@ 318 Romania - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryRomania.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryRomania.png en-US 51 33 @@ -1975,7 +1975,7 @@ 265 Russia - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryRussia.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryRussia.png en-US 52 33 @@ -1983,7 +1983,7 @@ 284 Saudi Arabia - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountrySaudiA.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountrySaudiA.png en-US 53 33 @@ -1991,7 +1991,7 @@ 266 Singapore - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountrySingapore.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountrySingapore.png en-US 54 33 @@ -1999,7 +1999,7 @@ 285 South Africa - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountrySouthAF.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountrySouthAF.png en-US 55 33 @@ -2007,7 +2007,7 @@ 286 South Korea - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountrySouthK.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountrySouthK.png en-US 56 33 @@ -2015,7 +2015,7 @@ 267 Spain - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountrySpain.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountrySpain.png en-US 57 33 @@ -2023,7 +2023,7 @@ 268 Sweden - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountrySweden.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountrySweden.png en-US 58 33 @@ -2031,7 +2031,7 @@ 269 Switzerland - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountrySwitzer.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountrySwitzer.png en-US 59 33 @@ -2039,7 +2039,7 @@ 270 Taiwan - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryTaiwan.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryTaiwan.png en-US 60 33 @@ -2047,7 +2047,7 @@ 271 Thailand - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryThailand.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryThailand.png en-US 61 33 @@ -2055,7 +2055,7 @@ 272 Turkey - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryTurkey.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryTurkey.png en-US 62 33 @@ -2063,7 +2063,7 @@ 273 Ukraine - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryUkraine.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryUkraine.png en-US 63 33 @@ -2071,7 +2071,7 @@ 274 United Arab Emirates - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryUAE.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryUAE.png en-US 64 33 @@ -2079,7 +2079,7 @@ 287 Uruguay - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryUruguay.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryUruguay.png en-US 65 33 @@ -2087,7 +2087,7 @@ 319 Venezuela - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryVenezuela.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryVenezuela.png en-US 66 33 @@ -2095,7 +2095,7 @@ 275 Vietnam - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoCountryVietnam.png + RS_DATA/Content/PlayerData/CountryFlags/IcoCountryVietnam.png en-US 67 33 @@ -2103,7 +2103,7 @@ 444 Pride - https://jsmedia.alanmoon.net/Content/PlayerData/CountryFlags/IcoPride.png + RS_DATA/Content/PlayerData/CountryFlags/IcoPride.png en-US 68 33 @@ -2120,7 +2120,7 @@ 288 Gleeful - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodGleeful.png + RS_DATA/Content/PlayerData/Mood/IcoMoodGleeful.png en-US 1 34 @@ -2128,7 +2128,7 @@ 289 Furious - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodFurious.png + RS_DATA/Content/PlayerData/Mood/IcoMoodFurious.png en-US 2 34 @@ -2136,7 +2136,7 @@ 290 Fabulous - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodFabulous.png + RS_DATA/Content/PlayerData/Mood/IcoMoodFabulous.png en-US 3 34 @@ -2144,7 +2144,7 @@ 291 Sporty - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodSporty.png + RS_DATA/Content/PlayerData/Mood/IcoMoodSporty.png en-US 4 34 @@ -2152,7 +2152,7 @@ 292 Amped - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodAmped.png + RS_DATA/Content/PlayerData/Mood/IcoMoodAmped.png en-US 5 34 @@ -2160,7 +2160,7 @@ 293 Blah - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodBlah.png + RS_DATA/Content/PlayerData/Mood/IcoMoodBlah.png en-US 6 34 @@ -2168,7 +2168,7 @@ 294 Perplexed - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodPerplexed.png + RS_DATA/Content/PlayerData/Mood/IcoMoodPerplexed.png en-US 7 34 @@ -2176,7 +2176,7 @@ 295 Sleepy - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodSleepy.png + RS_DATA/Content/PlayerData/Mood/IcoMoodSleepy.png en-US 8 34 @@ -2184,7 +2184,7 @@ 296 Embarrassed - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodEmbarrassed.png + RS_DATA/Content/PlayerData/Mood/IcoMoodEmbarrassed.png en-US 9 34 @@ -2192,7 +2192,7 @@ 297 Sassy - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodSassy.png + RS_DATA/Content/PlayerData/Mood/IcoMoodSassy.png en-US 10 34 @@ -2200,7 +2200,7 @@ 298 Amused - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodAmused.png + RS_DATA/Content/PlayerData/Mood/IcoMoodAmused.png en-US 11 34 @@ -2208,7 +2208,7 @@ 299 Tricky - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodTricky.png + RS_DATA/Content/PlayerData/Mood/IcoMoodTricky.png en-US 12 34 @@ -2216,7 +2216,7 @@ 300 Loony - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodLoony.png + RS_DATA/Content/PlayerData/Mood/IcoMoodLoony.png en-US 13 34 @@ -2224,7 +2224,7 @@ 301 Artsy - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodArtsy.png + RS_DATA/Content/PlayerData/Mood/IcoMoodArtsy.png en-US 14 34 @@ -2232,7 +2232,7 @@ 302 Musical - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodMusical.png + RS_DATA/Content/PlayerData/Mood/IcoMoodMusical.png en-US 15 34 @@ -2240,7 +2240,7 @@ 303 Brokenhearted - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodBrokenHearted.png + RS_DATA/Content/PlayerData/Mood/IcoMoodBrokenHearted.png en-US 16 34 @@ -2248,7 +2248,7 @@ 304 Nerdy - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodNerdy.png + RS_DATA/Content/PlayerData/Mood/IcoMoodNerdy.png en-US 17 34 @@ -2256,7 +2256,7 @@ 305 Messy - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodMessy.png + RS_DATA/Content/PlayerData/Mood/IcoMoodMessy.png en-US 18 34 @@ -2264,7 +2264,7 @@ 306 Cheesy - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodCheesy.png + RS_DATA/Content/PlayerData/Mood/IcoMoodCheesy.png en-US 19 34 @@ -2272,7 +2272,7 @@ 307 Brainy - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodBrainy.png + RS_DATA/Content/PlayerData/Mood/IcoMoodBrainy.png en-US 20 34 @@ -2280,7 +2280,7 @@ 308 Happy - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodHappy.png + RS_DATA/Content/PlayerData/Mood/IcoMoodHappy.png en-US 21 34 @@ -2288,7 +2288,7 @@ 309 Sad - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoMoodSad.png + RS_DATA/Content/PlayerData/Mood/IcoMoodSad.png en-US 22 34 @@ -2296,7 +2296,7 @@ 310 Pain - https://jsmedia.alanmoon.net/Content/PlayerData/Mood/IcoPain.png + RS_DATA/Content/PlayerData/Mood/IcoPain.png en-US 23 34 diff --git a/src/Services/ProfileService.cs b/src/Services/ProfileService.cs index 1e0a897..3ebc123 100644 --- a/src/Services/ProfileService.cs +++ b/src/Services/ProfileService.cs @@ -7,10 +7,29 @@ namespace sodoff.Services public class ProfileService { private readonly DBContext ctx; + private List allAnswersFromData; + private List allQuestionsFromData; public ProfileService(DBContext ctx) { this.ctx = ctx; + + ProfileQuestionData questionData = XmlUtil.DeserializeXml(XmlUtil.ReadResourceXmlString("questiondata")); + + allAnswersFromData = new List(); + allQuestionsFromData = new List(); + + foreach(var list in questionData.Lists) + { + foreach(var question in list.Questions) + { + allQuestionsFromData.Add(question); + foreach(var answer in question.Answers) + { + allAnswersFromData.Add(answer); + } + } + } } public bool SetAnswer(Viking viking, int qId, int aId) @@ -28,7 +47,6 @@ namespace sodoff.Services Model.ProfileAnswer answer = new Model.ProfileAnswer { - VikingId = viking.Id, AnswerID = aId, QuestionID = qId, }; @@ -77,30 +95,12 @@ namespace sodoff.Services public ProfileQuestion GetQuestionFromAnswerId(int aId) { - ProfileQuestionData questionData = XmlUtil.DeserializeXml(XmlUtil.ReadResourceXmlString("questiondata")); - - List allAnswersFromData = new List(); - List allQuestionsFromData = new List(); - - foreach(var list in questionData.Lists) - { - foreach(var question in list.Questions) - { - allQuestionsFromData.Add(question); - foreach(var answer in question.Answers) - { - allAnswersFromData.Add(answer); - } - } - } - - Schema.ProfileAnswer profileAnswer = allAnswersFromData.FirstOrDefault(e => e.ID == aId); + Schema.ProfileAnswer? profileAnswer = allAnswersFromData.FirstOrDefault(e => e.ID == aId); if (profileAnswer != null) { - ProfileQuestion questionFromAnswer = allQuestionsFromData.FirstOrDefault(e => e.ID == profileAnswer.QuestionID); - if (questionFromAnswer != null) return questionFromAnswer; - else return null!; + ProfileQuestion? questionFromAnswer = allQuestionsFromData.FirstOrDefault(e => e.ID == profileAnswer.QuestionID); + return questionFromAnswer!; } return null!;