merge upstream

src/Controllers/Common/RatingController.cs

@@ -240,6 +240,7 @@ public class RatingController : Controller
         return ctx.RatingRanks
             .Where(rr => categoryID == rr.CategoryID)
             .Take(numberOfRecord)
+            .ToList()
             .Select(rr => new RatingRankInfo(rr))
             .ToArray();
     }
@@ -255,6 +256,7 @@ public class RatingController : Controller
                 ))
                 .OrderBy(rr => rr.Rank)
                 .Take(numberOfRecord)
+                .ToList()
                 .Select(rr => new UserRatingRankInfo { RankInfo = new RatingRankInfo(rr), RatedUserID = new Guid(rr.RatedUserID) })
                 .ToArray()
         });

src/Resources/achievements/achievementtaskinfo_wojs.xml

@@ -14080,6 +14080,7 @@
       <atid xmlns="">36</atid>
     </AchieventTaskReward>
   </AchievementTaskInfo>
+  <!-- this caused issue with "collect the spark berries" task on WoJS 1.1
   <AchievementTaskInfo>
     <AchievementInfoID>265</AchievementInfoID>
     <AchievementTaskID>37</AchievementTaskID>
@@ -14300,6 +14301,7 @@
       <atid xmlns="">37</atid>
     </AchieventTaskReward>
   </AchievementTaskInfo>
+  -->
   <AchievementTaskInfo>
     <AchievementInfoID>269</AchievementInfoID>
     <AchievementTaskID>38</AchievementTaskID>

src/Services/AchievementService.cs

@@ -160,13 +160,13 @@ namespace sodoff.Services {
             AchievementTaskState? achievementTaskState = viking.AchievementTaskStates.FirstOrDefault(x => x.TaskId == taskID);
             int pointValue = (achievementTaskState?.Points ?? 0);
             var achievementInfo = achievementStore.GetAchievementTaskInfo(taskID, gameVersion, pointValue);
-            var lastLevelCompleted = false;
+            var lastLevelCompleted = true;
 
             if (achievementInfo == null) return new AchievementTaskSetResponse();
 
             if (pointValue < achievementInfo.PointValue) { // limit points stored value to max points value in achievement tasks
                 pointValue += 1;
-                lastLevelCompleted = true;
+                lastLevelCompleted = false;
             }
 
             var rewards = (achievementInfo.Reproducible || pointValue == achievementInfo.PointValue)

src/Services/ModdingService.cs

@@ -38,7 +38,7 @@ public class ModdingService {
                         
                         try {
                             itemsToUpdate.Add((int)itemID, item);
-                            if (item.stores != null && (item.action == ModAction.Add || item.action == ModAction.Default)) {
+                            if (item.stores != null && (item.action != ModAction.Remove)) {
                                 foreach (int storeID in item.stores) {
                                     try {
                                         itemsInStore[storeID].Add((int)itemID);

src/Services/StoreService.cs

@@ -29,6 +29,7 @@ public class StoreService {
             }
             foreach (int itemID in moddingService.GetStoreItem(s.Id)) {
                 ItemData item = itemService.GetItem(itemID);
+                if (itemsList.Contains(item)) continue;
                 itemsList.Add(item);
                 UpdateItemSaleModifier(item, memberSales, normalSales);
             }