Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/clj/endless_ships/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")))))

Expand Down
5 changes: 3 additions & 2 deletions src/clj/endless_ships/outfits.clj
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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}]
Expand Down
2 changes: 1 addition & 1 deletion src/clj/endless_ships/outfitters.clj
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
2 changes: 1 addition & 1 deletion src/clj/endless_ships/parser.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
6 changes: 3 additions & 3 deletions src/clj/endless_ships/ships.clj
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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))
Expand Down