Update to latest decoded packets#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AngeloTadeucci merged 1 commit into from
Oct 30, 2022
Merged

Update to latest decoded packets #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 76 additions & 23 deletions PacketToSQL/Program.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,29 +104,81 @@ Shop ReadShop(MaplePacket packet)
int id = packet.ReadInt();
long nextRestock = packet.ReadLong();
packet.ReadInt();
packet.ReadShort();
int itemCount = packet.ReadShort();
int category = packet.ReadInt();
packet.ReadBool();
bool restrictSales = packet.ReadBool();
bool openWallet = packet.ReadBool();
bool disableBuyBack = packet.ReadBool();
bool canRestock = packet.ReadBool();
packet.ReadBool();
bool randomizeOrder = packet.ReadBool();
ShopType shopType = (ShopType) packet.ReadByte();
bool allowBuyback = packet.ReadBool();
packet.ReadBool();
packet.ReadBool();
bool hideUnuseable = packet.ReadBool();
bool hideStats = packet.ReadBool();
packet.ReadBool();
bool displayNew = packet.ReadBool();
string name = packet.ReadString();
byte restockCurrencyType = 0;
byte excessRestockCurrencyType = 0;
int restockCost = 0;
bool enableRestockCostMultiplier = false;
int totalRestockCount = 0;
byte restockInterval = 0;
bool disableInstantRestock = false;
bool persistantInventory = false;
int pullCount = 0;
int restockMinInterval = 0;

if (canRestock)
{
restockCurrencyType = packet.ReadByte();
excessRestockCurrencyType = packet.ReadByte();
restockCost = packet.ReadInt();
enableRestockCostMultiplier = packet.ReadBool();
totalRestockCount = packet.ReadInt();
restockInterval = packet.ReadByte();
disableInstantRestock = packet.ReadBool();
persistantInventory = packet.ReadBool();
pullCount = itemCount;
restockMinInterval = restockInterval switch
{
0 => // minutes
1,
1 => // days
1440,
2 => // weeks
10080,
3 => 43200,
_ => restockMinInterval
};
}
else
{
nextRestock = 0;
}

return new()
{
AllowBuyback = allowBuyback,
HideUnuseable = hideUnuseable,
CanRestock = canRestock,
Category = category,
Id = id,
Name = name,
NextRestock = nextRestock,
RestrictSales = restrictSales,
ShopType = shopType
DisableBuyback = disableBuyBack,
ShopType = shopType,
OpenWallet = openWallet,
RandomizeOrder = randomizeOrder,
HideStats = hideStats,
DisplayNew = displayNew,
RestockCurrencyType = restockCurrencyType,
ExcessRestockCurrencyType = excessRestockCurrencyType,
RestockCost = restockCost,
EnableRestockCostMultiplier = enableRestockCostMultiplier,
TotalRestockCount = totalRestockCount,
RestockInterval = restockInterval,
DisableInstantRestock = disableInstantRestock,
PersistantInventory = persistantInventory,
PullCount = pullCount,
RestockMinInterval = restockMinInterval
};
}

Expand DownExpand Up@@ -172,8 +224,10 @@ async void CreateShopSqlFile(Shop shop)

string[] lines =
{
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.RestrictSales ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, " +
$"1630605560, {(shop.AllowBuyback ? "1" : "0")}),",
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.HideUnuseable ? "1" : "0")}, {(shop.HideStats ? "1" : "0")}, " +
$"{(shop.DisableBuyback ? "1" : "0")}, {(shop.OpenWallet ? "1" : "0")}, {(shop.DisplayNew ? "1" : "0")}, {(shop.RandomizeOrder ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, {shop.NextRestock}, {shop.RestockMinInterval}, " +
$"{shop.RestockInterval}, {shop.RestockCurrencyType}, {shop.ExcessRestockCurrencyType}, {shop.RestockCost}, {(shop.EnableRestockCostMultiplier ? "1" : "0")}, " +
$"{(shop.DisableInstantRestock ? "1" : "0")}, {(shop.PersistantInventory ? "1" : "0")}, {shop.PullCount})," +
"" // new line
};

Expand All@@ -195,12 +249,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)
File.WriteAllLines(shopsItemsFilePath, new[]
{
"-- SQL File created by PacketToSQL app by tDcc#0568",
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `flag`, `guild_trophy`, `item_id`, `item_rank`, `price`,
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `label`, `guild_trophy`, `item_id`, `rarity`, `price`,
`quantity`, `required_achievement_grade`, `required_achievement_id`,
`required_championship_grade`, `required_championship_join_count`, `required_fame_grade`,
`required_guild_merchant_level`, `required_guild_merchant_type`, `required_item_id`,
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `stock_purchased`,
`template_name`, `token_type`)
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `currency_id`, `currency_type`)
VALUES"
});
}
Expand All@@ -214,11 +267,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)

foreach (ShopItem shopItem in items)
{
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Flag}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.ItemRank}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Label}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.Rarity}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
$"{shopItem.RequiredChampionshipGrade}, {shopItem.RequiredChampionshipJoinCount}, {shopItem.RequiredFameGrade}, " +
$"{shopItem.RequiredGuildMerchantLevel}, {shopItem.RequiredGuildMerchantType}, {shopItem.RequiredItemId}, {shopItem.RequiredQuestAlliance}, " +
$"{shopItem.SalePrice}, {shopId}, 0, 0, '{shopItem.TemplateName}', {(int) shopItem.TokenType}),");
$"{shopItem.SalePrice}, {shopId}, {shopItem.StockCount}, '{shopItem.CurrencyId}', {(int) shopItem.CurrencyType}),");
}

lines.Add("");
Expand DownExpand Up@@ -255,7 +308,7 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
short quantity = maplePacket.ReadShort();
maplePacket.ReadByte();
byte flag = maplePacket.ReadByte();
string templateName = maplePacket.ReadString();
string currencyId = maplePacket.ReadString();
short requiredQuestAlliance = maplePacket.ReadShort();
int requiredFameGrade = maplePacket.ReadInt();
bool autoPreviewEquip = maplePacket.ReadBool();
Expand All@@ -264,10 +317,10 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
{
AutoPreviewEquip = autoPreviewEquip,
Category = category,
Flag = (ShopItemFlag) flag,
Label = (ShopItemLabel) flag,
GuildTrophy = guildTrophy,
ItemId = itemId,
ItemRank = itemRank,
Rarity = itemRank,
Price = price,
RequiredAchievementGrade = requiredAchievementGrade,
RequiredAchievementId = requiredAchievementId,
Expand All@@ -281,8 +334,8 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
SalePrice = salePrice,
StockCount = stockCount,
StockPurchased = stockPurchased,
TemplateName = templateName,
TokenType = (ShopCurrencyType) tokenType,
CurrencyId = currencyId,
CurrencyType = (ShopCurrencyType) tokenType,
Quantity = quantity
};
}
54 changes: 34 additions & 20 deletions PacketToSQL/Types/Shop.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,29 @@

public class Shop
{
public int Id { get; set; }
public int Category { get; set; }
public string Name { get; set; }
public ShopType ShopType { get; set; }
public bool RestrictSales { get; set; }
public bool CanRestock { get; set; }
public long NextRestock { get; set; }
public bool AllowBuyback { get; set; }
public List<ShopItem> Items { get; set; }
public int Id;
public int Category;
public string Name;
public ShopType ShopType;
public bool HideUnuseable;
public bool HideStats;
public bool DisableBuyback;
public bool OpenWallet;
public bool DisplayNew;
public bool RandomizeOrder;
public bool CanRestock;
public long NextRestock;
public int RestockMinInterval;
public byte RestockInterval;
public byte RestockCurrencyType;
public byte ExcessRestockCurrencyType;
public int RestockCost;
public bool EnableRestockCostMultiplier;
public int TotalRestockCount;
public bool DisableInstantRestock;
public bool PersistantInventory;
public int PullCount;
public List<ShopItem> Items;

public Shop() { }

Expand All@@ -20,22 +34,22 @@ public Shop(int id, int category, string name, byte shop_type, bool restrict_sal
Category = category;
Name = name;
ShopType = (ShopType) shop_type;
RestrictSales = restrict_sales;
DisableBuyback = restrict_sales;
CanRestock = can_restock;
NextRestock = next_restock;
AllowBuyback = allow_buyback;
HideUnuseable = allow_buyback;
}
}

public class ShopItem
{
public int Uid;
public int ItemId;
public ShopCurrencyType TokenType;
public ShopCurrencyType CurrencyType;
public int RequiredItemId;
public int Price;
public int SalePrice;
public byte ItemRank;
public byte Rarity;
public int StockCount;
public int StockPurchased;
public int GuildTrophy;
Expand All@@ -47,8 +61,8 @@ public class ShopItem
public byte RequiredGuildMerchantType;
public short RequiredGuildMerchantLevel;
public short Quantity;
public ShopItemFlag Flag;
public string TemplateName;
public ShopItemLabel Label;
public string CurrencyId;
public short RequiredQuestAlliance;
public int RequiredFameGrade;
public bool AutoPreviewEquip;
Expand All@@ -60,10 +74,10 @@ public ShopItem(dynamic data)
Uid = data.uid;
AutoPreviewEquip = data.auto_preview_equip;
Category = data.category;
Flag = (ShopItemFlag) data.flag;
Label = (ShopItemLabel) data.label;
GuildTrophy = data.guild_trophy;
ItemId = data.item_id;
ItemRank = data.item_rank;
Rarity = data.rarity;
Price = data.price;
RequiredAchievementGrade = data.required_achievement_grade;
RequiredAchievementId = data.required_achievement_id;
Expand All@@ -77,8 +91,8 @@ public ShopItem(dynamic data)
SalePrice = data.sale_price;
StockCount = data.stock_count;
StockPurchased = data.stock_purchased;
TemplateName = data.template_name;
TokenType = (ShopCurrencyType) data.token_type;
CurrencyId = data.template_name;
CurrencyType = (ShopCurrencyType) data.currency_type;
Quantity = data.quantity;
}
}
Expand DownExpand Up@@ -110,7 +124,7 @@ public enum ShopType : byte
Capsule = 4
}

public enum ShopItemFlag : byte
public enum ShopItemLabel : byte
{
None = 0,
New = 1,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Update to latest decoded packets#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AngeloTadeucci merged 1 commit into from
Oct 30, 2022
Merged

Update to latest decoded packets #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 76 additions & 23 deletions PacketToSQL/Program.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,29 +104,81 @@ Shop ReadShop(MaplePacket packet)
int id = packet.ReadInt();
long nextRestock = packet.ReadLong();
packet.ReadInt();
packet.ReadShort();
int itemCount = packet.ReadShort();
int category = packet.ReadInt();
packet.ReadBool();
bool restrictSales = packet.ReadBool();
bool openWallet = packet.ReadBool();
bool disableBuyBack = packet.ReadBool();
bool canRestock = packet.ReadBool();
packet.ReadBool();
bool randomizeOrder = packet.ReadBool();
ShopType shopType = (ShopType) packet.ReadByte();
bool allowBuyback = packet.ReadBool();
packet.ReadBool();
packet.ReadBool();
bool hideUnuseable = packet.ReadBool();
bool hideStats = packet.ReadBool();
packet.ReadBool();
bool displayNew = packet.ReadBool();
string name = packet.ReadString();
byte restockCurrencyType = 0;
byte excessRestockCurrencyType = 0;
int restockCost = 0;
bool enableRestockCostMultiplier = false;
int totalRestockCount = 0;
byte restockInterval = 0;
bool disableInstantRestock = false;
bool persistantInventory = false;
int pullCount = 0;
int restockMinInterval = 0;

if (canRestock)
{
restockCurrencyType = packet.ReadByte();
excessRestockCurrencyType = packet.ReadByte();
restockCost = packet.ReadInt();
enableRestockCostMultiplier = packet.ReadBool();
totalRestockCount = packet.ReadInt();
restockInterval = packet.ReadByte();
disableInstantRestock = packet.ReadBool();
persistantInventory = packet.ReadBool();
pullCount = itemCount;
restockMinInterval = restockInterval switch
{
0 => // minutes
1,
1 => // days
1440,
2 => // weeks
10080,
3 => 43200,
_ => restockMinInterval
};
}
else
{
nextRestock = 0;
}

return new()
{
AllowBuyback = allowBuyback,
HideUnuseable = hideUnuseable,
CanRestock = canRestock,
Category = category,
Id = id,
Name = name,
NextRestock = nextRestock,
RestrictSales = restrictSales,
ShopType = shopType
DisableBuyback = disableBuyBack,
ShopType = shopType,
OpenWallet = openWallet,
RandomizeOrder = randomizeOrder,
HideStats = hideStats,
DisplayNew = displayNew,
RestockCurrencyType = restockCurrencyType,
ExcessRestockCurrencyType = excessRestockCurrencyType,
RestockCost = restockCost,
EnableRestockCostMultiplier = enableRestockCostMultiplier,
TotalRestockCount = totalRestockCount,
RestockInterval = restockInterval,
DisableInstantRestock = disableInstantRestock,
PersistantInventory = persistantInventory,
PullCount = pullCount,
RestockMinInterval = restockMinInterval
};
}

Expand DownExpand Up@@ -172,8 +224,10 @@ async void CreateShopSqlFile(Shop shop)

string[] lines =
{
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.RestrictSales ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, " +
$"1630605560, {(shop.AllowBuyback ? "1" : "0")}),",
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.HideUnuseable ? "1" : "0")}, {(shop.HideStats ? "1" : "0")}, " +
$"{(shop.DisableBuyback ? "1" : "0")}, {(shop.OpenWallet ? "1" : "0")}, {(shop.DisplayNew ? "1" : "0")}, {(shop.RandomizeOrder ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, {shop.NextRestock}, {shop.RestockMinInterval}, " +
$"{shop.RestockInterval}, {shop.RestockCurrencyType}, {shop.ExcessRestockCurrencyType}, {shop.RestockCost}, {(shop.EnableRestockCostMultiplier ? "1" : "0")}, " +
$"{(shop.DisableInstantRestock ? "1" : "0")}, {(shop.PersistantInventory ? "1" : "0")}, {shop.PullCount})," +
"" // new line
};

Expand All@@ -195,12 +249,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)
File.WriteAllLines(shopsItemsFilePath, new[]
{
"-- SQL File created by PacketToSQL app by tDcc#0568",
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `flag`, `guild_trophy`, `item_id`, `item_rank`, `price`,
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `label`, `guild_trophy`, `item_id`, `rarity`, `price`,
`quantity`, `required_achievement_grade`, `required_achievement_id`,
`required_championship_grade`, `required_championship_join_count`, `required_fame_grade`,
`required_guild_merchant_level`, `required_guild_merchant_type`, `required_item_id`,
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `stock_purchased`,
`template_name`, `token_type`)
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `currency_id`, `currency_type`)
VALUES"
});
}
Expand All@@ -214,11 +267,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)

foreach (ShopItem shopItem in items)
{
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Flag}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.ItemRank}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Label}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.Rarity}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
$"{shopItem.RequiredChampionshipGrade}, {shopItem.RequiredChampionshipJoinCount}, {shopItem.RequiredFameGrade}, " +
$"{shopItem.RequiredGuildMerchantLevel}, {shopItem.RequiredGuildMerchantType}, {shopItem.RequiredItemId}, {shopItem.RequiredQuestAlliance}, " +
$"{shopItem.SalePrice}, {shopId}, 0, 0, '{shopItem.TemplateName}', {(int) shopItem.TokenType}),");
$"{shopItem.SalePrice}, {shopId}, {shopItem.StockCount}, '{shopItem.CurrencyId}', {(int) shopItem.CurrencyType}),");
}

lines.Add("");
Expand DownExpand Up@@ -255,7 +308,7 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
short quantity = maplePacket.ReadShort();
maplePacket.ReadByte();
byte flag = maplePacket.ReadByte();
string templateName = maplePacket.ReadString();
string currencyId = maplePacket.ReadString();
short requiredQuestAlliance = maplePacket.ReadShort();
int requiredFameGrade = maplePacket.ReadInt();
bool autoPreviewEquip = maplePacket.ReadBool();
Expand All@@ -264,10 +317,10 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
{
AutoPreviewEquip = autoPreviewEquip,
Category = category,
Flag = (ShopItemFlag) flag,
Label = (ShopItemLabel) flag,
GuildTrophy = guildTrophy,
ItemId = itemId,
ItemRank = itemRank,
Rarity = itemRank,
Price = price,
RequiredAchievementGrade = requiredAchievementGrade,
RequiredAchievementId = requiredAchievementId,
Expand All@@ -281,8 +334,8 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
SalePrice = salePrice,
StockCount = stockCount,
StockPurchased = stockPurchased,
TemplateName = templateName,
TokenType = (ShopCurrencyType) tokenType,
CurrencyId = currencyId,
CurrencyType = (ShopCurrencyType) tokenType,
Quantity = quantity
};
}
54 changes: 34 additions & 20 deletions PacketToSQL/Types/Shop.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,29 @@

public class Shop
{
public int Id { get; set; }
public int Category { get; set; }
public string Name { get; set; }
public ShopType ShopType { get; set; }
public bool RestrictSales { get; set; }
public bool CanRestock { get; set; }
public long NextRestock { get; set; }
public bool AllowBuyback { get; set; }
public List<ShopItem> Items { get; set; }
public int Id;
public int Category;
public string Name;
public ShopType ShopType;
public bool HideUnuseable;
public bool HideStats;
public bool DisableBuyback;
public bool OpenWallet;
public bool DisplayNew;
public bool RandomizeOrder;
public bool CanRestock;
public long NextRestock;
public int RestockMinInterval;
public byte RestockInterval;
public byte RestockCurrencyType;
public byte ExcessRestockCurrencyType;
public int RestockCost;
public bool EnableRestockCostMultiplier;
public int TotalRestockCount;
public bool DisableInstantRestock;
public bool PersistantInventory;
public int PullCount;
public List<ShopItem> Items;

public Shop() { }

Expand All@@ -20,22 +34,22 @@ public Shop(int id, int category, string name, byte shop_type, bool restrict_sal
Category = category;
Name = name;
ShopType = (ShopType) shop_type;
RestrictSales = restrict_sales;
DisableBuyback = restrict_sales;
CanRestock = can_restock;
NextRestock = next_restock;
AllowBuyback = allow_buyback;
HideUnuseable = allow_buyback;
}
}

public class ShopItem
{
public int Uid;
public int ItemId;
public ShopCurrencyType TokenType;
public ShopCurrencyType CurrencyType;
public int RequiredItemId;
public int Price;
public int SalePrice;
public byte ItemRank;
public byte Rarity;
public int StockCount;
public int StockPurchased;
public int GuildTrophy;
Expand All@@ -47,8 +61,8 @@ public class ShopItem
public byte RequiredGuildMerchantType;
public short RequiredGuildMerchantLevel;
public short Quantity;
public ShopItemFlag Flag;
public string TemplateName;
public ShopItemLabel Label;
public string CurrencyId;
public short RequiredQuestAlliance;
public int RequiredFameGrade;
public bool AutoPreviewEquip;
Expand All@@ -60,10 +74,10 @@ public ShopItem(dynamic data)
Uid = data.uid;
AutoPreviewEquip = data.auto_preview_equip;
Category = data.category;
Flag = (ShopItemFlag) data.flag;
Label = (ShopItemLabel) data.label;
GuildTrophy = data.guild_trophy;
ItemId = data.item_id;
ItemRank = data.item_rank;
Rarity = data.rarity;
Price = data.price;
RequiredAchievementGrade = data.required_achievement_grade;
RequiredAchievementId = data.required_achievement_id;
Expand All@@ -77,8 +91,8 @@ public ShopItem(dynamic data)
SalePrice = data.sale_price;
StockCount = data.stock_count;
StockPurchased = data.stock_purchased;
TemplateName = data.template_name;
TokenType = (ShopCurrencyType) data.token_type;
CurrencyId = data.template_name;
CurrencyType = (ShopCurrencyType) data.currency_type;
Quantity = data.quantity;
}
}
Expand DownExpand Up@@ -110,7 +124,7 @@ public enum ShopType : byte
Capsule = 4
}

public enum ShopItemFlag : byte
public enum ShopItemLabel : byte
{
None = 0,
New = 1,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Update to latest decoded packets#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AngeloTadeucci merged 1 commit into from
Oct 30, 2022
Merged

Update to latest decoded packets #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 76 additions & 23 deletions PacketToSQL/Program.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,29 +104,81 @@ Shop ReadShop(MaplePacket packet)
int id = packet.ReadInt();
long nextRestock = packet.ReadLong();
packet.ReadInt();
packet.ReadShort();
int itemCount = packet.ReadShort();
int category = packet.ReadInt();
packet.ReadBool();
bool restrictSales = packet.ReadBool();
bool openWallet = packet.ReadBool();
bool disableBuyBack = packet.ReadBool();
bool canRestock = packet.ReadBool();
packet.ReadBool();
bool randomizeOrder = packet.ReadBool();
ShopType shopType = (ShopType) packet.ReadByte();
bool allowBuyback = packet.ReadBool();
packet.ReadBool();
packet.ReadBool();
bool hideUnuseable = packet.ReadBool();
bool hideStats = packet.ReadBool();
packet.ReadBool();
bool displayNew = packet.ReadBool();
string name = packet.ReadString();
byte restockCurrencyType = 0;
byte excessRestockCurrencyType = 0;
int restockCost = 0;
bool enableRestockCostMultiplier = false;
int totalRestockCount = 0;
byte restockInterval = 0;
bool disableInstantRestock = false;
bool persistantInventory = false;
int pullCount = 0;
int restockMinInterval = 0;

if (canRestock)
{
restockCurrencyType = packet.ReadByte();
excessRestockCurrencyType = packet.ReadByte();
restockCost = packet.ReadInt();
enableRestockCostMultiplier = packet.ReadBool();
totalRestockCount = packet.ReadInt();
restockInterval = packet.ReadByte();
disableInstantRestock = packet.ReadBool();
persistantInventory = packet.ReadBool();
pullCount = itemCount;
restockMinInterval = restockInterval switch
{
0 => // minutes
1,
1 => // days
1440,
2 => // weeks
10080,
3 => 43200,
_ => restockMinInterval
};
}
else
{
nextRestock = 0;
}

return new()
{
AllowBuyback = allowBuyback,
HideUnuseable = hideUnuseable,
CanRestock = canRestock,
Category = category,
Id = id,
Name = name,
NextRestock = nextRestock,
RestrictSales = restrictSales,
ShopType = shopType
DisableBuyback = disableBuyBack,
ShopType = shopType,
OpenWallet = openWallet,
RandomizeOrder = randomizeOrder,
HideStats = hideStats,
DisplayNew = displayNew,
RestockCurrencyType = restockCurrencyType,
ExcessRestockCurrencyType = excessRestockCurrencyType,
RestockCost = restockCost,
EnableRestockCostMultiplier = enableRestockCostMultiplier,
TotalRestockCount = totalRestockCount,
RestockInterval = restockInterval,
DisableInstantRestock = disableInstantRestock,
PersistantInventory = persistantInventory,
PullCount = pullCount,
RestockMinInterval = restockMinInterval
};
}

Expand DownExpand Up@@ -172,8 +224,10 @@ async void CreateShopSqlFile(Shop shop)

string[] lines =
{
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.RestrictSales ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, " +
$"1630605560, {(shop.AllowBuyback ? "1" : "0")}),",
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.HideUnuseable ? "1" : "0")}, {(shop.HideStats ? "1" : "0")}, " +
$"{(shop.DisableBuyback ? "1" : "0")}, {(shop.OpenWallet ? "1" : "0")}, {(shop.DisplayNew ? "1" : "0")}, {(shop.RandomizeOrder ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, {shop.NextRestock}, {shop.RestockMinInterval}, " +
$"{shop.RestockInterval}, {shop.RestockCurrencyType}, {shop.ExcessRestockCurrencyType}, {shop.RestockCost}, {(shop.EnableRestockCostMultiplier ? "1" : "0")}, " +
$"{(shop.DisableInstantRestock ? "1" : "0")}, {(shop.PersistantInventory ? "1" : "0")}, {shop.PullCount})," +
"" // new line
};

Expand All@@ -195,12 +249,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)
File.WriteAllLines(shopsItemsFilePath, new[]
{
"-- SQL File created by PacketToSQL app by tDcc#0568",
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `flag`, `guild_trophy`, `item_id`, `item_rank`, `price`,
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `label`, `guild_trophy`, `item_id`, `rarity`, `price`,
`quantity`, `required_achievement_grade`, `required_achievement_id`,
`required_championship_grade`, `required_championship_join_count`, `required_fame_grade`,
`required_guild_merchant_level`, `required_guild_merchant_type`, `required_item_id`,
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `stock_purchased`,
`template_name`, `token_type`)
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `currency_id`, `currency_type`)
VALUES"
});
}
Expand All@@ -214,11 +267,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)

foreach (ShopItem shopItem in items)
{
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Flag}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.ItemRank}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Label}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.Rarity}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
$"{shopItem.RequiredChampionshipGrade}, {shopItem.RequiredChampionshipJoinCount}, {shopItem.RequiredFameGrade}, " +
$"{shopItem.RequiredGuildMerchantLevel}, {shopItem.RequiredGuildMerchantType}, {shopItem.RequiredItemId}, {shopItem.RequiredQuestAlliance}, " +
$"{shopItem.SalePrice}, {shopId}, 0, 0, '{shopItem.TemplateName}', {(int) shopItem.TokenType}),");
$"{shopItem.SalePrice}, {shopId}, {shopItem.StockCount}, '{shopItem.CurrencyId}', {(int) shopItem.CurrencyType}),");
}

lines.Add("");
Expand DownExpand Up@@ -255,7 +308,7 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
short quantity = maplePacket.ReadShort();
maplePacket.ReadByte();
byte flag = maplePacket.ReadByte();
string templateName = maplePacket.ReadString();
string currencyId = maplePacket.ReadString();
short requiredQuestAlliance = maplePacket.ReadShort();
int requiredFameGrade = maplePacket.ReadInt();
bool autoPreviewEquip = maplePacket.ReadBool();
Expand All@@ -264,10 +317,10 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
{
AutoPreviewEquip = autoPreviewEquip,
Category = category,
Flag = (ShopItemFlag) flag,
Label = (ShopItemLabel) flag,
GuildTrophy = guildTrophy,
ItemId = itemId,
ItemRank = itemRank,
Rarity = itemRank,
Price = price,
RequiredAchievementGrade = requiredAchievementGrade,
RequiredAchievementId = requiredAchievementId,
Expand All@@ -281,8 +334,8 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
SalePrice = salePrice,
StockCount = stockCount,
StockPurchased = stockPurchased,
TemplateName = templateName,
TokenType = (ShopCurrencyType) tokenType,
CurrencyId = currencyId,
CurrencyType = (ShopCurrencyType) tokenType,
Quantity = quantity
};
}
54 changes: 34 additions & 20 deletions PacketToSQL/Types/Shop.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,29 @@

public class Shop
{
public int Id { get; set; }
public int Category { get; set; }
public string Name { get; set; }
public ShopType ShopType { get; set; }
public bool RestrictSales { get; set; }
public bool CanRestock { get; set; }
public long NextRestock { get; set; }
public bool AllowBuyback { get; set; }
public List<ShopItem> Items { get; set; }
public int Id;
public int Category;
public string Name;
public ShopType ShopType;
public bool HideUnuseable;
public bool HideStats;
public bool DisableBuyback;
public bool OpenWallet;
public bool DisplayNew;
public bool RandomizeOrder;
public bool CanRestock;
public long NextRestock;
public int RestockMinInterval;
public byte RestockInterval;
public byte RestockCurrencyType;
public byte ExcessRestockCurrencyType;
public int RestockCost;
public bool EnableRestockCostMultiplier;
public int TotalRestockCount;
public bool DisableInstantRestock;
public bool PersistantInventory;
public int PullCount;
public List<ShopItem> Items;

public Shop() { }

Expand All@@ -20,22 +34,22 @@ public Shop(int id, int category, string name, byte shop_type, bool restrict_sal
Category = category;
Name = name;
ShopType = (ShopType) shop_type;
RestrictSales = restrict_sales;
DisableBuyback = restrict_sales;
CanRestock = can_restock;
NextRestock = next_restock;
AllowBuyback = allow_buyback;
HideUnuseable = allow_buyback;
}
}

public class ShopItem
{
public int Uid;
public int ItemId;
public ShopCurrencyType TokenType;
public ShopCurrencyType CurrencyType;
public int RequiredItemId;
public int Price;
public int SalePrice;
public byte ItemRank;
public byte Rarity;
public int StockCount;
public int StockPurchased;
public int GuildTrophy;
Expand All@@ -47,8 +61,8 @@ public class ShopItem
public byte RequiredGuildMerchantType;
public short RequiredGuildMerchantLevel;
public short Quantity;
public ShopItemFlag Flag;
public string TemplateName;
public ShopItemLabel Label;
public string CurrencyId;
public short RequiredQuestAlliance;
public int RequiredFameGrade;
public bool AutoPreviewEquip;
Expand All@@ -60,10 +74,10 @@ public ShopItem(dynamic data)
Uid = data.uid;
AutoPreviewEquip = data.auto_preview_equip;
Category = data.category;
Flag = (ShopItemFlag) data.flag;
Label = (ShopItemLabel) data.label;
GuildTrophy = data.guild_trophy;
ItemId = data.item_id;
ItemRank = data.item_rank;
Rarity = data.rarity;
Price = data.price;
RequiredAchievementGrade = data.required_achievement_grade;
RequiredAchievementId = data.required_achievement_id;
Expand All@@ -77,8 +91,8 @@ public ShopItem(dynamic data)
SalePrice = data.sale_price;
StockCount = data.stock_count;
StockPurchased = data.stock_purchased;
TemplateName = data.template_name;
TokenType = (ShopCurrencyType) data.token_type;
CurrencyId = data.template_name;
CurrencyType = (ShopCurrencyType) data.currency_type;
Quantity = data.quantity;
}
}
Expand DownExpand Up@@ -110,7 +124,7 @@ public enum ShopType : byte
Capsule = 4
}

public enum ShopItemFlag : byte
public enum ShopItemLabel : byte
{
None = 0,
New = 1,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Update to latest decoded packets#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AngeloTadeucci merged 1 commit into from
Oct 30, 2022
Merged

Update to latest decoded packets #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 76 additions & 23 deletions PacketToSQL/Program.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,29 +104,81 @@ Shop ReadShop(MaplePacket packet)
int id = packet.ReadInt();
long nextRestock = packet.ReadLong();
packet.ReadInt();
packet.ReadShort();
int itemCount = packet.ReadShort();
int category = packet.ReadInt();
packet.ReadBool();
bool restrictSales = packet.ReadBool();
bool openWallet = packet.ReadBool();
bool disableBuyBack = packet.ReadBool();
bool canRestock = packet.ReadBool();
packet.ReadBool();
bool randomizeOrder = packet.ReadBool();
ShopType shopType = (ShopType) packet.ReadByte();
bool allowBuyback = packet.ReadBool();
packet.ReadBool();
packet.ReadBool();
bool hideUnuseable = packet.ReadBool();
bool hideStats = packet.ReadBool();
packet.ReadBool();
bool displayNew = packet.ReadBool();
string name = packet.ReadString();
byte restockCurrencyType = 0;
byte excessRestockCurrencyType = 0;
int restockCost = 0;
bool enableRestockCostMultiplier = false;
int totalRestockCount = 0;
byte restockInterval = 0;
bool disableInstantRestock = false;
bool persistantInventory = false;
int pullCount = 0;
int restockMinInterval = 0;

if (canRestock)
{
restockCurrencyType = packet.ReadByte();
excessRestockCurrencyType = packet.ReadByte();
restockCost = packet.ReadInt();
enableRestockCostMultiplier = packet.ReadBool();
totalRestockCount = packet.ReadInt();
restockInterval = packet.ReadByte();
disableInstantRestock = packet.ReadBool();
persistantInventory = packet.ReadBool();
pullCount = itemCount;
restockMinInterval = restockInterval switch
{
0 => // minutes
1,
1 => // days
1440,
2 => // weeks
10080,
3 => 43200,
_ => restockMinInterval
};
}
else
{
nextRestock = 0;
}

return new()
{
AllowBuyback = allowBuyback,
HideUnuseable = hideUnuseable,
CanRestock = canRestock,
Category = category,
Id = id,
Name = name,
NextRestock = nextRestock,
RestrictSales = restrictSales,
ShopType = shopType
DisableBuyback = disableBuyBack,
ShopType = shopType,
OpenWallet = openWallet,
RandomizeOrder = randomizeOrder,
HideStats = hideStats,
DisplayNew = displayNew,
RestockCurrencyType = restockCurrencyType,
ExcessRestockCurrencyType = excessRestockCurrencyType,
RestockCost = restockCost,
EnableRestockCostMultiplier = enableRestockCostMultiplier,
TotalRestockCount = totalRestockCount,
RestockInterval = restockInterval,
DisableInstantRestock = disableInstantRestock,
PersistantInventory = persistantInventory,
PullCount = pullCount,
RestockMinInterval = restockMinInterval
};
}

Expand DownExpand Up@@ -172,8 +224,10 @@ async void CreateShopSqlFile(Shop shop)

string[] lines =
{
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.RestrictSales ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, " +
$"1630605560, {(shop.AllowBuyback ? "1" : "0")}),",
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.HideUnuseable ? "1" : "0")}, {(shop.HideStats ? "1" : "0")}, " +
$"{(shop.DisableBuyback ? "1" : "0")}, {(shop.OpenWallet ? "1" : "0")}, {(shop.DisplayNew ? "1" : "0")}, {(shop.RandomizeOrder ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, {shop.NextRestock}, {shop.RestockMinInterval}, " +
$"{shop.RestockInterval}, {shop.RestockCurrencyType}, {shop.ExcessRestockCurrencyType}, {shop.RestockCost}, {(shop.EnableRestockCostMultiplier ? "1" : "0")}, " +
$"{(shop.DisableInstantRestock ? "1" : "0")}, {(shop.PersistantInventory ? "1" : "0")}, {shop.PullCount})," +
"" // new line
};

Expand All@@ -195,12 +249,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)
File.WriteAllLines(shopsItemsFilePath, new[]
{
"-- SQL File created by PacketToSQL app by tDcc#0568",
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `flag`, `guild_trophy`, `item_id`, `item_rank`, `price`,
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `label`, `guild_trophy`, `item_id`, `rarity`, `price`,
`quantity`, `required_achievement_grade`, `required_achievement_id`,
`required_championship_grade`, `required_championship_join_count`, `required_fame_grade`,
`required_guild_merchant_level`, `required_guild_merchant_type`, `required_item_id`,
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `stock_purchased`,
`template_name`, `token_type`)
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `currency_id`, `currency_type`)
VALUES"
});
}
Expand All@@ -214,11 +267,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)

foreach (ShopItem shopItem in items)
{
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Flag}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.ItemRank}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Label}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.Rarity}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
$"{shopItem.RequiredChampionshipGrade}, {shopItem.RequiredChampionshipJoinCount}, {shopItem.RequiredFameGrade}, " +
$"{shopItem.RequiredGuildMerchantLevel}, {shopItem.RequiredGuildMerchantType}, {shopItem.RequiredItemId}, {shopItem.RequiredQuestAlliance}, " +
$"{shopItem.SalePrice}, {shopId}, 0, 0, '{shopItem.TemplateName}', {(int) shopItem.TokenType}),");
$"{shopItem.SalePrice}, {shopId}, {shopItem.StockCount}, '{shopItem.CurrencyId}', {(int) shopItem.CurrencyType}),");
}

lines.Add("");
Expand DownExpand Up@@ -255,7 +308,7 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
short quantity = maplePacket.ReadShort();
maplePacket.ReadByte();
byte flag = maplePacket.ReadByte();
string templateName = maplePacket.ReadString();
string currencyId = maplePacket.ReadString();
short requiredQuestAlliance = maplePacket.ReadShort();
int requiredFameGrade = maplePacket.ReadInt();
bool autoPreviewEquip = maplePacket.ReadBool();
Expand All@@ -264,10 +317,10 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
{
AutoPreviewEquip = autoPreviewEquip,
Category = category,
Flag = (ShopItemFlag) flag,
Label = (ShopItemLabel) flag,
GuildTrophy = guildTrophy,
ItemId = itemId,
ItemRank = itemRank,
Rarity = itemRank,
Price = price,
RequiredAchievementGrade = requiredAchievementGrade,
RequiredAchievementId = requiredAchievementId,
Expand All@@ -281,8 +334,8 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
SalePrice = salePrice,
StockCount = stockCount,
StockPurchased = stockPurchased,
TemplateName = templateName,
TokenType = (ShopCurrencyType) tokenType,
CurrencyId = currencyId,
CurrencyType = (ShopCurrencyType) tokenType,
Quantity = quantity
};
}
54 changes: 34 additions & 20 deletions PacketToSQL/Types/Shop.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,29 @@

public class Shop
{
public int Id { get; set; }
public int Category { get; set; }
public string Name { get; set; }
public ShopType ShopType { get; set; }
public bool RestrictSales { get; set; }
public bool CanRestock { get; set; }
public long NextRestock { get; set; }
public bool AllowBuyback { get; set; }
public List<ShopItem> Items { get; set; }
public int Id;
public int Category;
public string Name;
public ShopType ShopType;
public bool HideUnuseable;
public bool HideStats;
public bool DisableBuyback;
public bool OpenWallet;
public bool DisplayNew;
public bool RandomizeOrder;
public bool CanRestock;
public long NextRestock;
public int RestockMinInterval;
public byte RestockInterval;
public byte RestockCurrencyType;
public byte ExcessRestockCurrencyType;
public int RestockCost;
public bool EnableRestockCostMultiplier;
public int TotalRestockCount;
public bool DisableInstantRestock;
public bool PersistantInventory;
public int PullCount;
public List<ShopItem> Items;

public Shop() { }

Expand All@@ -20,22 +34,22 @@ public Shop(int id, int category, string name, byte shop_type, bool restrict_sal
Category = category;
Name = name;
ShopType = (ShopType) shop_type;
RestrictSales = restrict_sales;
DisableBuyback = restrict_sales;
CanRestock = can_restock;
NextRestock = next_restock;
AllowBuyback = allow_buyback;
HideUnuseable = allow_buyback;
}
}

public class ShopItem
{
public int Uid;
public int ItemId;
public ShopCurrencyType TokenType;
public ShopCurrencyType CurrencyType;
public int RequiredItemId;
public int Price;
public int SalePrice;
public byte ItemRank;
public byte Rarity;
public int StockCount;
public int StockPurchased;
public int GuildTrophy;
Expand All@@ -47,8 +61,8 @@ public class ShopItem
public byte RequiredGuildMerchantType;
public short RequiredGuildMerchantLevel;
public short Quantity;
public ShopItemFlag Flag;
public string TemplateName;
public ShopItemLabel Label;
public string CurrencyId;
public short RequiredQuestAlliance;
public int RequiredFameGrade;
public bool AutoPreviewEquip;
Expand All@@ -60,10 +74,10 @@ public ShopItem(dynamic data)
Uid = data.uid;
AutoPreviewEquip = data.auto_preview_equip;
Category = data.category;
Flag = (ShopItemFlag) data.flag;
Label = (ShopItemLabel) data.label;
GuildTrophy = data.guild_trophy;
ItemId = data.item_id;
ItemRank = data.item_rank;
Rarity = data.rarity;
Price = data.price;
RequiredAchievementGrade = data.required_achievement_grade;
RequiredAchievementId = data.required_achievement_id;
Expand All@@ -77,8 +91,8 @@ public ShopItem(dynamic data)
SalePrice = data.sale_price;
StockCount = data.stock_count;
StockPurchased = data.stock_purchased;
TemplateName = data.template_name;
TokenType = (ShopCurrencyType) data.token_type;
CurrencyId = data.template_name;
CurrencyType = (ShopCurrencyType) data.currency_type;
Quantity = data.quantity;
}
}
Expand DownExpand Up@@ -110,7 +124,7 @@ public enum ShopType : byte
Capsule = 4
}

public enum ShopItemFlag : byte
public enum ShopItemLabel : byte
{
None = 0,
New = 1,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Update to latest decoded packets#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AngeloTadeucci merged 1 commit into from
Oct 30, 2022
Merged

Update to latest decoded packets #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 76 additions & 23 deletions PacketToSQL/Program.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,29 +104,81 @@ Shop ReadShop(MaplePacket packet)
int id = packet.ReadInt();
long nextRestock = packet.ReadLong();
packet.ReadInt();
packet.ReadShort();
int itemCount = packet.ReadShort();
int category = packet.ReadInt();
packet.ReadBool();
bool restrictSales = packet.ReadBool();
bool openWallet = packet.ReadBool();
bool disableBuyBack = packet.ReadBool();
bool canRestock = packet.ReadBool();
packet.ReadBool();
bool randomizeOrder = packet.ReadBool();
ShopType shopType = (ShopType) packet.ReadByte();
bool allowBuyback = packet.ReadBool();
packet.ReadBool();
packet.ReadBool();
bool hideUnuseable = packet.ReadBool();
bool hideStats = packet.ReadBool();
packet.ReadBool();
bool displayNew = packet.ReadBool();
string name = packet.ReadString();
byte restockCurrencyType = 0;
byte excessRestockCurrencyType = 0;
int restockCost = 0;
bool enableRestockCostMultiplier = false;
int totalRestockCount = 0;
byte restockInterval = 0;
bool disableInstantRestock = false;
bool persistantInventory = false;
int pullCount = 0;
int restockMinInterval = 0;

if (canRestock)
{
restockCurrencyType = packet.ReadByte();
excessRestockCurrencyType = packet.ReadByte();
restockCost = packet.ReadInt();
enableRestockCostMultiplier = packet.ReadBool();
totalRestockCount = packet.ReadInt();
restockInterval = packet.ReadByte();
disableInstantRestock = packet.ReadBool();
persistantInventory = packet.ReadBool();
pullCount = itemCount;
restockMinInterval = restockInterval switch
{
0 => // minutes
1,
1 => // days
1440,
2 => // weeks
10080,
3 => 43200,
_ => restockMinInterval
};
}
else
{
nextRestock = 0;
}

return new()
{
AllowBuyback = allowBuyback,
HideUnuseable = hideUnuseable,
CanRestock = canRestock,
Category = category,
Id = id,
Name = name,
NextRestock = nextRestock,
RestrictSales = restrictSales,
ShopType = shopType
DisableBuyback = disableBuyBack,
ShopType = shopType,
OpenWallet = openWallet,
RandomizeOrder = randomizeOrder,
HideStats = hideStats,
DisplayNew = displayNew,
RestockCurrencyType = restockCurrencyType,
ExcessRestockCurrencyType = excessRestockCurrencyType,
RestockCost = restockCost,
EnableRestockCostMultiplier = enableRestockCostMultiplier,
TotalRestockCount = totalRestockCount,
RestockInterval = restockInterval,
DisableInstantRestock = disableInstantRestock,
PersistantInventory = persistantInventory,
PullCount = pullCount,
RestockMinInterval = restockMinInterval
};
}

Expand DownExpand Up@@ -172,8 +224,10 @@ async void CreateShopSqlFile(Shop shop)

string[] lines =
{
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.RestrictSales ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, " +
$"1630605560, {(shop.AllowBuyback ? "1" : "0")}),",
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.HideUnuseable ? "1" : "0")}, {(shop.HideStats ? "1" : "0")}, " +
$"{(shop.DisableBuyback ? "1" : "0")}, {(shop.OpenWallet ? "1" : "0")}, {(shop.DisplayNew ? "1" : "0")}, {(shop.RandomizeOrder ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, {shop.NextRestock}, {shop.RestockMinInterval}, " +
$"{shop.RestockInterval}, {shop.RestockCurrencyType}, {shop.ExcessRestockCurrencyType}, {shop.RestockCost}, {(shop.EnableRestockCostMultiplier ? "1" : "0")}, " +
$"{(shop.DisableInstantRestock ? "1" : "0")}, {(shop.PersistantInventory ? "1" : "0")}, {shop.PullCount})," +
"" // new line
};

Expand All@@ -195,12 +249,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)
File.WriteAllLines(shopsItemsFilePath, new[]
{
"-- SQL File created by PacketToSQL app by tDcc#0568",
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `flag`, `guild_trophy`, `item_id`, `item_rank`, `price`,
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `label`, `guild_trophy`, `item_id`, `rarity`, `price`,
`quantity`, `required_achievement_grade`, `required_achievement_id`,
`required_championship_grade`, `required_championship_join_count`, `required_fame_grade`,
`required_guild_merchant_level`, `required_guild_merchant_type`, `required_item_id`,
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `stock_purchased`,
`template_name`, `token_type`)
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `currency_id`, `currency_type`)
VALUES"
});
}
Expand All@@ -214,11 +267,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)

foreach (ShopItem shopItem in items)
{
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Flag}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.ItemRank}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Label}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.Rarity}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
$"{shopItem.RequiredChampionshipGrade}, {shopItem.RequiredChampionshipJoinCount}, {shopItem.RequiredFameGrade}, " +
$"{shopItem.RequiredGuildMerchantLevel}, {shopItem.RequiredGuildMerchantType}, {shopItem.RequiredItemId}, {shopItem.RequiredQuestAlliance}, " +
$"{shopItem.SalePrice}, {shopId}, 0, 0, '{shopItem.TemplateName}', {(int) shopItem.TokenType}),");
$"{shopItem.SalePrice}, {shopId}, {shopItem.StockCount}, '{shopItem.CurrencyId}', {(int) shopItem.CurrencyType}),");
}

lines.Add("");
Expand DownExpand Up@@ -255,7 +308,7 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
short quantity = maplePacket.ReadShort();
maplePacket.ReadByte();
byte flag = maplePacket.ReadByte();
string templateName = maplePacket.ReadString();
string currencyId = maplePacket.ReadString();
short requiredQuestAlliance = maplePacket.ReadShort();
int requiredFameGrade = maplePacket.ReadInt();
bool autoPreviewEquip = maplePacket.ReadBool();
Expand All@@ -264,10 +317,10 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
{
AutoPreviewEquip = autoPreviewEquip,
Category = category,
Flag = (ShopItemFlag) flag,
Label = (ShopItemLabel) flag,
GuildTrophy = guildTrophy,
ItemId = itemId,
ItemRank = itemRank,
Rarity = itemRank,
Price = price,
RequiredAchievementGrade = requiredAchievementGrade,
RequiredAchievementId = requiredAchievementId,
Expand All@@ -281,8 +334,8 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
SalePrice = salePrice,
StockCount = stockCount,
StockPurchased = stockPurchased,
TemplateName = templateName,
TokenType = (ShopCurrencyType) tokenType,
CurrencyId = currencyId,
CurrencyType = (ShopCurrencyType) tokenType,
Quantity = quantity
};
}
54 changes: 34 additions & 20 deletions PacketToSQL/Types/Shop.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,29 @@

public class Shop
{
public int Id { get; set; }
public int Category { get; set; }
public string Name { get; set; }
public ShopType ShopType { get; set; }
public bool RestrictSales { get; set; }
public bool CanRestock { get; set; }
public long NextRestock { get; set; }
public bool AllowBuyback { get; set; }
public List<ShopItem> Items { get; set; }
public int Id;
public int Category;
public string Name;
public ShopType ShopType;
public bool HideUnuseable;
public bool HideStats;
public bool DisableBuyback;
public bool OpenWallet;
public bool DisplayNew;
public bool RandomizeOrder;
public bool CanRestock;
public long NextRestock;
public int RestockMinInterval;
public byte RestockInterval;
public byte RestockCurrencyType;
public byte ExcessRestockCurrencyType;
public int RestockCost;
public bool EnableRestockCostMultiplier;
public int TotalRestockCount;
public bool DisableInstantRestock;
public bool PersistantInventory;
public int PullCount;
public List<ShopItem> Items;

public Shop() { }

Expand All@@ -20,22 +34,22 @@ public Shop(int id, int category, string name, byte shop_type, bool restrict_sal
Category = category;
Name = name;
ShopType = (ShopType) shop_type;
RestrictSales = restrict_sales;
DisableBuyback = restrict_sales;
CanRestock = can_restock;
NextRestock = next_restock;
AllowBuyback = allow_buyback;
HideUnuseable = allow_buyback;
}
}

public class ShopItem
{
public int Uid;
public int ItemId;
public ShopCurrencyType TokenType;
public ShopCurrencyType CurrencyType;
public int RequiredItemId;
public int Price;
public int SalePrice;
public byte ItemRank;
public byte Rarity;
public int StockCount;
public int StockPurchased;
public int GuildTrophy;
Expand All@@ -47,8 +61,8 @@ public class ShopItem
public byte RequiredGuildMerchantType;
public short RequiredGuildMerchantLevel;
public short Quantity;
public ShopItemFlag Flag;
public string TemplateName;
public ShopItemLabel Label;
public string CurrencyId;
public short RequiredQuestAlliance;
public int RequiredFameGrade;
public bool AutoPreviewEquip;
Expand All@@ -60,10 +74,10 @@ public ShopItem(dynamic data)
Uid = data.uid;
AutoPreviewEquip = data.auto_preview_equip;
Category = data.category;
Flag = (ShopItemFlag) data.flag;
Label = (ShopItemLabel) data.label;
GuildTrophy = data.guild_trophy;
ItemId = data.item_id;
ItemRank = data.item_rank;
Rarity = data.rarity;
Price = data.price;
RequiredAchievementGrade = data.required_achievement_grade;
RequiredAchievementId = data.required_achievement_id;
Expand All@@ -77,8 +91,8 @@ public ShopItem(dynamic data)
SalePrice = data.sale_price;
StockCount = data.stock_count;
StockPurchased = data.stock_purchased;
TemplateName = data.template_name;
TokenType = (ShopCurrencyType) data.token_type;
CurrencyId = data.template_name;
CurrencyType = (ShopCurrencyType) data.currency_type;
Quantity = data.quantity;
}
}
Expand DownExpand Up@@ -110,7 +124,7 @@ public enum ShopType : byte
Capsule = 4
}

public enum ShopItemFlag : byte
public enum ShopItemLabel : byte
{
None = 0,
New = 1,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Update to latest decoded packets#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AngeloTadeucci merged 1 commit into from
Oct 30, 2022
Merged

Update to latest decoded packets #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 76 additions & 23 deletions PacketToSQL/Program.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,29 +104,81 @@ Shop ReadShop(MaplePacket packet)
int id = packet.ReadInt();
long nextRestock = packet.ReadLong();
packet.ReadInt();
packet.ReadShort();
int itemCount = packet.ReadShort();
int category = packet.ReadInt();
packet.ReadBool();
bool restrictSales = packet.ReadBool();
bool openWallet = packet.ReadBool();
bool disableBuyBack = packet.ReadBool();
bool canRestock = packet.ReadBool();
packet.ReadBool();
bool randomizeOrder = packet.ReadBool();
ShopType shopType = (ShopType) packet.ReadByte();
bool allowBuyback = packet.ReadBool();
packet.ReadBool();
packet.ReadBool();
bool hideUnuseable = packet.ReadBool();
bool hideStats = packet.ReadBool();
packet.ReadBool();
bool displayNew = packet.ReadBool();
string name = packet.ReadString();
byte restockCurrencyType = 0;
byte excessRestockCurrencyType = 0;
int restockCost = 0;
bool enableRestockCostMultiplier = false;
int totalRestockCount = 0;
byte restockInterval = 0;
bool disableInstantRestock = false;
bool persistantInventory = false;
int pullCount = 0;
int restockMinInterval = 0;

if (canRestock)
{
restockCurrencyType = packet.ReadByte();
excessRestockCurrencyType = packet.ReadByte();
restockCost = packet.ReadInt();
enableRestockCostMultiplier = packet.ReadBool();
totalRestockCount = packet.ReadInt();
restockInterval = packet.ReadByte();
disableInstantRestock = packet.ReadBool();
persistantInventory = packet.ReadBool();
pullCount = itemCount;
restockMinInterval = restockInterval switch
{
0 => // minutes
1,
1 => // days
1440,
2 => // weeks
10080,
3 => 43200,
_ => restockMinInterval
};
}
else
{
nextRestock = 0;
}

return new()
{
AllowBuyback = allowBuyback,
HideUnuseable = hideUnuseable,
CanRestock = canRestock,
Category = category,
Id = id,
Name = name,
NextRestock = nextRestock,
RestrictSales = restrictSales,
ShopType = shopType
DisableBuyback = disableBuyBack,
ShopType = shopType,
OpenWallet = openWallet,
RandomizeOrder = randomizeOrder,
HideStats = hideStats,
DisplayNew = displayNew,
RestockCurrencyType = restockCurrencyType,
ExcessRestockCurrencyType = excessRestockCurrencyType,
RestockCost = restockCost,
EnableRestockCostMultiplier = enableRestockCostMultiplier,
TotalRestockCount = totalRestockCount,
RestockInterval = restockInterval,
DisableInstantRestock = disableInstantRestock,
PersistantInventory = persistantInventory,
PullCount = pullCount,
RestockMinInterval = restockMinInterval
};
}

Expand DownExpand Up@@ -172,8 +224,10 @@ async void CreateShopSqlFile(Shop shop)

string[] lines =
{
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.RestrictSales ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, " +
$"1630605560, {(shop.AllowBuyback ? "1" : "0")}),",
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.HideUnuseable ? "1" : "0")}, {(shop.HideStats ? "1" : "0")}, " +
$"{(shop.DisableBuyback ? "1" : "0")}, {(shop.OpenWallet ? "1" : "0")}, {(shop.DisplayNew ? "1" : "0")}, {(shop.RandomizeOrder ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, {shop.NextRestock}, {shop.RestockMinInterval}, " +
$"{shop.RestockInterval}, {shop.RestockCurrencyType}, {shop.ExcessRestockCurrencyType}, {shop.RestockCost}, {(shop.EnableRestockCostMultiplier ? "1" : "0")}, " +
$"{(shop.DisableInstantRestock ? "1" : "0")}, {(shop.PersistantInventory ? "1" : "0")}, {shop.PullCount})," +
"" // new line
};

Expand All@@ -195,12 +249,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)
File.WriteAllLines(shopsItemsFilePath, new[]
{
"-- SQL File created by PacketToSQL app by tDcc#0568",
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `flag`, `guild_trophy`, `item_id`, `item_rank`, `price`,
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `label`, `guild_trophy`, `item_id`, `rarity`, `price`,
`quantity`, `required_achievement_grade`, `required_achievement_id`,
`required_championship_grade`, `required_championship_join_count`, `required_fame_grade`,
`required_guild_merchant_level`, `required_guild_merchant_type`, `required_item_id`,
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `stock_purchased`,
`template_name`, `token_type`)
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `currency_id`, `currency_type`)
VALUES"
});
}
Expand All@@ -214,11 +267,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)

foreach (ShopItem shopItem in items)
{
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Flag}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.ItemRank}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Label}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.Rarity}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
$"{shopItem.RequiredChampionshipGrade}, {shopItem.RequiredChampionshipJoinCount}, {shopItem.RequiredFameGrade}, " +
$"{shopItem.RequiredGuildMerchantLevel}, {shopItem.RequiredGuildMerchantType}, {shopItem.RequiredItemId}, {shopItem.RequiredQuestAlliance}, " +
$"{shopItem.SalePrice}, {shopId}, 0, 0, '{shopItem.TemplateName}', {(int) shopItem.TokenType}),");
$"{shopItem.SalePrice}, {shopId}, {shopItem.StockCount}, '{shopItem.CurrencyId}', {(int) shopItem.CurrencyType}),");
}

lines.Add("");
Expand DownExpand Up@@ -255,7 +308,7 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
short quantity = maplePacket.ReadShort();
maplePacket.ReadByte();
byte flag = maplePacket.ReadByte();
string templateName = maplePacket.ReadString();
string currencyId = maplePacket.ReadString();
short requiredQuestAlliance = maplePacket.ReadShort();
int requiredFameGrade = maplePacket.ReadInt();
bool autoPreviewEquip = maplePacket.ReadBool();
Expand All@@ -264,10 +317,10 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
{
AutoPreviewEquip = autoPreviewEquip,
Category = category,
Flag = (ShopItemFlag) flag,
Label = (ShopItemLabel) flag,
GuildTrophy = guildTrophy,
ItemId = itemId,
ItemRank = itemRank,
Rarity = itemRank,
Price = price,
RequiredAchievementGrade = requiredAchievementGrade,
RequiredAchievementId = requiredAchievementId,
Expand All@@ -281,8 +334,8 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
SalePrice = salePrice,
StockCount = stockCount,
StockPurchased = stockPurchased,
TemplateName = templateName,
TokenType = (ShopCurrencyType) tokenType,
CurrencyId = currencyId,
CurrencyType = (ShopCurrencyType) tokenType,
Quantity = quantity
};
}
54 changes: 34 additions & 20 deletions PacketToSQL/Types/Shop.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,29 @@

public class Shop
{
public int Id { get; set; }
public int Category { get; set; }
public string Name { get; set; }
public ShopType ShopType { get; set; }
public bool RestrictSales { get; set; }
public bool CanRestock { get; set; }
public long NextRestock { get; set; }
public bool AllowBuyback { get; set; }
public List<ShopItem> Items { get; set; }
public int Id;
public int Category;
public string Name;
public ShopType ShopType;
public bool HideUnuseable;
public bool HideStats;
public bool DisableBuyback;
public bool OpenWallet;
public bool DisplayNew;
public bool RandomizeOrder;
public bool CanRestock;
public long NextRestock;
public int RestockMinInterval;
public byte RestockInterval;
public byte RestockCurrencyType;
public byte ExcessRestockCurrencyType;
public int RestockCost;
public bool EnableRestockCostMultiplier;
public int TotalRestockCount;
public bool DisableInstantRestock;
public bool PersistantInventory;
public int PullCount;
public List<ShopItem> Items;

public Shop() { }

Expand All@@ -20,22 +34,22 @@ public Shop(int id, int category, string name, byte shop_type, bool restrict_sal
Category = category;
Name = name;
ShopType = (ShopType) shop_type;
RestrictSales = restrict_sales;
DisableBuyback = restrict_sales;
CanRestock = can_restock;
NextRestock = next_restock;
AllowBuyback = allow_buyback;
HideUnuseable = allow_buyback;
}
}

public class ShopItem
{
public int Uid;
public int ItemId;
public ShopCurrencyType TokenType;
public ShopCurrencyType CurrencyType;
public int RequiredItemId;
public int Price;
public int SalePrice;
public byte ItemRank;
public byte Rarity;
public int StockCount;
public int StockPurchased;
public int GuildTrophy;
Expand All@@ -47,8 +61,8 @@ public class ShopItem
public byte RequiredGuildMerchantType;
public short RequiredGuildMerchantLevel;
public short Quantity;
public ShopItemFlag Flag;
public string TemplateName;
public ShopItemLabel Label;
public string CurrencyId;
public short RequiredQuestAlliance;
public int RequiredFameGrade;
public bool AutoPreviewEquip;
Expand All@@ -60,10 +74,10 @@ public ShopItem(dynamic data)
Uid = data.uid;
AutoPreviewEquip = data.auto_preview_equip;
Category = data.category;
Flag = (ShopItemFlag) data.flag;
Label = (ShopItemLabel) data.label;
GuildTrophy = data.guild_trophy;
ItemId = data.item_id;
ItemRank = data.item_rank;
Rarity = data.rarity;
Price = data.price;
RequiredAchievementGrade = data.required_achievement_grade;
RequiredAchievementId = data.required_achievement_id;
Expand All@@ -77,8 +91,8 @@ public ShopItem(dynamic data)
SalePrice = data.sale_price;
StockCount = data.stock_count;
StockPurchased = data.stock_purchased;
TemplateName = data.template_name;
TokenType = (ShopCurrencyType) data.token_type;
CurrencyId = data.template_name;
CurrencyType = (ShopCurrencyType) data.currency_type;
Quantity = data.quantity;
}
}
Expand DownExpand Up@@ -110,7 +124,7 @@ public enum ShopType : byte
Capsule = 4
}

public enum ShopItemFlag : byte
public enum ShopItemLabel : byte
{
None = 0,
New = 1,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Update to latest decoded packets#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AngeloTadeucci merged 1 commit into from
Oct 30, 2022
Merged

Update to latest decoded packets #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 76 additions & 23 deletions PacketToSQL/Program.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,29 +104,81 @@ Shop ReadShop(MaplePacket packet)
int id = packet.ReadInt();
long nextRestock = packet.ReadLong();
packet.ReadInt();
packet.ReadShort();
int itemCount = packet.ReadShort();
int category = packet.ReadInt();
packet.ReadBool();
bool restrictSales = packet.ReadBool();
bool openWallet = packet.ReadBool();
bool disableBuyBack = packet.ReadBool();
bool canRestock = packet.ReadBool();
packet.ReadBool();
bool randomizeOrder = packet.ReadBool();
ShopType shopType = (ShopType) packet.ReadByte();
bool allowBuyback = packet.ReadBool();
packet.ReadBool();
packet.ReadBool();
bool hideUnuseable = packet.ReadBool();
bool hideStats = packet.ReadBool();
packet.ReadBool();
bool displayNew = packet.ReadBool();
string name = packet.ReadString();
byte restockCurrencyType = 0;
byte excessRestockCurrencyType = 0;
int restockCost = 0;
bool enableRestockCostMultiplier = false;
int totalRestockCount = 0;
byte restockInterval = 0;
bool disableInstantRestock = false;
bool persistantInventory = false;
int pullCount = 0;
int restockMinInterval = 0;

if (canRestock)
{
restockCurrencyType = packet.ReadByte();
excessRestockCurrencyType = packet.ReadByte();
restockCost = packet.ReadInt();
enableRestockCostMultiplier = packet.ReadBool();
totalRestockCount = packet.ReadInt();
restockInterval = packet.ReadByte();
disableInstantRestock = packet.ReadBool();
persistantInventory = packet.ReadBool();
pullCount = itemCount;
restockMinInterval = restockInterval switch
{
0 => // minutes
1,
1 => // days
1440,
2 => // weeks
10080,
3 => 43200,
_ => restockMinInterval
};
}
else
{
nextRestock = 0;
}

return new()
{
AllowBuyback = allowBuyback,
HideUnuseable = hideUnuseable,
CanRestock = canRestock,
Category = category,
Id = id,
Name = name,
NextRestock = nextRestock,
RestrictSales = restrictSales,
ShopType = shopType
DisableBuyback = disableBuyBack,
ShopType = shopType,
OpenWallet = openWallet,
RandomizeOrder = randomizeOrder,
HideStats = hideStats,
DisplayNew = displayNew,
RestockCurrencyType = restockCurrencyType,
ExcessRestockCurrencyType = excessRestockCurrencyType,
RestockCost = restockCost,
EnableRestockCostMultiplier = enableRestockCostMultiplier,
TotalRestockCount = totalRestockCount,
RestockInterval = restockInterval,
DisableInstantRestock = disableInstantRestock,
PersistantInventory = persistantInventory,
PullCount = pullCount,
RestockMinInterval = restockMinInterval
};
}

Expand DownExpand Up@@ -172,8 +224,10 @@ async void CreateShopSqlFile(Shop shop)

string[] lines =
{
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.RestrictSales ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, " +
$"1630605560, {(shop.AllowBuyback ? "1" : "0")}),",
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.HideUnuseable ? "1" : "0")}, {(shop.HideStats ? "1" : "0")}, " +
$"{(shop.DisableBuyback ? "1" : "0")}, {(shop.OpenWallet ? "1" : "0")}, {(shop.DisplayNew ? "1" : "0")}, {(shop.RandomizeOrder ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, {shop.NextRestock}, {shop.RestockMinInterval}, " +
$"{shop.RestockInterval}, {shop.RestockCurrencyType}, {shop.ExcessRestockCurrencyType}, {shop.RestockCost}, {(shop.EnableRestockCostMultiplier ? "1" : "0")}, " +
$"{(shop.DisableInstantRestock ? "1" : "0")}, {(shop.PersistantInventory ? "1" : "0")}, {shop.PullCount})," +
"" // new line
};

Expand All@@ -195,12 +249,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)
File.WriteAllLines(shopsItemsFilePath, new[]
{
"-- SQL File created by PacketToSQL app by tDcc#0568",
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `flag`, `guild_trophy`, `item_id`, `item_rank`, `price`,
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `label`, `guild_trophy`, `item_id`, `rarity`, `price`,
`quantity`, `required_achievement_grade`, `required_achievement_id`,
`required_championship_grade`, `required_championship_join_count`, `required_fame_grade`,
`required_guild_merchant_level`, `required_guild_merchant_type`, `required_item_id`,
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `stock_purchased`,
`template_name`, `token_type`)
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `currency_id`, `currency_type`)
VALUES"
});
}
Expand All@@ -214,11 +267,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)

foreach (ShopItem shopItem in items)
{
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Flag}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.ItemRank}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Label}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.Rarity}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
$"{shopItem.RequiredChampionshipGrade}, {shopItem.RequiredChampionshipJoinCount}, {shopItem.RequiredFameGrade}, " +
$"{shopItem.RequiredGuildMerchantLevel}, {shopItem.RequiredGuildMerchantType}, {shopItem.RequiredItemId}, {shopItem.RequiredQuestAlliance}, " +
$"{shopItem.SalePrice}, {shopId}, 0, 0, '{shopItem.TemplateName}', {(int) shopItem.TokenType}),");
$"{shopItem.SalePrice}, {shopId}, {shopItem.StockCount}, '{shopItem.CurrencyId}', {(int) shopItem.CurrencyType}),");
}

lines.Add("");
Expand DownExpand Up@@ -255,7 +308,7 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
short quantity = maplePacket.ReadShort();
maplePacket.ReadByte();
byte flag = maplePacket.ReadByte();
string templateName = maplePacket.ReadString();
string currencyId = maplePacket.ReadString();
short requiredQuestAlliance = maplePacket.ReadShort();
int requiredFameGrade = maplePacket.ReadInt();
bool autoPreviewEquip = maplePacket.ReadBool();
Expand All@@ -264,10 +317,10 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
{
AutoPreviewEquip = autoPreviewEquip,
Category = category,
Flag = (ShopItemFlag) flag,
Label = (ShopItemLabel) flag,
GuildTrophy = guildTrophy,
ItemId = itemId,
ItemRank = itemRank,
Rarity = itemRank,
Price = price,
RequiredAchievementGrade = requiredAchievementGrade,
RequiredAchievementId = requiredAchievementId,
Expand All@@ -281,8 +334,8 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
SalePrice = salePrice,
StockCount = stockCount,
StockPurchased = stockPurchased,
TemplateName = templateName,
TokenType = (ShopCurrencyType) tokenType,
CurrencyId = currencyId,
CurrencyType = (ShopCurrencyType) tokenType,
Quantity = quantity
};
}
54 changes: 34 additions & 20 deletions PacketToSQL/Types/Shop.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,29 @@

public class Shop
{
public int Id { get; set; }
public int Category { get; set; }
public string Name { get; set; }
public ShopType ShopType { get; set; }
public bool RestrictSales { get; set; }
public bool CanRestock { get; set; }
public long NextRestock { get; set; }
public bool AllowBuyback { get; set; }
public List<ShopItem> Items { get; set; }
public int Id;
public int Category;
public string Name;
public ShopType ShopType;
public bool HideUnuseable;
public bool HideStats;
public bool DisableBuyback;
public bool OpenWallet;
public bool DisplayNew;
public bool RandomizeOrder;
public bool CanRestock;
public long NextRestock;
public int RestockMinInterval;
public byte RestockInterval;
public byte RestockCurrencyType;
public byte ExcessRestockCurrencyType;
public int RestockCost;
public bool EnableRestockCostMultiplier;
public int TotalRestockCount;
public bool DisableInstantRestock;
public bool PersistantInventory;
public int PullCount;
public List<ShopItem> Items;

public Shop() { }

Expand All@@ -20,22 +34,22 @@ public Shop(int id, int category, string name, byte shop_type, bool restrict_sal
Category = category;
Name = name;
ShopType = (ShopType) shop_type;
RestrictSales = restrict_sales;
DisableBuyback = restrict_sales;
CanRestock = can_restock;
NextRestock = next_restock;
AllowBuyback = allow_buyback;
HideUnuseable = allow_buyback;
}
}

public class ShopItem
{
public int Uid;
public int ItemId;
public ShopCurrencyType TokenType;
public ShopCurrencyType CurrencyType;
public int RequiredItemId;
public int Price;
public int SalePrice;
public byte ItemRank;
public byte Rarity;
public int StockCount;
public int StockPurchased;
public int GuildTrophy;
Expand All@@ -47,8 +61,8 @@ public class ShopItem
public byte RequiredGuildMerchantType;
public short RequiredGuildMerchantLevel;
public short Quantity;
public ShopItemFlag Flag;
public string TemplateName;
public ShopItemLabel Label;
public string CurrencyId;
public short RequiredQuestAlliance;
public int RequiredFameGrade;
public bool AutoPreviewEquip;
Expand All@@ -60,10 +74,10 @@ public ShopItem(dynamic data)
Uid = data.uid;
AutoPreviewEquip = data.auto_preview_equip;
Category = data.category;
Flag = (ShopItemFlag) data.flag;
Label = (ShopItemLabel) data.label;
GuildTrophy = data.guild_trophy;
ItemId = data.item_id;
ItemRank = data.item_rank;
Rarity = data.rarity;
Price = data.price;
RequiredAchievementGrade = data.required_achievement_grade;
RequiredAchievementId = data.required_achievement_id;
Expand All@@ -77,8 +91,8 @@ public ShopItem(dynamic data)
SalePrice = data.sale_price;
StockCount = data.stock_count;
StockPurchased = data.stock_purchased;
TemplateName = data.template_name;
TokenType = (ShopCurrencyType) data.token_type;
CurrencyId = data.template_name;
CurrencyType = (ShopCurrencyType) data.currency_type;
Quantity = data.quantity;
}
}
Expand DownExpand Up@@ -110,7 +124,7 @@ public enum ShopType : byte
Capsule = 4
}

public enum ShopItemFlag : byte
public enum ShopItemLabel : byte
{
None = 0,
New = 1,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Update to latest decoded packets#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AngeloTadeucci merged 1 commit into from
Oct 30, 2022
Merged

Update to latest decoded packets #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 76 additions & 23 deletions PacketToSQL/Program.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,29 +104,81 @@ Shop ReadShop(MaplePacket packet)
int id = packet.ReadInt();
long nextRestock = packet.ReadLong();
packet.ReadInt();
packet.ReadShort();
int itemCount = packet.ReadShort();
int category = packet.ReadInt();
packet.ReadBool();
bool restrictSales = packet.ReadBool();
bool openWallet = packet.ReadBool();
bool disableBuyBack = packet.ReadBool();
bool canRestock = packet.ReadBool();
packet.ReadBool();
bool randomizeOrder = packet.ReadBool();
ShopType shopType = (ShopType) packet.ReadByte();
bool allowBuyback = packet.ReadBool();
packet.ReadBool();
packet.ReadBool();
bool hideUnuseable = packet.ReadBool();
bool hideStats = packet.ReadBool();
packet.ReadBool();
bool displayNew = packet.ReadBool();
string name = packet.ReadString();
byte restockCurrencyType = 0;
byte excessRestockCurrencyType = 0;
int restockCost = 0;
bool enableRestockCostMultiplier = false;
int totalRestockCount = 0;
byte restockInterval = 0;
bool disableInstantRestock = false;
bool persistantInventory = false;
int pullCount = 0;
int restockMinInterval = 0;

if (canRestock)
{
restockCurrencyType = packet.ReadByte();
excessRestockCurrencyType = packet.ReadByte();
restockCost = packet.ReadInt();
enableRestockCostMultiplier = packet.ReadBool();
totalRestockCount = packet.ReadInt();
restockInterval = packet.ReadByte();
disableInstantRestock = packet.ReadBool();
persistantInventory = packet.ReadBool();
pullCount = itemCount;
restockMinInterval = restockInterval switch
{
0 => // minutes
1,
1 => // days
1440,
2 => // weeks
10080,
3 => 43200,
_ => restockMinInterval
};
}
else
{
nextRestock = 0;
}

return new()
{
AllowBuyback = allowBuyback,
HideUnuseable = hideUnuseable,
CanRestock = canRestock,
Category = category,
Id = id,
Name = name,
NextRestock = nextRestock,
RestrictSales = restrictSales,
ShopType = shopType
DisableBuyback = disableBuyBack,
ShopType = shopType,
OpenWallet = openWallet,
RandomizeOrder = randomizeOrder,
HideStats = hideStats,
DisplayNew = displayNew,
RestockCurrencyType = restockCurrencyType,
ExcessRestockCurrencyType = excessRestockCurrencyType,
RestockCost = restockCost,
EnableRestockCostMultiplier = enableRestockCostMultiplier,
TotalRestockCount = totalRestockCount,
RestockInterval = restockInterval,
DisableInstantRestock = disableInstantRestock,
PersistantInventory = persistantInventory,
PullCount = pullCount,
RestockMinInterval = restockMinInterval
};
}

Expand DownExpand Up@@ -172,8 +224,10 @@ async void CreateShopSqlFile(Shop shop)

string[] lines =
{
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.RestrictSales ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, " +
$"1630605560, {(shop.AllowBuyback ? "1" : "0")}),",
$"({shop.Id}, {shop.Category}, '{shop.Name}', {(byte) shop.ShopType}, {(shop.HideUnuseable ? "1" : "0")}, {(shop.HideStats ? "1" : "0")}, " +
$"{(shop.DisableBuyback ? "1" : "0")}, {(shop.OpenWallet ? "1" : "0")}, {(shop.DisplayNew ? "1" : "0")}, {(shop.RandomizeOrder ? "1" : "0")}, {(shop.CanRestock ? "1" : "0")}, {shop.NextRestock}, {shop.RestockMinInterval}, " +
$"{shop.RestockInterval}, {shop.RestockCurrencyType}, {shop.ExcessRestockCurrencyType}, {shop.RestockCost}, {(shop.EnableRestockCostMultiplier ? "1" : "0")}, " +
$"{(shop.DisableInstantRestock ? "1" : "0")}, {(shop.PersistantInventory ? "1" : "0")}, {shop.PullCount})," +
"" // new line
};

Expand All@@ -195,12 +249,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)
File.WriteAllLines(shopsItemsFilePath, new[]
{
"-- SQL File created by PacketToSQL app by tDcc#0568",
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `flag`, `guild_trophy`, `item_id`, `item_rank`, `price`,
@"INSERT INTO `shop_items` (`auto_preview_equip`, `category`, `label`, `guild_trophy`, `item_id`, `rarity`, `price`,
`quantity`, `required_achievement_grade`, `required_achievement_id`,
`required_championship_grade`, `required_championship_join_count`, `required_fame_grade`,
`required_guild_merchant_level`, `required_guild_merchant_type`, `required_item_id`,
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `stock_purchased`,
`template_name`, `token_type`)
`required_quest_alliance`, `sale_price`, `shop_id`, `stock_count`, `currency_id`, `currency_type`)
VALUES"
});
}
Expand All@@ -214,11 +267,11 @@ async void CreateShopItemsSqlFile(List<ShopItem> items, int shopId)

foreach (ShopItem shopItem in items)
{
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Flag}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.ItemRank}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
lines.Add($"({(shopItem.AutoPreviewEquip ? "1" : "0")}, '{shopItem.Category}', {(int) shopItem.Label}, {shopItem.GuildTrophy}, {shopItem.ItemId}, " +
$"{shopItem.Rarity}, {shopItem.Price}, {shopItem.Quantity}, {shopItem.RequiredAchievementGrade}, {shopItem.RequiredAchievementId}, " +
$"{shopItem.RequiredChampionshipGrade}, {shopItem.RequiredChampionshipJoinCount}, {shopItem.RequiredFameGrade}, " +
$"{shopItem.RequiredGuildMerchantLevel}, {shopItem.RequiredGuildMerchantType}, {shopItem.RequiredItemId}, {shopItem.RequiredQuestAlliance}, " +
$"{shopItem.SalePrice}, {shopId}, 0, 0, '{shopItem.TemplateName}', {(int) shopItem.TokenType}),");
$"{shopItem.SalePrice}, {shopId}, {shopItem.StockCount}, '{shopItem.CurrencyId}', {(int) shopItem.CurrencyType}),");
}

lines.Add("");
Expand DownExpand Up@@ -255,7 +308,7 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
short quantity = maplePacket.ReadShort();
maplePacket.ReadByte();
byte flag = maplePacket.ReadByte();
string templateName = maplePacket.ReadString();
string currencyId = maplePacket.ReadString();
short requiredQuestAlliance = maplePacket.ReadShort();
int requiredFameGrade = maplePacket.ReadInt();
bool autoPreviewEquip = maplePacket.ReadBool();
Expand All@@ -264,10 +317,10 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
{
AutoPreviewEquip = autoPreviewEquip,
Category = category,
Flag = (ShopItemFlag) flag,
Label = (ShopItemLabel) flag,
GuildTrophy = guildTrophy,
ItemId = itemId,
ItemRank = itemRank,
Rarity = itemRank,
Price = price,
RequiredAchievementGrade = requiredAchievementGrade,
RequiredAchievementId = requiredAchievementId,
Expand All@@ -281,8 +334,8 @@ ShopItem ReadItemShop(MaplePacket maplePacket)
SalePrice = salePrice,
StockCount = stockCount,
StockPurchased = stockPurchased,
TemplateName = templateName,
TokenType = (ShopCurrencyType) tokenType,
CurrencyId = currencyId,
CurrencyType = (ShopCurrencyType) tokenType,
Quantity = quantity
};
}
54 changes: 34 additions & 20 deletions PacketToSQL/Types/Shop.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,29 @@

public class Shop
{
public int Id { get; set; }
public int Category { get; set; }
public string Name { get; set; }
public ShopType ShopType { get; set; }
public bool RestrictSales { get; set; }
public bool CanRestock { get; set; }
public long NextRestock { get; set; }
public bool AllowBuyback { get; set; }
public List<ShopItem> Items { get; set; }
public int Id;
public int Category;
public string Name;
public ShopType ShopType;
public bool HideUnuseable;
public bool HideStats;
public bool DisableBuyback;
public bool OpenWallet;
public bool DisplayNew;
public bool RandomizeOrder;
public bool CanRestock;
public long NextRestock;
public int RestockMinInterval;
public byte RestockInterval;
public byte RestockCurrencyType;
public byte ExcessRestockCurrencyType;
public int RestockCost;
public bool EnableRestockCostMultiplier;
public int TotalRestockCount;
public bool DisableInstantRestock;
public bool PersistantInventory;
public int PullCount;
public List<ShopItem> Items;

public Shop() { }

Expand All@@ -20,22 +34,22 @@ public Shop(int id, int category, string name, byte shop_type, bool restrict_sal
Category = category;
Name = name;
ShopType = (ShopType) shop_type;
RestrictSales = restrict_sales;
DisableBuyback = restrict_sales;
CanRestock = can_restock;
NextRestock = next_restock;
AllowBuyback = allow_buyback;
HideUnuseable = allow_buyback;
}
}

public class ShopItem
{
public int Uid;
public int ItemId;
public ShopCurrencyType TokenType;
public ShopCurrencyType CurrencyType;
public int RequiredItemId;
public int Price;
public int SalePrice;
public byte ItemRank;
public byte Rarity;
public int StockCount;
public int StockPurchased;
public int GuildTrophy;
Expand All@@ -47,8 +61,8 @@ public class ShopItem
public byte RequiredGuildMerchantType;
public short RequiredGuildMerchantLevel;
public short Quantity;
public ShopItemFlag Flag;
public string TemplateName;
public ShopItemLabel Label;
public string CurrencyId;
public short RequiredQuestAlliance;
public int RequiredFameGrade;
public bool AutoPreviewEquip;
Expand All@@ -60,10 +74,10 @@ public ShopItem(dynamic data)
Uid = data.uid;
AutoPreviewEquip = data.auto_preview_equip;
Category = data.category;
Flag = (ShopItemFlag) data.flag;
Label = (ShopItemLabel) data.label;
GuildTrophy = data.guild_trophy;
ItemId = data.item_id;
ItemRank = data.item_rank;
Rarity = data.rarity;
Price = data.price;
RequiredAchievementGrade = data.required_achievement_grade;
RequiredAchievementId = data.required_achievement_id;
Expand All@@ -77,8 +91,8 @@ public ShopItem(dynamic data)
SalePrice = data.sale_price;
StockCount = data.stock_count;
StockPurchased = data.stock_purchased;
TemplateName = data.template_name;
TokenType = (ShopCurrencyType) data.token_type;
CurrencyId = data.template_name;
CurrencyType = (ShopCurrencyType) data.currency_type;
Quantity = data.quantity;
}
}
Expand DownExpand Up@@ -110,7 +124,7 @@ public enum ShopType : byte
Capsule = 4
}

public enum ShopItemFlag : byte
public enum ShopItemLabel : byte
{
None = 0,
New = 1,
Expand Down