From 61f30234af01b24b1a442a0b28232d90602fa8a9 Mon Sep 17 00:00:00 2001 From: ToeThumbs <138536573+ToeThumbs@users.noreply.github.com> Date: Sun, 7 Dec 2025 20:37:50 -0500 Subject: [PATCH 1/8] Added Chosen to lua --- almanac/game/feh.lua | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/almanac/game/feh.lua b/almanac/game/feh.lua index ce721b8d..75737f89 100644 --- a/almanac/game/feh.lua +++ b/almanac/game/feh.lua @@ -45,6 +45,7 @@ function Character:default_options() rarity = 5, merge = 0, flower = 0, + chosen = 0, resplendent = false, max = false, secret = false, @@ -62,6 +63,7 @@ function Character:setup() if self.options.max or self.options.secret then self.options.flower = self:flower_limit() self.options.merge = 10 + self.options.chosen = 10 if self:has_resplendent() then self.options.resplendent = true @@ -91,6 +93,7 @@ function Character:setup() self.rarity = self.options.rarity self.merge = self.options.merge self.flower = self.options.flower + self.chosen = self.options.chosen self.resplendent = self.options.resplendent self.aide = self.options.aide @@ -347,6 +350,11 @@ function Character:get_info() if self:is_entwined() then text = text .. string.format("%sEntwinned Hero\n", heroes_pack:get("entwined")) end + + -- Check for chosen + if self:is_chosen() then + text = text .. string.format("%sChosen Hero\n", heroes_pack:get("chosen")) + end return text end @@ -432,6 +440,10 @@ function Character:star_level() text = text .. string.format("%s+%s", self:flower_icon(), self.flower) end + if self.chosen > 0 then + text = text .. string.format("%s+%s", self:chosen_icon(), self.chosen) + end + return text end @@ -604,6 +616,21 @@ function Character:calc_base() end end + -- Chosen bonus + if self.chosen > 0 then + local increase = 1 + + for i = 1, self.chosen do + if increase == 6 then + increase = 1 + end + + boost(increase) + + increase = increase + 1 + end + end + return base end @@ -812,6 +839,10 @@ function Character:is_entwined() return (self.data.type == "entwined") end +function Character:is_chosen() + return (self.data.type == "chosen") +end + function Character:has_resplendent() return (self.data.resplendent) end @@ -824,6 +855,10 @@ function Character:flower_icon() return heroes_pack:get( string.format("feh_flower%s", self.data.move) ) end +function Character:chosen_icon() + return heroes_pack:get( string.format("feh_chosen%s", self.data.move) ) +end + function Character:movement_icon() return heroes_pack:get( string.format("feh_%s", self.data.move) ) end From 3f19978ba80b0ebe9c605266910c0fb187aaee62 Mon Sep 17 00:00:00 2001 From: ToeThumbs <138536573+ToeThumbs@users.noreply.github.com> Date: Sun, 7 Dec 2025 21:01:18 -0500 Subject: [PATCH 2/8] added icon for chosen --- database/feh/emoji.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/database/feh/emoji.json b/database/feh/emoji.json index 465fb1b9..ca11e5b7 100644 --- a/database/feh/emoji.json +++ b/database/feh/emoji.json @@ -429,9 +429,9 @@ "id": 1163570468910022686, "animated": false }, - "entwined": { - "name": "entwined", - "id": 1419463445174292740, + "feh_chosen": { + "name": "chosen", + "id": 1447406357190807594, "animated": false } } \ No newline at end of file From b481f4d4bbfce9ff8d0303c25b811b8306671765 Mon Sep 17 00:00:00 2001 From: ToeThumbs <138536573+ToeThumbs@users.noreply.github.com> Date: Sun, 7 Dec 2025 21:09:28 -0500 Subject: [PATCH 3/8] fix the emoji ID --- database/feh/emoji.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/feh/emoji.json b/database/feh/emoji.json index ca11e5b7..4edc3cd9 100644 --- a/database/feh/emoji.json +++ b/database/feh/emoji.json @@ -431,7 +431,7 @@ }, "feh_chosen": { "name": "chosen", - "id": 1447406357190807594, + "id": 1447409449965846579, "animated": false } } \ No newline at end of file From f64f10e7c03f20b3649a958fc52c0f23cba2569b Mon Sep 17 00:00:00 2001 From: ToeThumbs <138536573+ToeThumbs@users.noreply.github.com> Date: Sun, 7 Dec 2025 21:16:59 -0500 Subject: [PATCH 4/8] updated lua --- almanac/game/feh.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/almanac/game/feh.lua b/almanac/game/feh.lua index 75737f89..59b34927 100644 --- a/almanac/game/feh.lua +++ b/almanac/game/feh.lua @@ -856,7 +856,7 @@ function Character:flower_icon() end function Character:chosen_icon() - return heroes_pack:get( string.format("feh_chosen%s", self.data.move) ) + return heroes_pack:get("chosen") end function Character:movement_icon() From 85f93b74a7611f4592dfb999301680d10ec46f87 Mon Sep 17 00:00:00 2001 From: ToeThumbs <138536573+ToeThumbs@users.noreply.github.com> Date: Sun, 7 Dec 2025 21:23:10 -0500 Subject: [PATCH 5/8] Add files via upload --- almanac/game/feh.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/almanac/game/feh.lua b/almanac/game/feh.lua index 59b34927..ceaff46c 100644 --- a/almanac/game/feh.lua +++ b/almanac/game/feh.lua @@ -856,7 +856,7 @@ function Character:flower_icon() end function Character:chosen_icon() - return heroes_pack:get("chosen") + return heroes_pack:get("feh_chosen") end function Character:movement_icon() From 15ad6d6a5b638fff194cc512313b60a39f5b0011 Mon Sep 17 00:00:00 2001 From: ToeThumbs <138536573+ToeThumbs@users.noreply.github.com> Date: Sun, 7 Dec 2025 21:27:17 -0500 Subject: [PATCH 6/8] Add files via upload --- database/feh/emoji.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/feh/emoji.json b/database/feh/emoji.json index 4edc3cd9..270beaf7 100644 --- a/database/feh/emoji.json +++ b/database/feh/emoji.json @@ -430,7 +430,7 @@ "animated": false }, "feh_chosen": { - "name": "chosen", + "name": "feh_chosen", "id": 1447409449965846579, "animated": false } From 2045e3042b9bc4da0c8f51c003d1ff435c3fa622 Mon Sep 17 00:00:00 2001 From: ToeThumbs <138536573+ToeThumbs@users.noreply.github.com> Date: Sun, 7 Dec 2025 21:33:00 -0500 Subject: [PATCH 7/8] Add files via upload --- database/feh/emoji.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/feh/emoji.json b/database/feh/emoji.json index 270beaf7..d7ba5258 100644 --- a/database/feh/emoji.json +++ b/database/feh/emoji.json @@ -431,7 +431,7 @@ }, "feh_chosen": { "name": "feh_chosen", - "id": 1447409449965846579, + "id": 1447415260498624614, "animated": false } } \ No newline at end of file From c5df41bf82bc493f356d2e5f01b8f5efa1c52fd8 Mon Sep 17 00:00:00 2001 From: ToeThumbs <138536573+ToeThumbs@users.noreply.github.com> Date: Sun, 7 Dec 2025 21:42:57 -0500 Subject: [PATCH 8/8] Add files via upload --- database/feh/emoji.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/feh/emoji.json b/database/feh/emoji.json index d7ba5258..7ae8fe7c 100644 --- a/database/feh/emoji.json +++ b/database/feh/emoji.json @@ -431,7 +431,7 @@ }, "feh_chosen": { "name": "feh_chosen", - "id": 1447415260498624614, + "id": 1447409400296898570, "animated": false } } \ No newline at end of file