From 4db9b3076dd368939ef016d77c638bfa997752a4 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Thu, 24 Jan 2013 23:22:46 -0500 Subject: Modified tree generation and sapling growth calls to comply with new plantlife API In addition to that, there have been numerous other, smaller changes: * Tweaked palm tree model to add coconuts * Tweaked size of all "fruit" items (really just cones). Rotated their images in inventory and wield. * Changed descriptions of sideways trunks to "Sideways Xxxx Trunk" * Tweaked names of jungle tree leaves to be Jungle Tree Leaves (Xxxx) * Moved jungletree trunk, sideways trunk, sapling into nodedef loop * Renamed trunks and trunk tops to bear "_trunk" and "_trunk_top" in their filenames. * Added copies of default jungle tree trunks and tops, with naming similar to the above change. * Re-arranged init.lua to put all leaves/needles definitions in one place. * Deleted some outdated textures. * combined leaves definitions back into main loop with an exception for jungletrees (if that one is called for, it is skipped, because leaves for those trees are explicitly defined later) * Made all leaves drop saplings when dug, 1/20 chance. * Added leafdecay radii to main tree table but disabled the use of it. To be implemented in the future. Disabled leaf decay for firs. --- textures/moretrees_apple_tree.png | Bin 754 -> 0 bytes textures/moretrees_apple_tree_top.png | Bin 800 -> 0 bytes textures/moretrees_apple_tree_trunk.png | Bin 0 -> 754 bytes textures/moretrees_apple_tree_trunk_top.png | Bin 0 -> 800 bytes textures/moretrees_beech.png | Bin 706 -> 0 bytes textures/moretrees_beech_top.png | Bin 843 -> 0 bytes textures/moretrees_beech_trunk.png | Bin 0 -> 706 bytes textures/moretrees_beech_trunk_top.png | Bin 0 -> 843 bytes textures/moretrees_birch.png | Bin 989 -> 0 bytes textures/moretrees_birch_top.png | Bin 830 -> 0 bytes textures/moretrees_birch_trunk.png | Bin 0 -> 989 bytes textures/moretrees_birch_trunk_top.png | Bin 0 -> 830 bytes textures/moretrees_fir_trunk_reversed.png | Bin 721 -> 0 bytes textures/moretrees_fir_trunk_top.png | Bin 0 -> 768 bytes textures/moretrees_fir_trunktop.png | Bin 768 -> 0 bytes textures/moretrees_jungletree_bark.png | Bin 705 -> 0 bytes textures/moretrees_jungletree_trunk.png | Bin 0 -> 751 bytes textures/moretrees_jungletree_trunk_top.png | Bin 0 -> 865 bytes textures/moretrees_oak.png | Bin 816 -> 0 bytes textures/moretrees_oak_top.png | Bin 792 -> 0 bytes textures/moretrees_oak_trunk.png | Bin 0 -> 816 bytes textures/moretrees_oak_trunk_top.png | Bin 0 -> 792 bytes textures/moretrees_palm.png | Bin 640 -> 0 bytes textures/moretrees_palm_top.png | Bin 738 -> 0 bytes textures/moretrees_palm_trunk.png | Bin 0 -> 640 bytes textures/moretrees_palm_trunk_top.png | Bin 0 -> 738 bytes textures/moretrees_pine.png | Bin 872 -> 0 bytes textures/moretrees_pine_top.png | Bin 777 -> 0 bytes textures/moretrees_pine_trunk.png | Bin 0 -> 872 bytes textures/moretrees_pine_trunk_top.png | Bin 0 -> 777 bytes textures/moretrees_rubber_tree.png | Bin 808 -> 0 bytes textures/moretrees_rubber_tree_top.png | Bin 791 -> 0 bytes textures/moretrees_rubber_tree_trunk.png | Bin 0 -> 808 bytes textures/moretrees_rubber_tree_trunk_top.png | Bin 0 -> 791 bytes textures/moretrees_sequoia.png | Bin 508 -> 0 bytes textures/moretrees_sequoia_top.png | Bin 787 -> 0 bytes textures/moretrees_sequoia_trunk.png | Bin 0 -> 508 bytes textures/moretrees_sequoia_trunk_top.png | Bin 0 -> 787 bytes textures/moretrees_spruce.png | Bin 699 -> 0 bytes textures/moretrees_spruce_top.png | Bin 738 -> 0 bytes textures/moretrees_spruce_trunk.png | Bin 0 -> 699 bytes textures/moretrees_spruce_trunk_top.png | Bin 0 -> 738 bytes textures/moretrees_willow.png | Bin 510 -> 0 bytes textures/moretrees_willow_top.png | Bin 805 -> 0 bytes textures/moretrees_willow_trunk.png | Bin 0 -> 510 bytes textures/moretrees_willow_trunk_top.png | Bin 0 -> 805 bytes 46 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 textures/moretrees_apple_tree.png delete mode 100644 textures/moretrees_apple_tree_top.png create mode 100644 textures/moretrees_apple_tree_trunk.png create mode 100644 textures/moretrees_apple_tree_trunk_top.png delete mode 100755 textures/moretrees_beech.png delete mode 100755 textures/moretrees_beech_top.png create mode 100755 textures/moretrees_beech_trunk.png create mode 100755 textures/moretrees_beech_trunk_top.png delete mode 100644 textures/moretrees_birch.png delete mode 100644 textures/moretrees_birch_top.png create mode 100644 textures/moretrees_birch_trunk.png create mode 100644 textures/moretrees_birch_trunk_top.png delete mode 100644 textures/moretrees_fir_trunk_reversed.png create mode 100644 textures/moretrees_fir_trunk_top.png delete mode 100644 textures/moretrees_fir_trunktop.png delete mode 100644 textures/moretrees_jungletree_bark.png create mode 100644 textures/moretrees_jungletree_trunk.png create mode 100644 textures/moretrees_jungletree_trunk_top.png delete mode 100644 textures/moretrees_oak.png delete mode 100644 textures/moretrees_oak_top.png create mode 100644 textures/moretrees_oak_trunk.png create mode 100644 textures/moretrees_oak_trunk_top.png delete mode 100644 textures/moretrees_palm.png delete mode 100644 textures/moretrees_palm_top.png create mode 100644 textures/moretrees_palm_trunk.png create mode 100644 textures/moretrees_palm_trunk_top.png delete mode 100644 textures/moretrees_pine.png delete mode 100644 textures/moretrees_pine_top.png create mode 100644 textures/moretrees_pine_trunk.png create mode 100644 textures/moretrees_pine_trunk_top.png delete mode 100644 textures/moretrees_rubber_tree.png delete mode 100644 textures/moretrees_rubber_tree_top.png create mode 100644 textures/moretrees_rubber_tree_trunk.png create mode 100644 textures/moretrees_rubber_tree_trunk_top.png delete mode 100644 textures/moretrees_sequoia.png delete mode 100644 textures/moretrees_sequoia_top.png create mode 100644 textures/moretrees_sequoia_trunk.png create mode 100644 textures/moretrees_sequoia_trunk_top.png delete mode 100644 textures/moretrees_spruce.png delete mode 100644 textures/moretrees_spruce_top.png create mode 100644 textures/moretrees_spruce_trunk.png create mode 100644 textures/moretrees_spruce_trunk_top.png delete mode 100644 textures/moretrees_willow.png delete mode 100644 textures/moretrees_willow_top.png create mode 100644 textures/moretrees_willow_trunk.png create mode 100644 textures/moretrees_willow_trunk_top.png (limited to 'textures') diff --git a/textures/moretrees_apple_tree.png b/textures/moretrees_apple_tree.png deleted file mode 100644 index 7f2041d..0000000 Binary files a/textures/moretrees_apple_tree.png and /dev/null differ diff --git a/textures/moretrees_apple_tree_top.png b/textures/moretrees_apple_tree_top.png deleted file mode 100644 index 2aa3cd2..0000000 Binary files a/textures/moretrees_apple_tree_top.png and /dev/null differ diff --git a/textures/moretrees_apple_tree_trunk.png b/textures/moretrees_apple_tree_trunk.png new file mode 100644 index 0000000..7f2041d Binary files /dev/null and b/textures/moretrees_apple_tree_trunk.png differ diff --git a/textures/moretrees_apple_tree_trunk_top.png b/textures/moretrees_apple_tree_trunk_top.png new file mode 100644 index 0000000..2aa3cd2 Binary files /dev/null and b/textures/moretrees_apple_tree_trunk_top.png differ diff --git a/textures/moretrees_beech.png b/textures/moretrees_beech.png deleted file mode 100755 index ab12501..0000000 Binary files a/textures/moretrees_beech.png and /dev/null differ diff --git a/textures/moretrees_beech_top.png b/textures/moretrees_beech_top.png deleted file mode 100755 index 6d62006..0000000 Binary files a/textures/moretrees_beech_top.png and /dev/null differ diff --git a/textures/moretrees_beech_trunk.png b/textures/moretrees_beech_trunk.png new file mode 100755 index 0000000..ab12501 Binary files /dev/null and b/textures/moretrees_beech_trunk.png differ diff --git a/textures/moretrees_beech_trunk_top.png b/textures/moretrees_beech_trunk_top.png new file mode 100755 index 0000000..6d62006 Binary files /dev/null and b/textures/moretrees_beech_trunk_top.png differ diff --git a/textures/moretrees_birch.png b/textures/moretrees_birch.png deleted file mode 100644 index 3da8013..0000000 Binary files a/textures/moretrees_birch.png and /dev/null differ diff --git a/textures/moretrees_birch_top.png b/textures/moretrees_birch_top.png deleted file mode 100644 index 7ca4aa2..0000000 Binary files a/textures/moretrees_birch_top.png and /dev/null differ diff --git a/textures/moretrees_birch_trunk.png b/textures/moretrees_birch_trunk.png new file mode 100644 index 0000000..3da8013 Binary files /dev/null and b/textures/moretrees_birch_trunk.png differ diff --git a/textures/moretrees_birch_trunk_top.png b/textures/moretrees_birch_trunk_top.png new file mode 100644 index 0000000..7ca4aa2 Binary files /dev/null and b/textures/moretrees_birch_trunk_top.png differ diff --git a/textures/moretrees_fir_trunk_reversed.png b/textures/moretrees_fir_trunk_reversed.png deleted file mode 100644 index 0730e31..0000000 Binary files a/textures/moretrees_fir_trunk_reversed.png and /dev/null differ diff --git a/textures/moretrees_fir_trunk_top.png b/textures/moretrees_fir_trunk_top.png new file mode 100644 index 0000000..4f21401 Binary files /dev/null and b/textures/moretrees_fir_trunk_top.png differ diff --git a/textures/moretrees_fir_trunktop.png b/textures/moretrees_fir_trunktop.png deleted file mode 100644 index 4f21401..0000000 Binary files a/textures/moretrees_fir_trunktop.png and /dev/null differ diff --git a/textures/moretrees_jungletree_bark.png b/textures/moretrees_jungletree_bark.png deleted file mode 100644 index d826fdd..0000000 Binary files a/textures/moretrees_jungletree_bark.png and /dev/null differ diff --git a/textures/moretrees_jungletree_trunk.png b/textures/moretrees_jungletree_trunk.png new file mode 100644 index 0000000..d8c2635 Binary files /dev/null and b/textures/moretrees_jungletree_trunk.png differ diff --git a/textures/moretrees_jungletree_trunk_top.png b/textures/moretrees_jungletree_trunk_top.png new file mode 100644 index 0000000..805272a Binary files /dev/null and b/textures/moretrees_jungletree_trunk_top.png differ diff --git a/textures/moretrees_oak.png b/textures/moretrees_oak.png deleted file mode 100644 index 431695e..0000000 Binary files a/textures/moretrees_oak.png and /dev/null differ diff --git a/textures/moretrees_oak_top.png b/textures/moretrees_oak_top.png deleted file mode 100644 index daeb336..0000000 Binary files a/textures/moretrees_oak_top.png and /dev/null differ diff --git a/textures/moretrees_oak_trunk.png b/textures/moretrees_oak_trunk.png new file mode 100644 index 0000000..431695e Binary files /dev/null and b/textures/moretrees_oak_trunk.png differ diff --git a/textures/moretrees_oak_trunk_top.png b/textures/moretrees_oak_trunk_top.png new file mode 100644 index 0000000..daeb336 Binary files /dev/null and b/textures/moretrees_oak_trunk_top.png differ diff --git a/textures/moretrees_palm.png b/textures/moretrees_palm.png deleted file mode 100644 index c618419..0000000 Binary files a/textures/moretrees_palm.png and /dev/null differ diff --git a/textures/moretrees_palm_top.png b/textures/moretrees_palm_top.png deleted file mode 100644 index a2ec676..0000000 Binary files a/textures/moretrees_palm_top.png and /dev/null differ diff --git a/textures/moretrees_palm_trunk.png b/textures/moretrees_palm_trunk.png new file mode 100644 index 0000000..c618419 Binary files /dev/null and b/textures/moretrees_palm_trunk.png differ diff --git a/textures/moretrees_palm_trunk_top.png b/textures/moretrees_palm_trunk_top.png new file mode 100644 index 0000000..a2ec676 Binary files /dev/null and b/textures/moretrees_palm_trunk_top.png differ diff --git a/textures/moretrees_pine.png b/textures/moretrees_pine.png deleted file mode 100644 index 0aa9bfd..0000000 Binary files a/textures/moretrees_pine.png and /dev/null differ diff --git a/textures/moretrees_pine_top.png b/textures/moretrees_pine_top.png deleted file mode 100644 index 1584caf..0000000 Binary files a/textures/moretrees_pine_top.png and /dev/null differ diff --git a/textures/moretrees_pine_trunk.png b/textures/moretrees_pine_trunk.png new file mode 100644 index 0000000..0aa9bfd Binary files /dev/null and b/textures/moretrees_pine_trunk.png differ diff --git a/textures/moretrees_pine_trunk_top.png b/textures/moretrees_pine_trunk_top.png new file mode 100644 index 0000000..1584caf Binary files /dev/null and b/textures/moretrees_pine_trunk_top.png differ diff --git a/textures/moretrees_rubber_tree.png b/textures/moretrees_rubber_tree.png deleted file mode 100644 index 08067ef..0000000 Binary files a/textures/moretrees_rubber_tree.png and /dev/null differ diff --git a/textures/moretrees_rubber_tree_top.png b/textures/moretrees_rubber_tree_top.png deleted file mode 100644 index dc26a7a..0000000 Binary files a/textures/moretrees_rubber_tree_top.png and /dev/null differ diff --git a/textures/moretrees_rubber_tree_trunk.png b/textures/moretrees_rubber_tree_trunk.png new file mode 100644 index 0000000..08067ef Binary files /dev/null and b/textures/moretrees_rubber_tree_trunk.png differ diff --git a/textures/moretrees_rubber_tree_trunk_top.png b/textures/moretrees_rubber_tree_trunk_top.png new file mode 100644 index 0000000..dc26a7a Binary files /dev/null and b/textures/moretrees_rubber_tree_trunk_top.png differ diff --git a/textures/moretrees_sequoia.png b/textures/moretrees_sequoia.png deleted file mode 100644 index b0e5536..0000000 Binary files a/textures/moretrees_sequoia.png and /dev/null differ diff --git a/textures/moretrees_sequoia_top.png b/textures/moretrees_sequoia_top.png deleted file mode 100644 index 481bbdf..0000000 Binary files a/textures/moretrees_sequoia_top.png and /dev/null differ diff --git a/textures/moretrees_sequoia_trunk.png b/textures/moretrees_sequoia_trunk.png new file mode 100644 index 0000000..b0e5536 Binary files /dev/null and b/textures/moretrees_sequoia_trunk.png differ diff --git a/textures/moretrees_sequoia_trunk_top.png b/textures/moretrees_sequoia_trunk_top.png new file mode 100644 index 0000000..481bbdf Binary files /dev/null and b/textures/moretrees_sequoia_trunk_top.png differ diff --git a/textures/moretrees_spruce.png b/textures/moretrees_spruce.png deleted file mode 100644 index 6e4e67a..0000000 Binary files a/textures/moretrees_spruce.png and /dev/null differ diff --git a/textures/moretrees_spruce_top.png b/textures/moretrees_spruce_top.png deleted file mode 100644 index 84ec816..0000000 Binary files a/textures/moretrees_spruce_top.png and /dev/null differ diff --git a/textures/moretrees_spruce_trunk.png b/textures/moretrees_spruce_trunk.png new file mode 100644 index 0000000..6e4e67a Binary files /dev/null and b/textures/moretrees_spruce_trunk.png differ diff --git a/textures/moretrees_spruce_trunk_top.png b/textures/moretrees_spruce_trunk_top.png new file mode 100644 index 0000000..84ec816 Binary files /dev/null and b/textures/moretrees_spruce_trunk_top.png differ diff --git a/textures/moretrees_willow.png b/textures/moretrees_willow.png deleted file mode 100644 index 81d7c81..0000000 Binary files a/textures/moretrees_willow.png and /dev/null differ diff --git a/textures/moretrees_willow_top.png b/textures/moretrees_willow_top.png deleted file mode 100644 index 385da0f..0000000 Binary files a/textures/moretrees_willow_top.png and /dev/null differ diff --git a/textures/moretrees_willow_trunk.png b/textures/moretrees_willow_trunk.png new file mode 100644 index 0000000..81d7c81 Binary files /dev/null and b/textures/moretrees_willow_trunk.png differ diff --git a/textures/moretrees_willow_trunk_top.png b/textures/moretrees_willow_trunk_top.png new file mode 100644 index 0000000..385da0f Binary files /dev/null and b/textures/moretrees_willow_trunk_top.png differ -- cgit v1.2.3