diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 549ade2b298872abd4fc5893ab8d5d17b8fcca51..d0f7efe0c03a9a5084a11ea61867cab3dbca99a1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,6 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="823e43d5-2667-4282-9037-44d9359c8deb" name="Default Changelist" comment=""> - <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ants_vs_some_bees.py" beforeDir="false" afterPath="$PROJECT_DIR$/ants_vs_some_bees.py" afterDir="false" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -17,8 +15,8 @@ <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/main.py"> <provider selected="true" editor-type-id="text-editor"> - <state> - <caret line="30" column="10" selection-start-line="30" selection-start-column="10" selection-end-line="30" selection-end-column="10" /> + <state relative-caret-position="-1924"> + <caret line="54" column="18" lean-forward="true" selection-start-line="54" selection-start-column="18" selection-end-line="54" selection-end-column="18" /> <folding> <element signature="e#0#29#0" expanded="true" /> </folding> @@ -38,8 +36,8 @@ <file pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/ants_vs_some_bees.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="363"> - <caret line="313" column="60" lean-forward="true" selection-start-line="313" selection-start-column="60" selection-end-line="313" selection-end-column="60" /> + <state relative-caret-position="221"> + <caret line="704" column="104" selection-start-line="704" selection-start-column="104" selection-end-line="704" selection-end-column="104" /> <folding> <element signature="e#0#25#0" expanded="true" /> </folding> @@ -122,7 +120,7 @@ </list> </option> </component> - <component name="RunManager" selected="Python tests.Doctest SuperHarvester.act"> + <component name="RunManager" selected="Python.main"> <configuration name="main" type="PythonConfigurationType" factoryName="Python" temporary="true"> <module name="ants_vs_some_bees" /> <option name="INTERPRETER_OPTIONS" value="" /> @@ -200,8 +198,8 @@ </configuration> <recent_temporary> <list> - <item itemvalue="Python tests.Doctest SuperHarvester.act" /> <item itemvalue="Python.main" /> + <item itemvalue="Python tests.Doctest SuperHarvester.act" /> <item itemvalue="Python tests.Doctest Thrower.act" /> <item itemvalue="Python tests.Doctest Bee.act" /> </list> @@ -250,7 +248,7 @@ <window_info id="Structure" order="1" weight="0.25" /> <window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Find" order="1" /> - <window_info anchor="bottom" id="Run" order="2" weight="0.3271605" /> + <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3271605" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> @@ -329,27 +327,27 @@ <entry file="file://$PROJECT_DIR$/assets/ant_harvester.gif"> <provider selected="true" editor-type-id="images" /> </entry> - <entry file="file://$PROJECT_DIR$/main.py"> + <entry file="file://$PROJECT_DIR$/tower.kv"> <provider selected="true" editor-type-id="text-editor"> - <state> - <caret line="30" column="10" selection-start-line="30" selection-start-column="10" selection-end-line="30" selection-end-column="10" /> - <folding> - <element signature="e#0#29#0" expanded="true" /> - </folding> + <state relative-caret-position="1530"> + <caret line="102" column="42" selection-start-line="102" selection-start-column="42" selection-end-line="102" selection-end-column="42" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tower.kv"> + <entry file="file://$PROJECT_DIR$/main.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1530"> - <caret line="102" column="42" selection-start-line="102" selection-start-column="42" selection-end-line="102" selection-end-column="42" /> + <state relative-caret-position="-1924"> + <caret line="54" column="18" lean-forward="true" selection-start-line="54" selection-start-column="18" selection-end-line="54" selection-end-column="18" /> + <folding> + <element signature="e#0#29#0" expanded="true" /> + </folding> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/ants_vs_some_bees.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="363"> - <caret line="313" column="60" lean-forward="true" selection-start-line="313" selection-start-column="60" selection-end-line="313" selection-end-column="60" /> + <state relative-caret-position="221"> + <caret line="704" column="104" selection-start-line="704" selection-start-column="104" selection-end-line="704" selection-end-column="104" /> <folding> <element signature="e#0#25#0" expanded="true" /> </folding> diff --git a/__pycache__/ants_vs_some_bees.cpython-36.pyc b/__pycache__/ants_vs_some_bees.cpython-36.pyc index f15b06bb0283fc2f8895741851275601d7fed60a..51b2639b05760a70ec09163d9f46373f8b9cbf30 100644 Binary files a/__pycache__/ants_vs_some_bees.cpython-36.pyc and b/__pycache__/ants_vs_some_bees.cpython-36.pyc differ diff --git a/ants_vs_some_bees.py b/ants_vs_some_bees.py index e161d51c40a5f435d7fd195f8c482afc230b82e8..e7569eab42e2333d23c48abce93109d00b576db8 100644 --- a/ants_vs_some_bees.py +++ b/ants_vs_some_bees.py @@ -703,7 +703,7 @@ STANDARD_ANT_ARCHETYPES = ( def make_standard_game(radius=4, wave_count=4, wave_size=2, wave_growth=1, wave_interval=5, bee_health=4, bee_damage=1, - ant_archetypes=STANDARD_ANT_ARCHETYPES, food=15): + ant_archetypes=STANDARD_ANT_ARCHETYPES, food=10): """ Construct the GameState for the beginning of a standard game, which has the ant queen in the center of a square of ColonyPlaces, the Bee's hive on the periphery, and Bee's attacking in waves of increasing size. Most of the