From 6e69fb3872a002ef9b1641ed3b805597e1b5be1b Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 28 Jan 2024 17:27:11 +0900 Subject: [PATCH] seasonal texture for leaves --- assets/mods/basegame/blocks/112.tga | 4 ++-- assets/mods/basegame/blocks/113.tga | 4 ++-- assets/mods/basegame/blocks/114.tga | 4 ++-- assets/mods/basegame/blocks/115.tga | 4 ++-- .../terrarum/modulebasegame/gameactors/FixtureJukebox.kt | 2 +- work_files/graphics/terrain/tree_foliage.kra | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/assets/mods/basegame/blocks/112.tga b/assets/mods/basegame/blocks/112.tga index b00cb02fb..689362587 100644 --- a/assets/mods/basegame/blocks/112.tga +++ b/assets/mods/basegame/blocks/112.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8989af87cdb183685c0d2d32c4dedf9c1f67e442a696ea735c4543bdc1ce1320 -size 50194 +oid sha256:f775ac76f90a18f969266440796bd2ad791ac305055d31662dfdff03be88f0eb +size 301074 diff --git a/assets/mods/basegame/blocks/113.tga b/assets/mods/basegame/blocks/113.tga index 7f5063786..840b30998 100644 --- a/assets/mods/basegame/blocks/113.tga +++ b/assets/mods/basegame/blocks/113.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3fd82860fc2758ceb12ba864162046da445e508726198e1d7e468ff020eec27 -size 50194 +oid sha256:dc5adf6a2ad5aece0a7fef6386dc593184ff198021ea12df009aca6bcd2b475f +size 301074 diff --git a/assets/mods/basegame/blocks/114.tga b/assets/mods/basegame/blocks/114.tga index 31d694656..16100b488 100644 --- a/assets/mods/basegame/blocks/114.tga +++ b/assets/mods/basegame/blocks/114.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e9b975a1b0ad0f089417802bad421c3bf5ca549f985da8c8c606ddbecd132f7 -size 50194 +oid sha256:8b1981b5422c76c6e063e4f6460de3fc40acbf5cf22d8447b74bab09b40164cb +size 301074 diff --git a/assets/mods/basegame/blocks/115.tga b/assets/mods/basegame/blocks/115.tga index 62fc557f7..28635713a 100644 --- a/assets/mods/basegame/blocks/115.tga +++ b/assets/mods/basegame/blocks/115.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5dd34165ff73083df69b384bcf5229c3f4f4b88776278bb2f274522c77376bd1 -size 50194 +oid sha256:50097fe3e331c20f33891652dd309658eb44c3d423dec31eeba2a2345664afd5 +size 301074 diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureJukebox.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureJukebox.kt index a5dbf7931..7f8dd93a2 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureJukebox.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureJukebox.kt @@ -88,7 +88,7 @@ class FixtureJukebox : Electric, PlaysMusic { // supress the normal background music playback if (musicIsPlaying && !flagDespawn) { - (INGAME.musicGovernor as TerrarumMusicGovernor).stopMusic(this, false) + (INGAME.musicGovernor as TerrarumMusicGovernor).stopMusic(this, true) } } diff --git a/work_files/graphics/terrain/tree_foliage.kra b/work_files/graphics/terrain/tree_foliage.kra index 6bad212e4..2f51043e4 100644 --- a/work_files/graphics/terrain/tree_foliage.kra +++ b/work_files/graphics/terrain/tree_foliage.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9103c14c840f9bf6b4cd719e870bce14f658a286111e0fe39c9d2347a2d64534 -size 574231 +oid sha256:57afd8e9cfd37b05d56a5eeefe526d640ea53780bd30ca7c357b2ef1061cb198 +size 1873934