Our 'classes- jobs' files were too different for mercurials auto merge to work with, well, for me anyway. So I scrapped my old file and done some quick spelling error fixes and attempted to merge...
Did I break everything?
Also I seem to be getting minus gold in tips from my terrible service girls and strippers.
eg - 'Moeblob earned -33 gold in tips, you take it all. '
also ' she expects to be compensated for her services( -35 gold). You've payed her more than that (0 gold)!
And dev note>>> i missed something <<< charisma = 5, strip = -5
might as well throw in the error report here too - trying to clean my pigstall of a brothel, clean all brothels clicked.
While running game code:
File "game/library/screens/pyt - screens - brothelmanagement.rpy", line 18, in script
File "game/library/screens/pyt - screens - brothelmanagement.rpy", line 116, in python
NameError: name 'self' is not defined
and - label clean does not exist. Then you get stuck on a blank wood background screen with nothing to click.