Merge branch 'master' into 005_item_editing
This commit is contained in:
commit
110a523268
10 changed files with 109 additions and 60 deletions
|
@ -51,24 +51,24 @@
|
|||
},
|
||||
"equipable": {
|
||||
"equipped": false
|
||||
},
|
||||
"protective": {
|
||||
"armorValue": 0
|
||||
}
|
||||
},
|
||||
"weapon": {
|
||||
"templates": ["base", "physical", "equipable"],
|
||||
"attackType": "melee",
|
||||
"weaponBonus": 0,
|
||||
"opponentDefense": 0,
|
||||
"properties": {}
|
||||
"opponentDefense": 0
|
||||
},
|
||||
"armor": {
|
||||
"templates": ["base", "physical", "equipable"],
|
||||
"templates": ["base", "physical", "equipable", "protective"],
|
||||
"armorMaterialType": "cloth",
|
||||
"armorType": "body",
|
||||
"armorValue": 0
|
||||
"armorType": "body"
|
||||
},
|
||||
"shield": {
|
||||
"templates": ["base", "physical", "equipable"],
|
||||
"armorValue": 0
|
||||
"templates": ["base", "physical", "equipable", "protective"]
|
||||
},
|
||||
"trinket": {
|
||||
"templates": ["base", "physical", "equipable"]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue