Skip to content

Commit

Permalink
Merge pull request #13240 from BeautiDemise/Release-v0.6.3
Browse files Browse the repository at this point in the history 
[Project Moon TRPG] Maintenance Release v0.6.3
  • Loading branch information
@NBrooks-Roll20
NBrooks-Roll20 authored Aug 27, 2024
2 parents 1d5476f + d5f58ad commit 3bae268
Show file tree
Hide file tree
Showing 6 changed files with 892 additions and 449 deletions.
1,190 changes: 747 additions & 443 deletions ProjectMoonTRPG/ProjectMoonTRPG.html
View file

Large diffs are not rendered by default.

130 changes: 126 additions & 4 deletions ProjectMoonTRPG/ProjectMoonTRPGStyle.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,14 @@ textarea::placeholder, .CharSmallNotes::placeholder, .CharDetail::placeholder, .
.helperText:checked ~ .helperTextContainer .helpers b {
display: none !important;
}
.helperText:checked ~ .damageHelperContainer.helperTextContainer :is(.slash, .pierce) {
margin-right: 28px;
}
.helperText:checked ~ .damageHelperContainer.helperTextContainer .blunt {
position: absolute;
top: 0px;
left: 28px;
}
.editCover > .rowContainer,
.editCover > .hide-item,
.editCover > .hide-item > .rowContainer {
Expand Down Expand Up @@ -394,9 +402,10 @@ textarea::placeholder, .CharSmallNotes::placeholder, .CharDetail::placeholder, .
font-weight: bold;
z-index: 150;
}
/*#settings {*/
#settings:hover {
height: 500px;
width: 300px;
height: auto;
width: 530px;
border: 1px #fee2b0 solid;
border-radius: 5px 15px 5px 5px;
background-color: rgba(0,0,0,0.8);
Expand All @@ -416,7 +425,19 @@ textarea::placeholder, .CharSmallNotes::placeholder, .CharDetail::placeholder, .
border: 1px #fee2b0 solid;
}
.settingsText {
width: 220px;
padding: 35px;
padding-bottom: 25px;
}
.settingsText input[type="checkbox"] {
position: absolute;
}
.settingsText span:not(.settingsTitle) {
position: relative;
left: 21px;
}
.settingsTitle {
line-height: 1.8em;
}


Expand Down Expand Up @@ -1590,6 +1611,45 @@ margin-bottom: 2px !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 */
.helpers {
Expand Down Expand Up @@ -2240,6 +2300,10 @@ background-image: url('https://raw.githubusercontent.com/punibird/roll20-charact
background-image: url('https://raw.githubusercontent.com/beautidemise/roll20-character-sheets/master/ProjectMoonTRPG/images/ailments/limbus/RottingSkin.png');
}

.blood {
background-image: url('https://raw.githubusercontent.com/beautidemise/roll20-character-sheets/Release-v0.6.3/ProjectMoonTRPG/images/ailments/Blood.png');
}

.slashprotection-limbus {
background-image: url('https://raw.githubusercontent.com/punibird/roll20-character-sheets/master/ProjectMoonTRPG/images/ailments/limbus/SlashProtection.png');
}
Expand Down Expand Up @@ -2482,6 +2546,24 @@ height: 35px;}
.sheet-rolltemplate-damagecalculation .userscript-spCalculationContainer div:first-child { color: #6d9eeb; background-color: #111; }


/* Description and effect container styling */
.sheet-rolltemplate-baseRoll .userscript-descriptionContainer {
width: 50%;
height: auto;
float: left;
}
/* If only one description is present, expand its width */
.sheet-rolltemplate-baseRoll :nth-child(1 of div.userscript-descriptionContainer):not(:has(+ .userscript-descriptionContainer)) {
width: 100% !important;
}
.sheet-rolltemplate-baseRoll .userscript-effectDescription {
max-height: 70px;
overflow: auto;
border: 1px #555 solid;
padding-bottom: 1px;
}


/* AutoEffect message styling */
/* Yes, you have to write them all out like this... */
.sheet-rolltemplate-damagecalculation .userscript-autoeffectContainer .userscript-autoEffectImage,
Expand All @@ -2501,15 +2583,14 @@ height: 35px;}
.sheet-rolltemplate-autoeffect .userscript-autoeffectContainer,
.sheet-rolltemplate-message .userscript-autoeffectContainer,
.sheet-rolltemplate-baseRoll .userscript-autoeffectContainer {
margin-top: 10px;
margin-top: 5px;
border-radius: 5px;
border: 1px solid #555;
position: relative;
}
.sheet-rolltemplate-baseRoll .userscript-autoeffectContainer {
float: left;
width: 99.3%;
margin-top: 10px;
}
.sheet-rolltemplate-damagecalculation .userscript-autoeffectContainer > .userscript-autoeffectEntry,
.sheet-rolltemplate-autoeffect .userscript-autoeffectContainer > .userscript-autoeffectEntry,
Expand Down Expand Up @@ -2547,6 +2628,47 @@ height: 35px;}
position: absolute;
left: 0;
}
/* Collapseable section styling */
.sheet-rolltemplate-damagecalculation .userscript-collapseSection,
.sheet-rolltemplate-message .userscript-collapseSection,
.sheet-rolltemplate-baseRoll .userscript-collapseSection {
max-height: 29px;
transition: max-height 10s 0.1s ease-in;
overflow: hidden;
}
.sheet-rolltemplate-damagecalculation .userscript-collapseSection:hover,
.sheet-rolltemplate-message .userscript-collapseSection:hover,
.sheet-rolltemplate-baseRoll .userscript-collapseSection:hover {
max-height: 500px;
transition: max-height 3s 0.1s ease;
}
/* Removed mergin for every section but the first */
.sheet-rolltemplate-damagecalculation .userscript-collapseSection ~ .userscript-collapseSection,
.sheet-rolltemplate-message .userscript-collapseSection ~ .userscript-collapseSection,
.sheet-rolltemplate-baseRoll .userscript-collapseSection ~ .userscript-collapseSection {
margin-top: 0px;
}
/* Create arrow to indicate if the section is collapsed or expanded */
.sheet-rolltemplate-damagecalculation .userscript-collapseSection .userscript-arrow,
.sheet-rolltemplate-message .userscript-collapseSection .userscript-arrow,
.sheet-rolltemplate-baseRoll .userscript-collapseSection .userscript-arrow {
position: absolute; top: 10px; right: 10px;
width: 0px;
height: 0px;
border-bottom: none;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
border-top: 10px solid #fff;
opacity: 50%;
transition: opacity 10s 0.1s ease;
}
/* Create arrow to indicate if the section is collapsed or expanded */
.sheet-rolltemplate-damagecalculation .userscript-collapseSection:hover .userscript-arrow,
.sheet-rolltemplate-message .userscript-collapseSection:hover .userscript-arrow,
.sheet-rolltemplate-baseRoll .userscript-collapseSection:hover .userscript-arrow {
opacity: 0%;
transition: opacity 0.6s 0.1s ease;
}


/* Action buttons below chat messages */
Expand Down
Binary file added ProjectMoonTRPG/images/ailments/Blood.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ProjectMoonTRPG/imagesResized/ailments/Blood.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ProjectMoonTRPG/sheet.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"authors": "punibird, BeautifulDemise",
"roll20userid": "11544351, 487875",
"preview": "ProjectMoonTRPG-preview.jpg",
"instructions": "**Project Moon TRPG - Roll20 Sheet** - (version 0.6.2)\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.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/)",
"instructionstranslationkey": "sheetsettings-instructions",
"useroptions": [
{
Expand Down
19 changes: 18 additions & 1 deletion ProjectMoonTRPG/translation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@
"credits4":"Supported by:",
"credits5":"System:",
"settings":"Settings",
"settings-general":"General Settings",
"settings-combat":"Combat Settings",
"settings-damage-helper":"Damage Helper Settings",
"settings-ailments":"Ailment Settings",
"settings-autoeffects":"AutoEffect Setting",
"settings-mute":"Mute ailment messages",
"settings-detect":"Auto: Detect combat states",
"settings-autoapplydamage":"Auto: Apply damage taken",
"settings-simpledisplay":"Simple roll display",
"settings-extraequip":"Extra weapons/tools/skills",
"settings-hidespecial":"Hide: Special items",
"settings-hidebaseeffect":"Hide: Base effects",
"settings-hideactionbuttons":"Hide: Action buttons",
"settings-hidenextturn":"Hide: Next turn input",
"settings-hidebarupdate":"Hide: Status bar update",
"settings-hidehelpertext":"Hide: Helper text",
Expand All @@ -28,6 +34,8 @@
"settings-limbusstyle":"Limbus style ailment icons",
"settings-multihituses":"Spend Uses per Multi-hit",
"settings-hideuses":"Hide: Uses in messages",
"settings-collapsesections":"Collapse AutoEffect sections",
"settings-hideconditionalreminder":"Hide: Conditional button reminder",
"assessed":"Assessed by: ",
"sheet-title":"Background Investigation and Combat Ability Report",
"sheet-title-distort":"Distortion Survey Report",
Expand Down Expand Up @@ -148,6 +156,7 @@
"helper-text-applydamage":"Apply damage",
"helper-text-applyailments":"Apply ailments",
"helper-text-giveailments":"Give ailments",
"helper-text-lastdefenceroll":"Last Defence roll",
"resist-ailment":"Resistance",
"ailments-panic-title":"Panic",
"ailments-panic-text":"Panicked",
Expand Down Expand Up @@ -289,6 +298,8 @@
"autoeffect-dicemax": "DiceMax",
"autoeffect-dicecount": "DiceCount",
"autoeffect-challengeroll": "ChallengeRoll",
"autoeffect-proc":"Proc",
"autoeffect-pause":"Pause",
"autoeffect-speed": "Speed",
"autoeffect-format-require": "Require [SCALING NUM] [TARGET]: [CHECK]",
"autoeffect-format-consume": "Consume [-SCALING NUM] [TARGET]: [CHECK]",
Expand All @@ -298,14 +309,18 @@
"autoeffect-format-set": "Set [TARGET] to [RESULT]",
"autoeffect-format-add": "Regen [SCALING NUM] [TARGET]",
"autoeffect-format-add-neg": "Receive [-SCALING NUM] [TARGET] damage",
"autoeffect-format-add-light": "Gain [SCALING NUM] [TARGET]",
"autoeffect-format-add-light-neg": "Lose [-SCALING NUM] [TARGET]",
"autoeffect-format-multi1": "Multiply [TARGET] by <b>",
"autoeffect-format-multi2": "</b> [[SCALING NUM]]",
"autoeffect-format-basedamage": "Increase Base Damage by [SCALING NUM]",
"autoeffect-format-basedamage": "Increase [TARGET] Base Damage by [SCALING NUM]",
"autoeffect-format-flatdamage": "Deal [SCALING NUM] [TARGET] Damage",
"autoeffect-format-dice": "Increase [TARGET] by [SCALING NUM]",
"autoeffect-format-dice-neg": "Reduce [TARGET] by [SCALING NUM]",
"autoeffect-format-challengeroll": "Rolling [TARGET] <b>+</b>[SCALING NUM]",
"autoeffect-format-challengeroll-neg": "Rolling [TARGET] [SCALING NUM]",
"autoeffect-format-proc":"[/TARGET] Proc [TARGET]",
"autoeffect-format-pause":"[/TARGET] Paused [TARGET] for [SCALING NUM] activations",
"autoeffect-format-speed": "Increase [TARGET] by [SCALING NUM]",
"autoeffect-format-speed-neg": "Reduce [TARGET] by [SCALING NUM]",
"autoeffect-match-check": "[CHECK]",
Expand Down Expand Up @@ -492,6 +507,8 @@
"message-dealt": "dealt",
"message-regened":"regened",
"message-reduced-damage-by":"reduced damage by",
"message-increased-damage-by":"increased damage by",
"message-reduced-basedamage-by":"reduced base damage by",
"message-increased-HP-damage-by":"increased HP damage by",
"message-received":"received",
"message-received-no":"Received no",
Expand Down

0 comments on commit 3bae268

Please sign in to comment.