Another update to the Scurvy Scavenger scenario

daid / EmptyEpsilon

Open source bridge simulator. Build with the SeriousProton engine.

https://daid.github.io/EmptyEpsilon/

GNU General Public License v2.0

529 stars 180 forks source link

Another update to the Scurvy Scavenger scenario #2049

Closed Xansta closed 6 months ago

Xansta commented 6 months ago

Rearrange code
Use external scenario utilities
- Station creation
- Generate call sign
- CPU ship diversification
- Spawn ships (from GM buttons)
Make scenario more explicitly single player ship, single type of player ship
Update enemy ship spawn routines
Make asteroid size variance larger

daid commented 6 months ago

There seems to be some conflict?

Xansta commented 6 months ago

There is no mechanism in github to resolve conflicts, even when I click the "Resolve conflicts" button. It tells me there are 3 conflicts and scrolls to those places, but there's no way to pick which block to use. Does this have to be resolved outside of github (ir manually)?

muerteFR commented 6 months ago

When this happened to me at the time, I directly modified the file manually from the PR, choosing which block to keep if there were few conflicts. Maybe it's different now, I don't know.