From 0cfbf8cd6b53bef0a286c48656d2c428080f74f0 Mon Sep 17 00:00:00 2001
From: dariasteam <dariasteam94@gmail.com>
Date: Sun, 6 Aug 2017 16:17:12 +0100
Subject: [PATCH] Adds .directory to .gitignore

---
 .gitignore                | 1 +
 Scenes/Events/milk_ray.gd | 4 +++-
 Scenes/Events/player.tscn | 7 +++----
 Scenes/Maps/map_1.tscn    | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 75124d5..d8be4bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *~ 
+.directory
diff --git a/Scenes/Events/milk_ray.gd b/Scenes/Events/milk_ray.gd
index 29f2217..1c7839b 100644
--- a/Scenes/Events/milk_ray.gd
+++ b/Scenes/Events/milk_ray.gd
@@ -50,8 +50,10 @@ func _process(delta):
 	
 	if (is_colliding()):
 		end_point = Vector2 (get_global_pos().distance_to(get_collision_point()), 29)
+		end.set_emitting(true)
 	else:
-		end_point = Vector2 (distance, 29)
+		end_point = Vector2 (get_pos())
+		end.set_emitting(false)
 			
 	middle.set_region_rect(Rect2(get_pos(),end_point))
 	end.set_global_pos(get_collision_point())
diff --git a/Scenes/Events/player.tscn b/Scenes/Events/player.tscn
index 7f71f17..fa64368 100644
--- a/Scenes/Events/player.tscn
+++ b/Scenes/Events/player.tscn
@@ -6,7 +6,6 @@
 [ext_resource path="res://Sprites/Charasets/cow.png" type="Texture" id=4]
 [ext_resource path="res://Scenes/Events/player_animations.tres" type="Animation" id=5]
 
-
 [sub_resource type="ConvexPolygonShape2D" id=1]
 
 custom_solver_bias = 0.0
@@ -17,7 +16,7 @@ points = Vector2Array( -13.2061, 7.63341, -13.1494, -10.328, 11.2943, -10.3627,
 custom_solver_bias = 0.0
 extents = Vector2( 12.363, 15.2052 )
 
-[sub_resource type="Animation" id=5]
+[sub_resource type="Animation" id=3]
 
 resource/name = "idle"
 length = 0.6
@@ -105,7 +104,7 @@ region_rect = Rect2( 0, 0, 96, 96 )
 playback/process_mode = 0
 playback/default_blend_time = 0.2
 root/root = NodePath("..")
-anims/idle = SubResource( 5 )
+anims/idle = SubResource( 3 )
 anims/walk = ExtResource( 5 )
 playback/active = true
 playback/speed = 1.0
@@ -121,7 +120,7 @@ offset = Vector2( 0, -80 )
 anchor_mode = 1
 rotating = false
 current = true
-zoom = Vector2( 1, 1 )
+zoom = Vector2( 1.1, 1.1 )
 limit/left = -10000000
 limit/top = -10000000
 limit/right = 10000000
diff --git a/Scenes/Maps/map_1.tscn b/Scenes/Maps/map_1.tscn
index 6b10a9b..ec06957 100644
--- a/Scenes/Maps/map_1.tscn
+++ b/Scenes/Maps/map_1.tscn
@@ -32,7 +32,7 @@ collision/bounce = 0.0
 collision/layers = 1
 collision/mask = 1
 occluder/light_mask = 1
-tile_data = IntArray( -2031638, 24, -1769505, 27, -1769496, 21, -1769495, 20, -1769494, 22, -1703948, 27, -1638433, 27, -1638405, 19, -1703909, 24, -1572882, 24, -1638369, 24, -1507361, 27, -1507292, 21, -1507291, 23, -1507290, 22, -1441769, 22, -1245202, 25, -1245193, 25, -917536, 23, -917535, 21, -917534, 22, -917516, 23, -786431, 27, -720888, 24, -720879, 24, -524305, 19, -524293, 21, -524292, 22, -458781, 27, -524284, 23, -524283, 26, -524282, 26, -524281, 23, -524280, 19, -458737, 21, -458736, 22, -458735, 21, -458734, 20, -458733, 20, -458732, 22, -458726, 19, -393179, 21, -393178, 20, -393177, 20, -393176, 22, -196631, 21, -196630, 22 )
+tile_data = IntArray( -2031638, 24, -1769505, 27, -1769495, 19, -1703948, 27, -1638433, 27, -1638405, 19, -1703909, 24, -1572882, 24, -1638369, 24, -1507361, 27, -1507292, 21, -1507291, 23, -1507290, 22, -1441769, 22, -1245202, 25, -1245193, 25, -917536, 23, -917535, 21, -917534, 22, -917516, 23, -786431, 27, -720888, 24, -720879, 24, -524305, 19, -524293, 21, -524292, 22, -458781, 27, -524284, 23, -524283, 26, -524282, 26, -524281, 23, -524280, 19, -458737, 21, -458736, 22, -458735, 21, -458734, 20, -458733, 20, -458732, 22, -458726, 19, -393179, 21, -393178, 20, -393177, 20, -393176, 22, -196631, 21, -196630, 22 )
 
 [node name="tile_0" type="TileMap" parent="." groups=[
 "map",