Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update alune to set 13 #84

Merged
merged 15 commits into from
Nov 23, 2024
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![alune_header](https://github.com/TeamFightTacticsBots/Alune/assets/60011425/dd30ed87-c5ca-42eb-810a-da07f6502cf5)
<p align="center">
<img src="https://img.shields.io/badge/Python-3.12-green" />
<img src="https://img.shields.io/badge/TFT_Set-12-blue" />
<img src="https://img.shields.io/badge/TFT_Set-13-blue" />
<img src="https://github.com/TeamFightTacticsBots/Alune/actions/workflows/build.yml/badge.svg" />
</p>

Expand Down
67 changes: 27 additions & 40 deletions alune/images.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,31 +165,20 @@ def get_default_traits(cls):
Returns:
A list of the traits to be played by default, if the user misconfigures.
"""
return [cls.WITCHCRAFT, cls.INCANTOR]

ARCANA = auto()
BASTION = auto()
BLASTER = auto()
CHRONO = auto()
DRAGON = auto()
DRUID = auto()
ELDRITCH = auto()
FAERIE = auto()
FROST = auto()
HONEYMANCY = auto()
HUNTER = auto()
INCANTOR = auto()
MAGE = auto()
MULTISTRIKER = auto()
PORTAL = auto()
PRESERVER = auto()
PYRO = auto()
SCHOLAR = auto()
SHAPESHIFTER = auto()
SUGARCRAFT = auto()
VANGUARD = auto()
WARRIOR = auto()
WITCHCRAFT = auto()
return [cls.REBEL]

ACADEMY = auto()
AUTOMATA = auto()
BLACKROSE = auto()
CHEMBARON = auto()
CONQUEROR = auto()
EMISSARY = auto()
ENFORCER = auto()
EXPERIMENT = auto()
FAMILY = auto()
FIRELIGHT = auto()
REBEL = auto()
SCRAP = auto()


class DawnOfHeroesTrait(StrEnum):
Expand All @@ -202,7 +191,7 @@ class DawnOfHeroesTrait(StrEnum):
# noinspection PyMethodParameters
# pylint: disable-next=no-self-argument,redefined-outer-name
def _generate_next_value_(name, start, count, last_values):
return helpers.get_resource_path(f"alune/images/traits/dawn_of_heroes/{name.lower()}.png")
return helpers.get_resource_path(f"alune/images/traits/into_the_arcane/{name.lower()}.png")

@classmethod
def get_default_traits(cls):
Expand All @@ -212,23 +201,21 @@ def get_default_traits(cls):
Returns:
A list of the traits to be played by default, if the user misconfigures.
"""
return [cls.DAWNBRINGER]
return [cls.SENTINEL]

# Dawn of Heroes
ASSASSIN = auto()
BRAWLER = auto()
CANNONEER = auto()
CAVALIER = auto()
DAWNBRINGER = auto()
DRACONIC = auto()
FORGOTTEN = auto()
HELLION = auto()
NIGHTBRINGER = auto()
RANGER = auto()
REDEEMED = auto()
AMBUSHER = auto()
ARTILLERIST = auto()
BRUSIER = auto()
DOMINATOR = auto()
FORMSWAPPER = auto()
PITFIGHTER = auto()
QUICKSTRIKER = auto()
SENTINEL = auto()
SKIRMISHER = auto()
SPELLWEAVER = auto()
SNIPER = auto()
SORCERER = auto()
VISIONARY = auto()
WATCHER = auto()


class ClickButton: # pylint: disable=too-few-public-methods
Expand Down
Binary file added alune/images/traits/academy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed alune/images/traits/arcana.png
Binary file not shown.
Binary file added alune/images/traits/automata.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed alune/images/traits/bastion.png
Binary file not shown.
Binary file added alune/images/traits/blackrose.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed alune/images/traits/blaster.png
Binary file not shown.
Binary file added alune/images/traits/chem-baron.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed alune/images/traits/chrono.png
Binary file not shown.
Binary file added alune/images/traits/conqueror.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed alune/images/traits/dawn_of_heroes/assassin.png
Binary file not shown.
Binary file removed alune/images/traits/dawn_of_heroes/brawler.png
Binary file not shown.
Binary file removed alune/images/traits/dawn_of_heroes/cannoneer.png
Binary file not shown.
Binary file removed alune/images/traits/dawn_of_heroes/cavalier.png
Binary file not shown.
Binary file removed alune/images/traits/dawn_of_heroes/dawnbringer.png
Binary file not shown.
Binary file removed alune/images/traits/dawn_of_heroes/draconic.png
Binary file not shown.
Binary file removed alune/images/traits/dawn_of_heroes/forgotten.png
Binary file not shown.
Binary file removed alune/images/traits/dawn_of_heroes/hellion.png
Binary file not shown.
Binary file removed alune/images/traits/dawn_of_heroes/legionnaire.png
Binary file not shown.
Binary file removed alune/images/traits/dawn_of_heroes/nightbringer.png
Binary file not shown.
Binary file removed alune/images/traits/dawn_of_heroes/ranger.png
Binary file not shown.
Binary file removed alune/images/traits/dawn_of_heroes/redeemed.png
Binary file not shown.
Binary file removed alune/images/traits/dawn_of_heroes/sentinel.png
Binary file not shown.
Binary file removed alune/images/traits/dawn_of_heroes/skirmisher.png
Binary file not shown.
Binary file removed alune/images/traits/dawn_of_heroes/spellweaver.png
Binary file not shown.
Binary file removed alune/images/traits/dragon.png
Binary file not shown.
Binary file removed alune/images/traits/druid.png
Diff not rendered.
Binary file removed alune/images/traits/eldritch.png
Diff not rendered.
Binary file added alune/images/traits/emissary.png
Binary file added alune/images/traits/enforcer.png
Binary file added alune/images/traits/experiment.png
Binary file removed alune/images/traits/faerie.png
Diff not rendered.
Binary file added alune/images/traits/family.png
Binary file added alune/images/traits/firelight.png
Binary file removed alune/images/traits/frost.png
Diff not rendered.
Binary file removed alune/images/traits/honeymancy.png
Diff not rendered.
Binary file removed alune/images/traits/hunter.png
Diff not rendered.
Binary file removed alune/images/traits/incantor.png
Diff not rendered.
Binary file added alune/images/traits/into_the_arcane/ambusher.png
Binary file added alune/images/traits/into_the_arcane/artillerist.png
Binary file added alune/images/traits/into_the_arcane/brusier.png
Binary file added alune/images/traits/into_the_arcane/dominator.png
Binary file added alune/images/traits/into_the_arcane/pitfighter.png
Binary file added alune/images/traits/into_the_arcane/quickstriker.png
Binary file added alune/images/traits/into_the_arcane/sentinel.png
Binary file added alune/images/traits/into_the_arcane/sniper.png
Binary file added alune/images/traits/into_the_arcane/sorcerer.png
Binary file added alune/images/traits/into_the_arcane/visionary.png
Binary file added alune/images/traits/into_the_arcane/watcher.png
Binary file removed alune/images/traits/mage.png
Diff not rendered.
Binary file removed alune/images/traits/multistriker.png
Diff not rendered.
Binary file removed alune/images/traits/portal.png
Diff not rendered.
Binary file removed alune/images/traits/preserver.png
Diff not rendered.
Binary file removed alune/images/traits/pyro.png
Diff not rendered.
Binary file added alune/images/traits/rebel.png
Binary file removed alune/images/traits/scholar.png
Diff not rendered.
Binary file added alune/images/traits/scrap.png
Binary file removed alune/images/traits/shapeshifter.png
Diff not rendered.
Binary file removed alune/images/traits/sugarcraft.png
Diff not rendered.
Binary file removed alune/images/traits/vanguard.png
Diff not rendered.
Binary file removed alune/images/traits/warrior.png
Diff not rendered.
Binary file removed alune/images/traits/witchcraft.png
Diff not rendered.
8 changes: 4 additions & 4 deletions alune/resources/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ game_mode: "normal"
# For a full list of valid traits, visit https://github.com/TeamFightTacticsBots/Alune/tree/main/alune/images/traits
# Recommended dawn of heroes traits: dawnbringer
traits:
- witchcraft
- incantor
- rebel
- sentinel

# Determines whether the bot should surrender as soon as possible (after round 3-1)
# Valid values : true, false
Expand All @@ -40,6 +40,6 @@ adb_port: 5555

# Changing these below values manually can potentially break the bot, so don't!
# Version of the YAML.
version: 6
version: 7
# Version of the TFT set.
set: 12
set: 13
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "alune"
version = "0.1.7"
version = "0.1.8"
authors = [
{name = "akshualy"},
{name = "Detergent13"},
Expand Down