Merge branch 'master' of github.com:lxgr-linux/pokete into 267-multip…

…layer-mode
lxgr-linux · Jul 14, 2024 · 74d588e · 74d588e
2 parents e9173e0 + 779b60f
commit 74d588e
Show file tree

Hide file tree

Showing 53 changed files with 1,570 additions and 554 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -19,6 +19,8 @@ max_line_length = 80
 indent_size = 4
 tab_width = 4
 max_line_length = 80
+
+[*.xml]
 indent_style = tab
 
 [pokete_data/{map_data,npcs}.py]

diff --git a/.gh-pages.json b/.gh-pages.json
@@ -49,16 +49,16 @@
     "convert_with_pandoc": true,
     "new_name": "DevGuide.html"
   },
-  "gen_wiki.py": {
+  "util.py": {
     "type": "documentation"
   },
   "pokete.py": {
     "type": "documentation"
   },
-  "prepare_pages.py": {
+  "pokete_general_use_fns.py": {
     "type": "documentation"
   },
-  "pokete_general_use_fns.py": {
+  "util/": {
     "type": "documentation"
   },
   "pokete_classes/": {

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -22,13 +22,16 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
 
       - name: Cache
         uses: actions/[email protected]
         with:
           # A list of files, directories, and wildcard patterns to cache and restore
           path: |
-            ~/.cache/pip3
+            ~/.cache/pip
             /usr/bin/pandoc
           # An explicit key for restoring and saving the cache
           key: ${{ runner.os }}-dependencies
@@ -37,14 +40,15 @@ jobs:
       - name: Install dependecies
         if: steps.cache-dependencies.outputs.cache-hit != 'true'
         run: |
-          pip3 install scrap_engine pdoc3
+          pip install scrap_engine pdoc3 pyyaml
           sudo apt-get -qq install pandoc
 
       - name: Preprocess page files
         run: |
-          python3 ./prepare_pages.py before
+          mkdir /tmp/pokete
+          python util.py prepare-pages before
           cp -r ./assets/ /tmp/assets
-          cp ./prepare_pages.py /tmp/prepare_pages.py
+          cp -r ./* /tmp/pokete
       - name: Switch branch to gh-pages
         uses: actions/checkout/@v2
         with:
@@ -53,11 +57,12 @@ jobs:
         run: |
           rm -rf ./assets ./wiki-multi
           mv '/tmp/assets/' .
-          python3 /tmp/prepare_pages.py after
+          python /tmp/pokete/util.py prepare-pages after
       # Push to github_pages
       - name: Release documentation
         run: |
-          git config --local user.name  ${{ github.actor }}
+          git config --local user.name ${{ github.actor }}
+          git config user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
           if [[ $(git diff) != "" ]]
           then
           git add .
@@ -79,25 +84,28 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
 
       - name: Cache
         uses: actions/[email protected]
         with:
           # A list of files, directories, and wildcard patterns to cache and restore
           path: |
-            ~/.cache/pip3
+            ~/.cache/pip
           # An explicit key for restoring and saving the cache
           key: ${{ runner.os }}-dependencies
 
       # Runs a single command using the runners shell
       - name: Install dependecies
         if: steps.cache-dependencies.outputs.cache-hit != 'true'
         run: |
-          pip3 install scrap_engine
+          pip install scrap_engine pyyaml
 
       - name: Make multipage wiki
         run: |
-          python3 gen_wiki.py verbose single multi pics
+          python util.py wiki --verbose --single --multi --pics
           mkdir /tmp/gen-wiki
           cp -r HowToPlay.md DevGuide.md wiki.md /tmp/gen-wiki
       - name: Switch to wiki repository
@@ -112,6 +120,7 @@ jobs:
       - name: Release documentation
         run: |
           git config --local user.name  ${{ github.actor }}
+          git config user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
           if [[ $(git diff) != "" ]]
           then
           git add .

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,23 +14,27 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
       - name: install deps
-        run: pip3 install scrap_engine
+        run: pip install scrap_engine pyyaml
 
       - name: gen-wiki
-        run: python3 ./gen_wiki.py
-        
+        run: python util.py wiki
+
       - name: Commit files
         run: |
           git config --local user.name  ${{ github.actor }}
+          git config user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
           if [[ $(git diff) != "" ]]
           then
             git pull
             git add ./wiki.md
             git commit -m "Updated wiki"
           fi
-    
+
       - name: Push changes  # push the output folder to your repo
         uses: ad-m/github-push-action@master
         with:

diff --git a/Changelog.md b/Changelog.md
@@ -141,7 +141,8 @@ What changed until this release?
 - Added multipage wiki
 - Completely rewrote gen_wiki.py
 - Reformated, moved, outsourced, chnages a lot of code
-  Again special thanks to MaFeLP
+
+Again special thanks to MaFeLP
 
 ## [0.5.1] - 2021-09-19
 

diff --git a/README.md b/README.md
@@ -163,8 +163,7 @@ On Windows `pynput` has to be installed too.
 
 - [Documentation for pokete_classes](https://lxgr-linux.github.io/pokete/doc/pokete_classes/index.html)
 - [Documentation for pokete_data](https://lxgr-linux.github.io/pokete/doc/pokete_data/index.html)
-- [Documentation for the gen-wiki file](https://lxgr-linux.github.io/pokete/doc/gen_wiki.html "gen_wiki.py")
-- [Documentation for the prepare_pages file](https://lxgr-linux.github.io/pokete/doc/prepare_pages.html "prepare_pages.py")
+- [Documentation for the util file](https://lxgr-linux.github.io/pokete/doc/util.html)
 - [Documentation for the pokete_general_use_fns](https://lxgr-linux.github.io/pokete/doc/pokete_general_use_fns.html "pokete_general_use_fns.py")
 - [Documentation for the main file "pokete.py"](https://lxgr-linux.github.io/pokete/doc/pokete.html "pokete.py")
 
@@ -182,7 +181,7 @@ To learn how to add more poketes/types/attacks to the game, see [the development
 After adding new Poketes and/or attacks you may want to run
 
 ```shell
-$ ./gen_wiki.py
+$ ./util.py wiki
 ```
 
 to regenerate the wiki and adding them to it.

diff --git a/assets/AppImageBuilder.yml b/assets/AppImageBuilder.yml
@@ -1,70 +1,53 @@
-# appimage-builder recipe see https://appimage-builder.readthedocs.io for details
-version: 1
-script:
-  - rm -rf AppDir | true
-  - mkdir -p AppDir/usr/share/icons
-  - git clone --depth=1 https://github.com/lxgr-linux/pokete AppDir/usr/share/pokete
-  - git clone --depth=1 https://github.com/lxgr-linux/scrap_engine AppDir/usr/share/scrap_engine
-  - cp AppDir/usr/share/scrap_engine/scrap_engine.py AppDir/usr/share/pokete/
-  - cp AppDir/usr/share/pokete/assets/pokete.svg AppDir/usr/share/icons/pokete.svg
-
 AppDir:
-  path: AppDir
   app_info:
-    id: com.github.lxgr-linux.pokete
-    name: Pokete
-    icon: pokete
-    version: 0.8.0
     exec: usr/bin/python3.10
-    exec_args: $APPDIR/usr/share/pokete/pokete.py --log $@
-  # pacman:
-  #   include:
-  #     - python
-  #   exclude: []
+    exec_args: $APPDIR/usr/bin/pokete.py --log $@
+    icon: com.github.lxgr_linux.pokete
+    id: com.github.lxgr_linux.pokete
+    name: Pokete
+    version: 0.9.2
   apt:
     arch: amd64
-    sources:
-      - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse'
-        key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920d1991bc93c'
-    include:
-      - python3.10
     exclude:
-      - perl
-      - gcc-12-base
+    - perl
+    - gcc-12-base
+    include:
+    - python3.10
+    sources:
+    - key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920d1991bc93c
+      sourceline: deb [arch=amd64] https://archive.ubuntu.com/ubuntu/ jammy main restricted
+        universe multiverse
   files:
-    include: []
     exclude:
-      - usr/share/man
-      - usr/share/pokete/bash
-      - usr/share/pokete/.git
-      - usr/share/pokete/prepare_pages.py
-      - usr/share/pokete/gen_wiki.py./
-      - usr/share/pokete/*.md
-      - usr/share/scrap_engine
-      - usr/share/pokete/playsound/libplaysound.dll
-      - usr/share/pokete/playsound/libplaysound.osx.so
-      - usr/share/pokete/assets/ss
-      - usr/share/pokete/assets/*.png
-      - usr/share/pokete/assets/*.kra
-      - usr/share/pokete/assets/*.svg
-      - usr/share/doc
+    - pokete
+    - usr/share/scrap_engine
+    - usr/share/pokete/playsound/libplaysound.dll
+    - usr/share/pokete/playsound/libplaysound.osx.so
+    include: []
+  path: AppDir
   test:
-    fedora-30:
-      image: appimagecrafters/tests-env:fedora-30
-      command: ./AppRun
-    debian-stable:
-      image: appimagecrafters/tests-env:debian-stable
-      command: ./AppRun
     archlinux-latest:
-      image: appimagecrafters/tests-env:archlinux-latest
       command: ./AppRun
+      image: appimagecrafters/tests-env:archlinux-latest
     centos-7:
+      command: ./AppRun
       image: appimagecrafters/tests-env:centos-7
+    debian-stable:
       command: ./AppRun
+      image: appimagecrafters/tests-env:debian-stable
+    fedora-30:
+      command: ./AppRun
+      image: appimagecrafters/tests-env:fedora-30
     ubuntu-xenial:
-      image: appimagecrafters/tests-env:ubuntu-xenial
       command: ./AppRun
+      image: appimagecrafters/tests-env:ubuntu-xenial
 AppImage:
   arch: x86_64
   comp: gzip
   update-information: guess
+script:
+- rm -rf AppDir | true
+- git clone --depth=1 https://github.com/lxgr-linux/pokete
+- git clone --depth=1 https://github.com/lxgr-linux/scrap_engine AppDir/usr/share/scrap_engine
+- cd ./pokete && python3.10 ./util.py install AppDir/usr
+version: 1
diff --git a/assets/Bildschirmfoto_2021-06-04_09-04-44 (Kopie 1).kra~ b/assets/Bildschirmfoto_2021-06-04_09-04-44 (Kopie 1).kra~
diff --git a/assets/Bildschirmfoto_2021-06-04_09-04-44.png b/assets/Bildschirmfoto_2021-06-04_09-04-44.png
diff --git a/assets/pokete.desktop → assets/com.github.lxgr_linux.pokete.desktop b/assets/pokete.desktop → assets/com.github.lxgr_linux.pokete.desktop
@@ -4,7 +4,7 @@ Type=Application
 Name=Pokete
 Comment=A terminal based Pokemon clone, based on the scrap engine.
 Exec=/usr/bin/pokete.py
-Icon=/usr/share/pokete/assets/pokete.png
+Icon=com.github.lxgr_linux.pokete
 Terminal=true
 StartupNotify=false
 Categories=Game;
diff --git a/assets/pokete.svg → assets/com.github.lxgr_linux.pokete.svg b/assets/pokete.svg → assets/com.github.lxgr_linux.pokete.svg