sync from upstream (with new meld script), chick speed

meld-upstream.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+nohup meld ~/minetest/games/Bucket_Game patches/deprecated/merged-upstream/Bucket_Game &

patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/oldcoder.txt

@@ -36,11 +36,11 @@ Poikilos  has  made  changes  designed to  make  "nftools"  complement
   (change nftools_*ore.png to nftools_mineral_*.png,
   nftools:*_ore to nftools:stone_with_*,
   nftools:amber to nftools:stone_with_amber)
-* The old minerals in the world converted to the one following the comma:
+* The old minerals, converted:
   `nftools:amethyst, nftools:black_opal`
   `nftools:alexandrite_ore, nftools:bismuth`
   `nftools:aquamarine, nftools:turquoise`
-  (using aliases)
+  (for aliases see nftools_legacy in EnlivenMinetest)
 
 Other changes:
 

patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/LICENSE

@@ -3,45 +3,72 @@ es.
 
 ----------------------------------------------------------------------
 
-Original components which not covered under other licenses are licens-
+License: CC BY-SA 4.0
-ed as follows:
+is, or was, described by:
+https://creativecommons.org/licenses/by-sa/4.0/
 
-License: CC BY-SA 4.0  International.  Attribution:  OldCoder  (Robert
+License: CC BY-SA 3.0
-Kiraly).
+is, or was, described by:
+https://creativecommons.org/licenses/by-sa/3.0/
+
+Liense: CC BY-NC-SA 4.0
+is, or was, described by:
+https://creativecommons.org/licenses/by-nc-sa/4.0/
+
+License: CC BY-NC-SA 3.0
+is, or was, described by:
+https://creativecommons.org/licenses/by-nc-sa/3.0/
 
 ----------------------------------------------------------------------
 
+Original components  which are not covered under other  copyrights and
+licenses are copyright and licensed as follows:
 
-Unused Pixel Art (approximately 7 colors) Elk texture:
+(c) 2019 and CC BY-NC-SA 4.0: OldCoder (Robert Kiraly).
-  Copyright Sapier and Poikilos
-  (converted to UV-mapped texture by Poikilos)
-  Creative Commons Attribution Share-Alike 3.0
 
-HD Elk texture and default (16-color realistic) texture:
+----------------------------------------------------------------------
-  Copyright Stephen Baker (BLM/Oregon) and Poikilos
+
-  (converted to UV-mapped texture by Poikilos)
+Media for "baby_chick":
-  Creative Commons Attribution 2.0 Generic
+(c) 2019 and CC-BY-NC-SA 3.0: Poikilos.
 
 ----------------------------------------------------------------------
 
-Ostrich model:
+Improved Spider/Bug Sounds:
+codermobs_damage_giant_exoskeleton, codermobs_death_giant_bug,
+codermobs_use_giant_exoskeleton   
+(c) 2019 and CC BY-SA 4.0: Poikilos
 
-CC-BY-SA 3.0. Attribution: Sapier and Poikilos.
+Improved Particles:
-http://creativecommons.org/licenses/by-sa/3.0/de/legalcode
+codermobs_blood, codermobs_damage_stone, codermobs_lott_spider_blood  
+(c) 2019 and CC BY-SA 4.0: Poikilos
 
-2019-04-06: Poikilos reexported the model and worked on the textures.
+codermobs_fireball:
+(c) 2012 to 2019 and CC-BY-SA 3.0: Sapier, Poikilos
 
 ----------------------------------------------------------------------
 
-Other code and media for Sapier's "animal_materials", "elk"
+Media for "animal_materials",  "deer", "elk", "ostrich", and "sacreep-
-(formerly "deer"), and "ostrich":
+er":
 
-See the associated Lua source files.
+See  the  5 associated  Lua  source files.  In general,  the media is:
+(c) 2012 to 2019 and  CC-BY-SA 3.0:  Sapier and Poikilos,  except  for
+"sacreeper" for which the media is just Sapier.
 
-----------------------------------------------------------------------
+The "ostrich" texture is as described above but also attribution: Old-
+Coder.
+
+Code for "animal_materials": Same as media.  The  other 4 mobs  listed
+here use new code.
 
-Code  and  media  for  Sapier's   "animal_materials",  "ostrich",  and
+Unused Pixel Art in src (approximately 7 colors) Elk texture:
-"sacreeper": See the associated Lua source files.
+  Copyright Sapier and Poikilos
+  (converted to UV-mapped texture by Poikilos)
+  Creative Commons Attribution Share-Alike 3.0
+
+HD Elk texture and default (16-color realistic) texture:
+  Copyright Stephen Baker (BLM/Oregon) and Poikilos
+  (converted to UV-mapped texture by Poikilos)
+  Creative Commons Attribution 2.0 Generic
 
 Additionally, "chicken.lua" uses Sapier's 3D egg.  See that Lua source
 file as well.
@@ -49,8 +76,7 @@ file as well.
 ----------------------------------------------------------------------
 
 Car model:
-CC-BY-NC-SA 3.0. Attribution: Melkor.
+(c) 2015 and CC-BY-NC-SA 3.0: Melkor.
-http://creativecommons.org/licenses/by-nc-sa/3.0/
 
 ----------------------------------------------------------------------
 
@@ -70,18 +96,17 @@ Sound file: WTFPL
 
 Birds
 -----------------------------
-CC BY-SA 3.0. Attribution: models by poikilos (based on sapier's anim-
+(c) 2012-2019  and  CC-BY-SA  3.0:  Sapier,  Poikilos.  Sapier created
-al_gull.b3d from animals modpack), textures by poikilos.
+the original models. Poikilos derived new models from them and created
+new textures.
 
 Butterfly
 -----------------------------
-CC BY-SA 3.0. Attribution: AspireMint.
+(c) 2012 to 2019 and CC BY-SA 3.0: AspireMint.
 
 Realistic Milk Bucket
 -----------------------------
-Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
+(c) 2015-2019 and CC BY-SA 3.0: ElementW, Poikilos (modified by).
-Attribution: Copyright (C) 2015-2016 ElementW, Poikilos (modified by)
-
 
 D00Med code
 -----------------------------
@@ -93,7 +118,8 @@ CC BY-SA 3.0 Unported. Attribution: D00Med.
 
 Mr. Goat
 -----------------------------
-CC BY-SA 3.0. Attribution: Don Batman.
+(c) 2016 to 2019 and CC BY-SA 3.0: Don Batman.  OldCoder worked on the
+eyes.
 
 NSSM components
 -----------------------------
@@ -102,7 +128,7 @@ future, the applicable license will be GPL3.
 
 Sapier components
 -----------------------------
-CC-BY-SA 3.0. Attribution: Sapier.
+(c) 2012-2019 and CC-BY-SA 3.0: Sapier.
 
 "mobs_mc" components
 -----------------------------
@@ -117,9 +143,9 @@ Krupnov Pavel and TenPlus1 components:
 
 The MIT License (MIT)
 
-Copyright (c) 2014 Krupnov Pavel -- bugs, kpgmobs, pmobs
+(c) 2014 Krupnov Pavel -- bugs, kpgmobs, pmobs
-Copyright (c) 2014 Krupnov Pavel and 2016 TenPlus1 -- mobs_animal
+(c) 2014 Krupnov Pavel and 2016 TenPlus1 -- mobs_animal
-Copyright (c) 2016 TenPlus1 -- mobs_monster and mobs_npc
+(c) 2016 TenPlus1 -- mobs_monster and mobs_npc
 
 Permission is hereby granted,  free of charge, to any person obtaining
 a  copy  of  this  software  and  associated  documentation files (the
@@ -144,7 +170,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Blockmen components:
 
-Copyright (c) 2015-2016 BlockMen <blockmen2015@gmail.com>
+(c) 2015-2016 BlockMen <blockmen2015@gmail.com>
 
 This  software  is  provided  'as-is',  without any express or implied
 warranty.  In no event will the authors be held liable for any damages

patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/animal_materials.lua

@@ -1,11 +1,11 @@
 -- ===================================================================
--- License for this mod.
+-- Code and media license.
 --
 -- You may  copy,  use,  modify or do nearly anything  but remove this
 -- copyright notice. Of course,  you're not allowed to pretend  you've
--- created or written the Sapier-specific pieces.
+-- created or written the Sapier or Poikilos pieces.
 --
--- CC-BY-SA 3.0. Attribution: sapier.
+-- CC-BY-SA 3.0. Attribution: Sapier and Poikilos.
 
 -- ===================================================================
 
@@ -306,7 +306,6 @@ minetest.register_craftitem(":animal_materials:antlers", {
     image = "animal_materials_antlers.png",
     stack_max=20
 })
-minetest.register_alias("animal_materials:deer_horns", "animal_materials:antlers")
 
 minetest.register_craftitem(":animal_materials:ivory", {
     description = S("Ivory"),

patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/baby_chick.lua

@@ -1,15 +1,24 @@
--- Chick. Code descended from "Farlands" chicken.
+-- Baby Chick. Original mob w/media by Poikilos.
 
 -- ===================================================================
+-- Code license. Applies to this module only.
+--
+-- CC-BY-NC-SA 3.0.  (c) 2019 and attribution:  OldCoder  (Robert Kir-
+-- aly).
+
+-- ===================================================================
+-- Media license. Applies to model and associated texture.
 --
 -- You may  copy,  use,  modify or do nearly anything  but remove this
 -- copyright notice. Of course,  you're not allowed to pretend  you've
--- created or written the Sapier pieces.
+-- created or written the Poikilos pieces.
 --
+-- CC-BY-SA 3.0. (c) 2019 and attribution: Poikilos.
+
 -- ===================================================================
 
-local lcname     = "chicken_immature"
+local lcname     = "baby_chick"
-local ucname     = "Chick"
+local ucname     = "Baby Chick"
 local msname     = "codermobs_" .. lcname
 local obj_name   = "codermobs:" .. lcname
 
@@ -22,6 +31,21 @@ mobs_param = {
     aoc          =  2           ,
     obr          =  1           ,
     day_mode     = true         ,
+    aoc          = -1           ,
+
+    obr          =  1           ,
+    day_mode     = true         ,
+    min_light    =  3           ,
+    max_light    = 20           ,
+    min_height   = -31000       ,
+    max_height   =  31000       ,
+    spawn_chance =  60000       ,
+    spawn_type   = "animal"     ,
+
+    spawn_nodes  = {
+        "never:nosuchnode" ,
+    } ,
+
     add_egg   = true                    ,
     egg_image = "wool_brown.png"        ,
 }
@@ -32,81 +56,77 @@ codermobs.adjust_param()
 
 -- ===================================================================
 
-local msname_img            = msname           .. "_mesh.png"
--- local msname_cooked_img     = msname_cooked    .. ".png"
--- local msname_raw_img        = msname_raw       .. ".png"
-
--- local msname_egg_img        = msname_egg       .. ".png"
--- local msname_egg_fried_img  = msname_egg_fried .. ".png"
-
-
--- local obj_name_egg          = obj_name         .. "_egg"
--- local obj_name_egg_entity   = obj_name_egg     .. "_entity"
--- local obj_name_egg_fried    = obj_name_egg     .. "_fried"
-
--- ===================================================================
-
 mobs_param.core_param = {
     type = mobs_param.spawn_type    ,
     makes_footstep_sound = false    ,
 
-    armor       = 200               ,
+    armor         = 20              ,
     passive       = true            ,
     fall_damage   =  0              ,
     fall_speed    = -8              ,
+    hp_max        = 10              ,
+    hp_min        =  5              ,
+    runaway       = true            ,
+    jump          = false           ,
+    view_range    =  5              ,
+
     jump_height   =  0              ,
     fear_height   =  1              ,
-    hp_max      =  1                ,
+    stepheight    =  1.2            ,
-    hp_min      =  1                ,
+    -- at 14 fps, the feet move at .32 meters/sec:
-
+    walk_velocity =  .32            ,
-    water_damage = 1,
+    run_velocity  =  .64            ,
-    lava_damage = 5,
+
-    light_damage = 0,
+    water_damage  = 1               ,
-    collisionbox  = { -0.21, 0, -0.21, 0.21, 0.42, 0.21 }   ,
+    floats = 0,
-    -- The chick, at size x10, is .53 m tall. Therefore, ratio of
+    runaway = true,
-    -- adult to immature is .63:.53. Maybe change it to two thirds:
+    lava_damage   = 5               ,
-    -- .63:.42 therefore scale by .79 (.42/.53):    
+    light_damage  = 0               ,
-    visual_size   = { x=7.9, y=7.9 }                        ,
+
+    collisionbox  = { -0.3, 0, -0.3, 0.3, 0.8, 0.3 } ,
+    visual_scale  = 1.0                              ,
     visual        = "mesh"                           ,
     mesh          = msname .. ".b3d"                 ,
-    textures      = {{ msname_img }}             ,
+    textures      = {{ msname .. "_mesh.png" }}      ,
-    child_texture = {{ msname_img }}                        ,
+
+    animation     = {
+        speed_normal = 14 ,
+        stand_start  =  0 ,
+        stand_end    = 69 ,
+        walk_start   = 70 ,
+        walk_end     = 85 ,
+        speed_run    = 28 ,
+        run_start    = 70 ,
+        run_end      = 85 ,
+    },
 
     sounds = {
         random = msname ,
     },
 
-    walk_velocity = 1.264,
+    drops = {
-    run_velocity = 1.264,
-    runaway = true,
-    jump = true,
-
-    animation = {
-        speed_normal = 5.53,  -- speed_run / 2 = 5.53
-        stand_start = 0,
-        stand_end = 69,
-        walk_start = 70,
-        walk_end = 85,
-        speed_run = 11.06, -- 14 fps * visual_size = 11.06
-        run_start = 70,
-        run_end = 85,
     },
 
     follow = { "farming:seed_wheat", "farming:seed_cotton" } ,
-    view_range = 5,
 
     on_rightclick = function (self, clicker)
         mobs:protect (self, clicker)
         mobs:capture_mob (self, clicker, 30, 50, 80, false, nil)
     end,
 
+    do_custom = function (self)
+        if math.random (1, 4000) > 1 then return end
+        local pos = self.object:getpos()
+        self.object:remove()
+        minetest.add_entity (pos, "codermobs:chicken")
+    end ,
 }
 
 -- ===================================================================
 
 codermobs.setup_mob()
 
--- ===================================================================
+mobs:alias_mob ("codermobs:chick" , obj_name)
 
 codermobs.log_done()
 

patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/deer.lua

@@ -1,11 +1,11 @@
--- Deer. Descended from Sapier version.
+-- Deer. Descended from Sapier Deer/Elk common ancestor.
 
 -- ===================================================================
--- License for "deer" media.
+-- Media license. Applies to model and associated textures.
 --
 -- You may  copy,  use,  modify or do nearly anything  but remove this
 -- copyright notice. Of course,  you're not allowed to pretend  you've
--- created or written the Sapier-specific pieces.
+-- created or written the Sapier or Poikilos pieces.
 --
 -- CC-BY-SA 3.0. Attribution: Sapier and Poikilos.
 
@@ -83,16 +83,18 @@ mobs_param.core_param = {
 
     lava_damage   =   5          ,
     light_damage  =   0          ,
-    water_damage  =   0          ,
+    water_damage  =   1          ,
+    floats = 0,
+    runaway = true,
 
     collisionbox  = { -0.70, -1.10, -0.70, 0.70, 0.80, 0.70 } ,
     mesh          = msname .. ".b3d"                          ,
     visual        = "mesh"                                    ,
 
     textures      = {
-        { msname .. "_male_mesh.png"   } ,
         { msname .. "_female_mesh.png" } ,
-    },
+        { msname .. "_male_mesh.png"   } ,
+    } ,
 
     sounds        = {
     },

patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/elk.lua

@@ -1,11 +1,11 @@
--- Elk. Descended from Sapier version.
+-- Elk. Descended from Sapier Deer/Elk common ancestor.
 
 -- ===================================================================
--- License for "elk" media.
+-- Media license. Applies to model and associated textures.
 --
 -- You may  copy,  use,  modify or do nearly anything  but remove this
 -- copyright notice. Of course,  you're not allowed to pretend  you've
--- created or written the Sapier-specific pieces.
+-- created or written the Sapier or Poikilos pieces.
 --
 -- CC-BY-SA 3.0. Attribution: Sapier and Poikilos.
 
@@ -30,7 +30,7 @@ mobs_param = {
     max_light    =   20         ,
     min_height   =    0         ,
     max_height   =  200         ,
-    spawn_chance = 50000         ,
+    spawn_chance = 8000         ,
     spawn_type   = "animal"     ,
 
     spawn_nodes  = {
@@ -43,6 +43,7 @@ mobs_param = {
 
     spawn_by = {
         "default:pine_tree"             ,
+        "flowers:mushroom_brown"        ,
     } ,
 
     add_egg   = true                    ,
@@ -64,6 +65,7 @@ mobs_param.core_param = {
     attack_type   = "dogfight"   ,
     damage        =   2          ,
     fear_height   =   3          ,
+    floats        =   0          ,
     group_attack  = true         ,
     hp_max        =  15          ,
     hp_min        =   5          ,
@@ -75,6 +77,7 @@ mobs_param.core_param = {
     reach         =   2          ,
     rotate        = 270          ,
     run_velocity  =   3          ,
+    runaway       = true         ,
     stepheight    =   0.6        ,
     type          = "animal"     ,
     view_range    =  10          ,
@@ -82,7 +85,7 @@ mobs_param.core_param = {
 
     lava_damage   =   5          ,
     light_damage  =   0          ,
-    water_damage  =   0          ,
+    water_damage  =   1          ,
 
     collisionbox  = { -0.70, -1.10, -0.70, 0.70, 0.80, 0.70 } ,
     mesh          = msname .. ".b3d"                          ,

patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/init.lua

@@ -34,51 +34,56 @@ dofile (mp .. "/cacodemon.lua"    )
 dofile (mp .. "/car.lua"          )
 dofile (mp .. "/chicken.lua"      )
 dofile (mp .. "/cow.lua"          )
-dofile (mp .. "/sacreeper.lua"    )
 dofile (mp .. "/cyberdemon.lua"   )
 
+dofile (mp .. "/deer.lua"         )
 dofile (mp .. "/dirt_monster.lua" )
 dofile (mp .. "/dog.lua"          )
 dofile (mp .. "/elephant.lua"     )
 dofile (mp .. "/elk.lua"          )
-dofile (mp .. "/farhorse.lua"     )
 
+dofile (mp .. "/farhorse.lua"     )
 dofile (mp .. "/flying_pig.lua"   )
 dofile (mp .. "/ghost.lua"        )
 dofile (mp .. "/goat.lua"         )
 dofile (mp .. "/hedgehog.lua"     )
-dofile (mp .. "/jeraf.lua"        )
 
+dofile (mp .. "/jeraf.lua"        )
 dofile (mp .. "/kitten.lua"       )
 dofile (mp .. "/lava_flan.lua"    )
 dofile (mp .. "/lostsoul.lua"     )
 dofile (mp .. "/lott_spider.lua"  )
-dofile (mp .. "/mammoth.lua"      )
 
+dofile (mp .. "/mammoth.lua"      )
 dofile (mp .. "/mdskeleton.lua"   )
 dofile (mp .. "/oerkki.lua"       )
 dofile (mp .. "/ostrich.lua"      )
 dofile (mp .. "/owl.lua"          )
-dofile (mp .. "/panda.lua"        )
 
+dofile (mp .. "/panda.lua"        )
 dofile (mp .. "/penguin.lua"      )
+dofile (mp .. "/plane.lua"        )
 dofile (mp .. "/polar_bear.lua"   )
 dofile (mp .. "/rat.lua"          )
+
 dofile (mp .. "/rat_better.lua"   )
+dofile (mp .. "/sacreeper.lua"    )
 dofile (mp .. "/santa.lua"        )
-
 dofile (mp .. "/sheep.lua"        )
 dofile (mp .. "/silverfish.lua"   )
+
 dofile (mp .. "/snake_garter.lua" )
 dofile (mp .. "/snake_ice.lua"    )
 dofile (mp .. "/snowman.lua"      )
-
 dofile (mp .. "/tree_monster.lua" )
 dofile (mp .. "/vombie.lua"       )
+
 dofile (mp .. "/warthog.lua"      )
 dofile (mp .. "/wolf.lua"         )
 dofile (mp .. "/zebra.lua"        )
 
+dofile (mp .. "/baby_chick.lua"   )
+
 -- Moon Cow must be defined after regular cow.
 
 if enable_moontest then