Skip to content

Conversation

@AllyTally
Copy link
Contributor

Changes:

Supercrewmates now interact with gravity lines, gravity tokens and oneways correctly. They're now moved by horizontal moving platforms and conveyors.

Closes #901.

Legal Stuff:

By submitting this pull request, I confirm that...

  • My changes may be used in a future commercial release of VVVVVV
  • I will be credited in a CONTRIBUTORS file and the "GitHub Friends"
    section of the credits for all of said releases, but will NOT be compensated
    for these changes

Copy link
Contributor

@InfoTeddy InfoTeddy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflicts need to be resolved. Also, style pass.

if (entities[entity].rule == 6)
{
flipped = false;
entities[entity].rule = 7;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
entities[entity].rule = 7;
entities[entity].rule = 7;

else
{
flipped = true;
entities[entity].rule = 6;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
entities[entity].rule = 6;
entities[entity].rule = 6;

// entities[_i].drawframe += 6;
//}
entities[_i].drawframe++;
if (entities[_i].rule == 7 && entities[_i].type == 14) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (entities[_i].rule == 7 && entities[_i].type == 14) {
if (entities[_i].rule == 7 && entities[_i].type == 14)
{

if(entities[j].onentity>0)
{
if (entitycollide(i, j)) entities[j].state = entities[j].onentity;
if (entitycollide(i, j)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (entitycollide(i, j)) {
if (entitycollide(i, j))
{

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Certain supercrewmate interactions are odd

3 participants