Merge pull request #431 from aaronfranke/no-grid

Remove the grid based movement demo

2d/grid_based_movement/default_env.tres

@@ -1,13 +0,0 @@
-[gd_resource type="Environment" load_steps=2 format=2]
-
-[sub_resource type="ProceduralSky" id=1]
-sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
-sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )
-sky_curve = 0.25
-ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 )
-ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
-ground_curve = 0.01
-
-[resource]
-background_mode = 2
-background_sky = SubResource( 1 )

2d/grid_based_movement/grid/grid.gd

@@ -1,36 +0,0 @@
-extends TileMap
-
-enum CellType { EMPTY = -1, ACTOR, OBSTACLE, OBJECT }
-
-func _ready():
-	for child in get_children():
-		set_cellv(world_to_map(child.position), child.type)
-
-
-func get_cell_pawn(coordinates):
-	for node in get_children():
-		if world_to_map(node.position) == coordinates:
-			return(node)
-
-
-func request_move(pawn, direction):
-	var cell_start = world_to_map(pawn.position)
-	var cell_target = cell_start + direction
-	
-	var cell_target_type = get_cellv(cell_target)
-	match cell_target_type:
-		CellType.EMPTY:
-			return update_pawn_position(pawn, cell_start, cell_target)
-		CellType.OBJECT:
-			var object_pawn = get_cell_pawn(cell_target)
-			object_pawn.queue_free()
-			return update_pawn_position(pawn, cell_start, cell_target)
-		CellType.ACTOR:
-			var pawn_name = get_cell_pawn(cell_target).name
-			print("Cell %s contains %s" % [cell_target, pawn_name])
-
-
-func update_pawn_position(pawn, cell_start, cell_target):
-	set_cellv(cell_target, pawn.type)
-	set_cellv(cell_start, CellType.EMPTY)
-	return map_to_world(cell_target) + cell_size / 2

2d/grid_based_movement/icon.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://icon.png"
-dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

2d/grid_based_movement/pawns/Actor.tscn

@@ -1,83 +0,0 @@
-[gd_scene load_steps=5 format=2]
-
-[ext_resource path="res://pawns/actor.gd" type="Script" id=1]
-[ext_resource path="res://pawns/sprites/character.png" type="Texture" id=2]
-
-[sub_resource type="Animation" id=1]
-resource_name = "bump"
-length = 0.1
-step = 0.01
-tracks/0/type = "value"
-tracks/0/path = NodePath("Pivot/Sprite:position")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/keys = {
-"times": PoolRealArray( 0, 0.02, 0.04, 0.06, 0.08, 0.1 ),
-"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ),
-"update": 0,
-"values": [ Vector2( 0, 0 ), Vector2( -1.5, -9 ), Vector2( 6.5, 2.5 ), Vector2( -11.5, 8.5 ), Vector2( 4, -5 ), Vector2( 0, 0 ) ]
-}
-
-[sub_resource type="Animation" id=2]
-resource_name = "walk"
-length = 0.25
-step = 0.05
-tracks/0/type = "value"
-tracks/0/path = NodePath("Pivot/Sprite:self_modulate")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/imported = false
-tracks/0/enabled = false
-tracks/0/keys = {
-"times": PoolRealArray( 0, 0.1, 0.25 ),
-"transitions": PoolRealArray( 1, 1, 1 ),
-"update": 0,
-"values": [ Color( 1, 1, 1, 1 ), Color( 1, 0.9375, 0, 1 ), Color( 1, 1, 1, 1 ) ]
-}
-tracks/1/type = "value"
-tracks/1/path = NodePath("Pivot/Sprite:position")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/keys = {
-"times": PoolRealArray( 0, 0.1, 0.15, 0.25 ),
-"transitions": PoolRealArray( 1, 0.303143, 2.61003, 1 ),
-"update": 0,
-"values": [ Vector2( 1.43051e-06, -1.90735e-06 ), Vector2( 1.43051e-06, -1.90735e-06 ), Vector2( 0, -20 ), Vector2( 1.43051e-06, -1.90735e-06 ) ]
-}
-tracks/2/type = "value"
-tracks/2/path = NodePath("Pivot/Sprite:scale")
-tracks/2/interp = 1
-tracks/2/loop_wrap = true
-tracks/2/imported = false
-tracks/2/enabled = true
-tracks/2/keys = {
-"times": PoolRealArray( 0, 0.05, 0.15, 0.25 ),
-"transitions": PoolRealArray( 1, 0.354553, 1, 1 ),
-"update": 0,
-"values": [ Vector2( 1, 1 ), Vector2( 1.20007, 0.917384 ), Vector2( 0.916712, 1.13495 ), Vector2( 1, 1 ) ]
-}
-
-[node name="Actor" type="Node2D"]
-position = Vector2( 32, 32 )
-z_index = 1
-script = ExtResource( 1 )
-__meta__ = {
-"_edit_group_": true
-}
-
-[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
-anims/bump = SubResource( 1 )
-anims/walk = SubResource( 2 )
-
-[node name="Tween" type="Tween" parent="."]
-
-[node name="Pivot" type="Position2D" parent="."]
-
-[node name="Sprite" type="Sprite" parent="Pivot"]
-texture = ExtResource( 2 )
-centered = false
-offset = Vector2( -32, -32 )

2d/grid_based_movement/pawns/actor.gd

@@ -1,55 +0,0 @@
-extends "pawn.gd"
-
-onready var grid = get_parent()
-
-func _ready():
-	update_look_direction(Vector2.RIGHT)
-
-
-func _process(_delta):
-	var input_direction = get_input_direction()
-	if not input_direction:
-		return
-	update_look_direction(input_direction)
-
-	var target_position = grid.request_move(self, input_direction)
-	if target_position:
-		move_to(target_position)
-	else:
-		bump()
-
-
-func get_input_direction():
-	return Vector2(
-		Input.get_action_strength("move_right") - Input.get_action_strength("move_left"),
-		Input.get_action_strength("move_down") - Input.get_action_strength("move_up")
-	)
-
-
-func update_look_direction(direction):
-	$Pivot/Sprite.rotation = direction.angle()
-
-
-func move_to(target_position):
-	set_process(false)
-	$AnimationPlayer.play("walk")
-
-	# Move the node to the target cell instantly,
-	# and animate the sprite moving from the start to the target cell
-	var move_direction = (target_position - position).normalized()
-	$Tween.interpolate_property($Pivot, "position", - move_direction * 32, Vector2(), $AnimationPlayer.current_animation_length, Tween.TRANS_LINEAR, Tween.EASE_IN)
-	position = target_position
-
-	$Tween.start()
-
-	# Stop the function execution until the animation finished
-	yield($AnimationPlayer, "animation_finished")
-	
-	set_process(true)
-
-
-func bump():
-	set_process(false)
-	$AnimationPlayer.play("bump")
-	yield($AnimationPlayer, "animation_finished")
-	set_process(true)

2d/grid_based_movement/pawns/pawn.gd

@@ -1,5 +0,0 @@
-extends Node2D
-
-enum CellType { ACTOR, OBSTACLE, OBJECT }
-#warning-ignore:unused_class_variable
-export(CellType) var type = CellType.ACTOR

2d/grid_based_movement/pawns/sprites/character.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/character.png-98ed16816c5b464731c4fa68fe5b8613.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://pawns/sprites/character.png"
-dest_files=[ "res://.import/character.png-98ed16816c5b464731c4fa68fe5b8613.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

2d/grid_based_movement/pawns/sprites/character_grey.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/character_grey.png-a95d64c2e947e85f04dd1c6474e46965.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://pawns/sprites/character_grey.png"
-dest_files=[ "res://.import/character_grey.png-a95d64c2e947e85f04dd1c6474e46965.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

2d/grid_based_movement/pawns/sprites/star.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/star.png-4f164f82cf41ace82182660f1be8e68d.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://pawns/sprites/star.png"
-dest_files=[ "res://.import/star.png-4f164f82cf41ace82182660f1be8e68d.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

2d/grid_based_movement/project.godot

@@ -1,67 +0,0 @@
-; Engine configuration file.
-; It's best edited using the editor UI and not directly,
-; since the parameters that go here are not all obvious.
-;
-; Format:
-;   [section] ; section goes between []
-;   param=value ; assign values to parameters
-
-config_version=4
-
-_global_script_classes=[  ]
-_global_script_class_icons={
-
-}
-
-[application]
-
-config/name="Grid Movement"
-run/main_scene="res://Game.tscn"
-config/icon="res://icon.png"
-
-[display]
-
-window/size/width=1280
-window/size/height=720
-window/stretch/mode="2d"
-window/stretch/aspect="expand"
-
-[input]
-
-move_right={
-"deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null)
-, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null)
-, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null)
- ]
-}
-move_left={
-"deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null)
-, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null)
-, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null)
- ]
-}
-move_down={
-"deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null)
-, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
-, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null)
- ]
-}
-move_up={
-"deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)
-, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
-, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null)
- ]
-}
-
-[rendering]
-
-quality/driver/driver_name="GLES2"
-environment/default_environment="res://default_env.tres"

2d/grid_based_movement/tilesets/grid/GridTiles.tscn

@@ -1,19 +0,0 @@
-[gd_scene load_steps=4 format=2]
-
-[ext_resource path="res://tilesets/grid/actor.png" type="Texture" id=1]
-[ext_resource path="res://tilesets/grid/obstacle.png" type="Texture" id=2]
-[ext_resource path="res://tilesets/grid/object.png" type="Texture" id=3]
-
-[node name="Node2D" type="Node2D"]
-
-[node name="Actor" type="Sprite" parent="."]
-position = Vector2( 32, 32 )
-texture = ExtResource( 1 )
-
-[node name="Obstacle" type="Sprite" parent="."]
-position = Vector2( 96, 32 )
-texture = ExtResource( 2 )
-
-[node name="Object" type="Sprite" parent="."]
-position = Vector2( 160, 32 )
-texture = ExtResource( 3 )

2d/grid_based_movement/tilesets/grid/actor.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/actor.png-6a88af8a7bcb079732153877dfb0db8b.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://tilesets/grid/actor.png"
-dest_files=[ "res://.import/actor.png-6a88af8a7bcb079732153877dfb0db8b.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

2d/grid_based_movement/tilesets/grid/grid_tileset.tres

@@ -1,37 +0,0 @@
-[gd_resource type="TileSet" load_steps=4 format=2]
-
-[ext_resource path="res://tilesets/grid/actor.png" type="Texture" id=1]
-[ext_resource path="res://tilesets/grid/obstacle.png" type="Texture" id=2]
-[ext_resource path="res://tilesets/grid/object.png" type="Texture" id=3]
-
-[resource]
-
-0/name = "Actor"
-0/texture = ExtResource( 1 )
-0/tex_offset = Vector2( 0, 0 )
-0/modulate = Color( 1, 1, 1, 1 )
-0/region = Rect2( 0, 0, 64, 64 )
-0/is_autotile = false
-0/occluder_offset = Vector2( 32, 32 )
-0/navigation_offset = Vector2( 32, 32 )
-0/shapes = [  ]
-1/name = "Obstacle"
-1/texture = ExtResource( 2 )
-1/tex_offset = Vector2( 0, 0 )
-1/modulate = Color( 1, 1, 1, 1 )
-1/region = Rect2( 0, 0, 64, 64 )
-1/is_autotile = false
-1/occluder_offset = Vector2( 32, 32 )
-1/navigation_offset = Vector2( 32, 32 )
-1/shapes = [  ]
-2/name = "Object"
-2/texture = ExtResource( 3 )
-2/tex_offset = Vector2( 0, 0 )
-2/modulate = Color( 1, 1, 1, 1 )
-2/region = Rect2( 0, 0, 64, 64 )
-2/is_autotile = false
-2/occluder_offset = Vector2( 32, 32 )
-2/navigation_offset = Vector2( 32, 32 )
-2/shapes = [  ]
-_sections_unfolded = [ "0", "1" ]
-

2d/grid_based_movement/tilesets/grid/object.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/object.png-3e89ebfb3424e8759914732b2b0130c1.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://tilesets/grid/object.png"
-dest_files=[ "res://.import/object.png-3e89ebfb3424e8759914732b2b0130c1.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

2d/grid_based_movement/tilesets/grid/obstacle.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/obstacle.png-9f01dd1d06d7b99515918b65b46bd6c1.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://tilesets/grid/obstacle.png"
-dest_files=[ "res://.import/obstacle.png-9f01dd1d06d7b99515918b65b46bd6c1.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

2d/grid_based_movement/tilesets/grid_lines/GridLinesTiles.tscn

@@ -1,9 +0,0 @@
-[gd_scene load_steps=2 format=2]
-
-[ext_resource path="res://tilesets/grid_lines/grid_lines.png" type="Texture" id=1]
-
-[node name="TileSet" type="Node2D"]
-
-[node name="Grass" type="Sprite" parent="."]
-position = Vector2( 32, 32 )
-texture = ExtResource( 1 )

2d/grid_based_movement/tilesets/grid_lines/grid_lines.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/grid_lines.png-beef853b47aa830c8383e5f6cc4d03ce.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://tilesets/grid_lines/grid_lines.png"
-dest_files=[ "res://.import/grid_lines.png-beef853b47aa830c8383e5f6cc4d03ce.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

2d/grid_based_movement/tilesets/grid_lines/grid_lines_tileset.tres

@@ -1,16 +0,0 @@
-[gd_resource type="TileSet" load_steps=2 format=2]
-
-[ext_resource path="res://tilesets/grid_lines/grid_lines.png" type="Texture" id=1]
-
-[resource]
-
-0/name = "Grass"
-0/texture = ExtResource( 1 )
-0/tex_offset = Vector2( 0, 0 )
-0/modulate = Color( 1, 1, 1, 1 )
-0/region = Rect2( 0, 0, 64, 64 )
-0/is_autotile = false
-0/occluder_offset = Vector2( 32, 32 )
-0/navigation_offset = Vector2( 32, 32 )
-0/shapes = [  ]
-