Module:Ship - Revision history

がか: Undo revision 118188 by がか (talk)

2021-11-02T13:21:39Z

Undo revision 118188 by がか (talk)

2021-11-02T13:21:04Z

Undo revision 118185 by がか (talk)

2021-11-02T13:16:43Z

Undo revision 118184 by がか (talk)

2021-11-02T13:13:42Z

Undo revision 118182 by がか (talk)

2021-11-02T13:12:18Z

2021-05-24T01:55:07Z

2021-05-23T06:49:45Z

2021-05-12T12:22:06Z

40 revisions imported

2020-06-22T13:12:05Z

2020-06-22T11:48:12Z

@@ Line 98: / Line 98: @@
 function Ship:process_ship_key(ship_key)
-   local split = mw.ustring.find(ship_key, '/')
+   local split = string.find(ship_key, '/')
    local ship_base_name, ship_suffix
    if split == nil then
      ship_base_name = ship_key
    else
-     ship_base_name = split - 1 > 0 and mw.ustring.sub(ship_key, 1, split - 1) or ''
+     ship_base_name = split - 1 > 0 and string.sub(ship_key, 1, split - 1) or ''
-     ship_suffix = mw.ustring.sub(ship_key, split + 1, -1)
+     ship_suffix = string.sub(ship_key, split + 1, -1)
    end
    return ship_base_name, ship_suffix

@@ Line 98: / Line 98: @@
 function Ship:process_ship_key(ship_key)
-   local split = string.find(ship_key, '/')
+   local split = mw.ustring.find(ship_key, '/')
    local ship_base_name, ship_suffix
    if split == nil then
      ship_base_name = ship_key
    else
-     ship_base_name = split - 1 > 0 and string.sub(ship_key, 1, split - 1) or ''
+     ship_base_name = split - 1 > 0 and mw.ustring.sub(ship_key, 1, split - 1) or ''
-     ship_suffix = string.sub(ship_key, split + 1, -1)
+     ship_suffix = mw.ustring.sub(ship_key, split + 1, -1)
    end
    return ship_base_name, ship_suffix

@@ Line 98: / Line 98: @@
 function Ship:process_ship_key(ship_key)
-   local split = mw.ustring.find(ship_key, '/')
+   local split = string.find(ship_key, '/')
    local ship_base_name, ship_suffix
    if split == nil then
      ship_base_name = ship_key
    else
-     ship_base_name = split - 1 > 0 and mw.ustring.sub(ship_key, 1, split - 1) or ''
+     ship_base_name = split - 1 > 0 and string.sub(ship_key, 1, split - 1) or ''
-     ship_suffix = mw.ustring.sub(ship_key, split + 1, -1)
+     ship_suffix = string.sub(ship_key, split + 1, -1)
    end
    return ship_base_name, ship_suffix

@@ Line 98: / Line 98: @@
 function Ship:process_ship_key(ship_key)
-   local split = string.find(ship_key, '/')
+   local split = mw.ustring.find(ship_key, '/')
    local ship_base_name, ship_suffix
    if split == nil then
      ship_base_name = ship_key
    else
-     ship_base_name = split - 1 > 0 and string.sub(ship_key, 1, split - 1) or ''
+     ship_base_name = split - 1 > 0 and mw.ustring.sub(ship_key, 1, split - 1) or ''
-     ship_suffix = string.sub(ship_key, split + 1, -1)
+     ship_suffix = mw.ustring.sub(ship_key, split + 1, -1)
    end
    return ship_base_name, ship_suffix

@@ Line 98: / Line 98: @@
 function Ship:process_ship_key(ship_key)
-   local split = mw.ustring.find(ship_key, '/')
+   local split = string.find(ship_key, '/')
    local ship_base_name, ship_suffix
    if split == nil then
      ship_base_name = ship_key
    else
-     ship_base_name = split - 1 > 0 and mw.ustring.sub(ship_key, 1, split - 1) or ''
+     ship_base_name = split - 1 > 0 and string.sub(ship_key, 1, split - 1) or ''
-     ship_suffix = mw.ustring.sub(ship_key, split + 1, -1)
+     ship_suffix = string.sub(ship_key, split + 1, -1)
    end
    return ship_base_name, ship_suffix

@@ Line 56: / Line 56: @@
 function Ship:get_table(name, model)
-   local success, ship_table = Ship.requireModule(name)
+   local success, ship_table = Ship.requireModule(name, self._enemy)
    local ship_form_table
    if success then
@@ Line 117: / Line 117: @@
 end
-function Ship.requireModule(name)
+function Ship.requireModule(name, is_enemy)
-   local success, ship_table = U.requireModule('Data/Ship/' .. name)
+   local success, ship_table
    if not success then
      success, ship_table = U.requireModule('Data/Enemy/' .. name)

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

← 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 BaseData = require('Module:BaseData')		local BaseData = require('Module:BaseData')

@@ Line 110: / Line 110: @@
 function Ship:get_module(name, isEnemy)
-   if name == nil then
+   if not name then
      return nil
    end
 end