Module:EventComp - Revision history

Botkaze: 16 revisions imported

2022-03-12T12:43:54Z

16 revisions imported

2020-06-22T13:12:32Z

2018-04-12T16:20:10Z

2016-09-18T07:16:11Z

2015-08-10T06:58:55Z

2015-08-10T06:58:12Z

2015-08-10T06:57:23Z

2015-08-10T06:56:51Z

2015-08-10T05:00:32Z

2015-08-10T04:35:39Z

Undo revision 404945 by Nanamin (talk)

@@ Line 5: / Line 5: @@
 local Equipment = require('Module:Equipment')
 local Formatting = require('Module:Formatting')
-local format = require('Module:Utils').format
+local format = require('Module:Core').format
 local EventComp = {

@@ Line 5: / Line 5: @@
 local Equipment = require('Module:Equipment')
 local Formatting = require('Module:Formatting')
-local format = require('Module:StringInterpolation').format
+local format = require('Module:Utils').format
 local EventComp = {

@@ Line 58: / Line 58: @@
      local types_allowed = { [6] = true, [7] = true, [8] = true, [11] = true }
      if types_allowed[equip:type()] and equip:aa() then
-         self._fighter_power = self._fighter_power + math.floor(math.sqrt(planes) * equip:aa())
+         self._fighter_power = self._fighter_power + math.floor(math.sqrt(planes or 0) * equip:aa())
      end

@@ Line 53: / Line 53: @@
 end
-function EventComp:process_equipment(equip, slot)
+function EventComp:process_equipment(equip, planes)
      --Fighter power
      --Only fighter planes, dive bombers, torpedo bombers and seaplane bombers with an AA stat are counted

@@ Line 53: / Line 53: @@
 end
-function EventComp:process_equipment(ship, equip, slot)
+function EventComp:process_equipment(equip, slot)
      --Fighter power
      --Only fighter planes, dive bombers, torpedo bombers and seaplane bombers with an AA stat are counted

@@ Line 89: / Line 89: @@
              local equip = self._equip_class(item_key)
              table.insert(entry.equips, equip)
-             self:process_equipment(equip, select(2, ship:slot(#entry.equips)))
+             self:process_equipment(equip, select(2, entry.ship:slot(#entry.equips)))
          elseif entry.ship then
              entry.level = tonumber(item_key)

@@ Line 53: / Line 53: @@
 end
-function EventComp:process_equipment(equip)
+function EventComp:process_equipment(ship, equip, slot)
      --Fighter power
      --Only fighter planes, dive bombers, torpedo bombers and seaplane bombers with an AA stat are counted
@@ Line 87: / Line 87: @@
+             }
          elseif entry.ship and entry.level then
-             table.insert(entry.equips, self._equip_class(item_key))
+            local equip = self._equip_class(item_key)
          elseif entry.ship then
              entry.level = tonumber(item_key)
@@ Line 117: / Line 119: @@
              if column == "equipment" then
                  for index, equip in ipairs(row_values[column]) do
                      local values = { equip_name = Formatting:format_link(equip:link()), style = "" }
                      if index == #row_values[column] then values.style = "border-bottom: 1px solid grey;" end

@@ Line 120: / Line 120: @@
                      local values = { equip_name = Formatting:format_link(equip:link()), style = "" }
                      if index == #row_values[column] then values.style = "border-bottom: 1px solid grey;" end
-                     table.insert(self._rows, "| style=\"" .. values.style .. "\" |" .. Formatting:format_image{Formatting:format_equipment_icon(equip:icon())})
+                     table.insert(self._rows, "| style=\"" .. values.style .. "\" |" .. Formatting:format_image{Formatting:format_equipment_icon(equip:icon()), size = '20px'})
                      table.insert(self._rows, format(self._column_cell_templates[column], values))
                      table.insert(self._rows, "|-")

@@ Line 75: / Line 75: @@
+     }
      for index, item_key in ipairs(self._args) do
-         if item_key == "-" then
+         if index == #self._args then
              table.insert(self._items, entry)
@@ Line 97: / Line 100: @@
          end
      end
 end