mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-14 04:31:07 +01:00
Fix conflicts
This commit is contained in:
commit
4a044db77f
35 changed files with 1148 additions and 290 deletions
27
lang/en.json
27
lang/en.json
|
|
@ -264,6 +264,7 @@
|
|||
}
|
||||
},
|
||||
"Tiers": {
|
||||
"singular": "Tier",
|
||||
"tier1": "Tier 1",
|
||||
"tier2": "Tier 2",
|
||||
"tier3": "Tier 3",
|
||||
|
|
@ -630,7 +631,7 @@
|
|||
"WeaponFeature": {
|
||||
"Barrier": {
|
||||
"Name": "Barrier",
|
||||
"Description": "+{armorBonus} to Armor Score; -1 to Evasion"
|
||||
"Description": "+{armorScore} to Armor Score; -1 to Evasion"
|
||||
},
|
||||
"Bonded": {
|
||||
"Name": "Bonded",
|
||||
|
|
@ -700,6 +701,10 @@
|
|||
"Name": "Greedy",
|
||||
"Description": "Spend a handful of gold to gain a +1 bonus to your Proficiency on a damage roll."
|
||||
},
|
||||
"Healing": {
|
||||
"Name": "Healing",
|
||||
"Description": "During downtime, automatically clear a Hit Point."
|
||||
},
|
||||
"Heavy": {
|
||||
"Name": "Heavy",
|
||||
"Description": "-1 to Evasion"
|
||||
|
|
@ -724,6 +729,10 @@
|
|||
"Name": "Locked On",
|
||||
"Description": "On a successful attack, your next attack against the same target with your primary weapon automatically succeeds."
|
||||
},
|
||||
"Lucky": {
|
||||
"Name": "Lucky",
|
||||
"Description": "On a failed attack, you can mark a Stress to reroll your attack."
|
||||
},
|
||||
"Long": {
|
||||
"Name": "Long",
|
||||
"Description": "This weapon's attack targets all adversaries in a line within range."
|
||||
|
|
@ -758,7 +767,7 @@
|
|||
},
|
||||
"Protective": {
|
||||
"Name": "Protective",
|
||||
"Description": "+{armorBonus} to Armor Score"
|
||||
"Description": "+{tier} to Armor Score"
|
||||
},
|
||||
"Quick": {
|
||||
"Name": "Quick",
|
||||
|
|
@ -824,7 +833,8 @@
|
|||
"Input": "Input",
|
||||
"Dice": "Dice"
|
||||
},
|
||||
"Max": "Max"
|
||||
"Max": "Max",
|
||||
"NewEffect": "New Effect"
|
||||
},
|
||||
"FeatureType": {
|
||||
"Normal": "Normal",
|
||||
|
|
@ -1144,6 +1154,8 @@
|
|||
"Appearance": "Appearance",
|
||||
"settings": "Settings"
|
||||
},
|
||||
"HopeFeatures": "Hope Features",
|
||||
"Class Features": "Class Features",
|
||||
"Domains": "Domains",
|
||||
"DamageThresholds": {
|
||||
"Title": "Damage Thresholds",
|
||||
|
|
@ -1193,8 +1205,9 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"Heritage": {
|
||||
"Title": "Abilities"
|
||||
"Global": {
|
||||
"Actions": "Actions",
|
||||
"Effects": "Effects"
|
||||
},
|
||||
"DomainCard": {
|
||||
"Type": "Type",
|
||||
|
|
@ -1252,7 +1265,9 @@
|
|||
"Description": "Description",
|
||||
"SubclassFeature": {
|
||||
"Description": "Description",
|
||||
"Abilities": "Abilities"
|
||||
"Abilities": "Abilities",
|
||||
"Actions": "Actions",
|
||||
"Effects": "Effects"
|
||||
}
|
||||
},
|
||||
"Weapon": {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue