From c098b6ecdf21bd70092d3f3329abf713c90528b2 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Mon, 22 Aug 2016 23:28:25 +0200 Subject: finally fix train collisions (please work now) --- trainlogic.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'trainlogic.lua') diff --git a/trainlogic.lua b/trainlogic.lua index 1ec27e0..0afac7a 100644 --- a/trainlogic.lua +++ b/trainlogic.lua @@ -581,7 +581,7 @@ function advtrains.try_connect_trains_and_check_collision(id1, id2) --local v2_sign = math.sign(i - ((train2.index-0.5) - ( (train2.index-0.5)-(advtrains.get_train_end_index(train2)+0.5) / 2 ))) --TODO physics train1.velocity=1 - train2.velocity=advtrains.trains_facing(train1, train2) and -1 or 1 + train2.velocity=advtrains.trains_facing(train1, train2) and 1 or -1 train1.recently_collided_with_env=true train2.recently_collided_with_env=true return @@ -589,7 +589,7 @@ function advtrains.try_connect_trains_and_check_collision(id1, id2) if vector.distance(testpos, frontpos1) < 0.5 then --local v2_sign = math.sign(i - ((train2.index-0.5) - ( (train2.index-0.5)-(advtrains.get_train_end_index(train2)+0.5) / 2 ))) train1.velocity=-1 - train2.velocity=advtrains.trains_facing(train1, train2) and 1 or -1 + train2.velocity=advtrains.trains_facing(train1, train2) and -1 or 1 train1.recently_collided_with_env=true train2.recently_collided_with_env=true return -- cgit v1.2.3