search

vaendryl / Sunrider

source code of the visual novel 'Sunrider'
http://sunrider-vn.com/
41 stars 21 forks source link

Fix for issue 55 #63

Closed BlueOrange closed 9 years ago

BlueOrange commented 9 years ago

Fixes problem where destruction of a boss ship triggers a win in skirmish mode. Added some stuff to the sidemission interface in the process.

BlueOrange commented 9 years ago

youwin() and youlose() are both mine. Tried to follow the existing conventions, as far as I could tell, underscores weren't being used most of the time when these things were put in.

DoumanAsh commented 9 years ago

Remove such names then. At least for these functions. It's fairly bad and unreadable names. Each time when i look at such names it's making me irritated... seriously, i dunno how anyone could get used to such names :D

BlueOrange commented 9 years ago

Fixed

vaendryl commented 9 years ago

seems I can't auto-merge this PR. anyone any idea why?

DoumanAsh commented 9 years ago

Because there are conflicts. Better to rebase it upon current master and solve all merge conflicts. And i suspect that's because blueOrange commits are far behind from current master of Sunrider....

vaendryl commented 9 years ago

I believe I could merge it before the latest naming fix. odd that would cause any conflicts.

DoumanAsh commented 9 years ago

There are too big differences between Orange repo and yours... Most possibly it cannot apply some of these changes to your repo(due to someone replaced bunch of functions... well we know who exactly... :D ) Also: "This branch is 4 commits ahead, 18 commits behind vaendryl:master" I wonder why it was ok originally...

BlueOrange commented 9 years ago

It was OK originally because the number of lines impacted was very small. The naming fix hits a lot more lines, because I renamed things that have been refactored since. Should be easy enough for me to fix up.

BlueOrange commented 9 years ago

OK, thanks for bearing with me while I learn these tools. Should be good now.