Skip to content

Extract anon-fn out to pure fn #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
burinc merged 4 commits into from
Nov 9, 2025
Merged

Extract anon-fn out to pure fn #140

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38f821e
Extract anon-fn out to pure fn
slipset Nov 9, 2025
f3220a0
Make init level pureish, push swap! up
slipset Nov 9, 2025
2dd200e
Same thing with fire bullets of various sorts
slipset Nov 9, 2025
c75168c
Merge pull request #1 from slipset/push-swap-upwards
burinc Nov 9, 2025
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
141 changes: 70 additions & 71 deletions src/scittle/games/asteroids.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,27 +240,26 @@

(defn init-level!
"Initializes a new level"
[& {:keys [level]}]
[{:keys [level ship] :as game-state}]
(let [num-asteroids (+ 3 level)]
(swap! game-state assoc
:asteroids (vec (for [_ (range num-asteroids)]
(let [edge (rand-int 4)
x (case edge
0 (rand-int canvas-width)
1 canvas-width
2 (rand-int canvas-width)
(rand-int canvas-height))
y (case edge
0 0
1 (rand-int canvas-height)
2 canvas-height
0)]
(create-asteroid :x x :y y :size-type :large))))
:bullets []
:particles []
:ufo-timer (+ 600 (rand-int 600))
:ship (assoc (:ship @game-state)
:invulnerable 120))))
(merge game-state
{:asteroids (vec (for [_ (range num-asteroids)]
(let [edge (rand-int 4)
x (case edge
0 (rand-int canvas-width)
1 canvas-width
2 (rand-int canvas-width)
(rand-int canvas-height))
y (case edge
0 0
1 (rand-int canvas-height)
2 canvas-height
0)]
(create-asteroid :x x :y y :size-type :large))))
:bullets []
:particles []
:ufo-timer (+ 600 (rand-int 600))
:ship (assoc ship :invulnerable 120)})))

(defn reset-ship!
"Resets ship to center"
Expand All @@ -278,69 +277,69 @@

(defn fire-bullet!
"Fires a bullet from the ship"
[]
[{:keys [ship] :as game-state}]
(play-laser-sound) ; Play laser sound
(let [{:keys [x y angle]} (:ship @game-state)
(let [{:keys [x y angle]} ship
bullet-vx (* bullet-speed (Math/cos (- angle (/ Math/PI 2))))
bullet-vy (* bullet-speed (Math/sin (- angle (/ Math/PI 2))))]
(swap! game-state update :bullets conj
{:x x
:y y
:vx bullet-vx
:vy bullet-vy
:life bullet-lifetime})))
(update game-state :bullets conj
{:x x
:y y
:vx bullet-vx
:vy bullet-vy
:life bullet-lifetime})))

(defn ufo-fire!
"UFO fires bullet at ship"
[& {:keys [ufo]}]
(let [{:keys [ship]} @game-state
dx (- (:x ship) (:x ufo))
[{:keys [ship] :as game-state} & {:keys [ufo]}]
(let [dx (- (:x ship) (:x ufo))
dy (- (:y ship) (:y ufo))
angle (Math/atan2 dy dx)
bullet-vx (* 5 (Math/cos angle))
bullet-vy (* 5 (Math/sin angle))]
(swap! game-state update :bullets conj
{:x (:x ufo)
:y (:y ufo)
:vx bullet-vx
:vy bullet-vy
:life bullet-lifetime
:from-ufo true})))
(update game-state :bullets conj
{:x (:x ufo)
:y (:y ufo)
:vx bullet-vx
:vy bullet-vy
:life bullet-lifetime
:from-ufo true})))

;; ============================================================================
;; Special Moves
;; ============================================================================

(defn hyperspace [state new-x new-y died?]
(-> state
;; Teleport ship
(assoc-in [:ship :x] new-x)
(assoc-in [:ship :y] new-y)
(assoc-in [:ship :vx] 0)
(assoc-in [:ship :vy] 0)
(assoc :hyperspace-cooldown hyperspace-cooldown)
;; Conditionally handle death
(#(if died?
(-> %
(update-in [:lives] dec)
(update :particles
(fn [particles]
(vec (concat particles
(create-particles
:x new-x
:y new-y
:count 12
:color "#FFFFFF"))))))
%))))

(defn hyperspace!
"Hyperspace jump with risk"
[]
(when (<= (:hyperspace-cooldown @game-state) 0)
(play-hyperspace-sound) ; Play hyperspace sound
[game-state]
(when (<= (:hyperspace-cooldown game-state) 0)
(play-hyperspace-sound) ; Play hyperspace sound
(let [new-x (rand-int canvas-width)
new-y (rand-int canvas-height)
died? (< (rand) 0.1)]
(swap! game-state
(fn [state]
(-> state
;; Teleport ship
(assoc-in [:ship :x] new-x)
(assoc-in [:ship :y] new-y)
(assoc-in [:ship :vx] 0)
(assoc-in [:ship :vy] 0)
(assoc :hyperspace-cooldown hyperspace-cooldown)
;; Conditionally handle death
(#(if died?
(-> %
(update-in [:lives] dec)
(update :particles
(fn [particles]
(vec (concat particles
(create-particles
:x new-x
:y new-y
:count 12
:color "#FFFFFF"))))))
%))))))))
(hyperspace game-state new-x new-y died?))))

;; ============================================================================
;; Collision Detection
Expand Down Expand Up @@ -427,7 +426,7 @@
(do
(when (and (= (mod (:frame-count @game-state) 60) 0)
(< (rand) 0.3))
(ufo-fire! :ufo u))
(swap! game-state ufo-fire! :ufo u))
(-> u
(update :x + (:vx u))
(update :y + (:vy u))))))))
Expand Down Expand Up @@ -558,7 +557,7 @@
(when (empty? asteroids)
(play-level-complete-sound) ; Play victory sound
(swap! game-state update :level inc)
(init-level! :level (:level @game-state))))))
(swap! game-state init-level!)))))

;; ============================================================================
;; Drawing Functions
Expand Down Expand Up @@ -764,7 +763,7 @@
:distance 0}
:fire-button false
:hyperspace-button false})
(init-level! :level 1))
(init-level! {:level 1 :ship {}}))

;; ============================================================================
;; Canvas Component
Expand All @@ -786,9 +785,9 @@
(swap! keys-pressed conj key)
(when (= (:game-status @game-state) :playing)
(case key
" " (do (fire-bullet!) (.preventDefault e))
"x" (hyperspace!)
"X" (hyperspace!)
" " (do (swap! game-state fire-bullet!) (.preventDefault e))
"x" (swap! game-state hyperspace!)
"X" (swap! game-state hyperspace!)
nil)))))

(.addEventListener js/window "keyup"
Expand Down Expand Up @@ -1033,7 +1032,7 @@
:color "76, 175, 80"
:on-press #(do
(swap! game-state assoc-in [:touch-controls :fire-button] true)
(fire-bullet!))
(swap! game-state fire-bullet!))
:on-release #(swap! game-state assoc-in [:touch-controls :fire-button] false)]
[touch-action-button
:label "HYPER"
Expand All @@ -1042,7 +1041,7 @@
:color "255, 152, 0"
:on-press #(do
(swap! game-state assoc-in [:touch-controls :hyperspace-button] true)
(hyperspace!))
(swap! game-state hyperspace!))
:on-release #(swap! game-state assoc-in [:touch-controls :hyperspace-button] false)]]]))

;; ============================================================================
Expand Down