Merge pull request larrychristensen#261 from codeGlaze/develop

Fixes Sickle not working with Two-Weapon Fighting larrychristensen#251
MeanderingCode · Nov 27, 2019 · bcdae2b · bcdae2b
2 parents 32ef687 + a65ed65
commit bcdae2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/cljc/orcpub/dnd/e5/weapons.cljc b/src/cljc/orcpub/dnd/e5/weapons.cljc
@@ -131,7 +131,8 @@
     ::type :simple,
     ::damage-die-count 1,
     ::melee? true,
-    :key :sickle
+    :key :sickle,
+    ::light? true,
     ::link "https://en.wikipedia.org/wiki/Sickle"}
    {::melee? true,
     ::versatile {::damage-die 8, ::damage-die-count 1},

diff --git a/src/cljs/orcpub/dnd/e5/views.cljs b/src/cljs/orcpub/dnd/e5/views.cljs
@@ -6912,7 +6912,7 @@
      [:div.flex.w-100-p.flex-wrap
       [spell-input-field "Casting Time" :casting-time spell "m-b-20"]
       [spell-input-field "Range" :range spell "m-l-5 m-b-20"]
-      [spell-input-field "Duration" :duration spell "m-l-5 m-b-20"]]
+      ]
      [:div [:h2.f-s-24.f-w-b.m-b-10 "Components"]]
      [:div.flex.w-100-p.flex-wrap
       [component-checkbox :verbal spell]
@@ -6921,8 +6921,10 @@
      [:div.m-b-20
       [textarea-field
        {:value (get-in spell [:components :material-component])
-        :on-change #(dispatch [::spells/set-material-component %])}]]
+        :on-change #(dispatch [::spells/set-material-component %])}]
+      ]
      [:div.w-100-p
+      [spell-input-field "Duration" :duration spell "m-b-20"]
       [:div.f-s-24.f-w-b
        "Description"]
       [textarea-field