diff --git a/desktop/.gitignore b/desktop/.gitignore index 690500bf..d0ccc18b 100644 --- a/desktop/.gitignore +++ b/desktop/.gitignore @@ -1,7 +1,6 @@ /target/ /checkouts/ *.edn -*.png save.edn screenshot* .nrepl-port diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-1.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-1.png new file mode 100644 index 00000000..b819dfd4 Binary files /dev/null and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-1.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-10.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-10.png new file mode 100644 index 00000000..3e045a40 Binary files /dev/null and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-10.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-11.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-11.png new file mode 100644 index 00000000..ffd98f39 Binary files /dev/null and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-11.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-12.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-12.png new file mode 100644 index 00000000..15f5932d Binary files /dev/null and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-12.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-2.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-2.png new file mode 100644 index 00000000..cd09814c Binary files /dev/null and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-2.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-3.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-3.png new file mode 100644 index 00000000..922b5e00 Binary files /dev/null and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-3.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-4.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-4.png new file mode 100644 index 00000000..2c4cc3f8 Binary files /dev/null and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-4.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-5.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-5.png new file mode 100644 index 00000000..d473bdf6 Binary files /dev/null and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-5.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-6.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-6.png new file mode 100644 index 00000000..592b5a84 Binary files /dev/null and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-6.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-7.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-7.png new file mode 100644 index 00000000..e1f43989 Binary files /dev/null and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-7.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-8.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-8.png new file mode 100644 index 00000000..73448baf Binary files /dev/null and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-8.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-9.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-9.png new file mode 100644 index 00000000..001be60c Binary files /dev/null and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-9.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new.psd b/desktop/asset-work/inside-cafeteria/fight-new.psd new file mode 100644 index 00000000..e4d9389b Binary files /dev/null and b/desktop/asset-work/inside-cafeteria/fight-new.psd differ diff --git a/desktop/asset-work/inside-castle/sign-1.png b/desktop/asset-work/inside-castle/sign-1.png new file mode 100644 index 00000000..725a0db0 Binary files /dev/null and b/desktop/asset-work/inside-castle/sign-1.png differ diff --git a/desktop/asset-work/inside-castle/sign-2.png b/desktop/asset-work/inside-castle/sign-2.png new file mode 100644 index 00000000..c7925567 Binary files /dev/null and b/desktop/asset-work/inside-castle/sign-2.png differ diff --git a/desktop/asset-work/inside-castle/sign-3.png b/desktop/asset-work/inside-castle/sign-3.png new file mode 100644 index 00000000..94644795 Binary files /dev/null and b/desktop/asset-work/inside-castle/sign-3.png differ diff --git a/desktop/asset-work/inside-castle/sign1.png b/desktop/asset-work/inside-castle/sign1.png new file mode 100644 index 00000000..725a0db0 Binary files /dev/null and b/desktop/asset-work/inside-castle/sign1.png differ diff --git a/desktop/asset-work/inside-castle/sign2.png b/desktop/asset-work/inside-castle/sign2.png new file mode 100644 index 00000000..c7925567 Binary files /dev/null and b/desktop/asset-work/inside-castle/sign2.png differ diff --git a/desktop/asset-work/inside-castle/sign3.png b/desktop/asset-work/inside-castle/sign3.png new file mode 100644 index 00000000..94644795 Binary files /dev/null and b/desktop/asset-work/inside-castle/sign3.png differ diff --git a/desktop/asset-work/outsidehouse/charcoal-1.png b/desktop/asset-work/outsidehouse/charcoal-1.png new file mode 100644 index 00000000..cd5e9dd4 Binary files /dev/null and b/desktop/asset-work/outsidehouse/charcoal-1.png differ diff --git a/desktop/asset-work/outsidehouse/charcoal-2.png b/desktop/asset-work/outsidehouse/charcoal-2.png new file mode 100644 index 00000000..38e8278f Binary files /dev/null and b/desktop/asset-work/outsidehouse/charcoal-2.png differ diff --git a/desktop/asset-work/outsidehouse/charcoal-3.png b/desktop/asset-work/outsidehouse/charcoal-3.png new file mode 100644 index 00000000..5626f71f Binary files /dev/null and b/desktop/asset-work/outsidehouse/charcoal-3.png differ diff --git a/desktop/asset-work/outsidehouse/charcoal-4.png b/desktop/asset-work/outsidehouse/charcoal-4.png new file mode 100644 index 00000000..035f456f Binary files /dev/null and b/desktop/asset-work/outsidehouse/charcoal-4.png differ diff --git a/desktop/asset-work/outsidehouse/sheep-1.png b/desktop/asset-work/outsidehouse/sheep-1.png new file mode 100644 index 00000000..ac9c3bdc Binary files /dev/null and b/desktop/asset-work/outsidehouse/sheep-1.png differ diff --git a/desktop/asset-work/outsidehouse/sheep-2.png b/desktop/asset-work/outsidehouse/sheep-2.png new file mode 100644 index 00000000..a8027bb7 Binary files /dev/null and b/desktop/asset-work/outsidehouse/sheep-2.png differ diff --git a/desktop/asset-work/outsidehouse/sheep-3.png b/desktop/asset-work/outsidehouse/sheep-3.png new file mode 100644 index 00000000..df998242 Binary files /dev/null and b/desktop/asset-work/outsidehouse/sheep-3.png differ diff --git a/desktop/build-linux.json b/desktop/build-linux.json new file mode 100644 index 00000000..5307cc08 --- /dev/null +++ b/desktop/build-linux.json @@ -0,0 +1,10 @@ +{ + "platform": "linux64", + "jdk": "/Users/brycecovert/dev/jvms/openjdk-1.7.0-u80-unofficial-linux-amd64-image.zip", + "executable": "Tick's Tales", + "appjar": "target/advent-standalone.jar", + "mainclass": "advent/core/desktop_launcher", + "resources": ["resources/icon" ], + "minimizejre": "soft", + "outdir": "target/linux" +} diff --git a/desktop/content-builder/scripts/app_build_411610.vdf b/desktop/content-builder/scripts/app_build_411610.vdf index 8ff5f79d..dfb3f0ae 100644 --- a/desktop/content-builder/scripts/app_build_411610.vdf +++ b/desktop/content-builder/scripts/app_build_411610.vdf @@ -12,5 +12,6 @@ { "411611" "depot_build_411611.vdf" "411612" "depot_build_411612.vdf" + "411614" "depot_build_411614.vdf" } } diff --git a/desktop/content-builder/scripts/depot_build_411614.vdf b/desktop/content-builder/scripts/depot_build_411614.vdf new file mode 100644 index 00000000..2850a9d0 --- /dev/null +++ b/desktop/content-builder/scripts/depot_build_411614.vdf @@ -0,0 +1,31 @@ +"DepotBuildConfig" +{ + // Set your assigned depot ID here + "DepotID" "411614" + + // Set a root for all content. + // All relative paths specified below (LocalPath in FileMapping entries, and FileExclusion paths) + // will be resolved relative to this root. + // If you don't define ContentRoot, then it will be assumed to be + // the location of this script file, which probably isn't what you want + "ContentRoot" "/Users/brycecovert/dev/advent/desktop/target/linux" + + // include all files recursivley + "FileMapping" + { + // This can be a full path, or a path relative to ContentRoot + "LocalPath" "*" + + // This is a path relative to the install folder of your game + "DepotPath" "." + + // If LocalPath contains wildcards, setting this means that all + // matching files within subdirectories of LocalPath will also + // be included. + "recursive" "1" + } + + // but exclude all symbol files + // This can be a full path, or a path relative to ContentRoot + "FileExclusion" "*.pdb" +} diff --git a/desktop/last-release b/desktop/last-release index f64f5d8d..f04c001f 100644 --- a/desktop/last-release +++ b/desktop/last-release @@ -1 +1 @@ -27 +29 diff --git a/desktop/release.sh b/desktop/release.sh index 95d8a1e5..af1c0803 100755 --- a/desktop/release.sh +++ b/desktop/release.sh @@ -4,6 +4,7 @@ git tag -a v0.1.`cat last-release` -m "tagging version 0.1.`cat last-release`" lein with-profile steam do clean, compile, uberjar java -jar packr.jar build-windows.json java -jar packr.jar build-osx.json +java -jar packr.jar build-linux.json cp icons.icns target/osx/Tick\'s\ Tales.app/Contents/Resources/ read -p "Steam pass: " STEAM_PASS ./content-builder/builder_osx/steamcmd.sh +login digitalbouncehouse $STEAM_PASS +run_app_build ../scripts/app_build_411610.vdf +quit diff --git a/desktop/resources/icon/icon_128x128.png b/desktop/resources/icon/icon_128x128.png new file mode 100644 index 00000000..e7045b66 Binary files /dev/null and b/desktop/resources/icon/icon_128x128.png differ diff --git a/desktop/resources/icon/icon_16x16.png b/desktop/resources/icon/icon_16x16.png new file mode 100644 index 00000000..94979225 Binary files /dev/null and b/desktop/resources/icon/icon_16x16.png differ diff --git a/desktop/resources/icon/icon_32x32.png b/desktop/resources/icon/icon_32x32.png new file mode 100644 index 00000000..3f661f23 Binary files /dev/null and b/desktop/resources/icon/icon_32x32.png differ diff --git a/desktop/resources/packed/pack9.png b/desktop/resources/packed/pack9.png new file mode 100644 index 00000000..698892f0 Binary files /dev/null and b/desktop/resources/packed/pack9.png differ diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 66d542ac..aa75e642 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -246,7 +246,7 @@ (actions/present-choices entities {:choices ["Please, Frankie. Give me my stuff back!" {:run #(do (actions/respond entities % :frankie "Not a chance, Dipstick." - :frankie "Burglers like us gotta eat too, you know." + :frankie "Burglars like us gotta eat too, you know." :ego "But it's a matter of life and death!" :ego "Plus, Georgia's counting on me!") (actions/georgia-say entities "I'm counting on you, Tick!") diff --git a/desktop/test.png b/desktop/test.png new file mode 100644 index 00000000..eb013070 Binary files /dev/null and b/desktop/test.png differ