Well other than some QOL improvements the gameplay is now worse... well done

@Phugazi First rule of software engineering: never write the same code twice. Second rule, make your code interchangeable so you can use it over and over

Spaghetti code is the sign of a noob. You can quote me on that to your boss