wow/buffalo2: Modules/ArtifactPower.lua comparison

comparison Modules/ArtifactPower.lua @ 116:ddfe19d70a34

ArtifactPower: - Further 7.2 accommodations, relating to tokens that grant millions of AP. Currency: - Ancient Mana zones list expanded - Legionfall War Supplies, Nethershards, and Blood of Sargeras are tracked globally PaperDoll: - Should update more effectively when delayed artifact data loads in. WorldState: - Fixed hanging panels after OrderHallCommandBar is hidden.

author	Nenue
date	Wed, 26 Apr 2017 20:06:38 -0400
parents	8c94bee4fdfc
children	589045559484

comparison

equal deleted inserted replaced

-:8c94bee4fdfc
+:ddfe19d70a34
 cache = {},
 fishingCache = {},
 scanQueue = {},
 ItemButtons = {},
 anchorPoint = 'TOP',
-anchorPriority = 2,
+anchorPriority = 3,
 anchorFrom = 'TOP',
 moduleName = 'Artifactor',
 HideCombat = true
 }
 local defaultSettings = {
 firstUse = true,
 autoHide = true,
 }
-local ap = VeneerArtifactPowerMixin
+local Module = VeneerArtifactPowerMixin
 local BAGS_TO_SCAN = {BACKPACK_CONTAINER }
 local TOOLTIP_NAME = 'VeneerAPScanner'
 local POINT_COSTS = {
 100, 300, 325, 350, 375,
 400, 425, 450, 525, 625,
 2440000, 2560000, 2690000, 2825000, 2965000,
 3115000, 3270000, 3435000, 3605000, 3785000,
 3975000, 4175000, 4385000, 4605000
 }
 local FISHING_MAX_TRAITS = 24
-local WEAPON_MAX_TRAITS = 54
+local WEAPON_MAX_TRAITS = 92
+local FRAME_PADDING = 4
+local EQUIPPED_SIZE = 64
 local BUTTON_SIZE = 48
 local FRAME_LIST = {'ContainerFrame1', 'BankFrame'}
 local BAG_FRAMES = {'ContainerFrame1'}
 local BANK_FRAMES = {'BankFrame'}
-function ap:OnLoad()
+function Module:OnLoad()
 self:RegisterEvent('BAG_UPDATE') -- use to obtain bag IDs to scan
 self:RegisterEvent('BAG_UPDATE_DELAYED') -- use to trigger actual scan activity
 self:RegisterEvent('BANKFRAME_OPENED')  -- determine when bank info is available
 self:RegisterEvent('BANKFRAME_CLOSED')  -- " " "
 self:RegisterEvent('ARTIFACT_UPDATE')    -- when artifact data has changed
 self.tooltip = CreateFrame('GameTooltip', TOOLTIP_NAME, self, 'GameTooltipTemplate')
 end
 local ShortNumberString = function (value)
-if value >= 100000 then
+if value >= 1000000 then
+return tostring(floor(value/100000)/10) .. 'M'
+elseif value >= 100000 then
 return tostring(floor(value/1000)) .. 'k'
 elseif value >= 1000 then
 return tostring(floor(value/100)/10) .. 'k'
 else
 return value
 else
 PENDING_HOOKS[name] = args
 end
 end
-function ap:Setup()
+function Module:Setup()
 print(self:GetName()..':Setup()')
 local guid = UnitGUID('player')
 VeneerData.ArtifactPower = VeneerData.ArtifactPower or defaultSettings
 self.db = VeneerData.ArtifactPower
 self.db[guid] = self.db[guid] or {}
 end
 end
 local UNDERLIGHT_ANGLER_ID = 133755
-function ap:ResetCache()
+function Module:ResetCache()
 table.wipe(self.cache.items)
 table.wipe(self.cache.fishing)
 table.wipe(self.cache.bags)
 table.wipe(self.cache.bagItems)
 self:ScanAllBags()
 end
-function ap:QueueBag(containerID)
+function Module:QueueBag(containerID)
 containerID = tonumber(containerID)
 if not containerID then
 return
 end
 print(' queueing', containerID, type(containerID), #BAGS_TO_SCAN , 'in line')
 BAGS_TO_SCAN[#BAGS_TO_SCAN + 1] = containerID
 end
 end
-function ap:Reanchor()
+function Module:Reanchor()
 if Veneer then
 Veneer:DynamicReanchor()
 end
 end
-function ap:OnShow()
+function Module:OnShow()
 print('|cFFFFFF00OnShow()|r')
 for name, args in pairs(PENDING_HOOKS) do
 if _G[name] then
 AddFrameHooks(_G[name], args)
 self.enabled = true
 self:ScanAllBags()
 self:Reanchor()
 end
-function ap:OnHide()
+function Module:OnHide()
 print('|cFF88FF00OnHide()|r', debugstack())
 self:Reanchor()
 end
-function ap:OnEnter()
+function Module:OnEnter()
 GameTooltip:SetOwner(self, 'ANCHOR_CURSOR')
 GameTooltip:AddLine(self.bagAP)
 GameTooltip:AddLine(self.bankAP)
 end
-function ap:TryToShow()
+function Module:TryToShow()
 print('|cFFFFFF00TryToShow()')
 if not InCombatLockdown() then
 for _, name in ipairs(FRAME_LIST) do
 print('failed tests')
 self:Hide()
 end
-function ap:OnEvent(event, ...)
+function Module:OnEvent(event, ...)
 print('|cFF00FF88OnEvent()', event, ...)
 if event == 'PLAYER_ENTERING_WORLD' then
 self:TryToShow()
 elseif event == 'BAG_UPDATE' then
 local containerID = ...
 elseif event == 'PLAYER_REGEN_DISABLED' then
 self:Hide()
 end
 end
-function ap:OnUpdate()
+function Module:OnUpdate()
 if #self.scanQueue >= 1 then
 local scanInfo = tremove(self.scanQueue, 1)
 end
 if IsShiftKeyDown() then
 self.Refresh:Show()
 self.Refresh:Hide()
 end
 end
-function ap:OnMouseDown()
+function Module:OnMouseDown()
 self.enabled = nil
 self:Hide()
 end
-function ap:Update()
+function Module:Update()
 if not self:IsShown() then
 print('|cFFFF4400Update()|r')
 return
 end
 print('|cFF00FFFFUpdate()|r')
 self.worldQuestAP = 0
 if WorldPlan then
 if not self.worldPlanHooked then
 WorldPlan:RegisterDataCallback(function()
+print('data udpate callback')
 self:Update()
 end)
+self.worldPlanHooked = true
 end
 local showWQ
 print('world plan is loaded')
 local worldQuests = WorldPlan:GetQuestPins()
 for index, pin in ipairs(worldQuests) do
-if pin.dataLoaded and (pin.rewardType == WORLD_QUEST_REWARD_TYPE_FLAG_ARTIFACT_POWER) and (pin.isActive) then
+if (pin.rewardType == WORLD_QUEST_REWARD_TYPE_FLAG_ARTIFACT_POWER) and (pin.isActive) and (pin.dataLoaded) then
 showWQ = true
 print(pin.itemNumber)
 self.worldQuestAP = self.worldQuestAP + pin.itemNumber
 end
 end
 local numButtons = 0
 local contentsHeight = 16 + self.SummaryHeader:GetHeight()
 local contentsWidth = self.SummaryHeader:GetWidth() + 16
 if self.profile.knowledgeMultiplier then
-numButtons = self:UpdateArtifactButtons()
+local artifactsWidth = self:UpdateArtifactButtons()
-if numButtons ~= 0 then
+if artifactsWidth ~= 0 then
 contentsHeight = contentsHeight + 64
 end
-contentsWidth = max(contentsWidth, 64*numButtons + 4 * (numButtons+1))
+contentsWidth = max(contentsWidth, artifactsWidth)
 local itemsWidth, itemsHeight = self:UpdateItemButtons()
 contentsHeight = contentsHeight + itemsHeight
 contentsWidth = max(contentsWidth, itemsWidth)
 end
 self:SetWidth(contentsWidth)
 self:SetHeight(contentsHeight)
 self:Reanchor()
 end
-function ap:UpdateArtifactButtons()
+function Module:UpdateArtifactButtons()
 -- Artifact icons, in no particular order
 self.equippedID = C_ArtifactUI.GetEquippedArtifactInfo()
 self.canAddAP = nil
 self.canAddFishingAP = nil
 local hasArtifacts
 local numButtons = 0
 local lastFrame = self
 local fishingID, fishingData
 local index, button
+local equipped =self.profile.artifacts[self.equippedID]
+local buttonsWidth = 0
+if equipped then
+numButtons = numButtons + 1
+button = self.Artifact[numButtons]
+button.relativeFrame = self
+lastFrame = button:SetButton(self.equippedID, equipped, numButtons, true, nil)
+hasArtifacts = true
+buttonsWidth = EQUIPPED_SIZE + (FRAME_PADDING * 2)
+end
 for itemID, artifact in pairs(self.profile.artifacts) do
-if (itemID == UNDERLIGHT_ANGLER_ID)  then
+if (itemID == UNDERLIGHT_ANGLER_ID) then
-if VeneerData.ArtifactPower.EnableFishing then
+-- only add if we have fishing AP items and it's not being shown in the equipped slot
+if VeneerData.ArtifactPower.EnableFishing and (itemID ~= self.equippedID) then
 fishingID = itemID
 fishingData = artifact
 end
 if artifact.level < FISHING_MAX_TRAITS then
 if itemID == self.equippedID then
 self.canAddFishingAP = true
 end
 end
 else
 if artifact.level < WEAPON_MAX_TRAITS then
 if itemID == self.equippedID then
 self.canAddAP = true
+else
+hasArtifacts = true
+numButtons = numButtons + 1
+button = self.Artifact[numButtons]
+button.relativeFrame = lastFrame
+lastFrame = button:SetButton(itemID, artifact, numButtons, (self.equippedID == itemID), nil)
+buttonsWidth = buttonsWidth + lastFrame:GetWidth() + FRAME_PADDING
 end
-hasArtifacts = true
-numButtons = numButtons + 1
-button = self.Artifact[numButtons]
-button.relativeFrame = lastFrame
-lastFrame = button:SetButton(itemID, artifact, numButtons, (self.equippedID == itemID), nil)
 end
 end
 end
 print('hide', i)
 self.Artifact[i]:Hide()
 end
-return numButtons
+return buttonsWidth
 end
-function ap:UpdateItemButtons()
+function Module:UpdateItemButtons()
 print('|cFF00FFFFUpdateItemButtons()|r')
 local apType
 if self.canAddFishingAP then
 apType = true
 return buttonsWidth, buttonsHeight
 end
-function ap:SetItemAction(button, name)
+function Module:SetItemAction(button, name)
 name = name or self.itemName
 if InCombatLockdown() then
 self.itemName = name
 return
 else
 button:SetAttribute('*type*','item')
 button:SetAttribute('*item*', name)
 end
 end
-function ap:GetItemButton(itemID, texture, itemAP, fishing)
+function Module:GetItemButton(itemID, texture, itemAP, fishing)
 print('|cFF00FFFFGetItemButton()|r', itemID, texture, itemAP)
 local button = self.ItemButtons[itemID]
 if not button then
 button = CreateFrame('Button', 'VeneerAPToken'..itemID, self, 'VeneerItemButton')
 print('  created')
 self.ItemButtons[itemID] = button
 self.numItems = self.numItems +  1
 end
-local itemAPtext = itemAP
+button.Label:SetText(ShortNumberString(itemAP))
-if itemAPtext >= 100000 then
-itemAPtext = floor(itemAPtext/1000) .. 'k'
-elseif itemAPtext >= 1000 then
-itemAPtext = (floor(itemAPtext/100)/10 ) .. 'k'
-end
-button.Label:SetText(itemAPtext)
 button.numItems = button.numItems + 1
 return button
 end
-function ap:GetItemAP(itemID, itemLink, bagData)
+function Module:GetItemAP(itemID, itemLink, bagData)
 if not self.cache.items[itemID] then
 print('doing tooltip scan', itemLink, itemID)
 self.tooltip:SetOwner(self, 'ANCHOR_NONE')
 self.tooltip:SetHyperlink(itemLink)
 for i = 3, numLines do
 local text = _G[TOOLTIP_NAME .. 'TextLeft'.. i]:GetText()
 if text then
 text = text:lower():gsub(',', '')
 if text:match('equipped artifact') then
 print(itemLink, '-', tonumber(text))
-local itemAP = text:match('%d+')
+local itemAP = text:match('[%d%.]+')
 if itemAP then
+-- tokens > 1M are described as '%f million'
+if text:match("million") then
+itemAP = tonumber(itemAP) * 1000000
+end
 itemAP = itemAP
 self.cache.items[itemID] = tonumber(itemAP)
 end
 end
 if text:match('fishing artifact') then
 end
 end
 return self.cache.items[itemID], self.cache.fishing[itemID]
 end
-function ap:SetArtifact(itemID, name, texture, currentXP, pointsSpent)
+function Module:SetArtifact(itemID, name, texture, currentXP, pointsSpent)
 print('|cFF00FF00SetArtifact()|r')
 if not self.profile then
 return
 end
 local artifacts = self.profile.artifacts
 artifact.name = name
 artifact.texture = texture
 artifact.currentXP = currentXP
 artifact.level = pointsSpent
-local cost = C_ArtifactUI.GetCostForPointAtRank(pointsSpent)
+artifact.tier = C_ArtifactUI.GetArtifactTier() or ((pointsSpent >= 36) and 2 or 1)
+print('tier', artifact.tier)
+local cost = C_ArtifactUI.GetCostForPointAtRank(pointsSpent, artifact.tier)
 artifact.currentCost = cost
-local pointsAvailable = pointsSpent
-local actualCost = cost
-local actualXP = currentXP
+end
-while actualXP >= actualCost do
+end
-pointsAvailable = pointsAvailable + 1
-actualXP = actualXP - actualCost
+function Module:ScanBag(id)
-print(pointsAvailable, '-', actualCost, '=', actualXP)
-actualCost = C_ArtifactUI.GetCostForPointAtRank(pointsAvailable)
-end
-print('updating', itemID, name,  currentXP, pointsSpent, pointsAvailable, actualXP)
-artifact.actualXP = actualXP
-artifact.actualLevel = pointsAvailable
-artifact.actualCost = actualCost
-end
-end
-function ap:ScanBag(id)
 print('|cFF00FFFFScanBag()|r', id, IsBagOpen(id), GetContainerNumSlots(id))
 local numSlots = GetContainerNumSlots(id)
 local requiresUpdate
 if numSlots == 0 then
 return nil
 end
 local BAG_SLOTS = {0, 1, 2, 3, 4 }
 local BANK_SLOTS = {-1, 5, 6,7, 8, 9, 10, 11, 12}
 local ItemCounts = {}
-function ap:ScanAllBags()
+function Module:ScanAllBags()
 if InCombatLockdown() then
 self.queuedScan = true
 return
 end
 if not self.profile.knowledgeMultiplier then
 self.queuedScan = nil
 self:TryToShow()
 end
 VeneerArtifactButtonMixin = {}
+local Artifact = VeneerArtifactButtonMixin
-function VeneerArtifactButtonMixin:SetButton(itemID, artifact, index, equipped, fishing)
+function Artifact:SetButton(itemID, artifact, index, equipped, fishing)
 print(itemID, index)
 print(artifact.name, artifact.texture, artifact.currentXP)
 self:SetID(itemID)
 if not artifact.currentCost then
 artifact.currentCost = artifact.cost
 self[k] = v
 end
 self.isFishing = fishing
 -- this can change between artifact parses
-local potentialPoints = self.actualLevel
 local totalAP = (itemID ~= UNDERLIGHT_ANGLER_ID) and ((self:GetParent().bankAP or 0) + (self:GetParent().bagAP or 0)) or (self:GetParent().fishingAP or 0)
 print(totalAP)
-local potentialXP = self.actualXP + totalAP
+-- currentXP  what has been spent on the artifact
-self.potentialXP = potentialXP
+-- actualXP   amount
-local potentialCost = C_ArtifactUI.GetCostForPointAtRank(potentialPoints)
+-- totalXP
-while potentialXP >= potentialCost do
+local actualXP = artifact.currentXP + totalAP
-potentialXP = potentialXP - potentialCost
+local actualLevel = artifact.level
-potentialPoints = potentialPoints + 1
+local actualCost = C_ArtifactUI.GetCostForPointAtRank(actualLevel, artifact.tier)
-print('inc estimate', potentialXP, potentialPoints)
-potentialCost = C_ArtifactUI.GetCostForPointAtRank(potentialPoints)
+while actualXP >= actualCost do
-end
+actualXP = actualXP - actualCost
-self.potentialCost = potentialCost
+actualLevel = actualLevel + 1
-self.potentialLevel = potentialPoints
+actualCost = C_ArtifactUI.GetCostForPointAtRank(actualLevel, artifact.tier)
-self.potentialAdjustedXP = potentialXP
+print('* ', actualLevel, actualXP, actualCost)
+end
-self.maxCost = self.currentCost
+self.actualCost = actualCost
-for i = self.level + 1, #POINT_COSTS do
+self.actualLevel = actualLevel
-self.maxCost = self.maxCost + POINT_COSTS[i]
+self.actualXP = actualXP
-end
+self.totalXP = artifact.currentXP + totalAP
 if index ~= 1 then
 self:ClearAllPoints()
 self:SetPoint('TOPLEFT', self.relativeFrame, 'TOPRIGHT', 4, 0)
 else
 self:Update()
 self:Show()
 return self
 end
-function VeneerArtifactButtonMixin:Update()
+function Artifact:Update()
-local r, g, b = 1, 1, 1
+local r1, g1, b1 = 1, 1, 1
-local lR, lG, lB = 1, 1, 0
+local r2, g2, b2 = 1, 1, 0
 local levelText = self.level
-local xpValue = ShortNumberString(self.currentXP)
+local xpText = ShortNumberString(self.currentXP)
-local costValue = self.currentCost
+local costText = ShortNumberString(self.currentCost)
+local remainingText  = ShortNumberString(self.currentCost - self.currentXP)
+-- current:   amount shown in blizz ui
+-- actual:    amount contributing the next level, will be same until current point cap is reached
+-- potential: total of ap on hand
+print(self.currentXP, self.actualXP, self.potentialXP)
 if self.actualLevel ~= self.level then
-levelText, r,g,b = self.actualLevel, 0,1,0
-xpValue, costValue, lR, lG, lB = ShortNumberString(self.potentialXP) .. '\n' .. ShortNumberString(self.potentialCost-self.potentialXP), self.actualCost, 0, 1, 0
+levelText = self.actualLevel
-elseif self.potentialLevel ~= self.level then
+r1, g1, b1 = 0, 1, 0
-levelText, r, g, b = self.potentialLevel, 0,1,1
+r2, g2, b2 = 0, 1, 0
-xpValue, costValue, lR, lG, lB = ShortNumberString(self.potentialXP) .. '\n' .. ShortNumberString(self.potentialCost-self.potentialXP), self.potentialCost, 0,1,1
+xpText = ShortNumberString(self.actualXP)
-else
+costText = ShortNumberString(self.actualCost)
-xpValue, lR, lG, lB = ShortNumberString(self.actualXP) .. '\n|cFFFFFF00' .. ShortNumberString(self.actualCost-self.actualXP)..'|r', 1, 1, 1
+remainingText = ShortNumberString(self.actualCost-self.actualXP)
+--[[elseif self.potentialLevel ~= self.level then
+r1, g1, b1 = 0, 1, 1
+r2, g2, b2 = 0, 1, 1
+costText = ShortNumberString(self.potentialCost)
+remainingText = ShortNumberString(self.potentialCost-self.potentialXP)
+--]]
 end
 self.Level:SetText(levelText)
-self.Level:SetTextColor(r, g, b)
+self.CurrentXP:SetText( xpText )
-self.CurrentXP:SetText( xpValue)
+self.RemainingCost:SetText(remainingText)
-self.CurrentXP:SetTextColor(lR, lG, lB)
+self.Level:SetTextColor(r1, g1, b1)
+self.CurrentXP:SetTextColor(r1, g1, b1)
 if self.isEquipped then
+self:SetSize(64,64)
 self:SetNormalTexture([[Interface\Buttons\ButtonHilight-Square]])
 self:GetNormalTexture():SetBlendMode('ADD')
 self:GetNormalTexture():SetVertexColor(0,1,0)
 else
+self:SetSize(48,48)
 self:SetNormalTexture(nil, 'ADD')
 end
 local currentProgress = (self.currentXP < self.currentCost) and (self.currentXP / self.currentCost) or 1
 if self.level <= 53 then
 else
 self.CurrentProgress:Hide()
 self.ProgressLine:Hide()
 end
-if self.potentialXP > self.currentXP then
+if self.actualXP ~= self.currentXP then
-local projectedProgress = (self.potentialAdjustedXP < self.potentialCost) and (self.potentialXP / self.potentialCost) or 1
+local projectedProgress = (self.actualXP ~= self.actualCost) and (self.actualXP / self.actualCost) or 1
 if (projectedProgress > currentProgress) then
 self.AdjustedProgress:SetPoint('BOTTOM', self.CurrentProgress, 'TOP')
 projectedProgress = projectedProgress - currentProgress
 else
+self.CurrentProgress:Hide()
+self.ProgressLine:Hide()
 self.AdjustedProgress:SetPoint('BOTTOM', self, 'BOTTOM')
 end
-print('show potential', currentProgress, projectedProgress)
+print('show actual', currentProgress, projectedProgress)
 self.AdjustedProgress.animateFrom = self.AdjustedProgress:GetHeight() or 1
 self.AdjustedProgress.animateTo = projectedProgress * self:GetHeight()
 self.AdjustedLine:Show()
 self.AdjustedProgress:Show()
 else
 self.AdjustedProgress:Hide()
 self.AdjustedLine:Hide()
 end
 self.Icon:SetTexture(self.texture)
-self:SetSize(64,64)
+end
-end
+function Artifact:AnimateProgress(region)
-function VeneerArtifactButtonMixin:AnimateProgress(region)
 local cTime = GetTime()
 if not region.animateStart then
 region.animateStart = cTime
 end
 local progressTo, progressFrom = region.animateTo, region.animateFrom
 --print(self:GetName(), progressTo, progressFrom, (progressTo - progressFrom), ceil(progress*10)/10, ceil(height))
 region:SetHeight(height)
 end
 end
-function VeneerArtifactButtonMixin:OnUpdate(sinceLast)
+function Artifact:OnUpdate(sinceLast)
 if self.CurrentProgress.animateTo then
 self:AnimateProgress(self.CurrentProgress)
 end
 if self.AdjustedProgress.animateTo then
 self:AnimateProgress(self.AdjustedProgress)
 end
 end
-function VeneerArtifactButtonMixin:OnEnter()
+function Artifact:OnEnter()
 GameTooltip:SetOwner(self, 'ANCHOR_CURSOR')
 GameTooltip:SetText(self.name)
 GameTooltip:AddLine(ShortNumberString(self.currentXP) .. ' / '..ShortNumberString(self.currentCost), 1, 1, 0)
-if self.potentialXP > self.currentXP then
+if self.totalXP ~= self.currentXP then
-GameTooltip:AddLine(ShortNumberString(self.potentialXP) .. ' potential XP', 0, 1, 1)
+GameTooltip:AddLine(ShortNumberString(self.totalXP) .. ' total XP', 0, 1, 1)
-if self.potentialAdjustedXP ~= self.potentialXP then
+if self.actualXP ~= self.potentialXP then
-GameTooltip:AddLine(ShortNumberString(self.potentialAdjustedXP) .. ' / ' .. ShortNumberString(self.potentialCost).. ' after', 0, 1, 0)
+GameTooltip:AddLine(ShortNumberString(self.actualXP) .. ' / ' .. ShortNumberString(self.actualCost).. ' after', 0, 1, 0)
 end
 end
 if self.actualLevel ~= self.level then
 GameTooltip:AddLine(ShortNumberString(self.actualLevel - self.level) .. ' points unlocked', 0, 1, 1)
 end
 GameTooltip:AddLine(ShortNumberString(self.currentCost - self.currentXP) .. ' needed')
 end
 GameTooltip:Show()
 end
-function VeneerArtifactButtonMixin:OnLeave()
+function Artifact:OnLeave()
 if GameTooltip:IsOwned(self) then
 GameTooltip:Hide()
 end
 end
-function VeneerArtifactButtonMixin:OnHide()
+function Artifact:OnHide()
 if GameTooltip:IsOwned(self) then
 GameTooltip:Hide()
 end
 end
-function VeneerArtifactButtonMixin:OnClick(button, down)
+function Artifact:OnClick(button, down)
 if self.isEquipped then
 SocketInventoryItem(16)
 else
 if IsShiftKeyDown() then
 SocketContainerItem(self.containerID, self.slotID)

Mercurial > wow > buffalo2

comparison Modules/ArtifactPower.lua @ 116:ddfe19d70a34