From 93693a8dfdccf2b2cee41774fdc5325070fc98c8 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Sat, 14 Mar 2020 17:22:55 +0000
Subject: [PATCH] Add rocketeer class

---
 mods/ctf/ctf_classes/gui.lua                  |   4 ++--
 mods/ctf/ctf_classes/init.lua                 |  20 ++++++++++++++++++
 mods/ctf/ctf_classes/ranged.lua               |   6 ++++--
 .../textures/ctf_classes_rocketeer.png        | Bin 0 -> 679 bytes
 mods/other/give_initial_stuff/init.lua        |   8 ++++++-
 5 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 mods/ctf/ctf_classes/textures/ctf_classes_rocketeer.png

diff --git a/mods/ctf/ctf_classes/gui.lua b/mods/ctf/ctf_classes/gui.lua
index 9d2aef2..e87e449 100644
--- a/mods/ctf/ctf_classes/gui.lua
+++ b/mods/ctf/ctf_classes/gui.lua
@@ -2,12 +2,12 @@ function ctf_classes.show_gui(name, player)
 	player = player or minetest.get_player_by_name(name)
 	assert(player.get_player_name)
 	if not ctf_classes.can_change(player) then
-		minetest.chat_send_player(name, "Move closer to the flag to change classes!")
+		minetest.chat_send_player(name, "Move closer to your flag to change classes!")
 		return
 	end
 
 	local fs = {
-		"size[9,3.4]"
+		"size[", #ctf_classes.__classes_ordered * 3 , ",3.4]"
 	}
 
 
diff --git a/mods/ctf/ctf_classes/init.lua b/mods/ctf/ctf_classes/init.lua
index e6d2734..8eb17c1 100644
--- a/mods/ctf/ctf_classes/init.lua
+++ b/mods/ctf/ctf_classes/init.lua
@@ -76,6 +76,26 @@ ctf_classes.register("medic", {
 	},
 })
 
+ctf_classes.register("rocketeer", {
+	description = "Rocketeer",
+	pros = { "Can craft rockets" },
+	cons = {},
+	color = "#fa0",
+	properties = {
+		items = {
+			"shooter:rocket_gun_loaded",
+			"shooter:rocket 4",
+		},
+
+		allowed_guns = {
+			"shooter:pistol",
+			"shooter:smg",
+			"shooter:shotgun",
+		},
+	},
+})
+
+
 
 minetest.register_on_joinplayer(function(player)
 	ctf_classes.update(player)
diff --git a/mods/ctf/ctf_classes/ranged.lua b/mods/ctf/ctf_classes/ranged.lua
index 4d8702f..8f4dd9a 100644
--- a/mods/ctf/ctf_classes/ranged.lua
+++ b/mods/ctf/ctf_classes/ranged.lua
@@ -17,8 +17,10 @@ local function get_shooter_specs(weapon_name, multiplier)
 	spec = table.copy(spec)
 	specs_cache[idx] = spec
 
-	spec.range = spec.range * 1.5
-	spec.tool_caps.full_punch_interval = spec.tool_caps.full_punch_interval * 0.8
+	for key, value in pairs(multiplier) do
+		spec[key] = spec[key] * value
+	end
+
 	return spec
 end
 
diff --git a/mods/ctf/ctf_classes/textures/ctf_classes_rocketeer.png b/mods/ctf/ctf_classes/textures/ctf_classes_rocketeer.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b2dc4d1cc0e433a2c15bc2a09ea3b165f257324
GIT binary patch
literal 679
zcmV;Y0$BZtP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^x1
z4jMIOyV%tL00JjTL_t(I%bk-yXcJ)=#(!U^shASb1KUeW@gJ5$keXD`f>4UYC|nu{
z3PC7zIXYx<a6F`BaTF)HMaU8|1hltEQE3q>)JQ|6Lj!TBgd@WV%{9<Q<a21RO=ukS
zoxYdvdw#sn%kz;+gyj5eSn{9M2k=lI0FVGb^G)Gj?k3}m3|+wUydy!OQ0M{(fK(zR
z%_nDBE$^|p)n+i?6pmp45DW%!U6)8C!v6j~uIqL|0{&sOyhrk0h-+g(8i$sAakWup
zd3~Aw{(cliA(P2;TX^%XC438$6Q|kSY9BrLT_`Y^jMLb4|GtR%*)Xx`7^y@^rV=4p
zE|;aMs!~-|`3!gj#HM3CwE=)v`6jU|G0u-Z7T&L0Lf3Un(*(fHX3>DlAHVj51Uj2q
zt%jy)7>*-yxg4fxQYw{XC!{C9Fbq7;L(?=`qK>7i(zb1UNNues-E5YP(GU-k@sm05
z>-%<<^)KI~ZQJO&&K<`QFP}e^Q{xJ?wW7S6oIA|OQf~{FMy~>(>pC+xPYHnQ+bywN
zahbYtj@nvLw%ctonGC9`9tWw@hN36{ykC6H?U^{A-!3sesZ&|C<=p)dUMw~ND3wYg
zolYMEIw1f%Etdf$z{ZD90E|!StgNiag@py`^*WYiowQ(C7CSAMoz_8UeDTCsm~c1@
zKr|X<cz77&FzTXLIQ&g_P5^Lm=nRz~ebO)tEX%@i9P!WJ*H5V5{{ca@-Xt*)Eh7K`
N002ovPDHLkV1j{wA;SOw

literal 0
HcmV?d00001

diff --git a/mods/other/give_initial_stuff/init.lua b/mods/other/give_initial_stuff/init.lua
index 6ba9cd5..bd1936c 100644
--- a/mods/other/give_initial_stuff/init.lua
+++ b/mods/other/give_initial_stuff/init.lua
@@ -28,13 +28,19 @@ function give_initial_stuff.register_stuff_provider(func, priority)
 end
 
 function give_initial_stuff.get_stuff(player)
+	local seen_stuff = {}
+
 	local stuff = {}
 	for i=1, #registered_stuff_providers do
 		local new_stuff = registered_stuff_providers[i](player)
 		assert(new_stuff)
 
 		for j=1, #new_stuff do
-			stuff[#stuff + 1] = new_stuff[j]
+			local name = ItemStack(new_stuff[j]):get_name()
+			if not seen_stuff[name] then
+				seen_stuff[name] = true
+				stuff[#stuff + 1] = new_stuff[j]
+			end
 		end
 	end
 	return stuff