Skip to content

Commit

Permalink
Merge pull request #1568 from Miskatonic-Investigative-Society/develop
Browse files Browse the repository at this point in the history
0.10.18
  • Loading branch information
snap01 authored Jun 18, 2024
2 parents a8940b5 + 51692ea commit ca9b315
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 25 deletions.
7 changes: 7 additions & 0 deletions .github/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ Happy gaming !

When not specified, all changes were made by @castanhocorreia, @HavlockV, and @snap01.

## Version 0.10.18

When not specified, all changes were made by @castanhocorreia, @HavlockV, and @snap01.

- Fix chat message rolls for Dice So Nice
- Update to Japanese localization, thanks to @doumoku #1563

## Version 0.10.17

When not specified, all changes were made by @castanhocorreia, @HavlockV, and @snap01.
Expand Down
36 changes: 18 additions & 18 deletions .github/TRANSLATIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ The following translations have more than 50 untranslated strings [are you able

|Key|de|es|fr|ja|pl|uk|
|:---|:---:|:---:|:---:|:---:|:---:|:---:|
|**Remaining**:|**9**|**46**|**9**|**18**|**45**|**45**|
|[CoC7.EraReignOfTerror](#coc7erareignofterror)|✅|❌|✅|❌|❌|❌|
|[CoC7.ErrorCombinedRollsRequireSingleActor](#coc7errorcombinedrollsrequiresingleactor)|✅|❌|✅|❌|❌|❌|
|[CoC7.ErrorNoActorPermission](#coc7errornoactorpermission)|✅|❌|✅|❌|❌|❌|
|[CoC7.ErrorOpposedRollsLimitedToTwoActors](#coc7erroropposedrollslimitedtotwoactors)|✅|❌|✅|❌|❌|❌|
|[CoC7.ErrorRollAlreadyCompleted](#coc7errorrollalreadycompleted)|✅|❌|✅|❌|❌|❌|
|**Remaining**:|**9**|**46**|**9**|**1**|**45**|**45**|
|[CoC7.EraReignOfTerror](#coc7erareignofterror)|✅|❌|✅|✅|❌|❌|
|[CoC7.ErrorCombinedRollsRequireSingleActor](#coc7errorcombinedrollsrequiresingleactor)|✅|❌|✅|✅|❌|❌|
|[CoC7.ErrorNoActorPermission](#coc7errornoactorpermission)|✅|❌|✅|✅|❌|❌|
|[CoC7.ErrorOpposedRollsLimitedToTwoActors](#coc7erroropposedrollslimitedtotwoactors)|✅|❌|✅|✅|❌|❌|
|[CoC7.ErrorRollAlreadyCompleted](#coc7errorrollalreadycompleted)|✅|❌|✅|✅|❌|❌|
|[CoC7.Inactive](#coc7inactive)|✅|❌|✅|✅|❌|❌|
|[CoC7.InfoSkillAddedAtBase](#coc7infoskilladdedatbase)|✅|❌|✅|✅|❌|❌|
|[CoC7.Japanese](#coc7japanese)|❌|❌|❌|✅|❌|❌|
Expand All @@ -38,18 +38,18 @@ The following translations have more than 50 untranslated strings [are you able
|[CoC7.LinkCheckDiffPushing](#coc7linkcheckdiffpushing)|✅|❌|✅|✅|❌|❌|
|[CoC7.LinkCheckModifPushing](#coc7linkcheckmodifpushing)|✅|❌|✅|✅|❌|❌|
|[CoC7.LinkCheckPushing](#coc7linkcheckpushing)|✅|❌|✅|✅|❌|❌|
|[CoC7.MonetaryDefaultAristocracy](#coc7monetarydefaultaristocracy)|✅|❌|✅|❌|❌|❌|
|[CoC7.MonetaryDefaultDestitute](#coc7monetarydefaultdestitute)|✅|❌|✅|❌|❌|❌|
|[CoC7.MonetaryDefaultEstablished](#coc7monetarydefaultestablished)|✅|❌|✅|❌|❌|❌|
|[CoC7.MonetaryDefaultGentry](#coc7monetarydefaultgentry)|✅|❌|✅|❌|❌|❌|
|[CoC7.MonetaryDefaultLower](#coc7monetarydefaultlower)|✅|❌|✅|❌|❌|❌|
|[CoC7.MonetaryDefaultMiddle](#coc7monetarydefaultmiddle)|✅|❌|✅|❌|❌|❌|
|[CoC7.MonetaryDefaultProfessional](#coc7monetarydefaultprofessional)|✅|❌|✅|❌|❌|❌|
|[CoC7.MonetaryDefaultAristocracy](#coc7monetarydefaultaristocracy)|✅|❌|✅|✅|❌|❌|
|[CoC7.MonetaryDefaultDestitute](#coc7monetarydefaultdestitute)|✅|❌|✅|✅|❌|❌|
|[CoC7.MonetaryDefaultEstablished](#coc7monetarydefaultestablished)|✅|❌|✅|✅|❌|❌|
|[CoC7.MonetaryDefaultGentry](#coc7monetarydefaultgentry)|✅|❌|✅|✅|❌|❌|
|[CoC7.MonetaryDefaultLower](#coc7monetarydefaultlower)|✅|❌|✅|✅|❌|❌|
|[CoC7.MonetaryDefaultMiddle](#coc7monetarydefaultmiddle)|✅|❌|✅|✅|❌|❌|
|[CoC7.MonetaryDefaultProfessional](#coc7monetarydefaultprofessional)|✅|❌|✅|✅|❌|❌|
|[CoC7.Passive](#coc7passive)|✅|❌|✅|✅|❌|❌|
|[CoC7.PersonalSpecialityPlaceholder](#coc7personalspecialityplaceholder)|✅|❌|✅|❌|✅|✅|
|[CoC7.PickWhichActorDesc](#coc7pickwhichactordesc)|✅|❌|✅|❌|❌|❌|
|[CoC7.PickWhichActorTitle](#coc7pickwhichactortitle)|✅|❌|✅|❌|❌|❌|
|[CoC7.RangedSpecializationName](#coc7rangedspecializationname)|✅|❌|✅|❌|❌|❌|
|[CoC7.PickWhichActorDesc](#coc7pickwhichactordesc)|✅|❌|✅|✅|❌|❌|
|[CoC7.PickWhichActorTitle](#coc7pickwhichactortitle)|✅|❌|✅|✅|❌|❌|
|[CoC7.RangedSpecializationName](#coc7rangedspecializationname)|✅|❌|✅|✅|❌|❌|
|[CoC7.RealRollDecaderPlaceholderName](#coc7realrolldecaderplaceholdername)|✅|❌|✅|✅|❌|❌|
|[CoC7.SkillNameHandgun](#coc7skillnamehandgun)|❌|❌|❌|✅|❌|❌|
|[CoC7.SkillNameLaunch](#coc7skillnamelaunch)|❌|❌|❌|✅|❌|❌|
Expand All @@ -58,13 +58,13 @@ The following translations have more than 50 untranslated strings [are you able
|[CoC7.SkillNameRifleShotgun](#coc7skillnamerifleshotgun)|❌|❌|❌|✅|❌|❌|
|[CoC7.SkillNameShotgun](#coc7skillnameshotgun)|❌|❌|❌|✅|❌|❌|
|[CoC7.SkillNameSmb](#coc7skillnamesmb)|❌|❌|❌|✅|❌|❌|
|[CoC7.SkillRanged](#coc7skillranged)|✅|❌|✅|❌|❌|❌|
|[CoC7.SkillRanged](#coc7skillranged)|✅|❌|✅|✅|❌|❌|
|[CoC7.Suppressed](#coc7suppressed)|✅|❌|✅|✅|❌|❌|
|[CoC7.Temporary](#coc7temporary)|✅|❌|✅|✅|❌|❌|
|[CoC7.TokenCreationRoll.Averaged](#coc7tokencreationrollaveraged)|✅|❌|✅|✅|❌|❌|
|[CoC7.TokenCreationRoll.Rolled](#coc7tokencreationrollrolled)|✅|❌|✅|✅|❌|❌|
|[CoC7.Unavailable](#coc7unavailable)|✅|❌|✅|✅|❌|❌|
|[CoC7.WaitingOnUser](#coc7waitingonuser)|✅|❌|✅|❌|❌|❌|
|[CoC7.WaitingOnUser](#coc7waitingonuser)|✅|❌|✅|✅|❌|❌|
|[SETTINGS.TokenDropMode](#settingstokendropmode)|✅|❌|✅|✅|❌|❌|
|[SETTINGS.TokenDropModeAsk](#settingstokendropmodeask)|✅|❌|✅|✅|❌|❌|
|[SETTINGS.TokenDropModeAverage](#settingstokendropmodeaverage)|✅|❌|✅|✅|❌|❌|
Expand Down
26 changes: 22 additions & 4 deletions lang/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,9 @@
"CoC7.DamageInflicted": "ダメージを与えた",
"CoC7.Damage": "ダメージ",
"CoC7.TotalDamage": "ダメージ合計",
"CoC7.CheckFailed": "Check failed",
"CoC7.CheckPassed": "Check passed",
"CoC7.CheckMemoryRepressed": "Memory repressed",
"CoC7.CheckFailed": "チェック失敗",
"CoC7.CheckPassed": "チェック成功",
"CoC7.CheckMemoryRepressed": "記憶は抑圧された",

"CoC7.combatCard.dive4cover": "掩蔽に飛び込む",

Expand Down Expand Up @@ -375,6 +375,7 @@
"CoC7.EraModernPulp": "現代(パルプ)",
"CoC7.EraRegency": "Regency Cthulhu - Standard",
"CoC7.EraRegencyPulp": "Regency Cthulhu - Pulp",
"CoC7.EraReignOfTerror": "Reign Of Terror",
"CoC7.Eras": "対応サプリメント",
"CoC7.EraAvailability": "出典",

Expand All @@ -388,6 +389,7 @@
"CoC7.SkillCombat": "戦闘",
"CoC7.SkillFighting": "近接格闘",
"CoC7.SkillFirearm": "射撃",
"CoC7.SkillRanged": "遠隔",
"CoC7.SkillRequiresName": "名前が必要",
"CoC7.SkillKeepBaseValue": "初期値を保持",
"CoC7.SkillPickNameOnly": "専門分野を選択",
Expand Down Expand Up @@ -428,6 +430,7 @@
"CoC7.FightingSpecializationName": "近接格闘",
"CoC7.UnarmedWeaponName": "素手",
"CoC7.FirearmSpecializationName": "射撃",
"CoC7.RangedSpecializationName": "遠隔",
"CoC7.DriveSpecializationName": "運転",
"CoC7.PilotSpecializationName": "操縦",
"CoC7.LanguageSpecializationName": "言語",
Expand Down Expand Up @@ -555,11 +558,18 @@
"CoC7.MonetaryFormatLsd": "ポンド",
"CoC7.MonetaryFormatRoman": "ローマ",
"CoC7.MonetaryDefaultPenniless": "無一文",
"CoC7.MonetaryDefaultDestitute": "貧困層",
"CoC7.MonetaryDefaultPoor": "貧乏",
"CoC7.MonetaryDefaultAverage": "平均",
"CoC7.MonetaryDefaultLower": "下層階級",
"CoC7.MonetaryDefaultMiddle": "途上中流階級 / 見習い専門家",
"CoC7.MonetaryDefaultWealthy": "裕福",
"CoC7.MonetaryDefaultEstablished": "下流紳士階級 / 確立専門家",
"CoC7.MonetaryDefaultProfessional": "中流紳士階級 / 富裕専門家",
"CoC7.MonetaryDefaultGentry": "上流紳士階級",
"CoC7.MonetaryDefaultRich": "富豪",
"CoC7.MonetaryDefaultSuperRich": "大富豪",
"CoC7.MonetaryDefaultAristocracy": "貴族",

"CoC7.PossessionsNotes": "メモ :",
"CoC7.PossessionsNotesHolder": "メモ",
Expand Down Expand Up @@ -1330,5 +1340,13 @@
"CoC7.Passive": "受動",
"CoC7.Inactive": "非活性",
"CoC7.Suppressed": "抑制",
"CoC7.Unavailable": "使用不可"
"CoC7.Unavailable": "使用不可",

"CoC7.PickWhichActorTitle": "ロールする者を選択",
"CoC7.PickWhichActorDesc": "あなたは複数人のアクターの所有者権限を持っている。ロールする者を選択すること",
"CoC7.WaitingOnUser": "ユーザーの待機中:",
"CoC7.ErrorRollAlreadyCompleted": "このロールはすでに完了している",
"CoC7.ErrorNoActorPermission": "あなたはこのアクターの所有者ではない",
"CoC7.ErrorCombinedRollsRequireSingleActor": "複合ロールでは1人より多いアクターは参加できない",
"CoC7.ErrorOpposedRollsLimitedToTwoActors": "対抗カードには2名のアクターが必要"
}
7 changes: 6 additions & 1 deletion module/check.js
Original file line number Diff line number Diff line change
Expand Up @@ -1684,7 +1684,12 @@ export class CoC7Check {

// ChatMessage.applyRollMode( chatData, this.rollMode);
if (this.dice?.roll && !this.dice?.hideDice) {
chatData.roll = this.dice.roll
// FoundryVTT v11
if (foundry.utils.isNewerVersion(game.version, '11')) {
chatData.rolls = [this.dice.roll]
} else {
chatData.roll = this.dice.roll
}
chatData.type = CONST.CHAT_MESSAGE_TYPES.ROLL
chatData.rollMode = this.isBlind ? 'blindroll' : this.rollMode
}
Expand Down
4 changes: 2 additions & 2 deletions system.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "CoC7",
"title": "Call of Cthulhu 7th Edition",
"description": "An implementation of the Call of Cthulhu 7th Edition game system for Foundry Virtual Tabletop.",
"version": "0.10.17",
"version": "0.10.18",
"authors": [
{
"name": "Miskatonic Investigative Society"
Expand Down Expand Up @@ -151,5 +151,5 @@
"secondaryTokenAttribute": "attribs.san",
"url": "https://github.com/Miskatonic-Investigative-Society/CoC7-FoundryVTT",
"manifest": "https://github.com/Miskatonic-Investigative-Society/CoC7-FoundryVTT/releases/latest/download/system.json",
"download": "https://github.com/Miskatonic-Investigative-Society/CoC7-FoundryVTT/releases/download/0.10.17/system.zip"
"download": "https://github.com/Miskatonic-Investigative-Society/CoC7-FoundryVTT/releases/download/0.10.18/system.zip"
}

0 comments on commit ca9b315

Please sign in to comment.