Merge branch 'master' into drop

Author: farooqkz

.github/pull_request_template.md

@@ -0,0 +1,3 @@
+
+
+- [ ] This PR has been tested locally

.github/workflows/build.yml

@@ -0,0 +1,10 @@
+name: luacheck
+on: [push, pull_request]
+jobs:
+  luacheck:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Luacheck
+        uses: lunarmodules/luacheck@master

.github/workflows/luacheck.yml

@@ -13,4 +13,6 @@ debug.txt
 /mods/ctf/ctf_map/textures/*Back.*
 /mods/ctf/ctf_map/textures/*Left.*
 /mods/ctf/ctf_map/textures/*Right.*
-/mods/ctf/ctf_map/textures/*_screenshot.png
+/mods/ctf/ctf_map/textures/*_screenshot.png
+
+*.blend1

.gitignore

@@ -45,22 +45,22 @@ Note that this version may be slightly behind the git version, but it will be a
 * If you use Visual Studio Code we recommend these extensions:
   * https://marketplace.visualstudio.com/items?itemName=sumneko.lua
   * https://marketplace.visualstudio.com/items?itemName=dwenegar.vscode-luacheck
+  * https://marketplace.visualstudio.com/items?itemName=GreenXenith.minetest-tools
 
 ## License
 
 Created by [rubenwardy](https://rubenwardy.com/).
 Developed by [LandarVargan](https://github.com/LoneWolfHT).
 Previous Developers: [savilli](https://github.com/savilli).
 
-Licenses where not specified:
-Code: LGPLv2.1+
-Textures: CC-BY-SA 3.0
-
-### Textures
+Check out [mods/](mods/) to see all the installed mods and their respective licenses.
 
-* [Header](menu/header.png): CC BY-SA 4.0 by xenonca
-* [Background Image](menu/background.png): CC0 (where applicable) by Apelta (Uses [Minetest Game](https://github.com/minetest/minetest_game) textures, the majority of which are licensed CC-BY-SA 3.0). The player skin used is licensed CC-BY-SA 3.0
+Licenses where not specified:\
+Code: [GNU LGPLv2.1+](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)\
+Media: [CC BY-SA 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/)
 
-### Mods
+### Textures
 
-Check out [mods/](mods/) to see all the installed mods and their respective licenses.
+* [Header](menu/header.png): [CC BY 3.0 Unported](https://creativecommons.org/licenses/by/3.0/) by [SuddenSFD](https://github.com/SuddenSFD)
+* [Background Image](menu/background.png): [CC BY-SA 4.0 International](https://creativecommons.org/licenses/by-sa/4.0/) (where applicable) by [GreenBlob](https://github.com/a-blob) (Uses [Minetest Game](https://github.com/minetest/minetest_game) textures, the majority of which are licensed [CC BY-SA 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/)). The player skins used are licensed under [CC BY-SA 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/)
+* [Icon](menu/icon.png): [CC BY 3.0](https://creativecommons.org/licenses/by/3.0/) by [SuddenSFD](https://github.com/SuddenSFD)

README.md

@@ -6,13 +6,16 @@ index 46c947b6..f4372843 100644
  local hud_ids = {}
 
  local function scaleToDefault(player, field)
-+       return player["get_" .. field](player)
--        -- Scale "hp" or "breath" to the default dimensions
--       local current = player["get_" .. field](player)
--       local nominal = core["PLAYER_MAX_".. field:upper() .. "_DEFAULT"]
--       local max_display = math.max(nominal,
--               math.max(player:get_properties()[field .. "_max"], current))
--       return current / max_display * nominal
++       if field == "health" then
++           return player["get_" .. field](player)
++       else
+            -- Scale "hp" or "breath" to the default dimensions
+            local current = player["get_" .. field](player)
+            local nominal = core["PLAYER_MAX_".. field:upper() .. "_DEFAULT"]
+            local max_display = math.max(nominal,
+                math.max(player:get_properties()[field .. "_max"], current))
+            return current / max_display * nominal
++       end
  end
 
  local function update_builtin_statbars(player)

docs/accurate_statbar.patch

@@ -1,6 +1,9 @@
 CaptureTheFlag Lua API Reference
 ==================================
 
+# Code Style
+* Use tabs for indentation.
+
 # mods/apis/
 This folder contains a collection of mods with the main goal of providing an API
 
@@ -21,7 +24,7 @@ ctf_settings.register("my_setting", {
 	on_change = function(player, new_value)
 		<...>
 	end
-}
+})
 ```
 
 ### `ctf_settings.set(player, setting, value)`
@@ -36,7 +39,10 @@ ctf_settings.register("my_setting", {
 
 ---
 # mods/ctf/
-TODO
+TODO, below is a collection of quick notes for later
+
+## ctf_teams
+* https://modern.ircdocs.horse/formatting.html#colors-16-98
 
 ---
 # mods/mtg/