From 5a34ae037741dcfe6df1be2a1febcbdef7c88963 Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Mon, 19 Aug 2019 15:09:53 -0400
Subject: [PATCH] improve variable order for dungeon balancing patch

---
 .../mods/codermobs/codermobs/mdskeleton.lua   | 35 +++++-----
 .../mods/codermobs/codermobs/oerkki.lua       | 69 +++++++++----------
 2 files changed, 47 insertions(+), 57 deletions(-)

diff --git a/Bucket_Game-branches/codermobs-dungeon-balancing-190815-vs-190812/mods/codermobs/codermobs/mdskeleton.lua b/Bucket_Game-branches/codermobs-dungeon-balancing-190815-vs-190812/mods/codermobs/codermobs/mdskeleton.lua
index f6ab567..5f86f2e 100644
--- a/Bucket_Game-branches/codermobs-dungeon-balancing-190815-vs-190812/mods/codermobs/codermobs/mdskeleton.lua
+++ b/Bucket_Game-branches/codermobs-dungeon-balancing-190815-vs-190812/mods/codermobs/codermobs/mdskeleton.lua
@@ -46,35 +46,35 @@ codermobs.adjust_param()
 
 mobs_param.core_param = {
     type = mobs_param.spawn_type    ,
-    makes_footstep_sound = true     ,
-
-    armor          = 100            ,
+    passive        = false          ,
     attack_animals = true           ,
     attack_type    = "dogfight"     ,
     damage         =   2            ,
-    floats         =   0            ,
-    hp_max         =  33            ,
-    hp_min         =   7            ,
-    stepheight     = 1.2            ,
-    jump_height    =   0            ,
-    jump           = false          ,
-    passive        = false          ,
-    reach          =   2            ,
-    run_velocity   =   3            ,
     view_range     =  15            ,
-    walk_velocity  =   1            ,
+    reach          =   2            ,
 
+    hp_min         =   7            ,
+    hp_max         =  33            ,
+    armor          = 100            ,
     fall_damage    =   0            ,
     lava_damage    =   0            ,
     light_damage   =   2            ,
     water_damage   =   0            ,
+    drops          = {
+        { name="default:apple", chance=2, min=1, max=3 } ,
+    } ,
 
     collisionbox   = { -0.40, -0.01, -0.40, 0.40, 1.80, 0.40 } ,
+    visual         = "mesh"                                    ,
     drawtype       = "front"                                   ,
     mesh           = msname .. ".x"                            ,
     textures       = { msname .. "_mesh.png" }                 ,
-    visual         = "mesh"                                    ,
-
+    stepheight     = 1.2            ,
+    jump_height    =   0            ,
+    jump           = false          ,
+    floats         =   0            ,
+    walk_velocity  =   1            ,
+    run_velocity   =   3            ,
     animation      = {
         stand_start  =   0 ,
         stand_end    =  23 ,
@@ -92,15 +92,12 @@ mobs_param.core_param = {
         speed_run    =  60 ,
     } ,
 
-    drops          = {
-        { name="default:apple", chance=2, min=1, max=3 } ,
-    } ,
-
     sounds         = {
         death  = msname .. "_death"  ,
         hurt   = msname .. "_hurt"   ,
         random = msname .. "_random" ,
     } ,
+    makes_footstep_sound = true     ,
 }
 
 -- ===================================================================
diff --git a/Bucket_Game-branches/codermobs-dungeon-balancing-190815-vs-190812/mods/codermobs/codermobs/oerkki.lua b/Bucket_Game-branches/codermobs-dungeon-balancing-190815-vs-190812/mods/codermobs/codermobs/oerkki.lua
index 1b7ec3a..aa6a996 100644
--- a/Bucket_Game-branches/codermobs-dungeon-balancing-190815-vs-190812/mods/codermobs/codermobs/oerkki.lua
+++ b/Bucket_Game-branches/codermobs-dungeon-balancing-190815-vs-190812/mods/codermobs/codermobs/oerkki.lua
@@ -43,52 +43,49 @@ codermobs.adjust_param()
 
 mobs_param.core_param = {
     type = mobs_param.spawn_type ,
-
-    armor          = 100         ,
+    passive        = false       ,
+    runaway        = true        ,
+    attack_animals = true        ,
     attack_type    = "dogfight"  ,
     damage         =   4         ,
-    attack_animals = true           ,
-    fear_height    =   4         ,
-    hp_max         =  34         ,
-    hp_min         =   8         ,
-    stepheight     = 1.2         ,
-    jump_height    =   0         ,
-    jump           = false       ,
-    passive        = false       ,
-    pathfinding    = true        ,
-    reach          =   2         ,
-    run_velocity   =   3         ,
     view_range     =  10         ,
-    walk_velocity  =   1         ,
-    floats         =   0         ,
-    runaway        = true        ,
-
-    lava_damage    =   4         ,
-    light_damage   =   1         ,
-    water_damage   =   2         ,
-
+    reach          =   2         ,
     -- This mob eats torches
     replace_offset =  -1                    ,
     replace_rate   =   5                    ,
     replace_what   = { "default:torch" }    ,
     replace_with   = "air"                  ,
 
-    makes_footstep_sound = false ,
-
-    drops = {
-        { name = "default:obsidian" ,
-          chance = 3, min = 1, max = 2 } ,
-    },
-
+    hp_min         =   8         ,
+    hp_max         =  34         ,
+    armor          = 100         ,
+    lava_damage    =   4         ,
+    light_damage   =   1         ,
+    water_damage   =   2         ,
     immune_to = {
         { "default:sword_wood" ,   0 } , -- No damage
         { "default:gold_lump"  , -10 } , -- Heals by 10 points
     },
-
-    sounds = {
-        random = "codermobs_oerkki" ,
+    drops = {
+        { name = "default:obsidian" ,
+          chance = 3, min = 1, max = 2 } ,
     },
 
+    collisionbox = { -0.4, -1, -0.4, 0.4, 0.9, 0.4 }    ,
+    visual       = "mesh"                               ,
+    mesh         = "codermobs_oerkki.b3d"               ,
+    textures = {
+        { "codermobs_oerkki1.png" } ,
+        { "codermobs_oerkki2.png" } ,
+    },
+    pathfinding    = true        ,
+    stepheight     = 1.2         ,
+    fear_height    =   4         ,
+    jump_height    =   0         ,
+    jump           = false       ,
+    floats         =   0         ,
+    walk_velocity  =   1         ,
+    run_velocity   =   3         ,
     animation = {
         stand_start  =  0 ,
         stand_end    = 23 ,
@@ -102,14 +99,10 @@ mobs_param.core_param = {
         speed_run    = 15 ,
     },
 
-    textures = {
-        { "codermobs_oerkki1.png" } ,
-        { "codermobs_oerkki2.png" } ,
+    sounds = {
+        random = "codermobs_oerkki" ,
     },
-
-    collisionbox = { -0.4, -1, -0.4, 0.4, 0.9, 0.4 }    ,
-    mesh         = "codermobs_oerkki.b3d"               ,
-    visual       = "mesh"                               ,
+    makes_footstep_sound = false ,
 }
 
 -- ===================================================================