diff --git a/mods/ENTITIES/pyutest_fireworks/init.lua b/mods/ENTITIES/pyutest_fireworks/init.lua index 45b9471..f2047d8 100644 --- a/mods/ENTITIES/pyutest_fireworks/init.lua +++ b/mods/ENTITIES/pyutest_fireworks/init.lua @@ -18,7 +18,7 @@ core.register_entity("pyutest_fireworks:firework", { return end - vel.y = vel.y - (2 * dtime) + vel.y = vel.y - 2 * dtime self.object:set_velocity(vel) self:trail() end, @@ -97,6 +97,7 @@ PyuTest.make_item("pyutest_fireworks:firework", "Firework", {}, "pyutest-firewor if pointed_thing.type == "node" then local pos = pointed_thing.above core.add_entity(pos, "pyutest_fireworks:firework") + itemstack:take_item() end diff --git a/mods/ITEMS/pyutest_blocks/basic.lua b/mods/ITEMS/pyutest_blocks/basic.lua index 1726d44..a0016dd 100644 --- a/mods/ITEMS/pyutest_blocks/basic.lua +++ b/mods/ITEMS/pyutest_blocks/basic.lua @@ -1,70 +1,70 @@ PyuTest.make_building_blocks("pyutest_blocks:dirt", "Dirt", { "pyutest-dirt.png" }, nil, { - ground = 1, - dirt = 1, - acid_vulnerable = 1, - crumbly = PyuTest.BLOCK_FAST, + ground = 1, + dirt = 1, + acid_vulnerable = 1, + crumbly = PyuTest.BLOCK_FAST, }) PyuTest.make_building_blocks("pyutest_blocks:podzol", "Podzol", { "pyutest-dirt.png" }, nil, { - ground = 1, - dirt = 1, - acid_vulnerable = 1, - crumbly = PyuTest.BLOCK_FAST, + ground = 1, + dirt = 1, + acid_vulnerable = 1, + crumbly = PyuTest.BLOCK_FAST, }, { - overlay_tiles = { { name = "pyutest-ore-overlay.png", color = "#54623c" } } + overlay_tiles = { { name = "pyutest-ore-overlay.png", color = "#54623c" } } }) PyuTest.make_building_blocks("pyutest_blocks:snow", "Snow", { "pyutest-snow.png" }, nil, { - ground = 1, - acid_vulnerable = 1, - crumbly = PyuTest.BLOCK_FAST, + ground = 1, + acid_vulnerable = 1, + crumbly = PyuTest.BLOCK_FAST, }) PyuTest.make_building_blocks("pyutest_blocks:sand", "Sand", { "pyutest-sand.png" }, nil, { - ground = 1, - acid_vulnerable = 1, - falling_node = 1, - sugarcane_spawn_on = 1, - sand = 1, - crumbly = PyuTest.BLOCK_FAST, + ground = 1, + acid_vulnerable = 1, + falling_node = 1, + sugarcane_spawn_on = 1, + sand = 1, + crumbly = PyuTest.BLOCK_FAST, }) PyuTest.make_building_blocks("pyutest_blocks:mycelium", "Mycelium", { - { name = "pyutest-grass-top.png", color = "#5c455e" }, "pyutest-dirt.png" + { name = "pyutest-grass-top.png", color = "#5c455e" }, "pyutest-dirt.png" }, nil, { - ground = 1, - dirt = 1, - crumbly = PyuTest.BLOCK_FAST, + ground = 1, + dirt = 1, + crumbly = PyuTest.BLOCK_FAST, }, { - overlay_tiles = { "", "", { name = "pyutest-grass-side.png", color = "#5c455e" } } + overlay_tiles = { "", "", { name = "pyutest-grass-side.png", color = "#5c455e" } } }) PyuTest.make_building_blocks("pyutest_blocks:clay", "Clay", { "pyutest-clay-block.png" }, nil, { - acid_vulnerable = 1, - crumbly = PyuTest.BLOCK_FAST, + acid_vulnerable = 1, + crumbly = PyuTest.BLOCK_FAST, }) PyuTest.make_building_blocks("pyutest_blocks:gravel", "Gravel", { "pyutest-gravel.png" }, nil, { - falling_node = 1, - acid_vulnerable = 1, - crumbly = PyuTest.BLOCK_FAST, + falling_node = 1, + acid_vulnerable = 1, + crumbly = PyuTest.BLOCK_FAST, }) -- Cracky PyuTest.make_building_blocks("pyutest_blocks:stone", "Stone", { "pyutest-stone.png" }, nil, { - ground = 1, - stone = 1, - cobble = 1, - cracky = PyuTest.BLOCK_NORMAL, + ground = 1, + stone = 1, + cracky = PyuTest.BLOCK_NORMAL, }, { is_ground_content = true, _pyutest_blast_resistance = 3 }) PyuTest.make_building_blocks("pyutest_blocks:cobblestone", "Cobblestone", { "pyutest-cobblestone.png" }, nil, { - ground = 1, - stone = 1, - cracky = PyuTest.BLOCK_NORMAL, + ground = 1, + stone = 1, + cobble = 1, + cracky = PyuTest.BLOCK_NORMAL, }, { is_ground_content = true, _pyutest_blast_resistance = 3 @@ -88,133 +88,133 @@ PyuTest.make_building_blocks("pyutest_blocks:granite", "Granite", { "pyutest-gra }) PyuTest.make_building_blocks("pyutest_blocks:andesite", "Andesite", { "pyutest-andesite.png" }, nil, { - ground = 1, - stone = 1, - cracky = PyuTest.BLOCK_NORMAL, + ground = 1, + stone = 1, + cracky = PyuTest.BLOCK_NORMAL, }, { _pyutest_blast_resistance = 3 }) PyuTest.make_building_blocks("pyutest_blocks:diorite", "Diorite", { "pyutest-diorite.png" }, nil, { - ground = 1, - stone = 1, - cracky = PyuTest.BLOCK_NORMAL, + ground = 1, + stone = 1, + cracky = PyuTest.BLOCK_NORMAL, }, { - _pyutest_blast_resistance = 3 + _pyutest_blast_resistance = 3 }) PyuTest.make_building_blocks("pyutest_blocks:tuff", "Tuff", { "pyutest-tuff.png" }, nil, { - ground = 1, - stone = 1, - cracky = PyuTest.BLOCK_NORMAL, + ground = 1, + stone = 1, + cracky = PyuTest.BLOCK_NORMAL, }, { _pyutest_blast_resistance = 3 }) PyuTest.make_building_blocks("pyutest_blocks:calcite", "Calcite", { "pyutest-calcite.png" }, nil, { - ground = 1, - stone = 1, - cracky = PyuTest.BLOCK_NORMAL, + ground = 1, + stone = 1, + cracky = PyuTest.BLOCK_NORMAL, }, { - _pyutest_blast_resistance = 3 + _pyutest_blast_resistance = 3 }) PyuTest.make_building_blocks("pyutest_blocks:stone_bricks", "Stone Bricks", { - "pyutest-bricks2.png" + "pyutest-bricks2.png" }, "#82807c", { - bricks = 1, - cracky = PyuTest.BLOCK_NORMAL, + bricks = 1, + cracky = PyuTest.BLOCK_NORMAL, }, { - is_ground_content = false, - _pyutest_blast_resistance = 3 + is_ground_content = false, + _pyutest_blast_resistance = 3 }) PyuTest.make_building_blocks("pyutest_blocks:darkstone_bricks", "Darkstone Bricks", { - "pyutest-bricks2.png" + "pyutest-bricks2.png" }, "#3c3b3a", { - bricks = 1, - cracky = PyuTest.BLOCK_NORMAL, + bricks = 1, + cracky = PyuTest.BLOCK_NORMAL, }, { - is_ground_content = false, - _pyutest_blast_resistance = 3 + is_ground_content = false, + _pyutest_blast_resistance = 3 }) PyuTest.make_building_blocks("pyutest_blocks:granite_bricks", "Granite Bricks", { - "pyutest-bricks2.png" + "pyutest-bricks2.png" }, "#9d6658", { - bricks = 1, - cracky = PyuTest.BLOCK_NORMAL, + bricks = 1, + cracky = PyuTest.BLOCK_NORMAL, }, { - is_ground_content = false, - _pyutest_blast_resistance = 3 + is_ground_content = false, + _pyutest_blast_resistance = 3 }) PyuTest.make_building_blocks("pyutest_blocks:andesite_bricks", "Andesite Bricks", { - "pyutest-bricks2.png" + "pyutest-bricks2.png" }, "#525252", { - bricks = 1, - cracky = PyuTest.BLOCK_NORMAL, + bricks = 1, + cracky = PyuTest.BLOCK_NORMAL, }, { - is_ground_content = false, - _pyutest_blast_resistance = 3 + is_ground_content = false, + _pyutest_blast_resistance = 3 }) PyuTest.make_building_blocks("pyutest_blocks:diorite_bricks", "Diorite Bricks", { - "pyutest-bricks2.png" + "pyutest-bricks2.png" }, "#b4b3b1", { - bricks = 1, - cracky = PyuTest.BLOCK_NORMAL, + bricks = 1, + cracky = PyuTest.BLOCK_NORMAL, }, { - is_ground_content = false, - _pyutest_blast_resistance = 3 + is_ground_content = false, + _pyutest_blast_resistance = 3 }) PyuTest.make_building_blocks("pyutest_blocks:tuff_bricks", "Tuff Bricks", { - "pyutest-bricks2.png" + "pyutest-bricks2.png" }, "#e5b88c", { - bricks = 1, - cracky = PyuTest.BLOCK_NORMAL, + bricks = 1, + cracky = PyuTest.BLOCK_NORMAL, }, { - is_ground_content = false, - _pyutest_blast_resistance = 3 + is_ground_content = false, + _pyutest_blast_resistance = 3 }) PyuTest.make_building_blocks("pyutest_blocks:sandstone", "Sandstone", { "pyutest-sandstone.png" }, nil, { - ground = 1, - acid_vulnerable = 1, - cracky = PyuTest.BLOCK_FAST, + ground = 1, + acid_vulnerable = 1, + cracky = PyuTest.BLOCK_FAST, }, { is_ground_content = false, _pyutest_blast_resistance = 2 }) PyuTest.make_building_blocks("pyutest_blocks:ice", "Ice", { "pyutest-ice.png" }, nil, { - ground = 1, - acid_vulnerable = 1, - slippery = 4, - cracky = PyuTest.BLOCK_FAST, - thawable = 1, + ground = 1, + acid_vulnerable = 1, + slippery = 4, + cracky = PyuTest.BLOCK_FAST, + thawable = 1, }) PyuTest.make_building_blocks("pyutest_blocks:molten_rock", "Molten Rock", { "pyutest-molten-rock.png" }, nil, { - ground = 1, - cracky = PyuTest.BLOCK_FAST, - fire_persist = 1, + ground = 1, + cracky = PyuTest.BLOCK_FAST, + fire_persist = 1, }, { is_ground_content = false, _pyutest_blast_resistance = 2 }) PyuTest.make_building_blocks("pyutest_blocks:basalt", "Basalt", { "pyutest-basalt.png" }, nil, { - ground = 1, - cracky = PyuTest.BLOCK_FAST, + ground = 1, + cracky = PyuTest.BLOCK_FAST, }, { is_ground_content = false, _pyutest_blast_resistance = 3 }) PyuTest.make_building_blocks("pyutest_blocks:obsidian", "Obsidian", { "pyutest-obsidian.png" }, nil, { - cracky = PyuTest.BLOCK_NORMAL, + cracky = PyuTest.BLOCK_NORMAL, }, { is_ground_content = false, _pyutest_blast_resistance = 3 @@ -224,57 +224,62 @@ PyuTest.make_building_blocks("pyutest_blocks:crystal_lantern", "Crystal Lantern" { cracky = PyuTest.BLOCK_FAST, }, { - light_source = core.LIGHT_MAX, - paramtype = "light" + light_source = core.LIGHT_MAX, + paramtype = "light" }) PyuTest.make_building_blocks("pyutest_blocks:bone", "Bone", { - "pyutest-bone-block-top-bottom.png", - "pyutest-bone-block-top-bottom.png", - "pyutest-bone-block.png" + "pyutest-bone-block-top-bottom.png", + "pyutest-bone-block-top-bottom.png", + "pyutest-bone-block.png" }, nil, { - cracky = PyuTest.BLOCK_FAST, + cracky = PyuTest.BLOCK_FAST, }) PyuTest.make_building_blocks("pyutest_blocks:brick", "Bricks", { "pyutest-bricks.png" }, nil, { - cracky = PyuTest.BLOCK_NORMAL, + cracky = PyuTest.BLOCK_NORMAL, }, { - is_ground_content = false, - _pyutest_blast_resistance = 3 + is_ground_content = false, + _pyutest_blast_resistance = 3 }) -- Choppy PyuTest.make_building_blocks("pyutest_blocks:mushroom", "Mushroom", { "pyutest-mushroom.png" }, nil, { - flammable = 1, - choppy = PyuTest.BLOCK_FAST, + flammable = 1, + choppy = PyuTest.BLOCK_FAST, }, { is_ground_content = false }) PyuTest.make_building_blocks("pyutest_blocks:mushroom_stem", "Mushroom Stem", { "pyutest-mushroom-stem.png" }, nil, { - flammable = 1, - choppy = PyuTest.BLOCK_FAST, + flammable = 1, + choppy = PyuTest.BLOCK_FAST, }, { is_ground_content = false }) PyuTest.make_building_blocks("pyutest_blocks:glowshroom", "Glowshroom", { - "pyutest-glowshroom.png" + "pyutest-glowshroom.png" }, nil, { - flammable = 1, - choppy = PyuTest.BLOCK_FAST, + flammable = 1, + choppy = PyuTest.BLOCK_FAST, }, { - is_ground_content = false, - paramtype = "light", - light_source = core.LIGHT_MAX + is_ground_content = false, + paramtype = "light", + light_source = core.LIGHT_MAX }) -- Breakable by hand PyuTest.make_building_blocks("pyutest_blocks:haybale", "Haybale", { - "pyutest-haybale-top-bottom.png", - "pyutest-haybale-top-bottom.png", - "pyutest-haybale.png" + "pyutest-haybale-top-bottom.png", + "pyutest-haybale-top-bottom.png", + "pyutest-haybale.png" }, nil, { - oddly_breakable_by_hand = PyuTest.BLOCK_FAST + oddly_breakable_by_hand = PyuTest.BLOCK_FAST }) PyuTest.make_building_blocks("pyutest_blocks:slime", "Slime", { "pyutest-slime.png" }, nil, { - bouncy = 85, - oddly_breakable_by_hand = PyuTest.BLOCK_FAST + bouncy = 85, + oddly_breakable_by_hand = PyuTest.BLOCK_FAST +}) + +PyuTest.make_building_blocks("pyutest_blocks:superslime", "Superslime", { "pyutest-slime.png" }, "cyan", { + bouncy = 110, + oddly_breakable_by_hand = PyuTest.BLOCK_FAST }) diff --git a/mods/ITEMS/pyutest_crafts/init.lua b/mods/ITEMS/pyutest_crafts/init.lua index c9448af..9251a8e 100644 --- a/mods/ITEMS/pyutest_crafts/init.lua +++ b/mods/ITEMS/pyutest_crafts/init.lua @@ -345,5 +345,5 @@ core.register_craft({ core.register_craft({ type = "cooking", output = "pyutest_blocks:stone_block", - recipe = "pyutest_tools:cobblestone_block", + recipe = "pyutest_blocks:cobblestone_block", })