Merge pull request #13369 from BeautiDemise/revert-13313-Revert-0.6.3

Revert "[Project Moon RPG] Revert from v0.7 back to v0.6.3"
This commit is contained in:
Nora Cahill
2024-10-01 11:54:48 -07:00
committed by GitHub
4 changed files with 2189 additions and 425 deletions
File diff suppressed because it is too large Load Diff
+271 -42
View File
@@ -211,7 +211,7 @@ textarea::placeholder, .CharSmallNotes::placeholder, .CharDetail::placeholder, .
font-size: 16pt;
font-weight: bold;
}
.Cstat{
.Cstat, .Tstat {
color: #111;
background-color: transparent !important;
width: 125% !important;
@@ -223,7 +223,7 @@ textarea::placeholder, .CharSmallNotes::placeholder, .CharDetail::placeholder, .
opacity: 80%;
padding-left: 5px;
}
.Mstat{
.Mstat {
color: rgba(0,0,0,0.5);
position: absolute;
top: 0;
@@ -254,9 +254,25 @@ textarea::placeholder, .CharSmallNotes::placeholder, .CharDetail::placeholder, .
right: 0;
z-index: 20;
}
.bars {position: relative; background-color: #111; width: 90px !important; height: 25px; height: 37px; border-radius: 5px;}
.bars {position: relative; background-color: #111; width: 90px !important; height: 37px; border-radius: 5px;}
.contentBlock { width: 100%; display: flex; justify-content: start; align-items: start; }
/* Blue border for Temporary HP and ST */
.bars:has(> .style-toggle-rev:not(:checked)) {
border: 2px solid #1f9bd9c0 !important;
top: -3px;
left: -3px;
z-index: 1;
}
.bars:has(> .style-toggle-rev:checked) {
border: 0px !important;
}
.banner:has(.style-toggle-rev:not(:checked)) span {
position: relative;
top: -1px;
z-index: 2;
}
#Counter span {
font-weight: bold;
}
@@ -1602,53 +1618,17 @@ margin-bottom: 2px !important;}
border-radius: 5px;
background-color: #222 !important;
border: 1px #111 solid;
pointer-events: none;
}
.damageHelperType:has(input:checked:not([value="None"])) ~ .applyDamage .applyDamageInput {
opacity: 100%;
pointer-events: auto;
}
.damageHelperType:has(input:checked:not([value="None"])) ~ .applyDamage .applyDamageInput:hover {
background-color: #000 !important;
cursor: pointer;
}
/* Combat options */
/* Currently just contains a preview of the defence automation from v0.7 */
.combatOptionsContainer {
margin-bottom: 6px;
}
.defenceDice {
height: 40px !important;
width: 40px !important;
font-size: 20px;
text-shadow: #000 0 0 3px, #000 0 0 10px;
text-align: center;
background-size: contain;
background-position: left;
background-repeat: no-repeat;
background-image: url('https://raw.githubusercontent.com/beautidemise/roll20-character-sheets/Release-v0.6.2/ProjectMoonTRPG/imagesResized/icons/egoDef.png');
}
.defenceDice:not(:hover):not(:focus)::-webkit-inner-spin-button,
.defenceDice:not(:hover):not(:focus)::-webkit-outer-spin-button {
display: none;
}
/* This disables the spinner in Firefox */
.defenceDice {
appearance: textfield;
}
.defenceDice:focus, .defenceDice:hover {
appearance: auto;
}
/* For preview. Delete later */
.combatOptionsContainer .rowContainer {
display: flex;
align-items: center;
justify-content: center;
}
.combatOptionsContainer b {
margin-right: 5px;
font-size: 11pt !important;
}
/* Roll helpers */
@@ -1671,7 +1651,8 @@ margin-bottom: 2px !important;}
border: 1px #111 solid;
margin: 1px;
}
.speed:hover, button[type=roll].NDice:hover, button[type=action].NDice:hover, .challengeButton:hover, .declare:hover, .btn:hover {
.speed:hover, button[type=roll].NDice:hover, button[type=action].NDice:hover,
.challengeButton:hover, .declare:hover, .btn:hover, .selectTargetButton:hover, .defenceDice:hover {
background-color: #000 !important;
}
.expand-toggle:checked ~ .whisper {
@@ -2801,6 +2782,254 @@ justify-content: center;
}
/* Combat options */
.combatOptionsContainer {
margin-bottom: 6px;
}
.combatOptionsContainer b {
display: inline-block;
}
.combatOptionsContainer .tokenName {
display: inline-block;
width: 100%;
height: 12px !important;
padding: 0;
font-size: 9pt;
font-weight: bold;
text-align: center;
opacity: 30%;
color: #fff;
background-color: transparent;
pointer-events: none;
}
.combatOptionsContainer .tokenName::placeholder {
opacity: 100% !important;
}
.combatOptionsContainer :is(b, .tokenName) {
margin-bottom: 2px;
}
.combatOptionsContainer :is(img[src=""], img:not([src])) {
display: none;
}
.combatOptionsContainer :is(img[src=""], img:not([src])) + input[type="number"] {
display: none;
}
.combatOptionsContainer .bars {
height: 24px;
background-color: #222;
}
.combatOptionsContainer .bars.bars:not(:first-child) {
margin-left: 2px;
}
.combatOptionsContainer .Cstat {
width: 100% !important;
font-size: 12pt;
pointer-events: none;
}
.combatOptionsContainer .Cstat::-webkit-inner-spin-button,
.combatOptionsContainer .Cstat::-webkit-outer-spin-button {
display: none;
}
/* This disables the spinner in Firefox */
.combatOptionsContainer .Cstat {
appearance: textfield;
}
.hide-toggle-rev ~ .combatOptionsContainer.hide-item-rev {
display: flex;
}
.selectTargetButton, .targetToken {
height: 44px;
width: 44px;
}
.selectTargetButton {
padding: 3px;
border-radius: 5px;
background-color: #222 !important;
border: 1px #111 solid;
}
.targetToken {
opacity: 0.5;
}
.selectTargetIcon {
height: 50px;
width: 50px;
position: absolute;
bottom: 0;
left: 0;
background-size: contain;
background-position: center;
background-repeat: no-repeat;
background-image: url('https://raw.githubusercontent.com/beautidemise/roll20-character-sheets/Release-v0.6.2/ProjectMoonTRPG/imagesResized/icons/target.png');
}
/* Last defence dice display */
.defenceDice {
height: 52px !important;
width: 52px !important;
padding: 4px;
font-size: 20px;
text-shadow: #000 0 0 3px, #000 0 0 10px;
text-align: center;
border: 1px #111 solid !important;
border-radius: 5px;
background-color: #222 !important;
background-size: 45px;
background-position: 45% 45%;
background-repeat: no-repeat;
background-image: url('https://raw.githubusercontent.com/beautidemise/roll20-character-sheets/Release-v0.6.2/ProjectMoonTRPG/imagesResized/icons/egoDef.png');
}
.defenceDice:not(:hover):not(:focus)::-webkit-inner-spin-button,
.defenceDice:not(:hover):not(:focus)::-webkit-outer-spin-button {
display: none;
}
/* This disables the spinner in Firefox */
.defenceDice {
appearance: textfield;
}
.defenceDice:focus, .defenceDice:hover {
appearance: auto;
}
/* Generic token mode display */
.genericTokenContainer {
position: fixed;
bottom: 0px;
left: 0%;
width: calc(99% - 14px);
z-index: 999;
padding: 5px;
background-color: #1F1F1F !important;
}
#genericTokenModeToggle + .genericTokenContainer {
display: none !important;
}
#genericTokenModeToggle:checked + .genericTokenContainer {
display: flex !important;
}
.genericTokenInstanceContainer .repcontainer {
display: flex;
flex-wrap: wrap;
}
.genericTokenInstanceContainer .repcontrol {
display: none;
}
.genericTokenInstanceContainer .hide-toggle-rev + .hide-item-rev {
display: inline-block !important;
}
.genericTokenInstanceContainer .hide-toggle-rev:checked + .hide-item-rev {
display: none !important;
}
/* Generic token controls */
.genericTokenSelectButton {
position: absolute;
top: -2px;
left: -2px;
height: 20%;
width: calc(100% + 2px);
background-color: transparent;
}
.genericToken_controls {
justify-content: space-around;
width: 50px;
height: 130px;
margin: 10px 5px 10px 5px;
}
.genericToken_controls button {
background-color: transparent;
}
/* Individual generic token*/
.genericToken {
height: 130px;
width: 120px;
margin: 5px;
}
.style-toggle:checked + .genericToken {
height: 126px;
border: 2px solid #666;
}
.genericToken .tokenName {
background-color: transparent;
color: #999;
width: 100%;
padding: 0;
pointer-events: none;
overflow: ellipsis;
}
.genericToken .bars {
width: 100px !important;
height: 20px;
}
.genericToken .bars:not(:first-child) {
margin-top: 2px;
}
.genericToken :is(.Cstat, .Mstat, .Tstat) {
font-size: 12pt;
}
.genericToken .Mstat{
width: 33% !important;
padding: 4px 2px 4px 2px;
}
.genericToken .Tstat {
width: auto !important;
left: 30px;
z-index: 3;
}
.tokenAilment, .targetAilment {
width: 25px;
height: 25px;
margin-top: 2px;
}
:is(.tokenAilment, .targetAilment) img {
position: relative;
opacity: 90%;
left: 0;
width: 25px;
height: 25px;
background-size: contain;
background-position: center;
background-repeat: no-repeat;
z-index: 1;
}
:is(.tokenAilment, .targetAilment) input[type="number"] {
position: relative;
top: -25px;
left: -2px;
background-color: transparent;
color: #fff;
font-weight: bold;
text-shadow: #000 0 0 3px, #000 0 0 5px, #000 0 0 10px;
padding-left: 2px;
text-align: center;
z-index: 2;
}
.targetAilment {
pointer-events: none;
}
.tokenAilment input[type="number"]:not(:hover):not(:focus)::-webkit-inner-spin-button,
.tokenAilment input[type="number"]:not(:hover):not(:focus)::-webkit-outer-spin-button {
display: none;
}
.tokenAilment input[type="number"]:hover, :hover::-webkit-inner-spin-button,
.tokenAilment input[type="number"]:hover, :hover::-webkit-outer-spin-button,
.tokenAilment input[type="number"]:focus, :hover::-webkit-inner-spin-button,
.tokenAilment input[type="number"]:focus, :hover::-webkit-outer-spin-button {
z-index: 3;
}
.tokenAilment input[type="number"] {
appearance: textfield;
}
.tokenAilment input[type="number"]:not(:hover):not(:focus) {
width: 31px !important;
}
.tokenAilment input[type="number"]:focus, .tokenAilment input[type="number"]:hover {
appearance: auto;
width: 3.5em;
}
/* AutoScript Editor */
.autoscriptEditorContainer {
position: fixed;
+1 -1
View File
@@ -4,7 +4,7 @@
"authors": "punibird, BeautifulDemise",
"roll20userid": "11544351, 487875",
"preview": "ProjectMoonTRPG-preview.jpg",
"instructions": "**Project Moon TRPG - Roll20 Sheet** - (version 0.6.3)\n\n**Supported Languages:** English, 日本語, 한국어\n\nThis is a Roll20 character sheet and playing tool for Project Moon TRPG, a fan-made system based on the games and world setting of Project Moon.\nThe original system was created in Korean by helloing0119.\n\n**Contact:** [Google Form](https://forms.gle/EMnjArzsgdpQJwfZ9) | [@punibird](https://twitter.com/punibird) | [beautifuldemise (Discord)](https://discord.com/users/166920510330896384) \n\n**PMTRPG Resources:** [Google Drive](https://drive.google.com/drive/u/2/folders/15nMYLz0sB5xWUiSOG4oN6IsteRJjpdZk)\n[Rule Summary](https://docs.google.com/document/d/1MRk6HRD79pw-3-dcgteGgHIBAzdKVpDHRYIY5EFscE4/) | [Roll20 Sheet Guide](https://docs.google.com/document/d/1ok4-2vBbgH9jyBw05kGwsl0F96qrck4vmU9PO5kvoWU/)",
"instructions": "**Project Moon TRPG - Roll20 Sheet** - (version 0.7)\n\n**Supported Languages:** English, 日本語, 한국어\n\nThis is a Roll20 character sheet and playing tool for Project Moon TRPG, a fan-made system based on the games and world setting of Project Moon.\nThe original system was created in Korean by helloing0119.\n\n**Contact:** [Google Form](https://forms.gle/EMnjArzsgdpQJwfZ9) | [@punibird](https://twitter.com/punibird) | [beautifuldemise (Discord)](https://discord.com/users/166920510330896384) \n\n**PMTRPG Resources:** [Google Drive](https://drive.google.com/drive/u/2/folders/15nMYLz0sB5xWUiSOG4oN6IsteRJjpdZk)\n[Rule Summary](https://docs.google.com/document/d/1MRk6HRD79pw-3-dcgteGgHIBAzdKVpDHRYIY5EFscE4/) | [Roll20 Sheet Guide](https://docs.google.com/document/d/1ok4-2vBbgH9jyBw05kGwsl0F96qrck4vmU9PO5kvoWU/)",
"instructionstranslationkey": "sheetsettings-instructions",
"useroptions": [
{
+24 -2
View File
@@ -11,6 +11,7 @@
"settings-damage-helper":"Damage Helper Settings",
"settings-ailments":"Ailment Settings",
"settings-autoeffects":"AutoEffect Setting",
"settings-generictokenmode":"Sheet: Generic token mode",
"settings-mute":"Mute ailment messages",
"settings-detect":"Auto: Detect combat states",
"settings-autoapplydamage":"Auto: Apply damage taken",
@@ -23,9 +24,12 @@
"settings-hidebarupdate":"Hide: Status bar update",
"settings-hidehelpertext":"Hide: Helper text",
"settings-hideshare":"Hide: Share buttons",
"settings-hidecombatoptions":"Hide: Combat options",
"settings-hidedetailsfromtargeting":"Hide: Details from targeting",
"settings-burnimmune":"No burn damage",
"settings-bleedimmune":"No bleed damage",
"settings-turnupdate":"Auto: Update Turn Order",
"settings-autoupdate":"Auto: Update on New round",
"settings-evdinfluence":"EVD influenced by Haste/Bind",
"settings-whisper":"Whisper rolls to: ",
"settings-multihitfull":"No power debuff on Multi-hit",
@@ -34,6 +38,7 @@
"settings-limbusstyle":"Limbus style ailment icons",
"settings-multihituses":"Spend Uses per Multi-hit",
"settings-hideuses":"Hide: Uses in messages",
"settings-hide-combatoptions":"Hide: Combat options",
"settings-collapsesections":"Collapse AutoEffect sections",
"settings-hideconditionalreminder":"Hide: Conditional button reminder",
"assessed":"Assessed by: ",
@@ -74,6 +79,14 @@
"character-personality-placeholder":"Personality description.",
"character-background":"Background",
"character-background-placeholder":"Background description.",
"token-name":"Token Name",
"token-add":"Add token",
"token-add-multiple":"Add multiple",
"token-delete":"Delete token",
"token-bar1":"Bar 1",
"token-bar2":"Bar 2",
"token-bar3":"Bar 3",
"token-bar-none":"None",
"ego-name":"Mystery name (E.G.O)",
"ego-activate":"Activate Mystery",
"ego-activecondition":"Activation condition",
@@ -124,9 +137,11 @@
"bar-stagres-shortened":"ST",
"bar-health-and-stagres": "Health and Stagger",
"bar-health-temp": "Temporary Health",
"bar-health-temp-shortened": "THP",
"bar-health-temp-shorter": "Temp HP",
"bar-health-temp-shortest": "THP",
"bar-stagres-temp": "Temporary Stagger Res",
"bar-stagres-temp-shortened": "TST",
"bar-stagres-temp-shorter": "Temp ST",
"bar-stagres-temp-shortest": "TST",
"bar-sanity":"Sanity",
"bar-sanity-shortened":"SP",
"bar-light":"Light",
@@ -157,6 +172,10 @@
"helper-text-applyailments":"Apply ailments",
"helper-text-giveailments":"Give ailments",
"helper-text-lastdefenceroll":"Last Defence roll",
"helper-text-selecttarget":"Target",
"helper-text-selecttarget-title":"Select target. Double click button to reset target",
"helper-text-notarget":"No target selected",
"helper-text-defencedice":"Defence",
"resist-ailment":"Resistance",
"ailments-panic-title":"Panic",
"ailments-panic-text":"Panicked",
@@ -349,6 +368,7 @@
"autoeffect-trigger-defensive": "Defensive",
"autoeffect-trigger-block": "Block",
"autoeffect-trigger-evade": "Evade",
"autoeffect-alert-notarget": "No target",
"equip-weapon1-name":"Weapon Name (1)",
"equip-weapon2-name":"Weapon Name (2)",
"equip-weapon3-name":"Weapon Name (3)",
@@ -563,6 +583,8 @@
"query-reset-styling":"Are you certain you want to reset back to the default AutoEffect styling settings? This action can not be reversed",
"query-yes":"Yes",
"query-no":"No",
"query-enable-generic-mode":"Generic token mode not enabled for sheet. Enable setting?",
"query-add-token-instance":"Token does not have a token instance. Add instance?",
"pop-editmode":"Edit Mode",
"pop-pwerror":"Wrong password.",
"pop-update":"Update",