commit 25be8da37aeccaef9bdc95075844a57055ef50f6 Author: ray litchfield Date: Sat Jun 22 14:19:14 2013 -0400 add to git diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..412eeda --- /dev/null +++ b/.gitattributes @@ -0,0 +1,22 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b9d6bd9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,215 @@ +################# +## Eclipse +################# + +*.pydevproject +.project +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.classpath +.settings/ +.loadpath + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + + +################# +## Visual Studio +################# + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results + +[Dd]ebug/ +[Rr]elease/ +x64/ +build/ +[Bb]in/ +[Oo]bj/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.log +*.scc + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +*.ncrunch* +.*crunch*.local.xml + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.Publish.xml +*.pubxml + +# NuGet Packages Directory +## TODO: If you have NuGet Package Restore enabled, uncomment the next line +#packages/ + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +sql/ +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.[Pp]ublish.xml +*.pfx +*.publishsettings + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +App_Data/*.mdf +App_Data/*.ldf + +############# +## Windows detritus +############# + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Mac crap +.DS_Store + + +############# +## Python +############# + +*.py[co] + +# Packages +*.egg +*.egg-info +dist/ +build/ +eggs/ +parts/ +var/ +sdist/ +develop-eggs/ +.installed.cfg + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox + +#Translations +*.mo + +#Mr Developer +.mr.developer.cfg diff --git a/beer/CREDITS b/beer/CREDITS new file mode 100644 index 0000000..70d85dd --- /dev/null +++ b/beer/CREDITS @@ -0,0 +1,5 @@ +Bear textures by ray8888 +grape textures by sdzen +growing code from randomproofs growing mod +uses code from ironzorgs flowers +uses code from kahrls bucket \ No newline at end of file diff --git a/beer/copyright.txt b/beer/copyright.txt new file mode 100644 index 0000000..0143678 --- /dev/null +++ b/beer/copyright.txt @@ -0,0 +1,2 @@ +Original textures: by:ray8888 WTFPL +Grape textures: by sdzen WTFPL \ No newline at end of file diff --git a/beer/depends.txt b/beer/depends.txt new file mode 100644 index 0000000..3858b34 --- /dev/null +++ b/beer/depends.txt @@ -0,0 +1,3 @@ +default + +bucket \ No newline at end of file diff --git a/beer/init.lua b/beer/init.lua new file mode 100644 index 0000000..152c5f9 --- /dev/null +++ b/beer/init.lua @@ -0,0 +1,282 @@ +--[[ +-- beer mod by ray8888 +--]] + +math.randomseed(os.time()) + +local DEBUG = 0 + +local color = { + "hops", + "dandelion_yellow", + "bush", + "grape", + "grape_white", +} + +local beer = { + "hops", + "dandelion_yellow", + "bush", + "grape", + "grape_white", +} +local dropitem = { + "beer:beer_hops", + "beer:beer_dandelion_yellow", + "beer:bush_berries 5", + "beer:grape_berries 10", + "beer:grape_white_berries 10", +} + +local beer_DESCRIPTION = { + "hops", + "Dandelion yellow", + "bush", + "grape", + "grape white", + +} + +local MAX_RATIO = 800 +local GROWING_DELAY = 100 + +-- Local Functions +local dbg = function(s) + if DEBUG == 1 then + print('[BEER] ' .. s) + end +end + +local table_contains = function(t, v) + for _, i in ipairs(t) do + if (i == v) then + return true + end + end + + return false +end + +local is_node_in_cube = function(nodenames, node_pos, radius) + for x = node_pos.x - radius, node_pos.x + radius do + for y = node_pos.y - radius, node_pos.y + radius do + for z = node_pos.z - radius, node_pos.z + radius do + n = minetest.env:get_node_or_nil({x = x, y = y, z = z}) + if (n == nil) + or (n.name == 'ignore') + or (table_contains(nodenames, n.name) == true) then + return true + end + end + end + end + + return false +end + +grow_blocks_on_surfaces = function(growdelay, grownames, surfaces) + for _, surface in ipairs(surfaces) do + minetest.register_abm({ + nodenames = { surface.name }, + interval = growdelay, + chance = 30, + action = function(pos, node, active_object_count, active_object_count_wider) + local p_top = { + x = pos.x, + y = pos.y + 1, + z = pos.z + } + local n_top = minetest.env:get_node(p_top) + local rnd = math.random(1, MAX_RATIO) + + if (MAX_RATIO - surface.chance < rnd) then + local flower_in_range = is_node_in_cube(grownames, p_top, surface.spacing) + if (n_top.name == "air") and (flower_in_range == false) then + local nnode = grownames[math.random(1, #grownames)] + dbg('Adding node ' .. nnode .. ' (' + .. pos.x .. ', ' + .. pos.y .. ', ' + .. pos.z .. ')') + minetest.env:add_node(p_top, { name = nnode }) + end + end + end + }) + end +end + + +function beer_add_sprite_beer(modname,name,growdelay,surfaces) + + minetest.register_node(modname..':'..name, { + drawtype = 'plantlike', + visual_scale = 1.0, + tile_images = { modname.."_"..name .. '.png' }, + inventory_image = modname.."_"..name .. '.png', + sunlight_propagates = true, + paramtype = 'light', + walkable = false, + groups = {choppy=2,dig_immediate=2}, + furnace_burntime = 1, + drop = dropitem[i], + }) + + grow_blocks_on_surfaces(growdelay,{modname..':'..name,},surfaces) +end + + +-- Nodes +for i, color in ipairs(beer) do + local fname = 'beer_' .. color + + minetest.register_node('beer:' .. fname, { + description = beer_DESCRIPTION[i], + drawtype = 'plantlike', + visual_scale = 1.0, + tile_images = { fname .. '.png' }, + inventory_image = fname .. '.png', + sunlight_propagates = true, + paramtype = 'light', + walkable = false, + groups = {choppy=2,dig_immediate=2}, + furnace_burntime = 1, + drop = dropitem[i], + }) +end +-- Make it grow ! +grow_blocks_on_surfaces(GROWING_DELAY * 30, { + "beer:beer_dandelion_yellow", + }, { + {name = "default:dirt_with_grass", chance = 30, spacing = 15}, +}) +grow_blocks_on_surfaces(GROWING_DELAY * 10, { + "beer:beer_hops", + "beer:beer_grape", + "beer:beer_grape_white", + "beer:beer_bush", + }, { + {name = "default:dirt_with_grass", chance = 10, spacing = 10}, +}) + +minetest.register_craftitem("beer:bucket_empty", { + description = "Empty Beer Bucket", + image = "beer_bucket_empty.png", + stack_max = 1, + liquids_pointable = true, + on_place = minetest.item_place, + on_use = function(item, player, pointed_thing) + if pointed_thing.type == "node" then + n = minetest.env:get_node(pointed_thing.under) + if n.name == "default:water_source" then + minetest.env:add_node(pointed_thing.under, {name="air"}) + local leftover = player:get_inventory():add_item("main", ItemStack('beer:bucket_water 1')) + if leftover:is_empty() then + item:take_item() + else + minetest.chat_send_player(player:get_player_name(), 'Not enough space in inventory!') + end + end + end + return item + end, +}) + +minetest.register_craftitem("beer:bucket_water", { + description = "beer bucket", + image = "beer_bucket_full.png", + stack_max = 1, + liquids_pointable = true, + on_place = minetest.item_place, + on_use = function(item, player, pointed_thing) + if pointed_thing.type == "node" then + n = minetest.env:get_node(pointed_thing.under) + if n.name == "default:water_source" then + -- unchanged + elseif n.name == "default:lava_source" or n.name == "default:lava_flowing" then + minetest.env:add_node(pointed_thing.under, {name="default:cobble"}) + else + minetest.env:add_node(pointed_thing.above, {name="default:water_flowing"}) + end + local leftover = player:get_inventory():add_item("main", ItemStack('beer:bucket_empty 1')) + if leftover:is_empty() then + item:take_item() + else + minetest.chat_send_player(player:get_player_name(), 'Not enough space in inventory!') + end + end + return item + end, +}) + + +minetest.register_craftitem("beer:bush_berries", { + description = "berries", + inventory_image = "berry.png", + on_use = minetest.item_eat(-10), +}) +minetest.register_craftitem("beer:grape_berries", { + description = "grapes", + inventory_image = "grape.png", + on_use = minetest.item_eat(5), +}) +minetest.register_craftitem("beer:grape_white_berries", { + description = "white grapes", + inventory_image = "grape_white.png", + on_use = minetest.item_eat(5), +}) +minetest.register_craftitem("beer:beer", { + description = "Beer", + inventory_image = "beer.png", + on_use = minetest.item_eat(5), +}) +minetest.register_craftitem("beer:wine", { + description = "Wine", + inventory_image = "wine.png", + on_use = minetest.item_eat(5), +}) +minetest.register_craftitem("beer:grape_ferme", { + description = "fermented grapes", + inventory_image = "beer_bucket_ferm.png", +}) +minetest.register_craftitem("beer:moonshine", { + description = "Moonshine", + inventory_image = "moonshine.png", + on_use = minetest.item_eat(5), +}) +minetest.register_craft({ + output = 'beer:beer 24', + recipe = { + {'beer:beer_hops'}, + {'beer:bucket_water'}, + } +}) +minetest.register_craft({ + output = 'beer:moonshine', + type = 'cooking', + recipe = 'beer:grape_ferme', +}) +minetest.register_craft({ + output = 'beer:wine 2', + recipe = { + {'beer:beer_dandelion_yellow'}, + {'beer:beer_dandelion_yellow'}, + {'beer:bucket_water'}, + } +}) +minetest.register_craft({ + output = 'beer:grape_ferme', + recipe = { + {'beer:grape_berries'}, + {'beer:grape_white_berries'}, + {'beer:bucket_water'}, + } +}) +minetest.register_craft({ + output = 'beer:bucket_empty 1', + recipe = { + {'default:wood', '', 'default:wood'}, + {'', 'default:wood', ''}, + } +}) + diff --git a/beer/textures/beer.png b/beer/textures/beer.png new file mode 100644 index 0000000..310ef34 Binary files /dev/null and b/beer/textures/beer.png differ diff --git a/beer/textures/beer_bucket_empty.png b/beer/textures/beer_bucket_empty.png new file mode 100644 index 0000000..99a69ef Binary files /dev/null and b/beer/textures/beer_bucket_empty.png differ diff --git a/beer/textures/beer_bucket_ferm.png b/beer/textures/beer_bucket_ferm.png new file mode 100644 index 0000000..d14a33c Binary files /dev/null and b/beer/textures/beer_bucket_ferm.png differ diff --git a/beer/textures/beer_bucket_full.png b/beer/textures/beer_bucket_full.png new file mode 100644 index 0000000..5b390aa Binary files /dev/null and b/beer/textures/beer_bucket_full.png differ diff --git a/beer/textures/beer_buket_empty.png b/beer/textures/beer_buket_empty.png new file mode 100644 index 0000000..99a69ef Binary files /dev/null and b/beer/textures/beer_buket_empty.png differ diff --git a/beer/textures/beer_bush.png b/beer/textures/beer_bush.png new file mode 100644 index 0000000..0bdf1a7 Binary files /dev/null and b/beer/textures/beer_bush.png differ diff --git a/beer/textures/beer_grape.png b/beer/textures/beer_grape.png new file mode 100644 index 0000000..8596ef2 Binary files /dev/null and b/beer/textures/beer_grape.png differ diff --git a/beer/textures/beer_grape_white.png b/beer/textures/beer_grape_white.png new file mode 100644 index 0000000..eb2e29e Binary files /dev/null and b/beer/textures/beer_grape_white.png differ diff --git a/beer/textures/beer_hops.png b/beer/textures/beer_hops.png new file mode 100644 index 0000000..58c2ef0 Binary files /dev/null and b/beer/textures/beer_hops.png differ diff --git a/beer/textures/berry.png b/beer/textures/berry.png new file mode 100644 index 0000000..33ecb7b Binary files /dev/null and b/beer/textures/berry.png differ diff --git a/beer/textures/grape.png b/beer/textures/grape.png new file mode 100644 index 0000000..c4f6323 Binary files /dev/null and b/beer/textures/grape.png differ diff --git a/beer/textures/grape_white.png b/beer/textures/grape_white.png new file mode 100644 index 0000000..4077465 Binary files /dev/null and b/beer/textures/grape_white.png differ diff --git a/beer/textures/moonshine.png b/beer/textures/moonshine.png new file mode 100644 index 0000000..053e30a Binary files /dev/null and b/beer/textures/moonshine.png differ diff --git a/beer/textures/wine.png b/beer/textures/wine.png new file mode 100644 index 0000000..dd1247c Binary files /dev/null and b/beer/textures/wine.png differ