Module:Calculator/AgilityObstacle: Difference between revisions

← Older edit

Module:Calculator/AgilityObstacle (view source)

Revision as of 13:49, 22 June 2024

415 bytes added , 22 June

m

Fix derp again

Ricewind

2,647

edits

@@ Line 4: / Line 4: @@
 local Num = require('Module:Number')
 local Constants = require('Module:Constants')
+local Modifiers = require('Module:Modifiers')
 local Agility = require('Module:Skills/Agility')
 local Shared = require('Module:Shared')
 local Icons = require('Module:Icons')
+local iconTable = {
+    ['GP']  = function(amount) return Icons._Currency('GP', amount) end,
+    ['SC']  = function(amount) return Icons._Currency('SC', amount) end,
+    ['AP']  = function(amount) return Icons._Currency('AP', amount) end,
+    ['ASC'] = function(amount) return Icons._Currency('ASC', amount) end,
+}
 local function getItemIcon(itemName, amount)
- if itemName == 'GP' then
+ local iconFunc = iconTable[itemName]
- return Icons.GP(amount)
+    if iconFunc then
- end
+        return iconFunc(amount)
+    else
- if itemName == 'SC' then
+        return Icons.Icon({itemName, type='item', qty = amount, notext=true})
- return Icons.SC(amount)
+    end
- end
+end
- return Icons.Icon({itemName, type='item', qty = amount, notext=true})
+local function getObstacleIcon(obstacle)
+ local obs = obstacle.Obstacle
+ return Icons.getExpansionIcon(obs.id) .. Icons.Icon({obs.name, type='agility'})
 end
@@ Line 174: / Line 184: @@
  :wikitext(v.Slot)
  :tag('td')
- :wikitext(Icons.Icon({v.Name, type='agility'}))
+ :wikitext(getObstacleIcon(v))
  end
@@ Line 226: / Line 236: @@
  --== Local Functions for formatting Obstacle MetaData ==--
  local function getBonusses(obstacle)
- local bonuses = {}
+ if obstacle.modifiers == nil then
- for bonusName, bonusValue in pairs(obstacle.modifiers) do
+ return '<span style="color:red">None :(</span>'
- table.insert(bonuses, Constants._getModifierText(bonusName, bonusValue))
+ else
- end
+ return Modifiers.getModifiersText(obstacle.modifiers, true, false, 10)
- if Shared.tableIsEmpty(bonuses) then
- table.insert(bonuses, '<span style="color:red">None :(</span>')
  end
- return table.concat(bonuses, '<br/>')
  end
@@ Line 266: / Line 273: @@
  local function getTotalBonuses(obstacles)
+ --[==[
  local bonuses = {}
  for _, obstacle in pairs(obstacles) do
@@ Line 284: / Line 292: @@
  return table.concat(ret, '<br/>')
+ --]==]
+ return ''
  end
@@ Line 325: / Line 335: @@
  :css('text-align', 'right')
  :wikitext(obstacle.Slot)
- :tag('td'):wikitext(Icons.Icon({obstacle.Name, type='agility'}))
+ :tag('td'):wikitext(getObstacleIcon(obstacle))
  if showbonus then
@@ Line 361: / Line 371: @@
 function p.test()
- local obstacles = {"Rope Climb","Monkey Bars"," Balance Seesaw","Elite Pillar of Conflict"}
+ --local obstacles = {"Rope Climb","Monkey Bars"," Balance Seesaw","Elite Pillar of Conflict"}
- local obs = p.calculateCourse(obstacles)
+ --local obs = p.calculateCourse(obstacles)
+ mw.logObject(getObstacle('rope trap'))
 end
 return p