Skip to content

Commit

Permalink
Merge branch 'develop' into 956-shadowdarkling-no-name-bug
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Maskelyne <[email protected]>
  • Loading branch information
Muttley authored Nov 18, 2024
2 parents e19ec27 + d271adc commit f530f8b
Show file tree
Hide file tree
Showing 19 changed files with 112 additions and 55 deletions.
3 changes: 3 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* [#881] Support rolling on a character's Patron's Boon table if necessary in the Level Up app
* [#901] Added Russian as a partially complete system language.
* [#908] Add rollable dice to Cure Wounds spell that includes the necessary calculations *(Many thanks to **nschoenwald** for contributing to this issue)*
* [#909] Added +1 AC Dual Wield active effect to talent of same name which can be toggled on/off as needed on the character sheet now
* [#910] Implemented automatic check roll links and added new macro to launch the check request dialog.
* example syntax: `[[check 12 str]]` or `[[request 15 int]]`
* [#920] Show tooltips on weapon and armor properties when showing expanded inline view in inventory
Expand All @@ -31,6 +32,8 @@
* [#953] Dice So Nice not honouring roll modes in Shadowdark
* [#955] Chat message icon missing on hovering over Ancestry and Level talents on character sheet
* [#956] Can't import unnamed characters from Shadowdarklings
* [#959] Stimulent effect description has a broken link to a Ranger talent that was converted to a Class Ability
* [#960] Add missing Berzerk class ability for Sea Wolf class

## Chores
* [#911] Replaced compendium art mapping with default Foundry method. *(Settings for compendium art mapping are now found in *Settings > Core > Compendium Art*)*
Expand Down
26 changes: 26 additions & 0 deletions data/packs/class-abilities.db/berserk__so8ytbZuqmNvppI7.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"_id": "so8ytbZuqmNvppI7",
"_key": "!items!so8ytbZuqmNvppI7",
"effects": [
],
"folder": "q7zkgCiSTr8Xxshe",
"img": "icons/tools/navigation/map-chart-tan.webp",
"name": "Berserk",
"system": {
"ability": "",
"dc": 10,
"description": "<p>1/day, go berserk: immune to damage for 3 rounds.</p>",
"group": "Sea Wolf",
"limitedUses": true,
"loseOnFailure": false,
"lost": false,
"source": {
"title": ""
},
"uses": {
"available": 1,
"max": 1
}
},
"type": "Class Ability"
}
10 changes: 10 additions & 0 deletions data/packs/class-abilities.db/sea_wolf__q7zkgCiSTr8Xxshe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"_id": "q7zkgCiSTr8Xxshe",
"_key": "!folders!q7zkgCiSTr8Xxshe",
"color": "#22252b",
"description": "",
"folder": null,
"name": "Sea Wolf",
"sorting": "a",
"type": "Item"
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"name": "Effect: Stimulant",
"system": {
"category": "effect",
"description": "<p>Source: @UUID[Compendium.shadowdark.talents.dBQr9YPyhvwyPm0g]{Stimulant}</p>",
"description": "<p>@UUID[Compendium.shadowdark.class-abilities.Item.EhaA5tBROfrws1Kx]{Stimulant}</p>",
"duration": {
"type": "rounds",
"value": "10"
Expand Down
18 changes: 0 additions & 18 deletions data/packs/properties.db/breakable__e5RpI0crHweCVt8B.json

This file was deleted.

18 changes: 0 additions & 18 deletions data/packs/properties.db/returning__R9rw4pKdIHfJJoyJ.json

This file was deleted.

27 changes: 27 additions & 0 deletions data/packs/spell-effects.db/berserk__kYzSScmkTg4o1DKM.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"_id": "kYzSScmkTg4o1DKM",
"_key": "!items.effects!sfeg7jRt0oW5qXO4.kYzSScmkTg4o1DKM",
"changes": [
],
"description": "",
"disabled": false,
"duration": {
"combat": null,
"rounds": null,
"seconds": null,
"startRound": null,
"startTime": null,
"startTurn": null,
"turns": null
},
"img": "icons/magic/movement/abstract-ribbons-red-orange.webp",
"name": "Berserk",
"origin": "Compendium.shadowdark.spell-effects.Item.sfeg7jRt0oW5qXO4",
"statuses": [
],
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"_id": "sfeg7jRt0oW5qXO4",
"_key": "!items!sfeg7jRt0oW5qXO4",
"effects": [
"kYzSScmkTg4o1DKM"
],
"folder": null,
"img": "icons/magic/movement/abstract-ribbons-red-orange.webp",
Expand Down
33 changes: 33 additions & 0 deletions data/packs/talents.db/_1_ac_dual_wield__cGGttIknipaR4UIo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"_id": "cGGttIknipaR4UIo",
"_key": "!items.effects!quYUUqTTAX3QlAGa.cGGttIknipaR4UIo",
"changes": [
{
"key": "system.bonuses.acBonus",
"mode": 2,
"priority": null,
"value": "1"
}
],
"description": "",
"disabled": true,
"duration": {
"combat": null,
"rounds": null,
"seconds": null,
"startRound": null,
"startTime": null,
"startTurn": null,
"turns": null
},
"img": "icons/skills/melee/swords-parry-block-blue.webp",
"name": "+1 AC Dual Wield",
"origin": "Compendium.shadowdark.talents.Item.quYUUqTTAX3QlAGa",
"statuses": [
],
"system": {
},
"tint": "#ffffff",
"transfer": true,
"type": "base"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
"_id": "quYUUqTTAX3QlAGa",
"_key": "!items!quYUUqTTAX3QlAGa",
"effects": [
"cGGttIknipaR4UIo"
],
"folder": "Z4zDnZoxthjHXo5V",
"img": "icons/skills/melee/swords-parry-block-blue.webp",
"name": "+1 AC Dual Wield",
"system": {
"bonuses": {
"acBonus": "1",
"critical": {
"failureThreshold": 1,
"multiplier": 2,
Expand All @@ -17,7 +19,7 @@
"meleeDamageBonus": "1",
"rangedAttackBonus": "1"
},
"description": "<p>You gain +1 to your AC when wielding a melee weapon in each hand</p>",
"description": "<p>You gain +1 to your AC when wielding a melee weapon in each hand.</p><p></p><p><em><strong>Note:</strong> Remember to toggle the <strong>+1 AC Dual Wield</strong> Active Effect on/off in the Effects tab of your character sheet when needed.</em></p>",
"level": 0,
"magicItem": false,
"predefinedEffects": "",
Expand Down
9 changes: 0 additions & 9 deletions data/packs/talents.db/patron__TcpWrnecaN2k2gYr.json

This file was deleted.

2 changes: 1 addition & 1 deletion i18n/de.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ SHADOWDARK.chat.spell_learn.failure: "{name} konnte nichts von der Schriftrolle
SHADOWDARK.chat.spell_learn.success: "{name} hat den {spellName} Zauber erfolgreich gelernt"
SHADOWDARK.chat.spell_learn.title: Lerne Zauber
SHADOWDARK.chat.spell_roll.title: "Zaubere {name} auf Stufe {tier} mit Zauber-SK {spellDC}"
SHADOWDARK.chat.use_ability.failure: "{name} failed to used the {ability} ability"
SHADOWDARK.chat.use_ability.failure: "{name} failed to use the {ability} ability"
SHADOWDARK.chat.use_ability.success: "{name} successfully used the {ability} ability"
SHADOWDARK.chat.use_ability.title: "Using Ability"
SHADOWDARK.chat.welcome_message.arcane_library_button: Shop Shadowdark RPG
Expand Down
2 changes: 1 addition & 1 deletion i18n/es.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ SHADOWDARK.chat.spell_learn.failure: "{name} no ha podido aprender nada del perg
SHADOWDARK.chat.spell_learn.success: "{name} aprendió correctamente el hechizo {spellName}"
SHADOWDARK.chat.spell_learn.title: Aprender hechizo
SHADOWDARK.chat.spell_roll.title: "{name}, CD {spellDC}"
SHADOWDARK.chat.use_ability.failure: "{name} failed to used the {ability} ability"
SHADOWDARK.chat.use_ability.failure: "{name} failed to use the {ability} ability"
SHADOWDARK.chat.use_ability.success: "{name} successfully used the {ability} ability"
SHADOWDARK.chat.use_ability.title: "Usando habilidad"
SHADOWDARK.chat.welcome_message.arcane_library_button: Shop Shadowdark RPG
Expand Down
2 changes: 1 addition & 1 deletion i18n/fi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ SHADOWDARK.chat.spell_learn.failure: "{name} ei oppinut taikakääröstä mitä
SHADOWDARK.chat.spell_learn.success: "{name} onnistuneesti oppi {spellName} loitsun"
SHADOWDARK.chat.spell_learn.title: Opettelee loitsua
SHADOWDARK.chat.spell_roll.title: "Loihditaan {name} tasolla {tier} jolloin vaikeusaste on {spellDC}"
SHADOWDARK.chat.use_ability.failure: "{name} epäonnistui käyttämään {ability} kykyä"
SHADOWDARK.chat.use_ability.failure: "{name} failed to use the {ability} ability"
SHADOWDARK.chat.use_ability.success: "{name} onnistui {ability} kyvyssään"
SHADOWDARK.chat.use_ability.title: "Kyvyn käyttö"
SHADOWDARK.chat.welcome_message.arcane_library_button: Selaa Shadowdark RPG tuotteita
Expand Down
2 changes: 1 addition & 1 deletion i18n/fr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ SHADOWDARK.chat.spell_learn.failure: "{name} n'a pas réussi à apprendre quoi q
SHADOWDARK.chat.spell_learn.success: "{name} a bien appris le sort {spellName}"
SHADOWDARK.chat.spell_learn.title: Apprentissage de Sort
SHADOWDARK.chat.spell_roll.title: "Lancement de {name} au rang {tier} avec DD de sort {spellDC}"
SHADOWDARK.chat.use_ability.failure: "{name} a échoué à utiliser la capacité {ability}"
SHADOWDARK.chat.use_ability.failure: "{name} failed to use the {ability} ability"
SHADOWDARK.chat.use_ability.success: "{name} a utilisé la capacité {ability} avec succès"
SHADOWDARK.chat.use_ability.title: "Utiliser une capacité"
SHADOWDARK.chat.welcome_message.arcane_library_button: Shop Shadowdark RPG
Expand Down
2 changes: 1 addition & 1 deletion i18n/ko.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ SHADOWDARK.chat.spell_learn.failure: "{name} 두루마리로 주문 배우기를
SHADOWDARK.chat.spell_learn.success: "{name} 성공적으로 {spellName} 주문을 배웠습니다"
SHADOWDARK.chat.spell_learn.title: 주문 배우기
SHADOWDARK.chat.spell_roll.title: "{name}, DC {spellDC}"
SHADOWDARK.chat.use_ability.failure: "{name} failed to used the {ability} ability"
SHADOWDARK.chat.use_ability.failure: "{name} failed to use the {ability} ability"
SHADOWDARK.chat.use_ability.success: "{name} successfully used the {ability} ability"
SHADOWDARK.chat.use_ability.title: "Using Ability"
SHADOWDARK.chat.welcome_message.arcane_library_button: Shop Shadowdark RPG
Expand Down
2 changes: 1 addition & 1 deletion i18n/pt_BR.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ SHADOWDARK.chat.spell_learn.failure: "{name} não conseguiu aprender o pergaminh
SHADOWDARK.chat.spell_learn.success: "{name} aprendeu com sucesso a magia {spellName}"
SHADOWDARK.chat.spell_learn.title: Aprendendo Magia
SHADOWDARK.chat.spell_roll.title: "{name}, CD {spellDC}"
SHADOWDARK.chat.use_ability.failure: "{name} falhou em usar a habilidade {ability}"
SHADOWDARK.chat.use_ability.failure: "{name} failed to use the {ability} ability"
SHADOWDARK.chat.use_ability.success: "{name} usou a habilidade {ability} com sucesso"
SHADOWDARK.chat.use_ability.title: "Usando Habilidade"
SHADOWDARK.chat.welcome_message.arcane_library_button: Compre o RPG Shadowdark
Expand Down
2 changes: 1 addition & 1 deletion i18n/ru.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ SHADOWDARK.chat.spell_learn.failure: "{name} не удалось ничему н
SHADOWDARK.chat.spell_learn.success: "{name} успешно выучил заклинание {spellName}"
SHADOWDARK.chat.spell_learn.title: Изучение заклинания
SHADOWDARK.chat.spell_roll.title: "{name}, СЛ {spellDC}"
SHADOWDARK.chat.use_ability.failure: "{name} не удалось использовать способность {ability}"
SHADOWDARK.chat.use_ability.failure: "{name} failed to use the {ability} ability"
SHADOWDARK.chat.use_ability.success: "{name} успешно использовал способность {ability}"
SHADOWDARK.chat.use_ability.title: "Использование способности"
SHADOWDARK.chat.welcome_message.arcane_library_button: Магазин Shadowdark RPG
Expand Down
2 changes: 1 addition & 1 deletion i18n/sv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ SHADOWDARK.chat.spell_learn.failure: "{name} misslyckades lära sig något från
SHADOWDARK.chat.spell_learn.success: "{name} lärde sig besvärjelsen {spellName}"
SHADOWDARK.chat.spell_learn.title: Lär sig besvärjelse
SHADOWDARK.chat.spell_roll.title: "Kastar {name} som grad {tier} med svårighetsgrad {spellDC}"
SHADOWDARK.chat.use_ability.failure: "{name} misslyckades med att använda {ability} förmågan"
SHADOWDARK.chat.use_ability.failure: "{name} failed to use the {ability} ability"
SHADOWDARK.chat.use_ability.success: "{name} lyckades med {ability} förmågan"
SHADOWDARK.chat.use_ability.title: "Använder förmåga"
SHADOWDARK.chat.welcome_message.arcane_library_button: Shop Shadowdark RPG
Expand Down

0 comments on commit f530f8b

Please sign in to comment.