From 6f73c1892aaeb764d93d2ad374a4fbeebaea34cf Mon Sep 17 00:00:00 2001 From: Andre Schweiger Date: Sun, 27 Dec 2015 19:04:33 +0100 Subject: [PATCH] Add Bucket + Water/Lava = Rock Interaction --- data/icons2.png | Bin 16928 -> 17016 bytes source/Crafting.c | 3 ++- source/Globals.c | 30 +++++++++++++++++++++++++++++- source/Item.c | 16 ++++++++++++++-- source/Item.h | 1 + source/Menu.c | 2 +- source/Render.c | 6 ++++++ 7 files changed, 53 insertions(+), 5 deletions(-) diff --git a/data/icons2.png b/data/icons2.png index d1036781f310d928d40320b175616142e9e9fab8..f08579953bedd69ff9eea4106d7958acd008cf7d 100644 GIT binary patch literal 17016 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 i5!Tkfecz~R!p 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 diff --git a/source/Crafting.c b/source/Crafting.c index 670b906..98d1cbb 100644 --- a/source/Crafting.c +++ b/source/Crafting.c @@ -98,7 +98,7 @@ void initRecipes(){ workbenchRecipes.recipes[14] = defineRecipe(TOOL_PICKAXE,1,2,ITEM_WOOD,5,ITEM_STONE,5); workbenchRecipes.recipes[15] = defineRecipe(TOOL_SHOVEL,1,2,ITEM_WOOD,5,ITEM_STONE,5); - anvilRecipes.size = 15; + anvilRecipes.size = 16; anvilRecipes.recipes = (Recipe*)malloc(sizeof(Recipe) * (anvilRecipes.size)); anvilRecipes.recipes[0] = defineRecipe(TOOL_SWORD,2,2,ITEM_WOOD,5,ITEM_IRONINGOT,5); anvilRecipes.recipes[1] = defineRecipe(TOOL_AXE,2,2,ITEM_WOOD,5,ITEM_IRONINGOT,5); @@ -115,6 +115,7 @@ void initRecipes(){ anvilRecipes.recipes[12] = defineRecipe(TOOL_HOE,4,2,ITEM_WOOD,5,ITEM_GEM,50); anvilRecipes.recipes[13] = defineRecipe(TOOL_PICKAXE,4,2,ITEM_WOOD,5,ITEM_GEM,50); anvilRecipes.recipes[14] = defineRecipe(TOOL_SHOVEL,4,2,ITEM_WOOD,5,ITEM_GEM,50); + anvilRecipes.recipes[15] = defineRecipe(TOOL_BUCKET,0,1,ITEM_IRONINGOT,10); furnaceRecipes.size = 3; furnaceRecipes.recipes = (Recipe*)malloc(sizeof(Recipe) * (furnaceRecipes.size)); diff --git a/source/Globals.c b/source/Globals.c index abfa1c5..9507cba 100644 --- a/source/Globals.c +++ b/source/Globals.c @@ -455,7 +455,7 @@ void healPlayer(int amount){ s8 itemTileInteract(int tile, Item* item, int x, int y, int px, int py, int dir){ // Furniture items - if(item->id > 27){ + if(item->id > 27 && item->id < 34){ if(!tileIsSolid(getTile(x,y), NULL)){ addEntityToList(newFurnitureEntity(item->id,item->chestPtr, (x<<4)+8, (y<<4)+8, currentLevel), &eManager); removeItemFromCurrentInv(item); @@ -576,12 +576,38 @@ s8 itemTileInteract(int tile, Item* item, int x, int y, int px, int py, int dir) return 1; } break; case TILE_HOLE: + if(item->id == ITEM_DIRT){ + setTile(TILE_DIRT,x,y); + --item->countLevel; + return 1; + } + else if(item->id == TOOL_BUCKET && item->countLevel == 1 && playerUseEnergy(4)) { + setTile(TILE_WATER,x,y); + item->countLevel = 0; + } + else if(item->id == TOOL_BUCKET && item->countLevel == 2 && playerUseEnergy(4)) { + setTile(TILE_LAVA,x,y); + item->countLevel = 0; + } break; case TILE_WATER: + if(item->id == ITEM_DIRT){ + setTile(TILE_DIRT,x,y); + --item->countLevel; + return 1; + } + else if(item->id == TOOL_BUCKET && item->countLevel == 0 && playerUseEnergy(4)) { + setTile(TILE_HOLE,x,y); + item->countLevel = 1; + } break; case TILE_LAVA: if(item->id == ITEM_DIRT){ setTile(TILE_DIRT,x,y); --item->countLevel; return 1; + } + else if(item->id == TOOL_BUCKET && item->countLevel == 0 && playerUseEnergy(4)) { + setTile(TILE_HOLE,x,y); + item->countLevel = 2; } break; case TILE_NULL: if(item->id == ITEM_CLOUD){ @@ -639,6 +665,8 @@ void tickTile(int x, int y){ if(getTile(x-1,y)==TILE_HOLE) setTile(TILE_LAVA,x-1,y); if(getTile(x,y+1)==TILE_HOLE) setTile(TILE_LAVA,x,y+1); if(getTile(x,y-1)==TILE_HOLE) setTile(TILE_LAVA,x,y-1); + + if(getTile(x+1,y)==TILE_WATER || getTile(x-1,y)==TILE_WATER || getTile(x,y+1)==TILE_WATER || getTile(x,y-1)==TILE_WATER) setTile(TILE_ROCK,x,y); break; case TILE_HOLE: // This makes water flow slightly faster than lava if(getTile(x+1,y)==TILE_WATER) setTile(TILE_WATER,x,y); diff --git a/source/Item.c b/source/Item.c index a4dc71e..ca47720 100644 --- a/source/Item.c +++ b/source/Item.c @@ -3,7 +3,7 @@ char currentName[16]; bool isItemEmpty(Item* item){ - if(item->id < 6 || item->onlyOne == true) return false; + if(item->id < 6 || item->id > 100 || item->onlyOne == true) return false; if(item->countLevel < 1) return true; return false; } @@ -59,7 +59,7 @@ Item newItem(int id, int cLevel){ if(id != ITEM_NULL){ if(cLevel > 999) cLevel = 999; item.countLevel = cLevel; - if(id < 7 || id > 27) item.onlyOne = true; // Tools + Furniture. + if(id < 7 || id > 27 || id > 100) item.onlyOne = true; // Tools + Furniture. else item.onlyOne = false; } item.chestPtr = NULL; @@ -158,6 +158,12 @@ char* getItemName(int itemID, int countLevel){ case ITEM_GLASS: sprintf(currentName,"%d Glass", countLevel); return currentName; case ITEM_GEM: sprintf(currentName,"%d Gem", countLevel); return currentName; case ITEM_SLIME: sprintf(currentName,"%d Slime", countLevel); return currentName; + case TOOL_BUCKET: + switch(countLevel){ + case 1: return "Water Bucket"; + case 2: return "Lava Bucket"; + default: return "Empty Bucket"; + } default: return ""; // null } } @@ -232,6 +238,12 @@ char* getBasicItemName(int itemID, int countLevel){ case ITEM_GLASS: return "Glass"; case ITEM_GEM: return "Gem"; case ITEM_SLIME: return "Slime"; + case TOOL_BUCKET: + switch(countLevel){ + case 1: return "Water Bucket"; + case 2: return "Lava Bucket"; + default: return "Empty Bucket"; + } default: return ""; // null } diff --git a/source/Item.h b/source/Item.h index 1fd86e5..6e806e7 100644 --- a/source/Item.h +++ b/source/Item.h @@ -42,6 +42,7 @@ #define ITEM_FURNACE 31 #define ITEM_WORKBENCH 32 #define ITEM_LANTERN 33 +#define TOOL_BUCKET 101 typedef struct Inventory Inventory; diff --git a/source/Menu.c b/source/Menu.c index df0166e..ee21b84 100644 --- a/source/Menu.c +++ b/source/Menu.c @@ -408,7 +408,7 @@ void tickMenu(int menu){ removeItemFromInventory(curInvSel, player.p.inv); // remove original pushItemToInventoryFront(median, player.p.inv); // add copy to front player.p.activeItem = &player.p.inv->items[0]; // active item = copy. - if(player.p.activeItem->id > 27) player.p.isCarrying = true; + if(player.p.activeItem->id > 27 && player.p.activeItem->id < 34) player.p.isCarrying = true; else player.p.isCarrying = false; } currentMenu = MENU_NONE; diff --git a/source/Render.c b/source/Render.c index f8cf80b..362a69d 100644 --- a/source/Render.c +++ b/source/Render.c @@ -1206,6 +1206,9 @@ void renderItemIcon2(int itemID, int countLevel, int x, int y, int z) { case ITEM_GEM: renderb(x, y, 112, 152, 0, 0xFF); break; + case TOOL_BUCKET: + renderb(x, y, 200 + countLevel * 8, 144, 0, 0xFF); + break; } y -= z; renderItemIcon(itemID, countLevel, x, y); @@ -1314,6 +1317,9 @@ void renderItemIcon(int itemID, int countLevel, int x, int y) { case ITEM_GEM: render(x, y, 112, 152, 0); break; + case TOOL_BUCKET: + render(x, y, 200 + countLevel * 8, 144, 0); + break; } }