diff --git a/.github/workflows/pelusica.yml b/.github/workflows/pelusica.yml index d4906eb..3d7af0b 100644 --- a/.github/workflows/pelusica.yml +++ b/.github/workflows/pelusica.yml @@ -18,14 +18,14 @@ jobs: - name: Build run: | - npm install uglify-js -g set -x - curl -L -o calm.tgz https://github.com/VitoVan/calm/releases/download/0.1.0/calm.tgz + curl -L -o calm.tgz https://github.com/VitoVan/calm/releases/download/0.1.1/calm.tgz mkdir calm tar xvf calm.tgz --directory=calm ls -lah calm export PATH=$PATH:$(pwd)/calm/ export APP_NAME=Pelusica + export REBUILD_WASM_P=yes calm publish-web ls -lah . zip -r -9 ${APP_NAME}-web.zip ./web @@ -45,7 +45,7 @@ jobs: - name: Build run: | set -x - curl -L -o calm.tgz https://github.com/VitoVan/calm/releases/download/0.1.0/calm.tgz + curl -L -o calm.tgz https://github.com/VitoVan/calm/releases/download/0.1.1/calm.tgz mkdir calm tar xvf calm.tgz --directory=calm ls -lah calm @@ -76,7 +76,7 @@ jobs: run: | set -x export OS_SUBFIX=".${CI_MATRIX_OS}" - curl -L -o calm.dmg https://github.com/VitoVan/calm/releases/download/0.1.0/calm${OS_SUBFIX}.dmg + curl -L -o calm.dmg https://github.com/VitoVan/calm/releases/download/0.1.1/calm${OS_SUBFIX}.dmg hdiutil attach calm.dmg cp -R "/Volumes/Calm - CALM/Calm.app/Contents/MacOS/" calm ls -lah calm @@ -107,7 +107,7 @@ jobs: run: | set -x pacman -S --noconfirm --needed unzip - curl -L -o calm.zip https://github.com/VitoVan/calm/releases/download/0.1.0/calm.zip + curl -L -o calm.zip https://github.com/VitoVan/calm/releases/download/0.1.1/calm.zip unzip calm.zip -d calm ls -lah calm export PATH=$PATH:$(pwd)/calm/ diff --git a/canvas.lisp b/canvas.lisp index 6d3c0b0..9506c22 100644 --- a/canvas.lisp +++ b/canvas.lisp @@ -1,9 +1,9 @@ -;; pelusica 0.0.4 +;; pelusica 0.0.5 (in-package #:calm) #-jscl -(let ((required-version "0.1.0")) +(let ((required-version "0.1.1")) (unless (string>= *calm-version* required-version) (format t "Sorry, CALM ~A is needed, older version (current: ~A) of CALM won't work.~%" required-version *calm-version*) @@ -178,9 +178,6 @@ (incf *ball-x* 100))) ((c:keq key :SCANCODE-LEFT :SCANCODE-J :SCANCODE-H) (when (and (> *ball-x* 100) (play-note)) - #+jscl - (incf *ball-x* -100) - #-jscl (decf *ball-x* 100))) (t (format t "~%KEY PRESSED: ~A~%" key))))) @@ -190,7 +187,7 @@ (c:select-font-family "Open Sans" :normal :normal) (c:set-font-size 24) (apply #'c:set-source-rgb *ball-color*) - (c:move-to 142 240) + (c:move-to 140 240) (c:show-text "press ") (apply #'c:set-source-rgb *health-color*) #-jscl @@ -202,15 +199,17 @@ (c:show-text "Enter") (c:show-text "return")) (apply #'c:set-source-rgb *ball-color*) - (c:show-text ", and wait to die") - (c:move-to 142 290) - (c:show-text "or try pressing ") + (c:show-text " to start or restart") + (c:move-to 140 290) + (c:show-text "press ") (apply #'c:set-source-rgb *health-color*) (c:show-text "left") (apply #'c:set-source-rgb *ball-color*) - (c:show-text " / ") + (c:show-text " or ") (apply #'c:set-source-rgb *health-color*) - (c:show-text "right")) + (c:show-text "right") + (apply #'c:set-source-rgb *ball-color*) + (c:show-text " to move")) (defun draw-died-screen () (if *suffocated* @@ -249,9 +248,6 @@ (setf *level* (* 40 (/ *music-index* (length *music-list*))) *enemy-move-per-ms* (max 0.22 (/ - #+jscl - (#j:Math:log (1+ *level*)) - #-jscl (log (1+ *level*)) 4)))) (defun draw-level-border () @@ -321,18 +317,6 @@ (c:play-music "assets/chord.wav")) (when should-move ;; move downward - ;; this clumsy chunk is to indulge jscl - ;; track: https://github.com/jscl-project/jscl/issues/176 - #+jscl - (let ((current-enemy (nth i *enemy-list*))) - (setf (nth i *enemy-list*) - (list - (car current-enemy) - (+ (cadr current-enemy) - (if *enemy-move-tick* - (* (- (c:get-ticks) *enemy-move-tick*) *enemy-move-per-ms*) - 1))))) - #-jscl (incf (cadr (nth i *enemy-list*)) (if *enemy-move-tick* @@ -340,17 +324,8 @@ 1))) else do - ;; random reset the Y position - ;; this clumsy chunk is to indulge jscl - ;; track: https://github.com/jscl-project/jscl/issues/176 - #+jscl - (let ((current-enemy (nth i *enemy-list*))) - (setf (nth i *enemy-list*) - (list - (car current-enemy) - (* (1+ (random 400)) -1)))) - #-jscl - (setf (cadr (nth i *enemy-list*)) (* (1+ (random 400)) -1))) + ;; randomly reset the Y position + (setf (cadr (nth i *enemy-list*)) (* (1+ (random 400)) -1))) (when should-move (setf *enemy-move-tick* (c:get-ticks)))))) (defun draw-ball ()