Merge pull request #3 from joshfokis/heroes_unite

Heroes unite

Author: bluebasil

.gitignore

@@ -0,0 +1,212 @@
+
+# Created by https://www.gitignore.io/api/python,pycharm
+# Edit at https://www.gitignore.io/?templates=python,pycharm
+
+### PyCharm ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### PyCharm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# End of https://www.gitignore.io/api/python,pycharm

base/cards.py

@@ -141,7 +141,7 @@ class blue_beetle(card_frame.card):
 	vp = 2
 	cost = 6
 	ctype = cardtype.HERO
-	defence = True
+	defense = True
 	text = "+3 Power.  Defense: You may reveal this card from your hand to avoid an Attack. (It stays in your hand)"
 	image = "base/images/cards/Blue_Beetle.jpeg"
 
@@ -158,7 +158,7 @@ class bulletproof(card_frame.card):
 	vp = 1
 	cost = 4
 	ctype = cardtype.SUPERPOWER
-	defence = True
+	defense = True
 	text = "+2 Power.  Defense: You may discard this card to avoid an Attack.  If you do, draw a card and you may destroy a card in your discard pile."
 	image = "base/images/cards/Bulletproof.jpeg"
 
@@ -185,7 +185,7 @@ class the_cape_and_cowl(card_frame.card):
 	vp = 1
 	cost = 4
 	ctype = cardtype.EQUIPMENT
-	defence = True
+	defense = True
 	text = "+2 Power.  Defense: You may discard this card to avoid an Attack.  If you do, draw two cards."
 	image = "base/images/cards/The_Cape_and_Cowl.jpeg"
 
@@ -270,10 +270,7 @@ class the_dark_knight(card_frame.card):
 	def trigger(self,ttype,data,player,active,immediate):
 		if globe.DEBUG:
 			print("test - DK",self.name,flush=True)
-		if trigger.test(immediate,\
-						trigger.GAIN_CARD, \
-						self.trigger, \
-						player,ttype) \
+		if trigger.test(immediate,trigger.GAIN_CARD,self.trigger,player,ttype) \
 				and data[0] == False \
 				and effects.ok_or_no(f"Would you like to put {data[1].name} into your hand?",player,data[1],ai_hint.ALWAYS):
 			if globe.DEBUG:
@@ -570,7 +567,7 @@ class lasso_of_truth(card_frame.card):
 	vp = 1
 	cost = 2
 	ctype = cardtype.EQUIPMENT
-	defence = True
+	defense = True
 	text = "+1 Power\nDefence:: You may discard this card to avoid an Attack.  If you do, draw a card."
 	image = "base/images/cards/Lasso_of_Truth.jpeg"
 
@@ -909,7 +906,7 @@ class super_speed(card_frame.card):
 	vp = 1
 	cost = 3
 	ctype = cardtype.SUPERPOWER
-	defence = True
+	defense = True
 	text = "Draw a card.  Defense: You may discard this card to avoid an Attack.  If you do, draw two cards."
 	image = "base/images/cards/Super_Speed.jpeg"
 

base/deck.py

@@ -22,58 +22,58 @@ def initialize_supervillains():
 	assemble.append(cards.ras_al_ghul())
 	return assemble
 
-deck = {cards.aquamans_trident: 3, \
-		cards.bane: 2, \
-		cards.the_batmobile: 3, \
-		cards.the_bat_signal: 3, \
-		cards.bizarro: 1, \
-		cards.blue_beetle: 1, \
-		cards.bulletproof: 3, \
-		cards.the_cape_and_cowl: 3, \
-		cards.catwoman: 3, \
-		cards.cheetah: 2, \
-		cards.clayface: 2, \
-		cards.the_dark_knight: 1, \
-		cards.doomsday: 2, \
-		cards.the_emerald_knight: 1, \
-		cards.fastest_man_alive: 1, \
-		cards.gorilla_grodd: 2, \
-		cards.green_arrow: 3, \
-		cards.green_arrows_bow: 3, \
-		cards.harley_quinn: 2, \
-		cards.heat_vision: 3, \
-		cards.high_tech_hero: 3, \
-		cards.jonn_jonzz: 1, \
-		cards.kid_flash: 4, \
-		cards.king_of_atlantis: 1, \
-		cards.lasso_of_truth: 3, \
-		cards.lobo: 1, \
-		cards.the_man_of_steel: 1, \
-		cards.mera: 2, \
-		cards.nth_metal: 4, \
-		cards.the_penguin: 2, \
-		cards.poison_ivy: 2, \
-		cards.power_ring: 3, \
-		cards.princess_diana_of_themyscira: 1, \
-		cards.the_riddler: 2, \
-		cards.robin: 3, \
-		cards.scarecrow: 2, \
-		cards.solomon_grundy: 2, \
-		cards.starro: 1, \
-		cards.suicide_squad: 6, \
-		cards.super_speed: 4, \
-		cards.super_strength: 3, \
-		cards.super_girl: 2, \
-		cards.swamp_thing: 2, \
-		cards.two_face: 2, \
-		cards.utility_belt: 3, \
-		cards.x_ray_vision: 3, \
-		cards.zatanna_zatara: 2, \
-		cards.arkham_asylum: 1, \
-		cards.the_batcave: 1, \
-		cards.fortress_of_solitude: 1, \
-		cards.titans_tower: 1, \
-		cards.the_watchtower: 1, \
+deck = {cards.aquamans_trident: 3,
+		cards.bane: 2,
+		cards.the_batmobile: 3,
+		cards.the_bat_signal: 3,
+		cards.bizarro: 1,
+		cards.blue_beetle: 1,
+		cards.bulletproof: 3,
+		cards.the_cape_and_cowl: 3,
+		cards.catwoman: 3,
+		cards.cheetah: 2,
+		cards.clayface: 2,
+		cards.the_dark_knight: 1,
+		cards.doomsday: 2,
+		cards.the_emerald_knight: 1,
+		cards.fastest_man_alive: 1,
+		cards.gorilla_grodd: 2,
+		cards.green_arrow: 3,
+		cards.green_arrows_bow: 3,
+		cards.harley_quinn: 2,
+		cards.heat_vision: 3,
+		cards.high_tech_hero: 3,
+		cards.jonn_jonzz: 1,
+		cards.kid_flash: 4,
+		cards.king_of_atlantis: 1,
+		cards.lasso_of_truth: 3,
+		cards.lobo: 1,
+		cards.the_man_of_steel: 1,
+		cards.mera: 2,
+		cards.nth_metal: 4,
+		cards.the_penguin: 2,
+		cards.poison_ivy: 2,
+		cards.power_ring: 3,
+		cards.princess_diana_of_themyscira: 1,
+		cards.the_riddler: 2,
+		cards.robin: 3,
+		cards.scarecrow: 2,
+		cards.solomon_grundy: 2,
+		cards.starro: 1,
+		cards.suicide_squad: 6,
+		cards.super_speed: 4,
+		cards.super_strength: 3,
+		cards.super_girl: 2,
+		cards.swamp_thing: 2,
+		cards.two_face: 2,
+		cards.utility_belt: 3,
+		cards.x_ray_vision: 3,
+		cards.zatanna_zatara: 2,
+		cards.arkham_asylum: 1,
+		cards.the_batcave: 1,
+		cards.fortress_of_solitude: 1,
+		cards.titans_tower: 1,
+		cards.the_watchtower: 1,
 		}
 
 def initialize_deck():