Merge commit 'f8f115de10b4ef7818cf58bc03c9d75700e425b0' into test-new-mode-system

Dictionary: "A 🤔 game developed using LÖVE."
Legal page: "TECHMINO is not a fan game of Tetris."

This commit edits the dictionary to follow the legal page into:
"A block stacker game developed using LÖVE."

.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE_1.md

@@ -2,8 +2,7 @@
 name: Bug report (bluescreen crash) Bug报告 (蓝屏报错)
 about: Create a report of problems which made the crash with a bluescreen
 ---
-Screenshot with crash information: (delete this line before submitting)
-*Image Here*
+Screenshot with crash information (*Image(s) Here*):
 
-If you can reproduce it, write the steps here. If you can't, try to describe the exactly time the game crash, like pressing which key or which button: (delete this line before submitting)
-*Details Here*
+
+If you can reproduce it, write the steps here. If you can't, try to describe the exactly time the game crash, like pressing which key or which button (*Details Here*)

.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE_2.md

@@ -2,8 +2,7 @@
 name: Bug report (unintended behaviors) Bug报告 (奇怪的现象)
 about: Create a report of unintended behaviors
 ---
-Screenshot with unintended behaviors: (delete this line before submitting)
-*Image(s) Here*
+Screenshot with unintended behaviors (*Image(s) Here*):
 
-If you can reproduce it, write the steps here. If you can't, try to describe the exactly time the game crash, like pressing which key or which button: (delete this line before submitting)
-*Details Here*
+
+If you can reproduce it, write the steps here. If you can't, try to describe the exactly time the game crash, like pressing which key or which button (*Details Here*):

.github/actions/automatic-test/action.yml

@@ -0,0 +1,24 @@
+name: 'Automatic Test'
+description: 'Check for obvious errors.'
+
+runs:
+  using: "composite"
+  steps:
+  - uses: actions/checkout@v2
+  - uses: ./.github/actions/build-love
+    with:
+      file-path: Techmino.love
+  - name: Download love
+    shell: bash
+    run: |
+      curl -L https://github.com/love2d/love/releases/download/11.3/love-11.3-linux-x86_64.tar.gz | tar xz
+  - name: Prepare PulseAudio
+    shell: bash
+    run: |
+      sudo apt-get update
+      sudo apt-get install pulseaudio pulseaudio-utils pavucontrol alsa-oss alsa-utils -y
+  - name: Run automated test
+    uses: GabrielBB/xvfb-action@v1
+    with:
+      run: |
+        ./dest/love Techmino.love --test

.github/actions/build-android/action.yml

@@ -3,7 +3,7 @@ description: 'build Android package'
 inputs:
   type:
     required: true
-  code:
+  apkCode:
     required: true
   name:
     required: true
@@ -59,11 +59,41 @@ runs:
       shell: bash
       run: |
         7z a -tzip love-android/app/src/main/assets/game.love libAndroid
+    - name: update Android information
+      shell: python
+      run: |
+        if '${{ inputs.type }}' == 'Release':
+          appName = 'Techmino'
+          packageName = 'org.love2d.MrZ.Techmino'
+          edition = 'release'
+        elif '${{ inputs.type }}' == 'Snapshot':
+          appName = 'Techmino_Snapshot'
+          packageName = 'org.love2d.MrZ.Techmino.Snapshot'
+          edition = 'snapshot'
+        with open('./love-android/app/src/main/AndroidManifest.xml', "r+", encoding='utf-8') as file:
+          data = file.read()
+          data = data\
+            .replace('@appName', appName)\
+            .replace('@edition', edition)
+          file.seek(0)
+          file.truncate()
+          file.write(data)
+        with open("./love-android/app/build.gradle", "r+", encoding='utf-8') as file:
+          data = file.read()
+          data = data\
+            .replace('@packageName', packageName)\
+            .replace('@versionCode', '${{ inputs.apkCode }}')\
+            .replace('@versionName', '${{ inputs.name }}')\
+            .replace('@storePassword', '${{ inputs.KEY_STORE_PASSWORD }}')\
+            .replace('@keyAlias', '${{ inputs.ALIAS }}')\
+            .replace('@keyPassword', '${{ inputs.KEY_PASSWORD }}')
+          file.seek(0)
+          file.truncate()
+          file.write(data)
     - name: Build Techmino
       shell: bash
       run: |
         echo "${{ inputs.SIGNING_KEY }}" | base64 -d > love-android/app/android.keystore
-        python3 .github/workflows/updateVersion.py -T Android${{ inputs.type }} -C ${{ inputs.code }} -N ${{ inputs.name }} -S ${{ inputs.KEY_STORE_PASSWORD }} -A ${{ inputs.ALIAS }} -K ${{ inputs.KEY_PASSWORD }}
         chmod 777 love-android/gradlew
         cd love-android/
         ./gradlew assembleRelease

.github/actions/build-ios/action.yml

@@ -0,0 +1,96 @@
+name: 'build iOS'
+description: 'build iOS package'
+inputs:
+  name:
+    required: true
+    description: "Version name"
+  type:
+    required: true
+    description: "Build type"
+  APPLE_API_ID:
+    required: true
+    description: "API key ID"
+  APPLE_API_ISSUER:
+    required: true
+    description: "API issuer ID"
+  APPLE_API_KEY:
+    required: true
+    description: "API key content"
+  APPLE_APP_BUILD:
+    required: true
+    description: "Build number"
+  APPLE_APP_CHANGELOG:
+    required: true
+    description: "Changelog"
+  APPLE_APP_ID:
+    required: true
+    description: "AppStore Apple ID"
+  APPLE_APP_IDENTIFIER:
+    required: true
+    description: "Bundle ID"
+  APPLE_APP_PROFILE:
+    required: true
+    description: "Provisioning Profile specifer"
+  APPLE_KEYCHAIN_NAME:
+    required: true
+    description: "Temporary keychain name"
+  APPLE_KEYCHAIN_PWD:
+    required: true
+    description: "Temporary keychain password"
+  FASTLANE_DISCORD_WEBHOOK:
+    required: true
+    description: "Fastlane Discord webhook"
+  FASTLANE_ACTION_ID:
+    required: true
+    description: "Fastlane Action ID"
+  FASTLANE_MATCH_PWD:
+    required: true
+    description: "Fastlane Match description password"
+  FASTLANE_MATCH_TOKEN:
+    required: true
+    description: "Fastlane Match Github token"
+runs:
+  using: "composite"
+  steps:
+    - uses: ./.github/actions/build-love
+    - name: Checkout source codes
+      uses: actions/checkout@v2
+      with:
+        repository: '26F-Studio/Techmino-iOS'
+        path: 'Techmino-iOS'
+    - name: Download CCloader
+      uses: ./.github/actions/get-cc
+      with:
+        arch: iOS
+    - name: Update source codes
+      shell: bash
+      run: |
+        mv Techmino.love Techmino-iOS/platform/xcode
+        mv libcold_clear.a Techmino-iOS/platform/xcode
+        mv libCCloader.a Techmino-iOS/platform/xcode
+    - name: Run fastlane
+      uses: maierj/fastlane-action@v2.0.1
+      with:
+        lane: '${{ inputs.type }}'
+        subdirectory: 'Techmino-iOS/platform/xcode'
+      env:
+          ACTION_ID: '${{ inputs.FASTLANE_ACTION_ID }}'
+          API_ID: '${{ inputs.APPLE_API_ID }}'
+          API_ISSUER: '${{ inputs.APPLE_API_ISSUER }}'
+          API_KEY: '${{ inputs.APPLE_API_KEY }}'
+          APP_BUILD: '${{ inputs.APPLE_APP_BUILD }}'
+          APP_CHANGELOG: '${{ inputs.APPLE_APP_CHANGELOG }}'
+          APP_ID: '${{ inputs.APPLE_APP_ID }}'
+          APP_IDENTIFIER: '${{ inputs.APPLE_APP_IDENTIFIER }}'
+          APP_PROFILE: '${{ inputs.APPLE_APP_PROFILE }}'
+          APP_VERSION: '${{ inputs.name }}'
+          DISCORD_WEBHOOK: '${{ inputs.FASTLANE_DISCORD_WEBHOOK }}'
+          KEYCHAIN_NAME: '${{ inputs.APPLE_KEYCHAIN_NAME }}'
+          KEYCHAIN_PWD: '${{ inputs.APPLE_KEYCHAIN_PWD }}'
+          MATCH_PASSWORD: '${{ inputs.FASTLANE_MATCH_PWD }}'
+          MATCH_TOKEN: '${{ inputs.FASTLANE_MATCH_TOKEN }}'
+    - name: Move ipa
+      shell: bash
+      run: |
+        mv Techmino-iOS/platform/xcode/Techmino.ipa Techmino.ipa
+        

.github/actions/build-linux/action.yml

@@ -33,7 +33,7 @@ runs:
         cp squashfs-root/icon.png squashfs-root/.DirIcon
         chmod 777 squashfs-root/love
         mkdir -p squashfs-root/usr/share/Techmino
-        mv document media parts Zframework conf.lua main.lua version.lua squashfs-root/usr/share/Techmino
+        mv media parts Zframework conf.lua main.lua version.lua legals.md license.txt squashfs-root/usr/share/Techmino
         mv CCloader.so squashfs-root/usr/share/Techmino
         mv libcold_clear.so squashfs-root/usr/lib
         chmod 777 appimagetool-x86_64.AppImage

.github/actions/build-love/action.yml

@@ -7,5 +7,5 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - run: 7z a -tzip ${{ inputs.file-path }} document media parts Zframework conf.lua main.lua version.lua
+    - run: 7z a -tzip ${{ inputs.file-path }} media parts Zframework conf.lua main.lua version.lua legals.md license.txt
       shell: bash

.github/actions/build-macos/action.yml

@@ -3,43 +3,150 @@ description: 'build Mac OS package'
 inputs:
   name:
     required: true
+    description: "Version name"
   icon:
     required: true
-  MACOS_CERTIFICATE:
+    description: "App icons (.icns)"
+  APPLE_API_ID:
     required: true
-  MACOS_CERTIFICATE_ID:
+    description: "API key ID"
+  APPLE_API_ISSUER:
     required: true
-  MACOS_CERTIFICATE_PWD:
+    description: "API issuer ID"
+  APPLE_API_KEY:
     required: true
+    description: "API key content"
+  APPLE_APP_IDENTIFIER:
+    required: true
+    description: "Bundle ID"
+  APPLE_KEYCHAIN_NAME:
+    required: true
+    description: "Temporary keychain name"
+  APPLE_KEYCHAIN_PWD:
+    required: true
+    description: "Temporary keychain password"
+  FASTLANE_MATCH_PWD:
+    required: true
+    description: "Fastlane Match description password"
+  FASTLANE_MATCH_TOKEN:
+    required: true
+    description: "Fastlane Match Github token"
 runs:
   using: "composite"
   steps:
     - uses: ./.github/actions/build-love
-    - name: Download template
-      uses: ./.github/actions/get-unzip
+    - name: Checkout template
+      uses: actions/checkout@v2
       with:
-        url: https://github.com/26F-Studio/Techmino/releases/download/v0.15.1/Techmino.app.zip
+        repository: '26F-Studio/Techmino-macOS'
+        path: 'Techmino-macOS'
     - name: Download ColdClear
       uses: ./.github/actions/get-cc
       with:
         arch: macOS
+    - name: Fastlane match
+      uses: maierj/fastlane-action@v2.0.1
+      with:
+        lane: 'get_cert'
+        subdirectory: 'Techmino-macOS'
+      env:
+          API_ID: '${{ inputs.APPLE_API_ID }}'
+          API_ISSUER: '${{ inputs.APPLE_API_ISSUER }}'
+          API_KEY: '${{ inputs.APPLE_API_KEY }}'
+          APP_IDENTIFIER: '${{ inputs.APPLE_APP_IDENTIFIER }}'
+          KEYCHAIN_NAME: '${{ inputs.APPLE_KEYCHAIN_NAME }}'
+          KEYCHAIN_PWD: '${{ inputs.APPLE_KEYCHAIN_PWD }}'
+          MATCH_PASSWORD: '${{ inputs.FASTLANE_MATCH_PWD }}'
+          MATCH_TOKEN: '${{ inputs.FASTLANE_MATCH_TOKEN }}'
     - name: Modify template
+      shell: python
+      run: |
+        import datetime
+        from io import open
+        thisYear = str(datetime.datetime.today().year)
+        with open('./.github/build/macOS/info.plist.template', 'r', encoding='utf-8') as file:
+          data = file.read()
+          data = data\
+            .replace('@versionName', '${{ inputs.name }}'[1:])\
+            .replace('@thisYear', thisYear)\
+            .replace('@bundleId', '${{ inputs.APPLE_APP_IDENTIFIER }}')
+        with open('./Techmino-macOS/Techmino.app/Contents/info.plist', 'w+', encoding='utf-8') as file:
+          file.write(data)
+    - name: Pack
       shell: bash
       run: |
-        python3 .github/workflows/updateVersion.py -T macOS -N ${{ inputs.name }}
-        mv Techmino.love Techmino.app/Contents/Resources
-        mv CCloader.dylib Techmino.app/Contents/Frameworks
-        mv ${{ inputs.icon }} Techmino.app/Contents/Resources/iconfile.icns
+        mv Techmino.love Techmino-macOS/Techmino.app/Contents/Resources
+        mv CCloader.dylib Techmino-macOS/Techmino.app/Contents/Frameworks
+        mv ${{ inputs.icon }} Techmino-macOS/Techmino.app/Contents/Resources/iconfile.icns
+
+        chmod +x Techmino-macOS/Techmino.app/Contents/Frameworks/CCloader.dylib
+        chmod +x Techmino-macOS/Techmino.app/Contents/MacOS/love
     - name: Codesign executable
-      # In secrets:
-      #   - MACOS_CERTIFICATE: the *.p12 Developer ID Certificate, encoded in base64
-      #   - MACOS_CERTIFICATE_PWD: The password
       shell: bash
       run: |
-        echo ${{ inputs.MACOS_CERTIFICATE }} | base64 --decode > certificate.p12
-        security create-keychain -p Techminohaowan build.keychain
-        security default-keychain -s build.keychain
-        security unlock-keychain -p Techminohaowan build.keychain
-        security import certificate.p12 -k build.keychain -P ${{ inputs.MACOS_CERTIFICATE_PWD }} -T /usr/bin/codesign
-        security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k Techminohaowan build.keychain
-        /usr/bin/codesign --force --deep -s ${{ inputs.MACOS_CERTIFICATE_ID }} Techmino.app -v
+        security unlock-keychain -p ${{ inputs.TEMP_KEYCHAIN_PASSWORD }} \
+        ~/Library/Keychains/${{ inputs.TEMP_KEYCHAIN_USER }}-db
+
+        [[ $(security find-identity) =~ ([0-9A-F]{40}) ]]
+
+        codesign --timestamp --force --strict --deep -v \
+        --options runtime \
+        -s ${BASH_REMATCH[1]} \
+        --entitlements Techmino-macOS/love.entitlements \
+        Techmino-macOS/Techmino.app
+    - name: Fastlane notarize
+      uses: maierj/fastlane-action@v2.0.1
+      with:
+        lane: 'make_safe'
+        subdirectory: 'Techmino-macOS'
+      env:
+        API_ID: '${{ inputs.APPLE_API_ID }}'
+        API_ISSUER: '${{ inputs.APPLE_API_ISSUER }}'
+        API_KEY: '${{ inputs.APPLE_API_KEY }}'
+        APP_IDENTIFIER: '${{ inputs.APPLE_APP_IDENTIFIER }}'
+        NOTARIZE_OBJECT: 'Techmino.app'
+    - name: Create DMG file
+      shell: bash
+      run: |
+        brew install create-dmg
+        create-dmg \
+          --volname "Techmino for MacOS" \
+          --volicon "./.github/build/macOS/Techminodisk.icns" \
+          --window-pos 200 120 \
+          --window-size 800 500 \
+          --icon-size 100 \
+          --icon "Techmino.app" 239 203 \
+          --background ".github/build/macOS/backgroundImage.tiff" \
+          --hide-extension "Techmino.app" \
+          --app-drop-link 565 203 \
+          "Techmino-macOS/Techmino-macOS.dmg" \
+          "Techmino-macOS/Techmino.app/"
+    - name: Codesign DMG
+      shell: bash
+      run: |
+        security unlock-keychain -p ${{ inputs.TEMP_KEYCHAIN_PASSWORD }} \
+        ~/Library/Keychains/${{ inputs.TEMP_KEYCHAIN_USER }}-db
+
+        [[ $(security find-identity) =~ ([0-9A-F]{40}) ]]
+
+        codesign --timestamp --force --strict --deep -v \
+        --options runtime \
+        -s ${BASH_REMATCH[1]} \
+        --entitlements Techmino-macOS/love.entitlements \
+        Techmino-macOS/Techmino-macOS.dmg
+    - name: Fastlane notarize
+      uses: maierj/fastlane-action@v2.0.1
+      with:
+        lane: 'make_safe'
+        subdirectory: 'Techmino-macOS'
+      env:
+        API_ID: '${{ inputs.APPLE_API_ID }}'
+        API_ISSUER: '${{ inputs.APPLE_API_ISSUER }}'
+        API_KEY: '${{ inputs.APPLE_API_KEY }}'
+        APP_IDENTIFIER: '${{ inputs.APPLE_APP_IDENTIFIER }}'
+        NOTARIZE_OBJECT: 'Techmino-macOS.dmg'
+    - name: Finalize
+      shell: bash
+      run: |
+        mv Techmino-macOS/Techmino-macOS.dmg Techmino.dmg
+        spctl -a -t open --context context:primary-signature -vv Techmino.dmg

.github/actions/build-windows/action.yml

@@ -30,6 +30,18 @@ runs:
       with:
         url: http://www.angusj.com/resourcehacker/resource_hacker.zip
     - uses: ./.github/actions/build-love
+    - name: update Windows template
+      shell: python
+      run: |
+        Version = '${{ inputs.version }}'.replace('V', '')
+        FileVersion = (f"{Version.replace('.', ',')},0")
+        with open('./.github/build/Windows/Techmino.rc.template', 'r', encoding='utf8') as file:
+          data = file.read()
+          data = data\
+            .replace('@FileVersion', FileVersion)\
+            .replace('@Version', Version)
+        with open('Techmino.rc', 'w+', encoding='utf8') as file:
+          file.write(data)
     - name: Pack Techmino
       shell: pwsh
       run: |
@@ -42,7 +54,6 @@ runs:
         del .\love\readme.txt
         move .\cold_clear.dll .\love
         move .\CCloader.dll .\love
-        python .\.github\workflows\updateVersion.py -T Windows -N ${{ inputs.version }}
         cmd /c '.\ResourceHacker.exe -open .\love\Techmino.exe -save .\love\Techmino.exe -action delete -mask ICONGROUP,,'
         cmd /c '.\ResourceHacker.exe -open .\Techmino.rc -save .\Techmino.res -action compile'
         cmd /c '.\ResourceHacker.exe -open .\love\Techmino.exe -save .\love\Techmino.exe -action addoverwrite -res "${{ inputs.icon }}" -mask ICONGROUP,1,'

.github/actions/snapshot-update/action.yml

@@ -1,12 +0,0 @@
-name: 'update for a snapshot'
-description: 'common update logic for snapshot'
-inputs:
-  commit:
-    required: true
-runs:
-  using: "composite"
-  steps:
-    - shell: bash
-      run: |
-        python3 .github/workflows/updateVersion.py -T Conf
-        python3 .github/workflows/updateVersion.py -T Version -H ${{ inputs.commit }}

.github/actions/update-version/action.yml

@@ -0,0 +1,37 @@
+name: 'update version'
+description: 'common update logic for snapshot and release'
+inputs:
+  commit:
+    required: false
+  type:
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - shell: python
+      name: update snapshot saving folder
+      run: |
+        from io import open
+        if '${{ inputs.type }}'.lower() != 'snapshot':
+          exit(0)
+        with open('conf.lua', 'r+', encoding='utf-8') as file:
+          data = file.read()
+          data = data.replace("t.identity='Techmino'--Saving folder", "t.identity='Techmino_Snapshot'--Saving folder")
+          file.seek(0)
+          file.truncate()
+          file.flush()
+          file.write(data)
+    - shell: python
+      run: |
+        from io import open
+        import re
+        with open('version.lua', 'r+', encoding='utf-8') as file:
+          commitHash = '${{ inputs.commit }}'
+          if commitHash != '':
+            commitHash = '@' + commitHash[0:4]
+          data = file.read()
+          data = re.sub('(\d)"', r'\1' + commitHash + '"', data, 1)
+          file.seek(0)
+          file.truncate()
+          file.flush()
+          file.write(data)

.github/build/macOS/info.plist.template

@@ -11,7 +11,7 @@
     <key>CFBundleIconFile</key>
     <string>iconfile</string>
     <key>CFBundleIdentifier</key>
-    <string>org.love2d.MrZ.Techmino</string>
+    <string>@bundleId</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>

.github/workflows/build.yml

@@ -1,112 +0,0 @@
-name: Techmino CI
-
-on:
-  push:
-    branches: [ main, ci* ]
-  pull_request:
-    branches: [ main, ci* ]
-
-jobs:
-  get-info:
-    runs-on: ubuntu-20.04
-    outputs:
-      name: ${{ steps.actual-get-info.outputs.name }}
-      code: ${{ steps.actual-get-info.outputs.code }}
-      commit: ${{ steps.actual-get-info.outputs.commit }}
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install lua
-      run: |
-        sudo apt-get install lua5.3 -y
-    - name: Get Version
-      id: actual-get-info
-      run: |
-        echo "::set-output name=name::$(lua .github/workflows/getVersion.lua -name)"
-        echo "::set-output name=code::$(lua .github/workflows/getVersion.lua -code)"
-        echo "::set-output name=commit::$(git rev-parse --short ${{ GITHUB.SHA }})"
-
-  build-windows:
-    runs-on: windows-latest
-    needs: get-info
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ./.github/actions/snapshot-update
-      with:
-        commit: ${{ needs.get-info.outputs.commit }}
-    - uses: ./.github/actions/build-windows
-      with:
-        love-url: https://github.com/love2d/love/releases/download/11.3/love-11.3-win64.zip
-        love-dir: love-11.3-win64
-        arch: win64
-        version: ${{ needs.get-info.outputs.name }}
-        icon: .\.github\build\Windows\icon_snapshot.ico
-    - name: Upload
-      uses: actions/upload-artifact@v2
-      with:
-        name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_Windows
-        path: love
-
-  build-linux:
-    runs-on: ubuntu-20.04
-    needs: get-info
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ./.github/actions/snapshot-update
-      with:
-        commit: ${{ needs.get-info.outputs.commit }}
-    - uses: ./.github/actions/build-linux
-      with:
-        icon: .github/build/Linux/icon_snapshot.png
-    - name: Upload
-      uses: actions/upload-artifact@v2
-      with:
-        name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_Linux
-        path: Techmino.AppImage
-
-  build-android:
-    runs-on: ubuntu-20.04
-    needs: get-info
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ./.github/actions/snapshot-update
-      with:
-        commit: ${{ needs.get-info.outputs.commit }}
-    - uses: ./.github/actions/build-android
-      with:
-        type: Snapshot
-        code: ${{ needs.get-info.outputs.code }}
-        name: ${{ needs.get-info.outputs.name }}
-        file-path: Techmino_Snapshot.apk
-        SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
-        KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
-        ALIAS: ${{ secrets.ALIAS }}
-        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-    - name: Upload
-      uses: actions/upload-artifact@v2
-      with:
-        name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_Android
-        path: Techmino_Snapshot.apk
-
-  build-macOS:
-    runs-on: macos-10.15
-    needs: get-info
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ./.github/actions/snapshot-update
-      with:
-        commit: ${{ needs.get-info.outputs.commit }}
-    - uses: ./.github/actions/build-macos
-      with:
-        name: ${{ needs.get-info.outputs.name }}
-        icon: .github/build/macOS/icon_snapshot.icns
-        MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-        MACOS_CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }}
-        MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
-    - name: Pack Techmino
-      run: |
-        zip -r -y Techmino.zip Techmino.app
-    - name: Upload
-      uses: actions/upload-artifact@v2
-      with:
-        name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_macOS
-        path: Techmino.zip

.github/workflows/dev.yml

@@ -0,0 +1,203 @@
+name: Techmino Develop CI
+
+on:
+  push:
+    branches: [ main, ci* ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  get-info:
+    runs-on: ubuntu-20.04
+    outputs:
+      name: ${{ steps.actual-get-info.outputs.name }}
+      apkCode: ${{ steps.actual-get-info.outputs.apkCode }}
+      code: ${{ steps.actual-get-info.outputs.code }}
+      commit: ${{ steps.actual-get-info.outputs.commit }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install lua
+      run: |
+        sudo apt-get install lua5.3 -y
+    - name: Get Version
+      id: actual-get-info
+      run: |
+        echo "::set-output name=name::$(lua .github/workflows/getVersion.lua -name)"
+        echo "::set-output name=apkCode::$(lua .github/workflows/getVersion.lua -apkCode)"
+        echo "::set-output name=code::$(lua .github/workflows/getVersion.lua -code)"
+        echo "::set-output name=commit::$(git rev-parse --short ${{ GITHUB.SHA }})"
+
+  automatic-test:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/automatic-test
+
+  build-windows:
+    runs-on: windows-latest
+    needs: get-info
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/update-version
+      with:
+        commit: ${{ needs.get-info.outputs.commit }}
+        type: snapshot
+    - uses: ./.github/actions/build-windows
+      with:
+        love-url: https://github.com/love2d/love/releases/download/11.3/love-11.3-win64.zip
+        love-dir: love-11.3-win64
+        arch: win64
+        version: ${{ needs.get-info.outputs.name }}
+        icon: .\.github\build\Windows\icon_snapshot.ico
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_Windows
+        path: love
+
+  build-linux:
+    runs-on: ubuntu-20.04
+    needs: get-info
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/update-version
+      with:
+        commit: ${{ needs.get-info.outputs.commit }}
+        type: snapshot
+    - uses: ./.github/actions/build-linux
+      with:
+        icon: .github/build/Linux/icon_snapshot.png
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_Linux
+        path: Techmino.AppImage
+
+  build-android:
+    runs-on: ubuntu-20.04
+    needs: get-info
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/update-version
+      with:
+        commit: ${{ needs.get-info.outputs.commit }}
+        type: snapshot
+    - uses: ./.github/actions/build-android
+      with:
+        type: Snapshot
+        apkCode: ${{ needs.get-info.outputs.apkCode }}
+        name: ${{ needs.get-info.outputs.name }}
+        file-path: Techmino_Snapshot.apk
+        SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+        KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
+        ALIAS: ${{ secrets.ALIAS }}
+        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_Android
+        path: Techmino_Snapshot.apk
+  
+  build-android-mini:
+    runs-on: ubuntu-20.04
+    needs: get-info
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/update-version
+      with:
+        commit: ${{ needs.get-info.outputs.commit }}
+        type: snapshot
+    - name: remove media
+      run: |
+        rm -rf media/music media/effect media/vocal
+    - uses: ./.github/actions/build-android
+      with:
+        type: Snapshot
+        apkCode: ${{ needs.get-info.outputs.apkCode }}
+        name: ${{ needs.get-info.outputs.name }}
+        file-path: Techmino_Snapshot_Mini.apk
+        SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+        KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
+        ALIAS: ${{ secrets.ALIAS }}
+        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_Android_Mini
+        path: Techmino_Snapshot_Mini.apk
+
+  build-macOS:
+    runs-on: macos-10.15
+    needs: get-info
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/update-version
+      with:
+        commit: ${{ needs.get-info.outputs.commit }}
+        type: snapshot
+    - uses: ./.github/actions/build-macos
+      with:
+        name: ${{ needs.get-info.outputs.name }}
+        icon: .github/build/macOS/icon_snapshot.icns
+        APPLE_API_ID: '${{ secrets.APPLE_API_ID }}'
+        APPLE_API_ISSUER: '${{ secrets.APPLE_API_ISSUER }}'
+        APPLE_API_KEY: '${{ secrets.APPLE_API_KEY }}'
+        APPLE_APP_IDENTIFIER: '${{ secrets.APPLE_APP_IDENTIFIER }}'
+        APPLE_KEYCHAIN_NAME: '${{ secrets.APPLE_KEYCHAIN_NAME }}'
+        APPLE_KEYCHAIN_PWD: '${{ secrets.APPLE_KEYCHAIN_PWD }}'
+        FASTLANE_MATCH_PWD: '${{ secrets.FASTLANE_MATCH_PWD }}'
+        FASTLANE_MATCH_TOKEN: '${{ secrets.FASTLANE_MATCH_TOKEN }}'
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_macOS
+        path: Techmino.dmg
+
+  build-iOS:
+    runs-on: macos-latest
+    if: (!startsWith( github.ref , 'refs/heads/ci-')) || startsWith( github.ref , 'refs/heads/ci-ios-')
+    needs: get-info
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/update-version
+      with:
+        commit: ${{ needs.get-info.outputs.commit }}
+        type: snapshot
+    - uses: ./.github/actions/build-ios
+      with:
+        name: ${{ needs.get-info.outputs.name }}
+        type: 'dev'
+        APPLE_API_ID: '${{ secrets.APPLE_API_ID }}'
+        APPLE_API_ISSUER: '${{ secrets.APPLE_API_ISSUER }}'
+        APPLE_API_KEY: '${{ secrets.APPLE_API_KEY }}'
+        APPLE_APP_BUILD: '${{ needs.get-info.outputs.code }}.2.${{ github.run_number }}.${{ github.run_attempt }}'
+        APPLE_APP_CHANGELOG: '${{ github.event.commits[0].message }}'
+        APPLE_APP_ID: '${{ secrets.APPLE_APP_ID }}'
+        APPLE_APP_IDENTIFIER: '${{ secrets.APPLE_APP_IDENTIFIER }}'
+        APPLE_APP_PROFILE: '${{ secrets.APPLE_APP_PROFILE }}'
+        APPLE_KEYCHAIN_NAME: '${{ secrets.APPLE_KEYCHAIN_NAME }}'
+        APPLE_KEYCHAIN_PWD: '${{ secrets.APPLE_KEYCHAIN_PWD }}'
+        FASTLANE_ACTION_ID: '${{ github.run_id }}'
+        FASTLANE_DISCORD_WEBHOOK: '${{ secrets.FASTLANE_DISCORD_WEBHOOK }}'
+        FASTLANE_MATCH_PWD: '${{ secrets.FASTLANE_MATCH_PWD }}'
+        FASTLANE_MATCH_TOKEN: '${{ secrets.FASTLANE_MATCH_TOKEN }}'
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_iOS
+        path: Techmino.ipa
+
+  build-love:
+    runs-on: ubuntu-20.04
+    needs: get-info
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/update-version
+    - uses: ./.github/actions/build-love
+      with:
+        file-path: Techmino.love
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_Love
+        path: Techmino.love

.github/workflows/getVersion.lua

@@ -1,28 +1,28 @@
-if arg[1]=="-code"then
+local arg=arg[1]
+if arg=="-apkCode"then
     local code=require"version".apkCode
     print(code)
-elseif arg[1]=="-name"then
-    local str=require"version".string:gsub("@DEV","")
+elseif arg=="-code"then
+    local str=require"version".code
     print(str)
-elseif arg[1]=="-release"then
-    local str=require"version".string:gsub("V","",1):gsub("@DEV","")
+elseif arg=="-name"then
+    local str=require"version".string
     print(str)
-elseif arg[1]=="-updateTitle"then
+elseif arg=="-release"then
+    local str=require"version".string:gsub("V","",1)
+    print(str)
+elseif arg=="-updateTitle"then
     local note=require"parts.updateLog"
     local p1=note:find("\n%d")+1
     local p2=note:find("\n",p1)-1
     note=note:sub(p1,p2)
     print(note)
-elseif arg[1]=="-updateNote"then
+elseif arg=="-updateNote"then
     local note=require"parts.updateLog"
     local p1=note:find("\n",note:find("\n%d")+1)+1
     local p2=note:find("\n%d",p1+1)
     note=note:sub(p1,p2-2)
-    note=note
-        :gsub("                ","_")
-        :gsub("        ","")
-        :gsub("\n([^_])","\n\n%1")
-        :gsub("\n_","\n")
-        :gsub("\n\n","\n",1)
+        :gsub("                ","- ")
+        :gsub("        ","# ")
     print(note)
 end

.github/workflows/release.yml

@@ -3,202 +3,187 @@ name: Techmino Release CI
 on:
   push:
     tags:
-    - '*'
+      - "v*"
 
 jobs:
   get-info:
     runs-on: ubuntu-20.04
     outputs:
       name: ${{ steps.actual-get-info.outputs.name }}
+      apkCode: ${{ steps.actual-get-info.outputs.apkCode }}
       code: ${{ steps.actual-get-info.outputs.code }}
       release: ${{ steps.actual-get-info.outputs.release }}
       updateTitle: ${{ steps.actual-get-info.outputs.updateTitle }}
+      updateNote: ${{ steps.actual-get-info.outputs.updateNote }}
       commit: ${{ steps.actual-get-info.outputs.commit }}
     steps:
-    - uses: actions/checkout@v2
-    - name: Install lua
-      run: |
-        sudo apt-get install lua5.3 -y
-    - name: Get Version
-      id: actual-get-info
-      run: |
-        echo "::set-output name=name::$(lua .github/workflows/getVersion.lua -name)"
-        echo "::set-output name=code::$(lua .github/workflows/getVersion.lua -code)"
-        echo "::set-output name=release::$(lua .github/workflows/getVersion.lua -release)"
-        echo "::set-output name=updateTitle::$(lua .github/workflows/getVersion.lua -updateTitle)"
-        echo "::set-output name=commit::$(git rev-parse --short ${{ GITHUB.SHA }})"
+      - uses: actions/checkout@v2
+      - name: Install lua
+        run: |
+          sudo apt-get install lua5.3 -y
+      - name: Get Version
+        id: actual-get-info
+        run: |
+          UPDATE_NOTE=$(lua .github/workflows/getVersion.lua -updateNote)
+          UPDATE_NOTE="${UPDATE_NOTE//'%'/'%25'}"
+          UPDATE_NOTE="${UPDATE_NOTE//$'\n'/'%0A'}"
+          UPDATE_NOTE="${UPDATE_NOTE//$'\r'/'%0D'}"
+          echo "::set-output name=name::$(lua .github/workflows/getVersion.lua -name)"
+          echo "::set-output name=apkCode::$(lua .github/workflows/getVersion.lua -apkCode)"
+          echo "::set-output name=code::$(lua .github/workflows/getVersion.lua -code)"
+          echo "::set-output name=release::$(lua .github/workflows/getVersion.lua -release)"
+          echo "::set-output name=updateTitle::$(lua .github/workflows/getVersion.lua -updateTitle)"
+          echo "::set-output name=updateNote::$UPDATE_NOTE"
+          echo "::set-output name=commit::$(git rev-parse --short ${{ GITHUB.SHA }})"
 
   build-windows-x64:
     runs-on: windows-latest
     needs: get-info
     steps:
-    - uses: actions/checkout@v2
-    - name: Update Version
-      run: |
-        python .\.github\workflows\updateVersion.py -T Version
-    - uses: ./.github/actions/build-windows
-      with:
-        love-url: https://github.com/love2d/love/releases/download/11.3/love-11.3-win64.zip
-        love-dir: love-11.3-win64
-        arch: win64
-        version: ${{ needs.get-info.outputs.release }}
-        icon: .\.github\build\Windows\icon.ico
-    - name: Pack Techmino
-      run: 7z a -tzip .\Techmino.a${{ needs.get-info.outputs.release }}.Win64.zip .\love
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      with:
-        name: ${{ needs.get-info.outputs.updateTitle }}
-        files: Techmino.a${{ needs.get-info.outputs.release }}.Win64.zip
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/update-version
+      - uses: ./.github/actions/build-windows
+        with:
+          love-url: https://github.com/love2d/love/releases/download/11.3/love-11.3-win64.zip
+          love-dir: love-11.3-win64
+          arch: win64
+          version: ${{ needs.get-info.outputs.release }}
+          icon: .\.github\build\Windows\icon.ico
+      - name: Pack Techmino
+        run: 7z a -tzip .\Techmino_a${{ needs.get-info.outputs.release }}_Win64.zip .\love
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          name: ${{ needs.get-info.outputs.updateTitle }}
+          files: Techmino_a${{ needs.get-info.outputs.release }}_Win64.zip
 
   build-windows-x86:
     runs-on: windows-latest
     needs: get-info
     steps:
-    - uses: actions/checkout@v2
-    - name: Update Version
-      run: |
-        python .\.github\workflows\updateVersion.py -T Version
-    - uses: ./.github/actions/build-windows
-      with:
-        love-url: https://github.com/love2d/love/releases/download/11.3/love-11.3-win32.zip
-        love-dir: love-11.3-win32
-        arch: win32
-        version: ${{ needs.get-info.outputs.release }}
-        icon: .\.github\build\Windows\icon.ico
-    - name: Pack Techmino
-      run: 7z a -tzip .\Techmino.a${{ needs.get-info.outputs.release }}.Win32.zip .\love
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      with:
-        name: ${{ needs.get-info.outputs.updateTitle }}
-        files: Techmino.a${{ needs.get-info.outputs.release }}.Win32.zip
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/update-version
+      - uses: ./.github/actions/build-windows
+        with:
+          love-url: https://github.com/love2d/love/releases/download/11.3/love-11.3-win32.zip
+          love-dir: love-11.3-win32
+          arch: win32
+          version: ${{ needs.get-info.outputs.release }}
+          icon: .\.github\build\Windows\icon.ico
+      - name: Pack Techmino
+        run: 7z a -tzip .\Techmino_a${{ needs.get-info.outputs.release }}_Win32.zip .\love
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          name: ${{ needs.get-info.outputs.updateTitle }}
+          files: Techmino_a${{ needs.get-info.outputs.release }}_Win32.zip
 
   build-linux:
     runs-on: ubuntu-20.04
     needs: get-info
     steps:
-    - uses: actions/checkout@v2
-    - name: Update Version
-      run: |
-        python3 .github/workflows/updateVersion.py -T Version
-    - uses: ./.github/actions/build-linux
-      with:
-        file-path: Techmino.a${{ needs.get-info.outputs.release }}.AppImage
-        icon: .github/build/Linux/icon.png
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      with:
-        name: ${{ needs.get-info.outputs.updateTitle }}
-        files: Techmino.a${{ needs.get-info.outputs.release }}.AppImage
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/update-version
+      - uses: ./.github/actions/build-linux
+        with:
+          file-path: Techmino_a${{ needs.get-info.outputs.release }}_Linux.AppImage
+          icon: .github/build/Linux/icon.png
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          name: ${{ needs.get-info.outputs.updateTitle }}
+          files: Techmino_a${{ needs.get-info.outputs.release }}_Linux.AppImage
 
   build-android:
     runs-on: ubuntu-20.04
     needs: get-info
     steps:
-    - uses: actions/checkout@v2
-    - name: Update Version
-      run: |
-        python3 .github/workflows/updateVersion.py -T Version
-    - uses: ./.github/actions/build-android
-      with:
-        type: Release
-        code: ${{ needs.get-info.outputs.code }}
-        name: ${{ needs.get-info.outputs.name }}
-        file-path: Techmino.a${{ needs.get-info.outputs.Version }}.apk
-        SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
-        KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
-        ALIAS: ${{ secrets.ALIAS }}
-        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      with:
-        name: ${{ needs.get-info.outputs.updateTitle }}
-        files: Techmino.a${{ needs.get-info.outputs.Version }}.apk
-
-  build-android-mini:
-    runs-on: ubuntu-20.04
-    needs: get-info
-    steps:
-    - uses: actions/checkout@v2
-    - name: Update Version
-      run: |
-        python3 .github/workflows/updateVersion.py -T Version
-    - name: remove media
-      run: |
-        rm -rf media/music media/effect media/vocal
-    - uses: ./.github/actions/build-android
-      with:
-        type: Release
-        code: ${{ needs.get-info.outputs.code }}
-        name: ${{ needs.get-info.outputs.name }}
-        file-path: Techmino.a${{ needs.get-info.outputs.Version }}.mini.apk
-        SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
-        KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
-        ALIAS: ${{ secrets.ALIAS }}
-        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      with:
-        name: ${{ needs.get-info.outputs.updateTitle }}
-        files: Techmino.a${{ needs.get-info.outputs.Version }}.mini.apk
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/update-version
+      - uses: ./.github/actions/build-android
+        with:
+          type: Release
+          apkCode: ${{ needs.get-info.outputs.apkCode }}
+          name: ${{ needs.get-info.outputs.name }}
+          file-path: Techmino_a${{ needs.get-info.outputs.release }}_Android.apk
+          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+          KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
+          ALIAS: ${{ secrets.ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          name: ${{ needs.get-info.outputs.updateTitle }}
+          files: Techmino_a${{ needs.get-info.outputs.release }}_Android.apk
 
   build-macOS:
     runs-on: macos-10.15
     needs: get-info
     steps:
-    - uses: actions/checkout@v2
-    - name: Update Version
-      run: |
-        python3 .github/workflows/updateVersion.py -T Version
-    - uses: ./.github/actions/build-macos
-      with:
-        name: ${{ needs.get-info.outputs.name }}
-        icon: .github/build/macOS/icon.icns
-        MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-        MACOS_CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }}
-        MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
-    - name: Pack Techmino
-      run: |
-        zip -r -y Techmino.a${{ needs.get-info.outputs.Version }}.macOS.zip Techmino.app ".github/build/macOS/打不开？Can’t open the App？.pdf"
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      with:
-        name: ${{ needs.get-info.outputs.updateTitle }}
-        files: Techmino.a${{ needs.get-info.outputs.Version }}.macOS.zip
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/update-version
+      - uses: ./.github/actions/build-macos
+        with:
+          name: ${{ needs.get-info.outputs.name }}
+          icon: .github/build/macOS/icon.icns
+          APPLE_API_ID: "${{ secrets.APPLE_API_ID }}"
+          APPLE_API_ISSUER: "${{ secrets.APPLE_API_ISSUER }}"
+          APPLE_API_KEY: "${{ secrets.APPLE_API_KEY }}"
+          APPLE_APP_IDENTIFIER: "${{ secrets.APPLE_APP_IDENTIFIER }}"
+          APPLE_KEYCHAIN_NAME: "${{ secrets.APPLE_KEYCHAIN_NAME }}"
+          APPLE_KEYCHAIN_PWD: "${{ secrets.APPLE_KEYCHAIN_PWD }}"
+          FASTLANE_MATCH_PWD: "${{ secrets.FASTLANE_MATCH_PWD }}"
+          FASTLANE_MATCH_TOKEN: "${{ secrets.FASTLANE_MATCH_TOKEN }}"
+      - name: Pack Techmino
+        run: |
+          mv Techmino.dmg Techmino_a${{ needs.get-info.outputs.release }}_MacOS.dmg
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          name: ${{ needs.get-info.outputs.updateTitle }}
+          files: Techmino_a${{ needs.get-info.outputs.release }}_MacOS.dmg
 
-  build-love:
-    runs-on: ubuntu-20.04
+  build-iOS:
+    runs-on: macos-latest
     needs: get-info
     steps:
-    - uses: actions/checkout@v2
-    - name: Update Version
-      run: |
-        python3 .github/workflows/updateVersion.py -T Version
-    - uses: ./.github/actions/build-love
-      with:
-        file-path: Techmino.a${{ needs.get-info.outputs.release }}.love
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      with:
-        name: ${{ needs.get-info.outputs.updateTitle }}
-        files: Techmino.a${{ needs.get-info.outputs.release }}.love
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/update-version
+      - uses: ./.github/actions/build-ios
+        with:
+          name: ${{ needs.get-info.outputs.name }}
+          type: "release"
+          APPLE_API_ID: "${{ secrets.APPLE_API_ID }}"
+          APPLE_API_ISSUER: "${{ secrets.APPLE_API_ISSUER }}"
+          APPLE_API_KEY: "${{ secrets.APPLE_API_KEY }}"
+          APPLE_APP_BUILD: "${{ needs.get-info.outputs.code }}.0.${{ github.run_number }}.${{ github.run_attempt }}"
+          APPLE_APP_CHANGELOG: "${{ needs.get-info.outputs.updateNote }}"
+          APPLE_APP_ID: "${{ secrets.APPLE_APP_ID }}"
+          APPLE_APP_IDENTIFIER: "${{ secrets.APPLE_APP_IDENTIFIER }}"
+          APPLE_APP_PROFILE: "${{ secrets.APPLE_APP_PROFILE }}"
+          APPLE_KEYCHAIN_NAME: "${{ secrets.APPLE_KEYCHAIN_NAME }}"
+          APPLE_KEYCHAIN_PWD: "${{ secrets.APPLE_KEYCHAIN_PWD }}"
+          FASTLANE_ACTION_ID: "${{ github.run_id }}"
+          FASTLANE_DISCORD_WEBHOOK: "${{ secrets.FASTLANE_DISCORD_WEBHOOK }}"
+          FASTLANE_MATCH_PWD: "${{ secrets.FASTLANE_MATCH_PWD }}"
+          FASTLANE_MATCH_TOKEN: "${{ secrets.FASTLANE_MATCH_TOKEN }}"
+      - name: Rename ipa
+        shell: bash
+        run: |
+          mv Techmino.ipa Techmino_a${{ needs.get-info.outputs.release }}_iOS.ipa
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          name: ${{ needs.get-info.outputs.updateTitle }}
+          files: Techmino_a${{ needs.get-info.outputs.release }}_iOS.ipa
 
   Add-Release-note:
     runs-on: ubuntu-20.04
     needs: get-info
     steps:
-    - uses: actions/checkout@v2
-    - name: Install lua
-      run: |
-        sudo apt-get update -y
-        sudo apt-get upgrade -y
-        sudo apt-get install lua5.3 -y
-    - name: Get ReleaseNote
-      run: |
-        lua .github/workflows/getVersion.lua -updateNote > updateNote.txt
-    - name: Release
-      uses: softprops/action-gh-release@v1
-      with:
-        name: ${{ needs.get-info.outputs.updateTitle }}
-        body_path: updateNote.txt
+      - uses: actions/checkout@v2
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          name: ${{ needs.get-info.outputs.updateTitle }}
+          body: ${{ needs.get-info.outputs.updateNote }}

.github/workflows/test.yml

@@ -0,0 +1,154 @@
+name: Techmino Test CI
+
+on:
+  push:
+    tags:
+      - 'pre*'
+
+jobs:
+  get-info:
+    runs-on: ubuntu-20.04
+    outputs:
+      name: ${{ steps.actual-get-info.outputs.name }}
+      apkCode: ${{ steps.actual-get-info.outputs.apkCode }}
+      code: ${{ steps.actual-get-info.outputs.code }}
+      release: ${{ steps.actual-get-info.outputs.release }}
+      commit: ${{ steps.actual-get-info.outputs.commit }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install lua
+      run: |
+        sudo apt-get install lua5.3 -y
+    - name: Get Version
+      id: actual-get-info
+      run: |
+        echo "::set-output name=name::$(lua .github/workflows/getVersion.lua -name)"
+        echo "::set-output name=apkCode::$(lua .github/workflows/getVersion.lua -apkCode)"
+        echo "::set-output name=code::$(lua .github/workflows/getVersion.lua -code)"
+        echo "::set-output name=release::$(lua .github/workflows/getVersion.lua -release)"
+        echo "::set-output name=commit::$(git rev-parse --short ${{ GITHUB.SHA }})"
+
+  build-windows:
+    runs-on: windows-latest
+    needs: get-info
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/update-version
+      with:
+        commit: ${{ needs.get-info.outputs.commit }}
+        type: snapshot
+    - uses: ./.github/actions/build-windows
+      with:
+        love-url: https://github.com/love2d/love/releases/download/11.3/love-11.3-win64.zip
+        love-dir: love-11.3-win64
+        arch: win64
+        version: ${{ needs.get-info.outputs.name }}
+        icon: .\.github\build\Windows\icon_snapshot.ico
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_Windows
+        path: love
+    
+  build-linux:
+    runs-on: ubuntu-20.04
+    needs: get-info
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/update-version
+      with:
+        commit: ${{ needs.get-info.outputs.commit }}
+        type: snapshot
+    - uses: ./.github/actions/build-linux
+      with:
+        icon: .github/build/Linux/icon_snapshot.png
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_Linux
+        path: Techmino.AppImage
+
+  build-android:
+    runs-on: ubuntu-20.04
+    needs: get-info
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/update-version
+      with:
+        commit: ${{ needs.get-info.outputs.commit }}
+        type: snapshot
+    - uses: ./.github/actions/build-android
+      with:
+        type: Snapshot
+        apkCode: ${{ needs.get-info.outputs.apkCode }}
+        name: ${{ needs.get-info.outputs.name }}
+        file-path: Techmino_Snapshot.apk
+        SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+        KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
+        ALIAS: ${{ secrets.ALIAS }}
+        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_Android
+        path: Techmino_Snapshot.apk
+
+  build-macOS:
+    runs-on: macos-10.15
+    needs: get-info
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/update-version
+      with:
+        commit: ${{ needs.get-info.outputs.commit }}
+        type: snapshot
+    - uses: ./.github/actions/build-macos
+      with:
+        name: ${{ needs.get-info.outputs.name }}
+        icon: .github/build/macOS/icon_snapshot.icns
+        APPLE_API_ID: '${{ secrets.APPLE_API_ID }}'
+        APPLE_API_ISSUER: '${{ secrets.APPLE_API_ISSUER }}'
+        APPLE_API_KEY: '${{ secrets.APPLE_API_KEY }}'
+        APPLE_APP_IDENTIFIER: '${{ secrets.APPLE_APP_IDENTIFIER }}'
+        APPLE_KEYCHAIN_NAME: '${{ secrets.APPLE_KEYCHAIN_NAME }}'
+        APPLE_KEYCHAIN_PWD: '${{ secrets.APPLE_KEYCHAIN_PWD }}'
+        FASTLANE_MATCH_PWD: '${{ secrets.FASTLANE_MATCH_PWD }}'
+        FASTLANE_MATCH_TOKEN: '${{ secrets.FASTLANE_MATCH_TOKEN }}'
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_MacOS
+        path: Techmino.dmg
+
+  build-iOS:
+    runs-on: macos-latest
+    needs: get-info
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/update-version
+      with:
+        commit: ${{ needs.get-info.outputs.commit }}
+        type: snapshot
+    - uses: ./.github/actions/build-ios
+      with:
+        name: ${{ needs.get-info.outputs.name }}
+        type: 'test'
+        APPLE_API_ID: '${{ secrets.APPLE_API_ID }}'
+        APPLE_API_ISSUER: '${{ secrets.APPLE_API_ISSUER }}'
+        APPLE_API_KEY: '${{ secrets.APPLE_API_KEY }}'
+        APPLE_APP_BUILD: '${{ needs.get-info.outputs.code }}.1.${{ github.run_number }}.${{ github.run_attempt }}'
+        APPLE_APP_CHANGELOG: '${{ github.event.commits[0].message }}'
+        APPLE_APP_ID: '${{ secrets.APPLE_APP_ID }}'
+        APPLE_APP_IDENTIFIER: '${{ secrets.APPLE_APP_IDENTIFIER }}'
+        APPLE_APP_PROFILE: '${{ secrets.APPLE_APP_PROFILE }}'
+        APPLE_KEYCHAIN_NAME: '${{ secrets.APPLE_KEYCHAIN_NAME }}'
+        APPLE_KEYCHAIN_PWD: '${{ secrets.APPLE_KEYCHAIN_PWD }}'
+        FASTLANE_ACTION_ID: '${{ github.run_id }}'
+        FASTLANE_DISCORD_WEBHOOK: '${{ secrets.FASTLANE_DISCORD_WEBHOOK }}'
+        FASTLANE_MATCH_PWD: '${{ secrets.FASTLANE_MATCH_PWD }}'
+        FASTLANE_MATCH_TOKEN: '${{ secrets.FASTLANE_MATCH_TOKEN }}'
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: Techmino_pre${{ needs.get-info.outputs.release }}_${{ needs.get-info.outputs.commit }}_iOS
+        path: Techmino.ipa

.github/workflows/updateVersion.py

@@ -1,97 +0,0 @@
-import argparse
-
-def updateConf():   #更新存档位置
-    with open('conf.lua', 'r+', encoding='utf-8') as file:
-        data = file.read()
-        data = data.replace("t.identity='Techmino'--Saving folder", "t.identity='Techmino_Snapshot'--Saving folder")
-        file.seek(0)
-        file.truncate()
-        file.flush()
-        file.write(data)
-
-def updateVersion(args):    #更新版本号
-    with open('version.lua', 'r+', encoding='utf-8') as file:
-        data = file.read()
-        if args.Hash != False:
-            data = data.replace('@DEV', f'@{args.Hash[0:4]}')
-        else:
-            data = data.replace('@DEV', '')
-        file.seek(0)
-        file.truncate()
-        file.flush()
-        file.write(data)
-
-def updateMacOS(args):  #更新macOS打包信息
-    import datetime
-    thisYear = str(datetime.datetime.today().year)
-    with open('./.github/build/macOS/info.plist.template', 'r', encoding='utf-8') as file:
-        data = file.read()
-        data = data\
-            .replace('@versionName', args.Name)\
-            .replace('@thisYear', thisYear)
-    with open('./Techmino.app/Contents/info.plist', 'w+', encoding='utf-8') as file:
-        file.write(data)
-
-def updateWindows(args):    #更新Windows打包信息
-    Version = (args.Name).replace('V', '')
-    FileVersion = (f"{Version.replace('.', ',')},0")
-    with open('./.github/build/Windows/Techmino.rc.template', 'r', encoding='utf8') as file:
-        data = file.read()
-        data = data\
-            .replace('@FileVersion', FileVersion)\
-            .replace('@Version', Version)
-    with open('Techmino.rc', 'w+', encoding='utf8') as file:
-        file.write(data)
-
-def updateAndroid(args, edition):    #更新Android打包信息
-    if edition == 'Release':
-        appName = 'Techmino'
-        packageName = 'org.love2d.MrZ.Techmino'
-        edition = 'release'
-    elif edition == 'Snapshot':
-        appName = 'Techmino_Snapshot'
-        packageName = 'org.love2d.MrZ.Techmino.Snapshot'
-        edition = 'snapshot'
-    with open('./love-android/app/src/main/AndroidManifest.xml', "r+", encoding='utf-8') as file:
-        data = file.read()
-        data = data\
-            .replace('@appName', appName)\
-            .replace('@edition', edition)
-        file.seek(0)
-        file.truncate()
-        file.write(data)
-    with open("./love-android/app/build.gradle", "r+", encoding='utf-8') as file:
-        data = file.read()
-        data = data\
-            .replace('@packageName', packageName)\
-            .replace('@versionCode', args.Code)\
-            .replace('@versionName', args.Name)\
-            .replace('@storePassword', args.Store)\
-            .replace('@keyAlias', args.Alias)\
-            .replace('@keyPassword', args.Key)
-        file.seek(0)
-        file.truncate()
-        file.write(data)
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description='用于CI更新程序各类信息')
-    parser.add_argument('-T', '--Type', type=str, help = '更新的种类')
-    parser.add_argument('-H', '--Hash', type=str, default = False, help = 'Github提交Hash')
-    parser.add_argument('-C', '--Code', type=str, default = False, help = 'versionCode')
-    parser.add_argument('-N', '--Name', type=str, default = False, help = 'versionName')
-    parser.add_argument('-S', '--Store', type=str, default = False, help = 'storePassword')
-    parser.add_argument('-A', '--Alias', type=str, default = False, help = 'keyAlias')
-    parser.add_argument('-K', '--Key', type=str, default = False, help = 'keyPassword')
-    args = parser.parse_args()
-    if args.Type == 'Conf':
-        updateConf()
-    elif args.Type == 'Version':
-        updateVersion(args)
-    elif args.Type == 'Windows':
-        updateWindows(args)
-    elif args.Type == 'macOS':
-        updateMacOS(args)
-    elif args.Type == 'AndroidRelease':
-        updateAndroid(args, 'Release')
-    elif args.Type == 'AndroidSnapshot':
-        updateAndroid(args, 'Snapshot')

.gitignore

@@ -1,3 +1,8 @@
 .vscode
 libAndroid
-*.ini
+*.ini
+.DS_Store
+Thumbs.db
+Icon?
+.Trash
+.file

Zframework/background.lua

@@ -4,8 +4,9 @@ local BGs={
 }
 local BGlist={'none'}
 local BG={
-    cur='none',
     default='none',
+    locked=false,
+    cur='none',
     init=false,
     resize=false,
     update=NULL,
@@ -14,6 +15,8 @@ local BG={
     discard=NULL,
 }
 
+function BG.lock()BG.locked=true end
+function BG.unlock()BG.locked=false end
 function BG.add(name,bg)
     BGs[name]=bg
     BGlist[#BGlist+1]=name
@@ -21,6 +24,9 @@ end
 function BG.getList()
     return BGlist
 end
+function BG.remList(name)
+    table.remove(BGlist,TABLE.find(BGlist,name))
+end
 function BG.send(...)
     if BG.event then
         BG.event(...)
@@ -29,20 +35,20 @@ end
 function BG.setDefault(bg)
     BG.default=bg
 end
-function BG.set(background)
-    background=background or BG.default
-    if not BGs[background]or not SETTING.bg then return end
-    if background~=BG.cur then
+function BG.set(name)
+    name=name or BG.default
+    if not BGs[name]or BG.locked then return end
+    if name~=BG.cur then
         BG.discard()
-        BG.cur=background
-        background=BGs[background]
+        BG.cur=name
+        local bg=BGs[name]
 
-        BG.init=   background.init or NULL
-        BG.resize= background.resize or NULL
-        BG.update= background.update or NULL
-        BG.draw=   background.draw or NULL
-        BG.event=  background.event or NULL
-        BG.discard=background.discard or NULL
+        BG.init=   bg.init or NULL
+        BG.resize= bg.resize or NULL
+        BG.update= bg.update or NULL
+        BG.draw=   bg.draw or NULL
+        BG.event=  bg.event or NULL
+        BG.discard=bg.discard or NULL
         BG.init()
     end
     return true

Zframework/bgm.lua

@@ -1,19 +1,78 @@
+local lastLoaded={}
+local maxLoadedCount=3
+local nameList={}
+local SourceObjList={}
+local volume=1
+
 local BGM={
-    vol=1,
     default=false,
-    getList=function()error("Cannot getList before initialize!")end,
-    getCount=function()return 0 end,
-    play=NULL,
-    stop=NULL,
     onChange=NULL,
     --nowPlay=[str:playing ID]
     --playing=[src:playing SRC]
     --lastPlayed=[str:lastPlayed ID]
 }
+
+function BGM.getList()return nameList end
+function BGM.getCount()return #nameList end
+local function _addFile(name,path)
+    if not SourceObjList[name]then
+        table.insert(nameList,name)
+        SourceObjList[name]={path=path,source=false}
+    end
+end
+function BGM.load(name,path)
+    if type(name)=='table'then
+        for k,v in next,name do
+            _addFile(k,v)
+        end
+    else
+        _addFile(name,path)
+    end
+    table.sort(nameList)
+    LOG(BGM.getCount().." BGM files added")
+end
+
+local function _tryReleaseSources()
+    local n=#lastLoaded
+    while #lastLoaded>maxLoadedCount do
+        local name=lastLoaded[n]
+        if SourceObjList[name].source:isPlaying()then
+            n=n-1
+            if n<=0 then return end
+        else
+            SourceObjList[name].source=SourceObjList[name].source:release()and nil
+            table.remove(lastLoaded,n)
+            return
+        end
+    end
+end
+function BGM.setDefault(bgm)
+    BGM.default=bgm
+end
+function BGM.setMaxSources(count)
+    maxLoadedCount=count
+    _tryReleaseSources()
+end
+function BGM.setChange(func)
+    BGM.onChange=func
+end
+function BGM.setVol(v)
+    assert(type(v)=='number'and v>=0 and v<=1,'Wrong volume')
+    volume=v
+    if BGM.playing then
+        if volume>0 then
+            BGM.playing:setVolume(volume)
+            BGM.playing:play()
+        elseif BGM.nowPlay then
+            BGM.playing:pause()
+        end
+    end
+end
+
 local function task_fadeOut(src)
     while true do
         coroutine.yield()
-        local v=src:getVolume()-.025*BGM.vol
+        local v=src:getVolume()-.025*volume
         src:setVolume(v>0 and v or 0)
         if v<=0 then
             src:pause()
@@ -24,10 +83,10 @@ end
 local function task_fadeIn(src)
     while true do
         coroutine.yield()
-        local v=BGM.vol
+        local v=volume
         v=math.min(v,src:getVolume()+.025*v)
         src:setVolume(v)
-        if v>=BGM.vol then
+        if v>=volume then
             return true
         end
     end
@@ -35,110 +94,89 @@ end
 local function check_curFadeOut(task,code,src)
     return task.code==code and task.args[1]==src
 end
-function BGM.setDefault(bgm)
-    BGM.default=bgm
-end
-function BGM.setChange(func)
-    BGM.onChange=func
-end
-function BGM.setVol(v)
-    assert(type(v)=='number'and v>=0 and v<=1)
-    BGM.vol=v
-end
-function BGM.init(list)
-    BGM.init=nil
-    local Sources={}
-
-    local simpList={}
-    for _,v in next,list do
-        table.insert(simpList,v.name)
-        Sources[v.name]=v.path
-    end
-    table.sort(simpList)
-    function BGM.getList()return simpList end
-    local count=#simpList
-    function BGM.getCount()return count end
-
-    local function _load(name)
-        if type(Sources[name])=='string'then
-            if love.filesystem.getInfo(Sources[name])then
-                Sources[name]=love.audio.newSource(Sources[name],'stream')
-                Sources[name]:setLooping(true)
-                Sources[name]:setVolume(0)
-                return true
-            else
-                LOG("No BGM: "..Sources[name],5)
-            end
-        elseif Sources[name]then
+local function _tryLoad(name)
+    if SourceObjList[name]then
+        if SourceObjList[name].source then
             return true
-        elseif name then
-            LOG("No BGM: "..name,5)
-        end
-    end
-    function BGM.setVol(v)
-        assert(type(v)=='number'and v>=0 and v<=1)
-        BGM.vol=v
-        if BGM.playing then
-            if BGM.vol>0 then
-                BGM.playing:setVolume(BGM.vol)
-                BGM.playing:play()
-            elseif BGM.nowPlay then
-                BGM.playing:pause()
-            end
-        end
-    end
-    function BGM.loadAll()--Not neccessary, unless you want avoid the lag when playing something for the first time
-        for name in next,Sources do
-            _load(name)
-        end
-    end
-    function BGM.play(name)
-        name=name or BGM.default
-        if not _load(name)then return end
-        if BGM.vol==0 then
-            BGM.nowPlay=name
-            BGM.playing=Sources[name]
+        elseif love.filesystem.getInfo(SourceObjList[name].path)then
+            SourceObjList[name].source=love.audio.newSource(SourceObjList[name].path,'stream')
+            SourceObjList[name].source:setVolume(0)
+            table.insert(lastLoaded,1,name)
+            _tryReleaseSources()
             return true
+        else
+            LOG("No BGM: "..SourceObjList[name],5)
         end
-        if name and Sources[name]then
-            if BGM.nowPlay~=name then
-                if BGM.nowPlay then
+    elseif name then
+        LOG("No BGM: "..name,5)
+    end
+end
+function BGM.play(name,args)
+    name=name or BGM.default
+    args=args or""
+    if not _tryLoad(name)or args:sArg('-preLoad')then return end
+    if volume==0 then
+        BGM.nowPlay=name
+        BGM.playing=SourceObjList[name].source
+        return true
+    end
+    if name and SourceObjList[name].source then
+        if BGM.nowPlay~=name then
+            if BGM.nowPlay then
+                if not args:sArg('-sdout')then
                     TASK.new(task_fadeOut,BGM.playing)
+                else
+                    BGM.playing:pause()
                 end
-                TASK.removeTask_iterate(check_curFadeOut,task_fadeOut,Sources[name])
-                TASK.removeTask_code(task_fadeIn)
-
-                TASK.new(task_fadeIn,Sources[name])
-                BGM.nowPlay=name
-                BGM.playing=Sources[name]
-                BGM.lastPlayed=BGM.nowPlay
-                BGM.playing:seek(0)
-                BGM.playing:play()
-                BGM.onChange(name)
             end
-            return true
-        end
-    end
-    function BGM.seek(t)
-        if BGM.playing then
-            BGM.playing:seek(t)
-        end
-    end
-    function BGM.continue()
-        if BGM.lastPlayed then
-            BGM.nowPlay,BGM.playing=BGM.lastPlayed,Sources[BGM.lastPlayed]
-            TASK.removeTask_iterate(check_curFadeOut,task_fadeOut,Sources[BGM.nowPlay])
+            TASK.removeTask_iterate(check_curFadeOut,task_fadeOut,SourceObjList[name].source)
             TASK.removeTask_code(task_fadeIn)
-            TASK.new(task_fadeIn,BGM.playing)
+
+            BGM.nowPlay=name
+            BGM.playing=SourceObjList[name].source
+            if not args:sArg('-sdin')then
+                BGM.playing:setVolume(0)
+                TASK.new(task_fadeIn,BGM.playing)
+            else
+                BGM.playing:setVolume(volume)
+                BGM.playing:play()
+            end
+            SourceObjList[name].source:setLooping(not args:sArg('-noloop'))
+            BGM.lastPlayed=BGM.nowPlay
+            BGM.playing:seek(0)
             BGM.playing:play()
+            BGM.onChange(name)
         end
+        return true
     end
-    function BGM.stop()
+end
+function BGM.seek(t)
+    if BGM.playing then
+        BGM.playing:seek(t)
+    end
+end
+function BGM.isPlaying()
+    return BGM.playing and BGM.playing:isPlaying()
+end
+function BGM.continue()
+    if BGM.lastPlayed then
+        BGM.nowPlay,BGM.playing=BGM.lastPlayed,SourceObjList[BGM.lastPlayed].source
+        TASK.removeTask_iterate(check_curFadeOut,task_fadeOut,SourceObjList[BGM.nowPlay].source)
         TASK.removeTask_code(task_fadeIn)
+        TASK.new(task_fadeIn,BGM.playing)
+        BGM.playing:play()
+    end
+end
+function BGM.stop(args)
+    args=args or""
+    TASK.removeTask_code(task_fadeIn)
+    if not args:sArg('-s')then
         if BGM.nowPlay then
             TASK.new(task_fadeOut,BGM.playing)
         end
-        BGM.nowPlay,BGM.playing=nil
+    elseif BGM.playing then
+        BGM.playing:pause()
     end
+    BGM.nowPlay,BGM.playing=nil
 end
 return BGM

Zframework/color.lua

@@ -1,66 +1,88 @@
+local abs=math.abs
+local function hsv(h,s,v,a)--Color type, Color amount, Light
+    if s<=0 then return v,v,v,a end
+    h=h*6
+    local c=v*s
+    local x=abs((h-1)%2-1)*c
+    if h<1     then return v,x+v-c,v-c,a
+    elseif h<2 then return x+v-c,v,v-c,a
+    elseif h<3 then return v-c,v,x+v-c,a
+    elseif h<4 then return v-c,x+v-c,v,a
+    elseif h<5 then return x+v-c,v-c,v,a
+    else            return v,v-c,x+v-c,a
+    end
+end
+
 local COLOR={
-    red=     {.92,    .12,    .12},
-    fire=    {.92,    0.4,    .12},
-    orange=  {.92,    0.6,    .12},
-    yellow=  {.92,    .92,    .12},
-    lime=    {0.7,    .92,    .12},
-    jade=    {0.5,    .92,    .12},
-    green=   {.12,    .92,    .12},
-    aqua=    {.12,    .92,    0.6},
-    cyan=    {.12,    .92,    .92},
-    navy=    {.12,    0.7,    .92},
-    sea=     {.12,    0.4,    .92},
-    blue=    {0.2,    0.2,    .92},
-    violet=  {0.4,    .12,    .92},
-    purple=  {0.7,    .12,    .92},
-    magenta= {.92,    .12,    .92},
-    wine=    {.92,    .12,    0.5},
+    hsv=hsv,
 
-    lRed=    {.95,    0.5,    0.5},
-    lFire=   {.95,    0.7,    0.5},
-    lOrange= {.95,    0.8,    0.3},
-    lYellow= {.95,    .95,    0.5},
-    lLime=   {0.8,    .95,    0.4},
-    lJade=   {0.6,    .95,    0.4},
-    lGreen=  {0.5,    .95,    0.5},
-    lAqua=   {0.4,    .95,    0.7},
-    lCyan=   {0.5,    .95,    .95},
-    lNavy=   {0.4,    .85,    .95},
-    lSea=    {0.5,    0.7,    .95},
-    lBlue=   {0.7,    0.7,    .95},
-    lViolet= {0.7,    0.4,    .95},
-    lPurple= {0.8,    0.4,    .95},
-    lMagenta={.95,    0.5,    .95},
-    lWine=   {.95,    0.4,    0.7},
+    red=        {hsv(0.00, 0.89, 0.91)},
+    fire=       {hsv(0.04, 0.93, 0.94)},
+    orange=     {hsv(0.09, 0.99, 0.96)},
+    yellow=     {hsv(0.15, 0.82, 0.90)},
+    lime=       {hsv(0.20, 0.89, 0.88)},
+    jade=       {hsv(0.25, 1.00, 0.82)},
+    green=      {hsv(0.33, 1.00, 0.81)},
+    aqua=       {hsv(0.47, 1.00, 0.76)},
+    cyan=       {hsv(0.53, 1.00, 0.88)},
+    navy=       {hsv(0.56, 1.00, 1.00)},
+    sea=        {hsv(0.61, 1.00, 1.00)},
+    blue=       {hsv(0.64, 1.00, 0.95)},
+    violet=     {hsv(0.74, 1.00, 0.91)},
+    purple=     {hsv(0.80, 1.00, 0.81)},
+    magenta=    {hsv(0.86, 1.00, 0.78)},
+    wine=       {hsv(0.92, 0.98, 0.91)},
 
-    dRed=    {0.6,    .08,    .08},
-    dFire=   {0.6,    0.3,    .08},
-    dOrange= {0.6,    0.4,    .08},
-    dYellow= {0.6,    0.6,    .08},
-    dLime=   {0.5,    0.6,    .08},
-    dJade=   {0.3,    0.6,    .08},
-    dGreen=  {.08,    0.6,    .08},
-    dAqua=   {.08,    0.6,    0.4},
-    dCyan=   {.08,    0.6,    0.6},
-    dNavy=   {.08,    0.4,    0.6},
-    dSea=    {.08,    0.2,    0.6},
-    dBlue=   {0.1,    0.1,    0.6},
-    dViolet= {0.2,    .08,    0.6},
-    dPurple= {0.4,    .08,    0.6},
-    dMagenta={0.6,    .08,    0.6},
-    dWine=   {0.6,    .08,    0.3},
+    lRed=       {hsv(0.00, 0.38, 0.93)},
+    lFire=      {hsv(0.04, 0.45, 0.91)},
+    lOrange=    {hsv(0.10, 0.53, 0.92)},
+    lYellow=    {hsv(0.14, 0.61, 0.95)},
+    lLime=      {hsv(0.20, 0.66, 0.92)},
+    lJade=      {hsv(0.26, 0.56, 0.90)},
+    lGreen=     {hsv(0.34, 0.49, 0.89)},
+    lAqua=      {hsv(0.47, 0.59, 0.86)},
+    lCyan=      {hsv(0.51, 0.77, 0.88)},
+    lNavy=      {hsv(0.54, 0.80, 0.95)},
+    lSea=       {hsv(0.57, 0.72, 0.97)},
+    lBlue=      {hsv(0.64, 0.44, 0.96)},
+    lViolet=    {hsv(0.72, 0.47, 0.95)},
+    lPurple=    {hsv(0.80, 0.62, 0.89)},
+    lMagenta=   {hsv(0.86, 0.61, 0.89)},
+    lWine=      {hsv(0.93, 0.57, 0.92)},
 
-    black=   {.05,    .05,    .05},
-    dGray=   {0.3,    0.3,    0.3},
-    gray=    {0.6,    0.6,    0.6},
-    lGray=   {0.8,    0.8,    0.8},
-    white=   {.97,    .97,    .97},
+    dRed=       {hsv(0.00, 0.80, 0.48)},
+    dFire=      {hsv(0.04, 0.80, 0.34)},
+    dOrange=    {hsv(0.07, 0.80, 0.39)},
+    dYellow=    {hsv(0.12, 0.80, 0.37)},
+    dLime=      {hsv(0.20, 0.80, 0.26)},
+    dJade=      {hsv(0.29, 0.80, 0.27)},
+    dGreen=     {hsv(0.33, 0.80, 0.26)},
+    dAqua=      {hsv(0.46, 0.80, 0.24)},
+    dCyan=      {hsv(0.50, 0.80, 0.30)},
+    dNavy=      {hsv(0.58, 0.80, 0.42)},
+    dSea=       {hsv(0.64, 0.80, 0.40)},
+    dBlue=      {hsv(0.67, 0.80, 0.34)},
+    dViolet=    {hsv(0.71, 0.80, 0.35)},
+    dPurple=    {hsv(0.76, 0.80, 0.32)},
+    dMagenta=   {hsv(0.87, 0.80, 0.28)},
+    dWine=      {hsv(0.92, 0.80, 0.28)},
+
+    black=      {hsv(0.04, 0.04, 0.14)},
+    dGray=      {hsv(0.02, 0.05, 0.44)},
+    gray=       {hsv(0.02, 0.05, 0.65)},
+    lGray=      {hsv(0.02, 0.06, 0.86)},
+    white=      {hsv(0.01, 0.02, 0.99)},
+
+    xGray=      {hsv(0.00, 0.00, 0.35,.8)},
+    lxGray=     {hsv(0.00, 0.00, 0.62,.8)},
+    dxGray=     {hsv(0.00, 0.00, 0.16,.8)},
 }
 for k,v in next,{
-    R='red',  F='fire',  O='orange',  Y='yellow',  L='lime',  J='jade',  G='green',  A='aqua',  C='cyan',  N='navy',  S='sea',  B='blue',  V='violet',  P='purple',  M='magenta',  W='wine',
+    R='red', F='fire', O='orange', Y='yellow', L='lime', J='jade', G='green', A='aqua', C='cyan', N='navy', S='sea', B='blue', V='violet', P='purple', M='magenta', W='wine',
     lR='lRed',lF='lFire',lO='lOrange',lY='lYellow',lL='lLime',lJ='lJade',lG='lGreen',lA='lAqua',lC='lCyan',lN='lNavy',lS='lSea',lB='lBlue',lV='lViolet',lP='lPurple',lM='lMagenta',lW='lWine',
     dR='dRed',dF='dFire',dO='dOrange',dY='dYellow',dL='dLime',dJ='dJade',dG='dGreen',dA='dAqua',dC='dCyan',dN='dNavy',dS='dSea',dB='dBlue',dV='dViolet',dP='dPurple',dM='dMagenta',dW='dWine',
     D='black',dH='dGray',H='gray',lH='lGray',Z='white',
+    X='xGray',lX='lxGray',dX='dxGray',
     --Remain letter: EIKQTUX
 }do
     COLOR[k]=COLOR[v]

Zframework/file.lua

@@ -1,66 +1,76 @@
 local fs=love.filesystem
 local FILE={}
-function FILE.load(name,mode)
+function FILE.load(name,args)
+    if not args then args=''end
     if fs.getInfo(name)then
         local F=fs.newFile(name)
-        if F:open'r'then
-            local s=F:read()
-            F:close()
-            if mode=='luaon'or not mode and s:sub(1,6)=="return{"then
-                s=loadstring(s)
-                if s then
-                    setfenv(s,{})
-                    return s()
-                end
-            elseif mode=='json'or not mode and s:sub(1,1)=="["and s:sub(-1)=="]"or s:sub(1,1)=="{"and s:sub(-1)=="}"then
-                local res=JSON.decode(s)
-                if res then
-                    return res
-                end
-            elseif mode=='string'or not mode then
-                return s
+        assert(F:open'r','open error')
+        local s=F:read()F:close()
+        local mode=
+            STRING.sArg(args,'-luaon')and'luaon'or
+            STRING.sArg(args,'-lua')and'lua'or
+            STRING.sArg(args,'-json')and'json'or
+            STRING.sArg(args,'-string')and'string'or
+            s:sub(1,6)=='return{'and'luaon'or
+            (s:sub(1,1)=='['and s:sub(-1)==']'or s:sub(1,1)=='{'and s:sub(-1)=='}')and'json'or
+            'string'
+        if mode=='luaon'then
+            local func,err_mes=loadstring(s)
+            if func then
+                setfenv(func,{})
+                local res=func()
+                return assert(res,'decode error')
             else
-                MES.new("No file loading mode called "..tostring(mode))
+                error('decode error: '..err_mes)
             end
+        elseif mode=='lua'then
+            local func,err_mes=loadstring(s)
+            if func then
+                local res=func()
+                return assert(res,'run error')
+            else
+                error('compile error: '..err_mes)
+            end
+        elseif mode=='json'then
+            local res=JSON.decode(s)
+            if res then
+                return res
+            end
+            error('decode error')
+        elseif mode=='string'then
+            return s
         else
-            MES.new('error',name.." "..text.loadError)
+            error('unknown mode')
         end
+    else
+        error('no file')
     end
 end
-function FILE.save(data,name,mode)
-    if not mode then mode=""end
+function FILE.save(data,name,args)
+    if not args then args=''end
+    if STRING.sArg(args,'-d')and fs.getInfo(name)then
+        error('duplicate')
+    end
+
     if type(data)=='table'then
-        if mode:find'l'then
+        if STRING.sArg(args,'-luaon')then
             data=TABLE.dump(data)
             if not data then
-                MES.new('error',name.." "..text.saveError.."dump error")
-                return
+                error('encode error')
             end
         else
             data=JSON.encode(data)
             if not data then
-                MES.new('error',name.." "..text.saveError.."json error")
-                return
+                error('encode error')
             end
         end
     else
         data=tostring(data)
     end
 
-    if mode:find'd'and fs.getInfo(name)then
-        MES.new('error',text.saveError_duplicate)
-        return
-    end
     local F=fs.newFile(name)
-    F:open'w'
-    local success,mes=F:write(data)
-    F:flush()F:close()
-    if success then
-        return true
-    else
-        MES.new('error',text.saveError..(mes or"unknown error"))
-        MES.traceback()
-    end
+    assert(F:open('w'),'open error')
+    F:write(data)F:flush()F:close()
 end
 function FILE.clear(path)
     if fs.getRealDirectory(path)==SAVEDIR and fs.getInfo(path).type=='directory'then

Zframework/font.lua

@@ -1,67 +1,60 @@
 local gc=love.graphics
 local set=gc.setFont
-local fontCache={}
-local currentFontSize
+local fontFiles,fontCache={},{}
+local defaultFont,defaultFallBack
+local curFont=false--Current using font object
 
 local FONT={}
-function FONT.set(s)
-    if s~=currentFontSize then
-        if not fontCache[s]then
-            fontCache[s]=gc.setNewFont(s,'light',gc.getDPIScale()*SCR.k*2)
-        end
-        set(fontCache[s])
-        currentFontSize=s
-    end
-end
-function FONT.get(s)
+function FONT.setDefault(name)defaultFont=name end
+function FONT.setFallback(name)defaultFallBack=name end
+function FONT.rawget(s)
     if not fontCache[s]then
         fontCache[s]=gc.setNewFont(s,'light',gc.getDPIScale()*SCR.k*2)
     end
     return fontCache[s]
 end
-function FONT.reset()
-    for s in next,fontCache do
-        fontCache[s]=gc.setNewFont(s,'light',gc.getDPIScale()*SCR.k*2)
-    end
+function FONT.rawset(s)
+    set(fontCache[s]or FONT.rawget(s))
 end
-
-function FONT.init(mainFont,secFont)
-    assert(love.filesystem.getInfo(mainFont))
-    mainFont=love.filesystem.newFile(mainFont)
-    if secFont and love.filesystem.getInfo(secFont)then
-        secFont=love.filesystem.newFile(secFont)
-    else
-        secFont=false
-    end
-    function FONT.set(s)
-        if s~=currentFontSize then
-            if not fontCache[s]then
-                fontCache[s]=gc.setNewFont(mainFont,s,'light',gc.getDPIScale()*SCR.k*2)
-                if secFont then
-                    fontCache[s]:setFallbacks(gc.setNewFont(secFont,s,'light',gc.getDPIScale()*SCR.k*2))
-                end
-            end
-            set(fontCache[s])
-            currentFontSize=s
-        end
-    end
-    function FONT.get(s)
-        if not fontCache[s]then
-            fontCache[s]=gc.setNewFont(mainFont,s,'light',gc.getDPIScale()*SCR.k*2)
-            if secFont then
-                fontCache[s]:setFallbacks(gc.setNewFont(secFont,s,'light',gc.getDPIScale()*SCR.k*2))
-            end
-        end
-        return fontCache[s]
-    end
-    function FONT.reset()
-        for s in next,fontCache do
-            fontCache[s]=gc.setNewFont(mainFont,s,'light',gc.getDPIScale()*SCR.k*2)
-            if secFont then
-                fontCache[s]:setFallbacks(gc.setNewFont(secFont,s,'light',gc.getDPIScale()*SCR.k*2))
-            end
-        end
+function FONT.load(fonts)
+    for name,path in next,fonts do
+        assert(love.filesystem.getInfo(path),STRING.repD("Font file $1($2) not exist!",name,path))
+        fontFiles[name]=love.filesystem.newFile(path)
+        fontCache[name]={}
     end
     FONT.reset()
 end
+function FONT.get(size,name)
+    if not name then name=defaultFont end
+    local f=fontCache[name][size]
+    if not f then
+        f=gc.setNewFont(fontFiles[name],size,'light',gc.getDPIScale()*SCR.k*2)
+        if defaultFallBack and name~=defaultFallBack then
+            f:setFallbacks(FONT.get(size,defaultFallBack))
+        end
+        fontCache[name][size]=f
+    end
+    return f
+end
+function FONT.set(size,name)
+    if not name then name=defaultFont end
+
+    local f=fontCache[name][size]
+    if f~=curFont then
+        curFont=f or FONT.get(size,name)
+        set(curFont)
+    end
+end
+function FONT.reset()
+    for name,cache in next,fontCache do
+        if type(cache)=='table'then
+            for size in next,cache do
+                cache[size]=FONT.get(size,name)
+            end
+        else
+            fontCache[name]=FONT.rawget(name)
+        end
+    end
+end
+
 return FONT

Zframework/gcExtend.lua

@@ -95,6 +95,7 @@ do--function GC.DO(L)
         setLJ="setLineJoin",
 
         print="print",
+        rawFT=function(...)FONT.rawset(...)end,
         setFT=function(...)FONT.set(...)end,
         mText=GC.mStr,
         mDraw=GC.draw,

Zframework/image.lua

@@ -2,7 +2,6 @@ local IMG={}
 function IMG.init(list)
     IMG.init=nil
 
-    local null=love.graphics.newCanvas(1,1)
     setmetatable(IMG,{__index=function(self,name)
         if type(list[name])=='table'then
             self[name]={}
@@ -13,7 +12,7 @@ function IMG.init(list)
             self[name]=love.graphics.newImage(list[name])
         else
             LOG("No IMG: "..name)
-            self[name]=null
+            self[name]=PAPER
         end
         return self[name]
     end})

Zframework/init.lua

@@ -1,14 +1,16 @@
-NONE={}function NULL()end
+NONE={}function NULL()end PAPER=love.graphics.newCanvas(1,1)
 EDITING=""
 LOADED=false
-ERRDATA={}
 
 --Pure lua modules (basic)
+MATH=       require'Zframework.mathExtend'
 COLOR=      require'Zframework.color'
 TABLE=      require'Zframework.tableExtend'
 STRING=     require'Zframework.stringExtend'
 PROFILE=    require'Zframework.profile'
 JSON=       require'Zframework.json'
+TEST=       require'Zframework.test'
+
 do--Add pcall & MES for JSON lib
     local encode,decode=JSON.encode,JSON.decode
     JSON.encode=function(val)
@@ -35,7 +37,6 @@ REQUIRE=    require'Zframework.require'
 TASK=       require'Zframework.task'
 WS=         require'Zframework.websocket'
 LANG=       require'Zframework.languages'
-THEME=      require'Zframework.theme'
 
 --Love-based modules (basic)
 FILE=       require'Zframework.file'
@@ -59,6 +60,7 @@ BGM=        require'Zframework.bgm'
 VOC=        require'Zframework.voice'
 
 local ms,kb=love.mouse,love.keyboard
+local KBisDown=kb.isDown
 
 local gc=love.graphics
 local gc_push,gc_pop,gc_clear,gc_discard=gc.push,gc.pop,gc.clear,gc.discard
@@ -70,11 +72,24 @@ local WIDGET,SCR,SCN=WIDGET,SCR,SCN
 local xOy=SCR.xOy
 local ITP=xOy.inverseTransformPoint
 
-local mx,my,mouseShow=-20,-20,false
-local touching--First touching ID(userdata)
-joysticks={}
+local max,min=math.max,math.min
 
 local devMode
+local mx,my,mouseShow,cursorSpd=640,360,false,0
+local jsState={}--map, joystickID->axisStates: {axisName->axisVal}
+local errData={}--list, each error create {mes={errMes strings},scene=sceneNameStr}
+
+local function drawCursor(_,x,y)
+    gc_setColor(1,1,1)
+    gc_setLineWidth(2)
+    gc_circle(ms.isDown(1)and'fill'or'line',x,y,6)
+end
+local showPowerInfo=true
+local showClickFX=true
+local discardCanvas=false
+local frameMul=100
+local sleepInterval=1/60
+local onQuit=NULL
 
 local batteryImg=GC.DO{31,20,
     {'fRect',1,0,26,2},
@@ -92,17 +107,16 @@ local function updatePowerInfo()
     gc_clear(0,0,0,.25)
     if state~='unknown'then
         gc_setLineWidth(4)
-        local charging=state=='charging'
         if state=='nobattery'then
             gc_setColor(1,1,1)
             gc_setLineWidth(2)
-            gc_line(74,SCR.safeX+5,100,22)
+            gc_line(74,5,100,22)
         elseif pow then
-            if charging then    gc_setColor(0,1,0)
-            elseif pow>50 then  gc_setColor(1,1,1)
-            elseif pow>26 then  gc_setColor(1,1,0)
-            elseif pow==26 then gc_setColor(.5,0,1)
-            else                gc_setColor(1,0,0)
+            if state=='charging'then gc_setColor(0,1,0)
+            elseif pow>50 then       gc_setColor(1,1,1)
+            elseif pow>26 then       gc_setColor(1,1,0)
+            elseif pow==26 then      gc_setColor(.5,0,1)
+            else                     gc_setColor(1,0,0)
             end
             gc.rectangle('fill',76,6,pow*.22,14)
             if pow<100 then
@@ -125,36 +139,81 @@ local function updatePowerInfo()
 end
 -------------------------------------------------------------
 local lastX,lastY=0,0--Last click pos
+local function _updateMousePos(x,y,dx,dy)
+    if SCN.swapping then return end
+    dx,dy=dx/SCR.k,dy/SCR.k
+    if SCN.mouseMove then SCN.mouseMove(x,y,dx,dy)end
+    if ms.isDown(1)then
+        WIDGET.drag(x,y,dx,dy)
+    else
+        WIDGET.cursorMove(x,y)
+    end
+end
+local function _triggerMouseDown(x,y,k)
+    if devMode==1 then
+        print(("(%d,%d)<-%d,%d ~~(%d,%d)<-%d,%d"):format(
+            x,y,
+            x-lastX,y-lastY,
+            math.floor(x/10)*10,math.floor(y/10)*10,
+            math.floor((x-lastX)/10)*10,math.floor((y-lastY)/10)*10
+        ))
+    end
+    if SCN.swapping then return end
+    if SCN.mouseDown then SCN.mouseDown(x,y,k)end
+    WIDGET.press(x,y,k)
+    lastX,lastY=x,y
+    if showClickFX then SYSFX.newTap(3,x,y)end
+end
+local function mouse_update(dt)
+    if not KBisDown('lctrl','rctrl')and KBisDown('up','down','left','right')then
+        local dx,dy=0,0
+        if KBisDown('up')then    dy=dy-cursorSpd end
+        if KBisDown('down')then  dy=dy+cursorSpd end
+        if KBisDown('left')then  dx=dx-cursorSpd end
+        if KBisDown('right')then dx=dx+cursorSpd end
+        mx=max(min(mx+dx,1280),0)
+        my=max(min(my+dy,720),0)
+        if my==0 or my==720 then
+            WIDGET.sel=false
+            WIDGET.drag(0,0,0,-dy)
+        end
+        _updateMousePos(mx,my,dx,dy)
+        cursorSpd=min(cursorSpd+dt*26,12.6)
+    else
+        cursorSpd=6
+    end
+end
+local function gp_update(js,dt)
+    local sx,sy=js._jsObj:getGamepadAxis('leftx'),js._jsObj:getGamepadAxis('lefty')
+    if math.abs(sx)>.1 or math.abs(sy)>.1 then
+        local dx,dy=0,0
+        if sy<-.1 then dy=dy+2*sy*cursorSpd end
+        if sy>.1 then  dy=dy+2*sy*cursorSpd end
+        if sx<-.1 then dx=dx+2*sx*cursorSpd end
+        if sx>.1 then  dx=dx+2*sx*cursorSpd end
+        mx=max(min(mx+dx,1280),0)
+        my=max(min(my+dy,720),0)
+        if my==0 or my==720 then
+            WIDGET.sel=false
+            WIDGET.drag(0,0,0,-dy)
+        end
+        _updateMousePos(mx,my,dx,dy)
+        cursorSpd=min(cursorSpd+dt*26,12.6)
+    else
+        cursorSpd=6
+    end
+end
 function love.mousepressed(x,y,k,touch)
     if touch then return end
     mouseShow=true
     mx,my=ITP(xOy,x,y)
-    if devMode==1 then
-        print(("(%d,%d)<-%d,%d ~~(%d,%d)<-%d,%d"):format(
-            mx,my,
-            mx-lastX,my-lastY,
-            math.floor(mx/10)*10,math.floor(my/10)*10,
-            math.floor((mx-lastX)/10)*10,math.floor((my-lastY)/10)*10
-        ))
-    end
-    if SCN.swapping then return end
-    if SCN.mouseDown then SCN.mouseDown(mx,my,k)end
-    WIDGET.press(mx,my,k)
-    lastX,lastY=mx,my
-    if SETTING.clickFX then SYSFX.newTap(3,mx,my)end
+    _triggerMouseDown(mx,my,k)
 end
 function love.mousemoved(x,y,dx,dy,touch)
     if touch then return end
     mouseShow=true
     mx,my=ITP(xOy,x,y)
-    if SCN.swapping then return end
-    dx,dy=dx/SCR.k,dy/SCR.k
-    if SCN.mouseMove then SCN.mouseMove(mx,my,dx,dy)end
-    if ms.isDown(1)then
-        WIDGET.drag(mx,my,dx/SCR.k,dy/SCR.k)
-    else
-        WIDGET.cursorMove(mx,my)
-    end
+    _updateMousePos(mx,my,dx,dy)
 end
 function love.mousereleased(x,y,k,touch)
     if touch or SCN.swapping then return end
@@ -181,67 +240,67 @@ end
 function love.touchpressed(id,x,y)
     mouseShow=false
     if SCN.swapping then return end
-    if not touching then
-        touching=id
+    if not SCN.mainTouchID then
+        SCN.mainTouchID=id
         WIDGET.unFocus(true)
         love.touchmoved(id,x,y,0,0)
     end
     x,y=ITP(xOy,x,y)
     lastX,lastY=x,y
     WIDGET.cursorMove(x,y)
-    if SCN.touchDown then SCN.touchDown(x,y)end
+    if SCN.touchDown then SCN.touchDown(x,y,id)end
     if kb.hasTextInput()then kb.setTextInput(false)end
 end
-function love.touchmoved(_,x,y,dx,dy)
+function love.touchmoved(id,x,y,dx,dy)
     if SCN.swapping then return end
     x,y=ITP(xOy,x,y)
-    if SCN.touchMove then SCN.touchMove(x,y,dx/SCR.k,dy/SCR.k)end
+    if SCN.touchMove then SCN.touchMove(x,y,dx/SCR.k,dy/SCR.k,id)end
     WIDGET.drag(x,y,dx/SCR.k,dy/SCR.k)
 end
 function love.touchreleased(id,x,y)
     if SCN.swapping then return end
     x,y=ITP(xOy,x,y)
-    if id==touching then
+    if id==SCN.mainTouchID then
         WIDGET.press(x,y,1)
         WIDGET.release(x,y)
         WIDGET.cursorMove(x,y)
         WIDGET.unFocus()
-        touching=false
+        SCN.mainTouchID=false
     end
-    if SCN.touchUp then SCN.touchUp(x,y)end
+    if SCN.touchUp then SCN.touchUp(x,y,id)end
     if(x-lastX)^2+(y-lastY)^2<62 then
         if SCN.touchClick then SCN.touchClick(x,y)end
-        if SETTING.clickFX then SYSFX.newTap(3,x,y)end
+        if showClickFX then SYSFX.newTap(3,x,y)end
     end
 end
 
 local fnKey={NULL,NULL,NULL,NULL,NULL,NULL,NULL}
 local function noDevkeyPressed(key)
-    if key=="f1"then      fnKey[1]()
-    elseif key=="f2"then  fnKey[2]()
-    elseif key=="f3"then  fnKey[3]()
-    elseif key=="f4"then  fnKey[4]()
-    elseif key=="f5"then  fnKey[5]()
-    elseif key=="f6"then  fnKey[6]()
-    elseif key=="f7"then  fnKey[7]()
-    elseif key=="f8"then  devMode=nil MES.new('info',"DEBUG OFF",.2)
-    elseif key=="f9"then  devMode=1   MES.new('info',"DEBUG 1")
-    elseif key=="f10"then devMode=2   MES.new('info',"DEBUG 2")
-    elseif key=="f11"then devMode=3   MES.new('info',"DEBUG 3")
-    elseif key=="f12"then devMode=4   MES.new('info',"DEBUG 4")
+    if key=='f1'then      fnKey[1]()
+    elseif key=='f2'then  fnKey[2]()
+    elseif key=='f3'then  fnKey[3]()
+    elseif key=='f4'then  fnKey[4]()
+    elseif key=='f5'then  fnKey[5]()
+    elseif key=='f6'then  fnKey[6]()
+    elseif key=='f7'then  fnKey[7]()
+    elseif key=='f8'then  devMode=nil MES.new('info',"DEBUG OFF",.2)
+    elseif key=='f9'then  devMode=1   MES.new('info',"DEBUG 1")
+    elseif key=='f10'then devMode=2   MES.new('info',"DEBUG 2")
+    elseif key=='f11'then devMode=3   MES.new('info',"DEBUG 3")
+    elseif key=='f12'then devMode=4   MES.new('info',"DEBUG 4")
     elseif devMode==2 then
         local W=WIDGET.sel
         if W then
-            if key=="left"then W.x=W.x-10
-            elseif key=="right"then W.x=W.x+10
-            elseif key=="up"then W.y=W.y-10
-            elseif key=="down"then W.y=W.y+10
-            elseif key==","then W.w=W.w-10
-            elseif key=="."then W.w=W.w+10
-            elseif key=="/"then W.h=W.h-10
-            elseif key=="'"then W.h=W.h+10
-            elseif key=="["then W.font=W.font-5
-            elseif key=="]"then W.font=W.font+5
+            if key=='left'then W.x=W.x-10
+            elseif key=='right'then W.x=W.x+10
+            elseif key=='up'then W.y=W.y-10
+            elseif key=='down'then W.y=W.y+10
+            elseif key==','then W.w=W.w-10
+            elseif key=='.'then W.w=W.w+10
+            elseif key=='/'then W.h=W.h-10
+            elseif key=='\''then W.h=W.h+10
+            elseif key=='['then W.font=W.font-5
+            elseif key==']'then W.font=W.font+5
             else return true
             end
         else
@@ -255,21 +314,34 @@ function love.keypressed(key,_,isRep)
     mouseShow=false
     if devMode and not noDevkeyPressed(key)then
         return
-    elseif key=="f8"then
+    elseif key=='f8'then
         devMode=1
         MES.new('info',"DEBUG ON",.2)
-    elseif key=="f11"then
-        switchFullscreen()
+    elseif key=='f11'then
+        SETTING.fullscreen=not SETTING.fullscreen
+        applySettings()
         saveSettings()
     elseif not SCN.swapping then
-        if SCN.keyDown then
-            if EDITING==""then
-                SCN.keyDown(key,isRep)
+        if EDITING==""and(not SCN.keyDown or SCN.keyDown(key,isRep))then
+            local W=WIDGET.sel
+            if key=='escape'and not isRep then
+                SCN.back()
+            elseif key=='up'or key=='down'or key=='left'or key=='right'then
+                mouseShow=true
+                if KBisDown('lctrl','rctrl')then
+                    if W and W.arrowKey then W:arrowKey(key)end
+                end
+            elseif key=='space'or key=='return'then
+                mouseShow=true
+                if not isRep then
+                    if showClickFX then SYSFX.newTap(3,mx,my)end
+                    _triggerMouseDown(mx,my,1)
+                end
+            else
+                if W and W.keypress then
+                    W:keypress(key)
+                end
             end
-        elseif key=="escape"and not isRep then
-            SCN.back()
-        else
-            WIDGET.keyPressed(key,isRep)
         end
     end
 end
@@ -285,18 +357,18 @@ function love.textinput(texts)
     WIDGET.textinput(texts)
 end
 
-function love.joystickadded(JS)
-    table.insert(joysticks,JS)
-    MES.new('info',"Joystick added")
-end
-function love.joystickremoved(JS)
-    local i=TABLE.find(joysticks,JS)
-    if i then
-        table.remove(joysticks,i)
-        MES.new('info',"Joystick removed")
-    end
-end
-local keyMirror={
+--analog sticks: -1, 0, 1 for neg, neutral, pos
+--triggers: 0 for released, 1 for pressed
+local jsAxisEventName={
+    leftx={'leftstick_left','leftstick_right'},
+    lefty={'leftstick_up','leftstick_down'},
+    rightx={'rightstick_left','rightstick_right'},
+    righty={'rightstick_up','rightstick_down'},
+    triggerleft='triggerleft',
+    triggerright='triggerright'
+}
+local gamePadKeys={'a','b','x','y','back','guide','start','leftstick','rightstick','leftshoulder','rightshoulder','dpup','dpdown','dpleft','dpright'}
+local dPadToKey={
     dpup='up',
     dpdown='down',
     dpleft='left',
@@ -304,65 +376,131 @@ local keyMirror={
     start='return',
     back='escape',
 }
-function love.gamepadpressed(_,i)
+function love.joystickadded(JS)
+    table.insert(jsState,{
+        _id=JS:getID(),
+        _jsObj=JS,
+        leftx=0,lefty=0,
+        rightx=0,righty=0,
+        triggerleft=0,triggerright=0
+    })
+    MES.new('info',"Joystick added")
+end
+function love.joystickremoved(JS)
+    for i=1,#jsState do
+        if jsState[i]._jsObj==JS then
+            for j=1,#gamePadKeys do
+                if JS:isGamepadDown(gamePadKeys[j])then
+                    love.gamepadreleased(JS,gamePadKeys[j])
+                end
+            end
+            love.gamepadaxis(JS,'leftx',0)
+            love.gamepadaxis(JS,'lefty',0)
+            love.gamepadaxis(JS,'rightx',0)
+            love.gamepadaxis(JS,'righty',0)
+            love.gamepadaxis(JS,'triggerleft',-1)
+            love.gamepadaxis(JS,'triggerright',-1)
+            MES.new('info',"Joystick removed")
+            table.remove(jsState,i)
+            break
+        end
+    end
+end
+function love.gamepadaxis(JS,axis,val)
+    if jsState[1]and JS==jsState[1]._jsObj then
+        local js=jsState[1]
+        if axis=='leftx'or axis=='lefty'or axis=='rightx'or axis=='righty'then
+            local newVal=--range: [0,1]
+                val>.4 and 1 or
+                val<-.4 and -1 or
+                0
+            if newVal~=js[axis]then
+                if js[axis]==-1 then
+                    love.gamepadreleased(JS,jsAxisEventName[axis][1])
+                elseif js[axis]~=0 then
+                    love.gamepadreleased(JS,jsAxisEventName[axis][2])
+                end
+                if newVal==-1 then
+                    love.gamepadpressed(JS,jsAxisEventName[axis][1])
+                elseif newVal==1 then
+                    love.gamepadpressed(JS,jsAxisEventName[axis][2])
+                end
+                js[axis]=newVal
+            end
+        elseif axis=='triggerleft'or axis=='triggerright'then
+            local newVal=val>.3 and 1 or 0--range: [0,1]
+            if newVal~=js[axis]then
+                if newVal==1 then
+                    love.gamepadpressed(JS,jsAxisEventName[axis])
+                else
+                    love.gamepadreleased(JS,jsAxisEventName[axis])
+                end
+                js[axis]=newVal
+            end
+        end
+    end
+end
+function love.gamepadpressed(_,key)
     mouseShow=false
-    if SCN.swapping then return end
-    if SCN.gamepadDown then SCN.gamepadDown(i)
-    elseif SCN.keyDown then SCN.keyDown(keyMirror[i]or i)
-    elseif i=="back"then SCN.back()
-    else WIDGET.gamepadPressed(keyMirror[i]or i)
+    if not SCN.swapping then
+        local cursorCtrl
+        if SCN.gamepadDown then
+            cursorCtrl=SCN.gamepadDown(key)
+        elseif SCN.keyDown then
+            cursorCtrl=SCN.keyDown(dPadToKey[key]or key)
+        else
+            cursorCtrl=true
+        end
+        if cursorCtrl then
+            key=dPadToKey[key]or key
+            mouseShow=true
+            local W=WIDGET.sel
+            if key=='back'then
+                SCN.back()
+            elseif key=='up'or key=='down'or key=='left'or key=='right'then
+                mouseShow=true
+                if W and W.arrowKey then W:arrowKey(key)end
+            elseif key=='return'then
+                mouseShow=true
+                if showClickFX then SYSFX.newTap(3,mx,my)end
+                _triggerMouseDown(mx,my,1)
+            else
+                if W and W.keypress then
+                    W:keypress(key)
+                end
+            end
+        end
     end
 end
 function love.gamepadreleased(_,i)
     if SCN.swapping then return end
     if SCN.gamepadUp then SCN.gamepadUp(i)end
 end
---[[
-function love.joystickpressed(JS,k)
-    mouseShow=false
-    if SCN.swapping then return end
-    if SCN.gamepadDown then SCN.gamepadDown(i)
-    elseif SCN.keyDown then SCN.keyDown(keyMirror[i]or i)
-    elseif i=="back"then SCN.back()
-    else WIDGET.gamepadPressed(i)
-    end
-end
-function love.joystickreleased(JS,k)
-    if SCN.swapping then return end
-    if SCN.gamepadUp then SCN.gamepadUp(i)
-    end
-end
-function love.joystickaxis(JS,axis,val)
 
-end
-function love.joystickhat(JS,hat,dir)
-
-end
-function love.sendData(data)end
-function love.receiveData(id,data)end
-]]
 function love.filedropped(file)
     if SCN.fileDropped then SCN.fileDropped(file)end
 end
 function love.directorydropped(dir)
     if SCN.directoryDropped then SCN.directoryDropped(dir)end
 end
-local lastGCtime=0
+local autoGCcount=0
 function love.lowmemory()
-    if TIME()-lastGCtime>6.26 then
-        collectgarbage()
-        lastGCtime=TIME()
+    collectgarbage()
+    if autoGCcount<3 then
+        autoGCcount=autoGCcount+1
         MES.new('check',"[auto GC] low MEM 设备内存过低")
     end
 end
+
+local onResize=NULL
 function love.resize(w,h)
+    if SCR.w==w and SCR.h==h then return end
     SCR.resize(w,h)
     if BG.resize then BG.resize(w,h)end
     if SCN.resize then SCN.resize(w,h)end
     WIDGET.resize(w,h)
     FONT.reset()
-
-    SHADER.warning:send('w',w*SCR.dpi)
+    onResize(w,h)
 end
 
 local onFocus=NULL
@@ -374,7 +512,11 @@ local function secondLoopThread()
     repeat yield()until mainLoop()
 end
 function love.errorhandler(msg)
-    if not msg then msg="Unknown error" end
+    if type(msg)~='string'then
+        msg="Unknown error"
+    elseif msg:find("Invalid UTF-8")and text then
+        msg=text.tryAnotherBuild
+    end
 
     --Generate error message
     local err={"Error:"..msg}
@@ -396,20 +538,20 @@ function love.errorhandler(msg)
     love.audio.stop()
     gc.reset()
 
-    if LOADED and #ERRDATA<3 then
+    if LOADED and #errData<3 then
         BG.set('none')
         local scn=SCN and SCN.cur or"NULL"
-        table.insert(ERRDATA,{mes=err,scene=scn})
+        table.insert(errData,{mes=err,scene=scn})
 
         --Write messages to log file
         love.filesystem.append('conf/error.log',
             os.date("%Y/%m/%d %A %H:%M:%S\n")..
-            #ERRDATA.." crash(es) "..SYSTEM.."-"..VERSION.string.."  scene: "..scn.."\n"..
+            #errData.." crash(es) "..love.system.getOS().."-"..VERSION.string.."  scene: "..scn.."\n"..
             table.concat(err,"\n",1,c-2).."\n\n"
         )
 
         --Get screencapture
-        gc.captureScreenshot(function(_)ERRDATA[#ERRDATA].shot=gc.newImage(_)end)
+        gc.captureScreenshot(function(_)errData[#errData].shot=gc.newImage(_)end)
         gc.present()
 
         --Create a new mainLoop thread to keep game alive
@@ -445,7 +587,7 @@ function love.errorhandler(msg)
             FONT.set(100)gc_print(":(",100,0,0,1.2)
             FONT.set(40)gc.printf(errorMsg,100,160,SCR.w0-100)
             FONT.set(20)
-            gc_print(SYSTEM.."-"..VERSION.string.."                          scene:"..(SCN and SCN.cur or"NULL"),100,660)
+            gc_print(love.system.getOS().."-"..VERSION.string.."                          scene:"..(SCN and SCN.cur or"NULL"),100,660)
             gc.printf(err[1],100,360,1260-100)
             gc_print("TRACEBACK",100,450)
             for i=4,#err-2 do
@@ -469,7 +611,7 @@ local devColor={
 }
 local WS=WS
 local WSnames={'app','user','play','stream','chat','manage'}
-local wsBottomImage do
+local wsImg={}do
     local L={78,18,
         {'clear',1,1,1,0},
         {'setCL',1,1,1,.3},
@@ -479,31 +621,23 @@ local wsBottomImage do
         table.insert(L,{'setCL',1,1,1,i*.005})
         table.insert(L,{'fRect',i,0,1,18})
     end
-    wsBottomImage=GC.DO(L)
+    wsImg.bottom=GC.DO(L)
+    wsImg.dead=GC.DO{20,20,
+        {'rawFT',20},
+        {'setCL',1,.3,.3},
+        {'mText',"X",11,-1},
+    }
+    wsImg.connecting=GC.DO{20,20,
+        {'rawFT',20},
+        {'setLW',3},
+        {'mText',"C",11,-1},
+    }
+    wsImg.running=GC.DO{20,20,
+        {'rawFT',20},
+        {'setCL',.5,1,0},
+        {'mText',"R",11,-1},
+    }
 end
-local ws_deadImg=GC.DO{20,20,
-    {'setFT',20},
-    {'setCL',1,.3,.3},
-    {'mText',"X",11,-1},
-}
-local ws_connectingImg=GC.DO{20,20,
-    {'setFT',20},
-    {'setLW',3},
-    {'mText',"C",11,-1},
-}
-local ws_runningImg=GC.DO{20,20,
-    {'setFT',20},
-    {'setCL',.5,1,0},
-    {'mText',"R",11,-1},
-}
-
-local function drawCursor(_,x,y)
-    gc_setColor(1,1,1)
-    gc_setLineWidth(2)
-    gc_circle(ms.isDown(1)and'fill'or'line',x,y,6)
-end
-local function showPowerInfo()return true end
-local onQuit=NULL
 
 function love.run()
     local love=love
@@ -515,15 +649,14 @@ function love.run()
     local TASK_update=TASK.update
     local SYSFX_update,SYSFX_draw=SYSFX.update,SYSFX.draw
     local WIDGET_update,WIDGET_draw=WIDGET.update,WIDGET.draw
-
     local STEP,WAIT=love.timer.step,love.timer.sleep
     local FPS,MINI=love.timer.getFPS,love.window.isMinimized
     local PUMP,POLL=love.event.pump,love.event.poll
 
-    local TIME,SETTING,VERSION=TIME,SETTING,VERSION
+    local timer,VERSION=love.timer.getTime,VERSION
 
     local frameTimeList={}
-    local lastFrame=TIME()
+    local lastFrame=timer()
     local lastFreshPow=lastFrame
     local FCT=0--Framedraw counter, from 0~99
 
@@ -532,12 +665,12 @@ function love.run()
     --Scene Launch
     while #SCN.stack>0 do SCN.pop()end
     SCN.push('quit','slowFade')
-    SCN.init(#ERRDATA==0 and'load'or'error')
+    SCN.init(#errData==0 and'load'or'error')
 
     return function()
         local _
 
-        local time=TIME()
+        local time=timer()
         local dt=time-lastFrame
         lastFrame=time
 
@@ -554,6 +687,8 @@ function love.run()
 
         --UPDATE
         STEP()
+        if mouseShow then mouse_update(dt)end
+        if next(jsState)then gp_update(jsState[1],dt)end
         VOC.update()
         BG.update(dt)
         TEXT_update(dt)
@@ -567,11 +702,10 @@ function love.run()
 
         --DRAW
         if not MINI()then
-            FCT=FCT+SETTING.frameMul
+            FCT=FCT+frameMul
             if FCT>=100 then
                 FCT=FCT-100
 
-                local safeX=SCR.safeX
                 gc_replaceTransform(SCR.origin)
                     gc_setColor(1,1,1)
                     BG.draw()
@@ -582,16 +716,14 @@ function love.run()
                     TEXT_draw()
 
                     --Draw cursor
-                    if mouseShow then
-                        drawCursor(time,mx,my)
-                    end
-                gc_replaceTransform(SCR.xOy_ul)
-                    MES_draw()
+                    if mouseShow then drawCursor(time,mx,my)end
                 gc_replaceTransform(SCR.origin)
+                    MES_draw()
+
                     --Draw power info.
-                    if showPowerInfo()then
+                    if showPowerInfo then
                         gc_setColor(1,1,1)
-                        gc_draw(infoCanvas,safeX,0,0,SCR.k)
+                        gc_draw(infoCanvas,SCR.safeX,0,0,SCR.k)
                     end
 
                     --Draw scene swapping animation
@@ -602,10 +734,12 @@ function love.run()
                     end
                 gc_replaceTransform(SCR.xOy_d)
                     --Draw Version string
-                    gc_setColor(.8,.8,.8,.4)
+                    gc_setColor(.9,.9,.9,.42)
                     FONT.set(20)
                     mStr(VERSION.string,0,-30)
                 gc_replaceTransform(SCR.xOy_dl)
+                    local safeX=SCR.safeX/SCR.k
+
                     --Draw FPS
                     FONT.set(15)
                     gc_setColor(1,1,1)
@@ -616,9 +750,8 @@ function love.run()
                         --Left-down infos
                         gc_setColor(devColor[devMode])
                         gc_print("MEM     "..gcinfo(),safeX+5,-40)
-                        gc_print("Lines    "..FREEROW.getCount(),safeX+5,-60)
-                        gc_print("Tasks   "..TASK.getCount(),safeX+5,-80)
-                        gc_print("Voices  "..VOC.getQueueCount(),safeX+5,-100)
+                        gc_print("Tasks   "..TASK.getCount(),safeX+5,-60)
+                        gc_print("Voices  "..VOC.getQueueCount(),safeX+5,-80)
 
                         --Update & draw frame time
                         table.insert(frameTimeList,1,dt)table.remove(frameTimeList,126)
@@ -646,14 +779,14 @@ function love.run()
                             for i=1,6 do
                                 local status=WS.status(WSnames[i])
                                 gc_setColor(1,1,1)
-                                gc.draw(wsBottomImage,-79,20*i-139)
+                                gc.draw(wsImg.bottom,-79,20*i-139)
                                 if status=='dead'then
-                                    gc_draw(ws_deadImg,-20,20*i-140)
+                                    gc_draw(wsImg.dead,-20,20*i-140)
                                 elseif status=='connecting'then
                                     gc_setColor(1,1,1,.5+.3*math.sin(time*6.26))
-                                    gc_draw(ws_connectingImg,-20,20*i-140)
+                                    gc_draw(wsImg.connecting,-20,20*i-140)
                                 elseif status=='running'then
-                                    gc_draw(ws_runningImg,-20,20*i-140)
+                                    gc_draw(wsImg.running,-20,20*i-140)
                                 end
                                 local t1,t2,t3=WS.getTimers(WSnames[i])
                                 gc_setColor(.9,.9,.9,t1)gc.rectangle('fill',-60,20*i-122,-16,-16)
@@ -664,13 +797,13 @@ function love.run()
                 gc_present()
 
                 --SPEED UPUPUP!
-                if SETTING.cleanCanvas then gc_discard()end
+                if discardCanvas then gc_discard()end
             end
         end
 
         --Fresh power info.
         if time-lastFreshPow>2.6 then
-            if showPowerInfo()then
+            if showPowerInfo then
                 updatePowerInfo()
                 lastFreshPow=time
             end
@@ -688,28 +821,44 @@ function love.run()
             end
         end
 
-        --Keep 60fps
-        _=TIME()-lastFrame
-        if _<.0162 then WAIT(.0162-_)end
-        while TIME()-lastFrame<1/60 do end
+        _=timer()-lastFrame
+        if _<sleepInterval*.9626 then WAIT(sleepInterval*.9626-_)end
+        while timer()-lastFrame<sleepInterval do end
     end
 end
 
 local Z={}
 
-function Z.setIfPowerInfo(func)showPowerInfo=func end
+function Z.getJsState()return jsState end
+function Z.getErr(i)
+    if i=='#'then
+        return errData[#errData]
+    elseif i then
+        return errData[i]
+    else
+        return errData
+    end
+end
 
---Warning: color and line width is uncertain value, set it in the function.
+function Z.setPowerInfo(bool)showPowerInfo=bool end
+function Z.setCleanCanvas(bool)discardCanvas=bool end
+function Z.setFrameMul(n)frameMul=n end
+function Z.setMaxFPS(fps)sleepInterval=1/fps end
+function Z.setClickFX(bool)showClickFX=bool end
+
+--[Warning] Color and line width is uncertain value, set it in the function.
 function Z.setCursor(func)drawCursor=func end
 
 --Change F1~F7 events of devmode (F8 mode)
 function Z.setOnFnKeys(list)
-    assert(type(list)=='table')
+    assert(type(list)=='table',"Z.setOnFnKeys(list): list must be a table.")
     for i=1,7 do fnKey[i]=type(list[i])=='function'and list[i]or NULL end
 end
 
-function Z.setOnFocus(func)onFocus=type(func)=='function'and func or NULL end
+function Z.setOnFocus(func)onFocus=assert(type(func)=='function'and func,"Z.setOnFocus(func): func must be a function")end
 
-function Z.setOnQuit(func)onQuit=type(func)=='function'and func or NULL end
+function Z.setOnResize(func)onResize=assert(type(func)=='function'and func,"Z.setOnResize(func): func must be a function")end
+
+function Z.setOnQuit(func)onQuit=assert(type(func)=='function'and func,"Z.setOnQuit(func): func must be a function")end
 
 return Z

Zframework/languages.lua

@@ -47,7 +47,7 @@ function LANG.init(defaultLang,langList,publicText,pretreatFunc)
     function LANG.addScene(name)
         for _,L in next,langList do
             if L.WidgetText and not L.WidgetText[name]then
-                L.WidgetText[name]={back=L.back}
+                L.WidgetText[name]={}
             end
         end
     end

Zframework/log.lua

@@ -3,7 +3,7 @@ local ins=table.insert
 local logs={os.date("Techmino logs  %Y/%m/%d %A")}
 
 local function log(message)
-    ins(logs,os.date("%H:%M:%S")..message)
+    ins(logs,os.date("[%H:%M:%S] ")..message)
 end
 
 local LOG=setmetatable({logs=logs},{

Zframework/mathExtend.lua

@@ -0,0 +1,37 @@
+local MATH={}for k,v in next,math do MATH[k]=v end
+
+local rnd=math.random
+
+MATH.tau=2*math.pi
+
+function MATH.sign(a)
+    return a>0 and 1 or a<0 and -1 or 0
+end
+
+function MATH.roll(chance)
+    return rnd()<(chance or .5)
+end
+
+function MATH.coin(a,b)
+    if rnd()<.5 then
+        return a
+    else
+        return b
+    end
+end
+
+function MATH.interval(v,low,high)
+    if v<=low then
+        return low
+    elseif v>=high then
+        return high
+    else
+        return v
+    end
+end
+
+function MATH.expApproach(a,b,k)
+    return b+(a-b)*2.718281828459045^-k
+end
+
+return MATH

Zframework/profile.lua

@@ -140,11 +140,11 @@ function profile.switch()
     switch=not switch
     if not switch then
         profile.stop()
-        love.system.setClipboardText(PROFILE.report())
-        PROFILE.reset()
+        love.system.setClipboardText(profile.report())
+        profile.reset()
         return false
     else
-        PROFILE.start()
+        profile.start()
         return true
     end
 end

Zframework/require.lua

@@ -2,10 +2,10 @@ package.cpath=package.cpath..';'..SAVEDIR..'/lib/lib?.so;'..'?.dylib'
 local loaded={}
 return function(libName)
     local require=require
-    if SYSTEM=='OS X'then
+    if love.system.getOS()=='OS X'then
         require=package.loadlib(libName..'.dylib','luaopen_'..libName)
         libname=nil
-    elseif SYSTEM=='Android'then
+    elseif love.system.getOS()=='Android'then
         if not loaded[libName]then
             local platform=(function()
                 local p=io.popen('uname -m')

Zframework/scene.lua

@@ -4,6 +4,7 @@ local abs=math.abs
 local scenes={}
 
 local SCN={
+    mainTouchID=nil,     --First touching ID(userdata)
     cur='NULL',          --Current scene name
     swapping=false,      --If Swapping
     stat={
@@ -14,6 +15,8 @@ local SCN={
         draw=false,      --Swap draw  func
     },
     stack={},--Scene stack
+    prev=false,
+    args={},--Arguments from previous scene
 
     scenes=scenes,
 
@@ -51,13 +54,15 @@ function SCN.swapUpdate(dt)
     S.time=S.time-dt
     if S.time<S.changeTime and S.time+dt>=S.changeTime then
         --Scene swapped this frame
-        SCN.init(S.tar,SCN.cur)
+        SCN.prev=SCN.cur
+        SCN.init(S.tar)
+        SCN.mainTouchID=nil
     end
     if S.time<0 then
         SCN.swapping=false
     end
 end
-function SCN.init(s,org)
+function SCN.init(s)
     love.keyboard.setTextInput(false)
 
     local S=scenes[s]
@@ -87,7 +92,7 @@ function SCN.init(s,org)
     SCN.update=S.update
     SCN.draw=S.draw
     if S.sceneInit then
-        S.sceneInit(org)
+        S.sceneInit()
     end
 end
 function SCN.push(tar,style)
@@ -163,11 +168,12 @@ local swap={
         end
     },
 }--Scene swapping animations
-function SCN.swapTo(tar,style)--Parallel scene swapping, cannot back
+function SCN.swapTo(tar,style,...)--Parallel scene swapping, cannot back
     if scenes[tar]then
         if not SCN.swapping and tar~=SCN.cur then
             style=style or'fade'
             SCN.swapping=true
+            SCN.args={...}
             local S=SCN.stat
             S.tar,S.style=tar,style
             S.time=swap[style].duration
@@ -178,15 +184,15 @@ function SCN.swapTo(tar,style)--Parallel scene swapping, cannot back
         MES.new('warn',"No Scene: "..tar)
     end
 end
-function SCN.go(tar,style)--Normal scene swapping, can back
+function SCN.go(tar,style,...)--Normal scene swapping, can back
     if scenes[tar]then
         SCN.push()
-        SCN.swapTo(tar,style)
+        SCN.swapTo(tar,style,...)
     else
         MES.new('warn',"No Scene: "..tar)
     end
 end
-function SCN.back()
+function SCN.back(...)
     if SCN.swapping then return end
 
     --Leave scene
@@ -197,7 +203,7 @@ function SCN.back()
     --Poll&Back to previous Scene
     local m=#SCN.stack
     if m>0 then
-        SCN.swapTo(SCN.stack[m-1],SCN.stack[m])
+        SCN.swapTo(SCN.stack[m-1],SCN.stack[m],...)
         SCN.stack[m],SCN.stack[m-1]=nil
     end
 end

Zframework/sfx.lua

@@ -1,97 +1,170 @@
-local SFX={
-    vol=1,
-    stereo=1,
-    getCount=function()return 0 end,
-    load=function()error("Cannot load before init!")end,
-    fieldPlay=NULL,
-    play=NULL,
-    fplay=NULL,
-    reset=NULL,
+local type,rem=type,table.remove
+local int,rnd=math.floor,math.random
+local interval=MATH.interval
+
+local sfxList={}
+local packSetting={}
+local Sources={}
+local volume=1
+local stereo=1
+
+local noteVal={
+    C=1,c=1,
+    D=3,d=3,
+    E=5,e=5,
+    F=6,f=6,
+    G=8,g=8,
+    A=10,a=10,
+    B=12,b=12,
 }
+local noteName={'C','C#','D','D#','E','F','F#','G','G#','A','A#','B'}
+local function _getTuneHeight(tune)
+    local octave=tonumber(tune:sub(-1,-1))
+    if octave then
+        local tuneHeight=noteVal[tune:sub(1,1)]
+        if tuneHeight then
+            tuneHeight=tuneHeight+(octave-1)*12
+            local s=tune:sub(2,2)
+            if s=='s'or s=='#'then
+                tuneHeight=tuneHeight+1
+            elseif s=='f'or s=='b'then
+                tuneHeight=tuneHeight-1
+            end
+            return tuneHeight
+        end
+    end
+end
+
+local SFX={}
+
+function SFX.init(list)
+    assert(type(list)=='table',"Initialize SFX lib with a list of filenames!")
+    for i=1,#list do table.insert(sfxList,list[i])end
+end
+function SFX.load(path)
+    local c=0
+    local missing=0
+    for i=1,#sfxList do
+        local fullPath=path..sfxList[i]..'.ogg'
+        if love.filesystem.getInfo(fullPath)then
+            if Sources[sfxList[i]]then
+                for j=1,#Sources[sfxList[i]]do
+                    Sources[sfxList[i]][j]:release()
+                end
+            end
+            Sources[sfxList[i]]={love.audio.newSource(fullPath,'static')}
+            c=c+1
+        else
+            LOG("No SFX: "..sfxList[i]..'.ogg',.1)
+            missing=missing+1
+        end
+    end
+    LOG(c.."/"..#sfxList.." SFX files loaded")
+    LOG(missing.." SFX files missing")
+    if missing>0 then
+        MES.new('info',missing.." SFX files missing")
+    end
+    collectgarbage()
+end
+function SFX.loadSample(pack)
+    assert(type(pack)=='table',"Usage: SFX.loadsample([table])")
+    assert(pack.name,"No field: name")
+    assert(pack.path,"No field: path")
+    local num=1
+    while love.filesystem.getInfo(pack.path..'/'..num..'.ogg')do
+        Sources[pack.name..num]={love.audio.newSource(pack.path..'/'..num..'.ogg','static')}
+        num=num+1
+    end
+    local base=(_getTuneHeight(pack.base)or 37)-1
+    local top=base+num-1
+    packSetting[pack.name]={base=base,top=top}
+    LOG((num-1).." "..pack.name.." samples loaded")
+end
+
+function SFX.getCount()
+    return #sfxList
+end
 function SFX.setVol(v)
-    assert(type(v)=='number'and v>=0 and v<=1)
-    SFX.vol=v
+    assert(type(v)=='number'and v>=0 and v<=1,'Wrong volume')
+    volume=v
 end
 function SFX.setStereo(v)
-    assert(type(v)=='number'and v>=0 and v<=1)
-    SFX.stereo=v
+    assert(type(v)=='number'and v>=0 and v<=1,'Wrong stereo')
+    stereo=v
 end
-function SFX.init(list)
-    SFX.init=nil
-    local rem=table.remove
-    local Sources={}
 
-    local count=#list function SFX.getCount()return count end
-    function SFX.load(path)
-        for i=1,count do
-            local fullPath=path..list[i]..'.ogg'
-            if love.filesystem.getInfo(fullPath)then
-                Sources[list[i]]={love.audio.newSource(fullPath,'static')}
+function SFX.getNoteName(note)
+    if note<1 then
+        return'---'
+    else
+        note=note-1
+        local octave=int(note/12)+1
+        return noteName[note%12+1]..octave
+    end
+end
+function SFX.playSample(pack,...)--vol-1, sampSet1, vol-2, sampSet2
+    if ... then
+        local arg={...}
+        local vol
+        for i=1,#arg do
+            local a=arg[i]
+            if type(a)=='number'and a<=1 then
+                vol=a
             else
-                LOG("No SFX: "..list[i]..'.ogg',.1)
+                local base=packSetting[pack].base
+                local top=packSetting[pack].top
+                local tune=type(a)=='string'and _getTuneHeight(a)or a--Absolute tune in number
+                local playTune=tune+rnd(-2,2)
+                if playTune<=base then--Too low notes
+                    playTune=base+1
+                elseif playTune>top then--Too high notes
+                    playTune=top
+                end
+                SFX.play(pack..playTune-base,vol,nil,tune-playTune)
             end
         end
-
-        function SFX.play(s,vol,pos)
-            if SFX.vol==0 or vol==0 then return end
-            local S=Sources[s]--Source list
-            if not S then return end
-            local n=1
-            while S[n]:isPlaying()do
-                n=n+1
-                if not S[n]then
-                    S[n]=S[1]:clone()
-                    S[n]:seek(0)
-                    break
-                end
-            end
-            S=S[n]--AU_SRC
-            if S:getChannelCount()==1 then
-                if pos then
-                    pos=pos*SFX.stereo
-                    S:setPosition(pos,1-pos^2,0)
-                else
-                    S:setPosition(0,0,0)
-                end
-            end
-            S:setVolume(((vol or 1)*SFX.vol)^1.626)
-            S:play()
+    end
+end
+local function _play(name,vol,pos,pitch)
+    if volume==0 or vol==0 then return end
+    local S=Sources[name]--Source list
+    if not S then return end
+    local n=1
+    while S[n]:isPlaying()do
+        n=n+1
+        if not S[n]then
+            S[n]=S[1]:clone()
+            S[n]:seek(0)
+            break
         end
-        function SFX.fplay(s,vol,pos)
-            local S=Sources[s]--Source list
-            if not S then return end
-            local n=1
-            while S[n]:isPlaying()do
-                n=n+1
-                if not S[n]then
-                    S[n]=S[1]:clone()
-                    S[n]:seek(0)
-                    break
-                end
-            end
-            S=S[n]--AU_SRC
-            if S:getChannelCount()==1 then
-                if pos then
-                    pos=pos*SFX.stereo
-                    S:setPosition(pos,1-pos^2,0)
-                else
-                    S:setPosition(0,0,0)
-                end
-            end
-            S:setVolume(vol^1.626)
-            S:play()
+    end
+    S=S[n]--AU_SRC
+    if S:getChannelCount()==1 then
+        if pos then
+            pos=interval(pos,-1,1)*stereo
+            S:setPosition(pos,1-pos^2,0)
+        else
+            S:setPosition(0,0,0)
         end
-        function SFX.reset()
-            for _,L in next,Sources do
-                if type(L)=='table'then
-                    for i=#L,1,-1 do
-                        if not L[i]:isPlaying()then
-                            rem(L,i)
-                        end
-                    end
+    end
+    S:setVolume(vol^1.626)
+    S:setPitch(pitch and 1.0594630943592953^pitch or 1)
+    S:play()
+end
+SFX.fplay=_play--Play sounds without apply module's volume setting
+function SFX.play(name,vol,pos,pitch)
+    _play(name,(vol or 1)*volume,pos,pitch)
+end
+function SFX.reset()
+    for _,L in next,Sources do
+        if type(L)=='table'then
+            for i=#L,1,-1 do
+                if not L[i]:isPlaying()then
+                    rem(L,i)
                 end
             end
         end
     end
 end
+
 return SFX

Zframework/stringExtend.lua

@@ -2,9 +2,25 @@ local data=love.data
 local STRING={}
 local assert,tostring,tonumber=assert,tostring,tonumber
 local int,format=math.floor,string.format
-local find,sub,upper=string.find,string.sub,string.upper
+local find,sub,gsub,upper=string.find,string.sub,string.gsub,string.upper
 local char,byte=string.char,string.byte
 
+--"Replace dollars", replace all $n with ...
+function STRING.repD(str,...)
+    local l={...}
+    for i=#l,1,-1 do
+        str=gsub(str,'$'..i,l[i])
+    end
+    return str
+end
+
+--"Scan arg", scan if str has the arg (format of str is like "-json -q", arg is like "-q")
+function STRING.sArg(str,switch)
+    if find(str.." ",switch.." ")then
+        return true
+    end
+end
+
 do--function STRING.shiftChar(c)
     local shiftMap={
         ['1']='!',['2']='@',['3']='#',['4']='$',['5']='%',
@@ -63,9 +79,9 @@ function STRING.time(t)
     if t<60 then
         return format("%.3f\"",t)
     elseif t<3600 then
-        return format("%d'%05.2f\"",int(t/60),t%60)
+        return format("%d'%05.2f\"",int(t/60),int(t%60*100)/100)
     else
-        return format("%d:%.2d'%05.2f\"",int(t/3600),int(t/60%60),t%60)
+        return format("%d:%.2d'%05.2f\"",int(t/3600),int(t/60%60),int(t%60*100)/100)
     end
 end
 
@@ -153,6 +169,25 @@ function STRING.vcsDecrypt(text,key)
     end
     return result..buffer
 end
+function STRING.digezt(text)--Not powerful hash, just protect the original text
+    local out={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
+    local seed=26
+    for i=1,#text do
+        local c=byte(text,i)
+        seed=(seed+c)%26
+        c=c+seed
+        local pos=c*i%16
+        local step=(c+i)%4+1
+        local times=2+(c%6)
+        for _=1,times do
+            out[pos+1]=(out[pos+1]+c)%256
+            pos=(pos+step)%16
+        end
+    end
+    local result=""
+    for i=1,16 do result=result..char(out[i])end
+    return result
+end
 
 function STRING.readLine(str)
     local p=str:find("\n")
@@ -162,6 +197,9 @@ function STRING.readLine(str)
         return str,""
     end
 end
+function STRING.readChars(str,n)
+    return sub(str,1,n),sub(str,n+1)
+end
 
 function STRING.packBin(s)
     return data.encode('string','base64',data.compress('string','zlib',s))

Zframework/tableExtend.lua

@@ -1,4 +1,5 @@
 local find=string.find
+local rem=table.remove
 local next,type=next,type
 local TABLE={}
 
@@ -46,6 +47,18 @@ function TABLE.cover(new,old)
     end
 end
 
+--For all things in new, push to old
+function TABLE.coverR(new,old)
+    for k,v in next,new do
+        if type(v)=='table'and type(old[k])=='table'then
+            TABLE.coverR(v,old[k])
+        else
+            old[k]=v
+        end
+    end
+end
+
+
 --For all things in new if same type in old, push to old
 function TABLE.update(new,old)
     for k,v in next,new do
@@ -71,7 +84,7 @@ function TABLE.complete(new,old)
     end
 end
 
---Remove positive integer index of table
+--Remove [1~#] of table
 function TABLE.cut(G)
     for i=1,#G do
         G[i]=nil
@@ -85,11 +98,53 @@ function TABLE.clear(G)
     end
 end
 
+--Remove duplicated value of [1~#]
+function TABLE.trimDuplicate(org)
+    local cache={}
+    for i=1,#org,-1 do
+        if cache[org[i]]then
+            rem(org,i)
+        else
+            cache[org[i]]=true
+        end
+    end
+end
+
+--Discard duplicated value
+function TABLE.remDuplicate(org)
+    local cache={}
+    for k,v in next,org do
+        if cache[v]then
+            org[k]=nil
+        else
+            cache[v]=true
+        end
+    end
+end
+
+
+--Reverse [1~#]
+function TABLE.reverse(org)
+    local l=#org
+    for i=1,math.floor(l/2)do
+        org[i],org[l+1-i]=org[l+1-i],org[i]
+    end
+end
+
+--------------------------
+
 --Find value in [1~#]
 function TABLE.find(t,val)
     for i=1,#t do if t[i]==val then return i end end
 end
 
+--Return next value of [1~#] (by value)
+function TABLE.next(t,val)
+    for i=1,#t do if t[i]==val then return t[i%#t+1]end end
+end
+
+--------------------------
+
 --Find value in whole table
 function TABLE.search(t,val)
     for k,v in next,t do if v==val then return k end end
@@ -104,6 +159,8 @@ function TABLE.reIndex(org)
     end
 end
 
+--------------------------
+
 --Dump a simple lua table
 do--function TABLE.dump(L,t)
     local tabs={

Zframework/task.lua

@@ -23,7 +23,7 @@ function TASK.update(dt)
 end
 function TASK.new(code,...)
     local thread=coroutine.create(code)
-    resume(thread,...)
+    assert(resume(thread,...))
     if status(thread)~='dead'then
         tasks[#tasks+1]={
             thread=thread,

Zframework/test.lua

@@ -0,0 +1,12 @@
+local TEST={}
+
+--Wait for the scene swapping animation to finish
+function TEST.yieldUntilNextScene()
+    while SCN.swapping do YIELD()end
+end
+
+function TEST.yieldN(frames)
+    for _=1,frames do YIELD()end
+end
+
+return TEST

Zframework/vibrate.lua

@@ -1,6 +1,12 @@
 local level={0,0,.01,.016,.023,.03,.04,.05,.06,.07,.08,.09,.12,.15}
 local vib=love.system.vibrate
-return function(t)
-    t=level[t]
-    if t then vib(t)end
-end
+return love.system.getOS()=='iOS'and
+    function(t)
+        t=level[t]
+        if t then vib(t<=.03 and 1 or t<=.09 and 2 or 3)end
+    end
+or
+    function(t)
+        t=level[t]
+        if t then vib(t)end
+    end

Zframework/voice.lua

@@ -1,5 +1,7 @@
+local rnd=math.random
+local volume=1
+local diversion=0
 local VOC={
-    vol=1,
     getCount=function()return 0 end,
     getQueueCount=function()return 0 end,
     load=function()error("Cannot load before init!")end,
@@ -7,13 +9,16 @@ local VOC={
     play=NULL,
     update=NULL,
 }
+function VOC.setDiversion(n)
+    assert(type(n)=='number'and n>0 and n<12,'Wrong div')
+    diversion=n
+end
 function VOC.setVol(v)
-    assert(type(v)=='number'and v>=0 and v<=1)
-    VOC.vol=v
+    assert(type(v)=='number'and v>=0 and v<=1,'Wrong volume')
+    volume=v
 end
 function VOC.init(list)
     VOC.init=nil
-    local rnd=math.random
     local rem=table.remove
     local voiceQueue={free=0}
     local bank={}--{vocName1={SRC1s},vocName2={SRC2s},...}
@@ -72,7 +77,7 @@ function VOC.init(list)
         end
 
         function VOC.play(s,chn)
-            if VOC.vol>0 then
+            if volume>0 then
                 local _=Source[s]
                 if not _ then return end
                 if chn then
@@ -95,13 +100,15 @@ function VOC.init(list)
                     end
                 elseif Q.s==1 then--Waiting load source
                     Q[1]=_getVoice(Q[1])
-                    Q[1]:setVolume(VOC.vol)
+                    Q[1]:setVolume(volume)
+                    Q[1]:setPitch(1.0594630943592953^(diversion*(rnd()*2-1)))
                     Q[1]:play()
                     Q.s=Q[2]and 2 or 4
                 elseif Q.s==2 then--Playing 1,ready 2
                     if Q[1]:getDuration()-Q[1]:tell()<.08 then
                         Q[2]=_getVoice(Q[2])
-                        Q[2]:setVolume(VOC.vol)
+                        Q[2]:setVolume(volume)
+                        Q[1]:setPitch(1.0594630943592953^(diversion*(rnd()*2-1)))
                         Q[2]:play()
                         Q.s=3
                     end

Zframework/websocket_thread.lua

@@ -151,7 +151,7 @@ local readThread=coroutine.wrap(function()
         if op==8 then--8=close
             CHN_push(readCHN,8)--close
             if type(res)=='string'then
-                CHN_push(readCHN,res:sub(3))--Warning: 2 bytes close code at start so :sub(3)
+                CHN_push(readCHN,res:sub(3))--[Warning] 2 bytes close code at start so :sub(3)
             else
                 CHN_push(readCHN,"WS closed")
             end

Zframework/wheelScroll.lua

@@ -9,11 +9,11 @@ return function(y,key1,key2)
         trigDist=min(trigDist,0)-(-y)^1.2
     end
     while trigDist>=1 do
-        love.keypressed(key1 or"up")
+        love.keypressed(key1 or'up')
         trigDist=trigDist-1
     end
     while trigDist<=-1 do
-        love.keypressed(key2 or"down")
+        love.keypressed(key2 or'down')
         trigDist=trigDist+1
     end
 end

Zframework/widget.lua

@@ -10,15 +10,16 @@ local gc_rectangle=gc.rectangle
 local gc_print,gc_printf=gc.print,gc.printf
 
 local kb=love.keyboard
+local timer=love.timer.getTime
 
 local next=next
-local int,ceil,abs=math.floor,math.ceil,math.abs
+local int,ceil=math.floor,math.ceil
 local max,min=math.max,math.min
 local sub,ins,rem=string.sub,table.insert,table.remove
-local mDraw,mDraw_X,mDraw_Y=GC.draw,GC.simpX,GC.simpY
 local xOy=SCR.xOy
 local FONT=FONT
 local mStr=GC.mStr
+local approach=MATH.expApproach
 
 local downArrowIcon=GC.DO{40,25,{'fPoly',0,0,20,25,40,0}}
 local upArrowIcon=GC.DO{40,25,{'fPoly',0,25,20,0,40,25}}
@@ -28,7 +29,7 @@ local clearIcon=GC.DO{40,40,
     {'fRect',11,14,18,21},
 }
 local sureIcon=GC.DO{40,40,
-    {'setFT',35},
+    {'rawFT',35},
     {'mText',"?",20,0},
 }
 local smallerThen=GC.DO{20,20,
@@ -45,7 +46,12 @@ local function _rectangleStencil()
     gc.rectangle('fill',1,1,STW-2,STH-2)
 end
 
+local onChange=NULL
+
 local WIDGET={}
+
+function WIDGET.setOnChange(func)onChange=assert(type(func)=='function'and func,"WIDGET.setOnChange(func): func must be a function")end
+
 local widgetMetatable={
     __tostring=function(self)
         return self:getInfo()
@@ -72,24 +78,28 @@ function text:draw()
     if self.alpha>0 then
         local c=self.color
         gc_setColor(c[1],c[2],c[3],self.alpha)
+        local w=self.obj:getWidth()
+        local k=min(self.lim/self.obj:getWidth(),1)
         if self.align=='M'then
-            mDraw_X(self.obj,self.x,self.y)
+            gc_draw(self.obj,self.x,self.y,nil,k,1,w*.5,0)
         elseif self.align=='L'then
-            gc_draw(self.obj,self.x,self.y)
+            gc_draw(self.obj,self.x,self.y,nil,k,1)
         elseif self.align=='R'then
-            gc_draw(self.obj,self.x-self.obj:getWidth(),self.y)
+            gc_draw(self.obj,self.x,self.y,nil,k,1,w,0)
         end
     end
 end
-function WIDGET.newText(D)--name,x,y[,fText][,color][,font=30][,align='M'][,hideF][,hide]
+function WIDGET.newText(D)--name,x,y[,lim][,fText][,color][,font=30][,fType][,align='M'][,hideF][,hide]
     local _={
         name= D.name or"_",
         x=    D.x,
         y=    D.y,
+        lim=  D.lim or 1e99,
 
         fText=D.fText,
         color=D.color and(COLOR[D.color]or D.color)or COLOR.Z,
         font= D.font or 30,
+        fType=D.fType,
         align=D.align or'M',
         hideF=D.hideF,
     }
@@ -138,7 +148,7 @@ function button:reset()
 end
 function button:setObject(obj)
     if type(obj)=='string'or type(obj)=='number'then
-        self.obj=gc.newText(FONT.get(self.font),obj)
+        self.obj=gc.newText(FONT.get(self.font,self.fType),obj)
     elseif obj then
         self.obj=obj
     end
@@ -147,9 +157,9 @@ function button:isAbove(x,y)
     local ATV=self.ATV
     return
         x>self.x-ATV and
-        y>self.y-ATV and
+        y>self.y and
         x<self.x+self.w+2*ATV and
-        y<self.y+self.h+2*ATV
+        y<self.y+self.h
 end
 function button:getCenter()
     return self.x+self.w*.5,self.y+self.h*.5
@@ -170,45 +180,49 @@ function button:draw()
 
     --Button
     gc_setColor(.15+r*.7,.15+g*.7,.15+b*.7,.9)
-    gc_rectangle('fill',x-ATV,y-ATV,w+2*ATV,h+2*ATV,3)
+    gc_rectangle('fill',x-ATV,y,w+2*ATV,h,4)
+    gc_setLineWidth(2)
+    gc_setColor(.3+r*.7,.3+g*.7,.3+b*.7)
+    gc_rectangle('line',x-ATV,y,w+2*ATV,h,5)
     if ATV>0 then
-        gc_setLineWidth(2)
         gc_setColor(.97,.97,.97,ATV*.125)
-        gc_rectangle('line',x-ATV+2,y-ATV+2,w+2*ATV-4,h+2*ATV-4,3)
+        gc_rectangle('line',x-ATV,y,w+2*ATV,h,3)
     end
 
     --Drawable
     local obj=self.obj
-    local y0=y+h*.5-ATV*.5
+    local ox,oy=obj:getWidth()*.5,obj:getHeight()*.5
+    local y0=y+h*.5
     gc_setColor(1,1,1,.2+ATV*.05)
     if self.align=='M'then
         local x0=x+w*.5
-        mDraw(obj,x0-1,y0-1)
-        mDraw(obj,x0-1,y0+1)
-        mDraw(obj,x0+1,y0-1)
-        mDraw(obj,x0+1,y0+1)
+        local kx=obj:type()=='Text'and min(w/ox/2,1)or 1
+        gc_draw(obj,x0-1,y0-1,nil,kx,1,ox,oy)
+        gc_draw(obj,x0-1,y0+1,nil,kx,1,ox,oy)
+        gc_draw(obj,x0+1,y0-1,nil,kx,1,ox,oy)
+        gc_draw(obj,x0+1,y0+1,nil,kx,1,ox,oy)
         gc_setColor(r*.55,g*.55,b*.55)
-        mDraw(obj,x0,y0)
+        gc_draw(obj,x0,y0,nil,kx,1,ox,oy)
     elseif self.align=='L'then
         local edge=self.edge
-        mDraw_Y(obj,x+edge-1,y0-1)
-        mDraw_Y(obj,x+edge-1,y0+1)
-        mDraw_Y(obj,x+edge+1,y0-1)
-        mDraw_Y(obj,x+edge+1,y0+1)
+        gc_draw(obj,x+edge-1,y0-1-oy)
+        gc_draw(obj,x+edge-1,y0+1-oy)
+        gc_draw(obj,x+edge+1,y0-1-oy)
+        gc_draw(obj,x+edge+1,y0+1-oy)
         gc_setColor(r*.55,g*.55,b*.55)
-        mDraw_Y(obj,x+edge,y0)
+        gc_draw(obj,x+edge,y0-oy)
     elseif self.align=='R'then
-        local x0=x+w-self.edge-obj:getWidth()
-        mDraw_Y(obj,x0-1,y0-1)
-        mDraw_Y(obj,x0-1,y0+1)
-        mDraw_Y(obj,x0+1,y0-1)
-        mDraw_Y(obj,x0+1,y0+1)
+        local x0=x+w-self.edge-ox*2
+        gc_draw(obj,x0-1,y0-1-oy)
+        gc_draw(obj,x0-1,y0+1-oy)
+        gc_draw(obj,x0+1,y0-1-oy)
+        gc_draw(obj,x0+1,y0+1-oy)
         gc_setColor(r*.55,g*.55,b*.55)
-        mDraw_Y(obj,x0,y0)
+        gc_draw(obj,x0,y0-oy)
     end
 end
 function button:getInfo()
-    return("x=%d,y=%d,w=%d,h=%d,font=%d"):format(self.x+self.w*.5,self.y+self.h*.5,self.w,self.h,self.font)
+    return("x=%d,y=%d,w=%d,h=%d,font=%d"):format(self.x+self.w*.5,self.y+self.h*.5,self.w,self.h,self.font,self.fType)
 end
 function button:press(_,_,k)
     self.code(k)
@@ -216,15 +230,15 @@ function button:press(_,_,k)
     SYSFX.newRectRipple(
         6,
         self.x-ATV,
-        self.y-ATV-WIDGET.scrollPos,
+        self.y-WIDGET.scrollPos,
         self.w+2*ATV,
-        self.h+2*ATV
+        self.h
     )
     if self.sound then
-        SFX.play('button')
+        SFX.play(self.sound)
     end
 end
-function WIDGET.newButton(D)--name,x,y,w[,h][,fText][,color][,font=30][,sound=true][,align='M'][,edge=0],code[,hideF][,hide]
+function WIDGET.newButton(D)--name,x,y,w[,h][,fText][,color][,font=30][,fType][,sound][,align='M'][,edge=0][,code][,hideF][,hide]
     if not D.h then D.h=D.w end
     local _={
         name= D.name or"_",
@@ -245,13 +259,21 @@ function WIDGET.newButton(D)--name,x,y,w[,h][,fText][,color][,font=30][,sound=tr
         fText=D.fText,
         color=D.color and(COLOR[D.color]or D.color)or COLOR.Z,
         font= D.font or 30,
+        fType=D.fType,
         align=D.align or'M',
         edge= D.edge or 0,
-        sound=D.sound~=false,
-        code= D.code,
+        code= D.code or NULL,
         hideF=D.hideF,
         hide= D.hide,
     }
+    if D.sound==false then
+        _.sound=false
+    elseif type(D.sound)=='string'then
+        _.sound=D.sound
+    else
+        _.sound='button'
+    end
+
     for k,v in next,button do _[k]=v end
     setmetatable(_,widgetMetatable)
     return _
@@ -267,7 +289,7 @@ function key:reset()
 end
 function key:setObject(obj)
     if type(obj)=='string'or type(obj)=='number'then
-        self.obj=gc.newText(FONT.get(self.font),obj)
+        self.obj=gc.newText(FONT.get(self.font,self.fType),obj)
     elseif obj then
         self.obj=obj
     end
@@ -297,48 +319,54 @@ function key:draw()
     local align=self.align
     local r,g,b=c[1],c[2],c[3]
 
-    --Frame
-    if not self.noFrame then
-        gc_setColor(.2+r*.8,.2+g*.8,.2+b*.8,.7)
-        gc_setLineWidth(2)
-        gc_rectangle('line',x,y,w,h,3)
-    end
-
     --Fill
     if self.fShade then
         gc_setColor(r,g,b,ATV*.25)
         if align=='M'then
-            mDraw(self.fShade,x+w*.5,y+h*.5)
+            gc_draw(self.fShade,x+w*.5-self.fShade:getWidth()*.5,y+h*.5-self.fShade:getHeight()*.5)
         elseif align=='L'then
-            mDraw_Y(self.fShade,x+self.edge,y+h*.5)
+            gc_draw(self.fShade,x+self.edge,y+h*.5-self.fShade:getHeight()*.5)
         elseif align=='R'then
-            mDraw_Y(self.fShade,x+w-self.edge-self.fShade:getWidth(),y+h*.5)
+            gc_draw(self.fShade,x+w-self.edge-self.fShade:getWidth(),y+h*.5-self.fShade:getHeight()*.5)
         end
     else
+        --Background
+        gc_setColor(0,0,0,.3)
+        gc_rectangle('fill',x,y,w,h,4)
+
+        --Frame
+        gc_setColor(.2+r*.8,.2+g*.8,.2+b*.8,.7)
+        gc_setLineWidth(2)
+        gc_rectangle('line',x,y,w,h,3)
+
+        --Shade
         gc_setColor(1,1,1,ATV*.05)
         gc_rectangle('fill',x,y,w,h,3)
     end
 
     --Drawable
+    local obj=self.obj
+    local ox,oy=obj:getWidth()*.5,obj:getHeight()*.5
     gc_setColor(r,g,b)
     if align=='M'then
-        mDraw(self.obj,x+w*.5,y+h*.5)
+        local kx=obj:type()=='Text'and min(w/ox/2,1)or 1
+        gc_draw(obj,x+w*.5,y+h*.5,nil,kx,1,ox,oy)
     elseif align=='L'then
-        mDraw_Y(self.obj,x+self.edge,y+h*.5)
+        gc_draw(obj,x+self.edge,y-oy+h*.5)
     elseif align=='R'then
-        mDraw_Y(self.obj,x+w-self.edge-self.obj:getWidth(),y+h*.5)
+        gc_draw(obj,x+w-self.edge-ox*2,y-oy+h*.5)
     end
 end
 function key:getInfo()
-    return("x=%d,y=%d,w=%d,h=%d,font=%d"):format(self.x+self.w*.5,self.y+self.h*.5,self.w,self.h,self.font)
+    return("x=%d,y=%d,w=%d,h=%d,font=%d"):format(self.x+self.w*.5,self.y+self.h*.5,self.w,self.h,self.font,self.fType)
 end
 function key:press(_,_,k)
     self.code(k)
     if self.sound then
-        SFX.play('key')
+        SFX.play(self.sound)
     end
 end
-function WIDGET.newKey(D)--name,x,y,w[,h][,fText][,fShade][,noFrame][,color][,font=30][,sound=true][,align='M'][,edge=0],code[,hideF][,hide]
+function WIDGET.newKey(D)--name,x,y,w[,h][,fText][,fShade][,color][,font=30][,fType][,sound][,align='M'][,edge=0][,code][,hideF][,hide]
     if not D.h then D.h=D.w end
     local _={
         name=   D.name or"_",
@@ -358,16 +386,22 @@ function WIDGET.newKey(D)--name,x,y,w[,h][,fText][,fShade][,noFrame][,color][,fo
 
         fText=  D.fText,
         fShade= D.fShade,
-        noFrame=D.noFrame,
         color=  D.color and(COLOR[D.color]or D.color)or COLOR.Z,
         font=   D.font or 30,
-        sound=  D.sound~=false,
+        fType=  D.fType,
         align=  D.align or'M',
         edge=   D.edge or 0,
-        code=   D.code,
+        code=   D.code or NULL,
         hideF=  D.hideF,
         hide=   D.hide,
     }
+    if D.sound==false then
+        _.sound=false
+    elseif type(D.sound)=='string'then
+        _.sound=D.sound
+    else
+        _.sound='key'
+    end
     for k,v in next,key do _[k]=v end
     setmetatable(_,widgetMetatable)
     return _
@@ -407,6 +441,10 @@ function switch:draw()
     local x,y=self.x,self.y
     local ATV=self.ATV
 
+    --Background
+    gc_setColor(0,0,0,.3)
+    gc_rectangle('fill',x,y-25,50,50,4)
+
     --Frame
     gc_setLineWidth(2)
     gc_setColor(1,1,1,.6+ATV*.1)
@@ -429,15 +467,15 @@ function switch:draw()
     gc_draw(obj,x-12-ATV,y,nil,min(self.lim/obj:getWidth(),1),1,obj:getWidth(),obj:getHeight()*.5)
 end
 function switch:getInfo()
-    return("x=%d,y=%d,font=%d"):format(self.x,self.y,self.font)
+    return("x=%d,y=%d,font=%d"):format(self.x,self.y,self.font,self.fType)
 end
 function switch:press()
     self.code()
     if self.sound then
-        SFX.play('move')
+        SFX.play(self.disp()and'check'or'uncheck')
     end
 end
-function WIDGET.newSwitch(D)--name,x,y[,lim][,fText][,color][,font=30][,sound=true][,disp],code[,hideF][,hide]
+function WIDGET.newSwitch(D)--name,x,y[,lim][,fText][,color][,font=30][,fType][,sound=true][,disp][,code][,hideF][,hide]
     local _={
         name= D.name or"_",
 
@@ -452,9 +490,10 @@ function WIDGET.newSwitch(D)--name,x,y[,lim][,fText][,color][,font=30][,sound=tr
         fText=D.fText,
         color=D.color and(COLOR[D.color]or D.color)or COLOR.Z,
         font= D.font or 30,
+        fType=D.fType,
         sound=D.sound~=false,
         disp= D.disp,
-        code= D.code,
+        code= D.code or NULL,
         hideF=D.hideF,
         hide= D.hide,
     }
@@ -490,7 +529,7 @@ function slider:isAbove(x,y)
     return x>self.x-10 and x<self.x+self.w+10 and y>self.y-25 and y<self.y+25
 end
 function slider:getCenter()
-    return self.x+self.w*(self.pos/self.unit),self.y
+    return self.x+self.w*((self.pos-self.rangeL)/(self.rangeR-self.rangeL)),self.y
 end
 function slider:update(dt)
     local ATV=self.ATV
@@ -504,7 +543,7 @@ function slider:update(dt)
         if ATV>0 then self.ATV=max(ATV-dt*30,0)end
     end
     if not self.hide then
-        self.pos=self.pos*.7+self.disp()*.3
+        self.pos=approach(self.pos,self.disp(),dt*26)
     end
 end
 function slider:draw()
@@ -517,8 +556,8 @@ function slider:draw()
     --Units
     if not self.smooth then
         gc_setLineWidth(2)
-        for p=0,self.unit do
-            local X=x+(x2-x)*p/self.unit
+        for p=self.rangeL,self.rangeR,self.unit do
+            local X=x+(x2-x)*(p-self.rangeL)/(self.rangeR-self.rangeL)
             gc_line(X,y+7,X,y-7)
         end
     end
@@ -528,7 +567,7 @@ function slider:draw()
     gc_line(x,y,x2,y)
 
     --Block
-    local cx=x+(x2-x)*self.pos/self.unit
+    local cx=x+(x2-x)*(self.pos-self.rangeL)/(self.rangeR-self.rangeL)
     local bx,by,bw,bh=cx-10-ATV*.5,y-16-ATV,20+ATV,32+2*ATV
     gc_setColor(.8,.8,.8)
     gc_rectangle('fill',bx,by,bw,bh,3)
@@ -563,16 +602,19 @@ end
 function slider:drag(x)
     if not x then return end
     x=x-self.x
-    local p=self.disp()
-    local P=x<0 and 0 or x>self.w and self.unit or x/self.w*self.unit
-    if not self.smooth then
-        P=int(P+.5)
+    local newPos=MATH.interval(x/self.w,0,1)
+    local newVal
+    if not self.unit then
+        newVal=(1-newPos)*self.rangeL+newPos*self.rangeR
+    else
+        newVal=newPos*(self.rangeR-self.rangeL)
+        newVal=self.rangeL+newVal-newVal%self.unit
     end
-    if p~=P then
-        self.code(P)
+    if newVal~=self.disp()then
+        self.code(newVal)
     end
-    if self.change and TIME()-self.lastTime>.5 then
-        self.lastTime=TIME()
+    if self.change and timer()-self.lastTime>.5 then
+        self.lastTime=timer()
         self.change()
     end
 end
@@ -582,19 +624,25 @@ function slider:release(x)
 end
 function slider:scroll(n)
     local p=self.disp()
-    local u=self.smooth and .01 or 1
-    local P=n==-1 and max(p-u,0)or min(p+u,self.unit)
+    local u=self.unit or .01
+    local P=MATH.interval(p+u*n,self.rangeL,self.rangeR)
     if p==P or not P then return end
     self.code(P)
-    if self.change and TIME()-self.lastTime>.18 then
-        self.lastTime=TIME()
+    if self.change and timer()-self.lastTime>.18 then
+        self.lastTime=timer()
         self.change()
     end
 end
 function slider:arrowKey(k)
-    self:scroll((k=="left"or k=="up")and -1 or 1)
+    self:scroll((k=='left'or k=='up')and -1 or 1)
 end
-function WIDGET.newSlider(D)--name,x,y,w[,lim][,fText][,color][,unit][,smooth][,font=30][,change],disp[,show],code,hide
+function WIDGET.newSlider(D)--name,x,y,w[,lim][,fText][,color][,axis][,smooth][,font=30][,fType][,change],disp[,show][,code],hide
+    if not D.axis then
+        D.axis={0,1,false}
+        D.smooth=true
+    elseif not D.axis[3]then
+        D.smooth=true
+    end
     local _={
         name=  D.name or"_",
 
@@ -613,32 +661,30 @@ function WIDGET.newSlider(D)--name,x,y,w[,lim][,fText][,color][,unit][,smooth][,
 
         fText= D.fText,
         color= D.color and(COLOR[D.color]or D.color)or COLOR.Z,
-        unit=  D.unit or 1,
-        smooth=false,
+        rangeL=D.axis[1],
+        rangeR=D.axis[2],
+        unit=  D.axis[3],
+        smooth=D.smooth,
         font=  D.font or 30,
+        fType= D.fType,
         change=D.change,
         disp=  D.disp,
-        code=  D.code,
+        code=  D.code or NULL,
         hideF= D.hideF,
         hide=  D.hide,
         show=  false,
     }
-    if D.smooth~=nil then
-        _.smooth=D.smooth
-    else
-        _.smooth=_.unit<=1
-    end
     if D.show then
         if type(D.show)=='function'then
             _.show=D.show
         else
             _.show=sliderShowFunc[D.show]
         end
-    elseif D.show~=false then
-        if _.unit<=1 then
-            _.show=sliderShowFunc.percent
-        else
+    elseif D.show~=false then--Use default if nil
+        if _.unit and _.unit%1==0 then
             _.show=sliderShowFunc.int
+        else
+            _.show=sliderShowFunc.percent
         end
     end
     for k,v in next,slider do _[k]=v end
@@ -656,15 +702,16 @@ local selector={
 function selector:reset()
     self.ATV=0
     local V,L=self.disp(),self.list
-    local i=TABLE.find(L,V)
-    if i then
-        self.select=i
-        self.selText=self.list[i]
-    else
-        self.select=0
-        self.selText=""
-        MES.new('error',"Selector "..self.name.." dead, disp= "..tostring(V))
+    for i=1,#L do
+        if L[i]==V then
+            self.select=i
+            self.selText=self.list[i]
+            return
+        end
     end
+    self.select=0
+    self.selText=""
+    MES.new('error',"Selector "..self.name.." dead, disp= "..tostring(V))
 end
 function selector:isAbove(x,y)
     return
@@ -689,6 +736,10 @@ function selector:draw()
     local w=self.w
     local ATV=self.ATV
 
+    --Background
+    gc_setColor(0,0,0,.3)
+    gc_rectangle('fill',x,y,w,60,4)
+
     --Frame
     gc_setColor(1,1,1,.6+ATV*.1)
     gc_setLineWidth(2)
@@ -696,7 +747,7 @@ function selector:draw()
 
     --Arrow
     gc_setColor(1,1,1,.2+ATV*.1)
-    local t=(TIME()%.5)^.5
+    local t=(timer()%.5)^.5
     if self.select>1 then
         gc_draw(smallerThen,x+6,y+33)
         if ATV>0 then
@@ -742,7 +793,7 @@ function selector:press(x)
             self.select=s
             self.selText=self.list[s]
             if self.sound then
-                SFX.play('prerotate')
+                SFX.play('selector')
             end
         end
     end
@@ -762,14 +813,14 @@ function selector:scroll(n)
     self.select=s
     self.selText=self.list[s]
     if self.sound then
-        SFX.play('prerotate')
+        SFX.play('selector')
     end
 end
 function selector:arrowKey(k)
-    self:scroll((k=="left"or k=="up")and -1 or 1)
+    self:scroll((k=='left'or k=='up')and -1 or 1)
 end
 
-function WIDGET.newSelector(D)--name,x,y,w[,fText][,color][,sound=true],list,disp,code,hide
+function WIDGET.newSelector(D)--name,x,y,w[,fText][,color][,sound=true],list,disp[,code],hide
     local _={
         name= D.name or"_",
 
@@ -791,7 +842,7 @@ function WIDGET.newSelector(D)--name,x,y,w[,fText][,color][,sound=true],list,dis
         font= 30,
         list= D.list,
         disp= D.disp,
-        code= D.code,
+        code= D.code or NULL,
         hideF=D.hideF,
         hide= D.hide,
     }
@@ -852,18 +903,24 @@ function inputBox:draw()
     local x,y,w,h=self.x,self.y,self.w,self.h
     local ATV=self.ATV
 
-    gc_setColor(1,1,1,ATV*.08)
-    gc_rectangle('fill',x,y,w,h,3)
+    --Background
+    gc_setColor(0,0,0,.4)
+    gc_rectangle('fill',x,y,w,h,4)
 
+    --Highlight
+    gc_setColor(1,1,1,ATV*.08*(math.sin(TIME()*4.2)*.2+.8))
+    gc_rectangle('fill',x,y,w,h,4)
+
+    --Frame
     gc_setColor(1,1,1)
     gc_setLineWidth(3)
     gc_rectangle('line',x,y,w,h,3)
 
     --Drawable
     local f=self.font
-    FONT.set(f)
+    FONT.set(f,self.fType)
     if self.obj then
-        mDraw_Y(self.obj,x-12-self.obj:getWidth(),y+h*.5)
+        gc_draw(self.obj,x-12-self.obj:getWidth(),y+h*.5-self.obj:getHeight()*.5)
     end
     if self.secret then
         y=y+h*.5-f*.2
@@ -890,21 +947,21 @@ end
 function inputBox:keypress(k)
     local t=self.value
     if #t>0 and EDITING==""then
-        if k=="backspace"then
+        if k=='backspace'then
             local p=#t
             while t:byte(p)>=128 and t:byte(p)<192 do
                 p=p-1
             end
             t=sub(t,1,p-1)
             SFX.play('lock')
-        elseif k=="delete"then
+        elseif k=='delete'then
             t=""
             SFX.play('hold')
         end
         self.value=t
     end
 end
-function WIDGET.newInputBox(D)--name,x,y,w[,h][,font=30][,secret][,regex][,limit],hide
+function WIDGET.newInputBox(D)--name,x,y,w[,h][,font=30][,fType][,secret][,regex][,limit],hide
     local _={
         name=  D.name or"_",
 
@@ -920,6 +977,7 @@ function WIDGET.newInputBox(D)--name,x,y,w[,h][,font=30][,secret][,regex][,limit
         },
 
         font=  D.font or int(D.h/7-1)*5,
+        fType= D.fType,
         secret=D.secret==true,
         regex= D.regex,
         limit= D.limit,
@@ -997,9 +1055,9 @@ function textBox:scroll(dir)
     self:drag(nil,nil,nil,-dir*self.lineH)
 end
 function textBox:arrowKey(k)
-    if k=="up"then
+    if k=='up'then
         self:scroll(-1)
-    elseif k=="down"then
+    elseif k=='down'then
         self:scroll(-1)
     end
 end
@@ -1011,8 +1069,8 @@ function textBox:draw()
     local lineH=self.lineH
 
     --Background
-    gc_setColor(0,0,0,.4)
-    gc_rectangle('fill',x,y,w,h,3)
+    gc_setColor(0,0,0,.3)
+    gc_rectangle('fill',x,y,w,h,4)
 
     --Frame
     gc_setLineWidth(2)
@@ -1020,7 +1078,7 @@ function textBox:draw()
     gc_rectangle('line',x,y,w,h,3)
 
     --Texts
-    FONT.set(self.font)
+    FONT.set(self.font,self.fType)
     gc_push('transform')
         gc_translate(x,y)
 
@@ -1052,7 +1110,7 @@ end
 function textBox:getInfo()
     return("x=%d,y=%d,w=%d,h=%d"):format(self.x+self.w*.5,self.y+self.h*.5,self.w,self.h)
 end
-function WIDGET.newTextBox(D)--name,x,y,w,h[,font=30][,lineH][,fix],hide
+function WIDGET.newTextBox(D)--name,x,y,w,h[,font=30][,fType][,lineH][,fix],hide
     local _={
         name= D.name or"_",
 
@@ -1074,6 +1132,7 @@ function WIDGET.newTextBox(D)--name,x,y,w,h[,font=30][,lineH][,fix],hide
         h=    D.h,
 
         font= D.font or 30,
+        fType=D.fType,
         fix=  D.fix,
         texts={},
         hideF=D.hideF,
@@ -1151,7 +1210,7 @@ function listBox:press(x,y)
     if self.list[y]then
         if self.selected~=y then
             self.selected=y
-            SFX.play('click',.4)
+            SFX.play('selector',.8,0,12)
         end
     end
 end
@@ -1174,6 +1233,14 @@ function listBox:arrowKey(dir)
         end
     end
 end
+function listBox:select(i)
+    self.selected=i
+    if self.selected<int(self.scrollPos/self.lineH)+2 then
+        self:drag(nil,nil,nil,1e99)
+    elseif self.selected>int(self.scrollPos/self.lineH)+self.capacity-1 then
+        self:drag(nil,nil,nil,-1e99)
+    end
+end
 function listBox:draw()
     local x,y,w,h=self.x,self.y,self.w,self.h
     local list=self.list
@@ -1184,6 +1251,10 @@ function listBox:draw()
     gc_push('transform')
         gc_translate(x,y)
 
+        --Background
+        gc_setColor(0,0,0,.4)
+        gc_rectangle('fill',0,0,w,h,4)
+
         --Frame
         gc_setColor(WIDGET.sel==self and COLOR.lN or COLOR.Z)
         gc_setLineWidth(2)
@@ -1212,7 +1283,7 @@ end
 function listBox:getInfo()
     return("x=%d,y=%d,w=%d,h=%d"):format(self.x+self.w*.5,self.y+self.h*.5,self.w,self.h)
 end
-function WIDGET.newListBox(D)--name,x,y,w,h,lineH[,hideF][,hide][,drawF]
+function WIDGET.newListBox(D)--name,x,y,w,h,lineH,drawF[,hideF][,hide]
     local _={
         name=    D.name or"_",
 
@@ -1269,16 +1340,7 @@ function WIDGET.setWidgetList(list)
         for i=1,#list do
             list[i]:reset()
         end
-        if SCN.cur~='custom_field'then
-            local colorList=THEME.getThemeColor()
-            if not colorList then return end
-            local rnd=math.random
-            for _,W in next,list do
-                if W.color and not W.fText then
-                    W.color=colorList[rnd(#colorList)]
-                end
-            end
-        end
+        onChange()
     end
 end
 function WIDGET.setScrollHeight(height)
@@ -1371,101 +1433,17 @@ function WIDGET.release(x,y)
         W:release(x,y+WIDGET.scrollPos)
     end
 end
-function WIDGET.keyPressed(k,isRep)
-    local W=WIDGET.sel
-    if k=="space"or k=="return"then
-        if not isRep then
-            WIDGET.press()
-        end
-    elseif k=="up"or k=="down"or k=="left"or k=="right"then
-        if kb.isDown("lshift","lalt","lctrl")then
-            --Control some widgets with arrowkeys when hold shift/ctrl/alt
-            if W and W.arrowKey then W:arrowKey(k)end
-        else
-            if not W then
-                for _,w in next,WIDGET.active do
-                    if not w.hide and w.isAbove then
-                        WIDGET.focus(w)
-                        return
-                    end
-                end
-            elseif W.getCenter then
-                local WX,WY=W:getCenter()
-                local dir=(k=="right"or k=="down")and 1 or -1
-                local tar
-                local minDist=1e99
-                local swap_xy=k=="up"or k=="down"
-                if swap_xy then WX,WY=WY,WX end--note that we do not swap them back later
-                for _,W1 in ipairs(WIDGET.active)do
-                    if W~=W1 and W1.resCtr and not W1.hide then
-                        local L=W1.resCtr
-                        for j=1,#L,2 do
-                            local x,y=L[j],L[j+1]
-                            if swap_xy then x,y=y,x end--note that we do not swap them back later
-                            local dist=(x-WX)*dir
-                            if dist>10 then
-                                dist=dist+abs(y-WY)*6.26
-                                if dist<minDist then
-                                    minDist=dist
-                                    tar=W1
-                                end
-                            end
-                        end
-                    end
-                end
-                if tar then
-                    WIDGET.focus(tar)
-                end
-            end
-        end
-    else
-        if W and W.keypress then
-            W:keypress(k)
-        end
-    end
-end
 function WIDGET.textinput(texts)
     local W=WIDGET.sel
     if W and W.type=='inputBox'then
         if(not W.regex or texts:match(W.regex))and(not W.limit or #(WIDGET.sel.value..texts)<=W.limit)then
             WIDGET.sel.value=WIDGET.sel.value..texts
-            SFX.play('move')
+            SFX.play('touch')
         else
-            SFX.play('finesseError',.3)
+            SFX.play('drop_cancel')
         end
     end
 end
-local keyMirror={
-    dpup="up",
-    dpdown="down",
-    dpleft="left",
-    dpright="right",
-    start="return",
-    back="escape",
-}
-function WIDGET.gamepadPressed(i)
-    if i=="start"then
-        WIDGET.press()
-    elseif i=="a"or i=="b"then
-        local W=WIDGET.sel
-        if W then
-            if W.type=='button'or W.type=='key'then
-                WIDGET.press()
-            elseif W.type=='slider'then
-                local p=W.disp()
-                local P=i=="left"and(p>0 and p-1)or p<W.unit and p+1
-                if p==P or not P then return end
-                W.code(P)
-                if W.change and TIME()-W.lastTime>.18 then
-                    W.lastTime=TIME()
-                    W.change()
-                end
-            end
-        end
-    elseif i=="dpup"or i=="dpdown"or i=="dpleft"or i=="dpright"then
-        WIDGET.keyPressed(keyMirror[i])
-    end
-end
 
 function WIDGET.update(dt)
     for _,W in next,WIDGET.active do

contributing.md

@@ -1,87 +0,0 @@
-# 代码规范
-注:小程序和外部库等部分代码可以不遵守
-## 缩进
-    全部使用四个空格
-## 文件尾
-    文件尾要有空行
-## 变量名
-    库            全大写
-    库方法和全局变量   小驼峰
-    局部函数        下划线开头小驼峰
-    简单的局部变量    多个单词首字母或大写单字母
-    需要阅读的局部变量  小驼峰
-## 常用语句块格式
-```lua
-f() -- 语句末不需要加分号
-
-if c1 then
-    s1
-elseif c2 then
-    s2
-else
-    s3
-end
-
-while c do
-    s
-end
-
-for i=1,#l do
-    s
-end
-
-for k,v in next,table do -- pairs(table)最好换成next,table
-    s
-end
-
-repeat
-    s
-until c
-
-do
-    s
-end
-```
-## 单行/多行注释
-```lua
-单行代码--注释1
-
---注释2
-函数或者代码块
-
---[[这里最好带上几个字的概述,方便折叠的时候预览,方括号间等号能不带就不带
-    注释内容
-]]
-函数或者代码块
-```
-## 字符串
-    可能输出到外部给玩家或者看的(或给开发者看的debug信息)用双引号
-    只存在于代码中不对外展示的字符串用单引号
-    双方括号(等号能不带就不带)用于大段文本
-## 代码紧凑
-### 少空格(这几种地方不要用空格)
-    逗号后
-    运算符两边
-    左括号前
-    右括号后
-### 省小括号
-    如果一个函数只能接受一个输入
-    并且输入的值是table或者string
-    那么小括号要省略,例如
-    GC.DO{100,40
-        {'print',"Hello",0,0},
-        {'print',"World",0,20},
-    }
-### 少空格紧凑方法
-    用正则查找替换,把
-    \s?([+\-*/=()\[\]{}"']|==|>=|<=|~=|\.\.)\s?
-    全部替换成
-    $1
-    注意,需要缩进模式为制表符,可以先切到制表符然后替换再切回去
-    注意,字符串常量内部首尾空格会被替换
-## goto
-### 所有标签必须使用下列前缀的一个
-    BREAK_     类似一般的break,用于跳出任意层,可能跳过循环后一部分代码
-    CONTINUE_  类似一般的continue,用于快速跳到循环的末尾执行下一次循环
-    THROW_     类似一般的catch,用于捕获错误或跳出一个块并执行统一操作
-    REPEAT_    返回到前面一个点,用于重新执行某个操作

document/legals.txt

@@ -1,29 +0,0 @@
-TECHMINO © 2019-2021 26F Studio. Some rights reserved.
-TECHMINO and "26F Studio" are trademarks of 26F Studio.
-The TECHMINO game and source code are under a GNU Lesser General Public License Version 3.
-
-TECHMINO is not a fan game. TECHMINO and 26F Studio are not affiliated  with Tetris Holding, LLC or The Tetris Company, Inc. in any way.
-
-"Tetris" is the registered trademark of The Tetris Holding, LLC, licensed to The Tetris Company, Inc.
-
-Powered by LÖVE, © 2006-2021 LÖVE Development Team.
-
-Lua is free software distributed under the terms of the MIT license. Copyright © 1994~2021 by Lua.org, PUC-Rio.
-
-The Apple logo, "Apple Inc.," iOS, iPadOS, macOS, iPhone, and Mac are registered trademarks of Apple Inc. in the United States of America and other countries or regions.
-
-"Windows", the Windows logo, "Xbox", Xbox logo, and "Microsoft" are registered trademarks of Microsoft Corporation in the United States of America and other countries or regions.
-
-Alibaba Sans is copyrighted by Alibaba Group Holding Limited. Alibaba is a trademark of Alibaba Group Holding Limited in the People’s Republic of China and other countries or regions.
-
-JetBrains Mono is copyrighted by the JetBrains Mono Project authors. JetBrains Mono is a trademark of JetBrains s.r.o. JetBrains Mono is licensed under the SIL Open Font License, Version 1.1.
-
-"PlayStation", "PS", "PlayStation Family Mark", "PS logo", "DualSense" and "Play Has No Limits" are registered trademarks or trademarks of Sony Interactive Entertainment Inc. "SONY" is a registered trademark of Sony Corporation. © 2021 Sony Interactive Entertainment LLC.
-
-GoldWave is a registered trademark of GoldWave, Inc.
-
-Linux is a registered trademark of Linus Torvalds. 
-
-Touhou Project © Team Shanghai Alice 2002-2021.
-
-All other trademarks are the property of their respective owners.

document/mode.txt

@@ -1,149 +0,0 @@
-模式文件应当是一个合(语)法的lua程序文件，其必须返回一个table，里面的内容包括：
-    color:
-        必选
-        模式的颜色，用于点击地图图标后显示的提示文本
-    env:
-        必选
-        模式环境变量，决定了关卡的各项属性
-            *属性名*          *默认值*         *说明*
-            drop            60             下落延迟(帧，支持正整数,1/2^n,和0(20G))
-            lock            60             锁定延迟(帧)
-            wait            0              出块延迟(帧)
-            fall            0              消行延迟(帧)
-            bone            false          是否开启骨块模式
-            fieldH          20             场地高度
-            heightLimit     1e99           允许的最大场地高度
-            nextCount       6              显示next个数
-            nextStartPos    1              next从第几个开始显示
-            holdCount       1              hold个数
-            infHold         false          是否能无限hold
-            phyHold         false          是否开启物理hold
-            ospin           true           是否能O-spin
-            deepDrop        false          是否开启深降
-            RS              'TRS'          旋转系统名
-
-            das             10             DAS
-            arr             2              ARR
-            sddas           2              软降DAS
-            sdarr           2              软降ARR
-            mindas          0              允许的最小DAS
-            minarr          0              允许的最小ARR
-            minsdarr        0              允许的最小软降ARR
-            ihs             true           提前Hold
-            irs             true           提前旋转
-            ims             true           提前移动
-
-            skinSet         [设置]          方块贴图，只能填写内置皮肤的名字
-            skin            [设置]          方块颜色，包含25个整数(1~16)的table
-            face            [设置]          方块朝向，包含25个整数(0~3)的table
-
-            block           true           是否显示方块
-            ghost           0.3            影子透明度(0~1)
-            center          1              旋转中心透明度(0~1)
-            smooth          false          是否平滑下落
-            grid            0.16           网格透明度(0~1)
-            bagLine         true           是否显示包分界线(如果存在)
-            lockFX          2              锁定特效等级(0~5整数)
-            dropFX          2              瞬间下落特效等级(0~5整数)
-            moveFX          2              移动特效等级(0~5整数)
-            clearFX         2              消除特效等级(0~5整数)
-            splashFX        2              溅射特效等级(0~5整数)
-            shakeFX         2              晃动特效等级(0~5整数)
-            atkFX           2              攻击特效等级(0~5整数)
-
-            text            true           是否显示消行文本
-            score           true           是否显示落块分数
-            highCam         false          是否开启超屏视野
-            nextPos         false          是否开启生成预览
-            showSpike       false          是否开启spike计数器
-
-            hideBoard       false          场地隐藏模式("down"|"up"|"all")
-            flipBoard       false          场地翻转模式("U-D"|"L-R"|"180")
-
-            sequence        bag'           序列模式，是放一块后对next序列的刷新函数，可以使用默认的几个函数用字符串表示。也可以自己写一个，注意：使用协程技术
-            seqData         {1,2,3,4,5,6,7}序列模式使用的"包"数据(本质是生成序列用的数据，会作为参数传进上面那个叫sequence的序列生成函数，不一定是包)
-            mission         false          包含任务的table，说明暂时略
-
-            life            0              生命数(复活次数)
-            garbageSpeed    1              垃圾行释放速度
-            pushSpeed       3              垃圾行上涨速度
-            noTele          false          是否禁止10个高级按键
-            visible         'show'         方块可见性，填写固定的几个字符串
-            freshLimit      1e99           锁延刷新次数限制
-            easyFresh       true           是否使用简单锁延刷新规则
-            bufferLimit     1e99           攻击缓冲行数上限
-
-            fkey1           false          按下功能键1后执行的函数
-            fkey2           false          按下功能键2后执行的函数
-            keyCancel       {}             包含禁止使用的按键的id，例如{1,2}就是禁止左移和右移
-            fine            [设置]          是否开启非极简提示音
-            fineKill        false          是否开启非极简即死
-            b2bKill         false          是否开启断b2b即死
-            missionKill     false          是否开启强制任务
-            noInitSZO       false          是否禁止SZO块开局，如果禁止，开局序列会自动跳过最多连续五个SZO
-
-            mesDisp         NULL           需要在玩家侧边栏显示的信息(或函数列表,依次执行,可以显示在外面但是强烈不建议)，输入玩家对象
-            dropPiece       NULL           放一块后要执行的函数(或函数列表,依次执行)，输入玩家对象
-            task            NULL           每帧会*继续执行*的函数(或函数列表,依次执行,返回true会把自身从队列里清除)(初始化时会执行一次，可以用来设置场地等)，输入玩家对象，注意：使用协程技术
-            eventSet        false          使用预设事件套件名称(字符串)，和上面三个套件会叠加，使用时请小心，尽量不要同时指定太多组件
-
-            bg              'none'         背景，只能填写内置背景的名字
-            bgm             'race'         背景音乐名(或者列表随机，例如{'race','push'})，只能用内置音乐库的音乐名
-            allowMod        true           是否允许mod
-    load:
-        必选
-        模式初始化函数，一般创建一个玩家即可
-        无输入
-        无输出
-
-    score:
-        可选(不填就没有分数保存和计算)
-        一局打完后要存储的数据
-        输入玩家对象
-        输出游戏结束瞬间返回一个包含直接决定该模式成绩的数据table(会被强制加上date标签)
-
-    scoreDisp:
-        可选(模式不出现在地图上的时候不用写)
-        是把score()存起来的table转换为字符串显示出来的函数
-        输入一个成绩table
-        输出一个字符串
-
-    comp:
-        可选(没有score函数的时候不用写)
-        是成绩table之间对比并排序的规则
-        输入两个成绩table
-        输出[第一个是不是排在第二个前面]的布尔值(可以类比"小于"运算)
-
-    getRank:
-        可选，模式评级函数
-        是用于评价玩家表现的函数
-        输入玩家对象
-        输出0~5，0表示除了记录到排行榜外什么都不做；1/2/3/4/5表示D/C/B/A/S级，能解锁连接的模式，还会让模式图标在地图上显示不同的颜色
-
-以下是40行的模式文件内容:
-//sprint_40l.lua
-return{--返回一个table，你也可以在之前定义一些常量或者函数什么的
-    color=COLOR.green,--颜色
-    env={--模式环境变量
-        drop=60,lock=60,
-        eventSet='checkLine_40',--这个预设eventSet包含了dropPiece和mesDisp，就是40行需要的东西
-        bg='bg2',bgm='race',
-    },
-    load=function()--模式加载函数，这里只生成了一个玩家，常用的单人模式可以不写，默认使用这个函数
-        PLY.newPlayer(1)--1是玩家编号，默认用户控制1号玩家
-    end,
-    score=function(P)return{P.stat.time,P.stat.piece}end,--游戏结束时需要保存的本局关键信息
-    scoreDisp=function(D)return STRING.time(D[1]).."   "..D[2].." Pieces"end,--把score返回的数据显示出来的方法
-    comp=function(a,b)return a[1]<b[1]or a[1]==b[1]and a[2]<b[2]end,--按照时间排序，时间一样就看块数
-    getRank=function(P)--计算评级
-        if P.stat.row<40 then return end--你总得打完40行对吧，否则直接return空掉，成绩都不记录
-        local T=P.stat.time
-        return
-        T<=26 and 5 or--时间小于等于26秒就是S级要求
-        T<=32.6 and 4 or--A级要求
-        T<=52.6 and 3 or--B级要求
-        T<=92.9 and 2 or--C级要求
-        T<=183 and 1 or--D级要求，解锁别的模式的最低标准
-        0--记录成绩的最低标准
-    end,
-}

document/voice.txt

@@ -1,59 +0,0 @@
-Techmino配音说明文档
-
-每一个都可以录任意多条，用的时候会随机取一个，听起来更自然
-每一个都可以录任意多条，用的时候会随机取一个，听起来更自然
-每一个都可以录任意多条，用的时候会随机取一个，听起来更自然
-
-多条语音说明：
-    录了多条的在播放时会随机挑选一个播放，所以组合性的语音大概率不能随意发挥，不然和其他组合起来可能就会出现奇怪的现象
-    例：多条mini语音文件名应为 mini_1.ogg，mini_2.ogg，...
-    如果只有一个，"_1"可以省略，一个mini.ogg就行，但是多个文件的数字不能跳开，必须从1开始一个个写
-
-投稿语音包请使用wav格式，方便我留源文件，未来有需要的时候重新转格式；
-打算自己导入游戏的话需要降噪+裁剪+调整音量后再转为ogg格式 （不支持别的，因为ogg体积小）
-
-目前游戏内正在使用的音频:
-    【尖括号里是念的，方括号里是文件名，没写就跟尖括号里一样】
-    【尖括号里是念的，方括号里是文件名，没写就跟尖括号里一样】
-    【尖括号里是念的，方括号里是文件名，没写就跟尖括号里一样】
-
-    <single>
-    <double>
-    <triple>
-    <techrash> 读作\'tekrʌʃ\
-    <pentacrash> 读作\'ˈpæntəkrʌʃ\
-    <hexacrash> 读作\'heksəkrʌʃ\
-    用于消行
-
-    <mini>
-    <b2b> 读作back to back，有点长，可以读快一点
-    <b2b2b> 读作back to back to back，有点长，可以读快一点
-    用于加在 *-spin 前面，注意结束时语气要上扬，后面要接东西
-
-    <z spin>[zspin0] 用于不消行，注意结束时语气要下降，注意这个文件名就是自带0，后面还要接_1 _2等
-    <z spin>[zspin] 用于消行，注意结束时语气要上扬，后面要接东西
-    这两条要有所有方块的版本，文件名就替换第一个字母，包括:
-        Z S L J T O I（四连块）
-        P Q F E U V W X R Y N H（五连块）
-        C（三连块）
-
-    <all clear>[all_clear] 全消语音，建议也录几个perfect clear
-    <clear> 半全消语音，建议也录几个half clear
-
-    <win> 胜利语音，自由发挥
-    <lose> 失败语音，自由发挥
-    <welcome> 开游戏语音，自由发挥
-    <bye> 关游戏语音，自由发挥
-    这几个长度不要太长，最多最多最多2秒，建议多录几种不同的
-
-    <test> 测试音量用语音，要非常短，比如“啊”“喵”“呜”
-    <happy> 彩蛋语音，建议用短的笑声
-    <doubt> 彩蛋语音，建议“嗯？”声
-
-目前没有用到但是将要加入的，可能会修改导致用不上，条件方便的话可以顺便带上:
-    <split> 隔断消除
-    <air> 架空消除
-    <mix> 混合消除
-    <color> 彩色消除
-    <deep> 穿透消除
-    注意这些结束时语气全都要上扬，后面要接东西

legals.md

@@ -0,0 +1,51 @@
+TECHMINO © 2019-2021 26F Studio. Some rights reserved.
+
+TECHMINO and "26F Studio" are trademarks of 26F Studio. The TECHMINO game and source code are under a GNU Lesser General Public License Version 3.
+
+
+"Tetris" is the registered trademark of The Tetris Holding, LLC, licensed to The Tetris Company, Inc. TECHMINO is not a fan game of Tetris. TECHMINO and 26F Studio are not affiliated with Tetris Holding, LLC or The Tetris Company, Inc. in any way.
+
+
+Powered by LÖVE, © 2006-2021 LÖVE Development Team.
+
+Lua is free software distributed under the terms of the MIT license. Copyright © 1994-2021 by Lua.org, PUC-Rio.
+
+SIMPLE LOVE LIGHTS is under a MIT License. Created by Dylan Hunn.
+
+json.lua is copyrighted by rxi. © 2021 rxi.
+
+IBM Plex is copyrighted by the International Business Machines Corporation. IBM and IBM Plex are trademarks of IBM Corp, registered in many jurisdictions worldwide. IBM Plex is licensed under the SIL Open Font License, Version 1.1.
+
+
+Source Han Sans is copyrighted by Adobe Inc. Source Han Sans and Adobe are registered trademarks of Adobe Inc. in United States and other countries or regions. Source Han Sans is licensed under the SIL Open Font License, Version 1.1.
+
+
+JetBrains Mono is copyrighted by the JetBrains Mono Project authors. JetBrains Mono is a trademark of JetBrains s.r.o. JetBrains Mono is licensed under the SIL Open Font License, Version 1.1.
+
+
+"PlayStation", "PS", "PlayStation Family Mark", "PS logo", "DualSense" and "Play Has No Limits" are registered trademarks or trademarks of Sony Interactive Entertainment Inc. "SONY" is a registered trademark of Sony Corporation. © 2021 Sony Interactive Entertainment LLC.
+
+
+"Windows", the Windows logo, "Xbox", Xbox logo, and "Microsoft" are registered trademarks of Microsoft Corporation in the United States of America and other countries or regions.
+
+
+The Apple logo, "Apple Inc.," iOS, iPadOS, macOS, iPhone, and Mac are registered trademarks of Apple Inc. in the United States of America and other countries or regions.
+
+
+"EA" and "Electronic Arts" are registered trademarks of Electronic Arts Inc. © 2021 Electronic Arts Inc.
+
+SEGA and the SEGA logo are registered trademarks of Sega Corporation. © 2021 Sega Corporation.
+
+Oculus Quest is a registered trademark of Facebook Technologies, LLC. © Meta Platforms, Inc.
+
+"Nintendo" is a registered trademarks of Nintendo Co., Ltd. © 2021 Nintendo Co., Ltd.
+
+N3TWORK is a registered trademark of N3TWORK Inc. © 2021 N3TWORK Inc.
+
+GoldWave is a registered trademark of GoldWave, Inc.
+
+Linux is a registered trademark of Linus Torvalds.
+
+Touhou Project © Team Shanghai Alice 2002-2021.
+
+All other trademarks, logos, and copyrights are the properties of their respective owners.

main.lua

@@ -23,11 +23,14 @@ local fs=love.filesystem
 VERSION=require"version"
 TIME=love.timer.getTime
 YIELD=coroutine.yield
-SYSTEM=love.system.getOS()
+SYSTEM=love.system.getOS()if SYSTEM=='OS X'then SYSTEM='macOS'end
+FNNS=SYSTEM:find'\79\83'--What does FNSF stand for? IDK so don't ask me lol
 MOBILE=SYSTEM=='Android'or SYSTEM=='iOS'
 SAVEDIR=fs.getSaveDirectory()
 
 --Global Vars & Settings
+SFXPACKS={'chiptune'}
+VOCPACKS={'miya',--[['mono',]]'xiaoya','miku'}
 FIRSTLAUNCH=false
 DAILYLAUNCH=false
 
@@ -42,11 +45,37 @@ if MOBILE then
     love.window.setMode(w,h,f)
 end
 
+local _LOADTIMELIST_={}
+local _LOADTIME_=TIME()
+
 --Load modules
 Z=require'Zframework'
-FONT.init('parts/fonts/proportional.ttf')
+FONT.load{
+    norm='parts/fonts/proportional.ttf',
+    mono='parts/fonts/monospaced.ttf',
+}
+FONT.setDefault('norm')
+FONT.setFallback('norm')
+
 SCR.setSize(1280,720)--Initialize Screen size
+BGM.setMaxSources(5)
 BGM.setChange(function(name)MES.new('music',text.nowPlaying..name,5)end)
+VOC.setDiversion(.62)
+
+WIDGET.setOnChange(function()
+    if SCN.cur~='custom_field'then
+        local colorList=THEME.getThemeColor()
+        if not colorList then return end
+        local rnd=math.random
+        for _,W in next,SCN.scenes[SCN.cur].widgetList do
+            if W.color then
+                W.color=colorList[rnd(#colorList)]
+            end
+        end
+    end
+end)
+
+table.insert(_LOADTIMELIST_,("Load Zframework: %.3fs"):format(TIME()-_LOADTIME_))
 
 --Create shortcuts
 setFont=FONT.set
@@ -54,6 +83,10 @@ getFont=FONT.get
 mStr=GC.mStr
 mText=GC.simpX
 mDraw=GC.draw
+Snd=SFX.playSample
+string.repD=STRING.repD
+string.sArg=STRING.sArg
+string.split=STRING.split
 
 --Delete all naked files (from too old version)
 FILE.clear('')
@@ -69,20 +102,21 @@ for _,v in next,{'conf','record','replay','cache','lib'}do
     end
 end
 
+CHAR=require'parts.char'
+require'parts.gameTables'
+require'parts.gameFuncs'
+
 --Load shader files from SOURCE ONLY
 SHADER={}
 for _,v in next,fs.getDirectoryItems('parts/shaders')do
-    if fs.getRealDirectory('parts/shaders/'..v)~=SAVEDIR then
+    if isSafeFile('parts/shaders/'..v)then
         local name=v:sub(1,-6)
         SHADER[name]=love.graphics.newShader('parts/shaders/'..name..'.glsl')
     end
 end
 
-CHAR=require'parts.char'
-require'parts.gameTables'
-require'parts.gameFuncs'
-
-FREEROW=    require'parts.freeRow'
+THEME=      require'parts.theme'
+LINE=       require'parts.line'
 DATA=       require'parts.data'
 
 TEXTURE=    require'parts.texture'
@@ -93,13 +127,18 @@ VK=         require'parts.virtualKey'
 BOT=        require'parts.bot'
 RSlist=     require'parts.RSlist'DSCP=RSlist.TRS.centerPos
 PLY=        require'parts.player'
-netPLY=     require'parts.netPlayer'
-MODES=      require'parts.modes'
+NETPLY=     require'parts.netPlayer'
+MODETREE=   require'parts.modeTree'
+
+setmetatable(TEXTURE,{__index=function(self,k)
+    MES.new('warn',"No texture called: "..k)
+    self[k]=PAPER
+    return self[k]
+end})
+
+table.insert(_LOADTIMELIST_,("Load Parts: %.3fs"):format(TIME()-_LOADTIME_))
 
 --Init Zframework
-Z.setIfPowerInfo(function()
-    return SETTING.powerInfo and LOADED
-end)
 do--Z.setCursor
     local normImg=GC.DO{16,16,
         {'fCirc',8,8,4},
@@ -117,7 +156,7 @@ do--Z.setCursor
     Z.setCursor(function(time,x,y)
         if not SETTING.sysCursor then
             local R=int((time+1)/2)%7+1
-            _=minoColor[SETTING.skin[R]]
+            _=BLOCK_COLORS[SETTING.skin[R]]
             gc_setColor(_[1],_[2],_[3],min(abs(1-time%2),.3))
             _=DSCP[R][0]
             gc_draw(TEXTURE.miniBlock[R],x,y,time%3.14159265359*4,16,16,_[2]+.5,#BLOCKS[R][0]-_[1]-.5)
@@ -133,8 +172,8 @@ Z.setOnFnKeys({
     function()
         if GAME.playing and not GAME.net then
             for _=1,8 do
-                local P=PLY_ALIVE[math.random(#PLY_ALIVE)]
-                if P and P~=PLAYERS[1]then
+                if #PLY_ALIVE>1 then
+                    local P=PLY_ALIVE[math.random(2,#PLY_ALIVE)]
                     P.lastRecv=PLAYERS[1]
                     P:lose()
                 end
@@ -143,8 +182,11 @@ Z.setOnFnKeys({
     end,
     function()print(WIDGET.getSelected()or"no widget selected")end,
     function()for k,v in next,_G do print(k,v)end end,
-    function()if love["_openConsole"]then love["_openConsole"]()end end,
+    function()if love['_openConsole']then love['_openConsole']()end end,
 })
+Z.setOnResize(function(w,_)
+    SHADER.warning:send('w',w*SCR.dpi)
+end)
 do--Z.setOnFocus
     local function task_autoSoundOff()
         while true do
@@ -186,15 +228,15 @@ end
 Z.setOnQuit(destroyPlayers)
 
 --Load settings and statistics
-TABLE.cover (FILE.load('conf/user')or{},USER)
-TABLE.cover (FILE.load('conf/unlock')or{},RANKS)
-TABLE.update(FILE.load('conf/settings')or{},SETTING)
-TABLE.update(FILE.load('conf/data')or{},STAT)
-TABLE.cover (FILE.load('conf/key')or{},keyMap)
-TABLE.cover (FILE.load('conf/virtualkey')or{},VK_org)
+TABLE.cover (loadFile('conf/user','-canSkip')or{},USER)
+TABLE.cover (loadFile('conf/unlock','-canSkip')or{},RANKS)
+TABLE.update(loadFile('conf/settings','-canSkip')or{},SETTING)
+TABLE.coverR(loadFile('conf/data','-canSkip')or{},STAT)
+TABLE.cover (loadFile('conf/key','-canSkip')or{},KEY_MAP)
+TABLE.cover (loadFile('conf/virtualkey','-json -canSkip')or{},VK_ORG)
 
 --Initialize fields, sequence, missions, gameEnv for cutsom game
-local fieldData=FILE.load('conf/customBoards','string')
+local fieldData=loadFile('conf/customBoards','-string -canSkip')
 if fieldData then
     fieldData=STRING.split(fieldData,"!")
     for i=1,#fieldData do
@@ -203,16 +245,16 @@ if fieldData then
 else
     FIELD[1]=DATA.newBoard()
 end
-local sequenceData=FILE.load('conf/customSequence','string')
+local sequenceData=loadFile('conf/customSequence','-string -canSkip')
 if sequenceData then
     DATA.pasteSequence(sequenceData)
 end
-local missionData=FILE.load('conf/customMissions','string')
+local missionData=loadFile('conf/customMissions','-string -canSkip')
 if missionData then
     DATA.pasteMission(missionData)
 end
-local customData=FILE.load('conf/customEnv')
-if customData and customData.version==VERSION.code then
+local customData=loadFile('conf/customEnv','-canSkip')
+if customData and customData['version']==VERSION.code then
     TABLE.complete(customData,CUSTOMENV)
 end
 TABLE.complete(require"parts.customEnv0",CUSTOMENV)
@@ -229,14 +271,17 @@ IMG.init{
     speedLimit='media/image/mess/speedLimit.png',--Not used, for future C2-mode
     pay1='media/image/mess/pay1.png',
     pay2='media/image/mess/pay2.png',
+    drought='media/image/mess/drought.png',
 
-    miyaCH='media/image/characters/miya.png',
-    miyaF1='media/image/characters/miya_f1.png',
-    miyaF2='media/image/characters/miya_f2.png',
-    miyaF3='media/image/characters/miya_f3.png',
-    miyaF4='media/image/characters/miya_f4.png',
+    miyaCH1='media/image/characters/miya1.png',
+    miyaCH2='media/image/characters/miya2.png',
+    miyaCH3='media/image/characters/miya3.png',
+    miyaCH4='media/image/characters/miya4.png',
+    miyaHeart='media/image/characters/miya_heart.png',
+    miyaGlow='media/image/characters/miya_glow.png',
     monoCH='media/image/characters/mono.png',
     xiaoyaCH='media/image/characters/xiaoya.png',
+    xiaoyaOmino='media/image/characters/xiaoya_Omino.png',
     mikuCH='media/image/characters/miku.png',
     electric='media/image/characters/electric.png',
     hbm='media/image/characters/hbm.png',
@@ -250,10 +295,10 @@ IMG.init{
         'media/image/lanterns/6.png',
     },
 }
-SKIN.init{
+SKIN.load{
     {name="crystal_scf",path='media/image/skin/crystal_scf.png'},
     {name="matte_mrz",path='media/image/skin/matte_mrz.png'},
-    {name="shiny_cho",path='media/image/skin/shiny_cho.png'},
+    {name="shiny_chno",path='media/image/skin/shiny_chno.png'},
     {name="contrast_mrz",path='media/image/skin/contrast_mrz.png'},
     {name="polkadots_scf",path='media/image/skin/polkadots_scf.png'},
     {name="toy_scf",path='media/image/skin/toy_scf.png'},
@@ -276,30 +321,27 @@ SKIN.init{
     {name="classic",path='media/image/skin/classic_unknown.png'},
     {name="ball_shaw",path='media/image/skin/ball_shaw.png'},
     {name="retro_notypey",path='media/image/skin/retro_notypey.png'},
+    {name="pixel_chno",path='media/image/skin/pixel_chno.png'},
     {name="textbone_mrz",path='media/image/skin/textbone_mrz.png'},
     {name="coloredbone_mrz",path='media/image/skin/coloredbone_mrz.png'},
     {name="wtf",path='media/image/skin/wtf_mrz.png'},
 }
 
 --Initialize sound libs
-SFX.init((function()
+SFX.init((function()--[Warning] Not loading files here, just get the list of sound needed
     local L={}
     for _,v in next,fs.getDirectoryItems('media/effect/chiptune/')do
-        if fs.getRealDirectory('media/effect/chiptune/'..v)~=SAVEDIR then
+        if isSafeFile('media/effect/chiptune/'..v,"Dangerous file : %SAVE%/media/effect/chiptune/"..v)then
             table.insert(L,v:sub(1,-5))
-        else
-            MES.new('warn',"Dangerous file : %SAVE%/media/effect/chiptune/"..v)
         end
     end
     return L
 end)())
-BGM.init((function()
+BGM.load((function()
     local L={}
     for _,v in next,fs.getDirectoryItems('media/music')do
-        if fs.getRealDirectory('media/music/'..v)~=SAVEDIR then
-            table.insert(L,{name=v:sub(1,-5),path='media/music/'..v})
-        else
-            MES.new('warn',"Dangerous file : %SAVE%/media/music/"..v)
+        if isSafeFile('media/music/'..v,"Dangerous file : %SAVE%/media/music/"..v)then
+            L[v:sub(1,-5)]='media/music/'..v
         end
     end
     return L
@@ -318,60 +360,64 @@ VOC.init{
 LANG.init('zh',
     {
         zh=require'parts.language.lang_zh',
-        zh2=require'parts.language.lang_zh2',
+        zh_trad=require'parts.language.lang_zh_trad',
+        zh_full=require'parts.language.lang_zh_full',
         en=require'parts.language.lang_en',
         fr=require'parts.language.lang_fr',
         es=require'parts.language.lang_es',
         pt=require'parts.language.lang_pt',
-        grass=require'parts.language.lang_zh3',
-        yygq=require'parts.language.lang_yygq',
+        id=require'parts.language.lang_id',
+        zh_grass=require'parts.language.lang_zh_grass',
+        zh_yygq=require'parts.language.lang_yygq',
         symbol=require'parts.language.lang_symbol',
         --1. Add language file to LANG folder;
         --2. Require it;
-        --3. Add a button in parts/scenes/setting_lang.lua;
+        --3. Add a button in parts/scenes/lang.lua;
     },
     {
-        block=BLOCKNAMES
+        block=BLOCK_NAMES
     },
     (function()
         local tipMeta={__call=function(L)return L[math.random(#L)]end}
         return function(L)
             if type(rawget(L,'getTip'))=='table'then setmetatable(L.getTip,tipMeta)end
+            setmetatable(L,{__index=function(self,k)
+                local mes="No Text ("..SETTING.locale.."): "..k
+                LOG(mes)
+                MES.new('warn',mes)
+                self[k]=CHAR.zChan.thinking
+                return self[k]
+            end})
         end
     end)()
 )
+
+table.insert(_LOADTIMELIST_,("Initialize Parts: %.3fs"):format(TIME()-_LOADTIME_))
+
 --Load background files from SOURCE ONLY
 for _,v in next,fs.getDirectoryItems('parts/backgrounds')do
-    if fs.getRealDirectory('parts/backgrounds/'..v)~=SAVEDIR then
-        if v:sub(-3)=='lua'then
-            local name=v:sub(1,-5)
-            BG.add(name,require('parts.backgrounds.'..name))
-        end
+    if isSafeFile('parts/backgrounds/'..v)and v:sub(-3)=='lua'then
+        local name=v:sub(1,-5)
+        BG.add(name,require('parts.backgrounds.'..name))
     end
 end
+BG.remList('none')BG.remList('gray')BG.remList('custom')
 --Load scene files from SOURCE ONLY
 for _,v in next,fs.getDirectoryItems('parts/scenes')do
-    if fs.getRealDirectory('parts/scenes/'..v)~=SAVEDIR then
+    if isSafeFile('parts/scenes/'..v)then
         local sceneName=v:sub(1,-5)
         SCN.add(sceneName,require('parts.scenes.'..sceneName))
         LANG.addScene(sceneName)
     end
 end
---Load mode files
-for i=1,#MODES do
-    local m=MODES[i]--Mode template
-    if fs.getRealDirectory('parts/modes/'..m.name)~=SAVEDIR then
-        TABLE.complete(require('parts.modes.'..m.name),MODES[i])
-        MODES[m.name],MODES[i]=MODES[i]
-    end
-end
+
+table.insert(_LOADTIMELIST_,("Load Files: %.3fs"):format(TIME()-_LOADTIME_))
 
 --Update data
 do
     local needSave
 
     if not fs.getInfo('conf/data')then
-        FIRSTLAUNCH=true
         needSave=true
     end
     if type(STAT.version)~='number'then
@@ -403,7 +449,6 @@ do
         if RANKS.tsd_u then
             RANKS.tsd_u=0
         end
-        needSave=true
     end
     if STAT.version==1601 then
         RANKS.round_e=nil
@@ -417,6 +462,21 @@ do
         fs.remove('record/round_l.rec')
         fs.remove('record/round_u.rec')
     end
+    if STAT.version<1700 and SETTING.dascut<5 then
+        SETTING.dascut=SETTING.dascut+1
+        needSave=true
+    end
+    if SETTING.vocPack=='mono'then
+        SETTING.vocPack='miya'
+    end
+    if RANKS.stack_e then
+        RANKS.stack_e=nil
+        RANKS.stack_h=nil
+        RANKS.stack_u=nil
+        fs.remove('record/stack_e.rec')
+        fs.remove('record/stack_h.rec')
+        fs.remove('record/stack_u.rec')
+    end
     if RANKS.stack_20l then
         RANKS.stack_20l=nil
         RANKS.stack_40l=nil
@@ -425,64 +485,58 @@ do
         fs.remove('record/stack_40l.rec')
         fs.remove('record/stack_100l.rec')
     end
+    if RANKS.rhythm_e then
+        RANKS.rhythm_e=nil
+        RANKS.rhythm_h=nil
+        RANKS.rhythm_u=nil
+        fs.remove('record/rhythm_e.rec')
+        fs.remove('record/rhythm_h.rec')
+        fs.remove('record/rhythm_u.rec')
+    end
+    if RANKS.bigbang then
+        RANKS.clearRush,RANKS.bigbang=RANKS.bigbang
+        fs.remove('record/bigbang.rec')
+    end
     if STAT.version~=VERSION.code then
+        for k,v in next,MODE_UPDATE_MAP do
+            if RANKS[k]then
+                RANKS[v]=RANKS[k]
+                RANKS[k]=nil
+            end
+            k='record/'..k
+            if fs.getInfo(k..'.dat')then
+                fs.write('record/'..v..'.rec',fs.read(k..'.dat'))
+                fs.remove(k..'.dat')
+            end
+            if fs.getInfo(k..'.rec')then
+                fs.write('record/'..v..'.rec',fs.read(k..'.rec'))
+                fs.remove(k..'.rec')
+            end
+        end
         STAT.version=VERSION.code
         needSave=true
-        love.event.quit('restart')
     end
-    SETTING.appLock=nil
-    SETTING.dataSaving=nil
+    SETTING.appLock,SETTING.dataSaving,SETTING.swap=nil
     if not SETTING.VKSkin then SETTING.VKSkin=1 end
     for _,v in next,SETTING.skin do if v<1 or v>17 then v=17 end end
-    if SETTING.RS=='ZRS'or SETTING.RS=='BRS'or SETTING.RS=='ASCplus'or SETTING.RS=='C2sym'then SETTING.RS='TRS'end
+    if not RSlist[SETTING.RS]then SETTING.RS='TRS'end
     if SETTING.ghostType=='greyCell'then SETTING.ghostType='grayCell'end
     if type(SETTING.skinSet)=='number'then SETTING.skinSet='crystal_scf'end
     if not TABLE.find({8,10,13,17,22,29,37,47,62,80,100},SETTING.frameMul)then SETTING.frameMul=100 end
     if SETTING.cv then SETTING.vocPack,SETTING.cv=SETTING.cv end
+    if type(SETTING.bg)~='string'then SETTING.bg='on'end
+    if SETTING.skin[18]==10 then SETTING.skin[18]=4 end
+    if SETTING.reTime>3 or SETTING.reTime<.5 then SETTING.reTime=2 end
     if RANKS.infinite then RANKS.infinite=0 end
     if RANKS.infinite_dig then RANKS.infinite_dig=0 end
     if not RANKS.sprint_10l then RANKS.sprint_10l=0 end
     if RANKS.master_l then RANKS.master_n,RANKS.master_l=RANKS.master_l needSave=true end
     if RANKS.master_u then RANKS.master_h,RANKS.master_u=RANKS.master_u needSave=true end
-    for _,v in next,VK_org do v.color=nil end
+    for _,v in next,VK_ORG do v.color=nil end
     for name,rank in next,RANKS do
         if type(name)=='number'or type(rank)~='number'then
             RANKS[name]=nil
             needSave=true
-        else
-            local M=MODES[name]
-            if M and M.unlock and rank>0 then
-                for _,unlockName in next,M.unlock do
-                    if not RANKS[unlockName]then
-                        RANKS[unlockName]=0
-                        needSave=true
-                    end
-                end
-            end
-            if not(M and M.x)then
-                RANKS[name]=nil
-                needSave=true
-            end
-        end
-    end
-    if not MODES[STAT.lastPlay]then
-        STAT.lastPlay='sprint_10l'
-        needSave=true
-    end
-
-    for k,v in next,oldModeNameTable do
-        if RANKS[k]then
-            RANKS[v]=RANKS[k]
-            RANKS[k]=nil
-        end
-        k='record/'..k
-        if fs.getInfo(k..'.dat')then
-            fs.write('record/'..v..'.rec',fs.read(k..'.dat'))
-            fs.remove(k..'.dat')
-        end
-        if fs.getInfo(k..'.rec')then
-            fs.write('record/'..v..'.rec',fs.read(k..'.rec'))
-            fs.remove(k..'.rec')
         end
     end
 
@@ -490,13 +544,14 @@ do
         saveStats()
         saveProgress()
         saveSettings()
+        love.event.quit('restart')
     end
 end
 
---First start for phones
+--First start
+FIRSTLAUNCH=STAT.run==0
 if FIRSTLAUNCH and MOBILE then
     SETTING.VKSwitch=true
-    SETTING.swap=false
     SETTING.powerInfo=true
     SETTING.cleanCanvas=true
 end
@@ -510,7 +565,7 @@ for _,fileName in next,fs.getDirectoryItems('replay')do
         local date,mode,version,player,seed,setting,mod
         local fileData=fs.read('replay/'..fileName)
         date,   fileData=STRING.readLine(fileData)date=date:gsub("[a-zA-Z]","")
-        mode,   fileData=STRING.readLine(fileData)mode=oldModeNameTable[mode]or mode
+        mode,   fileData=STRING.readLine(fileData)mode=MODE_UPDATE_MAP[mode]or mode
         version,fileData=STRING.readLine(fileData)
         player, fileData=STRING.readLine(fileData)if player=="Local Player"then player="Stacker"end
         local success
@@ -549,3 +604,41 @@ for _,fileName in next,fs.getDirectoryItems('replay')do
     table.insert(REPLAY,rep)
 end
 table.sort(REPLAY,function(a,b)return a.fileName>b.fileName end)
+
+table.insert(_LOADTIMELIST_,("Initialize Data: %.3fs"):format(TIME()-_LOADTIME_))
+
+for i=1,#_LOADTIMELIST_ do LOG(_LOADTIMELIST_[i])end
+
+--Launch testing task if launch param received
+if TABLE.find(arg,'--test')then
+    TASK.new(function()
+        while not LOADED do YIELD()end
+
+        LOG("\27[92m\27[1mAutomatic Test Started\27[0m")
+        BGM.setVol(0)SFX.setVol(0)
+        love.keypressed('space')
+        TEST.yieldUntilNextScene()
+
+        for k,mode in next,MODES do
+            if k~='netBattle'then
+                LOG("Scanning mode: "..mode.name)
+                loadGame(mode.name,true)
+                TEST.yieldUntilNextScene()
+                SCN.back()
+                TEST.yieldUntilNextScene()
+            end
+        end
+        LOG("\27[92m\27[1mAutomatic Test Passed :)\27[0m")
+        TEST.yieldN(60)
+        love.event.quit(0)
+    end)
+    TASK.new(function()
+        while true do
+            YIELD()
+            if Z.getErr(1)then break end
+        end
+        LOG("\27[91m\27[1mAutomatic Test Failed :(\27[0m\nThe error message is:\n"..table.concat(Z.getErr(1).mes,"\n").."\27[91m\nAborting\27[0m")
+        TEST.yieldN(60)
+        love.event.quit(1)
+    end)
+end