drawing, moving, and collision problems (pygame)

[SheeppOSU]

There are no actual errors but there are errors in what I expect it to do. I have this game and after defeating all of the enemies can touch the side of the canvas. It resets everything to the next level and puts them on the opposite side of the map to give them the idea of a new area. The problems are as follows below -

problem 1 - the player is not placed on the opposite of the canvas after defeating the enemy and touching the edge of the canvas

problem 2 - When they are in the town, they have to go to the Cabin and Shop before anything happens when touching the edge. When they touch the left and top, nothing happens, if they touch the right or bottom, it doesn't end the town func but it places them on the other side of the canvas.

The code and where it can be downloaded is here - https://github.com/Sheepposu/Destination

---

I'll post some lines to look at that are responsible for this

---

problem 1 - line 919
problem 2 - 976

The player class starts at line 129
The move func inside the player class starts on line 312

---

If you do download it you'll need to know that you press "p" to pause and see/upgrade all your stats. The sword deals damage on touch.

---

He that can have patience can have what he will
- Benjamin Franklin