switch to generated emojis

.gitignore

@@ -11,3 +11,4 @@ uploads/*.gif
 uploads/*.jpg
 uploads/*.jpeg
 uploads/*.webm
+include/gen

src/campfire.cpp

@@ -24,7 +24,7 @@
 #include <ssod/game_player.h>
 #include <ssod/game_util.h>
 #include <ssod/component_builder.h>
-#include <ssod/emojis.h>
+#include <gen/emoji.h>
 #include <ssod/aes.h>
 #include <ssod/database.h>
 
@@ -160,8 +160,8 @@ dpp::task<void> campfire(const dpp::interaction_create_t& event, player p) {
 				}
 			}
 		}
-		cook_menu.add_select_option(dpp::select_option(tr("COOK_FOOD", event, name), cookable.at("name") + ";" + std::to_string(++index)).set_emoji(sprite::cooked_meat.name, sprite::cooked_meat.id));
-		content << sprite::cooked_meat.get_mention() << " ";
+		cook_menu.add_select_option(dpp::select_option(tr("COOK_FOOD", event, name), cookable.at("name") + ";" + std::to_string(++index)).set_emoji(sprite::meat.name, sprite::meat.id));
+		content << sprite::meat.get_mention() << " ";
 		content << "__**" << name << "**__\n";
 		content << "*" << description << "*\n";
 		content << "**" << tr("INGREDIENTS", event) << "** " << ingredients_list << "\n";

src/combat.cpp

@@ -23,7 +23,7 @@
 #include <ssod/game_util.h>
 #include <ssod/game_dice.h>
 #include <ssod/ssod.h>
-#include <ssod/emojis.h>
+#include <gen/emoji.h>
 #include <ssod/aes.h>
 #include <fmt/format.h>
 #include <ssod/game.h>
@@ -346,7 +346,7 @@ dpp::task<dpp::message> get_pvp_round(const dpp::interaction_create_t& event) {
 			.set_id(security::encrypt("follow_nav;" + std::to_string(p.paragraph) + ";" + std::to_string(p.paragraph)))
 			.set_label(tr("VICTORY", event))
 			.set_style(dpp::cos_primary)
-			.set_emoji(sprite::sword_box_green.name, sprite::sword_box_green.id)
+			.set_emoji(sprite::sword18.name, sprite::sword18.id)
 		);
 		co_await achievement_check("PVP_WIN", event, p, {});
 	}
@@ -685,7 +685,7 @@ dpp::task<void> continue_combat(const dpp::interaction_create_t& event, player p
 			.set_id(security::encrypt("follow_nav;" + std::to_string(p.paragraph) + ";" + std::to_string(p.paragraph)))
 			.set_label(tr("VICTORY", event))
 			.set_style(dpp::cos_primary)
-			.set_emoji(sprite::sword_box_green.name, sprite::sword_box_green.id)
+			.set_emoji(sprite::sword18.name, sprite::sword18.id)
 		);
 		co_await achievement_check("COMBAT_WIN", event, p, {{"enemy", {{"name", p.combatant.name}, {"stamina", p.combatant.stamina}, {"skill", p.combatant.skill}, {"armour", p.combatant.armour}, {"weapon", p.combatant.weapon}}}});
 		output1 << "\n\n```ansi\n";
@@ -934,7 +934,7 @@ dpp::task<void> continue_combat(const dpp::interaction_create_t& event, player p
 				.set_id(security::encrypt("follow_nav;" + std::to_string(p.paragraph) + ";" + std::to_string(p.paragraph)))
 				.set_label(tr("VICTORY", event))
 				.set_style(dpp::cos_primary)
-				.set_emoji(sprite::sword_box_green.name, sprite::sword_box_green.id)
+				.set_emoji(sprite::sword18.name, sprite::sword18.id)
 			);
 			CombatEnded = true;
 		}

src/commands/achievements.cpp

@@ -21,7 +21,7 @@
 #include <ssod/database.h>
 #include <ssod/commands/achievements.h>
 #include <ssod/game_player.h>
-#include <ssod/emojis.h>
+#include <gen/emoji.h>
 #include <fmt/format.h>
 #include <ssod/aes.h>
 
@@ -108,11 +108,11 @@ dpp::task<void> achievements_command::route(const dpp::slashcommand_t &event)
 		 * Gold: 100+ XP award achievement
 		 */
 		long xp = atol(achievement.at("xp"));
-		std::string trophy{sprite::bronze_coin.format()};
+		std::string trophy{sprite::bronzecoin.format()};
 		if (xp > 10 && xp < 100) {
-			trophy = sprite::silver_coin.format();
+			trophy = sprite::silvercoin.format();
 		} else if (xp >= 100) {
-			trophy = sprite::gold_coin.format();
+			trophy = sprite::goldcoin.format();
 		}
 		content << "<:" << trophy << "> __**" << achievement_name << "**__\n";
 		content << "[" << description << "](https://images.ssod.org/resource/achievements/" << achievement.at("emoji") << ")\n";

src/commands/lore.cpp

@@ -21,7 +21,7 @@
 #include <ssod/commands/lore.h>
 #include <ssod/game_date.h>
 #include <ssod/component_builder.h>
-#include <ssod/emojis.h>
+#include <gen/emoji.h>
 #include <ssod/aes.h>
 #include <filesystem>
 #include <set>

src/commands/profile.cpp

@@ -21,7 +21,7 @@
 #include <ssod/database.h>
 #include <ssod/commands/profile.h>
 #include <ssod/game_player.h>
-#include <ssod/emojis.h>
+#include <gen/emoji.h>
 #include <fmt/format.h>
 
 using namespace i18n;
@@ -97,17 +97,17 @@ dpp::task<void> profile_command::route(const dpp::slashcommand_t &event)
 		.set_colour(EMBED_COLOUR)
 		.set_description(content)
 		.set_image(file)
-		.add_field(tr("STAMINA", event), sprite::health_heart.get_mention() + " " + rs[0].at("stamina") + "/" + std::to_string(p2.max_stamina()), true)
+		.add_field(tr("STAMINA", event), sprite::heart.get_mention() + " " + rs[0].at("stamina") + "/" + std::to_string(p2.max_stamina()), true)
 		.add_field(tr("SKILL", event), sprite::book07.get_mention() + " " + rs[0].at("skill") + "/" + std::to_string(p2.max_skill()), true)
 		.add_field(tr("LUCK", event), sprite::clover.get_mention() + " " + rs[0].at("luck") + "/" + std::to_string(p2.max_luck()), true)
-		.add_field("XP", sprite::medal01.get_mention() + " " + rs[0].at("experience"), true)
+		.add_field("XP", sprite::ac_medal01.get_mention() + " " + rs[0].at("experience"), true)
 		.add_field(tr("SPEED", event), sprite::shoes03.get_mention() + " " + rs[0].at("speed") + "/" + std::to_string(p2.max_speed()), true)
 		.add_field(tr("SNEAK", event), sprite::throw05.get_mention() + " " + rs[0].at("sneak") + "/" + std::to_string(p2.max_sneak()), true)
-		.add_field(tr("GOLD", event), sprite::gold_coin.get_mention() + " " + rs[0].at("gold") + "/" + std::to_string(p2.max_gold()), true)
+		.add_field(tr("GOLD", event), sprite::goldcoin.get_mention() + " " + rs[0].at("gold") + "/" + std::to_string(p2.max_gold()), true)
 		.add_field(tr("MANA", event), sprite::hat02.get_mention() + " " + rs[0].at("mana") + "/" + std::to_string(p2.max_mana()), true)
-		.add_field(tr("ARMOUR", event), sprite::helm03.get_mention() + " " + rs[0].at("armour_rating") + " (" + rs[0].at("armour") + ")", true)
+		.add_field(tr("ARMOUR", event), sprite::elm03.get_mention() + " " + rs[0].at("armour_rating") + " (" + rs[0].at("armour") + ")", true)
 		.add_field(tr("WEAPON", event), sprite::axe013.get_mention() + " " + rs[0].at("weapon_rating") + " (" + rs[0].at("weapon") + ")", true)
-		.add_field(tr("NOTORIETY", event), sprite::helm01.get_mention() + " " + rs[0].at("notoriety"), true)
+		.add_field(tr("NOTORIETY", event), sprite::elm01.get_mention() + " " + rs[0].at("notoriety"), true)
 		.add_field(tr("RATIONS", event), sprite::cheese.get_mention() + " " + rs[0].at("rations") + "/" + std::to_string(p2.max_rations()), true)
 		.add_field(tr("SCROLLS", event), sprite::scroll.get_mention() + " " + rs[0].at("scrolls"), true)
 	;

src/commands/reset.cpp

@@ -20,7 +20,7 @@
 #include <ssod/ssod.h>
 #include <ssod/commands/reset.h>
 #include <ssod/aes.h>
-#include <ssod/emojis.h>
+#include <gen/emoji.h>
 #include <ssod/game_player.h>
 #include <fmt/format.h>
 

src/commands/start.cpp

@@ -25,7 +25,7 @@
 #include <ssod/game_player.h>
 #include <ssod/game.h>
 #include <ssod/aes.h>
-#include <ssod/emojis.h>
+#include <gen/emoji.h>
 #include <ssod/config.h>
 #include <ssod/neutrino_api.h>
 #include <ssod/sentry.h>

src/game.cpp

@@ -28,7 +28,7 @@
 #include <ssod/paragraph.h>
 #include <ssod/game_util.h>
 #include <ssod/component_builder.h>
-#include <ssod/emojis.h>
+#include <gen/emoji.h>
 #include <ssod/combat.h>
 #include <ssod/aes.h>
 #include <ssod/wildcard.h>
@@ -114,7 +114,7 @@ dpp::task<void> death(player& p, component_builder& cb) {
 			.set_id(security::encrypt("resurrect"))
 			.set_label(tr("RESURRECT_ME", p.event))
 			.set_style(dpp::cos_success)
-			.set_emoji(sprite::health_heart.name, sprite::health_heart.id)
+			.set_emoji(sprite::heart.name, sprite::heart.id)
 		);
 	} else {
 		toast += tr("RESURRECT_NOT_AVAILABLE", p.event, dpp::utility::timestamp(p.last_resurrect + when, dpp::utility::tf_relative_time));
@@ -234,7 +234,7 @@ dpp::task<void> game_input(const dpp::form_submit_t & event) {
 			p.paragraph = atol(parts[1]);
 			co_await achievement_check("ANSWER_RIDDLE_CORRECT", event, p);
 		} else {
-			p.add_toast({ .message = "### " + sprite::inv_drop.get_mention() + " " + tr("INCORRECT_RIDDLE", event), .image = "confused.png" });
+			p.add_toast({ .message = "### " + sprite::x_.get_mention() + " " + tr("INCORRECT_RIDDLE", event), .image = "confused.png" });
 			co_await achievement_check("ANSWER_RIDDLE_INCORRECT", event, p);
 		}
 		bot.log(dpp::ll_debug, "Answered: " + entered_answer);
@@ -1140,8 +1140,8 @@ dpp::task<void> bank(const dpp::interaction_create_t& event, player p) {
 			.icon_url = bot.me.get_avatar_url(), 
 			.proxy_url = "",
 		})
-		.add_field(tr("YOUR_BALANCE", event), std::to_string(amount) + " " + tr("GOLD", event) + " " + sprite::gold_coin.get_mention(), true)
-		.add_field(tr("COIN_PURSE", event), std::to_string(p.gold) + " " + tr("GOLD", event) + " " + sprite::gold_coin.get_mention(), true)
+		.add_field(tr("YOUR_BALANCE", event), std::to_string(amount) + " " + tr("GOLD", event) + " " + sprite::goldcoin.get_mention(), true)
+		.add_field(tr("COIN_PURSE", event), std::to_string(p.gold) + " " + tr("GOLD", event) + " " + sprite::goldcoin.get_mention(), true)
 		.set_colour(EMBED_COLOUR)
 		.set_description(content.str());
 
@@ -1217,15 +1217,15 @@ dpp::task<void> bank(const dpp::interaction_create_t& event, player p) {
 			.set_id(security::encrypt("deposit_gold"))
 			.set_label(tr("DEPOSIT_GOLD", event))
 			.set_style(dpp::cos_primary)
-			.set_emoji(sprite::gold_coin.name, sprite::gold_coin.id)
+			.set_emoji(sprite::goldcoin.name, sprite::goldcoin.id)
 			.set_disabled(p.gold == 0)
 		)
 		.add_component(dpp::component()
 			.set_type(dpp::cot_button)
 			.set_id(security::encrypt("withdraw_gold"))
 			.set_label(tr("WITHDRAW_GOLD", event))
 			.set_style(dpp::cos_primary)
-			.set_emoji(sprite::gold_coin.name, sprite::gold_coin.id)
+			.set_emoji(sprite::goldcoin.name, sprite::goldcoin.id)
 			.set_disabled(amount == 0)
 		)
 		.add_component(help_button(event))
@@ -1536,7 +1536,7 @@ dpp::task<void> continue_game(const dpp::interaction_create_t& event, player p)
 		if (n.type == nav_type_respawn) {
 			comp.set_emoji(sprite::skull.name, sprite::skull.id);
 		} else if (n.type == nav_type_bank) {
-			comp.set_emoji(sprite::gold_bar.name, sprite::gold_bar.id);
+			comp.set_emoji(sprite::goldbar.name, sprite::goldbar.id);
 		} else if (n.type == nav_type_modal) {
 			comp.set_emoji("❓");
 		}
@@ -1592,7 +1592,7 @@ dpp::task<void> continue_game(const dpp::interaction_create_t& event, player p)
 						.set_id(security::encrypt("campfire"))
 						.set_label(tr("COOK", event))
 						.set_style(dpp::cos_secondary)
-						.set_emoji(sprite::cooked_meat.name, sprite::cooked_meat.id)
+						.set_emoji(sprite::meat.name, sprite::meat.id)
 					);
 				}
 			}

src/grimoire.cpp

@@ -24,7 +24,7 @@
 #include <ssod/game_player.h>
 #include <ssod/game_util.h>
 #include <ssod/component_builder.h>
-#include <ssod/emojis.h>
+#include <gen/emoji.h>
 #include <ssod/aes.h>
 #include <ssod/database.h>
 

src/inventory.cpp

@@ -25,7 +25,7 @@
 #include <ssod/game_player.h>
 #include <ssod/game_util.h>
 #include <ssod/component_builder.h>
-#include <ssod/emojis.h>
+#include <gen/emoji.h>
 #include <ssod/aes.h>
 #include <ssod/database.h>
 
@@ -44,16 +44,16 @@ dpp::task<void> inventory(const dpp::interaction_create_t& event, player p) {
 	std::vector<dpp::embed_field> fields;
 
 	content << "__**" << tr("Stats", event) << "**__\n";
-	content << "<:" << sprite::health_heart.format() << "> " << tr("STAMINA", event) << ": __" << p.stamina << "__";
+	content << "<:" << sprite::heart.format() << "> " << tr("STAMINA", event) << ": __" << p.stamina << "__";
 	content << " <:" << sprite::book07.format() << "> " << tr("SKILL", event) << ": __" << p.skill << "__";
 	content << " <:" << sprite::clover.format() << "> " << tr("LUCK", event) << ": __" << p.luck << "__";
-	content << " <:" << sprite::medal01.format() << "> XP: __" << p.experience << "__ (" << tr("LEVEL", event) << ": __" << p.get_level() << "__)\n";
+	content << " <:" << sprite::ac_medal01.format() << "> XP: __" << p.experience << "__ (" << tr("LEVEL", event) << ": __" << p.get_level() << "__)\n";
 	content << " <:" << sprite::shoes03.format() << "> " << tr("SPEED", event) << ": __" << p.speed << "__";
 	if (p.gold > 0) {
-		content << " <:" << sprite::gold_coin.format() << "> " << tr("GOLD", event) << ": __" << p.gold << "__";
+		content << " <:" << sprite::goldcoin.format() << "> " << tr("GOLD", event) << ": __" << p.gold << "__";
 	}
 	if (p.silver > 0) {
-		content << " <:" << sprite::silver_coin.format() << "> " << tr("SILVER", event) << ": __" << p.silver << "__";
+		content << " <:" << sprite::silvercoin.format() << "> " << tr("SILVER", event) << ": __" << p.silver << "__";
 	}
 
 	content << "\n";