Browse Source

change formatting and texture naming for cleaner diff with Bucket_Game

master
poikilos 6 years ago
committed by Jacob Gustafson
parent
commit
43821c8ccb
  1. 12
      patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/LICENSE
  2. 43
      patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/oldcoder.txt
  3. 4
      patches/deprecated/merged-upstream/Bucket_Game/mods/coderfood/cake/README.txt
  4. 34
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/LICENSE
  5. 347
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/animal_materials.lua
  6. 35
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/elk.lua
  7. 26
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/init.lua
  8. 0
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female_mesh.png
  9. 0
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male_mesh.png

12
patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/LICENSE

@ -1,10 +1,16 @@
# "nftools" license information # "nftools" license information
## Minerals ## Minerals
Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>, Poikilos (modified by) Copyright (C) 2019 OldCoder (Robert Kiraly) and Poikilos
Creative Commons Zero Creative Commons Zero
Formerly WTFPL Version 2, December 2004, and what we want to do is re-
lease an improved version with a better license.
<https://creativecommons.org/share-your-work/public-domain/cc0/> <https://creativecommons.org/share-your-work/public-domain/cc0/>
The original author is unknown, but WTFPL allows distribution without
attribution. We'll offer attribution if the original author can be
identified.
## Stool ## Stool
Photo-326311 by Pixabay, made into texture by Poikilos Photo-326311 by Pixabay, made into texture by Poikilos
Creative Commons Zero Creative Commons Zero
@ -40,7 +46,9 @@ Poikilos (relit, rendered, & retouched by)
## Code ## Code
MIT License MIT License
Copyright 2004 Sam Hocevar, 2019 OldCoder, 2019 Poikilos Formerly WTFPL Version 2, December 2004, and what we want to do is re-
lease an improved version with a better license.
Copyright (C) 2019 OldCoder (Robert Kiraly) and Poikilos
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining

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

@ -1,27 +1,37 @@
Name: nftools Name: nftools
Source: Fork of upstream mod - Do not replace Source: Fork of upstream mod - Do not replace
License: Open the LICENSE file using your favorite text editor. License: See "LICENSE"
---------------------------------------------------------------------- ----------------------------------------------------------------------
Nftools adds additional minerals and tools to minetest. 1. "nftools" is a fork of a deceased mod, name and author unknown,
New tools: that was licensed originally under WTFPL.
As the original mod was licensed under WTFPL, attribution isn't re-
quired, though we'll offer it if the mod can be identified.
----------------------------------------------------------------------
2. "nftools" adds new minerals and tools.
New tools include:
* Battle Axe (low level weapon, does knockback occasionally) * Battle Axe (low level weapon, does knockback occasionally)
* Mace (high level weapon) * Mace (high level weapon)
* Scythe * Scythe
* "Quartz Crystals" decorative node
The Original version by Sam Hocevar adds the following minerals: Poikilos has made changes designed to make "nftools" complement
Amber (block and "chip") "birthstones". His changes include:
Poikilos' fork is designed to compliment birthstones by making the
following changes:
* Changed alexandrite (overlap with birthstones): * Changed alexandrite (overlap with birthstones):
to bismuth (it already looked somewhat like bismuth) to bismuth (it already looked somewhat like bismuth)
* Changed amethyst (modified texture until looked like black opal): * Changed amethyst (modified texture until looked like black opal):
to black opal to black opal.
* Changed aquamarine: * Changed aquamarine:
to turquoise to turquoise
* Use standard texture naming conventions * Use standard texture naming conventions
(change nftools_*ore.png to nftools_mineral_*.png, (change nftools_*ore.png to nftools_mineral_*.png,
nftools:*_ore to nftools:stone_with_*, nftools:*_ore to nftools:stone_with_*,
@ -32,15 +42,16 @@ following changes:
`nftools:aquamarine, nftools:turquoise` `nftools:aquamarine, nftools:turquoise`
(using aliases) (using aliases)
Unrelated changes: Other changes:
* Battle Axe, Mace, and Scythe textures * Battle Axe, Mace, and Scythe textures
* Tint of amber nodes is now amber (with yellow highlights) instead of * Tint of amber nodes is now amber (with yellow highlights) instead of
yellow. Blending is improved, and texture is 16% transparent. yellow. Blending is improved, and texture is 16% transparent.
* Bismuth texture is more angular to look even more like bismuth * Bismuth texture is more angular to look even more like bismuth
* Improve ore textures (nftools_mineral_*.png) * Improve ore textures (nftools_mineral_*.png)
* fixed issue where aquamarine ore drops ore * Fixed issue where aquamarine ore drops ore
* removed all smelting (smelting gemstones? really? not anymore) * Removed all smelting except for Bismuth
except Bismuth (formerly nftools:alexandrite) * Register each craftitem before referencing it as a drop
* Register each craftitem before referencding it as a drop. * Add missing recipe for quartz crystals node (displayable quartz)
* Make missing recipe for quartz crystals node (displayable quartz)
* Removed unused textures

4
patches/deprecated/merged-upstream/Bucket_Game/mods/coderfood/cake/README.txt

@ -25,7 +25,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
Authors and licenses of textures (not based on textures from TenPlus1's version): Authors and licenses of textures:
--------------------------------- ---------------------------------
Creative Commons Zero Creative Commons Zero
https://creativecommons.org/share-your-work/public-domain/cc0/ https://creativecommons.org/share-your-work/public-domain/cc0/
@ -38,6 +38,6 @@ lux_pp, Poikilos (texture and 3d version):
cake_sugar.png cake_sugar.png
cake_top.png cake_top.png
(also files in src directory) (also files in src directory)
unknown CC0 (multiple users on purepng.com): unknown CC0 (multiple users on purepng.com):
cake_sugar.png cake_sugar.png
(also sugar xcf project in src directory)

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

@ -22,14 +22,44 @@ HD Elk texture and default (16-color realistic) texture:
(converted to UV-mapped texture by Poikilos) (converted to UV-mapped texture by Poikilos)
Creative Commons Attribution 2.0 Generic Creative Commons Attribution 2.0 Generic
Other code and media for Sapier's "animal_materials", "elk": ----------------------------------------------------------------------
Ostrich model:
CC-BY-SA 3.0. Attribution: Sapier and Poikilos.
http://creativecommons.org/licenses/by-sa/3.0/de/legalcode
2019-04-06: Poikilos reexported the model and worked on the textures.
----------------------------------------------------------------------
Other code and media for Sapier's "animal_materials", "elk"
(formerly "deer"), and "ostrich": (formerly "deer"), and "ostrich":
See the associated Lua source files. See the associated Lua source files.
---------------------------------------------------------------------- ----------------------------------------------------------------------
Code and media for Sapier's "animal_materials", "ostrich", and
"sacreeper": See the associated Lua source files.
Additionally, "chicken.lua" uses Sapier's 3D egg. See that Lua source
file as well.
----------------------------------------------------------------------
Car model:
CC-BY-NC-SA 3.0. Attribution: Melkor.
http://creativecommons.org/licenses/by-nc-sa/3.0/
----------------------------------------------------------------------
mdoege code and/or media
-----------------------------
WTFPL
PilzAdam code and/or media PilzAdam code and/or media
-------------------------- -----------------------------
WTFPL WTFPL
Bat Bat

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

@ -1,20 +1,17 @@
-- =================================================================== -- ===================================================================
-- Mob Framework Mod by Sapier -- License for this mod.
-- --
-- You may copy, use, modify or do nearly anything but remove this -- You may copy, use, modify or do nearly anything but remove this
-- copyright notice. Of course, you are NOT allow to pretend you have -- copyright notice. Of course, you're not allowed to pretend you've
-- created or written the Sapier-specific pieces. -- created or written the Sapier-specific pieces.
-- --
-- CC-BY-SA 3.0. Attribution: sapier. -- CC-BY-SA 3.0. Attribution: sapier.
--
--! @file init.lua
--! @brief animal_materials
--! @copyright Sapier
--! @author Sapier
--! @date 2013-01-27
--
-- Boilerplate to support localized strings if intllib mod is installed. -- ===================================================================
-- Boilerplate to support localized strings if intllib mod is install-
-- ed.
local S local S
if (minetest.get_modpath("intllib")) then if (minetest.get_modpath("intllib")) then
dofile(minetest.get_modpath("intllib").."/intllib.lua") dofile(minetest.get_modpath("intllib").."/intllib.lua")
@ -26,7 +23,6 @@ end
core.log("action","MOD: animal_materials loading ...") core.log("action","MOD: animal_materials loading ...")
local version = "0.1.3" local version = "0.1.3"
animal_materialsdata = {} animal_materialsdata = {}
-- =================================================================== -- ===================================================================
@ -40,33 +36,33 @@ animal_materialsdata = {}
-- --
minetest.register_tool(":animal_materials:sword_deamondeath", { minetest.register_tool(":animal_materials:sword_deamondeath", {
description = S("Sword (Deamondeath)"), description = S("Sword (Deamondeath)"),
inventory_image = "default_tool_steelsword.png", inventory_image = "default_tool_steelsword.png",
tool_capabilities = { tool_capabilities = {
full_punch_interval = 0.50, full_punch_interval = 0.50,
max_drop_level=1, max_drop_level=1,
groupcaps={ groupcaps={
fleshy={times={[1]=2.00, [2]=0.80, [3]=0.40}, uses=10, maxlevel=1}, fleshy={times={[1]=2.00, [2]=0.80, [3]=0.40}, uses=10, maxlevel=1},
snappy={times={[2]=0.70, [3]=0.30}, uses=40, maxlevel=1}, snappy={times={[2]=0.70, [3]=0.30}, uses=40, maxlevel=1},
choppy={times={[3]=0.70}, uses=40, maxlevel=0}, choppy={times={[3]=0.70}, uses=40, maxlevel=0},
deamon={times={[1]=0.25, [2]=0.10, [3]=0.05}, uses=20, maxlevel=3}, deamon={times={[1]=0.25, [2]=0.10, [3]=0.05}, uses=20, maxlevel=3},
} }
} }
}) })
-- =================================================================== -- ===================================================================
-- scissors -- scissors
-- --
minetest.register_tool(":animal_materials:scissors", { minetest.register_tool(":animal_materials:scissors", {
description = S("Scissors"), description = S("Scissors"),
inventory_image = "animal_materials_scissors.png", inventory_image = "animal_materials_scissors.png",
tool_capabilities = { tool_capabilities = {
max_drop_level=0, max_drop_level=0,
groupcaps={ groupcaps={
wool = {uses=40,maxlevel=1} wool = {uses=40,maxlevel=1}
} }
}, },
}) })
-- =================================================================== -- ===================================================================
@ -74,9 +70,9 @@ minetest.register_tool(":animal_materials:scissors", {
-- --
minetest.register_craftitem(":animal_materials:lasso", { minetest.register_craftitem(":animal_materials:lasso", {
description = S("Lasso"), description = S("Lasso"),
image = "animal_materials_lasso.png", image = "animal_materials_lasso.png",
stack_max=10, stack_max=10,
}) })
-- =================================================================== -- ===================================================================
@ -84,9 +80,9 @@ minetest.register_craftitem(":animal_materials:lasso", {
-- --
minetest.register_craftitem(":animal_materials:net", { minetest.register_craftitem(":animal_materials:net", {
description = S("Net"), description = S("Net"),
image = "animal_materials_net.png", image = "animal_materials_net.png",
stack_max=10, stack_max=10,
}) })
-- =================================================================== -- ===================================================================
@ -94,9 +90,9 @@ minetest.register_craftitem(":animal_materials:net", {
-- --
minetest.register_craftitem(":animal_materials:saddle", { minetest.register_craftitem(":animal_materials:saddle", {
description = S("Saddle"), description = S("Saddle"),
image = "animal_materials_saddle.png", image = "animal_materials_saddle.png",
stack_max=1 stack_max=1
}) })
-- =================================================================== -- ===================================================================
@ -104,9 +100,9 @@ minetest.register_craftitem(":animal_materials:saddle", {
-- --
minetest.register_craftitem(":animal_materials:contract", { minetest.register_craftitem(":animal_materials:contract", {
description = S("Contract"), description = S("Contract"),
image = "animal_materials_contract.png", image = "animal_materials_contract.png",
stack_max=10, stack_max=10,
}) })
-- =================================================================== -- ===================================================================
@ -114,99 +110,99 @@ minetest.register_craftitem(":animal_materials:contract", {
-- --
minetest.register_craftitem(":animal_materials:meat_raw", { minetest.register_craftitem(":animal_materials:meat_raw", {
description = S("Raw meat"), description = S("Raw meat"),
image = "animal_materials_meat_raw.png", image = "animal_materials_meat_raw.png",
on_use = minetest.item_eat(1), on_use = minetest.item_eat(1),
groups = { meat=1, eatable=1 }, groups = { meat=1, eatable=1 },
stack_max=25 stack_max=25
}) })
minetest.register_craftitem(":animal_materials:meat_pork", { minetest.register_craftitem(":animal_materials:meat_pork", {
description = S("Pork (raw)"), description = S("Pork (raw)"),
image = "animal_materials_meat_raw.png", image = "animal_materials_meat_raw.png",
on_use = minetest.item_eat(1), on_use = minetest.item_eat(1),
groups = { meat=1, eatable=1 }, groups = { meat=1, eatable=1 },
stack_max=25 stack_max=25
}) })
minetest.register_craftitem(":animal_materials:meat_beef", { minetest.register_craftitem(":animal_materials:meat_beef", {
description = S("Beef (raw)"), description = S("Beef (raw)"),
image = "animal_materials_meat_raw.png", image = "animal_materials_meat_raw.png",
on_use = minetest.item_eat(1), on_use = minetest.item_eat(1),
groups = { meat=1, eatable=1 }, groups = { meat=1, eatable=1 },
stack_max=25 stack_max=25
}) })
minetest.register_craftitem(":animal_materials:meat_chicken", { minetest.register_craftitem(":animal_materials:meat_chicken", {
description = S("Chicken (raw)"), description = S("Chicken (raw)"),
image = "animal_materials_meat_raw.png", image = "animal_materials_meat_raw.png",
on_use = minetest.item_eat(1), on_use = minetest.item_eat(1),
groups = { meat=1, eatable=1 }, groups = { meat=1, eatable=1 },
stack_max=25 stack_max=25
}) })
minetest.register_craftitem(":animal_materials:meat_lamb", { minetest.register_craftitem(":animal_materials:meat_lamb", {
description = S("Lamb (raw)"), description = S("Lamb (raw)"),
image = "animal_materials_meat_raw.png", image = "animal_materials_meat_raw.png",
on_use = minetest.item_eat(1), on_use = minetest.item_eat(1),
groups = { meat=1, eatable=1 }, groups = { meat=1, eatable=1 },
stack_max=25 stack_max=25
}) })
minetest.register_craftitem(":animal_materials:meat_venison", { minetest.register_craftitem(":animal_materials:meat_venison", {
description = S("Venison (raw)"), description = S("Venison (raw)"),
image = "animal_materials_meat_raw.png", image = "animal_materials_meat_raw.png",
on_use = minetest.item_eat(1), on_use = minetest.item_eat(1),
groups = { meat=1, eatable=1 }, groups = { meat=1, eatable=1 },
stack_max=25 stack_max=25
}) })
minetest.register_craftitem(":animal_materials:meat_undead", { minetest.register_craftitem(":animal_materials:meat_undead", {
description = S("Meat (not quite dead)"), description = S("Meat (not quite dead)"),
image = "animal_materials_meat_undead_raw.png", image = "animal_materials_meat_undead_raw.png",
on_use = minetest.item_eat(-2), on_use = minetest.item_eat(-2),
groups = { meat=1, eatable=1 }, groups = { meat=1, eatable=1 },
stack_max=5 stack_max=5
}) })
minetest.register_craftitem(":animal_materials:meat_toxic", { minetest.register_craftitem(":animal_materials:meat_toxic", {
description = S("Toxic Meat"), description = S("Toxic Meat"),
image = "animal_materials_meat_toxic_raw.png", image = "animal_materials_meat_toxic_raw.png",
on_use = minetest.item_eat(-5), on_use = minetest.item_eat(-5),
groups = { meat=1, eatable=1 }, groups = { meat=1, eatable=1 },
stack_max=5 stack_max=5
}) })
minetest.register_craftitem(":animal_materials:meat_ostrich", { minetest.register_craftitem(":animal_materials:meat_ostrich", {
description = S("Ostrich Meat"), description = S("Ostrich Meat"),
image = "animal_materials_meat_raw.png", image = "animal_materials_meat_raw.png",
on_use = minetest.item_eat(3), on_use = minetest.item_eat(3),
groups = { meat=1, eatable=1 }, groups = { meat=1, eatable=1 },
stack_max=5 stack_max=5
}) })
minetest.register_craftitem(":animal_materials:pork_raw", { minetest.register_craftitem(":animal_materials:pork_raw", {
description = S("Pork"), description = S("Pork"),
image = "animal_materials_pork_raw.png", image = "animal_materials_pork_raw.png",
on_use = minetest.item_eat(4), on_use = minetest.item_eat(4),
groups = { meat=1, eatable=1 }, groups = { meat=1, eatable=1 },
stack_max=5 stack_max=5
}) })
minetest.register_craftitem(":animal_materials:fish_bluewhite", { minetest.register_craftitem(":animal_materials:fish_bluewhite", {
description = S("Fish (bluewhite)"), description = S("Fish (bluewhite)"),
image = "animal_materials_meat_raw.png", image = "animal_materials_meat_raw.png",
on_use = minetest.item_eat(1), on_use = minetest.item_eat(1),
groups = { meat=1, eatable=1 }, groups = { meat=1, eatable=1 },
stack_max=25 stack_max=25
}) })
minetest.register_craftitem(":animal_materials:fish_clownfish", { minetest.register_craftitem(":animal_materials:fish_clownfish", {
description = S("Fish (clownfish)"), description = S("Fish (clownfish)"),
image = "animal_materials_meat_raw.png", image = "animal_materials_meat_raw.png",
on_use = minetest.item_eat(1), on_use = minetest.item_eat(1),
groups = { meat=1, eatable=1 }, groups = { meat=1, eatable=1 },
stack_max=25 stack_max=25
}) })
-- =================================================================== -- ===================================================================
@ -214,9 +210,9 @@ minetest.register_craftitem(":animal_materials:fish_clownfish", {
-- --
minetest.register_craftitem(":animal_materials:feather", { minetest.register_craftitem(":animal_materials:feather", {
description = S("Feather"), description = S("Feather"),
image = "animal_materials_feather.png", image = "animal_materials_feather.png",
stack_max=25 stack_max=25
}) })
-- =================================================================== -- ===================================================================
@ -224,11 +220,11 @@ minetest.register_craftitem(":animal_materials:feather", {
-- --
minetest.register_craftitem(":animal_materials:milk", { minetest.register_craftitem(":animal_materials:milk", {
description = S("Milk"), description = S("Milk"),
image = "animal_materials_milk.png", image = "animal_materials_milk.png",
on_use = minetest.item_eat(1), on_use = minetest.item_eat(1),
groups = { eatable=1 }, groups = { eatable=1 },
stack_max=10 stack_max=10
}) })
-- =================================================================== -- ===================================================================
@ -236,45 +232,45 @@ minetest.register_craftitem(":animal_materials:milk", {
-- --
minetest.register_craftitem(":animal_materials:egg", { minetest.register_craftitem(":animal_materials:egg", {
description = S("Egg"), description = S("Egg"),
image = "animal_materials_egg.png", image = "animal_materials_egg.png",
stack_max=10 stack_max=10
}) })
minetest.register_craftitem(":animal_materials:egg_big", { minetest.register_craftitem(":animal_materials:egg_big", {
description = S("Egg (big)"), description = S("Egg (big)"),
image = "animal_materials_egg_big.png", image = "animal_materials_egg_big.png",
stack_max=5 stack_max=5
}) })
animal_materialsdata["animal_materials_egg"] = { animal_materialsdata["animal_materials_egg"] = {
graphics_3d = { graphics_3d = {
visual = "mesh", visual = "mesh",
mesh = "animal_materials_egg_ent.b3d", mesh = "animal_materials_egg_ent.b3d",
textures = { "animal_materials_egg_ent_mesh.png" }, textures = { "animal_materials_egg_ent_mesh.png" },
collisionbox = { -0.12,-0.125,-0.12,0.12,0.125,0.12 }, collisionbox = { -0.12,-0.125,-0.12,0.12,0.125,0.12 },
visual_size = {x=1,y=1,z=1}, visual_size = {x=1,y=1,z=1},
} }
} }
animal_materialsdata["animal_materials_egg_big"] = { animal_materialsdata["animal_materials_egg_big"] = {
graphics_3d = { graphics_3d = {
visual = "mesh", visual = "mesh",
mesh = "animal_materials_egg_ent.b3d", mesh = "animal_materials_egg_ent.b3d",
textures = { "animal_materials_egg_ent_mesh.png" }, textures = { "animal_materials_egg_ent_mesh.png" },
collisionbox = { -0.24,-0.25,-0.24,0.24,0.25,0.24 }, collisionbox = { -0.24,-0.25,-0.24,0.24,0.25,0.24 },
visual_size = {x=2,y=2,z=2}, visual_size = {x=2,y=2,z=2},
} }
} }
-- =================================================================== -- ===================================================================
-- bone -- bone
-- --
minetest.register_craftitem(":animal_materials:bone", { minetest.register_craftitem(":animal_materials:bone", {
description = S("Bone"), description = S("Bone"),
image = "animal_materials_bone.png", image = "animal_materials_bone.png",
stack_max=25 stack_max=25
}) })
-- =================================================================== -- ===================================================================
@ -284,22 +280,21 @@ minetest.register_craftitem(":animal_materials:bone", {
-- =================================================================== -- ===================================================================
minetest.register_craftitem(":animal_materials:fur", { minetest.register_craftitem(":animal_materials:fur", {
description = S("Fur"), description = S("Fur"),
image = "animal_materials_fur.png", image = "animal_materials_fur.png",
stack_max=25 stack_max=25
}) })
minetest.register_craftitem(":animal_materials:fur_deer", { minetest.register_craftitem(":animal_materials:fur_deer", {
description = S("Deer fur"), description = S("Deer fur"),
image = "animal_materials_deer_fur.png", image = "animal_materials_deer_fur.png",
stack_max=10 stack_max=10
}) })
minetest.register_craftitem(":animal_materials:coat_cattle", { minetest.register_craftitem(":animal_materials:coat_cattle", {
description = S("Cattle coat"), description = S("Cattle coat"),
image = "animal_materials_cattle_coat.png", image = "animal_materials_cattle_coat.png",
stack_max=10 stack_max=10
}) })
-- =================================================================== -- ===================================================================
@ -307,61 +302,61 @@ minetest.register_craftitem(":animal_materials:coat_cattle", {
-- --
minetest.register_craftitem(":animal_materials:antlers", { minetest.register_craftitem(":animal_materials:antlers", {
description = S("Antlers"), description = S("Antlers"),
image = "animal_materials_deer_horns.png", image = "animal_materials_antlers.png",
stack_max=20 stack_max=20
}) })
minetest.register_alias("animal_materials:deer_horns", "animal_materials:antlers") minetest.register_alias("animal_materials:deer_horns", "animal_materials:antlers")
minetest.register_craftitem(":animal_materials:ivory", { minetest.register_craftitem(":animal_materials:ivory", {
description = S("Ivory"), description = S("Ivory"),
image = "animal_materials_ivory.png", image = "animal_materials_ivory.png",
stack_max=20 stack_max=20
}) })
-- =================================================================== -- ===================================================================
-- scale -- scale
minetest.register_craftitem(":animal_materials:scale_golden", { minetest.register_craftitem(":animal_materials:scale_golden", {
description = S("Scale (golden)"), description = S("Scale (golden)"),
image = "animal_materials_scale_golden.png", image = "animal_materials_scale_golden.png",
stack_max=25 stack_max=25
}) })
minetest.register_craftitem(":animal_materials:scale_white", { minetest.register_craftitem(":animal_materials:scale_white", {
description = S("Scale (white)"), description = S("Scale (white)"),
image = "animal_materials_scale_white.png", image = "animal_materials_scale_white.png",
stack_max=25 stack_max=25
}) })
minetest.register_craftitem(":animal_materials:scale_grey", { minetest.register_craftitem(":animal_materials:scale_grey", {
description = S("Scale (grey)"), description = S("Scale (grey)"),
image = "animal_materials_scale_grey.png", image = "animal_materials_scale_grey.png",
stack_max=25 stack_max=25
}) })
minetest.register_craftitem(":animal_materials:scale_blue", { minetest.register_craftitem(":animal_materials:scale_blue", {
description = S("Scale (blue)"), description = S("Scale (blue)"),
image = "animal_materials_scale_blue.png", image = "animal_materials_scale_blue.png",
stack_max=25 stack_max=25
}) })
-- =================================================================== -- ===================================================================
-- recipes -- recipes
minetest.register_craft({ minetest.register_craft({
output = "wool:white", output = "wool:white",
recipe = { recipe = {
{"animal_materials:feather","animal_materials:feather","animal_materials:feather"}, {"animal_materials:feather","animal_materials:feather","animal_materials:feather"},
{"animal_materials:feather", "animal_materials:feather","animal_materials:feather"}, {"animal_materials:feather", "animal_materials:feather","animal_materials:feather"},
{"animal_materials:feather","animal_materials:feather","animal_materials:feather"}, {"animal_materials:feather","animal_materials:feather","animal_materials:feather"},
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "animal_materials:contract", output = "animal_materials:contract",
recipe = { recipe = {
{"default:paper"}, {"default:paper"},
{"default:paper"}, {"default:paper"},
} }
}) })

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

@ -1,18 +1,13 @@
-- Deer. Descended from Sapier version. -- Elk. Descended from Sapier version.
-- =================================================================== -- ===================================================================
-- Mob Framework Mod by Sapier -- License for "elk" media.
-- --
-- You may copy, use, modify or do nearly anything except removing this -- You may copy, use, modify or do nearly anything but remove this
-- copyright notice. Of course, you are NOT allow to pretend you have -- copyright notice. Of course, you're not allowed to pretend you've
-- written it. -- created or written the Sapier-specific pieces.
-- CC-BY-SA 3.0. Attribution: sapier.
-- --
--! @file init.lua -- CC-BY-SA 3.0. Attribution: Sapier and Poikilos.
--! @brief deer implementation
--! @copyright Sapier
--! @author Sapier
--! @date 2013-01-27
-- =================================================================== -- ===================================================================
@ -47,7 +42,7 @@ mobs_param = {
} , } ,
spawn_by = { spawn_by = {
"group:grass" , "default:pine_tree" ,
"flowers:mushroom_brown" , "flowers:mushroom_brown" ,
} , } ,
@ -91,17 +86,18 @@ mobs_param.core_param = {
water_damage = 0 , water_damage = 0 ,
collisionbox = { -0.70, -1.10, -0.70, 0.70, 0.80, 0.70 } , collisionbox = { -0.70, -1.10, -0.70, 0.70, 0.80, 0.70 } ,
mesh = msname .. ".b3d" , mesh = msname .. ".b3d" ,
visual = "mesh" ,
textures = { textures = {
{ msname .. "_male.png" }, { msname .. "_male_mesh.png" } ,
{ msname .. "_female.png"} { msname .. "_female_mesh.png" } ,
}, },
visual = "mesh" ,
sounds = { sounds = {
}, },
follow = { "default:apple", "farming:potato" } , follow = { "default:apple", "farming:potato" } ,
drops = { drops = {
{ {
@ -109,11 +105,11 @@ mobs_param.core_param = {
chance = 1, min = 1, max = 1 , chance = 1, min = 1, max = 1 ,
} , } ,
{ {
name = "animal_materials:antlers" , name = "animal_materials:antlers" ,
chance = 1, min = 1, max = 1 , chance = 1, min = 1, max = 1 ,
} , } ,
{ {
name = "animal_materials:fur_elk" , name = "animal_materials:fur_deer" ,
chance = 4, min = 1, max = 1 , chance = 4, min = 1, max = 1 ,
} , } ,
{ {
@ -143,7 +139,6 @@ mobs_param.core_param = {
-- =================================================================== -- ===================================================================
codermobs.setup_mob() codermobs.setup_mob()
codermobs.log_done() codermobs.log_done()
-- =================================================================== -- ===================================================================

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

@ -10,10 +10,14 @@ local enable_moontest =
minetest.setting_getbool ("enable_moontest" ) minetest.setting_getbool ("enable_moontest" )
-- =================================================================== -- ===================================================================
-- These must come first.
dofile (mp .. "/globals.lua" ) dofile (mp .. "/globals.lua" )
dofile (mp .. "/util.lua" ) dofile (mp .. "/util.lua" )
dofile (mp .. "/animal_materials.lua" ) dofile (mp .. "/animal_materials.lua" )
dofile (mp .. "/vombie_flame.lua" )
-- ===================================================================
dofile (mp .. "/badger.lua" ) dofile (mp .. "/badger.lua" )
dofile (mp .. "/bat.lua" ) dofile (mp .. "/bat.lua" )
@ -27,52 +31,52 @@ dofile (mp .. "/bunny.lua" )
dofile (mp .. "/butterfly.lua" ) dofile (mp .. "/butterfly.lua" )
dofile (mp .. "/cacodemon.lua" ) dofile (mp .. "/cacodemon.lua" )
dofile (mp .. "/car.lua" )
dofile (mp .. "/chicken.lua" ) dofile (mp .. "/chicken.lua" )
dofile (mp .. "/cow.lua" ) dofile (mp .. "/cow.lua" )
dofile (mp .. "/sacreeper.lua" )
dofile (mp .. "/cyberdemon.lua" ) dofile (mp .. "/cyberdemon.lua" )
-- dofile (mp .. "/deer.lua" )
dofile (mp .. "/elk.lua" )
mobs:alias_mob("codermobs:deer", "codermobs:elk")
dofile (mp .. "/dirt_monster.lua" ) dofile (mp .. "/dirt_monster.lua" )
dofile (mp .. "/dog.lua" ) dofile (mp .. "/dog.lua" )
dofile (mp .. "/elephant.lua" ) dofile (mp .. "/elephant.lua" )
dofile (mp .. "/elk.lua" )
dofile (mp .. "/farhorse.lua" ) dofile (mp .. "/farhorse.lua" )
dofile (mp .. "/flying_pig.lua" ) dofile (mp .. "/flying_pig.lua" )
dofile (mp .. "/ghost.lua" ) dofile (mp .. "/ghost.lua" )
dofile (mp .. "/goat.lua" ) dofile (mp .. "/goat.lua" )
dofile (mp .. "/hedgehog.lua" ) dofile (mp .. "/hedgehog.lua" )
dofile (mp .. "/jeraf.lua" ) dofile (mp .. "/jeraf.lua" )
dofile (mp .. "/kitten.lua" ) dofile (mp .. "/kitten.lua" )
dofile (mp .. "/lava_flan.lua" ) dofile (mp .. "/lava_flan.lua" )
dofile (mp .. "/lostsoul.lua" ) dofile (mp .. "/lostsoul.lua" )
dofile (mp .. "/lott_spider.lua" ) dofile (mp .. "/lott_spider.lua" )
dofile (mp .. "/mammoth.lua" ) dofile (mp .. "/mammoth.lua" )
dofile (mp .. "/mdskeleton.lua" )
dofile (mp .. "/oerkki.lua" ) dofile (mp .. "/oerkki.lua" )
dofile (mp .. "/ostrich.lua" ) dofile (mp .. "/ostrich.lua" )
dofile (mp .. "/owl.lua" ) dofile (mp .. "/owl.lua" )
dofile (mp .. "/panda.lua" ) dofile (mp .. "/panda.lua" )
dofile (mp .. "/penguin.lua" ) dofile (mp .. "/penguin.lua" )
dofile (mp .. "/polar_bear.lua" ) dofile (mp .. "/polar_bear.lua" )
dofile (mp .. "/rat.lua" ) dofile (mp .. "/rat.lua" )
dofile (mp .. "/rat_better.lua" ) dofile (mp .. "/rat_better.lua" )
dofile (mp .. "/santa.lua" ) dofile (mp .. "/santa.lua" )
dofile (mp .. "/sheep.lua" ) dofile (mp .. "/sheep.lua" )
dofile (mp .. "/silverfish.lua" ) dofile (mp .. "/silverfish.lua" )
dofile (mp .. "/snake_garter.lua" ) dofile (mp .. "/snake_garter.lua" )
dofile (mp .. "/snake_ice.lua" ) dofile (mp .. "/snake_ice.lua" )
dofile (mp .. "/snowman.lua" ) dofile (mp .. "/snowman.lua" )
dofile (mp .. "/tree_monster.lua" ) dofile (mp .. "/tree_monster.lua" )
dofile (mp .. "/vombie.lua" )
dofile (mp .. "/warthog.lua" ) dofile (mp .. "/warthog.lua" )
dofile (mp .. "/wolf.lua" ) dofile (mp .. "/wolf.lua" )
dofile (mp .. "/zebra.lua" ) dofile (mp .. "/zebra.lua" )
-- Moon Cow must be defined after regular cow. -- Moon Cow must be defined after regular cow.

0
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female.png → patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female_mesh.png

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male.png → patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male_mesh.png

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Loading…
Cancel
Save