diff options
| -rwxr-xr-x[-rw-r--r--] | bridge.py | 1 | ||||
| -rwxr-xr-x | events-example3.py | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/bridge.py b/bridge.py index b7e4576..26beb24 100644..100755 --- a/bridge.py +++ b/bridge.py @@ -1,3 +1,4 @@ +#!/usr/bin/python2 from fish_show import FishShow from sunrise import SunriseShow from constants import * diff --git a/events-example3.py b/events-example3.py index bbf2d68..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) |