Rename Bouncer -> Propulsor

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

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

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)
 

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)

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

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

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