Merge pull request #3 from timothymtorres/Code-Refactor

Code refactor
timothymtorres · Nov 14, 2016 · 5be401b · 5be401b
2 parents f3c4cc8 + 2efa9ce
commit 5be401b
Show file tree

Hide file tree

Showing 31 changed files with 275 additions and 814 deletions.
diff --git a/code/backup/skills_with_cost_slots/class.lua b/code/backup/skills_with_cost_slots/class.lua
diff --git a/code/backup/skills_with_cost_slots/flags.lua b/code/backup/skills_with_cost_slots/flags.lua
diff --git a/code/backup/skills_with_cost_slots/list.lua b/code/backup/skills_with_cost_slots/list.lua
diff --git a/code/item/class.lua b/code/item/class.lua
@@ -9,7 +9,7 @@ local order = require('code.item.order')
 local bit = require('plugin.bit')
 local lshift, rshift, bor = bit.lshift, bit.rshift, bit.bor
 local check = require('code.item.use.check')
-local dice = require('code.libs.rl-dice.dice')
+local dice = require('code.libs.dice')
 
 local item = class('item')
 

diff --git a/code/item/medical/class.lua b/code/item/medical/class.lua
@@ -22,20 +22,6 @@ function medical:getDice() return self.dice end
 
 function medical:getGroup() return self.group end 
 
---function medical:getWeaponID() return self.weapon_ID end
-
---[[
-for obj in pairs(w_list) do 
-  medical[obj] = class(obj, medical) 
-  medical[obj].initialize = function(self)
-    medical.initialize(self)
-  end
-  
-  for field, data in pairs(w_list[obj]) do medical[obj][field] = data end
-end    
---]]
-
-
 function medical:dataToClass(...) -- this should be a middleclass function (fix later)
   local combined_lists = {...}
   for _, list in ipairs(combined_lists) do

diff --git a/code/item/medical/search.lua b/code/item/medical/search.lua
diff --git a/code/item/search.lua b/code/item/search.lua