From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Fri, 23 Apr 2021 07:38:04 +0000 (+0200)
Subject: Genderneutral mit Doppelpunkt; Chat moderator rank; Optimierung der Partikelspawner
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=1a75204fbf07e908d06f557e5d988a3e049856aa;p=coronaserver.git

Genderneutral mit Doppelpunkt; Chat moderator rank; Optimierung der Partikelspawner
---

diff --git a/ranks.lua b/ranks.lua
index 2868128..04e7593 100755
--- a/ranks.lua
+++ b/ranks.lua
@@ -6,17 +6,23 @@ coronaserver.ranks = {
 		privs = {shout = true},
 	},
 	{
-        name = "student",
-        color = "#BBBBBB",
-        tag = "[SPIELER*IN]",
-        privs = {student = true, interact = true, fast = true, spawn = true, home = true, zoom = true, pvp = true, iblocks = true},
-    },
+		name = "student",
+		color = "#BBBBBB",
+		tag = "[SPIELER:IN]",
+		privs = {student = true, interact = true, fast = true, spawn = true, home = true, zoom = true, pvp = true, iblocks = true},
+	},
+	{
+		name = "chatmod",
+		color = "#93E3D6",
+		tag = "[CHATMODERATOR:IN]",
+		privs = {},
+	},
 	{
-        name = "vip",
-        color = "#00E5FF",
-        tag = "[VIP]",
-        privs = {},
-    },
+		name = "vip",
+		color = "#00E5FF",
+		tag = "[VIP]",
+		privs = {},
+	},
 	{
 		name = "feuerwehr",
 		color = "#000000",
@@ -26,31 +32,31 @@ coronaserver.ranks = {
 	{
 		name = "psupporter",
 		color = "#FF9C48",
-		tag = "[PROBE-SUPPORTER]",
+		tag = "[PROBE-SUPPORTER:IN]",
 		privs = {team = true, student = false,},
 	},
    	{
-        name = "teacher",
-        color = "#16AE00",
-        tag = "[LEHRER*IN / PÄDAGOG*IN]",
-        privs = {team = false, fly = true, teacher = true, creative = true, areas = true,  basic_privs = true, teleport = true, bring = true, settime = true}
-    },
+		name = "teacher",
+		color = "#16AE00",
+		tag = "[LEHRER:IN / PÄDAGOG:IN]",
+		privs = {team = false, fly = true, teacher = true, creative = true, areas = true,  basic_privs = true, teleport = true, bring = true, settime = true}
+	},
 	{
 		name = "supporter",
 		color = "#EE6E00",
-		tag = "[SUPPORTER]",
+		tag = "[SUPPORTER:IN]",
 		privs = {kick = true, team = true},
 	},
 	{
 		name = "moderator",
 		color = "#001FFF",
-		tag = "[MODERATOR]",
+		tag = "[MODERATOR:IN]",
 		privs = {server = true, ban = true, worldedit = true, vanish = true, ["rename"] = true},
 	},
 	{
 		name = "developer",
 		color = "#EBEE00",
-		tag = "[ENTWICKLER*IN]",
+		tag = "[ENTWICKLER:IN]",
 		privs = {privs = true},
 	},
 	{
@@ -68,7 +74,7 @@ coronaserver.ranks = {
 }
 coronaserver.savedata.ranks = coronaserver.savedata.ranks or {}
 function coronaserver.get_rank(name)
-    return coronaserver.get_rank_by_name(coronaserver.savedata.ranks[name] or "student")
+	return coronaserver.get_rank_by_name(coronaserver.savedata.ranks[name] or "student")
 end
 function coronaserver.get_rank_by_name(rankname)
 	for _, rank in pairs(coronaserver.ranks) do
@@ -78,9 +84,9 @@ function coronaserver.get_rank_by_name(rankname)
 	end
 end
 function coronaserver.get_player_name(name, brackets)
-    local rank = coronaserver.get_rank(name)
-    local rank_tag = minetest.colorize(rank.color, rank.tag)
-	if not brackets then 
+	local rank = coronaserver.get_rank(name)
+	local rank_tag = minetest.colorize(rank.color, rank.tag)
+	if not brackets then
 		brackets = {"",""}
 	end
 	return rank_tag .. brackets[1] .. name .. brackets[2] .. " "
@@ -100,17 +106,17 @@ minetest.register_on_joinplayer(function(player)
 	if privs.kick then privs.team = true end
 	minetest.set_player_privs(name, privs)
 	coronaserver.savedata.ranks[name] = (rankname == "student") and nil or rankname
-    minetest.chat_send_all(coronaserver.get_player_name(name) .. "has joined the Server.")
+	minetest.chat_send_all(coronaserver.get_player_name(name) .. "has joined the Server.")
 	coronaserver.reload_name_tag(name)
 end)
 minetest.register_on_leaveplayer(function(player)
 	local name = player:get_player_name()
-    minetest.chat_send_all(coronaserver.get_player_name(name) .. "has left the Server.")
+	minetest.chat_send_all(coronaserver.get_player_name(name) .. "has left the Server.")
 end)
 minetest.register_on_chat_message(function(name, message)
-    minetest.chat_send_all(coronaserver.get_player_name(name, {"<", ">"}) .. message)
-    minetest.log("[CHAT] <" .. name .. "> " .. message)
-    return true
+	minetest.chat_send_all(coronaserver.get_player_name(name, {"<", ">"}) .. message)
+	minetest.log("[CHAT] <" .. name .. "> " .. message)
+	return true
 end)
 minetest.register_chatcommand("rank", {
 	params = "<player> <rank>",
@@ -121,9 +127,9 @@ minetest.register_chatcommand("rank", {
 		local rank = param:split(" ")[2] or ""
 		local target_ref = minetest.get_player_by_name(target)
 		local rank_ref = coronaserver.get_rank_by_name(rank)
-		if not rank_ref then 
-            minetest.chat_send_player(name, "Invalider Rang: " .. rank)
-        else
+		if not rank_ref then
+			minetest.chat_send_player(name, "Invalider Rang: " .. rank)
+		else
 			coronaserver.savedata.ranks[target] = rank
 			local privs = {}
 			for _, r in pairs(coronaserver.ranks) do
diff --git a/spirit.lua b/spirit.lua
index 946c595..167d26c 100755
--- a/spirit.lua
+++ b/spirit.lua
@@ -6,8 +6,8 @@ function coronaserver.spirit(name)
 	minetest.add_particlespawner({
 		amount = 50,
 		time = 2,
-		minpos = vector.add(pos, {x = -0.1, y = 2, z = -0.1}),
-		maxpos = vector.add(pos, {x =  0.1, y = 3, z =  0.1}),
+		minpos = {x = -0.1, y = 0, z = -0.1},
+		maxpos = {x =  0.1, y = 1, z =  0.1},
 		minvel = {x = -0.1, y = 0, z = -0.1},
 		maxvel = {x =  0.1, y = 0, z = -0.1},
 		minacc = {x = -0.1, y = 5, z = -0.1},
@@ -16,9 +16,10 @@ function coronaserver.spirit(name)
 		maxexptime = 1,
 		minsize = 5,
 		maxsize = 7,
-		collisiondetection = false,
+		collisiondetection = true,
 		vertical = false,
 		texture = "fire_basic_flame.png",
+		
 	})
 	minetest.after(0.5, function() coronaserver.spirit(name) end)
 end