diff --git a/.gitignore b/.gitignore
index 219ad0681b3e0a0ab518efdbf02169469962206e..3af6a7b9d4b06555e57029066ab39e5a2ac4a56f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
__pycache__
-venv
-.venv
-.vscode/
\ No newline at end of file
+/venv
\ No newline at end of file
diff --git a/TopFarmer_CodeGame/.gitignore b/PyGame_music_ver/.gitignore
similarity index 100%
rename from TopFarmer_CodeGame/.gitignore
rename to PyGame_music_ver/.gitignore
diff --git a/TopFarmer_CodeGame/assets/carrot.png b/PyGame_music_ver/assets/carrot.png
similarity index 100%
rename from TopFarmer_CodeGame/assets/carrot.png
rename to PyGame_music_ver/assets/carrot.png
diff --git a/TopFarmer_CodeGame/assets/carrot1.png b/PyGame_music_ver/assets/carrot1.png
similarity index 100%
rename from TopFarmer_CodeGame/assets/carrot1.png
rename to PyGame_music_ver/assets/carrot1.png
diff --git a/TopFarmer_CodeGame/assets/farmer_idle.png b/PyGame_music_ver/assets/farmer_idle.png
similarity index 100%
rename from TopFarmer_CodeGame/assets/farmer_idle.png
rename to PyGame_music_ver/assets/farmer_idle.png
diff --git a/TopFarmer_CodeGame/assets/music/Lively Meadow (Song Loop) B 118.wav b/PyGame_music_ver/assets/music/Lively Meadow (Song Loop) B 118.wav
similarity index 100%
rename from TopFarmer_CodeGame/assets/music/Lively Meadow (Song Loop) B 118.wav
rename to PyGame_music_ver/assets/music/Lively Meadow (Song Loop) B 118.wav
diff --git a/TopFarmer_CodeGame/assets/music/Lively Meadow Victory Fanfare.wav b/PyGame_music_ver/assets/music/Lively Meadow Victory Fanfare.wav
similarity index 100%
rename from TopFarmer_CodeGame/assets/music/Lively Meadow Victory Fanfare.wav
rename to PyGame_music_ver/assets/music/Lively Meadow Victory Fanfare.wav
diff --git a/TopFarmer_CodeGame/assets/music/Lively Meadow.mp3 b/PyGame_music_ver/assets/music/Lively Meadow.mp3
similarity index 100%
rename from TopFarmer_CodeGame/assets/music/Lively Meadow.mp3
rename to PyGame_music_ver/assets/music/Lively Meadow.mp3
diff --git a/TopFarmer_CodeGame/assets/music/death.wav b/PyGame_music_ver/assets/music/death.wav
similarity index 100%
rename from TopFarmer_CodeGame/assets/music/death.wav
rename to PyGame_music_ver/assets/music/death.wav
diff --git a/TopFarmer_CodeGame/assets/music/round_end.wav b/PyGame_music_ver/assets/music/round_end.wav
similarity index 100%
rename from TopFarmer_CodeGame/assets/music/round_end.wav
rename to PyGame_music_ver/assets/music/round_end.wav
diff --git a/TopFarmer_CodeGame/assets/music/who_bitcrushed_all_my_pumpkins.wav b/PyGame_music_ver/assets/music/who_bitcrushed_all_my_pumpkins.wav
similarity index 100%
rename from TopFarmer_CodeGame/assets/music/who_bitcrushed_all_my_pumpkins.wav
rename to PyGame_music_ver/assets/music/who_bitcrushed_all_my_pumpkins.wav
diff --git a/TopFarmer_CodeGame/assets/potato.png b/PyGame_music_ver/assets/potato.png
similarity index 100%
rename from TopFarmer_CodeGame/assets/potato.png
rename to PyGame_music_ver/assets/potato.png
diff --git a/TopFarmer_CodeGame/assets/potato1.png b/PyGame_music_ver/assets/potato1.png
similarity index 100%
rename from TopFarmer_CodeGame/assets/potato1.png
rename to PyGame_music_ver/assets/potato1.png
diff --git a/TopFarmer_CodeGame/assets/pumpkin.png b/PyGame_music_ver/assets/pumpkin.png
similarity index 100%
rename from TopFarmer_CodeGame/assets/pumpkin.png
rename to PyGame_music_ver/assets/pumpkin.png
diff --git a/TopFarmer_CodeGame/assets/pumpkin1.png b/PyGame_music_ver/assets/pumpkin1.png
similarity index 100%
rename from TopFarmer_CodeGame/assets/pumpkin1.png
rename to PyGame_music_ver/assets/pumpkin1.png
diff --git a/TopFarmer_CodeGame/assets/tree.png b/PyGame_music_ver/assets/tree.png
similarity index 100%
rename from TopFarmer_CodeGame/assets/tree.png
rename to PyGame_music_ver/assets/tree.png
diff --git a/TopFarmer_CodeGame/assets/tree1.png b/PyGame_music_ver/assets/tree1.png
similarity index 100%
rename from TopFarmer_CodeGame/assets/tree1.png
rename to PyGame_music_ver/assets/tree1.png
diff --git a/TopFarmer_CodeGame/code_save.txt b/PyGame_music_ver/code_save.txt
similarity index 100%
rename from TopFarmer_CodeGame/code_save.txt
rename to PyGame_music_ver/code_save.txt
diff --git a/TopFarmer_CodeGame/embed_pygame.py b/PyGame_music_ver/embed_pygame.py
similarity index 100%
rename from TopFarmer_CodeGame/embed_pygame.py
rename to PyGame_music_ver/embed_pygame.py
diff --git a/TopFarmer_CodeGame/farmer.py b/PyGame_music_ver/farmer.py
similarity index 100%
rename from TopFarmer_CodeGame/farmer.py
rename to PyGame_music_ver/farmer.py
diff --git a/TopFarmer_CodeGame/farmgamegui.py b/PyGame_music_ver/farmgamegui.py
similarity index 100%
rename from TopFarmer_CodeGame/farmgamegui.py
rename to PyGame_music_ver/farmgamegui.py
diff --git a/TopFarmer_CodeGame/farmgrid.py b/PyGame_music_ver/farmgrid.py
similarity index 100%
rename from TopFarmer_CodeGame/farmgrid.py
rename to PyGame_music_ver/farmgrid.py
diff --git a/TopFarmer_CodeGame/farmtile.py b/PyGame_music_ver/farmtile.py
similarity index 100%
rename from TopFarmer_CodeGame/farmtile.py
rename to PyGame_music_ver/farmtile.py
diff --git a/PyGame_music_ver/issues.txt b/PyGame_music_ver/issues.txt
new file mode 100644
index 0000000000000000000000000000000000000000..840b752aeff9029e93345a26e242c4c27e52cb24
--- /dev/null
+++ b/PyGame_music_ver/issues.txt
@@ -0,0 +1,23 @@
+# restart goes to first lvl [FIXED]
+# new game does not display first task [FIXED]
+# farm stats reset with each level
+ - happens because farm is initialised
+ - possible fix: restore stats on init (save to file)
+ or store stats elsewhere
+
+# unlocked lvls must be saved and loaded also.[FIXED]
+# "restart" needs to reset inventory. retry after level failure resets inventory successfully
+# crop farm config does not reset correctly.
+# crop farm config sometimes places several crops on one tile [FIXED (for 1st instance)] but not for restart
+# when selecting another lvl from lvl page, sometimes old tiles remain. eg: grass farm into crop farm config-> grass shows behind some crop
+ to see: choose lvl 7 then lvl 5 from lvl page.....then restarting places crops on top of eachother still,
+# restart too many times and game crashes with error:\CodeGame-Capstone-brunch\PyGame_Embedded_Tkinter_levels\embed_pygame.py", line 88, in render_farm
+ farmer_x, farmer_y = self.farm.farmer.get_pos() [FIXED]
+ ^^^^^^^^^^^^^^^^^^^^^^^^
+# new game doesnt reset levels unlocked while already in game. have to first close game, then upon opening, it will be locked again. bcause it uses the previous json file to read in all the level data
+
+
+REFACTORINGS TO FIX DEADLOCKS N STUFF - possible reason for not updating properly
+join threads, terminate then exit
+locks maybe idk? could be stale data causing crop farm config issues
+
diff --git a/TopFarmer_CodeGame/level solutions.txt b/PyGame_music_ver/level solutions.txt
similarity index 100%
rename from TopFarmer_CodeGame/level solutions.txt
rename to PyGame_music_ver/level solutions.txt
diff --git a/TopFarmer_CodeGame/level.py b/PyGame_music_ver/level.py
similarity index 97%
rename from TopFarmer_CodeGame/level.py
rename to PyGame_music_ver/level.py
index 12904e00d449d2ff9a887127eee1077d146f564b..d340c0e3370e870efd3cfddfd146d5413ef44eff 100644
--- a/TopFarmer_CodeGame/level.py
+++ b/PyGame_music_ver/level.py
@@ -227,7 +227,7 @@ class Levels:
def check_level_1_completion(self, farm_stats):
# Check if 5 potatoes are planted in a row/col
- return farm_stats.check_crops_in_row(5, 0) and farm_stats.count_crops(0) ==5
+ return farm_stats.check_crops_in_row(5, 0)
def check_level_2_completion(self, farm_stats):
# check for 4 carrots and 4 pumpkins in an alternating pattern.
diff --git a/TopFarmer_CodeGame/main.py b/PyGame_music_ver/main.py
similarity index 100%
rename from TopFarmer_CodeGame/main.py
rename to PyGame_music_ver/main.py
diff --git a/TopFarmer_CodeGame/musicplayer.py b/PyGame_music_ver/musicplayer.py
similarity index 100%
rename from TopFarmer_CodeGame/musicplayer.py
rename to PyGame_music_ver/musicplayer.py
diff --git a/TopFarmer_CodeGame/requirements.txt b/PyGame_music_ver/requirements.txt
similarity index 100%
rename from TopFarmer_CodeGame/requirements.txt
rename to PyGame_music_ver/requirements.txt
diff --git a/TopFarmer_CodeGame/saveandload.py b/PyGame_music_ver/saveandload.py
similarity index 100%
rename from TopFarmer_CodeGame/saveandload.py
rename to PyGame_music_ver/saveandload.py
diff --git a/TopFarmer_CodeGame/stats.py b/PyGame_music_ver/stats.py
similarity index 100%
rename from TopFarmer_CodeGame/stats.py
rename to PyGame_music_ver/stats.py
diff --git a/TopFarmer_CodeGame/tilegraphics.py b/PyGame_music_ver/tilegraphics.py
similarity index 100%
rename from TopFarmer_CodeGame/tilegraphics.py
rename to PyGame_music_ver/tilegraphics.py
diff --git a/TopFarmer_CodeGame/tutorial.txt b/PyGame_music_ver/tutorial.txt
similarity index 87%
rename from TopFarmer_CodeGame/tutorial.txt
rename to PyGame_music_ver/tutorial.txt
index 1f67662f3f37d55d8ae72ac05a5e9b35c6783f90..06ee27536687e013093ac353c7cc45d108e360ab 100644
--- a/TopFarmer_CodeGame/tutorial.txt
+++ b/PyGame_music_ver/tutorial.txt
@@ -43,9 +43,6 @@ Accessing the grid:
1: carrot
2: pumpkin
- Example: do something if tile to the right from farmer is a carrot
- if farm.grid[farmer.x+1][farmer.y].crop_type == 1:
+ Example: do something if tile downwards from farmer is a carrot
+ if farm.grid[farmer.x][farmer.y + 1].crop_type == 1:
# DO SOMETHING
-
-You are free to write your own functions and declare your own variables using the methods provided to you
-or any built-in Python functions.
\ No newline at end of file