Skip to content

Commit

Permalink
conch clash support
Browse files Browse the repository at this point in the history
  • Loading branch information
catgirlinspace committed Jul 14, 2024
1 parent 28e096b commit 3179ab4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
5 changes: 4 additions & 1 deletion battles/format_schemas/splashcat.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@
"NONE",
"DECUPLE",
"DRAGON",
"DOUBLE_DRAGON"
"DOUBLE_DRAGON",
"CONCH_SHELL_SCRAMBLE",
"CONCH_SHELL_SCRAMBLE_10",
"CONCH_SHELL_SCRAMBLE_33"
]
},
"power": {
Expand Down
3 changes: 3 additions & 0 deletions battles/formats/splashcat_battle.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ class CloutMultiplier(Enum):
DOUBLE_DRAGON = "DOUBLE_DRAGON"
DRAGON = "DRAGON"
NONE = "NONE"
CONCH_SHELL_SCRAMBLE = "CONCH_SHELL_SCRAMBLE"
CONCH_SHELL_SCRAMBLE_10 = "CONCH_SHELL_SCRAMBLE_10"
CONCH_SHELL_SCRAMBLE_33 = "CONCH_SHELL_SCRAMBLE_33"


class SplatfestMode(Enum):
Expand Down
3 changes: 3 additions & 0 deletions battles/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ class SplatfestBattleCloutMultiplier(models.TextChoices):
DECUPLE = 'DECUPLE', _('10x')
DRAGON = 'DRAGON', _('100x')
DOUBLE_DRAGON = 'DOUBLE_DRAGON', _('333x')
CONCH_SHELL_SCRAMBLE = 'CONCH_SHELL_SCRAMBLE', _('Conch Clash')
CONCH_SHELL_SCRAMBLE_10 = 'CONCH_SHELL_SCRAMBLE_10', _('10x Conch Clash')
CONCH_SHELL_SCRAMBLE_33 = 'CONCH_SHELL_SCRAMBLE_33', _('33x Conch Clash')

class VsRule(models.TextChoices):
TURF_WAR = 'TURF_WAR', _('Turf War')
Expand Down

0 comments on commit 3179ab4

Please sign in to comment.