From a4d6adacff09675b98b736f29a137847bb24d175 Mon Sep 17 00:00:00 2001
From: Thaum Rystra <stefanzermatten@gmail.com>
Date: Thu, 14 May 2020 13:43:12 +0200
Subject: [PATCH] Fixed damage multiplier forms and viewers

---
 .../properties/forms/DamageMultiplierForm.vue | 19 +++++++------------
 .../viewers/DamageMultiplierViewer.vue        | 18 +++++++++---------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/app/imports/ui/properties/forms/DamageMultiplierForm.vue b/app/imports/ui/properties/forms/DamageMultiplierForm.vue
index f31caf96..c31ce3a7 100644
--- a/app/imports/ui/properties/forms/DamageMultiplierForm.vue
+++ b/app/imports/ui/properties/forms/DamageMultiplierForm.vue
@@ -11,12 +11,13 @@
       <smart-select
         label="Damage Type"
         style="flex-basis: 300px;"
+        multiple
         :items="damageTypes"
-        :value="model.damageType"
-        :error-messages="errors.damageType"
+        :value="model.damageTypes"
+        :error-messages="errors.damageTypes"
         :menu-props="{auto: true, lazy: true}"
         :debounce-time="debounceTime"
-        @change="(value, ack) => $emit('change', {path: ['damageType'], value, ack})"
+        @change="(value, ack) => $emit('change', {path: ['damageTypes'], value, ack})"
       />
       <smart-select
         label="Value"
@@ -59,15 +60,6 @@
 				}, {
 					value: 'slashing',
 					text: 'Slashing',
-				}, {
-					value: 'magicalBludgeoning',
-					text: 'Magical Bludgeoning',
-				}, {
-					value: 'magicalPiercing',
-					text: 'Magical Piercing',
-				}, {
-					value: 'magicalSlashing',
-					text: 'Magical Slashing',
 				}, {
 					value: 'acid',
 					text: 'Acid',
@@ -113,6 +105,9 @@
 				},
 			],
 		};},
+    methods: {
+      log: console.log
+    },
 	};
 </script>
 
diff --git a/app/imports/ui/properties/viewers/DamageMultiplierViewer.vue b/app/imports/ui/properties/viewers/DamageMultiplierViewer.vue
index 5c2b6598..7eafa526 100644
--- a/app/imports/ui/properties/viewers/DamageMultiplierViewer.vue
+++ b/app/imports/ui/properties/viewers/DamageMultiplierViewer.vue
@@ -1,10 +1,10 @@
 <template lang="html">
-	<div>
-		<property-name :value="model.name"/>
-		<div>
-			{{model.damageType}} {{operation}}
-		</div>
-	</div>
+  <div>
+    <property-name :value="model.name" />
+    <div v-if="model.damageTypes.length">
+      {{ operation }} to {{ model.damageTypes.join(', ') }} damage
+    </div>
+  </div>
 </template>
 
 <script>
@@ -14,9 +14,9 @@ export default {
 	computed: {
 		operation(){
 			switch (this.model.value){
-				case 0: return "immunity";
-				case 0.5: return "resistance";
-				case 2: return "vulnerability";
+				case 0: return 'Immunity';
+				case 0.5: return 'Resistance';
+				case 2: return 'Vulnerability';
 			}
 		},
 	},