Skip to content

Commit

Permalink
Merge pull request #15 from UnderVanCo-Op/Andrey
Browse files Browse the repository at this point in the history
Minor. Starting redoing build of convs by chains in a dei branch
  • Loading branch information
andrmiw9 authored May 14, 2022
2 parents ea37394 + 45a83a0 commit 5cf3024
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Objects/Conveyors/Conveyor.gd
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ func _physics_process(_delta: float) -> void:

func CheckShadeOffset() -> void:
if(FirstCell and FirstCell.offset >= ShadeOffset - 10 and !isSending):
print("Conv firstcell is in 10p from the ShadeOffset!")
print("Conv ", self, " firstcell is in 10p from the ShadeOffset!")
call_deferred("StopCells")
if(!isSpawning):
call_deferred("DeactivatePhysics")


func CheckQuitOffset() -> void:
if(FirstCell and FirstCell.offset >= QuitOffset - 10):
print("Conv firstcell is in 10p from the QuitOffset!")
print("Conv ", self, " firstcell is in 10p from the QuitOffset!")
# call_deferred("StopCells")
# if(!isSpawning):
# call_deferred("DeactivatePhysics")
Expand Down
4 changes: 2 additions & 2 deletions Objects/Points/Point.gd
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func TryMoveCell(outconv, useRecursion := true):
# return false

# General
if(!outconv.endPoint.WasUsed and useRecursion):
if(!outconv.endPoint.WasUsed and useRecursion): #useRecur can be replaced with isspawnpoint
outconv.endPoint.CellWork() # recursive to the end

print("\nPoint ", self, " is moving cell now")
Expand Down Expand Up @@ -170,6 +170,6 @@ func ReceiveSpawnRequest(count : int, conv, isContinuation := false, EndOfChainP
conv.ActivatePhysics()
conv.SpawnCells(count)
else:
print("Point: Moving request to the prev Point!")
print("Point ", self, ": Moving request to the prev Point!")
inc_convs[0].Point.ReceiveSpawnRequest(count, inc_convs[0], true, PToSend) # move on to the prev conv and Point
# inc convs[0] should be replaced with smart choice of a path-system

0 comments on commit 5cf3024

Please sign in to comment.