Module:Iterator - Revision history

がか at 16:19, 7 November 2025

2025-11-07T16:19:45Z

がか at 15:31, 7 November 2025

2025-11-07T15:31:07Z

がか at 15:02, 30 April 2023

2023-04-30T15:02:22Z

がか at 15:00, 30 April 2023

2023-04-30T15:00:23Z

がか at 14:47, 30 April 2023

2023-04-30T14:47:21Z

Chocolatecravinghobo: Module:Collection/Equipment with Module:Data/Equipment

2022-09-11T03:05:37Z

Module:Collection/Equipment with Module:Data/Equipment

Memetails at 02:59, 11 September 2022

2022-09-11T02:59:57Z

Memetails: /* Ships by TrueId (or ID if no true) */

2022-09-11T02:27:00Z

Ships by TrueId (or ID if no true)

Memetails: /* Can leave type nil to return all ships */

2022-09-11T02:17:24Z

Can leave type nil to return all ships

Memetails: /* Protect against nil sort for unknown ship class, etc. */

2022-09-11T00:10:21Z

Protect against nil sort for unknown ship class, etc.

@@ Line 425: / Line 425: @@
      local selectBoss = stringKey('boss', context, n, ''):lower()
-    -- treat unknwon _back as bosses? why it is unknwon?
      local predBoss = selectBoss == 'yes' and
-         function(e) return (e._back or -11) <= -11 end
+         function(e) return e._boss ~= false and (e._boss == true or (e._back or -11) <= -11) end
          or selectBoss == 'no' and
-         function(e) return (e._back or -11) >= -10 end
+         function(e) return e._boss ~= true and (e._boss == false or (e._back or -11) >= -10) end
          or
          function(e) return true end

@@ Line 355: / Line 355: @@
 function Iterator.enemiesBy(context, n, pred, pre)
-     local collection = U.imap(CollectionEnemy, function(name)
+	local base_ids = {}
-        return EnemyShip(name)
+     local collection = U.imap(CollectionEnemy, function(name, i)
      end)
      table.sort(collection, function(a, b)
-         local ai = U.ifind(CollectionEnemy, a:base_name())
+         local ai = base_ids[a:base_name()]
-         local bi = U.ifind(CollectionEnemy, b:base_name())
+         local bi = base_ids[b:base_name()]
          if ai and bi and ai ~= bi then
              return ai < bi
@@ Line 450: / Line 455: @@
      end
-     testIterator('shipsByType', { type = '11', sort = '_class' , listBase = 'true'})
+     --testIterator('shipsByType', { type = '11', sort = '_class' , listBase = 'true'})
-     testIterator('shipsByType', { sort = '_name'})
+     --testIterator('shipsByType', { sort = '_name'})
-     testIterator('shipsByTrueId', { sort = '_id', from = '1', to = '20', listBase = 'true'})
+     --testIterator('shipsByTrueId', { sort = '_id', from = '1', to = '20', listBase = 'true'})
-     testIterator('shipsBy', { pred = 'is_auxiliary' , sort = '_name'})
+     --testIterator('shipsBy', { pred = 'is_auxiliary' , sort = '_name'})
-     testIterator('equipmentById', { from = '11', to = '20' })
+     --testIterator('equipmentById', { from = '11', to = '20' })
-     testIterator('equipmentByIdWithHeaders', { from = '1', to = '30' })
+     --testIterator('equipmentByIdWithHeaders', { from = '1', to = '30' })
-     testIterator('equipmentByType', { type = '2' })
+     --testIterator('equipmentByType', { type = '2' })
-     testIterator('equipmentByType', { type = '1', sort = '_icon' })
+     --testIterator('equipmentByType', { type = '1', sort = '_icon' })
-     testIterator('equipmentByTypeAndIcon', { type = '1', icon = '16' })
+     --testIterator('equipmentByTypeAndIcon', { type = '1', icon = '16' })
-     testIterator('equipmentBy', { pred = 'is_large_caliber_main_gun', sort = '_type' })
+     --testIterator('equipmentBy', { pred = 'is_large_caliber_main_gun', sort = '_type' })
-     testIterator('enemiesByType', { type = '2' })
+     testIterator('enemiesByType', { type = '8' })
 end
 -- p.test()
 return Iterator

@@ Line 194: / Line 194: @@
 function Iterator.shipsByTrueId(context, n)
      local from = numberKey('from', context, n, 1)
-     local to = numberKey('to', context, n, 500)
+     local to = numberKey('to', context, n, 1500)
      return Iterator.shipsBy(context, n, function(e)
          if e._true_id then
@@ Line 277: / Line 277: @@
 function Iterator.equipmentById(context, n)
      local from = numberKey('from', context, n, 1)
-     local to = numberKey('to', context, n, 500)
+     local to = numberKey('to', context, n, 1500)
      return Iterator.equipmentBy(context, n, function(e)
          return e._id >= from and e._id <= to
@@ Line 285: / Line 285: @@
 function Iterator.equipmentByIdWithHeaders(context, n)
      local from = numberKey('from', context, n, 1)
-     local to = numberKey('to', context, n, 500)
+     local to = numberKey('to', context, n, 1500)
      local prevMod = 0
      return Iterator.equipmentBy(
@@ Line 308: / Line 308: @@
 function Iterator.equipmentByIdWithEmptyWithHeaders(context, n)
      local from = numberKey('from', context, n, 1)
-     local to = numberKey('to', context, n, 500)
+     local to = numberKey('to', context, n, 1500)
      local prevMod = 0
      local nItems = (math.floor(U.ilast(CollectionEquipment)._id / 10) + 1) * 10

@@ Line 98: / Line 98: @@
      local collectionKey = stringKey('collection', context, n)
      if collectionKey then
-         local _, CollectionData = U.requireModule(collectionKey == 'Equipment' and 'Data/Equipment' or string.format("Collection/%s", collectionKey))
+         local _, CollectionData = U.requireModule(string.format("Collection/%s", collectionKey))
          preCollection = U.icopy(CollectionData)
      else
@@ Line 218: / Line 218: @@
      local collectionKey = stringKey('collection', context, n)
      if collectionKey then
-         local _, CollectionData = U.requireModule(string.format("Collection/%s", collectionKey))
+         local _, CollectionData = U.requireModule(collectionKey == 'Equipment' and 'Data/Equipment' or string.format("Collection/%s", collectionKey))
          collection = U.icopy(CollectionData)
      else

@@ Line 98: / Line 98: @@
      local collectionKey = stringKey('collection', context, n)
      if collectionKey then
-         local _, CollectionData = U.requireModule(string.format("Collection/%s", collectionKey))
+         local _, CollectionData = U.requireModule(collectionKey == 'Equipment' and 'Data/Equipment' or string.format("Collection/%s", collectionKey))
          preCollection = U.icopy(CollectionData)
      else

@@ Line 9: / Line 9: @@
 local Ship = require('Module:Ship')
 local CollectionShips = require('Module:Collection/Ships')
-local CollectionEquipment = require('Module:Collection/Equipment')
+local CollectionEquipment = require('Module:Data/Equipment')
 local EnemyShip = require('Module:EnemyShip')
 local CollectionEnemy = require('Module:Collection/EnemyShips')

@@ Line 105: / Line 105: @@
      local allowedRemodels = context['allowedRemodels']
-     local listBase = (context['listBase'] == true)
+     local listBase = (context['listBase'] == 'true')
      local collection = {}
      local index = 1
@@ Line 450: / Line 450: @@
      end
-     testIterator('shipsByType', { type = '11', sort = '_class' , listBase = true})
+     testIterator('shipsByType', { type = '11', sort = '_class' , listBase = 'true'})
      testIterator('shipsByType', { sort = '_name'})
-     testIterator('shipsByTrueId', { sort = '_id', from = '1', to = '20', listBase = true})
+     testIterator('shipsByTrueId', { sort = '_id', from = '1', to = '20', listBase = 'true'})
      testIterator('shipsBy', { pred = 'is_auxiliary' , sort = '_name'})

@@ Line 188: / Line 188: @@
      local type = numberKey('type', context, n)
      return Iterator.shipsBy(context, n, function(e)
-         return e._type == type
+         return type == nil or e._type == type
      end)
 end
@@ Line 439: / Line 439: @@
      testIterator('shipsByType', { type = '11', sort = '_class' , listBase = true})
      testIterator('shipsBy', { pred = 'is_auxiliary' , sort = '_name'})

@@ Line 133: / Line 133: @@
      if sortKey then
          table.sort(collection, function(a, b)
-             if a[sortKey] ~= b[sortKey] then
+             if a[sortKey] and b[sortKey] and a[sortKey] ~= b[sortKey] then
                  return a[sortKey] < b[sortKey]
              elseif a._id == b._id then
              	return a._api_id < b._api_id
-        	else
+            else
                  return a._id < b._id
              end
@@ Line 438: / Line 438: @@
      end
-     testIterator('shipsByType', { type = '18', sort = '_id' , listBase = true})
+     testIterator('shipsByType', { type = '11', sort = '_class' , listBase = true})
      testIterator('shipsBy', { pred = 'is_auxiliary' , sort = '_name'})