diff --git a/README.txt b/README.txt index c84557c..d9e7a6a 100644 --- a/README.txt +++ b/README.txt @@ -1,5 +1,8 @@ ------Mushrooms------ — riesenpilz_stem.png (edited with gimp) from gamiano.de +— glowshroom and lavashroom from bas080's plants mod (WTFPL) +— parasol mushroom from a mod called mushrooms (WTFPL) +— "45" mushrooms from r01922090's mush45 mod (WTFPL) TODO: — add giant nethershroom diff --git a/init.lua b/init.lua index 563a131..925a584 100644 --- a/init.lua +++ b/init.lua @@ -430,12 +430,27 @@ local BOX = { { 2/16, -1/16, -2/16, 4/16, 1/16, 2/16} }, PARASOL = { - {-1/16, -8/16, -1/16, 1/16, 0, 1/16}, + {-1/16, -8/16, -1/16, 1/16, 0, 1/16}, {-2/16, -6/16, -2/16, 2/16, -5/16, 2/16}, {-5/16, -4/16, -5/16, 5/16, -3/16, 5/16}, {-4/16, -3/16, -4/16, 4/16, -2/16, 4/16}, {-3/16, -2/16, -3/16, 3/16, -1/16, 3/16} - } + }, + RED45 = { + {-1/16, -0.5, -1/16, 1/16, 1/8, 1/16}, + {-3/16, 1/8, -3/16, 3/16, 1/4, 3/16}, + {-5/16, -1/4, -5/16, -1/16, 1/8, -1/16}, + {1/16, -1/4, -5/16, 5/16, 1/8, -1/16}, + {-5/16, -1/4, 1/16, -1/16, 1/8, 5/16}, + {1/16, -1/4, 1/16, 5/16, 1/8, 5/16} + }, + BROWN45 = { + {-1/16, -0.5, -1/16, 1/16, 1/16, 1/16}, + {-3/8, 1/8, -7/16, 3/8, 1/4, 7/16}, + {-7/16, 1/8, -3/8, 7/16, 1/4, 3/8}, + {-3/8, 1/4, -3/8, 3/8, 5/16, 3/8}, + {-3/8, 1/16, -3/8, 3/8, 1/8, 3/8} + }, } @@ -447,6 +462,8 @@ local mushrooms_list = { {"glowshroom", "Glowshroom", BOX.GLOWSHROOM}, {"nether_shroom", "Nether Mushroom", BOX.NETHER_SHROOM, 6}, {"parasol", "Parasol Mushroom", BOX.PARASOL}, + {"red45", "45 Brown Mushroom", BOX.RED45}, + {"brown45", "45 Red Mushroom", BOX.BROWN45}, } for _,i in ipairs(mushrooms_list) do diff --git a/rest/mush45_b.png b/rest/mush45_b.png new file mode 100644 index 0000000..cd5bca3 Binary files /dev/null and b/rest/mush45_b.png differ diff --git a/rest/mush45_b0.png b/rest/mush45_b0.png new file mode 100644 index 0000000..91b7ec9 Binary files /dev/null and b/rest/mush45_b0.png differ diff --git a/rest/mush45_b1.png b/rest/mush45_b1.png new file mode 100644 index 0000000..2c5c135 Binary files /dev/null and b/rest/mush45_b1.png differ diff --git a/rest/mush45_b2.png b/rest/mush45_b2.png new file mode 100644 index 0000000..0c266bf Binary files /dev/null and b/rest/mush45_b2.png differ diff --git a/rest/mush45_bm.png b/rest/mush45_bm.png new file mode 100644 index 0000000..d4e8d2e Binary files /dev/null and b/rest/mush45_bm.png differ diff --git a/rest/mush45_bm2.png b/rest/mush45_bm2.png new file mode 100644 index 0000000..b1bbbda Binary files /dev/null and b/rest/mush45_bm2.png differ diff --git a/rest/mush45_bm3.png b/rest/mush45_bm3.png new file mode 100644 index 0000000..0a8596d Binary files /dev/null and b/rest/mush45_bm3.png differ diff --git a/rest/mush45_bm4.png b/rest/mush45_bm4.png new file mode 100644 index 0000000..830285b Binary files /dev/null and b/rest/mush45_bm4.png differ diff --git a/rest/mush45_meal.png b/rest/mush45_meal.png new file mode 100644 index 0000000..ba9799d Binary files /dev/null and b/rest/mush45_meal.png differ diff --git a/rest/mush45_r.png b/rest/mush45_r.png new file mode 100644 index 0000000..96345d9 Binary files /dev/null and b/rest/mush45_r.png differ diff --git a/rest/mush45_r0.png b/rest/mush45_r0.png new file mode 100644 index 0000000..03b39b7 Binary files /dev/null and b/rest/mush45_r0.png differ diff --git a/rest/mush45_r1.png b/rest/mush45_r1.png new file mode 100644 index 0000000..4a56801 Binary files /dev/null and b/rest/mush45_r1.png differ diff --git a/rest/mush45_r2.png b/rest/mush45_r2.png new file mode 100644 index 0000000..9dcdeef Binary files /dev/null and b/rest/mush45_r2.png differ diff --git a/rest/mush45_rm.png b/rest/mush45_rm.png new file mode 100644 index 0000000..bc02d65 Binary files /dev/null and b/rest/mush45_rm.png differ diff --git a/rest/mush45_rm2.png b/rest/mush45_rm2.png new file mode 100644 index 0000000..648195e Binary files /dev/null and b/rest/mush45_rm2.png differ diff --git a/rest/mush45_rm3.png b/rest/mush45_rm3.png new file mode 100644 index 0000000..60f2d27 Binary files /dev/null and b/rest/mush45_rm3.png differ diff --git a/rest/mush45_rm4.png b/rest/mush45_rm4.png new file mode 100644 index 0000000..b222b06 Binary files /dev/null and b/rest/mush45_rm4.png differ diff --git a/textures/riesenpilz_brown45_bottom.png b/textures/riesenpilz_brown45_bottom.png new file mode 100644 index 0000000..cd5bca3 Binary files /dev/null and b/textures/riesenpilz_brown45_bottom.png differ diff --git a/textures/riesenpilz_brown45_side.png b/textures/riesenpilz_brown45_side.png new file mode 100644 index 0000000..cd5bca3 Binary files /dev/null and b/textures/riesenpilz_brown45_side.png differ diff --git a/textures/riesenpilz_brown45_top.png b/textures/riesenpilz_brown45_top.png new file mode 100644 index 0000000..cd5bca3 Binary files /dev/null and b/textures/riesenpilz_brown45_top.png differ diff --git a/textures/riesenpilz_red45_bottom.png b/textures/riesenpilz_red45_bottom.png new file mode 100644 index 0000000..04e9589 Binary files /dev/null and b/textures/riesenpilz_red45_bottom.png differ diff --git a/textures/riesenpilz_red45_side.png b/textures/riesenpilz_red45_side.png new file mode 100644 index 0000000..96345d9 Binary files /dev/null and b/textures/riesenpilz_red45_side.png differ diff --git a/textures/riesenpilz_red45_top.png b/textures/riesenpilz_red45_top.png new file mode 100644 index 0000000..789f695 Binary files /dev/null and b/textures/riesenpilz_red45_top.png differ