From e7e27f686fa6cb8844d2b72ef655666c9eec7e4e Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Tue, 14 May 2019 15:43:08 -0400 Subject: [PATCH] add applicable patch, remove unapplicable --- patches/BG-190512-lapis_conf.patch | 31 ++++++ .../mods/codermobs/codermobs/sacreeper.lua | 100 ------------------ 2 files changed, 31 insertions(+), 100 deletions(-) create mode 100644 patches/BG-190512-lapis_conf.patch delete mode 100644 patches/Bucket_Game-basis/mods/codermobs/codermobs/sacreeper.lua diff --git a/patches/BG-190512-lapis_conf.patch b/patches/BG-190512-lapis_conf.patch new file mode 100644 index 0000000..4a23252 --- /dev/null +++ b/patches/BG-190512-lapis_conf.patch @@ -0,0 +1,31 @@ +diff -u Bucket_Game-basis/mods/coderbuild/lapis/init.lua Bucket_Game-patched/mods/coderbuild/lapis/init.lua +--- Bucket_Game-basis/mods/coderbuild/lapis/init.lua 2019-05-13 19:50:35.366747663 -0400 ++++ Bucket_Game-patched/mods/coderbuild/lapis/init.lua 2019-05-13 21:11:54.644664066 -0400 +@@ -1,6 +1,8 @@ + screwdriver = screwdriver or {} + +---dofile(minetest.get_modpath("lapis").."/columns.lua") ++if minetest.setting_getbool("enable_round_lapis_columns") then ++ dofile(minetest.get_modpath("lapis").."/columns.lua") ++end + + ---------- + --Nodes +@@ -225,14 +227,14 @@ + "Lapis Brick Stair", + "Lapis Brick Slab", + default.node_sound_stone_defaults()) +- ++ + stairs.register_stair_and_slab("lapis_cobble", "lapis:lapis_cobble", + {cracky = 3}, + {"lapis_cobble.png"}, + "Lapis Cobble Stair", + "Lapis Cobble Slab", + default.node_sound_stone_defaults()) +- ++ + stairs.register_stair_and_slab("lazurite", "lapis:lazurite_block", + {cracky = 3}, + {"lapis_lazurite_block.png"}, +Only in Bucket_Game-patched/mods/coderbuild/lapis: settingtypes.txt diff --git a/patches/Bucket_Game-basis/mods/codermobs/codermobs/sacreeper.lua b/patches/Bucket_Game-basis/mods/codermobs/codermobs/sacreeper.lua deleted file mode 100644 index 83f6c7d..0000000 --- a/patches/Bucket_Game-basis/mods/codermobs/codermobs/sacreeper.lua +++ /dev/null @@ -1,100 +0,0 @@ --- Sapier Creeper. Descended from Sapier version. - --- =================================================================== --- Media license. Applies to model but not associated texture. --- --- You may copy, use, modify or do nearly anything but remove this --- copyright notice. Of course, you're not allowed to pretend you've --- created or written the Sapier pieces. --- --- CC-BY-SA 3.0. Attribution: Sapier. - --- =================================================================== - -local lcname = "sacreeper" -local ucname = "Sapier Creeper" -local msname = "codermobs_" .. lcname -local obj_name = "codermobs:" .. lcname - --- =================================================================== - -mobs_param = { - lcname = lcname , - ucname = ucname , - obj_name = obj_name , - - aoc = 1 , - obr = 1 , - day_mode = false , - min_light = 0 , - max_light = 7 , - min_height = 1 , - max_height = 200 , - spawn_chance = 50000 , - spawn_type = "monster" , - - spawn_nodes = { - "default:desert_sand" , - "default:silver_sand" , - } , - - add_egg = true , - egg_image = "default_brick.png" , -} - --- =================================================================== - -codermobs.adjust_param() - --- =================================================================== - -mobs_param.core_param = { - type = mobs_param.spawn_type , - makes_footstep_sound = true , - - armor = 100 , - attack_animals = false , - attack_type = "explode" , - damage = 3 , - explosion_radius = 3 , - fall_damage = 0 , - hp_min = 7 , - hp_max = 33 , - jump = true , - lava_damage = 0 , - light_damage = 2 , - passive = false , - reach = 2 , - run_velocity = 2 , - view_range = 4 , - walk_velocity = 1 , - water_damage = 0 , - floats = 0, - - drops = { - { name = "default:apple" , - chance = 2, min = 1, max = 3 } , - }, - - sounds = { - random = "codermobs_sacreeper_random" , - explode = "codermobs_sacreeper_explode" , - } , - - textures = { - { "codermobs_sacreeper_mesh.png" } , - }, - - collisionbox = { -0.9, -0.9, -0.9, 0.9, 0.9, 0.9 } , - visual_size = { x=0.9, y=0.9 } , - mesh = "codermobs_sacreeper.b3d" , - visual = "mesh" , -} - --- =================================================================== - -codermobs.setup_mob() -codermobs.log_done() - --- =================================================================== --- End of file.