From 299ea685b9d08717af8edb9cf3e2d7e7f25765c7 Mon Sep 17 00:00:00 2001 From: Zughy <4279489-marco_a@users.noreply.gitlab.com> Date: Fri, 28 Jul 2023 21:57:53 +0200 Subject: [PATCH] Rename Bouncer -> Propulsor --- bl_tutorial/src/phases.lua | 6 +++--- block_league/LICENSE | 2 +- ...bl_bouncer.ogg => bl_propulsor_bounce.ogg} | Bin block_league/src/arena_lib/arena_manager.lua | 6 +++--- block_league/src/debug/testkit.lua | 4 ++-- block_league/src/deps/visible_wielditem.lua | 4 ++-- block_league/src/player_manager.lua | 2 +- .../weapons/{bouncer.lua => propulsor.lua} | 18 +++++++++--------- .../{bl_bouncer.png => bl_propulsor.png} | Bin ...osshair.png => bl_propulsor_crosshair.png} | Bin ...{bl_bouncer_dm.png => bl_propulsor_dm.png} | Bin 11 files changed, 21 insertions(+), 21 deletions(-) rename block_league/sounds/{bl_bouncer.ogg => bl_propulsor_bounce.ogg} (100%) rename block_league/src/weapons/{bouncer.lua => propulsor.lua} (84%) rename block_league/textures/{bl_bouncer.png => bl_propulsor.png} (100%) rename block_league/textures/{bl_bouncer_crosshair.png => bl_propulsor_crosshair.png} (100%) rename block_league/textures/{bl_bouncer_dm.png => bl_propulsor_dm.png} (100%) diff --git a/bl_tutorial/src/phases.lua b/bl_tutorial/src/phases.lua index 9518755..68b279f 100644 --- a/bl_tutorial/src/phases.lua +++ b/bl_tutorial/src/phases.lua @@ -150,7 +150,7 @@ function phase2(player) if not tracker[p_name] then return end arena_lib.HUD_send_msg("broadcast", p_name, S("Grab the propulsor at the end of the steps")) - minetest.add_item(i_pos, ItemStack("block_league:bouncer")) + minetest.add_item(i_pos, ItemStack("block_league:propulsor")) player:get_attach():remove() end) end @@ -159,7 +159,7 @@ end -- raccolta Spingimi! minetest.register_on_item_pickup(function(itemstack, picker, pointed_thing, time_from_last_punch, ...) - if itemstack:get_name() == "block_league:bouncer" and minetest.is_player(picker) and arena_lib.is_player_in_arena(picker:get_player_name(), "block_league") then + if itemstack:get_name() == "block_league:propulsor" and minetest.is_player(picker) and arena_lib.is_player_in_arena(picker:get_player_name(), "block_league") then local p_name = picker:get_player_name() picker:hud_set_flags({hotbar = true}) @@ -218,7 +218,7 @@ function phase3(player) local arena = arena_lib.get_arena_by_player(p_name) inv:set_stack("main", 1, ItemStack(smg)) - inv:set_stack("main", 2, ItemStack("block_league:bouncer")) + inv:set_stack("main", 2, ItemStack("block_league:propulsor")) arena.weapons_disabled = false arena.players[p_name].weapons_magazine[smg] = minetest.registered_nodes[smg].magazine diff --git a/block_league/LICENSE b/block_league/LICENSE index 78a3f88..73be089 100755 --- a/block_league/LICENSE +++ b/block_league/LICENSE @@ -37,7 +37,7 @@ CC BY-SA 4.0 Pixelgun shooting sound by Francesco Corrado CC0 -Bouncer sound by iozonic +Propulsor bounce sound by iozonic Crowd cheering by wangzhuokun Defeat jingle by Mrrobodevin, Zughy GUI equip sound by EminYILDIRIM diff --git a/block_league/sounds/bl_bouncer.ogg b/block_league/sounds/bl_propulsor_bounce.ogg similarity index 100% rename from block_league/sounds/bl_bouncer.ogg rename to block_league/sounds/bl_propulsor_bounce.ogg diff --git a/block_league/src/arena_lib/arena_manager.lua b/block_league/src/arena_lib/arena_manager.lua index 889fabd..0d53302 100644 --- a/block_league/src/arena_lib/arena_manager.lua +++ b/block_league/src/arena_lib/arena_manager.lua @@ -308,7 +308,7 @@ function reset_meta(p_name) local p_meta = minetest.get_player_by_name(p_name):get_meta() p_meta:set_int("bl_has_ball", 0) - p_meta:set_int("bl_bouncer_delay", 0) + p_meta:set_int("bl_propulsor_delay", 0) p_meta:set_int("bl_death_delay", 0) p_meta:set_int("bl_is_speed_locked", 0) p_meta:set_int("bl_immunity", 0) @@ -406,12 +406,12 @@ function equip(arena, p_name) else local weapons = block_league.get_player_weapons(p_name) - local bouncer = arena.mode == 1 and "block_league:bouncer" or "block_league:bouncer_dm" + local propulsor = arena.mode == 1 and "block_league:propulsor" or "block_league:propulsor_dm" for i, weapon_name in pairs(weapons) do inv:add_item("main", ItemStack(weapon_name)) end - inv:add_item("main", ItemStack(bouncer)) + inv:add_item("main", ItemStack(propulsor)) local skill = block_league.get_player_skill(p_name) diff --git a/block_league/src/debug/testkit.lua b/block_league/src/debug/testkit.lua index 29500a7..c974056 100644 --- a/block_league/src/debug/testkit.lua +++ b/block_league/src/debug/testkit.lua @@ -4,7 +4,7 @@ local function exit_test_mode() end local players_in_test_mode = {} local items = { - "block_league:bouncer", + "block_league:propulsor", "", "", "", @@ -47,7 +47,7 @@ function block_league.enter_test_mode(sender) local meta = player:get_meta() - meta:set_int("bl_bouncer_delay", 0) + meta:set_int("bl_propulsor_delay", 0) meta:set_int("bl_death_delay", 0) meta:set_int("bl_weapon_state", 0) meta:set_int("bl_is_speed_locked", 0) diff --git a/block_league/src/deps/visible_wielditem.lua b/block_league/src/deps/visible_wielditem.lua index 78c6e4f..d956609 100644 --- a/block_league/src/deps/visible_wielditem.lua +++ b/block_league/src/deps/visible_wielditem.lua @@ -9,14 +9,14 @@ if visible_wielditem then rotation = {x=180, y=0, z=280}, position = {x=0, y=-0.3, z=0.35} } - + visible_wielditem.item_tweaks["groups"]["bl_weapon_mesh"] = { rotation = {x=0, y=0, z=-100}, position = {x=0, y=-0.15, z=0.2}, scale = 1.4 } - visible_wielditem.item_tweaks["groups"]["bouncer"] = { + visible_wielditem.item_tweaks["groups"]["propulsor"] = { rotation = {x=180, y=0, z=300}, position = {x=0, y=-0.15, z=0}, scale = 0.75 diff --git a/block_league/src/player_manager.lua b/block_league/src/player_manager.lua index 2702534..9903d4c 100644 --- a/block_league/src/player_manager.lua +++ b/block_league/src/player_manager.lua @@ -43,6 +43,6 @@ function remove_weapons(inv) inv:remove_item("main", ItemStack("block_league:sword")) inv:remove_item("main", ItemStack("block_league:pixelgun")) inv:remove_item("main", ItemStack("block_league:rocket_launcher")) - inv:remove_item("main", ItemStack("block_league:bouncer")) + inv:remove_item("main", ItemStack("block_league:propulsor")) inv:remove_item("main", ItemStack("block_league:testkit_quit")) end diff --git a/block_league/src/weapons/bouncer.lua b/block_league/src/weapons/propulsor.lua similarity index 84% rename from block_league/src/weapons/bouncer.lua rename to block_league/src/weapons/propulsor.lua index f3f2b97..005f3f7 100644 --- a/block_league/src/weapons/bouncer.lua +++ b/block_league/src/weapons/propulsor.lua @@ -3,15 +3,15 @@ local function dash() end -local function register_bouncer(name, desc, stamina) +local function register_propulsor(name, desc, stamina) minetest.register_tool("block_league:" .. name, { description = desc, wield_scale = {x=1.3, y=1.3, z=1.3}, inventory_image = "bl_" .. name .. ".png", - crosshair = "bl_bouncer_crosshair.png", + crosshair = "bl_propulsor_crosshair.png", jump_height = 5, - groups = {oddly_breakable_by_hand = "2", bouncer = 1}, + groups = {oddly_breakable_by_hand = "2", propulsor = 1}, on_use = function(itemstack, user, pointed_thing) if not can_use(user) then return end @@ -32,7 +32,7 @@ local function register_bouncer(name, desc, stamina) local knockback = user:get_velocity().y < 1 and -15 or -10 user:add_velocity(vector.multiply(dir, knockback)) - block_league.sound_play("bl_bouncer", p_name) + block_league.sound_play("bl_propulsor_bounce", p_name) end, on_secondary_use = function(itemstack, user, pointed_thing) @@ -47,8 +47,8 @@ end -register_bouncer("bouncer", "Bouncer", 20) -register_bouncer("bouncer_dm", "Deathmatch Bouncer", 50) +register_propulsor("propulsor", "Propulsor", 20) +register_propulsor("propulsor_dm", "Deathmatch Propulsor", 50) @@ -83,17 +83,17 @@ end function can_use(player, stamina) local meta = player:get_meta() - if meta:get_int("bl_bouncer_delay") == 1 or + if meta:get_int("bl_propulsor_delay") == 1 or meta:get_int("bl_death_delay") == 1 or meta:get_int("bl_weapon_state") == 3 or meta:get_int("bl_weapon_state") == 4 or meta:get_int("bl_is_speed_locked") == 1 then return end - meta:set_int("bl_bouncer_delay", 1) + meta:set_int("bl_propulsor_delay", 1) minetest.after(0.3, function() if not player then return end - player:get_meta():set_int("bl_bouncer_delay", 0) + player:get_meta():set_int("bl_propulsor_delay", 0) end) return true diff --git a/block_league/textures/bl_bouncer.png b/block_league/textures/bl_propulsor.png similarity index 100% rename from block_league/textures/bl_bouncer.png rename to block_league/textures/bl_propulsor.png diff --git a/block_league/textures/bl_bouncer_crosshair.png b/block_league/textures/bl_propulsor_crosshair.png similarity index 100% rename from block_league/textures/bl_bouncer_crosshair.png rename to block_league/textures/bl_propulsor_crosshair.png diff --git a/block_league/textures/bl_bouncer_dm.png b/block_league/textures/bl_propulsor_dm.png similarity index 100% rename from block_league/textures/bl_bouncer_dm.png rename to block_league/textures/bl_propulsor_dm.png