C++ API: Round 2 - Sprite naming with creator input

examples/sprites/sprites.cpp

@@ -12,13 +12,13 @@ struct weapon_t {
 };
 
 std::array<weapon_t, 9> weapons = {{
-  {TRIDENT1, "Trident"},
-  {SWORD1, "Sword"},
-  {LASERGUN1, "Laser Gun"},
-  {MACE1, "Mace"},
-  {DAGGER, "Dagger"},
+  {TRIDENT, "Trident"},
+  {SWORD_IRON, "Sword"},
+  {SHOTGUN_AUTO, "Laser Gun"},
+  {MORNING_STAR, "Mace"},
+  {SAIS, "Dagger"},
   {SPEAR, "Spear"},
-  {BOW, "Bow"},
+  {BOW_HUNTERS, "Bow"},
   {PISTOL, "Pistol"},
   {SHOTGUN, "Shotgun"}
 }};

libraries/picosystem.hpp

@@ -254,70 +254,69 @@ namespace picosystem {
   #ifndef NO_SPRITESHEET
   enum _sprites_ids {
     // 00+
-    CHERRY, APPLE, BANANA, ORANGE, AUBERGINE, CARROT, POTATO, LEAF,
+    CHERRY, TOMATO, BANANA, ORANGE, EGGPLANT, CARROT, POTATO, SPINACH,
     // 08+
-    PARSNIP, MEAT, BEAN, RADISH, STRAWBERRY, PUMPKIN, CUCUMBER, SALT1,
+    GINGER, MEAT, BEANS, TURNIP, STRAWBERRY, PUMPKIN, CUCUMBER, RICE_BOWL,
     // 10+
-    SWORD1, SWORD2, SWORD3, AXE1, DAGGER, MACE1, BOW, ARROW1,
+    CLAW, SWORD_WOOD, SWORD_FROST, AXE, SAIS, MORNING_STAR, BOW_HUNTERS, ARROW,
     // 18+
-    ARROW2, ARROW3, TRIDENT1, SPEAR, TRIDENT2, MACHINEGUN, PISTOL, SHOTGUN,
+    ARROW_FIRE, ARROW_ICE, TRIDENT, SPEAR, TRIDENT_FIRE, MACHINEGUN, PISTOL, SHOTGUN,
     // 20+
-    GEM1, GEM2, GEM3, GEM4, GEM5, GEM6, AMULET, FOLDER,
+    ORB_GREEN, ORB_RED, ORB_YELLOW, ORB_BLUE, CANDY, RUBY_BLUE, BUTTON, OFFICIAL_LETTER,
     // 28+
-    COIN1, SKULL, TICK, CROSS, IDOL1, IDOL2, IDOL3, IDOL4,
+    COIN_A, SKULL, UI_CHECK, UI_CANCEL, ARMOR_WOOD, ARMOR_IRON, ARMOR_GOLD, ARMOR_DIAMOND,
     // 30+
-    SWEETCORN, BROCCOLI, BISCUIT, BERRIES, SCEPTRE, FIRE, LASERGUN1, LASERGUN2,
+    CORN, BROCCOLI, COOKIE, RADISHES, MALLET_FROST, CAMPFIRE, SHOTGUN_AUTO, PISTOL_AUTO,
     // 38+
-    HELMET1, HELMET2, HELMET3, HELMET4, BOOT1, BOOT2, BOOT3, BOOT4,
+    BODY_PROTECTOR, HAT_WIZARD, HELMET_IRON, HELMET_VIKING, BOOTS_LEATHER, BOOTS_IRON, BOOTS_GOLD, BOOTS_DIAMOND,
     // 40+
-    HEART1, SLIME, COIN2, SWORD4, SWORD5, __SPR_45, DYNAMITE, MEDPACK,
+    UI_HEART, SLIME_GREEN, COIN_B, SWORD_IRON, DAGGER_IRON, VEST_LEATHER, DYNAMITE, HEALTH_KIT,
     // 48+
-    GOGGLES, HELMET5, BOMB, OILCAN, SHIRT1, SHIRT2, SPEECH, DREAM,
+    PILOT_GOGGLES, HAT_DEMON_KING, BOMB, WATERING_CAN, MASK_DEMON, MASK_ELVEN, SPEECH_BUBBLE_A, SPEECH_BUBBLE_B,
     // 50+
-    HEART2, HEART3, HEART4, __SPR_53, TORCH, ICE, CARD, DIE,
+    UI_HEART_HALF, UI_HEART_EMPTY, UI_HEART_FROZEN, BUTTERFLY, TORCH, STONE_PIECE, PLAYING_CARD, DIE,
     // 58+
-    HELMET6, HELMET7, UPARROW, RING1, RING2, RING3, RING4, POUCH,
+    HAT_HIGH_KNIGHT_DECORATED, HAT_HIGH_KNIGHT, UI_ARROW_UP, RING_GOLDEN, RING_DEMONS, RING_FROST, RING_NATURE, POUCH_LITTLE,
     // 60+
-    TOKEN, VIAL1, VIAL2, RING5, RING6, BLOCK1, BLOCK2, BLOCK3,
+    COIN_SILVER, POTION_HEALTH, POTION_MAGIC, RING_DIAMOND, RING_EMERALD, BLOCK_STACK_WOOD, BLOCK_STACK_STONE, BLOCK_STACK_SAND,
     // 68+
-    BLOCK4, BLOCK5, BLOCK6, BLOCK7, BLOCK8, BLOCK9, SHIELD1, SACK,
+    BLOCK_STACK_BIOLOGIC, BLOCK_STACK_LAVA, BLOCK_STACK_IRON, BLOCK_STACK_ICE, BLOCK_STACK_DARK, BLOCK_STACK_GOLD, SHIELD_KNIGHT, POUCH_LARGE,
     // 70+
-    BUTTON, VIAL3, VIAL4, TOOTH, BONE, HALFBLOCK1, HALFBLOCK2, HALFBLOCK3,
+    COIN_GOLDEN, POTION_HEALTH_EMPTY, POTION_MAGIC_EMPTY, WINGS, BONE, BLOCK_WOOD, BLOCK_STONE, BLOCK_SAND,
     // 78+
-    HALFBLOCK4, HALFBLOCK5, HALFBLOCK6, HALFBLOCK7, HALFBLOCK8, HALFBLOCK9, SHIELD2, SHIELD3,
+    BLOCK_BIOLOGIC, BLOCK_LAVA, BLOCK_IRON, BLOCK_ICE, BLOCK_DARK, BLOCK_GOLD, SHIELD_MIRROR, SHIELD,
     // 80+
-    FLOWER1, FLOWER2, FLOWER3, FLOWER4, STAFF1, STAFF2, STAFF3, STICK1,
+    FLOWER_DANDELION, FLOWER_TULIP_RED, GRASS, FLOWER_TULIP_BLUE, WAND_FIRE, SPEAR_FROST, MACHETE, LOG,
     // 88+
-    SPIKEBALL, MACE2, AXE2, __SPR_8B, SWORD6, SWORD7, SWORD8, CROWN1,
+    MINE, MORNING_STAR_LARGE, AXE_DOUBLE, STONE_SMALL, SWORD_SILVER, SWORD_SILVER_GREAT, SWORD_DIAMOND, CROWN,
     // 90+
-    GOLD, GEM7, GEM8, GEM9, AXE3, MUSHROOM, SALT2, STICK2,
+    GOLD, DIAMOND, RUBY, EMERALD, AXE_DOUBLE_GOLD, POISON_MUSHROOM, ROPE, LOG_WITH_LEAF,
     // 98+
-    VIAL5, VIAL6, DOT, HELMET8, SWORD9, SWORD10, SWORD11, CROWN2,
+    POTION_SPEED_EMPTY, POTION_SPEED, EMERALD_CRYSTAL, HAT_SEAMONSTER, DAGGER_SILVER, DAGGER_SILVER_RARE, DAGGER_DIAMOND, CROWN_KINGS,
     // A0+
-    TOMATO, LEAF2, LEAF3, LEAF4, LEAF5, MUSHROOM2, STUMP, STAR,
+    APPLE, LEAF_SMALL, LEAF_ACORN, LEAF_LARGE, LEAF_LONG, MUSHROOM, WOOD, UI_STAR,
     // A8+
-    BIRD, BAUBLE, KEY1, KEY2, KEY3, __SPR_AC, NECKLACE1, NECKLACE2, NECKLACE3,
+    BIRD, GREEN_BALL, KEY_IRON, KEY_GOLD, KEY_GOLD_WORM, AMULET_FROST, AMULET_FIRE, AMULET_FOREST,
     // B0+
-    CATERPILLAR, LEAF2E, LEAF3E, LEAF4E, LEAF5E, FLOWER5, FLOWER6, FLOWERS,
+    WORM, LEAF_SMALL_EATEN, LEAF_ACORN_EATEN, LEAF_LARGE_EATEN, LEAF_LONG_EATEN, FLOWER_SMALL, FLOWER_MEDIUM, FLOWER_LARGE,
     // B8+
-    DOLL, EYE, FISH, BURGER, LIGHT, NOTE, DROP, DIPPER,
+    TOTEM_IRON_SMALL, EYEBALL, FISH, BURGER, UI_SUN, NOTE, WATER, LADLE,
     // C0+
-    AVOCADO, VIAL7, VIAL8, VIAL9, VIAL10, CANDYCANE, EGG, SCYTHE1,
+    AVOCADO, POTION_WHITE, POTION_YELLOW, POTION_GREEN, POTION_RED, CANDYCANE, EGG_FRIED, SICKLE_IRON,
     // C8+
-    SCYTHE2, SCYTHE3, CHEESE1, CHEESE2, CURSOR1, __SPR_CD, FIREBALL1, FIREBALL2,
+    GRAPPLING_HOOK, CLIMBING_HOOK, CHEESE_A, CHEESE_B, UI_SELECT, UI_SETTING_SELECT, SPELL_FIRE, SPELL_FIRE_MISSILE,
     // D0+
-    MEDIC, RING7, FLOWER7, FLOWER8, PAN, CONSOLE, HEADPHONES, BRICK1,
+    MEDICAL_KIT, RING_DEATH, BLUEBERRIES, FLOWER_PINK, PAN, COMPUTER, HEADPHONES, STONE_TABLET_EMPTY,
     // D8+
-    BRICK2, BRICK3, SHRIMP, __SPR_DB, CURSOR2, BLUEDOT, __SPR_DE, __SPR_DF,
+    STONE_TABLET_WRITTEN_HALF, STONE_TABLET_WRITTEN, DEMON_RED, BURNING_SPEAR, UI_CURSOR, SPELL_MANA, SPELL_MANA_RAIN, SPELL_MANA_MISSILE,
     // E0+
-    BOOK, __SPR_E1, PHONE, ROSE, BLOCK10, BLOCK11, ICEBLOCK, ROCKET1,
+    BOOK_LARGE, CABBAGE, CONTAINER, FLOWER_ROSE, UI_SPACER_A, UI_SPACER_B, GLASS, UI_DECREASE,
     // E8+
-    ROCKET2, BIRD2, GOBLIN, __SPR_EB, CARCAS, RETICLE, __SPR_EE, __SPR_EF,
+    UI_INCREASE, EAGLE, DEMON_GREEN, DEMON_BLUE, CORPSE, UI_CURRENT, SPELL_EMERALD_SPLASH, SPELL_EMERALD_THUNDER,
     // F0+
-    CLOCK, ALERT, __SPR_F2, QUESTION, BLOCK12, BLOCK13, HARP, CHECKER1,
+    UI_CLOCK, UI_ATTENTION, BATTERY_CELL, UI_QUESTION_MARK, UI_DISABLED_A, UI_DISABLED_B, BOW, START_MARKER,
     // F8+
-    CHECKER2, FLAG1, FLAG2, FLAG3, FLAG4, STOP, MISSILE, BEAMSPLASH
-    // can we better name the __SPR_XX sprites?
+    SMALL_START_MARKER, FLAG_A, FLAG_B, FLAG_C, FLAG_D, UI_ERROR, SPELL_EXPLOSION, SPELL_EXPLOSIVE_MISSILE
   };
   #endif