diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a81312..f9bd41a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,11 +20,37 @@ set(ASSETS_fx assets-fx/tiles/blocks/coal.png assets-fx/tiles/blocks/steel.png assets-fx/tiles/blocks/wood.png + assets-fx/tiles/blocks/apple.png + assets-fx/tiles/blocks/barrel.png + assets-fx/tiles/blocks/bed.png + assets-fx/tiles/blocks/chain.png + assets-fx/tiles/blocks/cherry.png + assets-fx/tiles/blocks/choco.png + assets-fx/tiles/blocks/cotton.png + assets-fx/tiles/blocks/fire.png + assets-fx/tiles/blocks/furnace.png + assets-fx/tiles/blocks/granit.png + assets-fx/tiles/blocks/ingot.png + assets-fx/tiles/blocks/lantern.png + assets-fx/tiles/blocks/leaves.png + assets-fx/tiles/blocks/orange.png + assets-fx/tiles/blocks/pear.png + assets-fx/tiles/blocks/pumpkin.png + assets-fx/tiles/blocks/starston.png + assets-fx/tiles/blocks/water1.png + assets-fx/tiles/blocks/water2.png + assets-fx/tiles/blocks/wheat.png + assets-fx/tiles/blocks/woodplks.png + assets-fx/tiles/blocks/woodstep.png assets-fx/player/skin1/player0.png assets-fx/player/skin1/player1.png assets-fx/player/skin1/player2.png assets-fx/player/skin1/player3.png assets-fx/tools/pickaxe.png + assets-fx/tools/axe.png + assets-fx/tools/sword.png + assets-fx/tools/shovel.png + assets-fx/tools/hoe.png assets-fx/tools/selectcross.png assets-fx/ui_icons/invnormal.png assets-fx/ui_icons/invselected.png @@ -32,6 +58,21 @@ set(ASSETS_fx assets-fx/tiles/overlays/block_break2.png assets-fx/tiles/overlays/block_break3.png assets-fx/tiles/overlays/block_break4.png + assets-fx/tiles/overlays/smoke1.png + assets-fx/tiles/overlays/smoke2.png + assets-fx/living/animals/chicken.png + assets-fx/living/animals/cow.png + assets-fx/living/animals/horse.png + assets-fx/living/animals/pig.png + assets-fx/living/animals/sheep.png + assets-fx/living/ennemies/badbird1.png + assets-fx/living/ennemies/badbird2.png + assets-fx/living/ennemies/caterp1.png + assets-fx/living/ennemies/caterp2.png + assets-fx/living/ennemies/gloup1.png + assets-fx/living/ennemies/gloup2.png + assets-fx/living/ennemies/zombie1.png + assets-fx/living/ennemies/zombie2.png # ... ) fxconv_declare_assets(${ASSETS} ${ASSETS_fx} ${ASSETS_cg} WITH_METADATA) diff --git a/assets-fx/living/animals/chicken.png b/assets-fx/living/animals/chicken.png new file mode 100644 index 0000000..1dbd20a Binary files /dev/null and b/assets-fx/living/animals/chicken.png differ diff --git a/assets-fx/living/animals/cow.png b/assets-fx/living/animals/cow.png new file mode 100644 index 0000000..3bb312c Binary files /dev/null and b/assets-fx/living/animals/cow.png differ diff --git a/assets-fx/living/animals/fxconv-metadata.txt b/assets-fx/living/animals/fxconv-metadata.txt new file mode 100644 index 0000000..ee1c4bd --- /dev/null +++ b/assets-fx/living/animals/fxconv-metadata.txt @@ -0,0 +1,15 @@ +chicken.png: + type: bopti-image + name: animal_chicken +cow.png: + type: bopti-image + name: animal_cow +horse.png: + type: bopti-image + name: animal_horse +pig.png: + type: bopti-image + name: animal_pig +sheep.png: + type: bopti-image + name: animal_sheep diff --git a/assets-fx/living/animals/horse.png b/assets-fx/living/animals/horse.png new file mode 100644 index 0000000..00c04d8 Binary files /dev/null and b/assets-fx/living/animals/horse.png differ diff --git a/assets-fx/living/animals/pig.png b/assets-fx/living/animals/pig.png new file mode 100644 index 0000000..bc17635 Binary files /dev/null and b/assets-fx/living/animals/pig.png differ diff --git a/assets-fx/living/animals/sheep.png b/assets-fx/living/animals/sheep.png new file mode 100644 index 0000000..d9a81e9 Binary files /dev/null and b/assets-fx/living/animals/sheep.png differ diff --git a/assets-fx/living/ennemies/badbird1.png b/assets-fx/living/ennemies/badbird1.png new file mode 100644 index 0000000..1544f3b Binary files /dev/null and b/assets-fx/living/ennemies/badbird1.png differ diff --git a/assets-fx/living/ennemies/badbird2.png b/assets-fx/living/ennemies/badbird2.png new file mode 100644 index 0000000..4a65b12 Binary files /dev/null and b/assets-fx/living/ennemies/badbird2.png differ diff --git a/assets-fx/living/ennemies/caterp1.png b/assets-fx/living/ennemies/caterp1.png new file mode 100644 index 0000000..041eba3 Binary files /dev/null and b/assets-fx/living/ennemies/caterp1.png differ diff --git a/assets-fx/living/ennemies/caterp2.png b/assets-fx/living/ennemies/caterp2.png new file mode 100644 index 0000000..34fd9fa Binary files /dev/null and b/assets-fx/living/ennemies/caterp2.png differ diff --git a/assets-fx/living/ennemies/fxconv-metadata.txt b/assets-fx/living/ennemies/fxconv-metadata.txt new file mode 100644 index 0000000..6c689f7 --- /dev/null +++ b/assets-fx/living/ennemies/fxconv-metadata.txt @@ -0,0 +1,24 @@ +badbird1.png: + type: bopti-image + name: ennemy_badbird_1 +badbird2.png: + type: bopti-image + name: ennemy_badbird_2 +caterp1.png: + type: bopti-image + name: ennemy_caterp_1 +caterp2.png: + type: bopti-image + name: ennemy_caterp_2 +gloup1.png: + type: bopti-image + name: ennemy_gloup_1 +gloup2.png: + type: bopti-image + name: ennemy_gloup_2 +zombie1.png: + type: bopti-image + name: ennemy_zombie_1 +zombie2.png: + type: bopti-image + name: ennemy_zombie_2 diff --git a/assets-fx/living/ennemies/gloup1.png b/assets-fx/living/ennemies/gloup1.png new file mode 100644 index 0000000..02730d5 Binary files /dev/null and b/assets-fx/living/ennemies/gloup1.png differ diff --git a/assets-fx/living/ennemies/gloup2.png b/assets-fx/living/ennemies/gloup2.png new file mode 100644 index 0000000..dea7655 Binary files /dev/null and b/assets-fx/living/ennemies/gloup2.png differ diff --git a/assets-fx/living/ennemies/zombie1.png b/assets-fx/living/ennemies/zombie1.png new file mode 100644 index 0000000..e5ffa04 Binary files /dev/null and b/assets-fx/living/ennemies/zombie1.png differ diff --git a/assets-fx/living/ennemies/zombie2.png b/assets-fx/living/ennemies/zombie2.png new file mode 100644 index 0000000..d6116a6 Binary files /dev/null and b/assets-fx/living/ennemies/zombie2.png differ diff --git a/assets-fx/tiles/blocks/apple.png b/assets-fx/tiles/blocks/apple.png new file mode 100644 index 0000000..560a69e Binary files /dev/null and b/assets-fx/tiles/blocks/apple.png differ diff --git a/assets-fx/tiles/blocks/barrel.png b/assets-fx/tiles/blocks/barrel.png new file mode 100644 index 0000000..a4f4be2 Binary files /dev/null and b/assets-fx/tiles/blocks/barrel.png differ diff --git a/assets-fx/tiles/blocks/bed.png b/assets-fx/tiles/blocks/bed.png new file mode 100644 index 0000000..72bb5f1 Binary files /dev/null and b/assets-fx/tiles/blocks/bed.png differ diff --git a/assets-fx/tiles/blocks/chain.png b/assets-fx/tiles/blocks/chain.png new file mode 100644 index 0000000..04c047f Binary files /dev/null and b/assets-fx/tiles/blocks/chain.png differ diff --git a/assets-fx/tiles/blocks/cherry.png b/assets-fx/tiles/blocks/cherry.png new file mode 100644 index 0000000..d4ce594 Binary files /dev/null and b/assets-fx/tiles/blocks/cherry.png differ diff --git a/assets-fx/tiles/blocks/choco.png b/assets-fx/tiles/blocks/choco.png new file mode 100644 index 0000000..56809e1 Binary files /dev/null and b/assets-fx/tiles/blocks/choco.png differ diff --git a/assets-fx/tiles/blocks/cotton.png b/assets-fx/tiles/blocks/cotton.png new file mode 100644 index 0000000..f9c7e44 Binary files /dev/null and b/assets-fx/tiles/blocks/cotton.png differ diff --git a/assets-fx/tiles/blocks/fire.png b/assets-fx/tiles/blocks/fire.png new file mode 100644 index 0000000..2104043 Binary files /dev/null and b/assets-fx/tiles/blocks/fire.png differ diff --git a/assets-fx/tiles/blocks/furnace.png b/assets-fx/tiles/blocks/furnace.png new file mode 100644 index 0000000..c1cdfe2 Binary files /dev/null and b/assets-fx/tiles/blocks/furnace.png differ diff --git a/assets-fx/tiles/blocks/fxconv-metadata.txt b/assets-fx/tiles/blocks/fxconv-metadata.txt index 81a1815..8c9c2af 100644 --- a/assets-fx/tiles/blocks/fxconv-metadata.txt +++ b/assets-fx/tiles/blocks/fxconv-metadata.txt @@ -16,3 +16,69 @@ coal.png: steel.png: type: bopti-image name: steel_tile +apple.png: + type: bopti-image + name: apple_tile +barrel.png: + type: bopti-image + name: barrel_tile +bed.png: + type: bopti-image + name: bed_tile +chain.png: + type: bopti-image + name: chain_tile +cherry.png: + type: bopti-image + name: cherry_tile +choco.png: + type: bopti-image + name: choco_tile +cotton.png: + type: bopti-image + name: cotton_tile +fire.png: + type: bopti-image + name: fire_tile +furnace.png: + type: bopti-image + name: furnace_tile +granit.png: + type: bopti-image + name: granit_tile +ingot.png: + type: bopti-image + name: ingot_tile +lantern.png: + type: bopti-image + name: lantern_tile +leaves.png: + type: bopti-image + name: leaves_tile +orange.png: + type: bopti-image + name: orange_tile +pear.png: + type: bopti-image + name: pear_tile +pumpkin.png: + type: bopti-image + name: pumpkin_tile +starston.png: + type: bopti-image + name: starstone_tile +water1.png: + type: bopti-image + name: water_1_tile +water2.png: + type: bopti-image + name: water_2_tile +wheat.png: + type: bopti-image + name: wheat_tile +woodplks.png: + type: bopti-image + name: woodplanks_tile +woodstep.png: + type: bopti-image + name: woodsteps_tile diff --git a/assets-fx/tiles/blocks/granit.png b/assets-fx/tiles/blocks/granit.png new file mode 100644 index 0000000..5628a6b Binary files /dev/null and b/assets-fx/tiles/blocks/granit.png differ diff --git a/assets-fx/tiles/blocks/ingot.png b/assets-fx/tiles/blocks/ingot.png new file mode 100644 index 0000000..659f203 Binary files /dev/null and b/assets-fx/tiles/blocks/ingot.png differ diff --git a/assets-fx/tiles/blocks/lantern.png b/assets-fx/tiles/blocks/lantern.png new file mode 100644 index 0000000..d17da07 Binary files /dev/null and b/assets-fx/tiles/blocks/lantern.png differ diff --git a/assets-fx/tiles/blocks/leaves.png b/assets-fx/tiles/blocks/leaves.png new file mode 100644 index 0000000..3a251eb Binary files /dev/null and b/assets-fx/tiles/blocks/leaves.png differ diff --git a/assets-fx/tiles/blocks/orange.png b/assets-fx/tiles/blocks/orange.png new file mode 100644 index 0000000..503ae49 Binary files /dev/null and b/assets-fx/tiles/blocks/orange.png differ diff --git a/assets-fx/tiles/blocks/pear.png b/assets-fx/tiles/blocks/pear.png new file mode 100644 index 0000000..0dc3d0d Binary files /dev/null and b/assets-fx/tiles/blocks/pear.png differ diff --git a/assets-fx/tiles/blocks/pumpkin.png b/assets-fx/tiles/blocks/pumpkin.png new file mode 100644 index 0000000..95864ba Binary files /dev/null and b/assets-fx/tiles/blocks/pumpkin.png differ diff --git a/assets-fx/tiles/blocks/starston.png b/assets-fx/tiles/blocks/starston.png new file mode 100644 index 0000000..e0a3577 Binary files /dev/null and b/assets-fx/tiles/blocks/starston.png differ diff --git a/assets-fx/tiles/blocks/water1.png b/assets-fx/tiles/blocks/water1.png new file mode 100644 index 0000000..989af77 Binary files /dev/null and b/assets-fx/tiles/blocks/water1.png differ diff --git a/assets-fx/tiles/blocks/water2.png b/assets-fx/tiles/blocks/water2.png new file mode 100644 index 0000000..db4c968 Binary files /dev/null and b/assets-fx/tiles/blocks/water2.png differ diff --git a/assets-fx/tiles/blocks/wheat.png b/assets-fx/tiles/blocks/wheat.png new file mode 100644 index 0000000..0996862 Binary files /dev/null and b/assets-fx/tiles/blocks/wheat.png differ diff --git a/assets-fx/tiles/blocks/woodplks.png b/assets-fx/tiles/blocks/woodplks.png new file mode 100644 index 0000000..f366848 Binary files /dev/null and b/assets-fx/tiles/blocks/woodplks.png differ diff --git a/assets-fx/tiles/blocks/woodstep.png b/assets-fx/tiles/blocks/woodstep.png new file mode 100644 index 0000000..25264be Binary files /dev/null and b/assets-fx/tiles/blocks/woodstep.png differ diff --git a/assets-fx/tiles/overlays/fxconv-metadata.txt b/assets-fx/tiles/overlays/fxconv-metadata.txt index 07902ee..ab6f9b2 100644 --- a/assets-fx/tiles/overlays/fxconv-metadata.txt +++ b/assets-fx/tiles/overlays/fxconv-metadata.txt @@ -10,3 +10,9 @@ block_break3.png: block_break4.png: type: bopti-image name: overlay_break_4 +smoke1.png: + type: bopti-image + name: smoke_1 +smoke2.png: + type: bopti-image + name: smoke_2 diff --git a/assets-fx/tiles/overlays/smoke1.png b/assets-fx/tiles/overlays/smoke1.png new file mode 100644 index 0000000..65de9f4 Binary files /dev/null and b/assets-fx/tiles/overlays/smoke1.png differ diff --git a/assets-fx/tiles/overlays/smoke2.png b/assets-fx/tiles/overlays/smoke2.png new file mode 100644 index 0000000..10e6a07 Binary files /dev/null and b/assets-fx/tiles/overlays/smoke2.png differ diff --git a/assets-fx/tools/axe.png b/assets-fx/tools/axe.png new file mode 100644 index 0000000..b86cc05 Binary files /dev/null and b/assets-fx/tools/axe.png differ diff --git a/assets-fx/tools/fxconv-metadata.txt b/assets-fx/tools/fxconv-metadata.txt index c1d16dc..0cc9cb2 100644 --- a/assets-fx/tools/fxconv-metadata.txt +++ b/assets-fx/tools/fxconv-metadata.txt @@ -1,6 +1,18 @@ pickaxe.png: type: bopti-image name: pickaxe_tool +axe.png: + type: bopti-image + name: axe_tool +sword.png: + type: bopti-image + name: sword_tool +hoe.png: + type: bopti-image + name: hoe_tool +shovel.png: + type: bopti-image + name: shovel_tool selectcross.png: type: bopti-image name: select_tool diff --git a/assets-fx/tools/hoe.png b/assets-fx/tools/hoe.png new file mode 100644 index 0000000..056640e Binary files /dev/null and b/assets-fx/tools/hoe.png differ diff --git a/assets-fx/tools/shovel.png b/assets-fx/tools/shovel.png new file mode 100644 index 0000000..6822ac7 Binary files /dev/null and b/assets-fx/tools/shovel.png differ diff --git a/assets-fx/tools/sword.png b/assets-fx/tools/sword.png new file mode 100644 index 0000000..493a5b9 Binary files /dev/null and b/assets-fx/tools/sword.png differ diff --git a/latest-build/Builder.g1a b/latest-build/Builder.g1a index a14376f..b18344d 100644 Binary files a/latest-build/Builder.g1a and b/latest-build/Builder.g1a differ