Skip to content

Commit

Permalink
Merge related weapon entries
Browse files Browse the repository at this point in the history
  • Loading branch information
@richardwilkes
richardwilkes committed Nov 26, 2021
1 parent 58f9d10 commit 31f4350
Showing 1 changed file with 23 additions and 85 deletions.
108 changes: 23 additions & 85 deletions Library/Basic Set/Basic Set Equipment.eqp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10258,6 +10258,7 @@
},
"strength": "11",
"usage": "Swung",
"usage_notes": "1-handed",
"reach": "1,2",
"parry": "0",
"block": "No",
Expand Down Expand Up @@ -10316,6 +10317,7 @@
},
"strength": "11",
"usage": "Thrust",
"usage_notes": "1-handed",
"reach": "1",
"parry": "0",
"block": "No",
Expand Down Expand Up @@ -10364,22 +10366,7 @@
"name": "Sword!"
}
]
}
],
"categories": [
"Melee Weapon"
]
},
{
"type": "equipment",
"id": "b5ff2217-8c5e-45df-ab6e-83e31e8c9091",
"quantity": 1,
"description": "Katana",
"tech_level": "3",
"value": "650",
"weight": "5 lb",
"reference": "B274",
"weapons": [
},
{
"type": "melee_weapon",
"damage": {
Expand All @@ -10389,6 +10376,7 @@
},
"strength": "10†",
"usage": "Swung",
"usage_notes": "2-handed",
"reach": "1,2",
"parry": "0",
"block": "No",
Expand Down Expand Up @@ -10432,6 +10420,7 @@
},
"strength": "10†",
"usage": "Thrust",
"usage_notes": "2-handed",
"reach": "1",
"parry": "0",
"block": "No",
Expand Down Expand Up @@ -10467,7 +10456,6 @@
]
}
],
"notes": "Using Two-Handed Sword skill",
"categories": [
"Melee Weapon"
]
Expand Down Expand Up @@ -13953,6 +13941,7 @@
},
"strength": "9†",
"usage": "Swung",
"usage_notes": "The sharp end, Polearm",
"reach": "1,2*",
"parry": "0U",
"block": "No",
Expand Down Expand Up @@ -13997,6 +13986,7 @@
},
"strength": "9†",
"usage": "Thrust",
"usage_notes": "The sharp end, Polearm",
"reach": "2",
"parry": "0",
"block": "No",
Expand Down Expand Up @@ -14031,22 +14021,7 @@
"modifier": -4
}
]
}
],
"categories": [
"Melee Weapon"
]
},
{
"type": "equipment",
"id": "a6b3ec96-8039-4290-87a6-7fa0da8d9e8e",
"quantity": 1,
"description": "Naginata",
"tech_level": "2",
"value": "100",
"weight": "6 lb",
"reference": "B273",
"weapons": [
},
{
"type": "melee_weapon",
"damage": {
Expand All @@ -14056,6 +14031,7 @@
},
"strength": "9†",
"usage": "Swung",
"usage_notes": "The blunt end",
"reach": "1,2",
"parry": "0U",
"block": "No",
Expand Down Expand Up @@ -14095,6 +14071,7 @@
},
"strength": "9†",
"usage": "Thrust",
"usage_notes": "The blunt end",
"reach": "1,2",
"parry": "0",
"block": "No",
Expand Down Expand Up @@ -14124,23 +14101,7 @@
"modifier": -2
}
]
}
],
"notes": "Using the blunt end",
"categories": [
"Melee Weapon"
]
},
{
"type": "equipment",
"id": "79edaf63-3f53-4716-bcac-22cc2224502a",
"quantity": 1,
"description": "Naginata",
"tech_level": "2",
"value": "100",
"weight": "6 lb",
"reference": "B274",
"weapons": [
},
{
"type": "melee_weapon",
"damage": {
Expand All @@ -14150,6 +14111,7 @@
},
"strength": "9†",
"usage": "Swung",
"usage_notes": "Two-handed sword",
"reach": "2",
"parry": "0U",
"block": "No",
Expand Down Expand Up @@ -14193,6 +14155,7 @@
},
"strength": "9†",
"usage": "Thrust",
"usage_notes": "Two-handed sword",
"reach": "2",
"parry": "0",
"block": "No",
Expand Down Expand Up @@ -14228,7 +14191,6 @@
]
}
],
"notes": "Using Two-Handed Sword skill",
"categories": [
"Melee Weapon"
]
Expand Down Expand Up @@ -16309,6 +16271,7 @@
},
"strength": "7†",
"usage": "Swung",
"usage_notes": "Staff",
"reach": "1,2",
"parry": "+2",
"block": "No",
Expand Down Expand Up @@ -16348,6 +16311,7 @@
},
"strength": "7†",
"usage": "Thrust",
"usage_notes": "Staff",
"reach": "1,2",
"parry": "+2",
"block": "No",
Expand Down Expand Up @@ -16377,22 +16341,7 @@
"modifier": -2
}
]
}
],
"categories": [
"Melee Weapon"
]
},
{
"type": "equipment",
"id": "3167747d-ff3f-4ca2-8978-aea01561b0d5",
"quantity": 1,
"description": "Quarterstaff",
"tech_level": "0",
"value": "10",
"weight": "4 lb",
"reference": "B274",
"weapons": [
},
{
"type": "melee_weapon",
"damage": {
Expand All @@ -16402,6 +16351,7 @@
},
"strength": "9†",
"usage": "Swung",
"usage_notes": "Two-Handed Sword",
"reach": "1,2",
"parry": "0",
"block": "No",
Expand Down Expand Up @@ -16445,6 +16395,7 @@
},
"strength": "9†",
"usage": "Thrust",
"usage_notes": "Two-Handed Sword",
"reach": "2",
"parry": "0",
"block": "No",
Expand Down Expand Up @@ -16480,7 +16431,6 @@
]
}
],
"notes": "Using Two-Handed Sword skill",
"categories": [
"Melee Weapon"
]
Expand Down Expand Up @@ -22330,6 +22280,7 @@
},
"strength": "11",
"usage": "Swung",
"usage_notes": "1-handed",
"reach": "1,2",
"parry": "0U",
"block": "No",
Expand Down Expand Up @@ -22387,6 +22338,7 @@
},
"strength": "11",
"usage": "Thrust",
"usage_notes": "1-handed",
"reach": "2",
"parry": "0U",
"block": "No",
Expand Down Expand Up @@ -22434,22 +22386,7 @@
"name": "Sword!"
}
]
}
],
"categories": [
"Melee Weapon"
]
},
{
"type": "equipment",
"id": "ed1bfe2d-8c6b-4ea5-8012-ebe7955c6d72",
"quantity": 1,
"description": "Thrusting Bastard Sword",
"tech_level": "3",
"value": "750",
"weight": "5 lb",
"reference": "B274",
"weapons": [
},
{
"type": "melee_weapon",
"damage": {
Expand All @@ -22459,6 +22396,7 @@
},
"strength": "10†",
"usage": "Swung",
"usage_notes": "2-handed",
"reach": "1,2",
"parry": "0",
"block": "No",
Expand Down Expand Up @@ -22502,6 +22440,7 @@
},
"strength": "10†",
"usage": "Thrust",
"usage_notes": "2-handed",
"reach": "2",
"parry": "0",
"block": "No",
Expand Down Expand Up @@ -22537,7 +22476,6 @@
]
}
],
"notes": "Using Two-Handed Sword skill",
"categories": [
"Melee Weapon"
]
Expand Down

0 comments on commit 31f4350

Please sign in to comment.