Skip to content

Commit

Permalink
Revert "Removed old code and typos"
Browse files Browse the repository at this point in the history
This reverts commit 2c33bf1.
  • Loading branch information
timothymtorres committed Nov 14, 2016
1 parent ea9afc9 commit 275f9dc
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 1 deletion.
25 changes: 25 additions & 0 deletions code/item/medical/list.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,17 @@ local medical = {}
--[[
{
full_name = 'insert name'
group = {
healing (medkit/bandage)
drugs (pills/antidote)
misc. (special)
}
*optional*
dice = '?d?'
accuracy = 0.00 (base chance to hit)
organic = human/zombie/nil (results in default weapon choice, since weapon is attached to body)
one_use = true/nil (is disposed of after one use)
}
--]]
Expand All @@ -18,20 +24,39 @@ local medical = {}

medical.FAK = {}
medical.FAK.full_name = 'first aid kit'
medical.FAK.group = {'healing', 'medkit'}
medical.FAK.dice = '1d5'
medical.FAK.one_use = true

medical.bandage = {}
medical.bandage.full_name = 'bandage'
medical.bandage.group = {'healing', 'bandage'}
medical.bandage.dice = '1d3'
medical.bandage.one_use = true

medical.herb = {}
medical.herb.full_name = 'herb'
medical.herb.group = {'healing', 'herb'}
medical.herb.dice = '1d2'
medical.herb.one_use = true

--[[
--- DRUGS
--]]

medical.antidote = {}
medical.antidote.full_name = 'antidote'
medical.antidote.group = {'drugs', 'antidote'}
medical.antidote.accuracy = 0.50
medical.antidote.one_use = true

--[[
--- INSTRUMENT
--]]

medical.syringe = {}
medical.syringe.full_name = 'syringe'
medical.syringe.group = {'instrument', 'syringe'}
medical.syringe.accuracy = 0.25
medical.syringe.one_use = true

Expand Down
1 change: 1 addition & 0 deletions code/item/weapon/chanceToHit.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ local skill_attack_bonus = {
arm = {hand_stimulus=0.10, claw=0.10, claw_adv=0.15},
teeth = {head_stimulus=0.10, bite=0.10, bite_adv=0.15},
acid = {acid=0.05, acid_adv=0.05},
stinger = {venom=0.05, venom_adv=0.10},
},
}

Expand Down
2 changes: 1 addition & 1 deletion scenes/action.lua
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ local function onRowRender( event )
effect = "fade",
time = 400,
params = {}
}
}

local mob_type = main_player:getMobType()
local action_data, params = action_list[mob_type][item_name], options.params
Expand Down

0 comments on commit 275f9dc

Please sign in to comment.