Refactoring: lottmobs: reformat drops. Relates to #1162

lord-server · Sep 24, 2023 · d043228 · d043228
1 parent 1df2724
commit d043228
Show file tree

Hide file tree

Showing 6 changed files with 249 additions and 574 deletions.
diff --git a/mods/lord/Entities/lottmobs/animals.lua b/mods/lord/Entities/lottmobs/animals.lua
@@ -35,7 +35,7 @@ mobs:register_mob("lottmobs:kitten", {
 	runaway = true,
 	jump = true,
 	drops = {
-		{name = "farming:string", chance = 1, min = 0, max = 1},
+		{ name = "farming:string", chance = 1, min = 0, max = 1 },
 	},
 	water_damage = 0,
 	lava_damage = 5,
@@ -189,15 +189,9 @@ mobs:register_mob("lottmobs:chicken", {
 	makes_footstep_sound = true,
 	walk_velocity = 1,
 	armor = 300,
-		drops = {
-		{name = "lottmobs:chicken_raw",
-		chance = 1,
-		min = 0,
-		max = 1,},
-		{name = "lottmobs:egg",
-		chance = 1,
-		min = 0,
-		max = 1,},
+	drops = {
+		{ name = "lottmobs:chicken_raw", chance = 1, min = 0, max = 1, },
+		{ name = "lottmobs:egg",         chance = 1, min = 0, max = 1, },
 	},
 	light_resistant = true,
 	drawtype = "front",
@@ -247,8 +241,8 @@ mobs:register_mob("lottmobs:sheep", {
 	runaway = true,
 	jump = true,
 	drops = {
-		{name = "lottmobs:meat_raw", chance = 1, min = 1, max = 2},
-		{name = "wool:white", chance = 1, min = 1, max = 1},
+		{ name = "lottmobs:meat_raw", chance = 1, min = 1, max = 2 },
+		{ name = "wool:white",        chance = 1, min = 1, max = 1 },
 	},
 	water_damage = 1,
 	lava_damage = 5,
@@ -340,7 +334,7 @@ mobs:register_mob("lottmobs:bunny", {
 	runaway = true,
 	jump = true,
 	drops = {
-		{name = "lottmobs:rabbit_raw", chance = 1, min = 1, max = 1},
+		{ name = "lottmobs:rabbit_raw", chance = 1, min = 1, max = 1 },
 	},
 	water_damage = 1,
 	lava_damage = 4,

diff --git a/mods/lord/Entities/lottmobs/dwarfs.lua b/mods/lord/Entities/lottmobs/dwarfs.lua
@@ -66,13 +66,13 @@ local textures1 = {
 }
 
 local drops1 = {
-	{ name = "default:diamond", chance = 30, min = 1, max = 2, },
-	{ name = "default:iron_lump", chance = 3, min = 1, max = 7, },
-	{ name = "default:copper_lump", chance = 4, min = 1, max = 4, },
-	{ name = "default:iron_ingot", chance = 3, min = 1, max = 7, },
-	{ name = "lottores:tin_lump", chance = 8, min = 1, max = 2, },
-	{ name = "default:copper_lump", chance = 8, min = 1, max = 2, },
-	{ name = "default:bronze_ingot", chance = 5, min = 1, max = 6, },
+	{ name = "default:diamond",       chance = 30, min = 1, max = 2, },
+	{ name = "default:iron_lump",     chance = 3,  min = 1, max = 7, },
+	{ name = "default:copper_lump",   chance = 4,  min = 1, max = 4, },
+	{ name = "default:iron_ingot",    chance = 3,  min = 1, max = 7, },
+	{ name = "lottores:tin_lump",     chance = 8,  min = 1, max = 2, },
+	{ name = "default:copper_lump",   chance = 8,  min = 1, max = 2, },
+	{ name = "default:bronze_ingot",  chance = 5,  min = 1, max = 6, },
 	{ name = "lottores:mithril_lump", chance = 50, min = 1, max = 3, },
 }
 
@@ -113,15 +113,15 @@ local textures2 = {
 }
 
 local drops2 = {
-	{ name = "default:obsidian", chance = 90, min = 1, max = 1, },
-	{ name = "default:diamond", chance = 30, min = 1, max = 2, },
-	{ name   = "default:iron_lump", chance = 3, min    = 1, max    = 7, },
-	{ name   = "default:copper_lump", chance = 4, min    = 1, max    = 4, },
-	{ name   = "default:iron_ingot", chance = 3, min    = 1, max    = 7, },
-	{ name   = "lottores:tin_lump", chance = 8, min    = 1, max    = 2, },
-	{ name   = "default:copper_lump", chance = 8, min    = 1, max    = 2, },
-	{ name   = "default:bronze_ingot", chance = 5, min    = 1, max    = 6, },
-	{ name   = "lottores:mithril_lump", chance = 50, min    = 1, max    = 3, },
+	{ name = "default:obsidian",      chance = 90, min = 1, max = 1, },
+	{ name = "default:diamond",       chance = 30, min = 1, max = 2, },
+	{ name = "default:iron_lump",     chance = 3,  min = 1, max = 7, },
+	{ name = "default:copper_lump",   chance = 4,  min = 1, max = 4, },
+	{ name = "default:iron_ingot",    chance = 3,  min = 1, max = 7, },
+	{ name = "lottores:tin_lump",     chance = 8,  min = 1, max = 2, },
+	{ name = "default:copper_lump",   chance = 8,  min = 1, max = 2, },
+	{ name = "default:bronze_ingot",  chance = 5,  min = 1, max = 6, },
+	{ name = "lottores:mithril_lump", chance = 50, min = 1, max = 3, },
 }
 
 lottmobs.register_dwarf("1", 30, 40, textures2, 2.75, 3.5, 13, 75, drops2)
@@ -161,13 +161,13 @@ local textures3 = {
 }
 
 local drops3 = {
-	{ name = "default:diamond", chance = 30, min = 1, max = 2, },
-	{ name = "default:iron_lump", chance = 3, min = 1, max = 7, },
-	{ name = "default:copper_lump", chance = 4, min = 1, max = 4, },
-	{ name = "default:iron_ingot", chance = 3, min = 1, max = 7, },
-	{ name = "lottores:tin_lump", chance = 8, min = 1, max = 2, },
-	{ name = "default:copper_lump", chance = 8, min = 1, max = 2, },
-	{ name = "default:bronze_ingot", chance = 5, min = 1, max = 6, },
+	{ name = "default:diamond",       chance = 30, min = 1, max = 2, },
+	{ name = "default:iron_lump",     chance = 3,  min = 1, max = 7, },
+	{ name = "default:copper_lump",   chance = 4,  min = 1, max = 4, },
+	{ name = "default:iron_ingot",    chance = 3,  min = 1, max = 7, },
+	{ name = "lottores:tin_lump",     chance = 8,  min = 1, max = 2, },
+	{ name = "default:copper_lump",   chance = 8,  min = 1, max = 2, },
+	{ name = "default:bronze_ingot",  chance = 5,  min = 1, max = 6, },
 	{ name = "lottores:mithril_lump", chance = 50, min = 1, max = 3, },
 }
 

diff --git a/mods/lord/Entities/lottmobs/elves.lua b/mods/lord/Entities/lottmobs/elves.lua
@@ -117,16 +117,16 @@ local textures1 = {
 }
 
 local drops1 = {
-	{ name = "lottplants:mallornsapling", chance = 5, min = 1, max = 3, },
-	{ name = "lottplants:mallornwood", chance = 5, min = 1, max = 6, },
-	{ name = "lottores:silveringot", chance = 20, min = 1, max = 7 },
-	{ name = "tools:sword_silver", chance = 20, min = 1, max = 1 },
-	{ name = "lottarmor:helmet_silver", chance = 30, min = 1, max = 1 },
-	{ name = "lottarmor:chestplate_silver", chance = 30, min = 1, max = 1 },
-	{ name = "tools:spear_silver", chance = 25, min = 1, max = 1, },
-	{ name = "lottores:blue_gem", chance = 200, min = 1, max = 1, },
+	{ name = "lottplants:mallornsapling",     chance = 5,   min = 1, max = 3, },
+	{ name = "lottplants:mallornwood",        chance = 5,   min = 1, max = 6, },
+	{ name = "lottores:silveringot",          chance = 20,  min = 1, max = 7 },
+	{ name = "tools:sword_silver",            chance = 20,  min = 1, max = 1 },
+	{ name = "lottarmor:helmet_silver",       chance = 30,  min = 1, max = 1 },
+	{ name = "lottarmor:chestplate_silver",   chance = 30,  min = 1, max = 1 },
+	{ name = "tools:spear_silver",            chance = 25,  min = 1, max = 1, },
+	{ name = "lottores:blue_gem",             chance = 200, min = 1, max = 1, },
 	{ name = "lottplants:yavannamiresapling", chance = 250, min = 1, max = 1, },
-	{ name = "lottores:mithril_lump", chance = 100, min = 1, max = 2, },
+	{ name = "lottores:mithril_lump",         chance = 100, min = 1, max = 2, },
 }
 
 lottmobs.register_elf("", 20, 35, textures1, 2.5, 5, 4, 200, drops1)
@@ -166,16 +166,16 @@ local textures2 = {
 }
 
 local drops2 = {
-	{ name = "lottplants:mallornsapling", chance = 5, min = 1, max = 3, },
-	{ name = "lottplants:mallornwood", chance = 5, min = 1, max = 6, },
-	{ name = "lottores:silveringot", chance = 20, min = 1, max = 7 },
-	{ name = "tools:sword_silver", chance = 20, min = 1, max = 1 },
-	{ name = "lottarmor:helmet_silver", chance = 30, min = 1, max = 1 },
-	{ name = "lottarmor:chestplate_silver", chance = 30, min = 1, max = 1 },
-	{ name = "tools:spear_silver", chance = 25, min = 1, max = 1, },
-	{ name = "lottores:blue_gem", chance = 200, min = 1, max = 1, },
+	{ name = "lottplants:mallornsapling",     chance = 5,   min = 1, max = 3, },
+	{ name = "lottplants:mallornwood",        chance = 5,   min = 1, max = 6, },
+	{ name = "lottores:silveringot",          chance = 20,  min = 1, max = 7 },
+	{ name = "tools:sword_silver",            chance = 20,  min = 1, max = 1 },
+	{ name = "lottarmor:helmet_silver",       chance = 30,  min = 1, max = 1 },
+	{ name = "lottarmor:chestplate_silver",   chance = 30,  min = 1, max = 1 },
+	{ name = "tools:spear_silver",            chance = 25,  min = 1, max = 1, },
+	{ name = "lottores:blue_gem",             chance = 200, min = 1, max = 1, },
 	{ name = "lottplants:yavannamiresapling", chance = 250, min = 1, max = 1, },
-	{ name = "lottores:mithril_lump", chance = 100, min = 1, max = 2, },
+	{ name = "lottores:mithril_lump",         chance = 100, min = 1, max = 2, },
 }
 
 lottmobs.register_elf(1, 20, 35, textures2, 2, 4.5, 6, 100, drops2)
@@ -204,16 +204,16 @@ local textures3 = {
 }
 
 local drops3 = {
-	{ name = "lottplants:mallornsapling", chance = 5, min = 1, max = 3, },
-	{ name = "lottplants:mallornwood", chance = 5, min = 1, max = 6, },
-	{ name = "lottores:silveringot", chance = 20, min = 1, max = 7 },
-	{ name = "tools:sword_silver", chance = 20, min = 1, max = 1 },
-	{ name = "lottarmor:helmet_silver", chance = 30, min = 1, max = 1 },
-	{ name = "lottarmor:chestplate_silver", chance = 30, min = 1, max = 1 },
-	{ name = "tools:spear_silver", chance = 25, min = 1, max = 1, },
-	{ name = "lottores:blue_gem", chance = 200, min = 1, max = 1, },
+	{ name = "lottplants:mallornsapling",     chance = 5,   min = 1, max = 3, },
+	{ name = "lottplants:mallornwood",        chance = 5,   min = 1, max = 6, },
+	{ name = "lottores:silveringot",          chance = 20,  min = 1, max = 7 },
+	{ name = "tools:sword_silver",            chance = 20,  min = 1, max = 1 },
+	{ name = "lottarmor:helmet_silver",       chance = 30,  min = 1, max = 1 },
+	{ name = "lottarmor:chestplate_silver",   chance = 30,  min = 1, max = 1 },
+	{ name = "tools:spear_silver",            chance = 25,  min = 1, max = 1, },
+	{ name = "lottores:blue_gem",             chance = 200, min = 1, max = 1, },
 	{ name = "lottplants:yavannamiresapling", chance = 250, min = 1, max = 1, },
-	{ name = "lottores:mithril_lump", chance = 100, min = 1, max = 2, },
+	{ name = "lottores:mithril_lump",         chance = 100, min = 1, max = 2, },
 }
 
 lottmobs.register_elf(2, 20, 35, textures3, 2.25, 4.75, 8, 150, drops3)
@@ -242,10 +242,10 @@ local textures4 = {
 }
 
 local drops4 = {
-	{ name = "arrows:arrow", chance = 30, min = 1, max = 10, },
-	{ name = "lottthrowing:bow_wood_mallord", chance = 5, min = 1, max = 1, },
-	{ name = "lottores:silveringot", chance = 20, min = 1, max = 7 },
-	{ name = "lottarmor:chestplate_silver", chance = 30, min = 1, max = 1 },
+	{ name = "arrows:arrow",                  chance = 30, min = 1, max = 10, },
+	{ name = "lottthrowing:bow_wood_mallord", chance = 5,  min = 1, max = 1, },
+	{ name = "lottores:silveringot",          chance = 20, min = 1, max = 7 },
+	{ name = "lottarmor:chestplate_silver",   chance = 30, min = 1, max = 1 },
 }
 
 lottmobs.register_elf_archer("", 20, 35, textures4, 2.25, 4.75, 8, 150, drops4)
diff --git a/mods/lord/Entities/lottmobs/fishes.lua b/mods/lord/Entities/lottmobs/fishes.lua
@@ -61,7 +61,7 @@ local SPRITE_VERSION = false	-- set to true to use upright sprites instead of me
 		view_range = 8,
 		water_damage = 0,
 		drops = {
-			{name = "lottmobs:fish_raw", chance = 1, min = 1, max = 1},
+			{ name = "lottmobs:fish_raw", chance = 1, min = 1, max = 1 },
 		},
 		lava_damage = 5,
 		light_damage = 0,
@@ -96,7 +96,7 @@ local SPRITE_VERSION = false	-- set to true to use upright sprites instead of me
 		fall_speed = 0,
 		view_range = 8,
 		drops = {
-			{name = "lottmobs:fish_raw", chance = 1, min = 1, max = 1},
+			{ name = "lottmobs:fish_raw", chance = 1, min = 1, max = 1 },
 		},
 		water_damage = 0,
 		lava_damage = 5,