diff --git a/.github/workflows/gut.yml b/.github/workflows/gut.yml index e33a8bba..8cdb8df8 100644 --- a/.github/workflows/gut.yml +++ b/.github/workflows/gut.yml @@ -5,6 +5,7 @@ on: branches-ignore: - main - steam_upload + - gut # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -27,7 +28,7 @@ jobs: # path: ./.github/actions/godot-tester # Runs a single command using the runners shell - name: Godot Tester - uses: croconut/godot-tester@v5 + uses: croconut/godot-tester@v5.2 with: version: 3.6 # should be long enough for asset import files to get generated @@ -38,6 +39,6 @@ jobs: test-timeout: 3600 # Directory containing Gut tests direct-scene: tests/cli/tests.tscn - custom-godot-dl-url: "https://github.com/godotengine/godot/releases/download/3.6-stable/Godot_v3.6-stable_linux_headless.64.zip" + custom-godot-dl-url: https://github.com/godotengine/godot/releases/download/3.6-stable/Godot_v3.6-stable_linux_headless.64.zip custom-godot-binary-path: "Godot_v3.6-stable_linux_headless.64" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8f91b43c..8471358a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,9 +36,9 @@ jobs: # path: ./.github/actions/godot-tester # Runs a single command using the runners shell - name: ⚙ Run Tests - uses: croconut/godot-tester@v5 + uses: croconut/godot-tester@v5.2 with: - version: 3.5 + version: 3.6 # should be long enough for asset import files to get generated import-time: 300 assert-check: true diff --git a/assets/card_front/gpt-new-front.png b/assets/card_front/gpt-new-front.png deleted file mode 100644 index f03f68c5..00000000 Binary files a/assets/card_front/gpt-new-front.png and /dev/null differ diff --git a/assets/card_front/gpt-new-front_action.png b/assets/card_front/gpt-new-front_action.png new file mode 100644 index 00000000..b102d955 Binary files /dev/null and b/assets/card_front/gpt-new-front_action.png differ diff --git a/assets/card_front/gpt-new-front_action.png.import b/assets/card_front/gpt-new-front_action.png.import new file mode 100644 index 00000000..07e09bda --- /dev/null +++ b/assets/card_front/gpt-new-front_action.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/gpt-new-front_action.png-d9c56e2406df3b977e24ac764a400904.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/card_front/gpt-new-front_action.png" +dest_files=[ "res://.import/gpt-new-front_action.png-d9c56e2406df3b977e24ac764a400904.stex" ] + +[params] + +compress/mode=1 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/assets/card_front/gpt-new-front_action.xcf b/assets/card_front/gpt-new-front_action.xcf new file mode 100644 index 00000000..67f9126a Binary files /dev/null and b/assets/card_front/gpt-new-front_action.xcf differ diff --git a/assets/card_front/gpt-new-front_concentration.png b/assets/card_front/gpt-new-front_concentration.png new file mode 100644 index 00000000..5b6586cf Binary files /dev/null and b/assets/card_front/gpt-new-front_concentration.png differ diff --git a/assets/card_front/gpt-new-front_concentration.png.import b/assets/card_front/gpt-new-front_concentration.png.import new file mode 100644 index 00000000..9b9af949 --- /dev/null +++ b/assets/card_front/gpt-new-front_concentration.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/gpt-new-front_concentration.png-ce92c5fd14b7b84baef8107b2ff21009.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/card_front/gpt-new-front_concentration.png" +dest_files=[ "res://.import/gpt-new-front_concentration.png-ce92c5fd14b7b84baef8107b2ff21009.stex" ] + +[params] + +compress/mode=1 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/assets/card_front/gpt-new-front_concentration.xcf b/assets/card_front/gpt-new-front_concentration.xcf new file mode 100644 index 00000000..e8b6c4e4 Binary files /dev/null and b/assets/card_front/gpt-new-front_concentration.xcf differ diff --git a/assets/card_front/gpt-new-front_control.png b/assets/card_front/gpt-new-front_control.png new file mode 100644 index 00000000..06f03af3 Binary files /dev/null and b/assets/card_front/gpt-new-front_control.png differ diff --git a/assets/card_front/gpt-new-front_control.png.import b/assets/card_front/gpt-new-front_control.png.import new file mode 100644 index 00000000..21f26f87 --- /dev/null +++ b/assets/card_front/gpt-new-front_control.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/gpt-new-front_control.png-0cef6f8909ca47baa8f925b609a97f8e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/card_front/gpt-new-front_control.png" +dest_files=[ "res://.import/gpt-new-front_control.png-0cef6f8909ca47baa8f925b609a97f8e.stex" ] + +[params] + +compress/mode=1 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/assets/card_front/gpt-new-front_control.xcf b/assets/card_front/gpt-new-front_control.xcf new file mode 100644 index 00000000..85f2a735 Binary files /dev/null and b/assets/card_front/gpt-new-front_control.xcf differ diff --git a/assets/card_front/gpt-new-front_petrurbation.png b/assets/card_front/gpt-new-front_petrurbation.png new file mode 100644 index 00000000..9d191d21 Binary files /dev/null and b/assets/card_front/gpt-new-front_petrurbation.png differ diff --git a/assets/card_front/gpt-new-front_petrurbation.png.import b/assets/card_front/gpt-new-front_petrurbation.png.import new file mode 100644 index 00000000..b3c4b92b --- /dev/null +++ b/assets/card_front/gpt-new-front_petrurbation.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/gpt-new-front_petrurbation.png-d7fee5787750a9c44b20f4b7c58fb67f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/card_front/gpt-new-front_petrurbation.png" +dest_files=[ "res://.import/gpt-new-front_petrurbation.png-d7fee5787750a9c44b20f4b7c58fb67f.stex" ] + +[params] + +compress/mode=1 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/assets/card_front/gpt-new-front_petrurbation.xcf b/assets/card_front/gpt-new-front_petrurbation.xcf new file mode 100644 index 00000000..f8d86c91 Binary files /dev/null and b/assets/card_front/gpt-new-front_petrurbation.xcf differ diff --git a/assets/card_front/gpt-new-front_thin.xcf b/assets/card_front/gpt-new-front_thin.xcf new file mode 100644 index 00000000..d807e6cf Binary files /dev/null and b/assets/card_front/gpt-new-front_thin.xcf differ diff --git a/assets/card_front/gpt-new-front_understanding.png b/assets/card_front/gpt-new-front_understanding.png new file mode 100644 index 00000000..0e5b4a25 Binary files /dev/null and b/assets/card_front/gpt-new-front_understanding.png differ diff --git a/assets/card_front/gpt-new-front_understanding.png.import b/assets/card_front/gpt-new-front_understanding.png.import new file mode 100644 index 00000000..46524e76 --- /dev/null +++ b/assets/card_front/gpt-new-front_understanding.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/gpt-new-front_understanding.png-2d347bb20b07c4e0285023a22ee8fdbd.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/card_front/gpt-new-front_understanding.png" +dest_files=[ "res://.import/gpt-new-front_understanding.png-2d347bb20b07c4e0285023a22ee8fdbd.stex" ] + +[params] + +compress/mode=1 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/assets/card_front/gpt-new-front_understanding.xcf b/assets/card_front/gpt-new-front_understanding.xcf new file mode 100644 index 00000000..69a2f3e9 Binary files /dev/null and b/assets/card_front/gpt-new-front_understanding.xcf differ diff --git a/assets/cards/Fist of Candies.jpg b/assets/cards/Fist of Candies.jpg deleted file mode 100644 index 43eed370..00000000 Binary files a/assets/cards/Fist of Candies.jpg and /dev/null differ diff --git a/assets/cards/Fist of Candies.webp b/assets/cards/Fist of Candies.webp new file mode 100644 index 00000000..b478560d Binary files /dev/null and b/assets/cards/Fist of Candies.webp differ diff --git a/assets/cards/Fist of Candies.webp.import b/assets/cards/Fist of Candies.webp.import new file mode 100644 index 00000000..4dd2caa8 --- /dev/null +++ b/assets/cards/Fist of Candies.webp.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Fist of Candies.webp-84528dba2efe9ef7da98185b3862e9e3.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/cards/Fist of Candies.webp" +dest_files=[ "res://.import/Fist of Candies.webp-84528dba2efe9ef7da98185b3862e9e3.stex" ] + +[params] + +compress/mode=1 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/assets/cards/Lotustus.png b/assets/cards/Lotustus.png deleted file mode 100644 index 5fe4d9a4..00000000 Binary files a/assets/cards/Lotustus.png and /dev/null differ diff --git a/assets/cards/Lotustus.webp b/assets/cards/Lotustus.webp new file mode 100644 index 00000000..d522e4ed Binary files /dev/null and b/assets/cards/Lotustus.webp differ diff --git a/assets/cards/Prepared.jpg.import b/assets/cards/Lotustus.webp.import similarity index 71% rename from assets/cards/Prepared.jpg.import rename to assets/cards/Lotustus.webp.import index b1e20682..134c3cf5 100644 --- a/assets/cards/Prepared.jpg.import +++ b/assets/cards/Lotustus.webp.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Prepared.jpg-39b9522ded0f1dd860c0b0b96f2fd400.stex" +path="res://.import/Lotustus.webp-05626e4731d28fa14ebb260566db752d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/cards/Prepared.jpg" -dest_files=[ "res://.import/Prepared.jpg-39b9522ded0f1dd860c0b0b96f2fd400.stex" ] +source_file="res://assets/cards/Lotustus.webp" +dest_files=[ "res://.import/Lotustus.webp-05626e4731d28fa14ebb260566db752d.stex" ] [params] diff --git a/assets/cards/Prepared.jpg b/assets/cards/Prepared.jpg deleted file mode 100644 index b55a9645..00000000 Binary files a/assets/cards/Prepared.jpg and /dev/null differ diff --git a/assets/cards/Prepared.ogv b/assets/cards/Prepared.ogv new file mode 100644 index 00000000..012a3380 Binary files /dev/null and b/assets/cards/Prepared.ogv differ diff --git a/assets/cards/Prepared.webp b/assets/cards/Prepared.webp new file mode 100644 index 00000000..15a27b76 Binary files /dev/null and b/assets/cards/Prepared.webp differ diff --git a/assets/cards/Reactionary.jpg.import b/assets/cards/Prepared.webp.import similarity index 70% rename from assets/cards/Reactionary.jpg.import rename to assets/cards/Prepared.webp.import index c08fbd94..a3b3fe59 100644 --- a/assets/cards/Reactionary.jpg.import +++ b/assets/cards/Prepared.webp.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Reactionary.jpg-2adb42ec9ffec0eaccaa1a8fe91cdfdc.stex" +path="res://.import/Prepared.webp-1b9f656f67f2a37b05f5998b322d9fb7.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/cards/Reactionary.jpg" -dest_files=[ "res://.import/Reactionary.jpg-2adb42ec9ffec0eaccaa1a8fe91cdfdc.stex" ] +source_file="res://assets/cards/Prepared.webp" +dest_files=[ "res://.import/Prepared.webp-1b9f656f67f2a37b05f5998b322d9fb7.stex" ] [params] diff --git a/assets/cards/Reactionary.jpg b/assets/cards/Reactionary.jpg deleted file mode 100644 index 827fe397..00000000 Binary files a/assets/cards/Reactionary.jpg and /dev/null differ diff --git a/assets/cards/Reactionary.ogv b/assets/cards/Reactionary.ogv new file mode 100644 index 00000000..cbb4c940 Binary files /dev/null and b/assets/cards/Reactionary.ogv differ diff --git a/assets/cards/Reactionary.webp b/assets/cards/Reactionary.webp new file mode 100644 index 00000000..7216a552 Binary files /dev/null and b/assets/cards/Reactionary.webp differ diff --git a/assets/cards/The Cold Dish.jpg.import b/assets/cards/Reactionary.webp.import similarity index 69% rename from assets/cards/The Cold Dish.jpg.import rename to assets/cards/Reactionary.webp.import index c87f6e2a..aa93434d 100644 --- a/assets/cards/The Cold Dish.jpg.import +++ b/assets/cards/Reactionary.webp.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/The Cold Dish.jpg-9781e654a6aa18353f8bebf89484f5b9.stex" +path="res://.import/Reactionary.webp-da3e7a438b4652e8552cede0394dbb88.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/cards/The Cold Dish.jpg" -dest_files=[ "res://.import/The Cold Dish.jpg-9781e654a6aa18353f8bebf89484f5b9.stex" ] +source_file="res://assets/cards/Reactionary.webp" +dest_files=[ "res://.import/Reactionary.webp-da3e7a438b4652e8552cede0394dbb88.stex" ] [params] diff --git a/assets/cards/Reckoning Time.jpg b/assets/cards/Reckoning Time.jpg deleted file mode 100644 index b5f0d0b8..00000000 Binary files a/assets/cards/Reckoning Time.jpg and /dev/null differ diff --git a/assets/cards/Reckoning Time.ogv b/assets/cards/Reckoning Time.ogv new file mode 100644 index 00000000..26038862 Binary files /dev/null and b/assets/cards/Reckoning Time.ogv differ diff --git a/assets/cards/Reckoning Time.webp b/assets/cards/Reckoning Time.webp new file mode 100644 index 00000000..a2ebebdd Binary files /dev/null and b/assets/cards/Reckoning Time.webp differ diff --git a/assets/card_front/gpt-new-front.png.import b/assets/cards/Reckoning Time.webp.import similarity index 69% rename from assets/card_front/gpt-new-front.png.import rename to assets/cards/Reckoning Time.webp.import index 6511f442..21fa20a4 100644 --- a/assets/card_front/gpt-new-front.png.import +++ b/assets/cards/Reckoning Time.webp.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/gpt-new-front.png-cf2d3185d39f9664c54a145e352d24d3.stex" +path="res://.import/Reckoning Time.webp-79e23b576bbc107a0da7593599b4e7c2.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/card_front/gpt-new-front.png" -dest_files=[ "res://.import/gpt-new-front.png-cf2d3185d39f9664c54a145e352d24d3.stex" ] +source_file="res://assets/cards/Reckoning Time.webp" +dest_files=[ "res://.import/Reckoning Time.webp-79e23b576bbc107a0da7593599b4e7c2.stex" ] [params] diff --git a/assets/cards/Saved for Later.jpg b/assets/cards/Saved for Later.jpg deleted file mode 100644 index 515f2e42..00000000 Binary files a/assets/cards/Saved for Later.jpg and /dev/null differ diff --git a/assets/cards/Saved for Later.jpg.import b/assets/cards/Saved for Later.jpg.import deleted file mode 100644 index 1e6eac3b..00000000 --- a/assets/cards/Saved for Later.jpg.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/Saved for Later.jpg-f0a4c40cbc4c6a97109d35a8816f1899.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/cards/Saved for Later.jpg" -dest_files=[ "res://.import/Saved for Later.jpg-f0a4c40cbc4c6a97109d35a8816f1899.stex" ] - -[params] - -compress/mode=1 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/assets/cards/Saved for Later.ogv b/assets/cards/Saved for Later.ogv new file mode 100644 index 00000000..c7c2b905 Binary files /dev/null and b/assets/cards/Saved for Later.ogv differ diff --git a/assets/cards/Saved for Later.webp b/assets/cards/Saved for Later.webp new file mode 100644 index 00000000..c906434d Binary files /dev/null and b/assets/cards/Saved for Later.webp differ diff --git a/assets/cards/Saved for Later.webp.import b/assets/cards/Saved for Later.webp.import new file mode 100644 index 00000000..35b6d7ea --- /dev/null +++ b/assets/cards/Saved for Later.webp.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Saved for Later.webp-fc49998b49e870eeb7211919ccf71e82.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/cards/Saved for Later.webp" +dest_files=[ "res://.import/Saved for Later.webp-fc49998b49e870eeb7211919ccf71e82.stex" ] + +[params] + +compress/mode=1 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/assets/cards/The Cold Dish.jpg b/assets/cards/The Cold Dish.jpg deleted file mode 100644 index 7eae233a..00000000 Binary files a/assets/cards/The Cold Dish.jpg and /dev/null differ diff --git a/assets/cards/The Cold Dish.webp b/assets/cards/The Cold Dish.webp new file mode 100644 index 00000000..5ce0d522 Binary files /dev/null and b/assets/cards/The Cold Dish.webp differ diff --git a/assets/cards/Reckoning Time.jpg.import b/assets/cards/The Cold Dish.webp.import similarity index 69% rename from assets/cards/Reckoning Time.jpg.import rename to assets/cards/The Cold Dish.webp.import index c1dd1e65..936cfb13 100644 --- a/assets/cards/Reckoning Time.jpg.import +++ b/assets/cards/The Cold Dish.webp.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Reckoning Time.jpg-d9b043ee7fea67d6f7d48c1f8db11213.stex" +path="res://.import/The Cold Dish.webp-964b8e21792dd63c2d93b3c1c29adbb8.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/cards/Reckoning Time.jpg" -dest_files=[ "res://.import/Reckoning Time.jpg-d9b043ee7fea67d6f7d48c1f8db11213.stex" ] +source_file="res://assets/cards/The Cold Dish.webp" +dest_files=[ "res://.import/The Cold Dish.webp-964b8e21792dd63c2d93b3c1c29adbb8.stex" ] [params] diff --git a/assets/cards/The Last Straw.jpg b/assets/cards/The Last Straw.jpg deleted file mode 100644 index 7b79f21e..00000000 Binary files a/assets/cards/The Last Straw.jpg and /dev/null differ diff --git a/assets/cards/The Last Straw.jpg.import b/assets/cards/The Last Straw.jpg.import deleted file mode 100644 index 93be20c1..00000000 --- a/assets/cards/The Last Straw.jpg.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/The Last Straw.jpg-69f8cd8798c941224f96732878bab755.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/cards/The Last Straw.jpg" -dest_files=[ "res://.import/The Last Straw.jpg-69f8cd8798c941224f96732878bab755.stex" ] - -[params] - -compress/mode=1 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/assets/cards/The Last Straw.png b/assets/cards/The Last Straw.png deleted file mode 100644 index add71692..00000000 Binary files a/assets/cards/The Last Straw.png and /dev/null differ diff --git a/assets/cards/The Last Straw.webp b/assets/cards/The Last Straw.webp new file mode 100644 index 00000000..f8a699d6 Binary files /dev/null and b/assets/cards/The Last Straw.webp differ diff --git a/assets/cards/Fist of Candies.jpg.import b/assets/cards/The Last Straw.webp.import similarity index 69% rename from assets/cards/Fist of Candies.jpg.import rename to assets/cards/The Last Straw.webp.import index f51923f8..c74dffc2 100644 --- a/assets/cards/Fist of Candies.jpg.import +++ b/assets/cards/The Last Straw.webp.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/Fist of Candies.jpg-ef3d443126adbee393dd1696084f1dc3.stex" +path="res://.import/The Last Straw.webp-b02d3dacad4488e32afe800d7e42c3ff.stex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/cards/Fist of Candies.jpg" -dest_files=[ "res://.import/Fist of Candies.jpg-ef3d443126adbee393dd1696084f1dc3.stex" ] +source_file="res://assets/cards/The Last Straw.webp" +dest_files=[ "res://.import/The Last Straw.webp-b02d3dacad4488e32afe800d7e42c3ff.stex" ] [params] diff --git a/assets/cards/Vestige of Warmth.jpg b/assets/cards/Vestige of Warmth.jpg deleted file mode 100644 index 45864b80..00000000 Binary files a/assets/cards/Vestige of Warmth.jpg and /dev/null differ diff --git a/assets/cards/Vestige of Warmth.jpg.import b/assets/cards/Vestige of Warmth.jpg.import deleted file mode 100644 index 3964aae6..00000000 --- a/assets/cards/Vestige of Warmth.jpg.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/Vestige of Warmth.jpg-bbe71e8abca5f587a3d03913346ccf05.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/cards/Vestige of Warmth.jpg" -dest_files=[ "res://.import/Vestige of Warmth.jpg-bbe71e8abca5f587a3d03913346ccf05.stex" ] - -[params] - -compress/mode=1 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/assets/cards/Vestige of Warmth.ogv b/assets/cards/Vestige of Warmth.ogv new file mode 100644 index 00000000..98d3994c Binary files /dev/null and b/assets/cards/Vestige of Warmth.ogv differ diff --git a/assets/cards/Vestige of Warmth.webp b/assets/cards/Vestige of Warmth.webp new file mode 100644 index 00000000..e78fc955 Binary files /dev/null and b/assets/cards/Vestige of Warmth.webp differ diff --git a/assets/cards/Vestige of Warmth.webp.import b/assets/cards/Vestige of Warmth.webp.import new file mode 100644 index 00000000..f2cfe541 --- /dev/null +++ b/assets/cards/Vestige of Warmth.webp.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Vestige of Warmth.webp-b908a181bc39158ac66c7a4fa8547f6f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/cards/Vestige of Warmth.webp" +dest_files=[ "res://.import/Vestige of Warmth.webp-b908a181bc39158ac66c7a4fa8547f6f.stex" ] + +[params] + +compress/mode=1 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/src/dreamscape/CardFrontNew.gd b/src/dreamscape/CardFrontNew.gd index bfd1f5fa..29e7f4ba 100644 --- a/src/dreamscape/CardFrontNew.gd +++ b/src/dreamscape/CardFrontNew.gd @@ -55,6 +55,7 @@ func _ready() -> void: card_labels["Abilities"] = $"CardText/OutsideArt/Abilities" card_labels["Tags"] = $Tags card_labels["Cost"] = $CostContainer/Cost + EventBus.connect("card_animations_toggled", self, "_on_card_animations_toggled") # These set te max size of each label. This is used to calculate how much # To shrink the font when it doesn't fit in the rect. @@ -130,6 +131,8 @@ func set_card_art(filename, is_placeholder := false) -> void: placeholder.visible = is_placeholder func set_card_animation(filename, is_placeholder := false) -> void: + if not cfc.game_settings.get("animate_cards", false): + return var anim = VideoStreamTheora.new() anim.set_file(filename) animation.stream = anim @@ -142,8 +145,18 @@ func set_card_animation(filename, is_placeholder := false) -> void: placeholder.visible = is_placeholder func _on_animation_finished(): + if not cfc.game_settings.get("animate_cards", false): + return animation.play() +func _on_card_animations_toggled(value: bool): + if value and animation.stream and not animation.is_playing(): + animation.visible = true + animation.play() + elif not value: + animation.visible = false + animation.stop() + func _get_bbcode_format(font_size = null) -> Dictionary: return(Terms.get_bbcode_formats(font_size)) diff --git a/src/dreamscape/CardFrontNew.tscn b/src/dreamscape/CardFrontNew.tscn index cb2ea4b2..f9f7237e 100644 --- a/src/dreamscape/CardFrontNew.tscn +++ b/src/dreamscape/CardFrontNew.tscn @@ -10,7 +10,7 @@ [ext_resource path="res://assets/card_front/Game_logo.jpg" type="Texture" id=8] [ext_resource path="res://assets/card_front/dream card/gem.png" type="Texture" id=9] [ext_resource path="res://src/dreamscape/GUI/ghost_rtl_effect.gd" type="Script" id=10] -[ext_resource path="res://assets/card_front/dream card/dream_card_body_2_frame_white.png" type="Texture" id=11] +[ext_resource path="res://assets/card_front/gpt-new-front_control.png" type="Texture" id=11] [ext_resource path="res://assets/card_front/dream card/CostBackground.png" type="Texture" id=12] [ext_resource path="res://assets/card_front/sun.png" type="Texture" id=13] [ext_resource path="res://assets/card_front/scar-wound.png" type="Texture" id=14] @@ -64,18 +64,6 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="TitleBackground" type="ColorRect" parent="."] -use_parent_material = true -margin_left = 31.0 -margin_top = 5.0 -margin_right = 171.0 -margin_bottom = 23.0 -rect_min_size = Vector2( 140, 18 ) -mouse_filter = 2 -__meta__ = { -"_edit_use_anchors_": false -} - [node name="TextBackground" type="Panel" parent="."] use_parent_material = true margin_left = 3.92099 @@ -126,6 +114,32 @@ rect_min_size = Vector2( 180, 115 ) mouse_filter = 2 autoplay = true +[node name="CardDesign" type="TextureRect" parent="."] +use_parent_material = true +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -0.297302 +margin_top = 0.297302 +margin_right = -0.297302 +margin_bottom = 0.297302 +rect_min_size = Vector2( 200, 280 ) +mouse_filter = 2 +texture = ExtResource( 11 ) +expand = true +stretch_mode = 1 + +[node name="TitleBackground" type="ColorRect" parent="."] +use_parent_material = true +margin_left = 31.0 +margin_top = 5.0 +margin_right = 171.0 +margin_bottom = 23.0 +rect_min_size = Vector2( 140, 18 ) +mouse_filter = 2 +__meta__ = { +"_edit_use_anchors_": false +} + [node name="RarityMiddle" type="TextureRect" parent="."] use_parent_material = true anchor_right = 1.0 @@ -145,17 +159,17 @@ __meta__ = { [node name="CostContainer" type="CenterContainer" parent="."] use_parent_material = true -margin_left = 80.4041 -margin_top = 120.523 +margin_left = 80.404 +margin_top = 125.0 margin_right = 120.404 -margin_bottom = 160.523 +margin_bottom = 165.0 mouse_filter = 2 __meta__ = { -"_edit_group_": true, -"_edit_use_anchors_": false +"_edit_group_": true } [node name="CostIcon" type="TextureRect" parent="CostContainer"] +visible = false modulate = Color( 0, 0, 0, 1 ) use_parent_material = true margin_right = 40.0 @@ -193,24 +207,6 @@ texture = ExtResource( 15 ) expand = true stretch_mode = 6 -[node name="CardDesign" type="TextureRect" parent="."] -modulate = Color( 0.313726, 0.313726, 0.313726, 1 ) -use_parent_material = true -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_left = -0.297302 -margin_top = 0.297302 -margin_right = -0.297302 -margin_bottom = 0.297302 -rect_min_size = Vector2( 200, 280 ) -mouse_filter = 2 -texture = ExtResource( 11 ) -expand = true -stretch_mode = 1 -__meta__ = { -"_edit_use_anchors_": false -} - [node name="Scarred" type="TextureRect" parent="."] visible = false use_parent_material = true @@ -367,10 +363,10 @@ custom_effects = [ SubResource( 5 ) ] [node name="TagContainer1" type="CenterContainer" parent="."] visible = false use_parent_material = true -margin_left = 1.33258 -margin_top = 138.166 -margin_right = 41.3326 -margin_bottom = 178.166 +margin_left = 1.333 +margin_top = 130.0 +margin_right = 41.333 +margin_bottom = 170.0 rect_min_size = Vector2( 40, 40 ) mouse_filter = 2 __meta__ = { @@ -404,9 +400,9 @@ expand = true visible = false use_parent_material = true margin_left = 158.574 -margin_top = 138.078 +margin_top = 130.0 margin_right = 198.574 -margin_bottom = 178.078 +margin_bottom = 170.0 rect_min_size = Vector2( 40, 40 ) mouse_filter = 2 __meta__ = { diff --git a/src/dreamscape/CardTemplate.gd b/src/dreamscape/CardTemplate.gd index b7c31087..46c4f714 100644 --- a/src/dreamscape/CardTemplate.gd +++ b/src/dreamscape/CardTemplate.gd @@ -133,9 +133,9 @@ func setup() -> void: var is_placeholder = false if card_art == beta_art: is_placeholder = true - if card_animation: + if card_animation and cfc.game_settings.get("animate_cards", false): card_front.set_card_animation(card_animation, is_placeholder) - elif card_art: + if card_art: card_front.set_card_art(card_art, is_placeholder) if deck_card_entry: if deck_card_entry.is_scarred(): diff --git a/src/dreamscape/Globals/EventBus.gd b/src/dreamscape/Globals/EventBus.gd index 2b5c610f..a37c2484 100644 --- a/src/dreamscape/Globals/EventBus.gd +++ b/src/dreamscape/Globals/EventBus.gd @@ -10,3 +10,5 @@ signal game_over signal deck_loaded # warning-ignore:unused_signal signal kobodoldai_server_changed +# warning-ignore:unused_signal +signal card_animations_toggled (value) diff --git a/src/dreamscape/MainMenu/SettingsMenu.gd b/src/dreamscape/MainMenu/SettingsMenu.gd index 3111ab6f..e1c5e82b 100644 --- a/src/dreamscape/MainMenu/SettingsMenu.gd +++ b/src/dreamscape/MainMenu/SettingsMenu.gd @@ -16,6 +16,7 @@ onready var judge_ai = $"%JudgeAI" onready var generate_ai = $"%GenerateAI" onready var ai_label = $"%AILabel" onready var ai_genre = $"%AIGenre" +onready var animate_cards = $"%AnimateCards" var sound_effect_enabled = false @@ -38,6 +39,7 @@ func _ready() -> void: cfc.game_settings['use_ai'] = cfc.game_settings.get('use_ai', OS.get_name() != "HTML5") cfc.game_settings['judge_ai'] = cfc.game_settings.get('judge_ai', true) cfc.game_settings['generate_ai'] = cfc.game_settings.get('generate_ai', false) + cfc.game_settings['animate_cards'] = cfc.game_settings.get('animate_cards', true) cfc.game_settings['ai_genre'] = cfc.game_settings.get('ai_genre', HConst.AIGenres.RANDOM) AudioServer.set_bus_volume_db(AudioServer.get_bus_index("Master"), cfc.game_settings.main_volume) @@ -55,6 +57,7 @@ func _ready() -> void: main_vol_slider.value = cfc.game_settings.main_volume music_vol_slider.value = cfc.game_settings.music_volume use_ai.pressed = cfc.game_settings.use_ai + animate_cards.pressed = cfc.game_settings.animate_cards if OS.get_name() == "HTML5": use_ai.disabled = true ai_label.text = ai_label.text + "\n(AI unsupported in HTML5)" @@ -201,6 +204,15 @@ func _on_UseAI_toggled(button_pressed): else: SoundManager.play_se('setting_toggle_off') +func _on_AnimateCards_toggled(button_pressed): + cfc.set_setting('animate_cards',button_pressed) + if sound_effect_enabled: + if button_pressed: + SoundManager.play_se('setting_toggle_on') + else: + SoundManager.play_se('setting_toggle_off') + EventBus.emit_signal("card_animations_toggled", button_pressed) + func _on_AIGenre_item_selected(index): cfc.set_setting('ai_genre', ai_genre.get_item_id(index)) diff --git a/src/dreamscape/MainMenu/SettingsMenu.tscn b/src/dreamscape/MainMenu/SettingsMenu.tscn index 45876a26..421fe9ef 100644 --- a/src/dreamscape/MainMenu/SettingsMenu.tscn +++ b/src/dreamscape/MainMenu/SettingsMenu.tscn @@ -26,20 +26,20 @@ script = ExtResource( 2 ) [node name="PC" type="PanelContainer" parent="."] self_modulate = Color( 1, 1, 1, 0.690196 ) -margin_left = 384.0 +margin_left = 407.0 margin_top = 259.0 -margin_right = 1070.0 +margin_right = 1047.0 margin_bottom = 641.0 [node name="VBC" type="VBoxContainer" parent="PC"] margin_left = 2.0 margin_top = 2.0 -margin_right = 684.0 +margin_right = 638.0 margin_bottom = 380.0 custom_constants/separation = 5 [node name="HBC" type="HBoxContainer" parent="PC/VBC"] -margin_right = 682.0 +margin_right = 636.0 margin_bottom = 268.0 custom_constants/separation = 20 @@ -232,50 +232,59 @@ __meta__ = { [node name="VBC3" type="VBoxContainer" parent="PC/VBC/HBC"] margin_left = 448.0 -margin_right = 682.0 +margin_right = 636.0 margin_bottom = 268.0 size_flags_horizontal = 3 custom_constants/separation = 20 [node name="AILabel" type="Label" parent="PC/VBC/HBC/VBC3"] unique_name_in_owner = true -margin_right = 234.0 +margin_right = 188.0 margin_bottom = 21.0 text = "Artificial Intelligence" align = 1 [node name="AIMC" type="MarginContainer" parent="PC/VBC/HBC/VBC3"] margin_top = 41.0 -margin_right = 234.0 +margin_right = 188.0 margin_bottom = 110.0 custom_constants/margin_right = 10 custom_constants/margin_left = 10 [node name="VBC" type="VBoxContainer" parent="PC/VBC/HBC/VBC3/AIMC"] margin_left = 10.0 -margin_right = 224.0 +margin_right = 178.0 margin_bottom = 69.0 [node name="UseAI" type="CheckButton" parent="PC/VBC/HBC/VBC3/AIMC/VBC"] unique_name_in_owner = true -margin_right = 214.0 +margin_right = 168.0 margin_bottom = 21.0 pressed = true text = "Use AI Stories" -[node name="JudgeAI" type="CheckButton" parent="PC/VBC/HBC/VBC3/AIMC/VBC"] +[node name="AnimateCards" type="CheckButton" parent="PC/VBC/HBC/VBC3/AIMC/VBC"] unique_name_in_owner = true margin_top = 24.0 -margin_right = 214.0 +margin_right = 168.0 margin_bottom = 45.0 pressed = true +text = "Animate Card Art" + +[node name="JudgeAI" type="CheckButton" parent="PC/VBC/HBC/VBC3/AIMC/VBC"] +unique_name_in_owner = true +margin_top = 48.0 +margin_right = 168.0 +margin_bottom = 69.0 +pressed = true text = "Judge AI Stories" [node name="GenerateAI" type="CheckButton" parent="PC/VBC/HBC/VBC3/AIMC/VBC"] unique_name_in_owner = true -margin_top = 48.0 +visible = false +margin_top = 72.0 margin_right = 214.0 -margin_bottom = 69.0 +margin_bottom = 93.0 text = "Generate (Req.KoboldAI)" [node name="HBC" type="HBoxContainer" parent="PC/VBC/HBC/VBC3/AIMC/VBC"] @@ -298,7 +307,7 @@ margin_bottom = 25.0 [node name="ExitToMain" type="Button" parent="PC/VBC"] margin_top = 273.0 -margin_right = 682.0 +margin_right = 636.0 margin_bottom = 323.0 rect_min_size = Vector2( 0, 50 ) size_flags_horizontal = 3 @@ -307,12 +316,12 @@ text = "Exit To Main Menu" [node name="HBoxContainer" type="HBoxContainer" parent="PC/VBC"] margin_top = 328.0 -margin_right = 682.0 +margin_right = 636.0 margin_bottom = 378.0 [node name="Back" type="Button" parent="PC/VBC/HBoxContainer"] unique_name_in_owner = true -margin_right = 682.0 +margin_right = 636.0 margin_bottom = 50.0 rect_min_size = Vector2( 0, 50 ) size_flags_horizontal = 3 @@ -331,6 +340,7 @@ text = "BACK" [connection signal="value_changed" from="PC/VBC/HBC/VBC/SoundMC/VBC/MusicVolSlider" to="." method="_on_MusicVolSlider_value_changed"] [connection signal="value_changed" from="PC/VBC/HBC/VBC/SoundMC/VBC/SoundVolSlider" to="." method="_on_SoundVolSlider_value_changed"] [connection signal="toggled" from="PC/VBC/HBC/VBC3/AIMC/VBC/UseAI" to="." method="_on_UseAI_toggled"] +[connection signal="toggled" from="PC/VBC/HBC/VBC3/AIMC/VBC/AnimateCards" to="." method="_on_AnimateCards_toggled"] [connection signal="toggled" from="PC/VBC/HBC/VBC3/AIMC/VBC/JudgeAI" to="." method="_on_JudgeAI_toggled"] [connection signal="toggled" from="PC/VBC/HBC/VBC3/AIMC/VBC/GenerateAI" to="." method="_on_GenerateAI_toggled"] [connection signal="item_selected" from="PC/VBC/HBC/VBC3/AIMC/VBC/HBC/AIGenre" to="." method="_on_AIGenre_item_selected"] diff --git a/src/dreamscape/cards/ActionFrontNew.tscn b/src/dreamscape/cards/ActionFrontNew.tscn index 273e2cc2..4616e78a 100644 --- a/src/dreamscape/cards/ActionFrontNew.tscn +++ b/src/dreamscape/cards/ActionFrontNew.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/dreamscape/CardFrontNew.tscn" type="PackedScene" id=1] [ext_resource path="res://shaders/Warping.shader" type="Shader" id=2] -[ext_resource path="res://assets/card_front/dream card/card_frame_square.png" type="Texture" id=3] +[ext_resource path="res://assets/card_front/gpt-new-front_action.png" type="Texture" id=3] [sub_resource type="StyleBoxFlat" id=3] bg_color = Color( 0.0588235, 0, 0, 1 ) @@ -25,16 +25,16 @@ corner_radius_bottom_left = 50 [node name="ArtBackground" parent="." index="0"] color = Color( 0.25098, 0, 0, 1 ) -[node name="TextBackground" parent="." index="2"] +[node name="TextBackground" parent="." index="1"] custom_styles/panel = SubResource( 3 ) -[node name="TextShader" parent="." index="3"] +[node name="TextShader" parent="." index="2"] self_modulate = Color( 1, 1, 1, 0.27451 ) material = SubResource( 1 ) custom_styles/panel = SubResource( 2 ) -[node name="Art" parent="." index="4"] +[node name="Art" parent="." index="3"] self_modulate = Color( 1, 0.811765, 0.811765, 1 ) -[node name="CardDesign" parent="." index="7"] +[node name="CardDesign" parent="." index="5"] texture = ExtResource( 3 ) diff --git a/src/dreamscape/cards/ConcentrationFrontNew.tscn b/src/dreamscape/cards/ConcentrationFrontNew.tscn index 61efd805..38b484d9 100644 --- a/src/dreamscape/cards/ConcentrationFrontNew.tscn +++ b/src/dreamscape/cards/ConcentrationFrontNew.tscn @@ -1,12 +1,13 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://src/dreamscape/CardFrontNew.tscn" type="PackedScene" id=1] [ext_resource path="res://shaders/Concentration.shader" type="Shader" id=2] +[ext_resource path="res://assets/card_front/gpt-new-front_concentration.png" type="Texture" id=3] [sub_resource type="StyleBoxFlat" id=1] bg_color = Color( 0, 0.0392157, 0, 1 ) -corner_radius_bottom_right = 50 -corner_radius_bottom_left = 50 +corner_radius_bottom_right = 40 +corner_radius_bottom_left = 40 [sub_resource type="ShaderMaterial" id=2] shader = ExtResource( 2 ) @@ -18,10 +19,10 @@ shader_param/time_offset = null [node name="ArtBackground" parent="." index="0"] color = Color( 0, 0.196078, 0.0313726, 1 ) -[node name="TextBackground" parent="." index="2"] +[node name="TextBackground" parent="." index="1"] custom_styles/panel = SubResource( 1 ) -[node name="TextShader" parent="." index="3"] +[node name="TextShader" parent="." index="2"] self_modulate = Color( 1, 1, 1, 0.0588235 ) material = SubResource( 2 ) margin_left = 3.62369 @@ -29,5 +30,12 @@ margin_top = 136.743 margin_right = 193.624 margin_bottom = 276.743 -[node name="Art" parent="." index="4"] +[node name="Art" parent="." index="3"] self_modulate = Color( 0.807843, 1, 0.819608, 1 ) + +[node name="CardDesign" parent="." index="5"] +texture = ExtResource( 3 ) + +[node name="RarityMiddle" parent="." index="7"] +margin_top = 165.0 +margin_bottom = -100.0 diff --git a/src/dreamscape/cards/ControlFrontNew.tscn b/src/dreamscape/cards/ControlFrontNew.tscn index df9e36c6..86de8a46 100644 --- a/src/dreamscape/cards/ControlFrontNew.tscn +++ b/src/dreamscape/cards/ControlFrontNew.tscn @@ -19,12 +19,12 @@ shader_param/time_offset = null [node name="ArtBackground" parent="." index="0"] color = Color( 0, 0.0431373, 0.282353, 1 ) -[node name="TextBackground" parent="." index="2"] +[node name="TextBackground" parent="." index="1"] custom_styles/panel = SubResource( 1 ) -[node name="TextShader" parent="." index="3"] +[node name="TextShader" parent="." index="2"] self_modulate = Color( 1, 1, 1, 0.254902 ) material = SubResource( 2 ) -[node name="Art" parent="." index="4"] +[node name="Art" parent="." index="3"] self_modulate = Color( 0.792157, 0.819608, 1, 1 ) diff --git a/src/dreamscape/cards/Perturbation.tscn b/src/dreamscape/cards/Perturbation.tscn index 5098d05d..ec121d2d 100644 --- a/src/dreamscape/cards/Perturbation.tscn +++ b/src/dreamscape/cards/Perturbation.tscn @@ -4,8 +4,4 @@ [ext_resource path="res://src/dreamscape/cards/PerturbationFrontNew.tscn" type="PackedScene" id=2] [node name="Card" instance=ExtResource( 1 )] -properties = { -} -scripts = { -} card_front_design = ExtResource( 2 ) diff --git a/src/dreamscape/cards/PerturbationFrontNew.tscn b/src/dreamscape/cards/PerturbationFrontNew.tscn index 1d7f236c..f9adbf32 100644 --- a/src/dreamscape/cards/PerturbationFrontNew.tscn +++ b/src/dreamscape/cards/PerturbationFrontNew.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://src/dreamscape/CardFrontNew.tscn" type="PackedScene" id=1] [ext_resource path="res://shaders/Dreambox.shader" type="Shader" id=2] +[ext_resource path="res://assets/card_front/gpt-new-front_petrurbation.png" type="Texture" id=3] [sub_resource type="StyleBoxEmpty" id=2] @@ -25,5 +26,14 @@ custom_styles/panel = SubResource( 2 ) [node name="ArtBackground" parent="." index="0"] color = Color( 0, 0, 0, 1 ) -[node name="TextShader" parent="." index="3"] +[node name="TextShader" parent="." index="2"] material = SubResource( 1 ) + +[node name="CardDesign" parent="." index="5"] +texture = ExtResource( 3 ) + +[node name="RarityMiddle" parent="." index="7"] +margin_left = 91.5 +margin_top = 168.0 +margin_right = -93.5 +margin_bottom = -97.0 diff --git a/src/dreamscape/cards/UnderstandingFrontNew.tscn b/src/dreamscape/cards/UnderstandingFrontNew.tscn index 8b915f25..62c7ebe3 100644 --- a/src/dreamscape/cards/UnderstandingFrontNew.tscn +++ b/src/dreamscape/cards/UnderstandingFrontNew.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=6 format=2] [ext_resource path="res://src/dreamscape/CardFrontNew.tscn" type="PackedScene" id=1] -[ext_resource path="res://assets/card_front/dream card/card_frame_square.png" type="Texture" id=2] +[ext_resource path="res://assets/card_front/gpt-new-front_understanding.png" type="Texture" id=2] [ext_resource path="res://shaders/Dreambox.shader" type="Shader" id=3] [sub_resource type="StyleBoxFlat" id=1] bg_color = Color( 0.0862745, 0, 0.137255, 1 ) -corner_radius_bottom_right = 50 -corner_radius_bottom_left = 50 +corner_radius_bottom_right = 38 +corner_radius_bottom_left = 38 [sub_resource type="ShaderMaterial" id=2] resource_local_to_scene = true @@ -30,14 +30,18 @@ margin_top = 20.2973 margin_bottom = 150.297 color = Color( 0.152941, 0, 0.341176, 1 ) -[node name="TextBackground" parent="." index="2"] +[node name="TextBackground" parent="." index="1"] custom_styles/panel = SubResource( 1 ) -[node name="TextShader" parent="." index="3"] +[node name="TextShader" parent="." index="2"] material = SubResource( 2 ) -[node name="Art" parent="." index="4"] +[node name="Art" parent="." index="3"] self_modulate = Color( 0.976471, 0.792157, 1, 1 ) -[node name="CardDesign" parent="." index="7"] +[node name="CardDesign" parent="." index="5"] texture = ExtResource( 2 ) + +[node name="RarityMiddle" parent="." index="7"] +margin_top = 165.0 +margin_bottom = -100.0 diff --git a/src/dreamscape/cards/sets/ImageLibrary.gd b/src/dreamscape/cards/sets/ImageLibrary.gd index 404fd245..32cf3162 100644 --- a/src/dreamscape/cards/sets/ImageLibrary.gd +++ b/src/dreamscape/cards/sets/ImageLibrary.gd @@ -63,22 +63,22 @@ const FINAL_IMAGES := { "That's Going in the Book": "res://assets/cards/That\'s Going in the Book.jpg", "Note-Taking": "res://assets/cards/Note-Taking.jpg", "Schadenfreude": "res://assets/cards/Schadenfreude.jpg", - "The Last Straw": "res://assets/cards/The Last Straw.jpg", + "The Last Straw": "res://assets/cards/The Last Straw.webp", "Memento of Anger": "res://assets/cards/Memento of Anger.jpg", "Memento of Safety": "res://assets/cards/Memento of Safety.jpg", "Moving On": "res://assets/cards/Moving On.jpg", - "Vestige of Warmth": "res://assets/cards/Vestige of Warmth.jpg", - "Fist of Candies": "res://assets/cards/Fist of Candies.jpg", + "Vestige of Warmth": "res://assets/cards/Vestige of Warmth.webp", + "Fist of Candies": "res://assets/cards/Fist of Candies.webp", "Hand of Grudge": "res://assets/cards/Hand of Grudge.jpg", "Vengeance": "res://assets/cards/Vengeance.jpg", - "Reactionary": "res://assets/cards/Reactionary.jpg", + "Reactionary": "res://assets/cards/Reactionary.webp", "Nothing Forgotten": "res://assets/cards/Nothing Forgotten.jpg", "Stewing": "res://assets/cards/Stewing.jpg", - "The Cold Dish": "res://assets/cards/The Cold Dish.jpg", + "The Cold Dish": "res://assets/cards/The Cold Dish.webp", "Planning": "res://assets/cards/Planning.jpg", - "Saved for Later": "res://assets/cards/Saved for Later.jpg", - "Reckoning Time": "res://assets/cards/Reckoning Time.jpg", - "Prepared": "res://assets/cards/Prepared.jpg", + "Saved for Later": "res://assets/cards/Saved for Later.webp", + "Reckoning Time": "res://assets/cards/Reckoning Time.webp", + "Prepared": "res://assets/cards/Prepared.webp", "Sensuous": "res://assets/cards/Sensuous.jpg", "A Strange Gaida": "res://assets/cards/A Strange Gaida.jpg", "The Plot Chickens...": "res://assets/cards/The Plot Chickens.jpg", @@ -245,6 +245,11 @@ const FINAL_VIDEOS := { "Vengeance": "res://assets/cards/Vengeance.ogv", "Planning": "res://assets/cards/Planning.ogv", "Confidence": "res://assets/cards/Confidence.ogv", + "Vestige of Warmth": "res://assets/cards/Vestige of Warmth.ogv", + "Saved for Later": "res://assets/cards/Saved for Later.ogv", + "Reckoning Time": "res://assets/cards/Reckoning Time.ogv", + "Reactionary": "res://assets/cards/Reactionary.ogv", + "Prepared": "res://assets/cards/Prepared.ogv", }