Skip to content

Commit

Permalink
add armour to vendors
Browse files Browse the repository at this point in the history
  • Loading branch information
CalebJohn committed Jun 8, 2015
1 parent 876b746 commit 37c4e38
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 6 deletions.
Binary file modified src/images/armours/femininefaulds.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
2 changes: 1 addition & 1 deletion src/items/armour/ivoryheadpiece.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ return{
info = 'An elegent headpiece that guarantees follicular purity.',
MAX_ITEMS = 5,
quantity = 1,
defense = 1,
defense = 30,
directory = 'armour/',
}
4 changes: 2 additions & 2 deletions src/items/armour/necromancercloak.lua
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
return{
name = "necromancercloak",
description = "Cloak of the Necromancer",
description = "Necrocloak",
type = "armour",
subtype = 'secondary',
info = 'This may look like a normal shirt, but its far more mystical.',
info = 'The name may be gross, but this cloak isn\'t.',
MAX_ITEMS = 5,
quantity = 1,
defense = 4,
Expand Down
2 changes: 1 addition & 1 deletion src/items/armour/windwalkercloak.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
return{
name = "windwalkercloak",
description = "Cloak of Windwalking",
description = "Windwalker",
type = "armour",
subtype = 'secondary',
info = 'Elven cloak. Still reeks of a naked 67 year old man.',
Expand Down
7 changes: 5 additions & 2 deletions src/shopping.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function state:init()
self.categories[2] = "materials"
self.categories[3] = "consumables"
self.categories[4] = "keys"
self.categories[5] = "armor"
self.categories[5] = "armour"
self.categories[6] = "misc"

-- used for centering text below boxes
Expand All @@ -56,7 +56,7 @@ function state:init()
self.shift["materials"] = 0
self.shift["consumables"] = 0
self.shift["keys"] = 8
self.shift["armor"] = 6
self.shift["armour"] = 5
self.shift["misc"] = 9

self.categoriespic = {}
Expand Down Expand Up @@ -578,6 +578,9 @@ function state:getItemStats( item )
if item.damage ~= nil and item.damage ~= "nil" then
itemStats = itemStats .. "{{white}}\ndamage: {{red}}" .. tostring(item.damage)
end
if item.defense ~= nil and item.defense ~= "nil" then
itemStats = itemStats .. "{{white}}\ndefense: {{blue_light}}" .. tostring(item.defense)
end
if item.special_damage ~= nil and item.special_damage ~= "nil" then
itemStats = itemStats .. "{{white}}\nspecial: {{red}}" .. item.special_damage
end
Expand Down
8 changes: 8 additions & 0 deletions src/suppliers/blacksmith.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ return {
{"bow",3,230},
{"arrow",25,8},
},
armour = {
{"femininefaulds",1,450},
{"lightarmour",1,375},
{"windwalkercloak",1,225},
{"ajaxshield",1,225},
{"berserkerbarbute",1,300},
{"platemail",5,750}
},
materials = {
{"leaf",30,30},
{"rock",30,15},
Expand Down
8 changes: 8 additions & 0 deletions src/suppliers/juans_smithy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ return {
{"arrow",30,6},
{"crimson_sword",1,450},
},
armour = {
{"ajaxshield",1,225},
{"greenguard",1,600},
{"lightarmour",1,375},
{"pruneplackart",1,375},
{"tinytarge",1,525},
{"spiderburgonet",1,450},
},
materials = {
{"leaf",10,55},
{"stone",10,60},
Expand Down
8 changes: 8 additions & 0 deletions src/suppliers/leslies_box.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ return {
{"bow",3,200},
{"arrow",50,5},
},
armour = {
{"ajaxshield",1,225},
{"berserkerbarbute",1,300},
{"hagshat",1,150},
{"lightarmour",1,375},
{"necromancercloak",1,300},
{"platemail",1,750}
},
materials = {
{"mushroom",20,30},
{"duck",20,34},
Expand Down

0 comments on commit 37c4e38

Please sign in to comment.