From 3a4ec342ccb33bbc9b59227c8b98cfe72edbbdea Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Thu, 22 Nov 2012 07:42:29 -0500 Subject: [PATCH 1/2] New version of vessels mod, with better textures. --- mods/vessels/README | 0 mods/vessels/README.txt | 45 ---------------- mods/vessels/changelog.txt | 10 ++++ mods/vessels/init.lua | 51 +++++++++++++----- .../alternates/vessels_drinking_glass.png | Bin 253 -> 0 bytes .../alternates/vessels_glass_bottle.png | Bin 242 -> 0 bytes .../alternates/vessels_steel_bottle.png | Bin 345 -> 0 bytes .../textures/vessels_drinking_glass.png | Bin 338 -> 253 bytes .../textures/vessels_drinking_glass_inv.png | Bin 0 -> 338 bytes .../vessels/textures/vessels_glass_bottle.png | Bin 405 -> 242 bytes .../textures/vessels_glass_bottle_inv.png | Bin 0 -> 405 bytes .../vessels/textures/vessels_steel_bottle.png | Bin 342 -> 345 bytes .../textures/vessels_steel_bottle_inv.png | Bin 0 -> 342 bytes 13 files changed, 48 insertions(+), 58 deletions(-) create mode 100644 mods/vessels/README delete mode 100644 mods/vessels/README.txt create mode 100644 mods/vessels/changelog.txt delete mode 100644 mods/vessels/textures/alternates/vessels_drinking_glass.png delete mode 100644 mods/vessels/textures/alternates/vessels_glass_bottle.png delete mode 100644 mods/vessels/textures/alternates/vessels_steel_bottle.png create mode 100644 mods/vessels/textures/vessels_drinking_glass_inv.png create mode 100644 mods/vessels/textures/vessels_glass_bottle_inv.png create mode 100644 mods/vessels/textures/vessels_steel_bottle_inv.png diff --git a/mods/vessels/README b/mods/vessels/README new file mode 100644 index 00000000..e69de29b diff --git a/mods/vessels/README.txt b/mods/vessels/README.txt deleted file mode 100644 index 150b501d..00000000 --- a/mods/vessels/README.txt +++ /dev/null @@ -1,45 +0,0 @@ -Minetest 0.4 mod: vessels -========================== - -Crafts -------- -Glass bottle (yields 10) - - G - G - G - G - - G - - -Drinking Glass (yields 14) - - G - G - G - G - G G G - -Heavy Steel Bottle (yields 5) - - S - S - S - S - - S - - -License of source code: ------------------------ -Copyright (C) 2012 Vanessa Ezekowitz -Version 2012-09-02 -Modifications by Perttu Ahola - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or -(at your option) any later version. - -http://www.gnu.org/licenses/lgpl-2.1.html - -License of media (textures and sounds) --------------------------------------- -WTFPL - -Authors of media files ------------------------ -Unless specifically noted, -Copyright (C) 2012 Vanessa Ezekowitz - diff --git a/mods/vessels/changelog.txt b/mods/vessels/changelog.txt new file mode 100644 index 00000000..9eb8ec1f --- /dev/null +++ b/mods/vessels/changelog.txt @@ -0,0 +1,10 @@ +Changelog +--------- + +2012-07-26: Added a smelting step for recycling crafted items back into raw +materials. 2 Glass bottles/cups -> 1 "glass fragments" -> smelt into normal +glass block. 1 Steel bottle -> smelt to 1 steel ingot. + +2012-07-26: Better bottle texture. Note that it is blended against the 50% +grey fields in the inventory display, so it will show artifacts if you try to +wield it. Don't do that. :-) diff --git a/mods/vessels/init.lua b/mods/vessels/init.lua index 81cbad3f..c4d890c5 100644 --- a/mods/vessels/init.lua +++ b/mods/vessels/init.lua @@ -1,10 +1,34 @@ --- Minetest 0.4 mod: vessels --- See README.txt for licensing and other information. +-- Vessels Mod by Vanessa Ezekowitz ~~ 2012-07-26 +-- +-- License: LGPL +-- + +--======================================== +-- Crafts +-- +-- Glass bottle (yields 10) +-- +-- G - G +-- G - G +-- - G - +-- +-- Drinking Glass (yields 14) +-- +-- G - G +-- G - G +-- G G G +-- +-- Heavy Steel Bottle (yields 5) +-- +-- S - S +-- S - S +-- - S - + minetest.register_craftitem("vessels:glass_bottle", { - description = "Glass Bottle (empty)", - inventory_image = "vessels_glass_bottle.png", - groups = {vessel=1}, + description = "Glass Bottle (empty)", + inventory_image = "vessels_glass_bottle_inv.png", + wield_image = "vessels_glass_bottle.png" }) minetest.register_craft( { @@ -17,9 +41,9 @@ minetest.register_craft( { }) minetest.register_craftitem("vessels:drinking_glass", { - description = "Drinking Glass (empty)", - inventory_image = "vessels_drinking_glass.png", - groups = {vessel=1}, + description = "Drinking Glass (empty)", + inventory_image = "vessels_drinking_glass_inv.png", + wield_image = "vessels_drinking_glass.png" }) minetest.register_craft( { @@ -32,9 +56,9 @@ minetest.register_craft( { }) minetest.register_craftitem("vessels:steel_bottle", { - description = "Heavy Steel Bottle (empty)", - inventory_image = "vessels_steel_bottle.png", - groups = {vessel=1}, + description = "Heavy Steel Bottle (empty)", + inventory_image = "vessels_steel_bottle_inv.png", + wield_image = "vessels_steel_bottle.png" }) minetest.register_craft( { @@ -50,8 +74,8 @@ minetest.register_craft( { -- Make sure we can recycle them minetest.register_craftitem("vessels:glass_fragments", { - description = "Pile of Glass Fragments", - inventory_image = "vessels_glass_fragments.png", + description = "Pile of Glass Fragments", + inventory_image = "vessels_glass_fragments.png", }) minetest.register_craft( { @@ -84,3 +108,4 @@ minetest.register_craft( { recipe = "vessels:steel_bottle", }) +print("[Vessels] Loaded!") diff --git a/mods/vessels/textures/alternates/vessels_drinking_glass.png b/mods/vessels/textures/alternates/vessels_drinking_glass.png deleted file mode 100644 index 8ad033e82f90e8cfb903d83f6a7974aec5829267..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#4!f+lxV*+pNdutJ98VX=5R21KgLiWsHV~NX%-gyAH*>wyzyHQY)t??HPPV<- zW*l?<*jnjd4SZM2gg7`$4y<2Tb*Nf@smPN#{Cf=9PH#F8wYn|u_dahgPq!*BPbUuc z+FiC$+4|u#s+u}PjJ^5O#FTb**H=DSwKXhX{l|_&`=yUa6q+rOcwFrMd`?fFVdQ&MBb@0EggO>i_@% diff --git a/mods/vessels/textures/alternates/vessels_glass_bottle.png b/mods/vessels/textures/alternates/vessels_glass_bottle.png deleted file mode 100644 index d922579329a8e05c396247ad568a551f405c67fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#4!f+lxWu-+KF8|r&MMFiEoRpk2Rd4-r%Z}E3ekSi(ly=?`G+Ud!PC{xWt~$(695SsSdjn# diff --git a/mods/vessels/textures/alternates/vessels_steel_bottle.png b/mods/vessels/textures/alternates/vessels_steel_bottle.png deleted file mode 100644 index 629c857d793cf88815b2d7e205cfa3e9d83ddb75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#4!f+l6n{fQxg=2Nho_5Uh{frz>% delta 280 zcmV+z0q6ex0n!4HLw^=9no|`h0002-NkltUwVGsnPNhTdIGHDo5!Js!1_PPGpWGkEM>h79?2L2n~o@knelO(}3O&@#|MIa*N zdG4J~>$;AOF??1x#&FxVANAMIN1CPpfV!@K4cWLX%WygX0DqKH5JJE?#~Yk;EQEkk z>N=3V@A)pYz2@~K>7y?_cCc^WYrgI_mSyQZc5;=$)_m(gO377Kc}Gs9l-CZl)=Wfv zB$QGz5wX_#+<~Xl!8hltnGts^uw7CB0000{XE z)7O>#4!f+ln8B=IQ4OHbM^6{W5R21CgRQ$-9Rzgbwe5}`@cFwWWDSfmB?1pFFc*{%L?$9}1V8y^NB}l;OfaP)NImJ3H4MDH0 zChU9vQ*X=OXJ1ubF4ng#+mL@Rd*3^=X{j%5%ZjERyjJtt!RusbXr;T~k}22uwp{aZ zsZp5{WF)xp+OIo}Tg4m&7HDu;Jh$jeW;kHcr=Y}hm?8V^U)`2Oj{Dy~*6n9xIK3$$ hHvG)znp*DqgXYgy&n(y35DN-522WQ%mvv4FO#n%jhHL-; literal 0 HcmV?d00001 diff --git a/mods/vessels/textures/vessels_glass_bottle.png b/mods/vessels/textures/vessels_glass_bottle.png index c325fd1666b487d7783657a87f5eeed76f4bcdf5..d922579329a8e05c396247ad568a551f405c67fb 100644 GIT binary patch delta 184 zcmV;p07w6o1M&foLVp(*7`FY4lK=n!kx4{BR5;7UQ!x(1FbIT7&QKoU|NkbLotfQp z6H9f5%T%dVQvz9flLh8IDL~lp8>VSIoi3%oP{5Alu`yu*aAX1o0rSQ1e|U`j m!pSn-DGdYlXQ$TM;WF)iH9zi}EEMwq0000PYX}mpG~I-^KgpI@Pzk3~LCv39dZ+hz_x{c~j|=>>MBT$`wW4X7 zFbo4lQD8hCi-!S9DM~3JrG#mkxSTIIejU;6c1!(FRe zwdT(`%QM#XRXVUN>t;X@ux*WPFuN^hkd_JdAidB*BomEB{y^XNhY)arT z3^AEZn$;JJ1(VN&P0>8hW37W;?*+T}U9CVAMd;t7o3Y()mzMwe`m*2eF&w@kNj~7ZF7rHx5CWY}2d!2MgTVmn^}5-j u=Xq30QESaS&v-hYm}MEY*7SY9j diff --git a/mods/vessels/textures/vessels_glass_bottle_inv.png b/mods/vessels/textures/vessels_glass_bottle_inv.png new file mode 100644 index 0000000000000000000000000000000000000000..c325fd1666b487d7783657a87f5eeed76f4bcdf5 GIT binary patch literal 405 zcmV;G0c!q-DOXgJkNMKpO|GCwbt}~zvS#25BQdlE`xSI00000NkvXXu0mjfekP_k literal 0 HcmV?d00001 diff --git a/mods/vessels/textures/vessels_steel_bottle.png b/mods/vessels/textures/vessels_steel_bottle.png index d2b846da0becbd073fd3a1d96bc83e8fedae342c..629c857d793cf88815b2d7e205cfa3e9d83ddb75 100644 GIT binary patch delta 287 zcmV+)0pR}D0@(tPLw_0%fPi-y0002^Nkl} z#K^?dz^ix)uOS9vV%s2!Zm{gIvy3|f!zTN(qF;Sf6|dn(^MFbr{B7XaV)X`1G>73#V^Y};nrHf-AlV1J%xR8>U?K^(_-J(urA zp63UEX_{QGR}90zFbo{W!8FY~&qII^f?*h#=lOF#O+(YP+Z4kvAcS~+gK3)B_Z`c! z0FYANpg(naHwXU>Af;qkmQ(YxEJ!JT4^omOhpy`cL4fCZ0F2{E-}kKRN>x?LOP?uC l)8i`x+qO}br5M6r=mUXEUONklkMC;}i1!{1Bjx^9523DaE#J#BmJ3IF49r zPj7Jl)Cd2KU>wJ{13xi`FF5B=N&&De3(h$JrfFiDCX`aI+NBfgy55r{K?w1(@I22r i=g?YHRn?8Zj1?zRBV^ZL!iu*50000{XE z)7O>#4!f+l5(j5>oFh=^tEY=&h{fr7UEkt)fEVKi9qx0M49hZ;W~ogHT7PS)@atXoCaXAdeBAWG l=Dfx83sJ$LS9|yOs0S&hTu(UEwH+7$44$rjF6*2UngFLQgf##F literal 0 HcmV?d00001 From 070b33df5bfdb70d90522c849c270cbeb94cd63b Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Thu, 22 Nov 2012 07:59:20 -0500 Subject: [PATCH 2/2] New textures for vessels mod, wield images are different from inventory images to allow for faked alpha blending in inventory. --- mods/vessels/README | 0 mods/vessels/README.txt | 45 +++++++++++++++++++++++++++++++++++ mods/vessels/changelog.txt | 1 + mods/vessels/init.lua | 48 +++++++++++--------------------------- 4 files changed, 59 insertions(+), 35 deletions(-) delete mode 100644 mods/vessels/README create mode 100644 mods/vessels/README.txt diff --git a/mods/vessels/README b/mods/vessels/README deleted file mode 100644 index e69de29b..00000000 diff --git a/mods/vessels/README.txt b/mods/vessels/README.txt new file mode 100644 index 00000000..150b501d --- /dev/null +++ b/mods/vessels/README.txt @@ -0,0 +1,45 @@ +Minetest 0.4 mod: vessels +========================== + +Crafts +------- +Glass bottle (yields 10) + + G - G + G - G + - G - + +Drinking Glass (yields 14) + + G - G + G - G + G G G + +Heavy Steel Bottle (yields 5) + + S - S + S - S + - S - + +License of source code: +----------------------- +Copyright (C) 2012 Vanessa Ezekowitz +Version 2012-09-02 +Modifications by Perttu Ahola + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or +(at your option) any later version. + +http://www.gnu.org/licenses/lgpl-2.1.html + +License of media (textures and sounds) +-------------------------------------- +WTFPL + +Authors of media files +----------------------- +Unless specifically noted, +Copyright (C) 2012 Vanessa Ezekowitz + diff --git a/mods/vessels/changelog.txt b/mods/vessels/changelog.txt index 9eb8ec1f..6c5cc3b7 100644 --- a/mods/vessels/changelog.txt +++ b/mods/vessels/changelog.txt @@ -1,5 +1,6 @@ Changelog --------- +2012-11-22: Minor tweaks to formatting of init.lua, worked in new textures. 2012-07-26: Added a smelting step for recycling crafted items back into raw materials. 2 Glass bottles/cups -> 1 "glass fragments" -> smelt into normal diff --git a/mods/vessels/init.lua b/mods/vessels/init.lua index c4d890c5..97608d13 100644 --- a/mods/vessels/init.lua +++ b/mods/vessels/init.lua @@ -1,34 +1,11 @@ --- Vessels Mod by Vanessa Ezekowitz ~~ 2012-07-26 --- --- License: LGPL --- - ---======================================== --- Crafts --- --- Glass bottle (yields 10) --- --- G - G --- G - G --- - G - --- --- Drinking Glass (yields 14) --- --- G - G --- G - G --- G G G --- --- Heavy Steel Bottle (yields 5) --- --- S - S --- S - S --- - S - - +-- Minetest 0.4 mod: vessels +-- See README.txt for licensing and other information. minetest.register_craftitem("vessels:glass_bottle", { - description = "Glass Bottle (empty)", - inventory_image = "vessels_glass_bottle_inv.png", + description = "Glass Bottle (empty)", + inventory_image = "vessels_glass_bottle_inv.png", wield_image = "vessels_glass_bottle.png" + groups = {vessel=1}, }) minetest.register_craft( { @@ -41,9 +18,10 @@ minetest.register_craft( { }) minetest.register_craftitem("vessels:drinking_glass", { - description = "Drinking Glass (empty)", - inventory_image = "vessels_drinking_glass_inv.png", + description = "Drinking Glass (empty)", + inventory_image = "vessels_drinking_glass_inv.png", wield_image = "vessels_drinking_glass.png" + groups = {vessel=1}, }) minetest.register_craft( { @@ -56,9 +34,10 @@ minetest.register_craft( { }) minetest.register_craftitem("vessels:steel_bottle", { - description = "Heavy Steel Bottle (empty)", - inventory_image = "vessels_steel_bottle_inv.png", + description = "Heavy Steel Bottle (empty)", + inventory_image = "vessels_steel_bottle_inv.png", wield_image = "vessels_steel_bottle.png" + groups = {vessel=1}, }) minetest.register_craft( { @@ -74,8 +53,8 @@ minetest.register_craft( { -- Make sure we can recycle them minetest.register_craftitem("vessels:glass_fragments", { - description = "Pile of Glass Fragments", - inventory_image = "vessels_glass_fragments.png", + description = "Pile of Glass Fragments", + inventory_image = "vessels_glass_fragments.png", }) minetest.register_craft( { @@ -108,4 +87,3 @@ minetest.register_craft( { recipe = "vessels:steel_bottle", }) -print("[Vessels] Loaded!")