Compare commits

..

No commits in common. "226e524f37e3e5608f38e8da0d27601b795a9200" and "b4d6c201afd3843e0141bdfacc1614054bc79d60" have entirely different histories.

5 changed files with 3 additions and 8 deletions

View File

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

View File

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

View File

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

View File

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

View File

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