Merge pull request #8684 from tapiochre/Hammerhead-CortexPrime

[Hammerhead Cortex Prime] Better editing features

CortexPrime-Hammerheads/CortexPrime-Hammerhead.css

@@ -272,7 +272,7 @@
 
 	input[name="attr_Portrait"]:not([value="PC0"]) ~ .sheet-physical {
 		position: absolute;
-		top: 190px;
+		top: 165px;
 		left: 280px;
 		line-height: 25px;
 		z-index: 10;
@@ -280,7 +280,7 @@
 
 	input[name="attr_Portrait"]:not([value="PC0"]) ~ .sheet-mental {
 		position: absolute;
-		top: 243px;
+		top: 218px;
 		left: 290px;
 		line-height: 25px;
 		z-index: 10;
@@ -288,7 +288,7 @@
 
 	input[name="attr_Portrait"]:not([value="PC0"]) ~ .sheet-social {
 		position: absolute;
-		top: 295px;
+		top: 270px;
 		left: 280px;
 		line-height: 25px;
 		z-index: 10;
@@ -373,6 +373,47 @@ input[name="attr_tooltipSwitch"][value="on"] ~ div h3.sheet-tooltip:hover .sheet
   visibility: visible;
 }
 
+/* Edit Stress */
+
+.charsheet label {
+	all: unset;
+	position: absolute;
+	font-size: 4px;
+	padding: 1ch;
+	color: rgba(61, 161, 106, 0.02);
+	border: 2px solid rgba(61, 161, 106, 0.32);
+	background-color: rgba(61, 161, 106, 0.02);
+	z-index: 15;
+	min-width: 90px;
+}
+
+.charsheet label:hover {
+	font-size: 11px;
+	color: #ffffff;
+	background-color: rgba(61, 161, 106, 0.62);
+	border: 1px solid #3da069;
+}
+
+label[for="sheet-editStress"] {
+	float: right;
+	align-content: right;
+	right: 4ch;
+}
+
+.sheet-wrapper select {
+	all: unset;
+	width: auto;
+}
+
+.sheet-editStress {
+	display: none;
+}
+
+
+input[name="attr_editStress"]:checked + div .sheet-editStress {
+	display: block;
+}
+
 /* Edit */
 
 .sheet-editPane {
@@ -381,7 +422,8 @@ input[name="attr_tooltipSwitch"][value="on"] ~ div h3.sheet-tooltip:hover .sheet
 	 width: 670px;
 	 z-index: 45;
 	 position: absolute;
-	 top: 15px;left: 10vh;
+	 top: 15px;
+	 left: 15vh;
 	 padding: 14px;
 	 display: none;
 }
@@ -390,7 +432,7 @@ input[name="attr_tooltipSwitch"][value="on"] ~ div h3.sheet-tooltip:hover .sheet
 	float: right;
 }
 
-input[name="attr_Edit"]:checked + div {
+input[name="attr_Edit"]:checked + div.sheet-editPane {
 	display: block !important;
 }
 
@@ -563,5 +605,13 @@ input[name="attr_Edit"]:checked + div {
 		display: block !important;
 		visibility: visible !important;
 	}
-	
-	}
+
+.charsheet label {
+	font-size: 9px !important;
+	color: #ffffff;
+	background-color: rgba(61, 161, 106, 0.62) !important;
+	border: 1px solid #3da069 !important;
+	padding: 4px !important;
+}
+
+}

CortexPrime-Hammerheads/CortexPrime-Hammerhead.html

@@ -28,8 +28,17 @@
 			<img class="sheet-hide" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/CortexPrime-Hammerheads/assets/portrait-20-510x510.png" alt="PC20" />
 	</div>
 	
-	<label>Edit<input type="checkbox" id="attr_Edit" name="attr_Edit" style="z-index: 15;" value="edit or not" />
-		<div class="sheet-editPane">
+
+	<div class="sheet-traits4">
+		<div>
+			<label for="attr_Edit">Edit Traits</label>
+		</div>
+		<div>
+			<label for="attr_editStress">Edit Stress</label>
+		</div>
+	</div>
+	<input type="checkbox" id="attr_Edit" name="attr_Edit" style="display: none;" value="edit or not" />
+	<div class="sheet-editPane">
 			<div class="sheet-traits1">
 				
 				
@@ -183,6 +192,7 @@
 					<h3>
 						High-Altitude Recovery
 						<select class="sheet-editDice" name="attr_HighAltitudeRecovery">
+							<option value="2">Select</option>
 							<option value="4">4</option>
 							<option value="6">6</option>
 							<option value="8">8</option>
@@ -367,8 +377,7 @@
 				<option value="12">12</option>
 			</select>
 		</div>
-	</label>
-	
+	<input type="checkbox" id="attr_editStress" name="attr_editStress" style="display: none;" value="edit or not" />
 	<div class="sheet-wrapper">
 		<div class="sheet-traits2">
 			<div>
@@ -400,9 +409,11 @@
 
 			</div>
 			<div class="sheet-info">
-				<h1>Name: <input type="text" name="attr_Name" placeholder="Name" /></h1>
-				<h2>Callsign: <input type="text" name="attr_Callsign" placeholder="Callsign" /></h2>
-				<h4>Description:</h4> <textarea cols="30" rows="10" name="attr_Fear" placeholder="Description"></textarea>
+				<div>
+					<h1>Name: <input type="text" name="attr_Name" placeholder="Name" /></h1>
+					<h2>Callsign: <input type="text" name="attr_Callsign" placeholder="Callsign" /></h2>
+					<h4>Description:</h4> <textarea cols="30" rows="10" name="attr_Fear" placeholder="Description"></textarea>
+				</div>
 				
 				<div>
 					<button class="sheet-blank-roll-button" type="roll" name="roll_DicePool" 
@@ -410,9 +421,58 @@
 &{template:Hammerheads} {{shaken=[[0d0+{(floor((@{physicalStress}/@{physical})-0.05))+(floor((@{mentalStress}/@{mental})-0.05))+(floor((@{socialStress}/@{social})-0.05)) + (floor(@{PhysicalStress}/14)) + (floor(@{MentalStress}/14)) + (floor(@{SocialStress}/14))}]]}} {{name=@{Callsign}}} {{portrait=@{Portrait}}} {{physical_stress=[[0d0+@{PhysicalStress}]]}} {{physical_dice_size=@{Physical}}} {{physical=[[1d@{Physical}]]}} {{mental_stress=[[0d0+@{MentalStress}]]}} {{mental_dice_size=@{Mental}}} {{mental=[[1d@{Mental}]]}} {{social_stress=[[0d0+@{SocialStress}]]}} {{social_dice_size=@{Social}}} {{social=[[1d@{Social}]]}} {{trait_name=[[0d0 + ?{Which attribute?|Physical,1|Mental,2|Social,3}]]}} {{CrowdControl_dice_size=@{CrowdControl}}} {{CrowdControl=[[1d@{CrowdControl}]]}} {{EmergencyMedical_dice_size=@{EmergencyMedical}}} {{EmergencyMedical=[[1d@{EmergencyMedical}]]}} {{Firefighting_dice_size=@{Firefighting}}} {{Firefighting=[[1d@{Firefighting}]]}} {{HammerheadPilot_dice_size=@{HammerheadPilot}}} {{HammerheadPilot=[[1d@{HammerheadPilot}]]}} {{Hazmat_dice_size=@{Hazmat}}} {{Hazmat=[[1d@{Hazmat}]]}} {{HighAltitudeRecovery_dice_size=@{HighAltitudeRecovery}}} {{HighAltitudeRecovery=[[1d@{HighAltitudeRecovery}]]}} {{LegalSpecialist_dice_size=@{LegalSpecialist}}} {{LegalSpecialist=[[1d@{LegalSpecialist}]]}} {{Logistics_dice_size=@{Logistics}}} {{Logistics=[[1d@{Logistics}]]}} {{MarineRecovery_dice_size=@{MarineRecovery}}} {{MarineRecovery=[[1d@{MarineRecovery}]]}} {{NetworkSpecialist_dice_size=@{NetworkSpecialist}}} {{NetworkSpecialist=[[1d@{NetworkSpecialist}]]}} {{Mechanic_dice_size=@{Mechanic}}} {{Mechanic=[[1d@{Mechanic}]]}} {{TacticalResponse_dice_size=@{TacticalResponse}}} {{TacticalResponse=[[1d@{TacticalResponse}]]}} {{TechnicalAnalyst_dice_size=@{TechnicalAnalyst}}} {{TechnicalAnalyst=[[1d@{TechnicalAnalyst}]]}} {{UrbanRecovery_dice_size=@{UrbanRecovery}}} {{UrbanRecovery=[[1d@{UrbanRecovery}]]}} {{TrainingPackage=[[0d0 + ?{Which training package?|Crowd Control,1|Emergency Medical,2|Firefighting,3|Hammerhead Pilot,4|Hazmat,5|High Altitude Recovery,6|Legal Specialist,7|Logistics,8|Marine Recovery,9|Network Specialist,10|Mechanic,11|Tactical Response,12|Technical Analyst,13|Urban Recovery,14}]]}} {{Distinction_dice_size=8}} {{Distinction=[[1d8]]}} {{Hinder_dice_size=4}} {{Hinder=[[1d4]]}} {{Distinction_Name=?{Which Distinction?|@{Distinction1Name}|@{Distinction2Name}|@{Distinction3Name}}}} {{Distinction_Hinder=[[0d0 +?{Does your distinction help or hinder?|Help,1|Hinder,2}]]}} {{MyStress4=[[1d4]]}} {{Stress4=[[1d4]]}} {{Stress6=[[1d6]]}} {{Stress8=[[1d8]]}} {{Stress10=[[1d10]]}} {{Stress12=[[1d12]]}} {{MyStress=[[0d0 +?{Do you have relevant stress at D4?|No,0|Yes,4}]]}} {{TargetStress=[[0d0 +?{Does your target have any stress?|No,0|D6,6|D8,8|D10,10|D12,12}]]}} {{friend4=[[1d4]]}} {{friend6=[[1d6]]}} {{friend8=[[1d8]]}} {{friend10=[[1d10]]}} {{friend12=[[1d12]]}} {{friendship=[[0d0+?{Are you receiving help?|No,0|D6,6|D8,8|D10,10|D12,12}]]}}">Dice Pool Builder</button>
 					<span>This may not work on the Roll20 Beta Mobile app.</span>
 				</div>
+				
 			</div>
 		</div>
 	
+		<div class="sheet-editStress">
+			<h1>Edit Stress</h1>
+			<div class="sheet-traits3">
+				<div class="sheet-stress">
+				<h3>
+					Physical 
+					<select name="attr_PhysicalStress">
+						<option value="2">no stress</option>
+						<option value="4">d4</option>
+						<option value="6">d6</option>
+						<option value="8">d8</option>
+						<option value="10">d10</option>
+						<option value="12">d12</option>
+						<option value="14">Stressed out</option>
+					</select>
+				</h3>
+				</div>
+				<div class="sheet-stress">
+				<h3>
+					Mental 
+				<select name="attr_MentalStress">
+					<option value="2">no stress</option>
+					<option value="4">d4</option>
+					<option value="6">d6</option>
+					<option value="8">d8</option>
+					<option value="10">d10</option>
+					<option value="12">d12</option>
+					<option value="14">Stressed out</option>
+				</select>
+				</h3>
+				</div>
+				<div class="sheet-stress">
+				<h3>
+					Social 
+				<select name="attr_SocialStress">
+					<option value="2">no stress</option>
+					<option value="4">d4</option>
+					<option value="6">d6</option>
+					<option value="8">d8</option>
+					<option value="10">d10</option>
+					<option value="12">d12</option>
+					<option value="14">Stressed out</option>
+				</select>
+				</h3>
+				</div>
+			</div>
+		</div>
+
 		<div class="sheet-traits1">
 			<div class="sheet-traits1">
 				<input class="sheet-locked" type="hidden" name="attr_Portrait" value="PC0" />

CortexPrime-Hammerheads/readme.md

@@ -5,7 +5,7 @@ Cortex Prime: Hammerhead Character Sheet
 - Open the Journal tab, and add a new Character.
 - Click on save changes.
 - Open the Character Sheet Tab
-- Tick the Edit Checkbox.
+- Hover over the green buttons and click the Edit Traits button to toggle the edit panel on and off.
 - Select One of the Portraits, or select the dot next to the word Portrait to set no portrait.
 - Set the dice values for the Attributes, Training Packages, and Relationships using the drop downs.
 - Untick the Edit check box to hide the editor
@@ -13,9 +13,7 @@ Cortex Prime: Hammerhead Character Sheet
 
 ##Stress
 
-I have been using API macro's to adjust Stress values. But these are simply Attributes (PhysicalStress, MentalStress, SocialStress).
-
-You can add these to the Attributes and Abilities tab manually, and assign values ranging from 2 to show the character has no stress - 4,6,8,10 or 12 corresponding to the dice value, or a value of 14 indicates the character has been stressed out.
+NEW: Two buttons have been added to the top of the character sheet, hover over the green buttons and click on the Edit Stress button to toggle the edit feature on. New trait boxes appear below the attributes and info block, and you can select from not stressed/d4/d6/d8/d10/d12/stressed out for each of the stress values.
 
 ###Diceroller
 
@@ -33,6 +31,11 @@ Character Portraits sourced from https://thispersondoesnotexist.com/
 
 ##Changelog
 
+### V1.3 2021-04-08
+
+Changed the Edit checkbox to a styled hover button.
+Added a second button that shows/hides a specific edit feature for Stress values.
+
 ### V1.2 2021-03-22
 
 Added mobile layout support - which includes support for the beta release of the mobile app.
@@ -53,4 +56,4 @@ Removed Trauma
 Added d10 and d12 settings to relationships
 Minor adjustments
 
-### v.1.0 2021-03-13"
+### v.1.0 2021-03-13

CortexPrime-Hammerheads/sheet.json

@@ -5,5 +5,5 @@
   "roll20userid": "73532",
   "preview": "CortexPrime-Hammerhead.png",
   "legacy": false,
-  "instructions": "Cortex Prime: Hammerhead Character Sheet\n\n##Set up\n\n- Open the Journal tab, and add a new Character.\n- Click on save changes.\n- Open the Character Sheet Tab\n- Tick the Edit Checkbox.\n- Select One of the Portraits, or select the dot next to the word Portrait to set no portrait.\n- Set the dice values for the Attributes, Training Packages, and Relationships using the drop downs.\n- Untick the Edit check box to hide the editor\n- Enter the remaining details - Name, Description, Value statements, Relationship names, Distinctions title and description in the editable text fields.\n\n##Stress\n\nI have been using API macros to adjust Stress values. But these are simply Attributes (PhysicalStress, MentalStress, SocialStress).\nYou can add these to the Attributes and Abilities tab manually, and assign values ranging from 2 to show the character has no stress - 4,6,8,10 or 12 corresponding to the dice value, or a value of 14 indicates the character has been stressed out.\n\n###Diceroller\n\nUsing the Dice-Pool-Builder button will ask the player which traits to include and roll in a dice pool. The output to the chat panel will also indicate if the character is shaken or stricken. \n\nIf you have added a stress and its not showing check the spelling, Capitalisation, and dice value to be sure you got those all correct.\n\nAny feedback, or requests - Im happy to hear.\n\n---\n\nHammerheads is a part of the Cortex Prime Game Handbook published by Fandom Inc, and was written, designed, and developed by Cam Banks.\nHammerheads uses the Cortex system. The Cortex system and the Fandom logos are © 2020 Fandom Inc. All rights reserved. Reference to other copyrighted material in no way constitutes a challenge to the respective copyright holders of that material.\nArtwork and graphics © and ™ Fandom Inc, illustrated by Ten Ten Studios Malaysia. All rights reserved.\nCharacter Portraits sourced from https://thispersondoesnotexist.com/\n"
-}
+  "instructions": "Cortex Prime: Hammerhead Character Sheet\n##Set up\n- Open the Journal tab, and add a new Character.\n- Click on save changes.\n- Open the Character Sheet Tab\n- Hover over the green buttons at the top and click the Edit Traits button to toggle the edit panel on and off.\n- Select One of the Portraits, or select the dot next to the word Portrait to set no portrait.\n- Set the dice values for the Attributes, Training Packages, and Relationships using the drop downs.\n- Untick the Edit check box to hide the editor\n- Enter the remaining details - Name, Description, Value statements, Relationship names, Distinctions title and description in the editable text fields.\n##Stress\nNEW: Two buttons have been added to the top of the character sheet, hover over the green buttons and click on the Edit Stress button to toggle the edit feature on. New trait boxes appear below the attributes and info block, and you can select from not stressed/d4/d6/d8/d10/d12/stressed out for each of the stress values.\n###Diceroller\nUsing the 'Dice Pool Builder' button will ask the player which traits to include and roll in a dice pool. The output to the chat panel will also indicate if the character is shaken or stricken.\nAny feedback, or requests - I'm happy to hear.\n---\nHammerheads is a part of the Cortex Prime Game Handbook published by Fandom Inc, and was written, designed, and developed by Cam Banks.\nHammerheads uses the Cortex system. The Cortex system and the Fandom logos are © 2020 Fandom Inc. All rights reserved. Reference to other copyrighted material in no way constitutes a challenge to the respective copyright holders of that material.\nArtwork and graphics © and ™ Fandom Inc, illustrated by Ten Ten Studios Malaysia. All rights reserved.\nCharacter Portraits sourced from https://thispersondoesnotexist.com/\n##Changelog\n### V1.3 2021-04-08\nChanged the Edit checkbox to a styled hover button.\nAdded a second button that shows/hides a specific edit feature for Stress values.\n### V1.2 2021-03-22\nAdded mobile layout support - which includes support for the beta release of the mobile app.\nCurrently the beta release of the mobile app does not support the dice pool builder macros.\nRoll Template includes prompts when the character is shaken or stricken.\nStress can now go higher than 12, if set a value of 14 the icon shows as 12+ to indicate being stressed out.\n### V1.2 2021-03-19\nAdded a Roll Template, to better display the roll results.\nAdded black dice icons and dark dice icons to use in roll template\n### V1.1 2021-03-17\nFixed broken images\nRemoved Trauma\nAdded d10 and d12 settings to relationships\nMinor adjustments\n### v.1.0 2021-03-13"
+}