Module:ShipClassData - Revision history

Botkaze: 13 revisions imported

2021-05-12T12:26:50Z

13 revisions imported

2018-08-29T04:16:48Z

2018-08-28T20:23:05Z

2018-08-28T20:16:36Z

2018-08-28T20:14:49Z

2018-08-28T20:10:40Z

2018-08-28T20:03:05Z

2018-08-28T19:46:46Z

2017-05-03T20:23:34Z

2017-05-03T20:16:13Z

@@ Line 6: / Line 6: @@
 function ShipClassData:base_name()
 	return type(self._name) == 'table' and self._name._name or self._name
 end

@@ Line 27: / Line 27: @@
 	local result = {}
 	if self._prefix then
-        table.insert(result, self._prefix)
+		table.insert(result, self._prefix)
-    end
+	end
-    local name = self._name_override or self:base_name()
+	if self._name_override or self:base_name() then
-	if name then
+	    table.insert(result, self._name_override or self:base_name())
 	end
 	if self._suffix then
-	    table.insert(result, self._suffix)
+		table.insert(result, self._suffix)
 	end
 	return table.concat(result, " ")

@@ Line 26: / Line 26: @@
 function ShipClassData:name_override()
 	local result = {}
 	if self._prefix then
-	    if type(self._prefix) == 'string' then
+        table.insert(result, self._prefix)
      end
      local name = self._name_override or self:base_name()
 	if name then
-	    if type(name) == 'string' then
+        table.insert(result, name)
 	end
 	if self._suffix then
-	    if type(self._suffix) == 'string' then
+	    table.insert(result, self._suffix)
 	end
-	return table.concat(result, " "), table.concat(errors, ", ")
+	return table.concat(result, " ")
 end

@@ Line 5: / Line 5: @@
 function ShipClassData:base_name()
-	return self._name
+	return type(self._name) == 'table' and self._name._name or self._name
 end

@@ Line 40: / Line 40: @@
          else
              table.insert(errors, '_name_override ' .. type(self._name_override) .. ', base_name ' .. type(self:base_name()))
          end
 	end

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