From 4b509c0981a0358a3ce7441eaf0e338ea94d7daf Mon Sep 17 00:00:00 2001 From: Map Date: Fri, 22 Mar 2024 03:06:05 -0500 Subject: [PATCH 1/3] fix exception on build --- game/screens.rpy | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/game/screens.rpy b/game/screens.rpy index b26eb8d..b6abcc0 100644 --- a/game/screens.rpy +++ b/game/screens.rpy @@ -437,8 +437,7 @@ screen bonus_chapter_button(f="gui/button/menubuttons/template_idle.png"): action ShowMenu("ex_ch_menu") activate_sound "audio/ui/uiClick.wav" fixed: - if (persistent.old_endings != persistent.endings) \ - or (persistent.bonus_chapters != persistent.old_bonus_chapters and (persistent.bonus_chapters == 0b111111111)): + if (persistent.old_endings != persistent.endings) or (persistent.bonus_chapters != persistent.old_bonus_chapters and (persistent.bonus_chapters == 0b111111111)): add "bonus_flash" xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5 $ persistent.old_endings = persistent.endings #$ persistent.old_bonus_chapters = persistent.bonus_chapters @@ -479,8 +478,7 @@ screen main_menu(): pass - if (persistent.old_endings != persistent.endings) \ - or (persistent.bonus_chapters != persistent.old_bonus_chapters and (persistent.bonus_chapters == 0b111111111)): + if (persistent.old_endings != persistent.endings) or (persistent.bonus_chapters != persistent.old_bonus_chapters and (persistent.bonus_chapters == 0b111111111)): fixed: xalign 0.125 yalign 0.5 From 4a940e62b499a285f956f2fbb0e5f5a317db4a67 Mon Sep 17 00:00:00 2001 From: Map Date: Fri, 22 Mar 2024 03:13:03 -0500 Subject: [PATCH 2/3] impliment changes to allow building on woodpecker This also generates strange update files within the distribution folder that I can't seem to disable, but don't prevent building (Aside from possibly just making it slower) --- .android.json | 1 + .gitignore | 5 +---- renconstruct.toml | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 .android.json create mode 100644 renconstruct.toml diff --git a/.android.json b/.android.json new file mode 100644 index 0000000..1c70f82 --- /dev/null +++ b/.android.json @@ -0,0 +1 @@ +{"expansion": false, "heap_size": "3", "icon_name": "Snoot Game", "include_pil": false, "include_sqlite": false, "layout": null, "name": "Snoot Game", "numeric_version": 1, "orientation": "sensorLandscape", "package": "cavemanon.snootgame", "permissions": ["VIBRATE", "INTERNET"], "source": false, "store": "none", "update_always": true, "update_icons": true, "update_keystores": true, "version": "9.0"} \ No newline at end of file diff --git a/.gitignore b/.gitignore index cc8cc93..e25f054 100644 --- a/.gitignore +++ b/.gitignore @@ -51,7 +51,4 @@ env *.rpymc #backups -*.bak - -#android -.android.json \ No newline at end of file +*.bak \ No newline at end of file diff --git a/renconstruct.toml b/renconstruct.toml new file mode 100644 index 0000000..c967782 --- /dev/null +++ b/renconstruct.toml @@ -0,0 +1,51 @@ +[tasks.clean] + enabled = false + priorities = { post_build = 0 } # the priority that determines the orders tasks will run in, defaults to 0 + on_builds = ["pc", "win", "linux", "mac", "web", "steam", "market", "android_apk", "android_aab"] # builds this task should run for, defaults to all available builds + +[tasks.notarize] # required if matching task is enabled + enabled = false + priorities = { post_build = 10 } # the priority that determines the orders tasks will run in, defaults to 10 + on_builds = ["mac"] # builds this task should run for, defaults to "mac" + bundle_identifier = "com.my-game" # the bundle ID of your came, typically in reverse domain notation + key_file = "certificates/private-key.pem" # the path to the private key file generated during the provisioning process + cert_file = "certificates/developerID_application.cer" # the path to the Apple-generated certificate file generated during the provisioning process + app_store_key_file = "certificates/app-store-key.json" # the path to the combined App Store key file generated during the provisioning process + json_bundle_file = "certificates/renotize.json" # the path to the combined certificate file. replaces the key, cert and app store files above + +[tasks.keystore] # required if matching task is enabled + enabled = false + priorities = { pre_build = 0 } # the priority that determines the orders tasks will run in, defaults to 0 + on_builds = ["android_apk", "android_aab"] # builds this task should run for, defaults to all android builds + keystore_apk = "" # the base-64 encoded binary keystore file for the APK bundles + keystore_aab = "" # the base-64 encoded binary keystore file for the AAB bundles + +[tasks.convert_images] + enabled = false + format = "webp" # webp or avif + priorities = { pre_build = 10 } # the priority that determines the orders tasks will run in, defaults to 10 + on_builds = ["pc", "win", "linux", "mac", "web", "steam", "market", "android_apk", "android_aab"] # builds this task should run for, defaults to all available builds + # extensions: a list of file extensions to convert + # recursive: scans directories recursively if enabled, otherwise only scans the immediate directory + # lossless: converts to lossless WebP if enabled, otherwise converts to lossy WebP + "game/images/cg" = { extensions = ["png", "jpg"], recursive = true, lossless = true } # default values + "game/images/bg" = { lossless = false } + "game/images" = { } # all parameters are optional + +[build] # required, at least one item must be 'true' + #pc = true # windows + linux + #win = true # windows + #linux = true # linux + #mac = true # macos + #web = false # web + steam = true # steam + market = true # multiple markets (i.e. itch.io) + android_apk = true # Android Universal APK + #android_aab = false # Android Play Store Bundle + +[options] + clear_output_dir = false # whether to clear the output directory on startup + +[renutil] + version = "8.0.3" # the Ren'Py version to use (required) + registry = "tmp/cache" # the directory to store installation files in From 72af6972844d754898ae1dbd9d87e79f795a3a4a Mon Sep 17 00:00:00 2001 From: Map Date: Fri, 22 Mar 2024 03:17:12 -0500 Subject: [PATCH 3/3] fix builds and correct woodpecker to use the proper renpy version. --- .woodpecker.yml | 2 +- renconstruct.toml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 700c118..8b9fb91 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -73,6 +73,6 @@ steps: matrix: RenpyVersion: - - "8.1.3" + - "8.0.3" RenkitVersion: - "3.3.1" diff --git a/renconstruct.toml b/renconstruct.toml index c967782..eefa3e7 100644 --- a/renconstruct.toml +++ b/renconstruct.toml @@ -34,12 +34,12 @@ [build] # required, at least one item must be 'true' #pc = true # windows + linux - #win = true # windows - #linux = true # linux - #mac = true # macos + win = true # windows + linux = true # linux + mac = true # macos #web = false # web - steam = true # steam - market = true # multiple markets (i.e. itch.io) + #steam = true # steam + #market = true # multiple markets (i.e. itch.io) android_apk = true # Android Universal APK #android_aab = false # Android Play Store Bundle