Changes

m
Undo revision 118188 by がか (talk)
Line 56: Line 56:     
function Ship:get_table(name, model)
 
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
 
   local ship_form_table
 
   if success then
 
   if success then
Line 98: Line 98:     
function Ship:process_ship_key(ship_key)
 
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
 
   local ship_base_name, ship_suffix
 
   if split == nil then
 
   if split == nil then
 
     ship_base_name = ship_key
 
     ship_base_name = ship_key
 
   else
 
   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
 
   end
 
   return ship_base_name, ship_suffix
 
   return ship_base_name, ship_suffix
Line 117: Line 117:  
end
 
end
   −
function Ship.requireModule(name)
+
function Ship.requireModule(name, is_enemy)
   local success, ship_table = U.requireModule(name)
+
   local success, ship_table
   if not success then
+
   if not is_enemy then
    success, ship_table = U.requireModule('Data/Ship/' .. name)
+
success, ship_table = U.requireModule('Data/Ship/' .. name)
 
   end
 
   end
 
   if not success then
 
   if not success then
cssedit, gkautomate
6,926

edits