Merge Stuff Together, Setuped Cave in PlayerMovement Scene
This commit is contained in:
parent
9ea57c4566
commit
fa686fb55a
3 changed files with 13 additions and 8 deletions
|
@ -488,7 +488,8 @@ texture_region_size = Vector2i(32, 32)
|
||||||
|
|
||||||
[resource]
|
[resource]
|
||||||
tile_size = Vector2i(32, 32)
|
tile_size = Vector2i(32, 32)
|
||||||
physics_layer_0/collision_layer = 0
|
physics_layer_0/collision_layer = 1
|
||||||
|
physics_layer_0/collision_mask = 0
|
||||||
terrain_set_0/mode = 0
|
terrain_set_0/mode = 0
|
||||||
terrain_set_0/terrain_0/name = "Walls"
|
terrain_set_0/terrain_0/name = "Walls"
|
||||||
terrain_set_0/terrain_0/color = Color(1, 0.301961, 0.329412, 1)
|
terrain_set_0/terrain_0/color = Color(1, 0.301961, 0.329412, 1)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
[gd_scene load_steps=12 format=3 uid="uid://ccgpsim5nfxd6"]
|
[gd_scene load_steps=12 format=3 uid="uid://ccgpsim5nfxd6"]
|
||||||
|
|
||||||
|
[ext_resource type="TileSet" uid="uid://bj7uu2180mie3" path="res://Assets/Tileset.tres" id="1_wkp62"]
|
||||||
[ext_resource type="Script" path="res://Scripts/PlayerController.gd" id="1_x3102"]
|
[ext_resource type="Script" path="res://Scripts/PlayerController.gd" id="1_x3102"]
|
||||||
[ext_resource type="TileSet" uid="uid://b7cqbf6xdbeal" path="res://Assets/Test_Tileset.tres" id="3_0at2g"]
|
|
||||||
[ext_resource type="Script" path="res://Scripts/MapGenerator.gd" id="4_8st0q"]
|
[ext_resource type="Script" path="res://Scripts/MapGenerator.gd" id="4_8st0q"]
|
||||||
[ext_resource type="Texture2D" uid="uid://bl7vfn05ul1vu" path="res://Assets/Sprites/Jesus/Jesus Spritesheet.png" id="4_e5cec"]
|
[ext_resource type="Texture2D" uid="uid://bl7vfn05ul1vu" path="res://Assets/Sprites/Jesus/Jesus Spritesheet.png" id="4_e5cec"]
|
||||||
|
|
||||||
|
@ -116,16 +116,20 @@ _data = {
|
||||||
[node name="Player Movement" type="Node2D"]
|
[node name="Player Movement" type="Node2D"]
|
||||||
|
|
||||||
[node name="Map Generator" type="TileMap" parent="."]
|
[node name="Map Generator" type="TileMap" parent="."]
|
||||||
tile_set = ExtResource("3_0at2g")
|
tile_set = ExtResource("1_wkp62")
|
||||||
cell_quadrant_size = 8
|
cell_quadrant_size = 32
|
||||||
collision_visibility_mode = 1
|
collision_visibility_mode = 1
|
||||||
format = 2
|
format = 2
|
||||||
script = ExtResource("4_8st0q")
|
script = ExtResource("4_8st0q")
|
||||||
|
start_area_size = 3
|
||||||
|
start_area_corner_size = 1
|
||||||
|
|
||||||
[node name="Player" type="CharacterBody2D" parent="." node_paths=PackedStringArray("animation_player")]
|
[node name="Player" type="CharacterBody2D" parent="." node_paths=PackedStringArray("animation_player")]
|
||||||
position = Vector2(512, 300)
|
position = Vector2(960, 512)
|
||||||
scale = Vector2(0.25, 0.25)
|
scale = Vector2(0.5, 0.5)
|
||||||
|
collision_layer = 0
|
||||||
script = ExtResource("1_x3102")
|
script = ExtResource("1_x3102")
|
||||||
|
speed = 60
|
||||||
animation_player = NodePath("Player Animator")
|
animation_player = NodePath("Player Animator")
|
||||||
|
|
||||||
[node name="Player Sprite" type="Sprite2D" parent="Player"]
|
[node name="Player Sprite" type="Sprite2D" parent="Player"]
|
||||||
|
@ -138,11 +142,10 @@ vframes = 4
|
||||||
polygon = PackedVector2Array(12, 32, -16, 32, -16, -24, 12, -24)
|
polygon = PackedVector2Array(12, 32, -16, 32, -16, -24, 12, -24)
|
||||||
|
|
||||||
[node name="Player Camera" type="Camera2D" parent="Player"]
|
[node name="Player Camera" type="Camera2D" parent="Player"]
|
||||||
zoom = Vector2(10, 10)
|
zoom = Vector2(3, 3)
|
||||||
position_smoothing_enabled = true
|
position_smoothing_enabled = true
|
||||||
drag_horizontal_enabled = true
|
drag_horizontal_enabled = true
|
||||||
drag_vertical_enabled = true
|
drag_vertical_enabled = true
|
||||||
editor_draw_limits = true
|
|
||||||
editor_draw_drag_margin = true
|
editor_draw_drag_margin = true
|
||||||
|
|
||||||
[node name="Player Animator" type="AnimationPlayer" parent="Player"]
|
[node name="Player Animator" type="AnimationPlayer" parent="Player"]
|
||||||
|
|
|
@ -53,6 +53,7 @@ move_down={
|
||||||
[layer_names]
|
[layer_names]
|
||||||
|
|
||||||
2d_physics/layer_1="Map"
|
2d_physics/layer_1="Map"
|
||||||
|
2d_physics/layer_2="Player"
|
||||||
|
|
||||||
[rendering]
|
[rendering]
|
||||||
|
|
||||||
|
|
Reference in a new issue