Digitalstack/otclientv8
2
0
Fork 0
mirror of https://github.com/OTCv8/otclientv8.git synced 2025-10-19 14:13:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 2.5.6 - http://otclient.net/showthread.php?tid=373

Browse Source
This commit is contained in:
OTCv8
2020-09-11 01:13:37 +02:00
parent cf931af49e
commit dfd69fd3b5
19 changed files with 308 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
modules/game_market/market.lua
View File

@@ -35,6 +35,8 @@ itemDetailsPanel = nil
itemStatsPanel = nil
myOffersPanel = nil
currentOffersPanel = nil
myCurrentOffersTab = nil
myOfferHistoryTab = nil
offerHistoryPanel = nil
itemsPanel = nil
selectedOffer = {}
@@ -69,10 +71,12 @@ buyCancelButton = nil
sellCancelButton = nil
buyMyOfferTable = nil
sellMyOfferTable = nil
myOfferHistoryTabel = nil
offerExhaust = {}
marketOffers = {}
marketItems = {}
marketItemNames = {}
information = {}
currentItems = {}
lastCreatedOffer = 0
@@ -114,7 +118,7 @@ local function isItemValid(item, category, searchFilter)
if filterLevel and marketData.requiredLevel and player:getLevel() < marketData.requiredLevel then
return false
end
if filterVocation and marketData.restrictVocation > 0 then
if filterVocation and marketData.restrictVocation and marketData.restrictVocation > 0 then
local voc = Bit.bit(information.vocation)
if not Bit.hasBit(marketData.restrictVocation, voc) then
return false
@@ -146,6 +150,7 @@ local function clearMyOffers()
marketOffers[MarketAction.Sell] = {}
buyMyOfferTable:clearData()
sellMyOfferTable:clearData()
myOfferHistoryTabel:clearData()
end
local function clearFilters()
@@ -181,14 +186,17 @@ local function addOffer(offer, offerType)
local amount = offer:getAmount()
local price = offer:getPrice()
local timestamp = offer:getTimeStamp()
local itemName = offer:getItem():getMarketData().name
local itemName = marketItemNames[offer:getItem():getId()]
if not itemName then
itemName = offer:getItem():getMarketData().name
end
buyOfferTable:toggleSorting(false)
sellOfferTable:toggleSorting(false)
buyMyOfferTable:toggleSorting(false)
sellMyOfferTable:toggleSorting(false)
if amount < 1 then return false end
if offerType == MarketAction.Buy then
if offer.warn then
@@ -202,7 +210,7 @@ local function addOffer(offer, offerType)
{text = comma_value(price*amount), sortvalue = price*amount},
{text = comma_value(price), sortvalue = price},
{text = amount},
{text = string.gsub(os.date('%c', timestamp), " ", " "), sortvalue = timestamp}
{text = string.gsub(os.date('%H:%M %d/%m/%y', timestamp), " ", " "), sortvalue = timestamp}
})
else
row = buyOfferTable:addRow({
@@ -210,7 +218,7 @@ local function addOffer(offer, offerType)
{text = amount},
{text = comma_value(price*amount), sortvalue = price*amount},
{text = comma_value(price), sortvalue = price},
{text = string.gsub(os.date('%c', timestamp), " ", " ")}
{text = string.gsub(os.date('%H:%M %d/%m/%y', timestamp), " ", " ")}
})
end
row.ref = id
@@ -231,7 +239,7 @@ local function addOffer(offer, offerType)
{text = comma_value(price*amount), sortvalue = price*amount},
{text = comma_value(price), sortvalue = price},
{text = amount},
{text = string.gsub(os.date('%c', timestamp), " ", " "), sortvalue = timestamp}
{text = string.gsub(os.date('%H:%M %d/%m/%y', timestamp), " ", " "), sortvalue = timestamp}
})
else
row = sellOfferTable:addRow({
@@ -239,7 +247,7 @@ local function addOffer(offer, offerType)
{text = amount},
{text = comma_value(price*amount), sortvalue = price*amount},
{text = comma_value(price), sortvalue = price},
{text = string.gsub(os.date('%c', timestamp), " ", " "), sortvalue = timestamp}
{text = string.gsub(os.date('%H:%M %d/%m/%y', timestamp), " ", " "), sortvalue = timestamp}
})
end
row.ref = id
@@ -343,6 +351,40 @@ local function updateOffers(offers)
end
end
local function updateHistoryOffers(offers)
myOfferHistoryTabel:toggleSorting(false)
for _, offer in ipairs(offers) do
local offerType = offer:getType()
local id = offer:getId()
local player = offer:getPlayer()
local amount = offer:getAmount()
local price = offer:getPrice()
local timestamp = offer:getTimeStamp()
local itemName = marketItemNames[offer:getItem():getId()]
if not itemName then
itemName = offer:getItem():getMarketData().name
end
local offerTypeName = "?"
if offerType == MarketAction.Buy then
offerTypeName = "Buy"
elseif offerType == MarketAction.Sell then
offerTypeName = "Sell"
end
local row = myOfferHistoryTabel:addRow({
{text = offerTypeName},
{text = itemName},
{text = comma_value(price*amount), sortvalue = price*amount},
{text = comma_value(price), sortvalue = price},
{text = amount},
{text = string.gsub(os.date('%H:%M %d/%m/%y', timestamp), " ", " "), sortvalue = timestamp}
})
end
myOfferHistoryTabel:toggleSorting(false)
myOfferHistoryTabel:sort()
end
local function updateDetails(itemId, descriptions, purchaseStats, saleStats)
if not selectedItem then
return
@@ -698,13 +740,45 @@ local function onMarketMessage(messageMode, message)
Market.displayMessage(message)
end
local function initMarketItems()
local function initMarketItems(items)
for c = MarketCategory.First, MarketCategory.Last do
marketItems[c] = {}
end
marketItemNames = {}
-- save a list of items which are already added
local itemSet = {}
-- parse items send by server
if items then
for _, entry in ipairs(items) do
local item = Item.create(entry.id)
local thingType = g_things.getThingType(entry.id, ThingCategoryItem)
if item and thingType and not marketItemNames[entry.id] then
-- create new marketItem block
local marketItem = {
displayItem = item,
thingType = thingType,
marketData = {
name = entry.name,
category = entry.category,
requiredLevel = 0,
restrictVocation = 0,
showAs = entry.id,
tradeAs = entry.id
}
}
-- add new market item
if marketItems[entry.category] ~= nil then
table.insert(marketItems[entry.category], marketItem)
marketItemNames[entry.id] = entry.name
end
end
end
Market.updateCategories()
return
end
-- populate all market items
local types = g_things.findThingTypeByAttr(ThingAttrMarket, 0)
@@ -777,16 +851,31 @@ local function initInterface()
offersTabBar:setContentWidget(myOffersPanel:getChildById('offersTabContent'))
currentOffersPanel = g_ui.loadUI('ui/myoffers/currentoffers')
offersTabBar:addTab(tr('Current Offers'), currentOffersPanel)
myCurrentOffersTab = offersTabBar:addTab(tr('Current Offers'), currentOffersPanel)
offerHistoryPanel = g_ui.loadUI('ui/myoffers/offerhistory')
offersTabBar:addTab(tr('Offer History'), offerHistoryPanel)
myOfferHistoryTab = offersTabBar:addTab(tr('Offer History'), offerHistoryPanel)
balanceLabel = marketWindow:getChildById('balanceLabel')
mainTabBar.onTabChange = function(widget, tab)
if tab == myOffersTab then
Market.refreshMyOffers()
local ctab = offersTabBar:getCurrentTab()
if ctab == myCurrentOffersTab then
Market.refreshMyOffers()
elseif ctab == myOfferHistoryTab then
Market.refreshMyOffersHistory()
end
else
Market.refreshOffers()
end
end
offersTabBar.onTabChange = function(widget, tab)
if tab == myCurrentOffersTab then
Market.refreshMyOffers()
elseif tab == myOfferHistoryTab then
Market.refreshMyOffersHistory()
end
end
@@ -859,6 +948,8 @@ local function initInterface()
-- setup my offers
buyMyOfferTable = currentOffersPanel:recursiveGetChildById('myBuyingTable')
sellMyOfferTable = currentOffersPanel:recursiveGetChildById('mySellingTable')
myOfferHistoryTabel = offerHistoryPanel:recursiveGetChildById('myHistoryTable')
buyMyOfferTable.onSelectionChange = onSelectMyBuyOffer
sellMyOfferTable.onSelectionChange = onSelectMySellOffer
@@ -878,6 +969,7 @@ local function initInterface()
buyMyOfferTable:setSorting(3, TABLE_SORTING_DESC)
sellMyOfferTable:setSorting(3, TABLE_SORTING_DESC)
myOfferHistoryTabel:setSorting(6, TABLE_SORTING_DESC)
end
function init()
@@ -937,9 +1029,18 @@ function Market.updateCategories()
subCategoryList:clearOptions()
local categories = {}
local addedCategories = {}
for _, c in ipairs(g_things.getMarketCategories()) do
table.insert(categories, getMarketCategoryName(c) or "Unknown")
addedCategories[c] = true
end
for c, items in ipairs(marketItems) do
if #items > 0 and not addedCategories[c] then
table.insert(categories, getMarketCategoryName(c) or "Unknown")
addedCategories[c] = true
end
end
table.sort(categories)
for _, c in ipairs(categories) do
categoryList:addOption(c)
@@ -993,6 +1094,9 @@ function Market.isOfferSelected(type)
end
function Market.getDepotCount(itemId)
if not information.depotItems then
return 0
end
return information.depotItems[itemId] or 0
end
@@ -1108,7 +1212,12 @@ function Market.refreshOffers()
if Market.isItemSelected() then
Market.onItemBoxChecked(selectedItem.ref)
else
Market.refreshMyOffers()
local ctab = offersTabBar:getCurrentTab()
if ctab == myCurrentOffersTab then
Market.refreshMyOffers()
elseif ctab == myOfferHistoryTab then
Market.refreshMyOffersHistory()
end
end
end
@@ -1117,6 +1226,11 @@ function Market.refreshMyOffers()
MarketProtocol.sendMarketBrowseMyOffers()
end
function Market.refreshMyOffersHistory()
clearMyOffers()
MarketProtocol.sendMarketBrowseMyHistory()
end
function Market.loadMarketItems(category)
clearItems()
@@ -1242,9 +1356,9 @@ end
-- protocol callback functions
function Market.onMarketEnter(depotItems, offers, balance, vocation)
if not loaded then
initMarketItems()
function Market.onMarketEnter(depotItems, offers, balance, vocation, items)
if not loaded or (items and #items > 0) then
initMarketItems(items)
loaded = true
end
@@ -1301,8 +1415,12 @@ function Market.onMarketDetail(itemId, descriptions, purchaseStats, saleStats)
updateDetails(itemId, descriptions, purchaseStats, saleStats)
end
function Market.onMarketBrowse(offers)
updateOffers(offers)
function Market.onMarketBrowse(offers, offersType)
if offersType == MarketRequest.MyHistory then
updateHistoryOffers(offers)
else
updateOffers(offers)
end
end
function Market.onCoinBalance(coins, transferableCoins)

28
modules/game_market/marketprotocol.lua
View File

@@ -39,15 +39,31 @@ end
-- parsing protocols
local function parseMarketEnter(protocol, msg)
local items
if g_game.getClientVersion() < 944 then
items = {}
local itemsCount = msg:getU16()
for i = 1, itemsCount do
local itemId = msg:getU16()
local category = msg:getU8()
local name = msg:getString()
table.insert(items, {
id = itemId,
category = category,
name = name
})
end
end
local balance
if g_game.getClientVersion() >= 981 then
if g_game.getClientVersion() >= 981 or g_game.getClientVersion() < 944 then
balance = msg:getU64()
else
balance = msg:getU32()
end
local vocation = -1
if g_game.getClientVersion() < 950 then
if g_game.getClientVersion() >= 944 and g_game.getClientVersion() < 950 then
vocation = msg:getU8() -- get vocation id
end
local offers = msg:getU8()
@@ -61,7 +77,7 @@ local function parseMarketEnter(protocol, msg)
depotItems[itemId] = itemCount
end
signalcall(Market.onMarketEnter, depotItems, offers, balance, vocation)
signalcall(Market.onMarketEnter, depotItems, offers, balance, vocation, items)
return true
end
@@ -134,7 +150,7 @@ local function parseMarketBrowse(protocol, msg)
table.insert(offers, readMarketOffer(msg, MarketAction.Sell, var))
end
signalcall(Market.onMarketBrowse, offers)
signalcall(Market.onMarketBrowse, offers, var)
return true
end
@@ -215,6 +231,10 @@ function MarketProtocol.sendMarketBrowseMyOffers()
MarketProtocol.sendMarketBrowse(MarketRequest.MyOffers)
end
function MarketProtocol.sendMarketBrowseMyHistory()
MarketProtocol.sendMarketBrowse(MarketRequest.MyHistory)
end
function MarketProtocol.sendMarketCreateOffer(type, spriteId, amount, price, anonymous)
if g_game.getFeature(GamePlayerMarket) then
local msg = OutputMessage.create()

40
modules/game_market/ui/myoffers/currentoffers.otui
View File

@@ -46,17 +46,18 @@ Panel
text-offset: 0 2
anchors.top: parent.top
anchors.left: parent.left
margin-top: 44
margin-top: 20
margin-left: 6
Table
id: mySellingTable
anchors.top: prev.bottom
anchors.left: prev.left
anchors.left: parent.left
anchors.right: parent.right
height: 150
height: 160
margin-top: 5
margin-bottom: 5
margin-left: 6
margin-right: 6
padding: 1
focusable: false
@@ -82,10 +83,10 @@ Panel
width: 125
OfferTableHeaderColumn
!text: tr('Amount')
width: 110
width: 100
OfferTableHeaderColumn
!text: tr('Auction End')
width: 110
width: 120
TableData
id: mySellingTableData
@@ -103,34 +104,35 @@ Panel
step: 28
pixels-scroll: true
Label
!text: tr('Buy Offers')
font: verdana-11px-rounded
text-offset: 0 2
anchors.top: prev.bottom
anchors.left: parent.left
margin-top: 20
margin-left: 6
Button
id: buyCancelButton
!text: tr('Cancel')
anchors.right: parent.right
anchors.top: prev.bottom
anchors.bottom: prev.bottom
margin-top: 5
margin-right: 6
width: 80
enabled: false
Label
!text: tr('Buy Offers')
font: verdana-11px-rounded
text-offset: 0 2
anchors.top: prev.top
anchors.left: parent.left
margin-top: 9
margin-left: 6
Table
id: myBuyingTable
anchors.top: prev.bottom
anchors.left: prev.left
anchors.left: parent.left
anchors.right: parent.right
margin-top: 5
margin-bottom: 5
margin-left: 6
margin-right: 6
height: 150
height: 160
padding: 1
focusable: false
background-color: #222833
@@ -155,10 +157,10 @@ Panel
width: 125
OfferTableHeaderColumn
!text: tr('Amount')
width: 110
width: 100
OfferTableHeaderColumn
!text: tr('Auction End')
width: 110
width: 120
TableData
id: myBuyingTableData

58
modules/game_market/ui/myoffers/offerhistory.otui
View File

@@ -2,8 +2,60 @@ Panel
background-color: #22283399
margin: 1
Label
!text: tr('Offer History')
Table
id: myHistoryTable
anchors.top: parent.top
anchors.left: parent.left
margin-left: 10
anchors.right: parent.right
height: 390
margin-top: 5
margin-bottom: 5
margin-left: 8
margin-right: 8
padding: 1
focusable: false
background-color: #222833
border-width: 1
border-color: #191f27
table-data: myHistoryTableData
row-style: OfferTableRow
column-style: OfferTableColumn
header-column-style: false
header-row-style: false
OfferTableHeaderRow
id: header
OfferTableHeaderColumn
!text: tr('Action')
width: 60
OfferTableHeaderColumn
!text: tr('Item Name')
width: 140
OfferTableHeaderColumn
!text: tr('Total Price')
width: 115
OfferTableHeaderColumn
!text: tr('Piece Price')
width: 115
OfferTableHeaderColumn
!text: tr('Amount')
width: 75
OfferTableHeaderColumn
!text: tr('Auction End')
width: 120
TableData
id: myHistoryTableData
anchors.bottom: myHistoryTable.bottom
anchors.left: myHistoryTable.left
anchors.right: myHistoryTable.right
margin-top: 2
vertical-scrollbar: myHistoryTableScrollBar
VerticalScrollBar
id: myHistoryTableScrollBar
anchors.top: myHistoryTable.top
anchors.bottom: myHistoryTable.bottom
anchors.right: myHistoryTable.right
step: 28
pixels-scroll: true

4
modules/game_outfit/outfit.lua
View File

@@ -54,7 +54,9 @@ end
function setupSelector(widget, id, outfit, list)
widget:setId(id)
widget.title:setText(id:gsub("^%l", string.upper))
table.insert(list, 1, {0, "-"})
if id ~= "type" or #list == 0 then
table.insert(list, 1, {0, "-"})
end
local pos = 1
for i, o in pairs(list) do

4
modules/game_outfit/outfitwindow.otui
View File

@@ -46,7 +46,7 @@ OutfitSelectorPanel < Panel
MainWindow
!text: tr('Select Outfit')
size: 540 330
size: 560 330
@onEnter: modules.game_outfit.accept()
@onEscape: modules.game_outfit.destroy()
@@ -162,7 +162,7 @@ MainWindow
layout:
type: horizontalBox
fit-children: true
spacing: 3
spacing: 8
Button
id: outfitOkButton

7
modules/game_protocol/protocol.lua Normal file
View File

@@ -0,0 +1,7 @@
function init()
end
function terminate()
end

11
modules/game_protocol/protocol.otmod Normal file
View File

@@ -0,0 +1,11 @@
Module
name: game_protocol
description: Game protocol
author: otclientv8
website: http://otclient.ovh
scripts: [ protocol ]
sandboxed: true
autoload: true
autoload-priority: 500
@onLoad: init()
@onUnload: terminate()

4
modules/game_skills/skills.otui
View File

@@ -202,11 +202,11 @@ MiniWindow
SmallSkillButton
id: skillId11
SkillNameLabel
!text: tr('Life Leech Chance')
!text: tr('Mana Leech Chance')
SkillValueLabel
SmallSkillButton
id: skillId12
SkillNameLabel
!text: tr('Life Leech Amount')
!text: tr('Mana Leech Amount')
SkillValueLabel

1
modules/game_walking/walking.lua
View File

@@ -377,7 +377,6 @@ function walk(dir, ticks)
return
elseif not toTile then
player:lockWalk(100) -- bug fix for missing stairs down on map
return
else
if g_app.isMobile() and dir <= Directions.West then
turn(dir, ticks > 0)

1
modules/gamelib/const.lua
View File

@@ -189,6 +189,7 @@ GameWingsAndAura = 104
GamePlayerStateU32 = 105
GameOutfitShaders = 106
GameForceAllowItemHotkeys = 107
GameCountU16 = 108
GamePacketSizeU32 = 110
GamePacketCompression = 111