Merge branch 'master' into 'awards'

Merge from master

See merge request dirk/aestivalserver-mods!3

.luacheckrc

@@ -1,3 +1,27 @@
+-- FIXME testing some minetest-mods/i3 luacheck settings
+
+allow_defined_top = true
+
+read_globals = {
+	"minetest",
+	"armor",
+	"skins",
+	"awards",
+	"vector",
+	"string",
+	"table",
+	"ItemStack",
+	"VoxelArea",
+	"VoxelManip",
+}
+
+globals = {
+	"i3",
+	"core",
+	"sfinv",
+	"unified_inventory",
+}
+
 ignore = {
 	-- list taken from https://stackoverflow.com/questions/49158143/how-to-ignore-luacheck-warnings/49160695#56618022 as
 	-- all the third party mods would be hard to manage otherwise
@@ -56,5 +80,7 @@ ignore = {
     "631", -- Line is too long.
 }
 
-
+exclude_files = {
+	"i3"
+}
 

3d_armor

@@ -1 +1 @@
-Subproject commit b6651fd396dcd4ae6d75881cbf1712e5210eac9c
+Subproject commit a9b8bc4dddfc9c2739c3c02c40497bc7ba1a75b0

basic_materials

@@ -1 +1 @@
-Subproject commit d9e06980d33ec02c2321269f47ab9ec32b36551f
+Subproject commit 8631a2670bbca0bf8dbc5c128cdf8cde02fbda52

charcoal

@@ -1 +1 @@
-Subproject commit ac7e03bdd8606d64b7b8d90b44e141356f9206f2
+Subproject commit 5f70976e7f71fc6384309ccc68ae07494c580ece

farming

@@ -1 +1 @@
-Subproject commit d59e200a42a3077abeee1a8a990de4faceafa7ca
+Subproject commit 2e90959a6c4116a99fca6915dcc7f3ccecaf4763

i3

@@ -1 +1 @@
-Subproject commit e3941a7b71ec5d1322201e0c61d150242cebd9f4
+Subproject commit 1dd742e88770a495867ee5d41f57d45bf46684d6

illuna_aestival/src/armor.lua

@@ -1,30 +1,30 @@
 minetest.override_item("nether_mobs:dragon_helmet", {
-    groups = {armor_head=1, armor_heal=15, armor_use=350, armor_fire=1},
+    groups = {armor_head=1, armor_heal=15, armor_use=100, armor_fire=1},
     armor_groups = {fleshy=18},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("nether_mobs:dragon_chestplate", {
-    groups = {armor_torso=1, armor_heal=15, armor_use=350, armor_fire=1},
+    groups = {armor_torso=1, armor_heal=15, armor_use=100, armor_fire=1},
     armor_groups = {fleshy=23},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("nether_mobs:dragon_leggings", {
-    groups = {armor_legs=1, armor_heal=15, armor_use=350, armor_fire=1},
+    groups = {armor_legs=1, armor_heal=15, armor_use=100, armor_fire=1},
     armor_groups = {fleshy=23},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("nether_mobs:dragon_boots", {
-    groups = {armor_feet=1, armor_heal=15, armor_use=350, armor_fire=1,
+    groups = {armor_feet=1, armor_heal=15, armor_use=100, armor_fire=1,
         physics_speed=1, physics_jump=0.5},
     armor_groups = {fleshy=17}, -- not 18 to prevent level=100 (already give speed)
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("nether_mobs:dragon_shield", {
-    groups = {armor_shield=1, armor_heal=15, armor_use=350},
+    groups = {armor_shield=1, armor_heal=15, armor_use=100, armor_fire=2},
     armor_groups = {fleshy=18},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
@@ -32,31 +32,31 @@ minetest.override_item("nether_mobs:dragon_shield", {
 -- [[ ... ]] --
 
 minetest.override_item("3d_armor:helmet_mithril", {
-    groups = {armor_head=1, armor_heal=14, armor_use=200},
+    groups = {armor_head=1, armor_heal=14, armor_use=66},
     armor_groups = {fleshy=17},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("3d_armor:chestplate_mithril", {
-    groups = {armor_torso=1, armor_heal=14, armor_use=200},
+    groups = {armor_torso=1, armor_heal=14, armor_use=66},
     armor_groups = {fleshy=22},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("3d_armor:leggings_mithril", {
-    groups = {armor_legs=1, armor_heal=14, armor_use=200},
+    groups = {armor_legs=1, armor_heal=14, armor_use=66},
     armor_groups = {fleshy=22},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("3d_armor:boots_mithril", {
-    groups = {armor_feet=1, armor_heal=14, armor_use=200},
+    groups = {armor_feet=1, armor_heal=14, armor_use=66},
     armor_groups = {fleshy=17},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
 
 minetest.override_item("shields:shield_mithril", {
-    groups = {armor_shield=1, armor_heal=14, armor_use=200},
+    groups = {armor_shield=1, armor_heal=14, armor_use=66},
     armor_groups = {fleshy=17},
     damage_groups = {cracky=2, snappy=1, level=3},
 })
@@ -92,3 +92,35 @@ minetest.override_item("obsidianstuff:shield", {
     armor_groups = {fleshy=16},
     damage_groups = {cracky=2, snappy=1, choppy=1, level=3},
 })
+
+-- [[ ... ]] --
+
+minetest.override_item("3d_armor:helmet_nether", {
+    groups = {armor_head=1, armor_heal=13, armor_use=200, armor_fire=1},
+    armor_groups = {fleshy=16},
+    damage_groups = {cracky=2, snappy=1, level=3},
+})
+
+minetest.override_item("3d_armor:chestplate_nether", {
+    groups = {armor_torso=1, armor_heal=13, armor_use=200, armor_fire=1},
+    armor_groups = {fleshy=21},
+    damage_groups = {cracky=2, snappy=1, level=3},
+})
+
+minetest.override_item("3d_armor:leggings_nether", {
+    groups = {armor_legs=1, armor_heal=13, armor_use=200, armor_fire=1},
+    armor_groups = {fleshy=21},
+    damage_groups = {cracky=2, snappy=1, level=3},
+})
+
+minetest.override_item("3d_armor:boots_nether", {
+    groups = {armor_feet=1, armor_heal=13, armor_use=200, armor_fire=1},
+    armor_groups = {fleshy=16},
+    damage_groups = {cracky=2, snappy=1, level=3},
+})
+
+minetest.override_item("shields:shield_nether", {
+    groups = {armor_shield=1, armor_heal=13, armor_use=200, armor_fire=1},
+    armor_groups = {fleshy=16},
+    damage_groups = {cracky=2, snappy=1, level=3},
+})

illuna_aestival/src/tools.lua

@@ -71,64 +71,48 @@ minetest.override_item("sickles:scythe_steel", {
 	groups = { scythe = 2, scythe_uses = 140 },
 })
 
--- FIXME - TMP - these should only be overrides!
-minetest.register_tool(":nether:pick_nether", {
-	description = "Nether Pickaxe",
-	inventory_image = "nether_tool_netherpick.png",
+--Nether tools
+
+minetest.override_item("nether:pick_nether", {
 	tool_capabilities = {
 		full_punch_interval = 0.5,
 		max_drop_level=3,
 		groupcaps={
-		cracky = {times={[1]=1.80, [2]=0.8, [3]=0.4}, uses=200, maxlevel=3},
-			},
-		damage_groups = {fleshy=7},
+			cracky = {times={[1]=1.80, [2]=0.8, [3]=0.4}, uses=50, maxlevel=3},
 		},
-	sound = {breaks = "default_tool_breaks"},
-	groups = {pickaxe = 1},
+		damage_groups = {fleshy=7},
+	},
 })
 
-minetest.register_tool(":nether:shovel_nether", {
-	description = "Nether Shovel",
-	inventory_image = "nether_tool_nethershovel.png",
-	wield_image = "nether_tool_nethershovel.png^[transformR90",
+minetest.override_item("nether:shovel_nether", {
 	tool_capabilities = {
 		full_punch_interval = 0.9,
 		max_drop_level=3,
 		groupcaps={
-			crumbly = {times={[1]=1.0, [2]=0.4, [3]=0.25}, uses=200, maxlevel=3},
+			crumbly = {times={[1]=1.0, [2]=0.4, [3]=0.25}, uses=50, maxlevel=3},
 		},
 		damage_groups = {fleshy=5},
 	},
-	sound = {breaks = "default_tool_breaks"},
-	groups = {shovel = 1},
 })
 
-minetest.register_tool(":nether:axe_nether", {
-	description = "Nether Axe",
-	inventory_image = "nether_tool_netheraxe.png",
+minetest.override_item("nether:axe_nether", {
 	tool_capabilities = {
 		full_punch_interval = 0.7,
 		max_drop_level=1,
 		groupcaps={
-			choppy={times={[1]=1.9, [2]=0.7, [3]=0.4}, uses=200, maxlevel=3},
+			choppy={times={[1]=1.9, [2]=0.7, [3]=0.4}, uses=50, maxlevel=3},
 		},
 		damage_groups = {fleshy=8},
 	},
-	sound = {breaks = "default_tool_breaks"},
-	groups = {axe = 1},
 })
 
-minetest.register_tool(":nether:sword_nether", {
-	description = "Nether Sword",
-	inventory_image = "nether_tool_nethersword.png",
+minetest.override_item("nether:sword_nether", {
 	tool_capabilities = {
 		full_punch_interval = 0.5,
 		max_drop_level=1,
 		groupcaps={
-			snappy={times={[1]=1.5, [2]=0.6, [3]=0.2}, uses=200, maxlevel=3},
+			snappy={times={[1]=1.5, [2]=0.6, [3]=0.2}, uses=100, maxlevel=3},
 		},
 		damage_groups = {fleshy=15},
 	},
-	sound = {breaks = "default_tool_breaks"},
-	groups = {sword = 1},
 })

mesecons

@@ -1 +1 @@
-Subproject commit 4c5b13a3473b970b639e7e63e4a09adfc7abcfe4
+Subproject commit 399ee9f5b5ded1c423f4aa652c2e2252abbe5312

nether

@@ -1 +1 @@
-Subproject commit d8e6a6aca3a3d4a79d30c70933f10e4fc97f89cd
+Subproject commit d3f79e961b591b322472fb7a378644ff144c5900

player_monoids

@@ -1 +1 @@
-Subproject commit ed11a7395bb62bcdce3e314597edc06f4bb8a86e
+Subproject commit 08bc018f92b54732ade8c5e1ff38c404706e411e

protector

@@ -1 +1 @@
-Subproject commit df561350d6d7e70523639d7d85f52c5d8d632f68
+Subproject commit 939f65db59c11f35376743005b93b0319fcca091

signs_lib

@@ -1 +1 @@
-Subproject commit aa5f865131b61eda0e71308f1a83cd10f1ac7b31
+Subproject commit 14efa6eeb7b46c61f35dc55ebd3aa1b25f818671

skinsdb

@@ -1 +1 @@
-Subproject commit 716a9a3f9a9a43a762a44608945c6243df4e0681
+Subproject commit c9fa5d92dfba3ad55e27560f2e5790c0ec7cf7e3

spectator_mode

@@ -1 +1 @@
-Subproject commit 36483716ed29699f20b3c7a704a1ab8023989f49
+Subproject commit 1b031ebd4c2d1fb6112f63b2fe88b48c625323ed

unifieddyes

@@ -1 +1 @@
-Subproject commit ff3b2d30fa0df5c7181fdd401b989de6271c3bb3
+Subproject commit 41dd54d1be15ca38b02c66d100cabf3801f2ae0f

wardrobe

@@ -1 +1 @@
-Subproject commit 8636079b5d6b8a24c7b025db9122adabb9ea3a2c
+Subproject commit 369c088067b35ee28c268ee390095db2dcf40dca

wine

@@ -1 +1 @@
-Subproject commit ae058f923d86eae75a7445699bd8c418d375dae0
+Subproject commit 82746a50e9eba6204d385f7d77a3fe89ee1d55a5