From 8c0259e75635a671943fb396d3572d8c1d584e40 Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Mon, 13 May 2019 02:39:44 -0400 Subject: [PATCH] move BOM mob merged upstream --- .../mods/codermobs/codermobs/init.lua | 94 ------------------ .../mods/codermobs/codermobs/bom.lua | 0 .../codermobs/models/codermobs_bom.b3d | Bin .../codermobs/sounds/codermobs_bom_death.ogg | Bin .../sounds/codermobs_bom_explode.ogg | Bin .../codermobs/sounds/codermobs_bom_random.ogg | Bin .../sounds/codermobs_damage_hollow_metal.ogg | Bin .../mods/codermobs/codermobs/src/BOM2b.blend | Bin .../165911__deganoth__explosion-1.wav | Bin .../bom-sounds}/372186__seidolon__fuse.wav | Bin .../src/bom-sounds}/codermobs_bom_death.aup | 0 .../src/bom-sounds}/codermobs_bom_death1b.aup | 0 .../eff/d1f/eff1f2e0.au | Bin .../eff/d1f/eff1f2e0.au | Bin .../165911__deganoth__explosion-1.wav | Bin .../eff/d1f/eff1f7d4.au | Bin .../codermobs/src/codermobs_bom_mesh.xcf | Bin .../src/codermobs_damage_hollow_metal.aup | 0 18 files changed, 94 deletions(-) delete mode 100644 patches/Bucket_Game-patched/mods/codermobs/codermobs/init.lua rename patches/{Bucket_Game-patched => deprecated/merged-upstream/Bucket_Game}/mods/codermobs/codermobs/bom.lua (100%) rename patches/{Bucket_Game-patched => deprecated/merged-upstream/Bucket_Game}/mods/codermobs/codermobs/models/codermobs_bom.b3d (100%) rename patches/{Bucket_Game-patched => deprecated/merged-upstream/Bucket_Game}/mods/codermobs/codermobs/sounds/codermobs_bom_death.ogg (100%) rename patches/{Bucket_Game-patched => deprecated/merged-upstream/Bucket_Game}/mods/codermobs/codermobs/sounds/codermobs_bom_explode.ogg (100%) rename patches/{Bucket_Game-patched => deprecated/merged-upstream/Bucket_Game}/mods/codermobs/codermobs/sounds/codermobs_bom_random.ogg (100%) rename patches/{Bucket_Game-patched => deprecated/merged-upstream/Bucket_Game}/mods/codermobs/codermobs/sounds/codermobs_damage_hollow_metal.ogg (100%) rename patches/{Bucket_Game-patched => deprecated/merged-upstream/Bucket_Game}/mods/codermobs/codermobs/src/BOM2b.blend (100%) rename patches/{Bucket_Game-patched/mods/codermobs/codermobs/src => deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds}/165911__deganoth__explosion-1.wav (100%) rename patches/{Bucket_Game-patched/mods/codermobs/codermobs/src => deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds}/372186__seidolon__fuse.wav (100%) rename patches/{Bucket_Game-patched/mods/codermobs/codermobs/src => deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds}/codermobs_bom_death.aup (100%) rename patches/{Bucket_Game-patched/mods/codermobs/codermobs/src => deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds}/codermobs_bom_death1b.aup (100%) rename patches/{Bucket_Game-patched/mods/codermobs/codermobs/src => deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds}/codermobs_bom_death1b_data/eff/d1f/eff1f2e0.au (100%) rename patches/{Bucket_Game-patched/mods/codermobs/codermobs/src => deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds}/codermobs_bom_death_data/eff/d1f/eff1f2e0.au (100%) rename patches/{Bucket_Game-patched/mods/codermobs/codermobs/src => deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds}/codermobs_damage_hollow_metal_data/165911__deganoth__explosion-1.wav (100%) rename patches/{Bucket_Game-patched/mods/codermobs/codermobs/src => deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds}/codermobs_damage_hollow_metal_data/eff/d1f/eff1f7d4.au (100%) rename patches/{Bucket_Game-patched => deprecated/merged-upstream/Bucket_Game}/mods/codermobs/codermobs/src/codermobs_bom_mesh.xcf (100%) rename patches/{Bucket_Game-patched => deprecated/merged-upstream/Bucket_Game}/mods/codermobs/codermobs/src/codermobs_damage_hollow_metal.aup (100%) diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/init.lua b/patches/Bucket_Game-patched/mods/codermobs/codermobs/init.lua deleted file mode 100644 index 784839c..0000000 --- a/patches/Bucket_Game-patched/mods/codermobs/codermobs/init.lua +++ /dev/null @@ -1,94 +0,0 @@ -codermobs = {} -mobs_param = {} - -codermobs.modname = minetest.get_current_modname() -codermobs.modpath = minetest.get_modpath (codermobs.modname) -local mp = codermobs.modpath - -local enable_moontest = - minetest.setting_getbool ("enable_moon" ) or - minetest.setting_getbool ("enable_moontest" ) - --- =================================================================== --- These must come first. - -dofile (mp .. "/globals.lua" ) -dofile (mp .. "/util.lua" ) -dofile (mp .. "/animal_materials.lua" ) -dofile (mp .. "/vombie_flame.lua" ) - --- =================================================================== - -dofile (mp .. "/badger.lua" ) -dofile (mp .. "/bat.lua" ) -dofile (mp .. "/bear.lua" ) -dofile (mp .. "/bee.lua" ) -dofile (mp .. "/beetle.lua" ) - -dofile (mp .. "/bird.lua" ) -dofile (mp .. "/bug.lua" ) -dofile (mp .. "/bunny.lua" ) -dofile (mp .. "/butterfly.lua" ) -dofile (mp .. "/cacodemon.lua" ) - -dofile (mp .. "/car.lua" ) -dofile (mp .. "/chicken.lua" ) -dofile (mp .. "/cow.lua" ) -dofile (mp .. "/cyberdemon.lua" ) - -dofile (mp .. "/deer.lua" ) -dofile (mp .. "/dirt_monster.lua" ) -dofile (mp .. "/dog.lua" ) -dofile (mp .. "/elephant.lua" ) -dofile (mp .. "/elk.lua" ) - -dofile (mp .. "/farhorse.lua" ) -dofile (mp .. "/flying_pig.lua" ) -dofile (mp .. "/ghost.lua" ) -dofile (mp .. "/goat.lua" ) -dofile (mp .. "/hedgehog.lua" ) - -dofile (mp .. "/jeraf.lua" ) -dofile (mp .. "/kitten.lua" ) -dofile (mp .. "/lava_flan.lua" ) -dofile (mp .. "/lostsoul.lua" ) -dofile (mp .. "/lott_spider.lua" ) - -dofile (mp .. "/mammoth.lua" ) -dofile (mp .. "/mdskeleton.lua" ) -dofile (mp .. "/oerkki.lua" ) -dofile (mp .. "/ostrich.lua" ) -dofile (mp .. "/owl.lua" ) - -dofile (mp .. "/panda.lua" ) -dofile (mp .. "/penguin.lua" ) -dofile (mp .. "/plane.lua" ) -dofile (mp .. "/polar_bear.lua" ) -dofile (mp .. "/rat.lua" ) - -dofile (mp .. "/rat_better.lua" ) -dofile (mp .. "/bom.lua" ) -dofile (mp .. "/santa.lua" ) -dofile (mp .. "/sheep.lua" ) -dofile (mp .. "/silverfish.lua" ) - -dofile (mp .. "/snake_garter.lua" ) -dofile (mp .. "/snake_ice.lua" ) -dofile (mp .. "/snowman.lua" ) -dofile (mp .. "/tree_monster.lua" ) -dofile (mp .. "/vombie.lua" ) - -dofile (mp .. "/warthog.lua" ) -dofile (mp .. "/wolf.lua" ) -dofile (mp .. "/zebra.lua" ) - -dofile (mp .. "/baby_chick.lua" ) - --- Moon Cow must be defined after regular cow. - -if enable_moontest then - dofile (mp .. "/mooncow.lua") -end - --- =================================================================== --- End of file. diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/bom.lua b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/bom.lua similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/bom.lua rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/bom.lua diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/models/codermobs_bom.b3d b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_bom.b3d similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/models/codermobs_bom.b3d rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_bom.b3d diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/sounds/codermobs_bom_death.ogg b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_bom_death.ogg similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/sounds/codermobs_bom_death.ogg rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_bom_death.ogg diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/sounds/codermobs_bom_explode.ogg b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_bom_explode.ogg similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/sounds/codermobs_bom_explode.ogg rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_bom_explode.ogg diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/sounds/codermobs_bom_random.ogg b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_bom_random.ogg similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/sounds/codermobs_bom_random.ogg rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_bom_random.ogg diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/sounds/codermobs_damage_hollow_metal.ogg b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_damage_hollow_metal.ogg similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/sounds/codermobs_damage_hollow_metal.ogg rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/sounds/codermobs_damage_hollow_metal.ogg diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/src/BOM2b.blend b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/BOM2b.blend similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/src/BOM2b.blend rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/BOM2b.blend diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/src/165911__deganoth__explosion-1.wav b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/165911__deganoth__explosion-1.wav similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/src/165911__deganoth__explosion-1.wav rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/165911__deganoth__explosion-1.wav diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/src/372186__seidolon__fuse.wav b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/372186__seidolon__fuse.wav similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/src/372186__seidolon__fuse.wav rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/372186__seidolon__fuse.wav diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_bom_death.aup b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death.aup similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_bom_death.aup rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death.aup diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_bom_death1b.aup b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death1b.aup similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_bom_death1b.aup rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death1b.aup diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_bom_death1b_data/eff/d1f/eff1f2e0.au b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death1b_data/eff/d1f/eff1f2e0.au similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_bom_death1b_data/eff/d1f/eff1f2e0.au rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death1b_data/eff/d1f/eff1f2e0.au diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_bom_death_data/eff/d1f/eff1f2e0.au b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death_data/eff/d1f/eff1f2e0.au similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_bom_death_data/eff/d1f/eff1f2e0.au rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_bom_death_data/eff/d1f/eff1f2e0.au diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_damage_hollow_metal_data/165911__deganoth__explosion-1.wav b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_damage_hollow_metal_data/165911__deganoth__explosion-1.wav similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_damage_hollow_metal_data/165911__deganoth__explosion-1.wav rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_damage_hollow_metal_data/165911__deganoth__explosion-1.wav diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_damage_hollow_metal_data/eff/d1f/eff1f7d4.au b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_damage_hollow_metal_data/eff/d1f/eff1f7d4.au similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_damage_hollow_metal_data/eff/d1f/eff1f7d4.au rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/bom-sounds/codermobs_damage_hollow_metal_data/eff/d1f/eff1f7d4.au diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_bom_mesh.xcf b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_bom_mesh.xcf similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_bom_mesh.xcf rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_bom_mesh.xcf diff --git a/patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_damage_hollow_metal.aup b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_damage_hollow_metal.aup similarity index 100% rename from patches/Bucket_Game-patched/mods/codermobs/codermobs/src/codermobs_damage_hollow_metal.aup rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_damage_hollow_metal.aup