Commit files changed by the formatting script

Author: aaronfranke

.gitignore

@@ -8,4 +8,4 @@ logs/
 assets/icon/
 *.psd
 
-.vscode/
+.vscode/

2017/cheatsheet/Godot 2.1-Code Editor Shortcuts.md

@@ -54,4 +54,3 @@ func turn_towards(_direction):
 	elif _direction == RIGHT:
 		direction = Vector2(1, 0)
 		get_node("Sprite").set_flip_h(true)
-	

2017/final/02-Custom camera with instant room transitions/Player.gd

@@ -62,4 +62,4 @@ func get_player_grid_pos():
 	var pos = player.get_pos() - player.size / 2
 	var x = floor(pos.x / window_size.x)
 	var y = floor(pos.y / window_size.y)
-	return Vector2(x, y)
+	return Vector2(x, y)

2017/final/03-Camera room transitions with steering/Camera.gd

@@ -54,4 +54,3 @@ func turn_towards(_direction):
 	elif _direction == RIGHT:
 		direction = Vector2(1, 0)
 		get_node("Sprite").set_flip_h(true)
-	

2017/final/03-Camera room transitions with steering/Player.gd

@@ -46,4 +46,3 @@ func turn_towards(_direction):
 	elif _direction == RIGHT:
 		direction = Vector2(1, 0)
 		get_node("Sprite").set_flip_h(true)
-	

2017/final/04-Camera with proper Object Oriented design by Lars Kokhemor/Player.gd

@@ -1,2 +1,2 @@
 Camera fix example by Lars Kokemohr, dean of engineering at the school4games Berlin
-http://school4games.net/
+http://school4games.net/

2017/final/04-Camera with proper Object Oriented design by Lars Kokhemor/README.txt

@@ -9,4 +9,4 @@ func _input(event):
 		if get_tree().is_paused():
 			get_tree().set_pause(false)
 		else:
-			get_tree().set_pause(true)
+			get_tree().set_pause(true)

2017/final/06-Grid-based movement/Game.gd

@@ -32,4 +32,4 @@ func _fixed_process(delta):
 	if pos != target_pos: color = GREEN
 	elif pos == target_pos and not Player.is_moving and Player.direction == Vector2(): color = GREEN
 	else: color = RED
-	update()
+	update()

2017/final/09-Isometric grid-based movement/PlayerVisualizer.gd

@@ -60,4 +60,4 @@ func draw_circle_arc_poly(center, radius, angle_from, angle_to, color):
     for i in range(nb_points+1):
         var angle_point = angle_from + i*(angle_to-angle_from)/nb_points
         points_arc.push_back(center + Vector2( cos( deg2rad(angle_point) ), sin( deg2rad(angle_point) ) ) * radius)
-    draw_polygon(points_arc, colors)
+    draw_polygon(points_arc, colors)

2017/final/11-Save settings with ConfigFile/Game/Player.gd

@@ -76,4 +76,4 @@ func get_setting(category, key):
 
 
 func set_setting(category, key, value):
-	_settings[category][key] = value
+	_settings[category][key] = value

2017/final/11-Save settings with ConfigFile/Settings.gd

@@ -4,4 +4,4 @@ var Player = null
 
 func _ready():
 	Player = get_parent()
-	set_text("Max health: %s" % Player.max_health)
+	set_text("Max health: %s" % Player.max_health)

2017/final/12-Save game/PrintAttributes.gd

@@ -12,4 +12,4 @@
             "y": 183.763229
         }
     }
-}
+}

2017/final/12-Save game/save.json

@@ -6,4 +6,4 @@ func _ready():
 
 
 func change_color(name):
-	set_texture(load("res://Characters/%s.png" % name))
+	set_texture(load("res://Characters/%s.png" % name))

2017/final/14-Intro to signals/Sprite.gd

@@ -6,4 +6,4 @@ func _ready():
 	visible = false
 
 func _physics_process(delta):
-	text = str(Character.current_state)
+	text = str(Character.current_state)

2017/final/17-Attack demo with Heartbeast/end/characters/DebugCharacter.gd

@@ -19,4 +19,4 @@ func heal(amount):
 		life = max_life
 
 func get_health_ratio():
-	return life / max_life
+	return life / max_life

2017/final/17-Attack demo with Heartbeast/end/characters/shared/health.gd

@@ -6,4 +6,4 @@ func _ready():
 	visible = false
 
 func _physics_process(delta):
-	text = str(Character.current_state)
+	text = str(Character.current_state)

2017/final/17-Attack demo with Heartbeast/start/characters/DebugCharacter.gd

@@ -19,4 +19,4 @@ func heal(amount):
 		life = max_life
 
 func get_health_ratio():
-	return life / max_life
+	return life / max_life

2017/final/17-Attack demo with Heartbeast/start/characters/shared/health.gd

@@ -43,4 +43,3 @@ func turn_towards(_direction):
 	elif _direction == RIGHT:
 		direction = Vector2(1, 0)
 		get_node("Sprite").set_flip_h(true)
-	

2017/start/01-Custom Camera in Godot 1-Transform the Canvas/Player.gd

@@ -11,4 +11,4 @@ func _ready():
 
 
 func update_camera():
-	print('moved!')
+	print('moved!')

2017/start/02-Custom Camera in Godot 2-Follow the Player/Camera.gd

@@ -47,4 +47,3 @@ func turn_towards(_direction):
 	elif _direction == RIGHT:
 		direction = Vector2(1, 0)
 		get_node("Sprite").set_flip_h(true)
-	

2017/start/02-Custom Camera in Godot 2-Follow the Player/Player.gd

@@ -47,4 +47,3 @@ func turn_towards(_direction):
 	elif _direction == RIGHT:
 		direction = Vector2(1, 0)
 		get_node("Sprite").set_flip_h(true)
-	

2017/start/03-Custom Camera in Godot 3-Let's simplify the code!/Player.gd

@@ -54,4 +54,3 @@ func turn_towards(_direction):
 	elif _direction == RIGHT:
 		direction = Vector2(1, 0)
 		get_node("Sprite").set_flip_h(true)
-	

2017/start/04-Custom camera with instant room transitions/Player.gd

@@ -6,4 +6,4 @@ func _ready():
 
 
 func _fixed_process(delta):
-	pass
+	pass

2017/start/07-Top-down character movement/Player.gd

@@ -37,4 +37,3 @@ func _fixed_process(delta):
 	velocity = speed * direction.normalized() * delta
 
 	move(velocity)
-	

2017/start/08-Basic grid system/Player.gd

@@ -31,4 +31,3 @@ func _fixed_process(delta):
 
 	velocity = speed * direction.normalized() * delta
 	move(velocity)
-	

2017/start/09-Adding the last 2 methods to the Grid/Player.gd

@@ -54,4 +54,4 @@ func draw_circle_arc_poly(center, radius, angle_from, angle_to, color):
     for i in range(nb_points+1):
         var angle_point = angle_from + i*(angle_to-angle_from)/nb_points
         points_arc.push_back(center + Vector2( cos( deg2rad(angle_point) ), sin( deg2rad(angle_point) ) ) * radius)
-    draw_polygon(points_arc, colors)
+    draw_polygon(points_arc, colors)

2017/start/11-Field of view with the dot product/Player.gd

@@ -60,4 +60,4 @@ func draw_circle_arc_poly(center, radius, angle_from, angle_to, color):
     for i in range(nb_points+1):
         var angle_point = angle_from + i*(angle_to-angle_from)/nb_points
         points_arc.push_back(center + Vector2( cos( deg2rad(angle_point) ), sin( deg2rad(angle_point) ) ) * radius)
-    draw_polygon(points_arc, colors)
+    draw_polygon(points_arc, colors)

2017/start/12-Save settings with ConfigFile/Player.gd

@@ -33,4 +33,4 @@ func get_setting(category, key):
 
 
 func set_setting(category, key, value):
-    _settings[category][key] = value
+    _settings[category][key] = value

2017/start/12-Save settings with ConfigFile/Settings.gd

@@ -39,4 +39,4 @@ func _fixed_process(delta):
 func save():
 	# Compile all the data to save in a dictionary
 	var save_dict = {}
-	return save_dict
+	return save_dict

2017/start/13-Save game/Player.gd

@@ -40,4 +40,4 @@ func save():
 			y=get_pos().y
 		}
 	}
-	return save_dict
+	return save_dict

2017/start/13-Save game/Player2.gd

@@ -4,4 +4,4 @@ var Player = null
 
 func _ready():
 	Player = get_parent()
-	set_text("Max health: %s" % Player.max_health)
+	set_text("Max health: %s" % Player.max_health)

2017/start/13-Save game/PrintAttributes.gd

@@ -20,4 +20,4 @@ func load_game():
 	# Try to load a saved file
 	# Parse the file data if it exists
 	# load the data into persistent nodes
-	pass
+	pass

2017/start/13-Save game/Save.gd

@@ -54,4 +54,4 @@ func draw_circle_arc_poly(center, radius, angle_from, angle_to, color):
     for i in range(nb_points+1):
         var angle_point = angle_from + i*(angle_to-angle_from)/nb_points
         points_arc.push_back(center + Vector2( cos( deg2rad(angle_point) ), sin( deg2rad(angle_point) ) ) * radius)
-    draw_polygon(points_arc, colors)
+    draw_polygon(points_arc, colors)

2017/tools/Field of view/Player.gd

@@ -52,4 +52,4 @@ func _fixed_process(delta):
 	if speed == 0:
 		velocity = Vector2()
 
-	move(velocity)
+	move(velocity)

2017/tools/vector vizualizer/Player.gd

@@ -37,4 +37,4 @@ func _draw():
 		var time = time_step * i
 		var new_point = Vector2(time * speed, sin(time * 10) * sine_amplitude)
 		points_array.append(new_point)
-	draw_polyline(points_array, Color(1.0,1.0,1.0), 2.0, true)
+	draw_polyline(points_array, Color(1.0,1.0,1.0), 2.0, true)

2018/01-25-tool-draw-in-viewport/end/bat/Bat.gd

@@ -2,4 +2,4 @@ extends "res://characters/character.gd"
 
 
 func _physics_process(delta):
-	pass
+	pass

2018/03-28-character-scene-setup/end/characters/player/player.gd

@@ -2,4 +2,4 @@ extends "res://characters/character.gd"
 
 
 func _physics_process(delta):
-	pass
+	pass

2018/03-28-character-scene-setup/start/characters/player/player.gd

@@ -183,4 +183,4 @@ func _set_path_end_position(value):
 	set_cell(value.x, value.y, 2)
 	path_end_position = value
 	if path_start_position != value:
-		_recalculate_path()
+		_recalculate_path()

2018/03-30-astar-pathfinding/pathfind_astar.gd

@@ -15,4 +15,4 @@ func _ready():
 
 
 func _on_Player_state_changed(new_state):
-	text = STATE_STRINGS[new_state]
+	text = STATE_STRINGS[new_state]

2018/04-07-simple-sword-attack/end/characters/debug/state-visualizer.gd

@@ -1 +1 @@
-.import
+.import

2018/05-09-screen-sizes-example/.gitignore

@@ -1 +1 @@
-.import
+.import

2018/05-23-intro-to-ui-containers/.gitignore

@@ -1,3 +1,3 @@
 extends Button
 
-export(String) var scene_to_load
+export(String) var scene_to_load

2018/06-07-title-screen/end/title_screen/buttons/MenuButton.gd

@@ -6,4 +6,4 @@ uniform vec2 amplitude = vec2(10, 10);
 void vertex() {
 	VERTEX.x += sin(TIME * time_factor) * amplitude.x;
 	VERTEX.y += cos(TIME * time_factor) * amplitude.y;
-}
+}

2018/06-16-intro-to-shaders-2d-water/end/first_shader/dancing_godot/dancing_godot.shader

@@ -19,4 +19,4 @@ void fragment() {
 	COLOR = texture(TEXTURE, tiled_uvs + wave_uv_offset * amplitude);
 //	COLOR = vec4(wave_uv_offset, vec2(0.0, 1.0));
 //	COLOR = vec4(UV * aspect_ratio, vec2(0.0, 1.0));
-}
+}

2018/06-16-intro-to-shaders-2d-water/end/water/01.sine/water_sine.shader

@@ -22,4 +22,4 @@ void fragment() {
 
 	COLOR = texture(TEXTURE, tiled_uvs + wave_uv_offset * amplitude);
 //	COLOR = vec4(wave_uv_offset, 0.0, 1.0);
-}
+}

2018/06-16-intro-to-shaders-2d-water/end/water/01.sine/water_sine_function.shader

@@ -21,4 +21,4 @@ void fragment() {
 	adjusted_uv.y *= aspect_ratio; // Apply aspect ratio
 
 	COLOR = texture(TEXTURE, adjusted_uv + texture_based_offset); // And lookup our color
-}
+}

2018/06-16-intro-to-shaders-2d-water/end/water/02.uv_texture_offset/water_texture_offset.shader

@@ -25,4 +25,4 @@ void fragment() {
 	// The only difference from the previous example is we deform the normal map with our UV offset
 	// The normal map comes from the Sprite node, and Light2D reacts to it
 	NORMALMAP = texture(NORMAL_TEXTURE, UV + texture_based_offset).rgb;
-}
+}

2018/06-16-intro-to-shaders-2d-water/end/water/03.lighting/water_lighting.shader

@@ -36,4 +36,4 @@ void fragment() {
 	COLOR = texture(TEXTURE, adjusted_uv + texture_based_offset * wave_size + sine_waves_offset * sine_wave_size);
 //	COLOR = vec4(texture_based_offset, 0.0, 1.0); // visualize texture-based waves
 //	COLOR = vec4(sine_waves_offset, 0.0, 1.0); // visualize sine wave
-}
+}

2018/06-16-intro-to-shaders-2d-water/end/water/04.sine_and_texture/sine_and_texture.shader

@@ -8,4 +8,4 @@ func _on_item_rect_changed():
 	update_shader_aspect_ratio()
 
 func update_shader_aspect_ratio():
-	material.set_shader_param("aspect_ratio", scale.y/scale.x)
+	material.set_shader_param("aspect_ratio", scale.y/scale.x)

2018/06-16-intro-to-shaders-2d-water/end/water/water.gd

@@ -12,4 +12,4 @@ void fragment() {
 	adjusted_uv.y *= aspect_ratio;
 
 	COLOR = texture(TEXTURE, adjusted_uv + texture_based_offset);
-}
+}

2018/06-16-intro-to-shaders-2d-water/start/water/02.uv_texture_offset/water_texture_offset.shader

@@ -22,4 +22,4 @@ void fragment() {
 	adjusted_uv.y *= aspect_ratio;
 
 	COLOR = texture(TEXTURE, adjusted_uv + texture_based_offset);
-}
+}

2018/06-16-intro-to-shaders-2d-water/start/water/03.lighting/water_lighting.shader

@@ -19,4 +19,4 @@ void fragment() {
 	COLOR = texture(TEXTURE, tiled_uvs + wave_uv_offset * amplitude);
 //	COLOR = vec4(wave_uv_offset, vec2(0.0, 1.0));
 //	COLOR = vec4(UV * aspect_ratio, vec2(0.0, 1.0));
-}
+}

2018/06-16-intro-to-shaders-2d-water/start/water/04.sine_and_texture/water_sine_and_texture.shader

@@ -15,4 +15,4 @@ func _on_player_disconnected(id):
 	get_node(str(id)).queue_free()
 
 func _on_server_disconnected():
-	get_tree().change_scene('res://interface/Menu.tscn')
+	get_tree().change_scene('res://interface/Menu.tscn')

2018/07-30-2018-multiplayer-high-level-api/Game.gd

@@ -61,4 +61,4 @@ remote func _send_player_info(id, info):
 	new_player.init(info.name, info.position, true)
 
 func update_position(id, position):
-	players[id].position = position
+	players[id].position = position

2018/07-30-2018-multiplayer-high-level-api/Network.gd

@@ -14,4 +14,4 @@ func _process(delta):
 	elif Input.is_action_pressed('move_down'):
 		motion.y = 1
 
-	move_and_collide(motion.normalized() * MoveSpeed * delta)
+	move_and_collide(motion.normalized() * MoveSpeed * delta)

2018/07-30-2018-multiplayer-high-level-api/outlines/multiplayer-outline-part-2.md

@@ -22,4 +22,4 @@ void fragment()
 
     vec3 final_color = mix(outline_color.rgb, sprite_color.rgb, sprite_color.a);
     COLOR = vec4(final_color, clamp(alpha, 0.0, 1.0));
-}
+}

2018/09-11-input-actions-remapping/player/Player.gd

@@ -13,4 +13,4 @@ void fragment()
 
 	COLOR.rgb = mix(input_color.rgb, sampled_color, mix_amount);
 	COLOR.a = input_color.a;
-}
+}

2018/09-20-shaders/shaders/outline.shader

@@ -22,4 +22,3 @@ func _on_HTTPRequest_request_completed(result: int, response_code: int, headers:
 		notification.text = "Registration sucessful!"
 		yield(get_tree().create_timer(2.0), "timeout")
 		get_tree().change_scene("res://interface/login/Login.tscn")
-