diff --git a/README.md b/README.md index 5531a56..bf1270f 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,10 @@ Some major changes were done to make the mod easier to maintain: ## Changes: '!' is for bugs in 2012 version that are fixed (as opposed to features that were changed/added) in this fork -* (2017-03-09) changed sun square emission from 10 to 10000 -* (2017-03-09) new textures for "white diamond": mineral, item [blend file: octagon beveled all but top and bottom by .12 offset]; for topaz: mineral +* (2017-03-11) added better placeholder textures for gems where prerendered block is not finished yet +* (2017-03-11) added new texture for emerald: mineral, item +* (2017-03-10) changed sun square emission from 10 to 100 +* (2017-03-10) new textures for "white diamond": mineral, item [blend file: octagon beveled all but top and bottom by .12 offset]; for topaz: mineral * (2017-02-19) new textures for aquamarine: mineral, block, item * (2017-02-16) Rerendered Alexandrite block&item; new textures for minerals: Alexandrite, Amethyst; collecting hd versions in etc/hd * (2017-02-16) blend file: completely reworked gem shader (blend version 2) @@ -78,7 +80,8 @@ Some major changes were done to make the mod easier to maintain: * (2017-02-10) expertmm fork starting today ## Known Issues -* Improve block textures +* Improve remaining block textures +* Make 8-bit style block textures (using default_diamond_block.png as luminance) * Make a trm for treasurer (separate mod) * Make variables based on real hardness values (but allow all birthstones to break the same types of blocks, for playability): * #of uses, dig times, and fleshy damage group value now all based on real-life hardness values (see xlsx spreadsheet for details and sources and extrapolation formulas) @@ -95,6 +98,7 @@ Some major changes were done to make the mod easier to maintain: * No arrows (planned as separate mod: birthstones_throwing) ### Future plans +* Add option in server minetest.conf to use 8-bit style block textures (based on minetest default diamond block) * Look into changes in "birthstones fixed" at https://forum.minetest.net/viewtopic.php?f=9&t=11497&hilit=birthstones * Look into overlap in stone list found in Glooptest * Make compatible with glooptest @@ -124,6 +128,7 @@ MORE but with hardness values available from 18carat.co.uk link above: ### Developer Notes xcf file has colors used for manual tinting +Reference photos: Wikipedia entries for each Gem, and http://geologynerd.tumblr.com/ (If you rotate the gems, rotation must be applied, since absorption is manually done along object z axis--see "Blender gem tutorial" link below for why) Do the following steps to re-render a block: @@ -132,13 +137,13 @@ Do the following steps to re-render a block: * Open the included Blend file in Blender and set the input nodes as follows (if there are two, set one as the input for absorption and turn that up--or experiment; ~ means wasn't plugged into any nodes): (v1L you can also tweak whether fresnel, facing, or IsTransmissionRay is Factor for "Glow Mix" node (you can also flip the inputs) (v2 you can also tweak whether Tangent, which Light Path output [and whether passes through Reduction node], or nothing [0.00] is used for Glare Mix's Factor; warped block shards can be fitted together then scaled by 1.01 on the x&z [s, shift z, 1.01]) -Name, GemColor, IOR**, Frost, Gloss, Clarity,Absorption, AbsSat, Glare Mix, GlareSat (Glare Saturation) +Name, GemColor, IOR**, Frost, Gloss, Clarity,Absorption, AbspSat, Glare Mix, GlareSat (Glare Saturation) ***Alexandrite,567274 to 63152c,1.75, ~, ~, .95, 1, 1.0, Gem:Tangent ; Block: Tangent*Reduction; Block east: 0.00, ~ ***Amethyst, ad87a6, 1.55, .5, 0, 0, 1, .5, ~, ~ ***Aquamarine, 8bdcdf, 1.564-1.596,~, ~, .95, 1, 0, Gem:PatchyNoise;, .5 -Aquamarine, 8bdcdf, 1.564-1.596,.1, 0, .5, 0, 0, ~, ~ +Aquamarine, (!8bdcdf)04A752, 1.564-1.596,.1, 0, .5, 0, 0, ~, ~ Diamond, ced7da, 2.418, 0{.1}[.01], 0[.1], 1, 0, , , -Emerald, 02552a, , , , , , +Emerald, 02552a, 1.5775-1.5835,0, .1, .99, .5, 0,,, Garnet, 78200c, , , , , , Opal, (texture), , , , , , Peridot, 85b116, , , , , , @@ -147,13 +152,15 @@ Sapphire, 163f7d, , , , , , ***Topaz, E5A55F, 1.62, .5, .5, 1.0, 0.0, 0.0 Zircon, 255f75, , , , , , [] if in brackets, value is for block version +! means not that value: though that value is apparent from a reference photo, it is apparently not the true albedo {} if in bracurly braces, value is for mineral (ore) version ** Complete IOR Lists (values averaged or used from) http://forums.cgsociety.org/archive/index.php?t-513458.html http://www.gemselect.com/gem-info/refractive-index.php *** old shader (usually Gem2, or sometimes Gem) was used as opposed to Gem3 (Frost was called Scatter, but it wasn't actually volumetric scatter in Gem shaders 1-2) -(where '-' appears in IOR column, double refraction is used [different values in each IOR value input node]) - +- where '-' appears in IOR column, double refraction is used [different values in each IOR value input node]) +Starting with emerald, block is rotated by 90 on z + Take note that this list is in alphabetical order (like birthstones-mod git 2012) for convenience, not in actual birthstone month order. * Keep default resolution of 32x32 (must be full bleed then cropped to 16x16 manually to avoid edge issues with cycles) * Render the following cameras (or experiment): North, East, Top diff --git a/etc/8bit/birthstones_mineral_emerald.png b/etc/8bit/birthstones_mineral_emerald.png new file mode 100644 index 0000000..1649485 Binary files /dev/null and b/etc/8bit/birthstones_mineral_emerald.png differ diff --git a/etc/birthstones_mineral_emerald ALPHA.png b/etc/birthstones_mineral_emerald ALPHA.png new file mode 100644 index 0000000..a0f27d3 Binary files /dev/null and b/etc/birthstones_mineral_emerald ALPHA.png differ diff --git a/etc/birthstones_mineral_emerald COLOR.png b/etc/birthstones_mineral_emerald COLOR.png new file mode 100644 index 0000000..9b35541 Binary files /dev/null and b/etc/birthstones_mineral_emerald COLOR.png differ diff --git a/etc/hd/birthstones_emerald_block_north.png b/etc/hd/birthstones_emerald_block_north.png new file mode 100644 index 0000000..7a75367 Binary files /dev/null and b/etc/hd/birthstones_emerald_block_north.png differ diff --git a/etc/hd/birthstones_mineral_emerald.png b/etc/hd/birthstones_mineral_emerald.png new file mode 100644 index 0000000..64be775 Binary files /dev/null and b/etc/hd/birthstones_mineral_emerald.png differ diff --git a/etc/minetest birthstones 2 expertmm.blend b/etc/minetest birthstones 2 expertmm.blend index 850f540..6a8e911 100644 Binary files a/etc/minetest birthstones 2 expertmm.blend and b/etc/minetest birthstones 2 expertmm.blend differ diff --git a/textures/birthstones_alexandrite_block.png b/textures/birthstones_alexandrite_block.png new file mode 100644 index 0000000..3dad68d Binary files /dev/null and b/textures/birthstones_alexandrite_block.png differ diff --git a/textures/birthstones_amethyst_block.png b/textures/birthstones_amethyst_block.png new file mode 100644 index 0000000..34d8092 Binary files /dev/null and b/textures/birthstones_amethyst_block.png differ diff --git a/textures/birthstones_aquamarine_block.png b/textures/birthstones_aquamarine_block.png new file mode 100644 index 0000000..ff9901d Binary files /dev/null and b/textures/birthstones_aquamarine_block.png differ diff --git a/textures/birthstones_diamond_block.png b/textures/birthstones_diamond_block.png index 229f453..cbc1dea 100644 Binary files a/textures/birthstones_diamond_block.png and b/textures/birthstones_diamond_block.png differ diff --git a/textures/birthstones_emerald.png b/textures/birthstones_emerald.png index a3b84dc..dd76abd 100644 Binary files a/textures/birthstones_emerald.png and b/textures/birthstones_emerald.png differ diff --git a/textures/birthstones_emerald_block.png b/textures/birthstones_emerald_block.png index e034ca4..d0ed224 100644 Binary files a/textures/birthstones_emerald_block.png and b/textures/birthstones_emerald_block.png differ diff --git a/textures/birthstones_garnet_block.png b/textures/birthstones_garnet_block.png index 82e3403..fb78c3d 100644 Binary files a/textures/birthstones_garnet_block.png and b/textures/birthstones_garnet_block.png differ diff --git a/textures/birthstones_mineral_emerald.png b/textures/birthstones_mineral_emerald.png index e3dadad..b00e3a8 100644 Binary files a/textures/birthstones_mineral_emerald.png and b/textures/birthstones_mineral_emerald.png differ diff --git a/textures/birthstones_opal_block.png b/textures/birthstones_opal_block.png index 0c5574e..bb03642 100644 Binary files a/textures/birthstones_opal_block.png and b/textures/birthstones_opal_block.png differ diff --git a/textures/birthstones_peridot_block.png b/textures/birthstones_peridot_block.png index 112f81b..4da70ba 100644 Binary files a/textures/birthstones_peridot_block.png and b/textures/birthstones_peridot_block.png differ diff --git a/textures/birthstones_ruby_block.png b/textures/birthstones_ruby_block.png index 23ffe35..8d347d1 100644 Binary files a/textures/birthstones_ruby_block.png and b/textures/birthstones_ruby_block.png differ diff --git a/textures/birthstones_sapphire_block.png b/textures/birthstones_sapphire_block.png index 3355aef..d10ae04 100644 Binary files a/textures/birthstones_sapphire_block.png and b/textures/birthstones_sapphire_block.png differ diff --git a/textures/birthstones_topaz_block.png b/textures/birthstones_topaz_block.png new file mode 100644 index 0000000..6250c14 Binary files /dev/null and b/textures/birthstones_topaz_block.png differ diff --git a/textures/birthstones_zircon_block.png b/textures/birthstones_zircon_block.png index a3740ba..183acc6 100644 Binary files a/textures/birthstones_zircon_block.png and b/textures/birthstones_zircon_block.png differ diff --git a/update in C games Minetest games subgametest from 8bit.bat b/update in C games Minetest games subgametest from 8bit.bat new file mode 100644 index 0000000..a2ad834 --- /dev/null +++ b/update in C games Minetest games subgametest from 8bit.bat @@ -0,0 +1,32 @@ +SET SOURCE_PATH=.\textures +IF NOT EXIST "%SOURCE_PATH%" GOTO ENDNOSOURCE +SET SOURCE_PATH=.\etc\8bit +IF NOT EXIST "%SOURCE_PATH%" GOTO ENDNOSOURCE +SET MT_PATH=C:\games\Minetest +IF NOT EXIST "%MT_PATH%" GOTO ENDNOMINETEST +SET MT_GAMES_PATH=%MT_PATH%\games +SET MT_GAME_PATH=%MT_GAMES_PATH%\subgametest +echo "subgametest is minetest_game, plus: birthstones, unified_inventory" +IF NOT EXIST "%MT_GAME_PATH%" GOTO ENDNOGAME + +SET MODS_PATH=%MT_GAME_PATH%\mods +SET MOD_DEST_PATH=%MODS_PATH%\birthstones +IF NOT EXIST "%MOD_DEST_PATH%" md "%MOD_DEST_PATH%" +copy *.* "%MOD_DEST_PATH%\" +IF NOT EXIST "%MOD_DEST_PATH%\textures" md "%MOD_DEST_PATH%\textures" +copy /y .\textures\*.* "%MOD_DEST_PATH%\textures" +copy /y .\etc\8bit\*.* "%MOD_DEST_PATH%\textures" + +GOTO ENDSILENTLY +:ENDNOMINETEST: +echo "Minetest is not installed at %MT_PATH% -- extract minetest there first or edit this batch file in your favorite text editor and edit the value for MT_PATH. +pause +GOTO ENDSILENTLY +:ENDNOGAME +echo "Subgame %MT_ENLIVEN_PATH% is not installed -- extract that subgame there first or edit this batch file in your favorite text editor and edit the value for MT_GAME_PATH. +pause +GOTO ENDSILENTLY +:ENDNOSOURCE +echo "Missing source folder '%SOURCE_PATH%'. You must extract all files and run from a drive letter, so that textures folder is in current working directory" +pause +:ENDSILENTLY \ No newline at end of file diff --git a/update in C games Minetest games subgametest.bat b/update in C games Minetest games subgametest.bat index dddced0..862e91c 100644 --- a/update in C games Minetest games subgametest.bat +++ b/update in C games Minetest games subgametest.bat @@ -11,7 +11,7 @@ SET MOD_DEST_PATH=%MODS_PATH%\birthstones IF NOT EXIST "%MOD_DEST_PATH%" md "%MOD_DEST_PATH%" copy *.* "%MOD_DEST_PATH%\" IF NOT EXIST "%MOD_DEST_PATH%\textures" md "%MOD_DEST_PATH%\textures" -copy .\textures\*.* "%MOD_DEST_PATH%\textures" +copy /y .\textures\*.* "%MOD_DEST_PATH%\textures" GOTO ENDSILENTLY :ENDNOMINETEST: