diff --git a/art/gen/blueprint.png b/art/gen/blueprint.png new file mode 100644 index 0000000..edf205f Binary files /dev/null and b/art/gen/blueprint.png differ diff --git a/art/gen/coal.png b/art/gen/coal.png new file mode 100644 index 0000000..5b3fde8 Binary files /dev/null and b/art/gen/coal.png differ diff --git a/code/foundation/src/debug/debug_replay.c b/code/foundation/src/debug/debug_replay.c index 3d6e151..cfd79a8 100644 --- a/code/foundation/src/debug/debug_replay.c +++ b/code/foundation/src/debug/debug_replay.c @@ -175,7 +175,7 @@ void debug_replay_run(void) { void ActPlaceIceRink(void); void ActSpawnCirclingDriver(void); void ActEraseWorldChanges(void); -void ActSpawnIcemaker(void); +void ActSpawnCoal(void); void ActSpawnChest(void); void ActSpawnBelt(void); @@ -226,7 +226,7 @@ void debug_replay_update(void) { ActEraseWorldChanges(); }break; case RPKIND_SPAWN_ICEMAKER_ITEM:{ - ActSpawnIcemaker(); + ActSpawnCoal(); }break; case RPKIND_SPAWN_CHEST:{ ActSpawnChest(); diff --git a/code/foundation/src/debug/debug_ui.c b/code/foundation/src/debug/debug_ui.c index 4d57259..25c555c 100644 --- a/code/foundation/src/debug/debug_ui.c +++ b/code/foundation/src/debug/debug_ui.c @@ -137,7 +137,7 @@ static debug_item items[] = { { .kind = DITEM_BUTTON, .name = "place ice rink", .on_click = ActPlaceIceRink }, { .kind = DITEM_BUTTON, .name = "erase world changes", .on_click = ActEraseWorldChanges }, { .kind = DITEM_BUTTON, .name = "spawn circling driver", .on_click = ActSpawnCirclingDriver }, - { .kind = DITEM_BUTTON, .name = "spawn icemaker item", .on_click = ActSpawnIcemaker }, + { .kind = DITEM_BUTTON, .name = "spawn coal lump", .on_click = ActSpawnCoal }, { .kind = DITEM_BUTTON, .name = "spawn chest", .on_click = ActSpawnChest }, { .kind = DITEM_BUTTON, .name = "spawn belt", .on_click = ActSpawnBelt }, { .kind = DITEM_BUTTON, .name = "spawn furnace", .on_click = ActSpawnFurnace }, diff --git a/code/foundation/src/debug/debug_ui_actions.c b/code/foundation/src/debug/debug_ui_actions.c index 7529882..a4543dd 100644 --- a/code/foundation/src/debug/debug_ui_actions.c +++ b/code/foundation/src/debug/debug_ui_actions.c @@ -22,8 +22,8 @@ ActSpawnCar(void) { } void -ActSpawnIcemaker(void) { - ecs_entity_t e = item_spawn(ASSET_DEMO_ICEMAKER, 32); +ActSpawnCoal(void) { + ecs_entity_t e = item_spawn(ASSET_COAL, 32); ecs_entity_t plr = camera_get().ent_id; Position const* origin = ecs_get(world_ecs(), plr, Position); @@ -62,7 +62,7 @@ ActSpawnBelt(void) { void ActSpawnDurabilityTest(void) { - ecs_entity_t e = item_spawn(ASSET_DEMO_ICEMAKER, 1); + ecs_entity_t e = item_spawn(ASSET_COAL, 1); ecs_entity_t plr = camera_get().ent_id; Position const* origin = ecs_get(world_ecs(), plr, Position); diff --git a/code/foundation/src/lists/assets_ids.h b/code/foundation/src/lists/assets_ids.h index 997266c..51b54cb 100644 --- a/code/foundation/src/lists/assets_ids.h +++ b/code/foundation/src/lists/assets_ids.h @@ -17,7 +17,6 @@ typedef enum { ASSET_BLUEPRINT, // NOTE(zaklaus): items - ASSET_DEMO_ICEMAKER, // NOTE(zaklaus): blocks ASSET_FENCE, diff --git a/code/foundation/src/lists/assets_list.c b/code/foundation/src/lists/assets_list.c index 19402c1..5b6faa5 100644 --- a/code/foundation/src/lists/assets_list.c +++ b/code/foundation/src/lists/assets_list.c @@ -15,7 +15,7 @@ static asset assets[] = { ASSET_TEX(ASSET_BLANK), ASSET_TEX(ASSET_BLOCK_FRAME), ASSET_TEX(ASSET_BUILDMODE_HIGHLIGHT), - ASSET_TEX(ASSET_DEMO_ICEMAKER), + ASSET_TEX(ASSET_COAL), ASSET_TEX(ASSET_CHEST), ASSET_TEX(ASSET_FURNACE), ASSET_TEX(ASSET_BLUEPRINT), diff --git a/code/foundation/src/lists/items_list.c b/code/foundation/src/lists/items_list.c index a235b8f..876aa20 100644 --- a/code/foundation/src/lists/items_list.c +++ b/code/foundation/src/lists/items_list.c @@ -4,7 +4,7 @@ static item_desc items[] = { { .kind = 0, .max_quantity = 0, }, - ITEM_INGREDIENT(ASSET_DEMO_ICEMAKER, 64, ASSET_FURNACE, ASSET_BELT, 0), + ITEM_INGREDIENT(ASSET_COAL, 64, ASSET_FURNACE, ASSET_BELT, 0), ITEM_SELF(ASSET_FENCE, 64), ITEM_ENERGY(ASSET_WOOD, ASSET_FURNACE, 64, 15.0f), ITEM_HOLD(ASSET_TREE, 64), diff --git a/code/games/sandbox/src/texgen.c b/code/games/sandbox/src/texgen.c index 791de62..7172ca3 100644 --- a/code/games/sandbox/src/texgen.c +++ b/code/games/sandbox/src/texgen.c @@ -23,7 +23,8 @@ Texture2D texgen_build_sprite(asset_id id) { case ASSET_BLOCK_FRAME: return GenFrameRect(); break; // NOTE(zaklaus): items - case ASSET_DEMO_ICEMAKER: return LoadTexEco("demo_icemaker"); + case ASSET_COAL: return LoadTexEco("coal"); + case ASSET_BLUEPRINT: return LoadTexEco("blueprint"); // NOTE(zaklaus): blocks case ASSET_FENCE: return LoadTexEco("fence"); diff --git a/code/games/sandbox/src/worldgen.c b/code/games/sandbox/src/worldgen.c index 5106d41..6163a8f 100644 --- a/code/games/sandbox/src/worldgen.c +++ b/code/games/sandbox/src/worldgen.c @@ -100,7 +100,7 @@ int32_t worldgen_build(world_data *wld) { // items #if 1 for (int i=0; ix = RAND_RANGEF(0, world->dim*WORLD_BLOCK_SIZE);