diff --git a/src/clj/endless_ships/core.clj b/src/clj/endless_ships/core.clj index f7fa7e7..2414eec 100644 --- a/src/clj/endless_ships/core.clj +++ b/src/clj/endless_ships/core.clj @@ -8,7 +8,8 @@ [clojure.string :as str] [endless-ships.outfits :refer [outfits]] [endless-ships.outfitters :refer [outfitters]] - [endless-ships.ships :refer [modifications ships]])) + [endless-ships.ships :refer [modifications ships]] + [endless-ships.parser])) (def file->race {"kestrel.txt" :human @@ -133,7 +134,7 @@ (io/file "./build/app.css")) (io/copy (io/file "./public/ga.json") (io/file "./build/ga.json")) - (if (.exists (io/file "./ga.json")) + (when (.exists (io/file "./ga.json")) (io/copy (io/file "./ga.json") (io/file "./build/ga.json"))))) diff --git a/src/clj/endless_ships/outfits.clj b/src/clj/endless_ships/outfits.clj index ba4071c..7088a51 100644 --- a/src/clj/endless_ships/outfits.clj +++ b/src/clj/endless_ships/outfits.clj @@ -1,6 +1,7 @@ (ns endless-ships.outfits (:require [clojure.string :as str] - [endless-ships.parser :refer [->map data]])) + [endless-ships.parser :refer [->map data]]) + (:import [java.lang Integer])) (defn- update-if-present [m k f] (if (contains? m k) @@ -91,7 +92,7 @@ (defn- normalize-weapon-attrs [outfits] (map (fn [{category :category - {:keys [reload velocity velocity-override lifetime shield-damage hull-damage] + {:keys [reload velocity velocity-override lifetime] ; shield-damage hull-damage] [submunition-name submunition-count] :submunition :as weapon-attrs} :weapon :as outfit}] diff --git a/src/clj/endless_ships/outfitters.clj b/src/clj/endless_ships/outfitters.clj index cb94fd0..f830053 100644 --- a/src/clj/endless_ships/outfitters.clj +++ b/src/clj/endless_ships/outfitters.clj @@ -1,5 +1,5 @@ (ns endless-ships.outfitters - (:require [endless-ships.parser :refer [->map data]])) + (:require [endless-ships.parser :refer [data]])) (defn- find-object-with-name [objects name] (some (fn [object] diff --git a/src/clj/endless_ships/parser.clj b/src/clj/endless_ships/parser.clj index 07468b8..5b562a1 100644 --- a/src/clj/endless_ships/parser.clj +++ b/src/clj/endless_ships/parser.clj @@ -3,7 +3,7 @@ [clojure.java.io :refer [file resource]] [clojure.string :as str] [instaparse.core :as insta]) - (:import [java.lang Float Integer])) + (:import [java.lang Float])) (def files "All files containing game data." diff --git a/src/clj/endless_ships/ships.clj b/src/clj/endless_ships/ships.clj index 0781ca1..2642b6c 100644 --- a/src/clj/endless_ships/ships.clj +++ b/src/clj/endless_ships/ships.clj @@ -1,6 +1,5 @@ (ns endless-ships.ships - (:require [clojure.set :refer [rename-keys]] - [endless-ships.parser :refer [->map data]])) + (:require [endless-ships.parser :refer [->map data]])) (defn- add-key-if [cond key value] (if cond @@ -28,7 +27,8 @@ :file file} (add-key-if (contains? ship "sprite") :sprite - [sprite (not (empty? animation))]) + [sprite #_{:clj-kondo/ignore [:not-empty?]} + (not (empty? animation))]) (add-key-if (contains? attrs "licenses") :licenses (-> license-attrs keys vec))