summaryrefslogtreecommitdiffstats
path: root/events-example3.py
diff options
context:
space:
mode:
authorRaymond Hogenson <rayhogenson@openmailbox.org>2016-10-09 23:27:02 -0400
committerRaymond Hogenson <rayhogenson@openmailbox.org>2016-10-09 23:27:02 -0400
commit2dd0795104b14fbb7aeee95f9f6bcf349f119960 (patch)
tree4df0ebbb5172ecdf327e7afb28e8b1126a3600c4 /events-example3.py
parentMerge (diff)
parentRealistic small fish movement (diff)
downloadbridge-2dd0795104b14fbb7aeee95f9f6bcf349f119960.tar.zst
Merge branch 'master' of github.com:rayhogenson/bridge
Diffstat (limited to 'events-example3.py')
-rwxr-xr-xevents-example3.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/events-example3.py b/events-example3.py
index d21877b..18db630 100755
--- a/events-example3.py
+++ b/events-example3.py
@@ -114,7 +114,11 @@ def fixDirection(data, theta=None):
def doStep(data):
data.counter += 1
+<<<<<<< HEAD
if random.random() < 1 / 50:
+=======
+ if data.counter % 50 == 0:
+>>>>>>> 9b60deedc508c74b249fd1da0776b5a719322807
fixDirection(data)
#print(abs(data.tailAcceleration))
data.speed += data.drag * data.speed / abs(data.speed)