Merge branch '085-130_compat'

zeel01 · May 30, 2021 · 41d3da3 · 41d3da3
2 parents 363781e + 38f75f6
commit 41d3da3
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/module.json b/module.json
@@ -11,11 +11,11 @@
 			"discord": "zeel#4200"
 		}
 	],
-	"version": "100.2.5.3",
-	"minimumCoreVersion": "0.7.6",
-	"compatibleCoreVersion": "0.7.10",
+	"version": "100.3.0.0",
+	"minimumCoreVersion": "0.8.5",
+	"compatibleCoreVersion": "0.8.6",
 	"systems": ["dnd5e"],
-	"minimumSystemVersion": "1.2.3",
+	"minimumSystemVersion": "1.3.0",
 	"scripts": [
 		"input-expressions/handler.js"
 	],

diff --git a/monsterblock.css b/monsterblock.css
@@ -742,6 +742,14 @@ li:nth-last-of-type(2):after {
 .monsterblock .select-field:hover .select-list {
 	visibility: visible;
 }
+
+.monsterblock .config-button {
+	display: none;
+}
+.monsterblock *:hover > .config-button {
+	display: inline;
+}
+
 .monsterblock .editor {
 	height: 100%;
 }

diff --git a/monsterblock.lock b/monsterblock.lock
@@ -0,0 +1 @@
+🔒
diff --git a/scripts/dnd5e/MonsterBlock5e.js b/scripts/dnd5e/MonsterBlock5e.js
@@ -892,6 +892,9 @@ export default class MonsterBlock5e extends ActorSheet5eNPC {
 		});
 
 		html.find(".item").click(this.toggleExpanded.bind(this));
+
+		// Configure Special Flags
+		html.find(".config-button").click(this._onConfigMenu.bind(this));
 	}
 
 	toggleExpanded(event) {

diff --git a/templates/dnd5e/parts/header/identity.hbs b/templates/dnd5e/parts/header/identity.hbs
@@ -12,8 +12,11 @@
 			</ul>
 		{{~/if~}}
 	</div>{{~" "~}}
-	<span class="optional-space" contenteditable="{{flags.editing}}" data-field-key="data.details.type" placeholder="{{ localize 'DND5E.Type' }}">
-		{{~data.details.type~}}
+	<span class="optional-space">
+		{{~labels.type~}}
+		<a class="config-button" data-action="type" title="Configure Creature Type">
+			<i class="fas fa-cog"></i>{{~" "~}}
+		</a>{{~" "~}}
 	</span>{{~" "~}}
 	<span class="optional-comma" contenteditable="{{flags.editing}}" placeholder="{{ localize 'DND5E.Alignment' }}" data-field-key="data.details.alignment">
 		{{~data.details.alignment~}}

diff --git a/templates/dnd5e/parts/main/attack.hbs b/templates/dnd5e/parts/main/attack.hbs
@@ -30,7 +30,6 @@
 					{{ localize "MOBLOKS5E.AttackHitLabel" }}
 				</span>
 				{{#each item.description.damage as |part|}}
-					{{log item}}
 					{{#unless @first}}
 						{{ localize "MOBLOKS5E.MultiDamageAttackConjunctionPlus" }}						
 					{{/unless}}