poikilos
3 years ago
3 changed files with 160 additions and 0 deletions
@ -0,0 +1,55 @@ |
|||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
# How the files in this version of the patch were converted is unknown, but I (Poikilos) probably used Audacity to combine the channels, and I know some of the files were re-recorded. |
||||
|
$ cd ~/git/EnlivenMinetest/Bucket_Game-branches/mono-sounds-patch-190613 |
||||
|
$ find -type f -exec ls -lh {} \; > ../mono-sounds-patch-190613.stats.txt |
||||
|
$ cd .. |
||||
|
# apply: |
||||
|
# Set BUCKET_GAME to Bucket_Game dir then: cd EnlivenMinetest && git pull && rsync -rt Bucket_Game-branches/mono-sounds-patch-190613/ $BUCKET_GAME |
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
#region files common between original 190613 and redo patch |
||||
|
-rw-r--r-- 1 owner owner 21K Jun 13 2019 ./mods/codermobs/codermobs/sounds/codermobs_kitten.ogg |
||||
|
-rw-r--r-- 1 owner owner 10K Jun 13 2019 ./mods/codermobs/codermobs/sounds/codermobs_roar.ogg |
||||
|
-rw-r--r-- 1 owner owner 31K Jun 13 2019 ./mods/codermobs/codermobs/sounds/chicken_lay_egg.ogg |
||||
|
-rw-r--r-- 1 owner owner 31K Jun 13 2019 ./mods/codermobs/codermobs/sounds/codermobs_wasp.ogg |
||||
|
-rw-r--r-- 1 owner owner 41K Jun 13 2019 ./mods/codermobs/codermobs/sounds/hohoho.ogg |
||||
|
-rw-r--r-- 1 owner owner 6.6K Jun 13 2019 ./mods/codermobs/codermobs/sounds/codermobs_denny.ogg |
||||
|
-rw-r--r-- 1 owner owner 18K Jun 13 2019 ./mods/codermobs/codermobs/sounds/bellow.ogg |
||||
|
-rw-r--r-- 1 owner owner 29K Jun 13 2019 ./mods/codermobs/codermobs/sounds/codermobs_pumpking.ogg |
||||
|
-rw-r--r-- 1 owner owner 31K Jun 13 2019 ./mods/codermobs/codermobs/sounds/coderwasp.ogg |
||||
|
-rw-r--r-- 1 owner owner 20K Jun 13 2019 ./mods/codermobs/codermobs/sounds/codermobs_fireball.ogg |
||||
|
-rw-r--r-- 1 owner owner 18K Jun 13 2019 ./mods/codermobs/codermobs/sounds/codermobs_bellow.ogg |
||||
|
#endregion files common between original 190613 and redo patch |
||||
|
|
||||
|
|
||||
|
|
||||
|
-rw-r--r-- 1 owner owner 19K May 26 2015 ./mods/codermobs/codermobs/src/oops-stereo/bellow.ogg |
||||
|
-rw-r--r-- 1 owner owner 59K Apr 9 2019 ./mods/codermobs/codermobs/src/oops-stereo/chicken_lay_egg.ogg |
||||
|
-rw-r--r-- 1 owner owner 19K May 26 2015 ./mods/codermobs/codermobs/src/oops-stereo/codermobs_bellow.ogg |
||||
|
-rw-r--r-- 1 owner owner 9.6K May 24 2019 ./mods/codermobs/codermobs/src/oops-stereo/codermobs_denny.ogg |
||||
|
-rw-r--r-- 1 owner owner 22K Aug 29 2015 ./mods/codermobs/codermobs/src/oops-stereo/codermobs_fireball.ogg |
||||
|
-rwxr-xr-x 1 owner owner 38K Aug 29 2015 ./mods/codermobs/codermobs/src/oops-stereo/codermobs_kitten.ogg |
||||
|
-rw-r--r-- 1 owner owner 45K Apr 28 2015 ./mods/codermobs/codermobs/src/oops-stereo/codermobs_pumpking.ogg |
||||
|
-rw-r--r-- 1 owner owner 15K Nov 22 2016 ./mods/codermobs/codermobs/src/oops-stereo/codermobs_roar.ogg |
||||
|
-rw-r--r-- 1 owner owner 37K Nov 22 2016 ./mods/codermobs/codermobs/src/oops-stereo/codermobs_wasp.ogg |
||||
|
-rw-r--r-- 1 owner owner 37K Nov 11 2017 ./mods/codermobs/codermobs/src/oops-stereo/coderwasp.ogg |
||||
|
-rw-r--r-- 1 owner owner 71K Dec 14 2012 ./mods/codermobs/codermobs/src/oops-stereo/hohoho.ogg |
@ -0,0 +1,42 @@ |
|||||
|
$ ~/git/mtanalyze/findstereofiles.py ~/minetest/bucket_game-190613 --patch ~/git/EnlivenMinetest/Bucket_Game-branches/mono-sounds-patch-redo-20211111-vs-190613 |
||||
|
$ # ^ Such as if hard-coded "-qscale:a 0" in findstereofiles.py. |
||||
|
$ # Then analyze difference in size using meld like: |
||||
|
$ cd ~/git/EnlivenMinetest/Bucket_Game-branches/mono-sounds-patch-redo-20211111-vs-190613 |
||||
|
$ # rm ./mods/coderbuild/lavender/sounds/lavender_mipiace.ogg ./mods/coderbuild/castle/src/original/castle_weapons/sounds/castle_crossbow_click.ogg ./mods/coderbuild/castle/src/original/orbs_of_time/sounds/orbs_birds.ogg ./mods/coderbuild/castle/src/original/orbs_of_time/sounds/orbs_owl.ogg ./mods/coderbuild/castle/src/original/orbs_of_time/sounds/orbs_ding.ogg ./mods/coderbuild/castle/src/original/ropes/sounds/ropes_creak.3.ogg ./mods/coderbuild/castle/src/original/ropes/sounds/ropes_creak.2.ogg |
||||
|
$ # ^ removes nothing in 19-06-13 |
||||
|
$ # Remove files that are only in an older bucket_game version (This list was generated by ../remove_not_in.py): |
||||
|
$ rm ./mods/coderbuild/castle/orbs_of_time/sounds/orbs_birds.ogg |
||||
|
$ rm ./mods/coderbuild/castle/orbs_of_time/sounds/orbs_owl.ogg |
||||
|
$ rm ./mods/coderbuild/castle/orbs_of_time/sounds/orbs_ding.ogg |
||||
|
$ rm ./mods/coderbuild/castle/ropes/sounds/ropes_creak.3.ogg |
||||
|
$ rm ./mods/coderbuild/castle/ropes/sounds/ropes_creak.2.ogg |
||||
|
$ rm ./mods/coderbuild/castle/castle_weapons/sounds/castle_crossbow_click.ogg |
||||
|
$ rm ./mods/coderbuild/scifi_nodes/sounds/scifi_nodes_door_mechanic.ogg |
||||
|
$ rm ./mods/coderfood/hbhunger/sounds/hbhunger_eat_generic.ogg |
||||
|
$ rm ./mods/codermobs/manaslimes/sounds/item_slurp.ogg |
||||
|
$ # Remove files that are done in the later patch (list 2): |
||||
|
$ rm ./mods/coderfood/unified_foods/sounds/unified_hunger_eat_generic.ogg ./mods/coderbuild/christmas_craft/sounds/snowball_splash.4.ogg ./mods/coderbuild/travelnet/sounds/travelnet_bell.ogg ./mods/coderbuild/castle/sounds/orbs_birds.ogg ./mods/coderbuild/castle/sounds/castle_crossbow_click.ogg ./mods/coderbuild/castle/sounds/ropes_creak.3.ogg ./mods/coderbuild/castle/sounds/orbs_owl.ogg ./mods/coderbuild/castle/sounds/ropes_creak.2.ogg ./mods/coderbuild/castle/sounds/orbs_ding.ogg ./mods/mtmachines/technic/sounds/item_drop_pickup.1.ogg ./mods/mtmachines/technic/sounds/mining_drill.ogg ./mods/mtmachines/technic/sounds/item_drop_pickup.4.ogg ./mods/mtmachines/technic/sounds/item_drop_pickup.3.ogg ./mods/mtmachines/technic/sounds/item_drop_pickup.2.ogg ./mods/codercore/wiki/sounds/REALZulfikar.ogg ./mods/codercore/tpr/sounds/whoosh.ogg ./mods/codercore/unified_inventory/sounds/birds.ogg ./mods/codercore/unified_inventory/sounds/owl.ogg ./mods/codercore/item_drop/sounds/item_drop_pickup.1.ogg ./mods/codercore/item_drop/sounds/item_drop_pickup.4.ogg ./mods/codercore/item_drop/sounds/item_drop_pickup.3.ogg ./mods/codercore/item_drop/sounds/item_drop_pickup.2.ogg ./mods/codermobs/mobs/sounds/mobs_swing.ogg ./mods/codermobs/codermobs/sounds/codermobs_trex1.ogg ./mods/codermobs/codermobs/sounds/codermobs_trex2.ogg ./mods/codermobs/codermobs/sounds/codermobs_tiger.ogg ./mods/codermobs/codermobs/sounds/codermobs_mdskeleton_war_cry.ogg ./mods/codermobs/codermobs/sounds/codermobs_mdskeleton_attack.2.ogg |
||||
|
$ find -type f -exec ls -lh {} \; > ../mono-sounds-patch-redo-20211111-vs-190613.stats.txt |
||||
|
$ cd .. |
||||
|
$ meld mono-sounds-patch-redo-20211111-vs-190613.stats.txt mono-sounds-patch-redo-20211111-vs-190613.stats.txt |
||||
|
# apply: |
||||
|
# Set BUCKET_GAME to Bucket_Game dir then: cd EnlivenMinetest && git pull && rsync -rt Bucket_Game-branches/mono-sounds-patch-redo-20211111-vs-190613/ $BUCKET_GAME |
||||
|
|
||||
|
-rw-r--r-- 1 owner owner 37K Nov 11 09:32 ./mods/codercore/tsm_pyramids/sounds/mummy.1.ogg |
||||
|
-rw-r--r-- 1 owner owner 28K Nov 11 09:32 ./mods/codercore/tsm_pyramids/sounds/mummy.2.ogg |
||||
|
-rw-r--r-- 1 owner owner 6.0K Nov 11 09:32 ./mods/codercore/tsm_pyramids/sounds/mummy_hurt.1.ogg |
||||
|
#region files common between original 190613 and redo patch |
||||
|
-rw-r--r-- 1 owner owner 15K Nov 11 09:32 ./mods/codermobs/codermobs/sounds/codermobs_kitten.ogg |
||||
|
-rw-r--r-- 1 owner owner 8.8K Nov 11 09:32 ./mods/codermobs/codermobs/sounds/codermobs_roar.ogg |
||||
|
-rw-r--r-- 1 owner owner 24K Nov 11 09:32 ./mods/codermobs/codermobs/sounds/chicken_lay_egg.ogg |
||||
|
-rw-r--r-- 1 owner owner 26K Nov 11 09:32 ./mods/codermobs/codermobs/sounds/codermobs_wasp.ogg |
||||
|
-rw-r--r-- 1 owner owner 32K Nov 11 09:32 ./mods/codermobs/codermobs/sounds/hohoho.ogg |
||||
|
-rw-r--r-- 1 owner owner 6.0K Nov 11 09:32 ./mods/codermobs/codermobs/sounds/codermobs_denny.ogg |
||||
|
-rw-r--r-- 1 owner owner 16K Nov 11 09:32 ./mods/codermobs/codermobs/sounds/bellow.ogg |
||||
|
-rw-r--r-- 1 owner owner 24K Nov 11 09:32 ./mods/codermobs/codermobs/sounds/codermobs_pumpking.ogg |
||||
|
-rw-r--r-- 1 owner owner 26K Nov 11 09:32 ./mods/codermobs/codermobs/sounds/coderwasp.ogg |
||||
|
-rw-r--r-- 1 owner owner 17K Nov 11 09:32 ./mods/codermobs/codermobs/sounds/codermobs_fireball.ogg |
||||
|
-rw-r--r-- 1 owner owner 16K Nov 11 09:32 ./mods/codermobs/codermobs/sounds/codermobs_bellow.ogg |
||||
|
#endregion files common between original 190613 and redo patch |
||||
|
|
||||
|
|
@ -0,0 +1,63 @@ |
|||||
|
#!/usr/bin/env python3 |
||||
|
|
||||
|
import sys |
||||
|
import os |
||||
|
import platform |
||||
|
|
||||
|
profile = None |
||||
|
if platform.system() == "Windows": |
||||
|
profile = os.environ['USERPROFILE'] |
||||
|
else: |
||||
|
profile = os.environ['HOME'] |
||||
|
|
||||
|
|
||||
|
def error(msg): |
||||
|
sys.stderr.write("{}\n".format(msg)) |
||||
|
sys.stderr.flush() |
||||
|
|
||||
|
|
||||
|
def showNotInOriginal(patched, original, root=None, ignores=[]): |
||||
|
''' |
||||
|
Print rm relative ('rm ./...') commands to standard output where |
||||
|
a file in patched doesn't exist in original. |
||||
|
|
||||
|
Keyword arguments: |
||||
|
root -- Remove this from the beginning of the rm commands and |
||||
|
replace it with ".". If None, it is set to patched. |
||||
|
ignores -- files to ignore |
||||
|
''' |
||||
|
if root is None: |
||||
|
root = patched |
||||
|
for sub in os.listdir(patched): |
||||
|
originalPath = os.path.join(original, sub) |
||||
|
patchedPath = os.path.join(patched, sub) |
||||
|
if sub in ignores: |
||||
|
continue |
||||
|
if os.path.isdir(patchedPath): |
||||
|
showNotInOriginal(patchedPath, originalPath, root=root, ignores=ignores) |
||||
|
continue |
||||
|
if not os.path.isfile(originalPath): |
||||
|
relPath = patchedPath[len(root):] |
||||
|
dotPath = "." + relPath |
||||
|
dotPathShell = dotPath |
||||
|
if "'" in dotPathShell: |
||||
|
dotPathShell = '"{}"'.format(dotPathShell) |
||||
|
elif '"' in dotPathShell: |
||||
|
dotPathShell = "'{}'".format(dotPathShell) |
||||
|
print("rm {}".format(dotPathShell)) |
||||
|
|
||||
|
|
||||
|
if __name__ == "__main__": |
||||
|
original = os.path.join(profile, "minetest", "games", "Bucket_Game") |
||||
|
patched = os.path.abspath(".") |
||||
|
originalMods = os.path.join(original, "mods") |
||||
|
patchedMods = os.path.join(patched, "mods") |
||||
|
if not os.path.isdir(originalMods): |
||||
|
error("Error: \"{}\" doesn't seem to be a game since it doesn't have a \"mods\" directory.".format(original)) |
||||
|
exit(1) |
||||
|
if not os.path.isdir(patchedMods): |
||||
|
error("Error: \"{}\" doesn't seem to be a game since it doesn't have a \"mods\" directory.".format(patched)) |
||||
|
exit(1) |
||||
|
myName = os.path.split(sys.argv[0])[1] |
||||
|
# error("myName:{}".format(myName)) |
||||
|
showNotInOriginal(patched, original, None, ignores=[myName]) |
Loading…
Reference in new issue