diff --git a/_arena_lib/arena_manager.lua b/_arena_lib/arena_manager.lua index c1400a8..5e863c2 100644 --- a/_arena_lib/arena_manager.lua +++ b/_arena_lib/arena_manager.lua @@ -78,7 +78,7 @@ end) arena_lib.on_celebration("quake", function(arena, winner_name) - quake.add_xp(winner_name, 50) + --quake.add_xp(winner_name, 50) minetest.after(0.01, function() for pl_name, stats in pairs(arena.players) do @@ -137,18 +137,6 @@ end) -arena_lib.on_timer_tick("quake", function(arena) - minetest.chat_send_player("a", arena.timer_current) -end) - - - -arena_lib.on_timeout("quake", function(arena) - minetest.chat_send_player("singleplayer", "REEEEEEEE") -end) - - - arena_lib.on_quit("quake", function(arena, p_name) local panel = panel_lib.get_panel(p_name) diff --git a/_weapons/railgun.lua b/_weapons/railgun.lua index 846313f..cc13ec1 100644 --- a/_weapons/railgun.lua +++ b/_weapons/railgun.lua @@ -1,6 +1,6 @@ quake.register_weapon("quake:railgun", { - description = "IT'S ONESHOT BABY", + description = S("Railgun"), mesh = "quake_railgun.obj", tiles = {"quake_railgun.png"}, wield_scale = {x=1.3, y=1.3, z=1.3}, diff --git a/_weapons/rocket_launcher.lua b/_weapons/rocket_launcher.lua index ac8f909..ef5ae13 100644 --- a/_weapons/rocket_launcher.lua +++ b/_weapons/rocket_launcher.lua @@ -1,6 +1,6 @@ quake.register_weapon("quake:rocket_launcher", { - description = "IT'S ONESHOT BABY", + description = S("Rocket Launcher"), mesh = "quake_rocketlauncher.obj", tiles = {"quake_rocketlauncher.png"}, wield_scale = {x=1.3, y=1.3, z=1.3}, diff --git a/_weapons/shotgun.lua b/_weapons/shotgun.lua index e4e7b10..9c44795 100644 --- a/_weapons/shotgun.lua +++ b/_weapons/shotgun.lua @@ -1,4 +1,4 @@ - +--WIP AF quake.register_weapon("quake:shotgun", { description = "Keep your friends close, and your enemies closer", mesh = "quake_railgun.obj", diff --git a/_weapons/weapons.lua b/_weapons/weapons.lua index 7cf2666..66f75d5 100644 --- a/_weapons/weapons.lua +++ b/_weapons/weapons.lua @@ -144,8 +144,8 @@ function quake.shoot(p_name, targets, damage, has_knockback) -- controllo le immunità if target:get_inventory():contains_item("main", "arena_lib:immunity") then - minetest.chat_send_player(p_name, "Non puoi colpire " .. target:get_player_name() .. ", è immune") --TODO: sostituire con un suono + minetest.chat_send_player(p_name, minetest.colorize("#d7ded7", S("You can't hit @1 due to immunity", target:get_player_name()))) return end -- eventuale knockback @@ -162,7 +162,7 @@ function quake.shoot(p_name, targets, damage, has_knockback) if remaining_HP <= 0 and arena.players[t_name].killstreak >= 3 then quake.add_achievement(p_name, 4) quake.show_achievement(p_name, 4) - arena_lib.send_message_players_in_arena(arena, "[Quake] " .. minetest.colorize("#eea160", p_name) .. " ha fermato " .. minetest.colorize("#eea160", t_name)) + arena_lib.send_message_players_in_arena(arena, minetest.colorize("#eea160", t_name .. " ") .. minetest.colorize("#d7ded7", S("has been stopped by @1", minetest.colorize("#eea160", p_name)))) end -- applico il danno @@ -195,7 +195,7 @@ function after_shoot(arena, p_name, killed_players) quake.show_achievement(p_name, 7) end - arena_lib.send_message_players_in_arena(arena, "[Quake] " .. minetest.colorize("#eea160", p_name) .. " ha ucciso " .. killed_players .. " giocatori in un colpo!") + arena_lib.send_message_players_in_arena(arena, minetest.colorize("#eea160", p_name .. " ") .. minetest.colorize("#d7ded7", S("has killed @1 players in a row!", killed_players))) end end @@ -213,8 +213,8 @@ function kill(arena, p_name, target) local t_name = target:get_player_name() -- informo dell'uccisione - minetest.chat_send_player(p_name, "[Quake] Hai ucciso " .. minetest.colorize("#eea160", t_name)) - minetest.chat_send_player(t_name, "[Quake] Sei stato ucciso da " .. minetest.colorize("#eea160", p_name)) + minetest.chat_send_player(p_name, minetest.colorize("#d7ded7", S("You've killed @1", minetest.colorize("#eea160", t_name)))) + minetest.chat_send_player(t_name, minetest.colorize("#d7ded7", S("You've been killed by @1", minetest.colorize("#eea160", p_name)))) local p_stats = arena.players[p_name] @@ -228,7 +228,7 @@ function kill(arena, p_name, target) arena.first_blood = p_name quake.add_achievement(p_name, 5) quake.show_achievement(p_name, 5) - arena_lib.send_message_players_in_arena(arena, "[Quake] " .. minetest.colorize("#eea160", p_name) .. " ha versato il primo sangue") + arena_lib.send_message_players_in_arena(arena, minetest.colorize("#eea160", p_name .. " ") .. minetest.colorize("#d7ded7", S("drew first blood"))) end -- visibilità kill leader @@ -239,18 +239,18 @@ function kill(arena, p_name, target) -- eventuale killstreak if p_stats.killstreak == 3 then - arena_lib.send_message_players_in_arena(arena, "[Quake] " .. minetest.colorize("#eea160", p_name) .. " è in una " .. minetest.colorize("#eea160", "serie d'uccisioni").. "!") - quake.add_xp(p_name, 10) + arena_lib.send_message_players_in_arena(arena, minetest.colorize("#eea160", p_name .. " ") .. minetest.colorize("#d7ded7", S("is on a @1", minetest.colorize("#eea160", S("killing spree")))) .. minetest.colorize("#d7ded7", "!")) + --quake.add_xp(p_name, 10) quake.add_achievement(p_name, 1) quake.show_achievement(p_name, 1) elseif p_stats.killstreak == 5 then - arena_lib.send_message_players_in_arena(arena, "[Quake] " .. minetest.colorize("#eea160", p_name) .. " è " .. minetest.colorize("#eea160", "inarrestabile").. "!") - quake.add_xp(p_name, 25) + arena_lib.send_message_players_in_arena(arena, minetest.colorize("#eea160", p_name .. " ") .. minetest.colorize("#d7ded7", S("is @1", minetest.colorize("#eea160", S("unstoppable")))) .. minetest.colorize("#d7ded7", "!")) + --quake.add_xp(p_name, 25) quake.add_achievement(p_name, 2) quake.show_achievement(p_name, 2) elseif p_stats.killstreak == 7 then - arena_lib.send_message_players_in_arena(arena, "[Quake] " .. minetest.colorize("#eea160", p_name) .. " è una " .. minetest.colorize("#eea160", "FURIA OMICIDA").. "!") - quake.add_xp(p_name, 50) + arena_lib.send_message_players_in_arena(arena, minetest.colorize("#eea160", p_name .. " ") .. minetest.colorize("#d7ded7", S("made a @1", string.upper(minetest.colorize("#eea160", S("bloodbath"))))) .. minetest.colorize("#d7ded7", "!")) + --quake.add_xp(p_name, 50) quake.add_achievement(p_name, 3) quake.show_achievement(p_name, 3) end @@ -260,7 +260,7 @@ function kill(arena, p_name, target) quake.update_stats(arena) -- aggiungo XP - quake.add_xp(p_name, 5) + --quake.add_xp(p_name, 5) -- se kill cap raggiunto finisce match if arena.players[p_name].kills == arena.kill_cap then diff --git a/exp_manager.lua b/exp_manager.lua index 54f1d7f..1ed059d 100644 --- a/exp_manager.lua +++ b/exp_manager.lua @@ -1,5 +1,8 @@ +-- EXP is disabled right now as we haven't decided yet what purpose should have, +-- aside as a barrier for future ranked games + function quake.add_xp(p_name, xp) - --quake.players[p_name].XP = quake.players[p_name].XP + xp + quake.players[p_name].XP = quake.players[p_name].XP + xp end function quake.subtract_exp(p_name, xp) diff --git a/items.lua b/items.lua index 5beca9a..8372e96 100644 --- a/items.lua +++ b/items.lua @@ -1,6 +1,6 @@ minetest.register_tool("quake:match_over", { - description = "THE END!", + description = S("THE END!"), inventory_image = "quake_match_over.png", groups = {not_in_creative_inventory = 1, oddly_breakable_by_hand = "2"}, diff --git a/locale/quake.it.tr b/locale/quake.it.tr index 0075eb8..8b5a678 100644 --- a/locale/quake.it.tr +++ b/locale/quake.it.tr @@ -22,3 +22,21 @@ THE END!=FINE DEI GIOCHI! # privs.lua It allows to use the /quakeadmin command=Permette di usare il comando /quakeadmin + +# _weapons/ +# railgun.lua +Railgun=Railgun + +# rocket_launcher.lua +Rocket Launcher=Lanciarazzi + +# weapons.lua +You can't hit @1 due to immunity=Non puoi colpire @1, è immune +has been stopped by @1=è stato fermato da @1 +has killed @1 players in a row!=ha ucciso @1 giocatori in un colpo! +You've killed @1=Hai ucciso @1 +You've been killed by @1=Sei stato ucciso da @1 +drew first blood=ha versato il primo sangue +is on a @1=è in una @1 +is @1=è @1 +made a @1=è una @1 diff --git a/locale/template.txt b/locale/template.txt index 5b2e4f7..77ab0fc 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -32,3 +32,11 @@ Rocket Launcher= # weapons.lua You can't hit @1 due to immunity= +has been stopped by @1= +has killed @1 players in a row!= +You've killed @1= +You've been killed by @1= +drew first blood= +is on a @1= +is @1= +made a @1=