Module:Development - Revision history

Botkaze: 17 revisions imported

2021-05-12T12:48:03Z

17 revisions imported

Botkaze at 13:12, 22 June 2020

2020-06-22T13:12:41Z

がか at 21:55, 15 April 2018

2018-04-15T21:55:11Z

がか at 21:27, 15 April 2018

2018-04-15T21:27:53Z

がか at 21:13, 15 April 2018

2018-04-15T21:13:45Z

がか at 21:07, 15 April 2018

2018-04-15T21:07:50Z

がか at 20:46, 15 April 2018

2018-04-15T20:46:11Z

がか at 20:44, 15 April 2018

2018-04-15T20:44:54Z

がか at 20:27, 15 April 2018

2018-04-15T20:27:29Z

がか at 20:26, 15 April 2018

2018-04-15T20:26:58Z

← Older revision		Revision as of 13:12, 22 June 2020
Line 1:		Line 1:
−	local U = require("Module:~~Utils~~")	+	local U = require("Module:Core")

	local Self = {}		local Self = {}

@@ Line 289: / Line 289: @@
+}
 --]]
 function ensureResourceGroup(fuel, ammo, steel, bauxite, resourceGroup)
@@ Line 321: / Line 308: @@
          local result = {}
          local id = eq:id()
          local fuel = (eq:scrap().fuel or 1) * 10
          local ammo = (eq:scrap().ammo or 1) * 10
@@ Line 327: / Line 313: @@
          local bauxite = (eq:scrap().bauxite or 1) * 10
          local maxRate
-         for typeGroup, resourceGroups in pairs(groups) do
+         for typeGroup, resourceGroups in ipairs(Self.groups) do
-             for resourceGroup, n in pairs(resourceGroups) do
+             for resourceGroup, equipment in ipairs(resourceGroups) do
-                 local fuel, ammo, steel, bauxite = ensureResourceGroup(fuel, ammo, steel, bauxite, resourceGroup)
+                 if equipment[id] and equipment[id] > 0 then
-                local recipe = U.format{
+                    local fuel, ammo, steel, bauxite = ensureResourceGroup(fuel, ammo, steel, bauxite, resourceGroup)
-                    "${fuel}/${ammo}/${steel}/${bauxite}",
+                    local recipe = U.format{
-                    fuel = fuel,
+                        "${fuel}/${ammo}/${steel}/${bauxite}",
-                    ammo = ammo,
+                        fuel = fuel,
-                    steel = steel,
+                        ammo = ammo,
-                    bauxite = bauxite,
+                        steel = steel,
+                        bauxite = bauxite,
-                result[recipe] = result[recipe] or {
-                    fuel = fuel,
+                    result[recipe] = result[recipe] or {
-                    ammo = ammo,
+                        fuel = fuel,
-                    steel = steel,
+                        ammo = ammo,
-                    bauxite = bauxite,
+                        steel = steel,
-                    resourceGroup = resourceGroup,
+                        bauxite = bauxite,
-                    types = {},
+                        resourceGroup = resourceGroup,
+                        types = {},
-                local rate = U.round(100 * n / 50)
-                result[recipe].types[Self.typeGroups[typeGroup]] = rate
+                    local rate = U.round(100 * equipment[id] / 50)
-                if not maxRate or rate > maxRate then
+                    result[recipe].types[Self.typeGroups[typeGroup]] = result[recipe].types[Self.typeGroups[typeGroup]] or {
-                    maxRate = rate
+                        rate = rate,
                  end
              end
@@ Line 368: / Line 359: @@
                          },
                          types = U.ijoin(U.imap(types, function(type)
-                             local rate = result[recipe].types[type]
+                             local rate = result[recipe].types[type].rate
                              return (rate == maxRate and U.red or U.id)(type)
                          end), "/"),
                          rates = U.ijoin(U.imap(types, function(type)
-                             local rate = result[recipe].types[type]
+                             local rate = result[recipe].types[type].rate
-                             return (rate == maxRate and U.red or U.id)(tostring(result[recipe].types[type]) .. "%")
+                             return (rate == maxRate and U.red or U.id)(tostring(rate) .. "%")
                          end), "/"),
+                     }

@@ Line 332: / Line 332: @@
                  local recipe = U.format{
                      "${fuel}/${ammo}/${steel}/${bauxite}",
-                     fuel = (resourceGroup == 1 and U.red or U.id)(fuel),
+                     fuel = fuel,
-                     ammo = (resourceGroup == 2 and U.red or U.id)(ammo),
+                    ammo = ammo,
-                     steel = (resourceGroup == 1 and U.red or U.id)(steel),
+                    steel = steel,
-                     bauxite = (resourceGroup == 3 and U.red or U.id)(bauxite),
+                    bauxite = bauxite,
+                 }
                  local rate = U.round(100 * n / 50)
-                 result[recipe] = result[recipe] or {}
+                 result[recipe].types[Self.typeGroups[typeGroup]] = rate
                  if not maxRate or rate > maxRate then
                      maxRate = rate
@@ Line 349: / Line 356: @@
                  U.isort(U.keys(result)),
                  function(recipe)
-                     local types = U.isort(U.keys(result[recipe]))
+                     local types = U.isort(U.keys(result[recipe].types))
                      return U.format{
                          rates and "${rates}" or "${recipe} (${types})",
-                         recipe = recipe,
+                         recipe = U.format{
                          types = U.ijoin(U.imap(types, function(type)
-                             local rate = result[recipe][type]
+                             local rate = result[recipe].types[type]
                              return (rate == maxRate and U.red or U.id)(type)
                          end), "/"),
                          rates = U.ijoin(U.imap(types, function(type)
-                             local rate = result[recipe][type]
+                             local rate = result[recipe].types[type]
-                             return (rate == maxRate and U.red or U.id)(tostring(result[recipe][type]) .. "%")
+                             return (rate == maxRate and U.red or U.id)(tostring(result[recipe].types[type]) .. "%")
                          end), "/"),
+                     }

@@ Line 326: / Line 326: @@
          local steel = (eq:scrap().steel or 1) * 10
          local bauxite = (eq:scrap().bauxite or 1) * 10
          for typeGroup, resourceGroups in pairs(groups) do
              for resourceGroup, n in pairs(resourceGroups) do
@@ Line 336: / Line 337: @@
                      bauxite = (resourceGroup == 3 and U.red or U.id)(bauxite),
+                 }
                  result[recipe] = result[recipe] or {}
-                 result[recipe][Self.typeGroups[typeGroup]] = U.round(100 * n / 50)
+                 result[recipe][Self.typeGroups[typeGroup]] = rate
              end
          end
@@ Line 345: / Line 350: @@
                  function(recipe)
                      local types = U.isort(U.keys(result[recipe]))
                      return U.format{
                          rates and "${rates}" or "${recipe} (${types})",

@@ Line 331: / Line 331: @@
                  local recipe = U.format{
                      "${fuel}/${ammo}/${steel}/${bauxite}",
-                     fuel = fuel,
+                     fuel = (resourceGroup == 1 and U.red or U.id)(fuel),
-                     ammo = ammo,
+                     ammo = (resourceGroup == 2 and U.red or U.id)(ammo),
-                     steel = steel,
+                     steel = (resourceGroup == 1 and U.red or U.id)(steel),
-                     bauxite = bauxite,
+                     bauxite = (resourceGroup == 3 and U.red or U.id)(bauxite),
+                 }
                  result[recipe] = result[recipe] or {}
@@ Line 345: / Line 345: @@
                  function(recipe)
                      local types = U.isort(U.keys(result[recipe]))
                      return U.format{
                          rates and "${rates}" or "${recipe} (${types})",
                          recipe = recipe,
-                         types = U.ijoin(types, "/"),
+                         types = U.ijoin(U.imap(types, function(type)
-                         rates = U.ijoin(U.imap(types, function(type) return tostring(result[recipe][type]) .. "%" end), "/"),
+                            local rate = result[recipe][type]
+                     }
                  end

← Older revision	Revision as of 12:48, 12 May 2021
(No difference)

@@ Line 317: / Line 317: @@
 end
-function Self.formatResources(eq)
+function Self.formatResources(eq, rates)
      if eq:buildable() then
          local result = {}
@@ Line 327: / Line 327: @@
          local bauxite = (eq:scrap().bauxite or 1) * 10
          for typeGroup, resourceGroups in pairs(groups) do
-             for resourceGroup, _ in pairs(resourceGroups) do
+             for resourceGroup, n in pairs(resourceGroups) do
                  local fuel, ammo, steel, bauxite = ensureResourceGroup(fuel, ammo, steel, bauxite, resourceGroup)
                  local recipe = U.format{
@@ Line 337: / Line 337: @@
+                 }
                  result[recipe] = result[recipe] or {}
-                 result[recipe][Self.typeGroups[typeGroup]] = true
+                 result[recipe][Self.typeGroups[typeGroup]] = U.round(100 * n / 50)
              end
          end
@@ Line 344: / Line 344: @@
                  U.isort(U.keys(result)),
                  function(recipe)
                      return U.format{
-                         "${recipe} (${types})",
+                         rates and "${rates}" or "${recipe} (${types})",
                          recipe = recipe,
-                         types = U.ijoin(U.isort(U.keys(result[recipe])), "/")
+                         types = U.ijoin(types, "/"),
+                     }
                  end
@@ Line 354: / Line 356: @@
+         )
      else
-         return 'N/A'
+         return "-"
      end
 end
 function Self.formatRates(eq)
-     return "?"
+     return Self.formatResources(eq, true)
 end
 function Self.formatHQ(eq)
-     return math.max(math.max((eq:rarity() or 0) - 2, 0) * 10, 1)
+     if eq:buildable() then
 end
@@ Line 370: / Line 376: @@
      return
          Self.formatResources(Equipment("46cm Triple Gun Mount")) ..
          "\n" ..
          Self.formatResources(Equipment("12cm Single Gun Mount"))