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.

Sign up for GitHub

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

February update #226

Merged
merged 4 commits into from
Feb 29, 2024
Merged

February update #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb9c691
feature: split troops/spells by resource
lukasthaler Feb 27, 2024
518e356
chore: add new spells and equipment
lukasthaler Feb 27, 2024
8c7d6a0
chore: bump versions & add release notes
lukasthaler Feb 27, 2024
e2dfabc
chore: update static data
lukasthaler Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion coc/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
SOFTWARE.
"""

__version__ = "3.2.1"
__version__ = "3.3.0"

from .abc import BasePlayer, BaseClan
from .clans import RankedClan, Clan
Expand All @@ -37,8 +37,12 @@
BUILDER_TROOPS_ORDER,
HERO_ORDER,
PETS_ORDER,
ELIXIR_TROOP_ORDER,
DARK_ELIXIR_TROOP_ORDER,
HOME_TROOP_ORDER,
SIEGE_MACHINE_ORDER,
ELIXIR_SPELL_ORDER,
DARK_ELIXIR_SPELL_ORDER,
SPELL_ORDER,
SUPER_TROOP_ORDER,
UNRANKED_LEAGUE_DATA,
Expand Down
34 changes: 25 additions & 9 deletions coc/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class Resource(Enum):
starry_ore = "EpicOre"


HOME_TROOP_ORDER = [
ELIXIR_TROOP_ORDER = [
"Barbarian",
"Archer",
"Giant",
Expand All @@ -101,6 +101,10 @@ class Resource(Enum):
"Dragon Rider",
"Electro Titan",
"Root Rider",
]


DARK_ELIXIR_TROOP_ORDER = [
"Minion",
"Hog Rider",
"Valkyrie",
Expand Down Expand Up @@ -139,12 +143,11 @@ class Resource(Enum):
"Ice Hound",
"Super Bowler",
"Super Miner",
"Super Hog Rider"
"Super Hog Rider",
]

#enum with only the actual troops, not sure why they were combined to begin with
HV_TROOP_ORDER = HOME_TROOP_ORDER
HOME_TROOP_ORDER = HOME_TROOP_ORDER + SIEGE_MACHINE_ORDER
HV_TROOP_ORDER = ELIXIR_TROOP_ORDER + DARK_ELIXIR_TROOP_ORDER
HOME_TROOP_ORDER = HV_TROOP_ORDER + SIEGE_MACHINE_ORDER


BUILDER_TROOPS_ORDER = [
Expand All @@ -159,10 +162,11 @@ class Resource(Enum):
"Drop Ship",
"Power P.E.K.K.A",
"Hog Glider",
"Electrofire Wizard"
"Electrofire Wizard",
]

SPELL_ORDER = [

ELIXIR_SPELL_ORDER = [
"Lightning Spell",
"Healing Spell",
"Rage Spell",
Expand All @@ -171,13 +175,21 @@ class Resource(Enum):
"Clone Spell",
"Invisibility Spell",
"Recall Spell",
]


DARK_ELIXIR_SPELL_ORDER = [
"Poison Spell",
"Earthquake Spell",
"Haste Spell",
"Skeleton Spell",
"Bat Spell",
"Overgrowth Spell",
]


SPELL_ORDER = ELIXIR_SPELL_ORDER + DARK_ELIXIR_SPELL_ORDER

HOME_BASE_HERO_ORDER = ["Barbarian King", "Archer Queen", "Grand Warden", "Royal Champion"]
BUILDER_BASE_HERO_ORDER = ["Battle Machine", "Battle Copter"]
HERO_ORDER = HOME_BASE_HERO_ORDER + BUILDER_BASE_HERO_ORDER
Expand All @@ -191,7 +203,7 @@ class Resource(Enum):
"Diggy",
"Poison Lizard",
"Phoenix",
"Spirit Fox"
"Spirit Fox",
]

EQUIPMENT = [
Expand All @@ -208,7 +220,11 @@ class Resource(Enum):
"Giant Arrow",
"Healer Puppet",
"Rage Gem",
"Healing Tome"
"Healing Tome",
"Giant Gauntlet",
"Frozen Arrow",
"Hog Rider Puppet",
"Haste Vial",
]

ACHIEVEMENT_ORDER = [
Expand Down
Loading
Loading