diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | README.md | 12 | ||||
| -rw-r--r-- | project.clj | 2 | ||||
| -rw-r--r-- | resources/icons/256x256.png | bin | 0 -> 120620 bytes | |||
| -rw-r--r-- | resources/icons/32x32.png | bin | 0 -> 7190 bytes | |||
| -rw-r--r-- | resources/icons/48x48.png | bin | 0 -> 10464 bytes | |||
| -rw-r--r-- | src/votann/codex_view.clj | 5 | ||||
| -rw-r--r-- | src/votann/core.clj | 6 | ||||
| -rw-r--r-- | src/votann/enhancements_widget.clj | 6 | ||||
| -rw-r--r-- | src/votann/models/leagues_of_votann.clj | 4 | ||||
| -rw-r--r-- | src/votann/records/model.clj (renamed from src/votann/model.clj) | 2 | ||||
| -rw-r--r-- | src/votann/records/weapon.clj (renamed from src/votann/weapon.clj) | 2 | ||||
| -rw-r--r-- | src/votann/tab_widget.clj | 5 | ||||
| -rw-r--r-- | src/votann/util.clj | 3 | ||||
| -rw-r--r-- | src/votann/weapons/leagues_of_votann.clj | 4 |
15 files changed, 22 insertions, 30 deletions
@@ -12,4 +12,3 @@ pom.xml.asc .hgignore .hg/ *~ -/resources/leagues-of-votann/* @@ -4,17 +4,15 @@ Votann is an informational program for creating your unit lists for Warhammer 40 ## Installation -Download votann-0.1.0.jar +Download votann-0.2.0.jar ## Compile from source 1. Install [clojure](https://clojure.org/guides/install_clojure), openJDK, [leinagain](https://leiningen.org). -2. `run lein uberjar` (might need to `run lein deps` before if it doesnt do it automatically) +2. `run lein uberjar` -3. `java -jar target/uberjar/votann-0.1.0-standalone.jar` - -(Please note I did not include the images for these, so if you build from source you will not have the unit and enhancements tabs viewable reach out to me and I can provide those files until I create non-copyright versions) +3. `java -jar target/uberjar/votann-0.2.0-standalone.jar` ## Usage @@ -24,11 +22,11 @@ Navigate with clicking or tab or arrow keys and enter to select. Run the following command in your terminal or create a `.sh` script. -`$ java -jar votann-0.1.0.jar` +`$ java -jar votann-0.2.0.jar` ### Windows -You can create a `.bat` file with the above command. Set the absolute path of the jar file or place the `.bat` file in the same directory as the `.jar` file. Or run the above command in your terminal. +You can create a `.bat` file with the above command. Set the absolute path of the jar file or place the `.bat` file in the same directory as the `.jar` file. Or simply run the above command in your terminal. ## License diff --git a/project.clj b/project.clj index 82b72ca..7f307be 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject votann "0.1.0" +(defproject votann "0.2.0" :description "Votann is an informational program for creating your unit lists for Warhammer 40k" :url "https://github.com/0xNul/votann" :license {:name "GPL-3.0-or-later" diff --git a/resources/icons/256x256.png b/resources/icons/256x256.png Binary files differnew file mode 100644 index 0000000..ef5b897 --- /dev/null +++ b/resources/icons/256x256.png diff --git a/resources/icons/32x32.png b/resources/icons/32x32.png Binary files differnew file mode 100644 index 0000000..8d869f9 --- /dev/null +++ b/resources/icons/32x32.png diff --git a/resources/icons/48x48.png b/resources/icons/48x48.png Binary files differnew file mode 100644 index 0000000..5648f11 --- /dev/null +++ b/resources/icons/48x48.png diff --git a/src/votann/codex_view.clj b/src/votann/codex_view.clj index 96eb289..e5088ec 100644 --- a/src/votann/codex_view.clj +++ b/src/votann/codex_view.clj @@ -1,5 +1,6 @@ (ns votann.codex-view - (:require [clojure.string :as string] + (:require [votann.util :as util] + [clojure.string :as string] [hiccup2.core :as h] [hiccup.page :as page])) @@ -232,7 +233,7 @@ (def head [:head - [:link {:rel "stylesheet" :href (votann.util/get-resource-path "css/style.css")}]]) + [:link {:rel "stylesheet" :href (util/get-resource-path "css/style.css")}]]) (defn body [model] [:body diff --git a/src/votann/core.clj b/src/votann/core.clj index ef03fe7..9dc46d6 100644 --- a/src/votann/core.clj +++ b/src/votann/core.clj @@ -12,9 +12,9 @@ :max-height 1000 :min-height 1000 :on-close-request (fn [_] (System/exit 0)) - :icons [(get-resource-path (str "leagues-of-votann/icon256x256.png")) - (get-resource-path (str "leagues-of-votann/icon48x48.png")) - (get-resource-path (str "leagues-of-votann/icon32x32.png"))] + :icons [(get-resource-path (str "icons/256x256.png")) + (get-resource-path (str "icons/48x48.png")) + (get-resource-path (str "icons/32x32.png"))] :showing true :title "Votann" :scene {:fx/type :scene diff --git a/src/votann/enhancements_widget.clj b/src/votann/enhancements_widget.clj index 65a99a2..2a124d0 100644 --- a/src/votann/enhancements_widget.clj +++ b/src/votann/enhancements_widget.clj @@ -5,7 +5,5 @@ (def enhancements-view-widget {:fx/type :scroll-pane :content {:fx/type :h-box - :children [{:fx/type :image-view - :fit-width 1233 - :preserve-ratio true - :image (get-resource-path (str "leagues-of-votann/enhancements.png"))}]}}) + :children [{:fx/type :label + :text "coming soon (TM)"}]}}) diff --git a/src/votann/models/leagues_of_votann.clj b/src/votann/models/leagues_of_votann.clj index 72dd642..1d98fb6 100644 --- a/src/votann/models/leagues_of_votann.clj +++ b/src/votann/models/leagues_of_votann.clj @@ -1,8 +1,8 @@ (ns votann.models.leagues-of-votann - (:require [votann.model] + (:require [votann.records.model] [votann.records.points] [votann.weapons.leagues-of-votann :as weapon]) - (:import [votann.model Model] + (:import [votann.records.model Model] [votann.records.points Points])) (def uthar-the-destined (Model. "Ûthar the Destined" 5 5 3 5 7 1 diff --git a/src/votann/model.clj b/src/votann/records/model.clj index 8338b89..21eb237 100644 --- a/src/votann/model.clj +++ b/src/votann/records/model.clj @@ -1,4 +1,4 @@ -(ns votann.model) +(ns votann.records.model) (defrecord Model [name m t sv w ld oc points diff --git a/src/votann/weapon.clj b/src/votann/records/weapon.clj index d037253..851bd9f 100644 --- a/src/votann/weapon.clj +++ b/src/votann/records/weapon.clj @@ -1,3 +1,3 @@ -(ns votann.weapon) +(ns votann.records.weapon) (defrecord Weapon [name abilities range a bs s ap d]) diff --git a/src/votann/tab_widget.clj b/src/votann/tab_widget.clj index 0e5a9bf..297d47c 100644 --- a/src/votann/tab_widget.clj +++ b/src/votann/tab_widget.clj @@ -37,9 +37,8 @@ [{:fx/type :tab :text "Battle Simulator" :closable false - :content {:fx/type fx.ext.web-view/with-engine-props - :props {:content (codex-page nil)} - :desc {:fx/type :web-view}}}]) + :content {:fx/type :label + :text "coming soon (TM)"}}]) (defn tab-widget [data] (vec (apply concat [(list-view-tab data) codex-view-tab battle-simulator-view-tab]))) diff --git a/src/votann/util.clj b/src/votann/util.clj index 5e4ec18..f449d77 100644 --- a/src/votann/util.clj +++ b/src/votann/util.clj @@ -14,9 +14,6 @@ (defn get-resource-path [file] (.toExternalForm (clojure.java.io/resource file))) -(defn unit-file-name [unit] - (string/lower-case (string/replace unit " " "-"))) - (defn remove-by-index [data index] (vec (concat (subvec data 0 index) (subvec data (inc index))))) diff --git a/src/votann/weapons/leagues_of_votann.clj b/src/votann/weapons/leagues_of_votann.clj index c30984a..d503ca0 100644 --- a/src/votann/weapons/leagues_of_votann.clj +++ b/src/votann/weapons/leagues_of_votann.clj @@ -1,6 +1,6 @@ (ns votann.weapons.leagues-of-votann - (:require [votann.weapon]) - (:import [votann.weapon Weapon])) + (:require [votann.records.weapon]) + (:import [votann.records.weapon Weapon])) (def ancestral-ward-stave (Weapon. "Ancestral ward stave" ["Psychic"] 1 1 3 7 1 "D3")) (def ancestral-wrath-focused-witchfire (Weapon. "Ancestral Wrath - focused witchfire" ["Hazardous" "Psychic"] 24 6 2 6 2 "D3")) |
