diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn index 4e901577e..9480eb867 100644 --- a/.clj-kondo/config.edn +++ b/.clj-kondo/config.edn @@ -1,6 +1,7 @@ {:linters {:if {:level :off} :unused-namespace {:level :off} :unused-binding {:level :off} + :shadowed-var {:level :off} :unresolved-symbol {:exclude [(clojure.core.match/match) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 03691a76a..1c5f00588 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -28,6 +28,6 @@ jobs: - name: Get leiningen version run: lein -v - name: Run linter - run: lein lint + run: lein lint || test $? -eq 2 - name: Run tests run: lein test \ No newline at end of file diff --git a/src/cljc/orcpub/dnd/e5/options.cljc b/src/cljc/orcpub/dnd/e5/options.cljc index 2fdabfd98..757dcc38f 100644 --- a/src/cljc/orcpub/dnd/e5/options.cljc +++ b/src/cljc/orcpub/dnd/e5/options.cljc @@ -1949,7 +1949,7 @@ spell-lists spells-map languages - source + option-source {:keys [name abilities profs @@ -2188,7 +2188,6 @@ armor-proficiencies weapon-proficiencies profs - source plugin? edit-event] :as race}] diff --git a/src/cljs/orcpub/dnd/e5/events.cljs b/src/cljs/orcpub/dnd/e5/events.cljs index 687655c69..4f87df1dd 100644 --- a/src/cljs/orcpub/dnd/e5/events.cljs +++ b/src/cljs/orcpub/dnd/e5/events.cljs @@ -1163,10 +1163,10 @@ character-interceptors set-hit-points-to-average) -(defn set-level-hit-points [character [_ built-template character level-value value]] +(defn set-level-hit-points [character [_ built-template char level-value value]] (assoc-in character - (entity/get-entity-path built-template character (:path level-value)) + (entity/get-entity-path built-template char (:path level-value)) {::entity/key :manual-entry ::entity/value (if (not (js/isNaN value)) value)}))