Added two new flowers

robbi-blechdose · robbi-blechdose · commit f3a877e30329 · 2022-08-24T16:31:40.000+02:00
diff --git a/res/tex/terrain.png b/res/tex/terrain.png
diff --git a/src/blocks/blockdrawing.c b/src/blocks/blockdrawing.c
@@ -46,7 +46,7 @@ const vec2i* const blockTextures[] = {
     [BLOCK_GOLD_ORE] =   (vec2i[1]) {{3, 1}},
     [BLOCK_REDSTONE_ORE] = (vec2i[1]) {{4, 1}},
     [BLOCK_DIAMOND_ORE] = (vec2i[1]) {{5, 1}},
-    [BLOCK_FLOWER] =     (vec2i[2]) {{6, 1}, {7, 1}},
+    [BLOCK_FLOWER] =     (vec2i[4]) {{6, 1}, {7, 1}, {3, 7}, {4, 7}},
 
     [BLOCK_TALL_GRASS] = (vec2i[1]) {{0, 2}},
     [BLOCK_GLASS] =      (vec2i[1]) {{1, 2}},
diff --git a/src/inventory.c b/src/inventory.c
@@ -35,10 +35,10 @@ const InventoryTab inventory[NUM_INVENTORY_TABS] = {
         }
     },
     {
-        "Plants", 9, B(BLOCK_FLOWER),
+        "Plants", 11, B(BLOCK_FLOWER),
         {
-            B(BLOCK_FLOWER), {BLOCK_FLOWER, BLOCK_DATA_TEXTURE1}, B(BLOCK_TALL_GRASS), B(BLOCK_WHEAT), B(BLOCK_SUGAR_CANE), B(BLOCK_CACTUS),
-            B(BLOCK_DEAD_SHRUB), B(BLOCK_MUSHROOM), {BLOCK_MUSHROOM, BLOCK_DATA_TEXTURE1}
+            B(BLOCK_FLOWER), {BLOCK_FLOWER, BLOCK_DATA_TEXTURE1}, {BLOCK_FLOWER, BLOCK_DATA_TEXTURE2}, {BLOCK_FLOWER, BLOCK_DATA_TEXTURE3}, B(BLOCK_TALL_GRASS), B(BLOCK_WHEAT),
+            B(BLOCK_SUGAR_CANE), B(BLOCK_CACTUS), B(BLOCK_DEAD_SHRUB), B(BLOCK_MUSHROOM), {BLOCK_MUSHROOM, BLOCK_DATA_TEXTURE1}
         }
     },
     {
diff --git a/src/version.h b/src/version.h
@@ -1,7 +1,7 @@
 #ifndef _VERSION_H
 #define _VERSION_H
 
-#define GAME_BASE_VERSION "1.0"
+#define GAME_BASE_VERSION "1.0.1"
 
 #ifdef DEBUG
 #define GAME_VERSION GAME_BASE_VERSION "-debug"

Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,10 @@ const InventoryTab inventory[NUM_INVENTORY_TABS] = {`
`35`	`35`	`}`
`36`	`36`	`},`
`37`	`37`	`{`
`38`		`- "Plants", 9, B(BLOCK_FLOWER),`
	`38`	`+ "Plants", 11, B(BLOCK_FLOWER),`
`39`	`39`	`{`
`40`		`- B(BLOCK_FLOWER), {BLOCK_FLOWER, BLOCK_DATA_TEXTURE1}, B(BLOCK_TALL_GRASS), B(BLOCK_WHEAT), B(BLOCK_SUGAR_CANE), B(BLOCK_CACTUS),`
`41`		`- B(BLOCK_DEAD_SHRUB), B(BLOCK_MUSHROOM), {BLOCK_MUSHROOM, BLOCK_DATA_TEXTURE1}`
	`40`	`+ B(BLOCK_FLOWER), {BLOCK_FLOWER, BLOCK_DATA_TEXTURE1}, {BLOCK_FLOWER, BLOCK_DATA_TEXTURE2}, {BLOCK_FLOWER, BLOCK_DATA_TEXTURE3}, B(BLOCK_TALL_GRASS), B(BLOCK_WHEAT),`
	`41`	`+ B(BLOCK_SUGAR_CANE), B(BLOCK_CACTUS), B(BLOCK_DEAD_SHRUB), B(BLOCK_MUSHROOM), {BLOCK_MUSHROOM, BLOCK_DATA_TEXTURE1}`
`42`	`42`	`}`
`43`	`43`	`},`
`44`	`44`	`{`