diff options
| author | Fernando Carmona Varo <ferkiwi@gmail.com> | 2015-10-24 17:13:09 +0200 |
|---|---|---|
| committer | Fernando Carmona Varo <ferkiwi@gmail.com> | 2015-10-24 17:21:41 +0200 |
| commit | 3a59f18eb196a3fddb8c67d5e5143a6e3ab0e11b (patch) | |
| tree | 1b9b0f5d6b55fdb6e7cacaf4fc1d5cd50b23ff4e /pacmine/init.lua | |
| parent | a538d073951f06bf52f7e9f7cc8afe76efffb343 (diff) | |
| parent | 683316f94c578ec030dc762eb256fd96c4dd978e (diff) | |
Merge branch 'master' into arcade
Conflicts:
pacmine/init.lua
pacmine/portals.lua
Diffstat (limited to 'pacmine/init.lua')
| -rw-r--r-- | pacmine/init.lua | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pacmine/init.lua b/pacmine/init.lua index 07fc1ab..6689cc7 100644 --- a/pacmine/init.lua +++ b/pacmine/init.lua @@ -2,8 +2,7 @@ -- This variable will be exported to other mods when they "depend" on this mod pacmine = {} - -dofile(minetest.get_modpath("pacmine").."/craftitems.lua") +dofile(minetest.get_modpath("pacmine").."/fruit.lua") dofile(minetest.get_modpath("pacmine").."/ghost.lua") dofile(minetest.get_modpath("pacmine").."/blocks.lua") dofile(minetest.get_modpath("pacmine").."/portals.lua") @@ -11,6 +10,8 @@ dofile(minetest.get_modpath("pacmine").."/gamestate.lua") dofile(minetest.get_modpath("pacmine").."/hud.lua") dofile(minetest.get_modpath("pacmine").."/aliases.lua") + + --Yellow Pellets minetest.register_node("pacmine:pellet_1", { description = "Pellet 1", @@ -43,7 +44,7 @@ minetest.register_node("pacmine:pellet_1", { --Power Pellets. Need to make these do something minetest.register_node("pacmine:pellet_2", { description = "Pellet 2", - tiles = {"wool_yellow.png^[colorize:white:140"}, + tiles = {{name="pacmine_powerpellet.png", animation={type="vertical_frames",aspect_w=16, aspect_h=16, length=0.8}},}, drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", |