Merge fixes

Loungeware/objects/tabi_gogogatsby_obj_car/Alarm_0.gml

@@ -0,0 +1 @@
+image_index = 0;

Loungeware/objects/tabi_gogogatsby_obj_car/Create_0.gml

@@ -0,0 +1,5 @@
+lane_one = 160
+lane_two = 230
+
+sprite_change_time = 15;
+draw_y_position = y;

Loungeware/objects/tabi_gogogatsby_obj_car/Draw_0.gml

@@ -0,0 +1,42 @@
+//set up animation varibles
+var _anim_x = 0;
+var _anim_y = 0;
+var _anim_x_scale = 0;
+var _rot = 0;
+
+_anim_y = random_range(-2,2);
+
+//ease to the y location
+if(draw_y_position != y){
+	draw_y_position = lerp(draw_y_position,y,0.5);
+
+	//if close enough to y
+	if(abs(draw_y_position - y) <= 0.01){
+		draw_y_position = y;
+	}
+}
+
+//get values from the anmation curve
+var _channel = animcurve_get_channel(tabi_gogogatsby_acurve_gatsby_scale, "curve1");
+var _channel_two = animcurve_get_channel(tabi_gogogatsby_acurve_gatsby_scale, "curve2");
+var _val = current_time/1000;
+
+//keep those values between 0 and 1
+if(_val > 1){
+	_val = abs(_val - round(current_time/1000));
+}
+
+_anim_x_scale = animcurve_channel_evaluate(_channel, _val);
+_rot = animcurve_channel_evaluate(_channel_two, _val)*5;
+
+//draw the sprite
+draw_sprite_ext(sprite_index,
+image_index,
+x+_anim_x,
+draw_y_position+_anim_y,
+image_xscale+_anim_x_scale,
+image_yscale,
+image_angle+_rot,
+image_blend,
+image_alpha
+);

Loungeware/objects/tabi_gogogatsby_obj_car/Step_0.gml

@@ -0,0 +1,20 @@
+
+if KEY_UP_PRESSED
+{
+	y = lane_one
+	image_index = 1;
+	alarm[0] = sprite_change_time;
+}
+
+if KEY_DOWN_PRESSED
+{
+	y = lane_two
+	image_index = 1;
+	alarm[0] = sprite_change_time;
+}
+
+if place_meeting(x,y,tabi_gogogatsby_obj_character)
+{
+	microgame_fail()
+	microgame_end_early()
+}

Loungeware/objects/tabi_gogogatsby_obj_character/Alarm_0.gml

@@ -0,0 +1 @@
+instance_create_depth(500, lane_number = 1 ? 215 : 280, lane_number = 1 ? 100 : -100, tabi_gogogatsby_obj_character)

Loungeware/objects/tabi_gogogatsby_obj_character/Create_0.gml

@@ -0,0 +1,4 @@
+lane_number = irandom(2)
+y = lane_number = 1 ? 215 : 280
+character_speed = 5
+depth = lane_number = 1 ? 100 : -100

Loungeware/objects/tabi_gogogatsby_obj_character/Step_0.gml

@@ -0,0 +1,9 @@
+if alarm[0] = -1
+	alarm[0] = random_range(65,85)
+
+if x < -150
+	instance_destroy(self)
+
+x -= character_speed
+
+