From 0d978988fd38a1ab77a2896778393341a60f4b0b Mon Sep 17 00:00:00 2001
From: Bryce Covert <bryce@liffft.com>
Date: Mon, 14 Sep 2015 19:07:06 -0700
Subject: [PATCH] IOS tweaks.

---
 desktop/gametodos.txt                         |   4 +---
 desktop/resources/particles/dream-magic       |   2 +-
 desktop/resources/particles/lightning.png     | Bin 1440 -> 1765 bytes
 desktop/resources/robovm.ini                  |   4 ++--
 .../advent/screens/rooms/outside_house.clj    |   4 +++-
 desktop/src-common/advent/screens/scene.clj   |   6 +++---
 ios/build.sh                                  |   2 +-
 ios/project.clj                               |   6 +++++-
 8 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt
index 731d8966..87582b60 100644
--- a/desktop/gametodos.txt
+++ b/desktop/gametodos.txt
@@ -2,19 +2,17 @@ ART
 + Update all collisions
 
 PROGRAMMING
-+ fight with blergh at end isn't great
 + Save slots?
 + try to have dialogue for every wrong interaction
 + preload all sounds
 + behind house left direction not great
-+ grenouille chala leftovers
 
 IOS
 + all mp3s
-+ particle effects slowdown?
 + pngcrush breaks colors
 + renable pickup sound once it's been replaced
 + check out 64 bit?
++ update-override slow on IOS
 
 AUDIO
   + Walking
diff --git a/desktop/resources/particles/dream-magic b/desktop/resources/particles/dream-magic
index 3f4b7d1e..f42a1ced 100644
--- a/desktop/resources/particles/dream-magic
+++ b/desktop/resources/particles/dream-magic
@@ -6,7 +6,7 @@ lowMin: 1000.0
 lowMax: 1000.0
 - Count - 
 min: 0
-max: 800
+max: 200
 - Emission - 
 lowMin: 0.0
 lowMax: 0.0
diff --git a/desktop/resources/particles/lightning.png b/desktop/resources/particles/lightning.png
index 83ed254877d9f2fa529b653b542eec5075115ff5..eef89c03b713aa2f4912f2c925feba08dac5b69b 100644
GIT binary patch
delta 723
zcmV;^0xbQY3*`;49|V5_ut`KgR9Fe^nA=XnKnz3y@n`S|Uki`$ZG};E#MGVag(QF~
zB8A=9bFsZm5!~GTU)M2#ho{r&s7|E4hyETKNA<X-d$*Qo#ntHh>+Nj|)5`5Js68}P
zqjb1iHGelZTj%|VQ58M%Fsj!`eF?Lsqqyq#{FZ)_x5s9+hu?pYx0l7HXP`#8y)f;4
z2)?g4J<G3$>E)BIV(`>Uub(xIqvFjsgu>livD8GuI!}A&B|I?>zw&t&PMF7MB6(df
z=k<CGnYDjZ^^W>>-w+q7gOU+<YNM5N-NgONG4(Z5-%PK~H^hbXY2-jsLF7`QkI!EX
zxMspu9rvnSVWodv<4JeV*pYtC1Mwyp6ssSQ<NRv`EUR!FjyL5)Uogwzi|2aa#FdWg
zdJT0ip8F|}R>f9a&DZBOor?44mdEgcAjm<~Vff%2tG#2{b1-1RRUPn-OI*+Uki?fJ
zF%5(LsCF748t$9)JkOr`lkUae63IwHG)6-_W5VhtNvnTXbUhGswI;6cc;c6E;=8uj
zpYV<qSC`|+du&0C|3pI!dN?}}HMC|RG9(Gmy!N_0w?w{vR;)7a<Ao{bTBBTXTJ=kp
zOMddNzRG)Dj%Uw0iUaR!i+gq;BGmzS;XWugnAul-=l1j~m&O<@&u9|oS*v4|uby}~
z&iQrk9#wzKvFLg%?Js_ZRMFP=T@viYq(53*)uOf@--m<-T=g?DY}ZJ5^628Tw)SxJ
zbn%9)3GN+N0lgx7p3<npVo>5HeSA-!m#_&_eHoU=M|h4O-Cw*REn+QfOHtxhJ-oN*
zN~6WEz8nzVX>I8x{IA5)FcstesiNe^m1;_LP@_wDqnxC3L~PSnR%+&_KTTf4jQ4kW
z=@6tf<DE3FCZ=KdaAz9Z!kzJ%!FK<-I3xBO*lYV_egM*Y(z3wzIvM}~002ovPDHLk
FV1lzQe3AeF

delta 396
zcmV;70dxN44WJ9K9|V5^Ye_^wR9Fe^lfiDoFbqQzV1L#fx3Arf-M3}U;h}`VSc2;f
zMXFq6M<S_^?XuKU4wM7sKsitjj5)B5!H!Xvk8Pv-^Sw^zhx@GcZPtfr5VJU6k>{ab
za5jYOKgIE7v1bWyC=h4d_3PM@_s@H;XRzbFBbTLz)j4<GZqI-Ie!V@e|19r@mcuv~
zf|}p!tGV#0DPWb4zG8Xjs^fKY`Yy{2X0}E;5EaHOmfEW`j(&FD&B38nwVZ*vE4UGE
zuz#iDc*8*WIQKznj9VToy}ddf?Q?eA4x62u&5N$v39YEYvCk2X4J0yBi4cX5yVghe
zBCP6U&Te<bIfH*4COfCxoO{?X5WsG!UI>V{)fvo8#OJW=2ZvU-v-X`H8a-a+Pz}e&
zEWF&0strVkA?k_geD(~l&Sy0uY}8lH_Uy1O9D>O1-0HM<bi+Ve;IrNN5Z!B*NpSv$
q23l3ifpVZ6C<n@ca^NHm`~m@{u0uFWx~TvF002ovPDBK*LSTXt3Ckk@

diff --git a/desktop/resources/robovm.ini b/desktop/resources/robovm.ini
index 85f2571f..ad648ee3 100644
--- a/desktop/resources/robovm.ini
+++ b/desktop/resources/robovm.ini
@@ -1,2 +1,2 @@
-ms=256M
-mx=1024M
+ms128M
+mx512M
diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj
index 6624e1e4..34b3b254 100644
--- a/desktop/src-common/advent/screens/rooms/outside_house.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_house.clj
@@ -171,7 +171,9 @@
   (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :reset)
   (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :start)
   (Thread/sleep 1500)
-  (actions/transition-background entities :outside-house [257 90] :face :left))
+  (actions/transition-background entities :outside-house [257 90] :face :left)
+  (dotimes [_ 160]
+    (particle-effect! (get-in @entities [:rooms :inside-house :entities :magic-frog-particle]) :update 0.2)))
 
 (defn do-prophecy [entities]
   {:run #(do (actions/respond entities %
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index 66ba9d0a..e5efd4ae 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -1114,7 +1114,7 @@ void main()
               (set! (. camera zoom) (:zoom (:cam entities)))
               (set! (.. camera position x) (:x (:cam entities) 160.0))
               (set! (.. camera position y) (:y (:cam entities) 120.0)))
-        (let [entities (utils/update-override screen entities)]
+        (let [entities entities (utils/update-override screen entities)]
           
           
           (when (= (get-in entities [:fade :opacity])
@@ -1262,8 +1262,8 @@ void main()
   (fn [{:keys [^FitViewport viewport] :as screen} [entities]]
     (.apply viewport)
     (let [entities (utils/apply-tweens screen entities (:tweens entities))]
-      #_(label! (:fps entities) :set-text (str (game :fps))) 
-      (render! screen [ (:inventory entities) (:close entities)]) 
+      (label! (:fps entities) :set-text (str (game :fps))) 
+      (render! screen [ (:fps entities) (:inventory entities) (:close entities)]) 
       entities))
 
   :on-resize
diff --git a/ios/build.sh b/ios/build.sh
index 9beeacc1..8a1b9df3 100755
--- a/ios/build.sh
+++ b/ios/build.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-rm -rf advent.core.IOSLauncher && lein do compile, fruit ipa
+rm -rf advent.core.IOSLauncher && lein do compile, fruit ipa64
diff --git a/ios/project.clj b/ios/project.clj
index f022d51a..fdeb91c6 100644
--- a/ios/project.clj
+++ b/ios/project.clj
@@ -7,6 +7,9 @@
                  [org.clojure/data.priority-map "0.0.5"]
                  [org.clojure/core.async "0.1.346.0-17112a-alpha"]
                  [org.clojure/clojure "1.6.0"]
+                 [org.robovm/robovm-cocoatouch "1.7.0"]
+                 [org.robovm/robovm-objc "1.7.0"]
+                 [org.robovm/robovm-rt "1.7.0"]
                  [play-clj "0.4.5-BRYCE"]]
   :source-paths ["src/clojure" "../desktop/src-common"]
   :java-source-paths ["src/java"]
@@ -15,7 +18,8 @@
   :ios {:robovm-opts ["-forcelinkclasses" "advent.**:clojure.**:com.badlogic.**:play_clj.**"
                       "-libs" "libs/libObjectAL.a:libs/libgdx.a:libs/libgdx-box2d.a:libs/libgdx-bullet.a"
                       "-frameworks" "UIKit:OpenGLES:QuartzCore:CoreGraphics:OpenAL:AudioToolbox:AVFoundation"
-                      "-resources" "../desktop/resources/**"]
+                      "-resources" "../desktop/resources/**"
+                      ]
         :robovm-path "/Users/brycecovert/dev/robovm/robovm-1.7.0/"
         :versionn 1.1}
   :aot :all