Merge branch 'main' of https://codeberg.org/hurrycurry/flatpak into org.metamuffin.hurrycurry.client

4 files changed, 3 insertions, 124 deletions

diff --git a/hurrycurry b/hurrycurry
deleted file mode 100644
index c8a53b1..0000000
--- a/hurrycurry
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-godot --main-pack /app/share/hurrycurry/client.pck
diff --git a/org.metamuffin.hurrycurry.client.desktop b/org.metamuffin.hurrycurry.client.desktop
deleted file mode 100644
index ca74768..0000000
--- a/org.metamuffin.hurrycurry.client.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Hurry Curry!
-Icon=org.metamuffin.hurrycurry.client
-GenericName[de]=Ein Spiel rund ums Kochen
-GenericName=A game about cooking
-Exec=hurrycurry
-Terminal=false
-StartupNotify=false
-Type=Application
-Categories=Game;
-Keywords=game;cooking;
-PrefersNonDefaultGPU=true
diff --git a/org.metamuffin.hurrycurry.client.metainfo.xml b/org.metamuffin.hurrycurry.client.metainfo.xml
deleted file mode 100644
index bd4093d..0000000
--- a/org.metamuffin.hurrycurry.client.metainfo.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-    <id>org.metamuffin.hurrycurry.client</id>
-
-    <name>Hurry Curry!</name>
-    <summary>A fast-paced multiplayer game about cooking</summary>
-
-    <developer id="org.metamuffin.hurrycurry">
-        <name>The Hurry Curry! contributors</name>
-    </developer>
-
-    <metadata_license>CC-BY-SA-4.0</metadata_license>
-    <project_license>AGPL-3.0-only</project_license>
-
-    <branding>
-        <color type="primary" scheme_preference="light">#f4a570</color>
-        <color type="primary" scheme_preference="dark">#e38242</color>
-    </branding>
-
-    <supports>
-        <control>pointing</control>
-        <control>keyboard</control>
-        <control>touch</control>
-        <control>gamepad</control>
-    </supports>
-
-    <recommends>
-        <internet>always</internet>
-    </recommends>
-
-    <description>
-        <p>
-            Hurry Curry! is a multiplayer game about cooking. Your goal is to run a
-            restaurant and gain points by serving meals you've cooked. </p>
-        <p>
-            Keyboard Controls: Move character with WASD. Move camera with arrow keys.
-            Interact with Space or J. Boost with Left Shift or K. Open/close menus with Escape.
-            Press Enter to open chat. Reset view with R. </p>
-        <p>
-            Controller Controls: Move character with Left Stick. Move camera with Right
-            Stick. Interact with A, Boost with B, Open/close menus with Menu button. Use keyboard
-            for chat. Reset view with Y. </p>
-        <p>
-            Game developed by nokoe, metamuffin, tpart. Special thanks to RustyStriker for
-            playtesting and technical assistance.
-            Thanks to Sofviic for most of the maps.
-        </p>
-    </description>
-
-    <launchable type="desktop-id">org.metamuffin.hurrycurry.client.desktop</launchable>
-
-    <url type="homepage">https://hurrycurry.metamuffin.org/</url>
-    <url type="bugtracker">https://codeberg.org/hurrycurry/hurrycurry/issues</url>
-    <!-- <url type="help">https://codeberg.org/hurrycurry/hurrycurry/wiki</url> -->
-    <url type="vcs-browser">https://codeberg.org/hurrycurry/hurrycurry</url>
-    <url type="contribute">https://codeberg.org/hurrycurry/hurrycurry</url>
-    <categories>
-        <category>Game</category>
-    </categories>
-    <screenshots>
-        <screenshot type="default">
-            <image>https://img.itch.zone/aW1hZ2UvMjgxOTEyNy8xNjg2MzQzMS5qcGVn/original/2O5lVR.jpeg</image>
-        </screenshot>
-        <screenshot>
-            <image>https://img.itch.zone/aW1hZ2UvMjgxOTEyNy8xNjg2MzQzMC5qcGVn/original/YDCBug.jpeg</image>
-        </screenshot>
-        <screenshot>
-            <image>https://img.itch.zone/aW1hZ2UvMjgxOTEyNy8xNjg2MzQzMy5qcGVn/original/ynbKBP.jpeg</image>
-        </screenshot>
-        <screenshot>
-            <image>https://img.itch.zone/aW1hZ2UvMjgxOTEyNy8xNjg2MzQzMi5qcGVn/original/CT6oZD.jpeg</image>
-        </screenshot>
-        <screenshot>
-            <video codec="av1" container="webm">
-                https://s.metamuffin.org/static/hurrycurry/trailer-flathub.webm</video>
-        </screenshot>
-    </screenshots>
-
-    <content_rating type="oars-1.1">
-        <content_attribute id="social-chat">intense</content_attribute>
-    </content_rating>
-
-
-    <releases>
-        <release version="1.2.1" date="2024-07-14" type="stable">
-            <description>Apple Biscuit</description>
-            <url>https://codeberg.org/hurrycurry/hurrycurry/releases/tag/v1.2.1</url>
-        </release>
-        <release version="1.2.0" date="2024-07-14" type="stable">
-            <description>Apple Biscuit</description>
-            <url>https://codeberg.org/hurrycurry/hurrycurry/releases/tag/v1.2.0</url>
-        </release>
-        <release version="1.1.0" date="2024-07-11" type="stable">
-            <description>Post-Jam Release</description>
-            <url>https://codeberg.org/hurrycurry/hurrycurry/releases/tag/v1.1.0</url>
-        </release>
-        <release version="1.0.0" date="2024-07-09" type="stable">
-            <description>Purism Game Jam release</description>
-            <url>https://codeberg.org/hurrycurry/hurrycurry/releases/tag/v1.0.0</url>
-        </release>
-    </releases>
-</component>
diff --git a/org.metamuffin.hurrycurry.client.yaml b/org.metamuffin.hurrycurry.client.yaml
index 4e13bc5..4f1a6d3 100644
--- a/org.metamuffin.hurrycurry.client.yaml
+++ b/org.metamuffin.hurrycurry.client.yaml
@@ -64,14 +64,9 @@ modules:
         sha256: cddc72a740395eaa760c2eb8e757a3f14ec377a286f257df542bd62614c6583a
         url: https://s.metamuffin.org/static/hurrycurry-1.2/book.webp.tar.zst
 
-      - type: file
-        path: hurrycurry
-
-      - type: file
-        path: org.metamuffin.hurrycurry.client.desktop
-
-      - type: file
-        path: org.metamuffin.hurrycurry.client.metainfo.xml
+      - type: archive
+        sha256: 872a3b55bff2d3abeb73ba2c9fc680572276e6a4074412f6782834dd02503cb9
+        url: https://codeberg.org/hurrycurry/hurrycurry-dist-extra/archive/v1.2.1.tar.gz
 
     build-commands:
       - tar -xf book.webp.tar.zst -C client/menu/book