From 7541584b99cbcc2a5d11ca6e12bade7155a175d6 Mon Sep 17 00:00:00 2001 From: alzer <> Date: Mon, 28 Sep 2026 20:38:36 +0200 Subject: [PATCH] fix: Korrumpierungstest-Makro laesst jetzt den Spieler wuerfeln, nicht den GM actor.corruptionDialog() rollt immer auf dem Client, der es aufruft - direkt vom GM-Makro gerufen wuerfelte also der GM statt des Spielers. Nutzt jetzt stattdessen den eingebauten Mechanismus des Systems: fuer jeden ausgewaehlten Token wird geprueft, ob ein aktiver Spieler den Charakter besitzt; falls ja, bekommt nur dieser Spieler eine Chat-Nachricht mit "Widerstehen"-Knopf zugefluestert (CorruptionMessageModel.createCorruptionMessage), die er selbst anklickt und dabei auf seinem eigenen Client fuer seinen zugewiesenen Charakter wuerfelt. Ohne aktiven Spielerbesitzer (NSCs) wuerfelt der GM wie bisher direkt. --- .../Korrumpierungstest_k8NFrPLMTrMKIfrx.json | 4 ++-- packs/macros/000034.ldb | Bin 0 -> 2658 bytes packs/macros/CURRENT | 2 +- packs/macros/LOG | 10 +++++----- packs/macros/LOG.old | 6 +++--- packs/macros/MANIFEST-000028 | Bin 298 -> 0 bytes packs/macros/MANIFEST-000033 | Bin 0 -> 369 bytes 7 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 packs/macros/000034.ldb delete mode 100644 packs/macros/MANIFEST-000028 create mode 100644 packs/macros/MANIFEST-000033 diff --git a/packs-source/macros/Korrumpierungstest_k8NFrPLMTrMKIfrx.json b/packs-source/macros/Korrumpierungstest_k8NFrPLMTrMKIfrx.json index 95293af..318e8ab 100644 --- a/packs-source/macros/Korrumpierungstest_k8NFrPLMTrMKIfrx.json +++ b/packs-source/macros/Korrumpierungstest_k8NFrPLMTrMKIfrx.json @@ -3,7 +3,7 @@ "type": "script", "flags": {}, "scope": "global", - "command": "/* GM-Makro: Korrumpierungstest auslösen\n * Fragt Schwere (Leicht/Mittel/Schwer) und Art des Kontakts (Ausdauer = körperlich,\n * Besonnenheit = geistig) ab und wendet den Test auf alle aktuell ausgewählten\n * Token an (Fallback: eigener zugewiesener Charakter, falls nichts ausgewählt ist).\n */\n\nlet actors = canvas.tokens.controlled.map(t => t.actor).filter(a => a);\nif (actors.length === 0 && game.user.character) actors = [game.user.character];\nif (actors.length === 0) {\n ui.notifications.warn(\"Bitte zuerst einen oder mehrere Token auswählen.\");\n return;\n}\n\nlet strength = await foundry.applications.api.DialogV2.wait({\n window: { title: \"Korrumpierungstest: Schwere\" },\n content: `

Wie schwer ist der Kontakt mit Verderbnis?

`,\n buttons: [\n { action: \"minor\", label: game.i18n.localize(\"CORRUPTION.Minor\") },\n { action: \"moderate\", label: game.i18n.localize(\"CORRUPTION.Moderate\") },\n { action: \"major\", label: game.i18n.localize(\"CORRUPTION.Major\") }\n ]\n});\nif (!strength) return;\n\n// actor.corruptionDialog(strength, skill) compares `skill` against the LOCALIZED\n// skill names (game.i18n.localize(\"NAME.Endurance\"/\"NAME.Cool\"), lowercased) - not\n// against the English \"endurance\"/\"cool\" literals. Passing the raw English action\n// value here made corruptionDialog think no skill was chosen yet, so it popped up\n// its own redundant Ausdauer/Besonnenheit dialog on top of ours. Using the\n// localized name as the action value makes corruptionDialog recognize the choice\n// and go straight to the roll dialog, as intended.\nlet skill = await foundry.applications.api.DialogV2.wait({\n window: { title: \"Korrumpierungstest: Art\" },\n content: `

Handelt es sich um körperlichen oder geistigen Kontakt?

`,\n buttons: [\n { action: game.i18n.localize(\"NAME.Endurance\"), label: `${game.i18n.localize(\"NAME.Endurance\")} (körperlich)` },\n { action: game.i18n.localize(\"NAME.Cool\"), label: `${game.i18n.localize(\"NAME.Cool\")} (geistig)` }\n ]\n});\nif (!skill) return;\n\nfor (let actor of actors) {\n await actor.corruptionDialog(strength, skill);\n}\n", + "command": "/* GM-Makro: Korrumpierungstest auslösen\n * Fragt Schwere (Leicht/Mittel/Schwer) und Art des Kontakts (Ausdauer = körperlich,\n * Besonnenheit = geistig) ab. Für jeden aktuell ausgewählten Token wird geprüft, ob\n * ein aktiver Spieler den zugehörigen Charakter besitzt: falls ja, bekommt NUR dieser\n * Spieler eine Chat-Nachricht mit \"Widerstehen\"-Knopf zugeflüstert und würfelt selbst\n * (auf seinem eigenen Client, für seinen zugewiesenen Charakter). Gibt es keinen\n * aktiven Spielerbesitzer (z.B. bei NSCs), würfelt der GM direkt.\n */\n\nlet actors = canvas.tokens.controlled.map(t => t.actor).filter(a => a);\nif (actors.length === 0 && game.user.character) actors = [game.user.character];\nif (actors.length === 0) {\n ui.notifications.warn(\"Bitte zuerst einen oder mehrere Token auswählen.\");\n return;\n}\n\nlet strength = await foundry.applications.api.DialogV2.wait({\n window: { title: \"Korrumpierungstest: Schwere\" },\n content: `

Wie schwer ist der Kontakt mit Verderbnis?

`,\n buttons: [\n { action: \"minor\", label: game.i18n.localize(\"CORRUPTION.Minor\") },\n { action: \"moderate\", label: game.i18n.localize(\"CORRUPTION.Moderate\") },\n { action: \"major\", label: game.i18n.localize(\"CORRUPTION.Major\") }\n ]\n});\nif (!strength) return;\n\n// actor.corruptionDialog(strength, skill) compares `skill` against the LOCALIZED\n// skill names (game.i18n.localize(\"NAME.Endurance\"/\"NAME.Cool\"), lowercased) - not\n// against the English \"endurance\"/\"cool\" literals. Using the localized name as the\n// action value makes corruptionDialog recognize the choice directly.\nlet skill = await foundry.applications.api.DialogV2.wait({\n window: { title: \"Korrumpierungstest: Art\" },\n content: `

Handelt es sich um körperlichen oder geistigen Kontakt?

`,\n buttons: [\n { action: game.i18n.localize(\"NAME.Endurance\"), label: `${game.i18n.localize(\"NAME.Endurance\")} (körperlich)` },\n { action: game.i18n.localize(\"NAME.Cool\"), label: `${game.i18n.localize(\"NAME.Cool\")} (geistig)` }\n ]\n});\nif (!skill) return;\n\n// actor.corruptionDialog() rolls on whichever client calls it - calling it directly\n// here would make the GM roll, not the player. The system's own corruption chat\n// card (CorruptionMessageModel) exists exactly for this: it posts a \"Widerstehen\"\n// button whose click handler runs corruptionDialog() on the CLICKING user's own\n// client. Whisper it only to the actor's active player owner (+ GM), so just that\n// player is prompted and rolls for their own assigned character.\nconst CorruptionMessageModel = CONFIG.ChatMessage.dataModels?.[\"corruption\"];\nconst gmIds = game.users.contents.filter(u => u.isGM).map(u => u.id);\n\nfor (let actor of actors) {\n const ownerIds = game.users.contents\n .filter(u => !u.isGM && u.active && actor.testUserPermission(u, \"OWNER\"))\n .map(u => u.id);\n\n if (ownerIds.length && CorruptionMessageModel) {\n CorruptionMessageModel.createCorruptionMessage(strength, { skill, source: actor.name }, {\n whisper: [...new Set([...ownerIds, ...gmIds])],\n speaker: { alias: actor.name }\n });\n } else {\n // Kein aktiver Spielerbesitzer gefunden (z.B. NSC) - GM würfelt direkt.\n await actor.corruptionDialog(strength, skill);\n }\n}\n", "author": "mC699Qr7Z5o6lRTF", "img": "icons/magic/unholy/silhouette-robe-evil-power.webp", "_stats": { @@ -13,7 +13,7 @@ "systemId": "wfrp4e", "systemVersion": "10.0.3", "createdTime": 1759071600000, - "modifiedTime": 1759158000000, + "modifiedTime": 1759161600000, "lastModifiedBy": "mC699Qr7Z5o6lRTF" }, "folder": null, diff --git a/packs/macros/000034.ldb b/packs/macros/000034.ldb new file mode 100644 index 0000000000000000000000000000000000000000..3ea6adaaf686f112441f0d7e64a090c2b10bf0e1 GIT binary patch literal 2658 zcmaJ@e{38_6`sX+bT2ty&vDW?t&`3zj(gkO?b(UzIM>A0**Pbd#Lf>pc9UEZ&+X3L zO>TB)GqdZ9Z7dS0L25xlR5Y|Gsv4<6v_e(>fT*AVs!T*%;2(sb5>!=yQh_Q_q!uBH zfVYm|Pgc5H-ORl=?|t8U-YOx`QCwch8Oj#%-p@CM)T?^rQe7Bi&z|fbgx9dR; zi`rVSl&x8@1vqvZpyBY2JS~L{+Jqoj1AdG*i3HcMRilapOFbprHx48TrGW@at>G*7@pfSO$19 z*^xFRSEoF{it?HYwx|3o3G46++`5=X;Y9&*Mmoyj$9S^LsJU%EXb^_4@q1j3Bk_k~L;QHVjWqk1I2`<*P#wA5aZhN!ki5?S*#= zRiK#D024b9QUMb-@fL`(f(T+|*}$a~oKwegiJt|kMsZ*fE&rrx)ftc>vm{z0=Hpe5 z)p0ga;TES}BWU7%`}W}h+~1EIP_0%7I9j&$tF#S9=9UnhIrK0>XY0q&n$xlFK>|Q>$Rt&RL z0@gK;sVDXp{L%S%sjn6W0c2IgXSAa_#>*L|Lzdc=5tn&FR*f9yq(*tse4ewx5zpen zCY&u%Kw$jni4!M}%~Xy~S(AwYWOiOJPNE(GCy;=?b_{LWb$S}b$c0-kp~Qf0;uY<~ zxI;v+}LOGhfF%lqTg@eIN@-qxYN%Rd{P*7i@8Cd*dYb3#cxn^uiN zHPP*i3&E>~2}uc14Vx(Hm^hDt;P@#^p={Y}aHg8jHFW1egzWhEUd$Pk2I0!WCl&J= z@ox_P5;<`ImniLl#3^KJpAO&!!b6H((t4-=h|}zY9m#{BcsJ@wQl&_PUa2*KJ9-HeRKW{6 znJ+@6OW=*EqV__}7urLJjQ--j__to!w-MqKifZo-*)7}zI3j_B`7zPo5zCsH4OhDH z_>s!^;mXtj{Kf}~*W)M5K5XGR@CEv=> z0n(Mg7s9Jco&Pk=z0eximrz*&bugT_eF~}04`Y7RpW(xtZLkSHE}%Ia4Sx#te5X(?t5TN zPeO01ZI(U|MzR!IOhG_aYDVws(jD{hy9=3DP}X=>*RiN)wm>&1^G_cqnrVO-`n82h zAH*=;c@d#ZLZ+V4QJDIXp1Ba~?@ydTR?1!Pp9CE{My1Oja^Ype9F*|UxvBCAsCKjS z_@UPjIC!Jg^_6XZ)4}ZY8LjgU!lxfbJ(evg^y}EywRf+hI~_`!7CTqpSk^&W z%sx#+?TR}D5@A`EN85Os23alH_3d;H!^-xX$+PC!T;g{aV;}=sK&HN^o{k#bL-L#S`WR{U)Q7Th8NdugmD19ctta;_5Ih@LAVdP z3Hs0%U%d}Ku04-dHrz^lv;r3d5(Z5n;eOzb5AWG?T<$*om>A|KW+q^dxeeH0FdkIF zB@Jd5La!fr7JZ)SzW+6>qjXF|mp>b=Cg8IkZMgO2K4f&sI0lzC%Z z2zO#_r0#sXdqZRu`9iyYaBdkTIt=aK_a1bo`+s}aexJK`w|n5)#?8^v|9|E_z5J!V I@W5~W16%_)(*OVf literal 0 HcmV?d00001 diff --git a/packs/macros/CURRENT b/packs/macros/CURRENT index 5d0fffb..a56825e 100644 --- a/packs/macros/CURRENT +++ b/packs/macros/CURRENT @@ -1 +1 @@ -MANIFEST-000028 +MANIFEST-000033 diff --git a/packs/macros/LOG b/packs/macros/LOG index e92c69f..13dbdbf 100644 --- a/packs/macros/LOG +++ b/packs/macros/LOG @@ -1,5 +1,5 @@ -2026/09/28-20:33:34.418376 70000a8ff000 Recovering log #27 -2026/09/28-20:33:34.419367 70000a8ff000 Level-0 table #29: started -2026/09/28-20:33:34.420174 70000a8ff000 Level-0 table #29: 1885 bytes OK -2026/09/28-20:33:34.421252 70000a8ff000 Delete type=3 #26 -2026/09/28-20:33:34.421375 70000a8ff000 Delete type=0 #27 +2026/09/28-20:38:19.626146 70000c54f000 Recovering log #32 +2026/09/28-20:38:19.626873 70000c54f000 Level-0 table #34: started +2026/09/28-20:38:19.627431 70000c54f000 Level-0 table #34: 2658 bytes OK +2026/09/28-20:38:19.628566 70000c54f000 Delete type=3 #31 +2026/09/28-20:38:19.628803 70000c54f000 Delete type=0 #32 diff --git a/packs/macros/LOG.old b/packs/macros/LOG.old index fa8686c..cdf3876 100644 --- a/packs/macros/LOG.old +++ b/packs/macros/LOG.old @@ -1,3 +1,3 @@ -2026/09/28-20:33:23.548180 700013eab000 Recovering log #25 -2026/09/28-20:33:23.552091 700013eab000 Delete type=3 #24 -2026/09/28-20:33:23.552252 700013eab000 Delete type=0 #25 +2026/09/28-20:38:11.854045 7000057f2000 Recovering log #30 +2026/09/28-20:38:11.856164 7000057f2000 Delete type=3 #28 +2026/09/28-20:38:11.856384 7000057f2000 Delete type=0 #30 diff --git a/packs/macros/MANIFEST-000028 b/packs/macros/MANIFEST-000028 deleted file mode 100644 index bfc4b28ae5a40068648a2a79de34680125bad988..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 298 zcmc~_SbX{{10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAei199f?{rBa#4PV_Dn0PU^IlNBB+3!iD!=n zT$Qm=Qb?9KDenEjx$0t H6_)}4H{4F) diff --git a/packs/macros/MANIFEST-000033 b/packs/macros/MANIFEST-000033 new file mode 100644 index 0000000000000000000000000000000000000000..f9795f13ad2dce4a834bc31e484e697daa544b65 GIT binary patch literal 369 zcmcbA`!u5nBO{|!PHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAei199f?{rBa#4PV_Dn0PU^IfLBB+3!LEtSn zZdHbajDad(XX4qT0XN3jC@CbTpxn~1A}_+t*V%|sAI%tCo|4)im+Q~K$fV54z^uYz U%+8?nNCa*wh98a5OvR-D0D6O99smFU literal 0 HcmV?d00001