SoDOff-Project/sodoff
1
0
Fork 1
mirror of https://github.com/SoDOff-Project/sodoff.git synced 2025-10-11 08:18:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

do not store item defintion in database for rooms

Browse Source
This commit is contained in:
Robert Paciorek 2025-08-18 19:53:12 +00:00
parent 8d8b9a4566
commit 693a73a71e
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Schema/UserItemPosition.cs
View File

@ -31,8 +31,8 @@ public class UserItemPosition {
[XmlElement(ElementName = "uicid")] [XmlElement(ElementName = "uicid")]
public int? UserInventoryCommonID; public int? UserInventoryCommonID;
[XmlElement(ElementName = "i")] [XmlElement(ElementName = "i", IsNullable = true)]
public ItemData Item; public ItemData? Item;
[XmlElement(ElementName = "px")] [XmlElement(ElementName = "px")]
public double? PositionX; public double? PositionX;

38
src/Services/RoomService.cs
View File

@ -29,15 +29,21 @@ public class RoomService {
List<int> ids = new(); List<int> ids = new();
List<UserItemState> states = new(); List<UserItemState> states = new();
foreach (var itemRequest in roomItemRequest) { foreach (var itemRequest in roomItemRequest) {
ItemData itemData = itemRequest.Item;
// TODO: Remove item from inventory (using CommonInventoryID) // TODO: Remove item from inventory (using CommonInventoryID)
InventoryItem? i = room.Viking?.InventoryItems.FirstOrDefault(x => x.Id == itemRequest.UserInventoryCommonID); InventoryItem? i = room.Viking?.InventoryItems.FirstOrDefault(x => x.Id == itemRequest.UserInventoryCommonID);
if (i != null) { if (i != null) {
i.Quantity--; i.Quantity--;
if (itemRequest.Item is null) { if (itemData is null) {
itemRequest.Item = itemService.GetItem(i.ItemId); itemData = itemService.GetItem(i.ItemId);
} }
} }
// do not store item definition in serialised xml in database (store item id instead)
itemRequest.Item = null;
itemRequest.ItemID = itemData.ItemID;
RoomItem roomItem = new RoomItem { RoomItem roomItem = new RoomItem {
RoomItemData = XmlUtil.SerializeXml<UserItemPosition>(itemRequest).Replace(" xsi:type=\"UserItemPositionSetRequest\"", "") // NOTE: No way to avoid this hack when we're serializing a child class into a base class RoomItemData = XmlUtil.SerializeXml<UserItemPosition>(itemRequest).Replace(" xsi:type=\"UserItemPositionSetRequest\"", "") // NOTE: No way to avoid this hack when we're serializing a child class into a base class
}; };
@ -45,12 +51,12 @@ public class RoomService {
room.Items.Add(roomItem); room.Items.Add(roomItem);
ctx.SaveChanges(); ctx.SaveChanges();
ids.Add(roomItem.Id); ids.Add(roomItem.Id);
if (itemRequest.Item.ItemStates.Count > 0) { if (itemData.ItemStates.Count > 0) {
ItemState defaultState = itemRequest.Item.ItemStates.Find(x => x.Order == 1)!; ItemState defaultState = itemData.ItemStates.Find(x => x.Order == 1)!;
UserItemState userDefaultState = new UserItemState { UserItemState userDefaultState = new UserItemState {
CommonInventoryID = (int)itemRequest.UserInventoryCommonID!, CommonInventoryID = (int)itemRequest.UserInventoryCommonID!,
UserItemPositionID = roomItem.Id, UserItemPositionID = roomItem.Id,
ItemID = (int)itemRequest.Item.ItemID, ItemID = (int)itemData.ItemID,
ItemStateID = defaultState.ItemStateID, ItemStateID = defaultState.ItemStateID,
StateChangeDate = new DateTime(DateTime.Now.Ticks) StateChangeDate = new DateTime(DateTime.Now.Ticks)
}; };
@ -76,7 +82,7 @@ public class RoomService {
if (itemRequest.UserItemState != null) itemPosition.UserItemState = itemRequest.UserItemState; if (itemRequest.UserItemState != null) itemPosition.UserItemState = itemRequest.UserItemState;
if (itemRequest.UserItemAttributes != null) itemPosition.UserItemAttributes = itemRequest.UserItemAttributes; if (itemRequest.UserItemAttributes != null) itemPosition.UserItemAttributes = itemRequest.UserItemAttributes;
if (itemRequest.UserItemStat != null) itemPosition.UserItemStat = itemRequest.UserItemStat; if (itemRequest.UserItemStat != null) itemPosition.UserItemStat = itemRequest.UserItemStat;
if (itemRequest.Item != null) itemPosition.Item = itemRequest.Item; if (itemRequest.Item != null) itemPosition.ItemID = itemRequest.Item.ItemID;
if (itemRequest.PositionX != null) itemPosition.PositionX = itemRequest.PositionX; if (itemRequest.PositionX != null) itemPosition.PositionX = itemRequest.PositionX;
if (itemRequest.PositionY != null) itemPosition.PositionY = itemRequest.PositionY; if (itemRequest.PositionY != null) itemPosition.PositionY = itemRequest.PositionY;
if (itemRequest.PositionZ != null) itemPosition.PositionZ = itemRequest.PositionZ; if (itemRequest.PositionZ != null) itemPosition.PositionZ = itemRequest.PositionZ;
@ -110,7 +116,10 @@ public class RoomService {
foreach (var item in room.Items) { foreach (var item in room.Items) {
UserItemPosition data = XmlUtil.DeserializeXml<UserItemPosition>(item.RoomItemData); UserItemPosition data = XmlUtil.DeserializeXml<UserItemPosition>(item.RoomItemData);
data.UserItemPositionID = item.Id; data.UserItemPositionID = item.Id;
data.ItemID = data.Item?.ItemID; if (data.ItemID is null)
data.ItemID = data.Item?.ItemID; // for backward compatibility with database entries without set `data.ItemID`
else
data.Item = itemService.GetItem((int)data.ItemID);
if (gameVersion < 0xa3a00a0a && data.Uses is null) if (gameVersion < 0xa3a00a0a && data.Uses is null)
data.Uses = -1; data.Uses = -1;
itemPosition.Add(data); itemPosition.Add(data);
@ -123,7 +132,10 @@ public class RoomService {
Success = true, Success = true,
ErrorCode = ItemStateChangeError.Success ErrorCode = ItemStateChangeError.Success
}; };
UserItemPosition pos = XmlUtil.DeserializeXml<UserItemPosition>(item.RoomItemData); UserItemPosition pos = XmlUtil.DeserializeXml<UserItemPosition>(item.RoomItemData);
if (pos.ItemID is null)
pos.ItemID = pos.Item?.ItemID; // for backward compatibility with database entries without set `data.ItemID`
AchievementReward[]? rewards; AchievementReward[]? rewards;
int? achievementID; int? achievementID;
@ -159,7 +171,7 @@ public class RoomService {
response.UserItemState = new UserItemState { response.UserItemState = new UserItemState {
CommonInventoryID = (int)pos.UserInventoryCommonID!, CommonInventoryID = (int)pos.UserInventoryCommonID!,
UserItemPositionID = item.Id, UserItemPositionID = item.Id,
ItemID = pos.Item.ItemID, ItemID = (int)pos.ItemID,
ItemStateID = nextStateID, ItemStateID = nextStateID,
StateChangeDate = stateChange StateChangeDate = stateChange
}; };
@ -177,11 +189,12 @@ public class RoomService {
rewards = null; rewards = null;
achievementID = null; achievementID = null;
consumables = new List<ItemStateCriteria>(); consumables = new List<ItemStateCriteria>();
var itemStates = itemService.GetItem((int)pos.ItemID).ItemStates;
if (pos.UserItemState == null) if (pos.UserItemState == null)
return pos.Item.ItemStates.Find(x => x.Order == 1)!.ItemStateID; return itemStates.Find(x => x.Order == 1)!.ItemStateID;
ItemState currState = pos.Item.ItemStates.Find(x => x.ItemStateID == pos.UserItemState.ItemStateID)!; ItemState currState = itemStates.Find(x => x.ItemStateID == pos.UserItemState.ItemStateID)!;
rewards = currState.Rewards; rewards = currState.Rewards;
consumables = currState.Rule.Criterias.FindAll(x => x.Type == ItemStateCriteriaType.ConsumableItem); consumables = currState.Rule.Criterias.FindAll(x => x.Type == ItemStateCriteriaType.ConsumableItem);
@ -204,12 +217,11 @@ public class RoomService {
switch (currState.Rule.CompletionAction.Transition) { switch (currState.Rule.CompletionAction.Transition) {
default: default:
return pos.Item.ItemStates.Find(x => x.Order == currState.Order + 1)!.ItemStateID; return itemStates.Find(x => x.Order == currState.Order + 1)!.ItemStateID;
case StateTransition.InitialState: case StateTransition.InitialState:
return pos.Item.ItemStates.Find(x => x.Order == 1)!.ItemStateID; return itemStates.Find(x => x.Order == 1)!.ItemStateID;
case StateTransition.Deletion: case StateTransition.Deletion:
return -1; return -1;
} }
} }
} }