diff --git a/Main.gd b/Main.gd deleted file mode 100644 index ed1a164..0000000 --- a/Main.gd +++ /dev/null @@ -1,22 +0,0 @@ -extends Node2D - - -# Declare member variables here. Examples: -# var a = 2 -# var b = "text" -var camera :Camera2D - -# Called when the node enters the scene tree for the first time. - -func _ready(): - camera = $Path2D/PathFollow2D/Camera2D - camera.make_current() - for child in get_children(): - print(child) - if child is Player: - camera = child.get_node("Camera2D") - - -# Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(delta): - pass diff --git a/Main.tscn b/Main.tscn index bd42e49..30ecb3a 100644 --- a/Main.tscn +++ b/Main.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=18 format=2] -[ext_resource path="res://Player.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/playerB/Player.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/Tiles/Assets/Assets.png" type="Texture" id=3] [ext_resource path="res://Position2D.gd" type="Script" id=5] -[ext_resource path="res://Enemy2.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/enemyB/Enemy2.tscn" type="PackedScene" id=6] [sub_resource type="ConvexPolygonShape2D" id=2] points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 ) diff --git a/project.godot b/project.godot index f6cfe76..a0bd2e1 100644 --- a/project.godot +++ b/project.godot @@ -17,27 +17,27 @@ _global_script_classes=[ { "base": "KinematicBody2D", "class": "Enemy2", "language": "GDScript", -"path": "res://Enemy2-KinematicBody2D.gd" +"path": "res://src/enemyB/Enemy2-KinematicBody2D.gd" }, { -"base": "Position2D", +"base": "Reference", "class": "Gun", "language": "GDScript", -"path": "res://Gun.gd" +"path": "res://src/playerB/Gun.gd" }, { "base": "Node", "class": "Movement", "language": "GDScript", -"path": "res://player_move_component.gd" +"path": "res://src/playerB/player_move_component.gd" }, { "base": "KinematicBody2D", "class": "Player", "language": "GDScript", -"path": "res://Player-KinematicBody2D.gd" +"path": "res://src/playerB/Player-KinematicBody2D.gd" }, { "base": "Node", "class": "State", "language": "GDScript", -"path": "res://state.gd" +"path": "res://src/state.gd" } ] _global_script_class_icons={ "Enemy": "", diff --git a/Enemy2-KinematicBody2D.gd b/src/enemyB/Enemy2-KinematicBody2D.gd similarity index 100% rename from Enemy2-KinematicBody2D.gd rename to src/enemyB/Enemy2-KinematicBody2D.gd diff --git a/Enemy2.tscn b/src/enemyB/Enemy2.tscn similarity index 95% rename from Enemy2.tscn rename to src/enemyB/Enemy2.tscn index 6b9024a..ec009c8 100644 --- a/Enemy2.tscn +++ b/src/enemyB/Enemy2.tscn @@ -1,16 +1,16 @@ [gd_scene load_steps=35 format=2] -[ext_resource path="res://Enemy2-KinematicBody2D.gd" type="Script" id=1] +[ext_resource path="res://src/enemyB/Enemy2-KinematicBody2D.gd" type="Script" id=1] [ext_resource path="res://src/states/enemy/fall.gd" type="Script" id=2] -[ext_resource path="res://state_machine.gd" type="Script" id=3] +[ext_resource path="res://src/state_machine.gd" type="Script" id=3] [ext_resource path="res://src/states/enemy/jump.gd" type="Script" id=4] [ext_resource path="res://src/states/enemy/move.gd" type="Script" id=5] [ext_resource path="res://src/states/enemy/wander.gd" type="Script" id=6] [ext_resource path="res://src/states/enemy/idle.gd" type="Script" id=7] [ext_resource path="res://src/states/enemy/attack.gd" type="Script" id=8] -[ext_resource path="res://Gun.gd" type="Script" id=9] +[ext_resource path="res://src/playerB/Gun.gd" type="Script" id=9] [ext_resource path="res://src/states/enemy/hurt.gd" type="Script" id=10] -[ext_resource path="res://enemy_move_component.gd" type="Script" id=11] +[ext_resource path="res://src/enemyB/enemy_move_component.gd" type="Script" id=11] [sub_resource type="StreamTexture" id=149] load_path = "res://.import/botEnemy.png-46efd539a38730ff15fb4ddb087329c6.stex" diff --git a/enemy_move_component.gd b/src/enemyB/enemy_move_component.gd similarity index 100% rename from enemy_move_component.gd rename to src/enemyB/enemy_move_component.gd diff --git a/Gun.gd b/src/playerB/Gun.gd similarity index 100% rename from Gun.gd rename to src/playerB/Gun.gd diff --git a/Player-KinematicBody2D.gd b/src/playerB/Player-KinematicBody2D.gd similarity index 100% rename from Player-KinematicBody2D.gd rename to src/playerB/Player-KinematicBody2D.gd diff --git a/Player.tscn b/src/playerB/Player.tscn similarity index 95% rename from Player.tscn rename to src/playerB/Player.tscn index d684d40..4b98764 100644 --- a/Player.tscn +++ b/src/playerB/Player.tscn @@ -1,15 +1,15 @@ [gd_scene load_steps=86 format=2] -[ext_resource path="res://Player-KinematicBody2D.gd" type="Script" id=1] -[ext_resource path="res://idle.gd" type="Script" id=2] -[ext_resource path="res://state_machine.gd" type="Script" id=3] -[ext_resource path="res://fall.gd" type="Script" id=4] -[ext_resource path="res://move.gd" type="Script" id=5] -[ext_resource path="res://player_move_component.gd" type="Script" id=6] -[ext_resource path="res://jump.gd" type="Script" id=7] -[ext_resource path="res://hurt.gd" type="Script" id=8] -[ext_resource path="res://Gun.gd" type="Script" id=9] -[ext_resource path="res://fire.gd" type="Script" id=10] +[ext_resource path="res://src/playerB/Player-KinematicBody2D.gd" type="Script" id=1] +[ext_resource path="res://src/playerB/states/idle.gd" type="Script" id=2] +[ext_resource path="res://src/state_machine.gd" type="Script" id=3] +[ext_resource path="res://src/playerB/states/fall.gd" type="Script" id=4] +[ext_resource path="res://src/playerB/states/move.gd" type="Script" id=5] +[ext_resource path="res://src/playerB/player_move_component.gd" type="Script" id=6] +[ext_resource path="res://src/playerB/states/jump.gd" type="Script" id=7] +[ext_resource path="res://src/playerB/states/hurt.gd" type="Script" id=8] +[ext_resource path="res://src/playerB/Gun.gd" type="Script" id=9] +[ext_resource path="res://src/playerB/states/fire.gd" type="Script" id=10] [sub_resource type="StreamTexture" id=75] load_path = "res://.import/MegaMan.png-dc2c293e5a0f5d183ee961942ac90e4a.stex" @@ -409,7 +409,7 @@ script = ExtResource( 1 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] frames = SubResource( 147 ) animation = "idle" -frame = 6 +frame = 13 playing = true flip_h = true __meta__ = { diff --git a/player_move_component.gd b/src/playerB/player_move_component.gd similarity index 100% rename from player_move_component.gd rename to src/playerB/player_move_component.gd diff --git a/dash.gd b/src/playerB/states/dash.gd similarity index 100% rename from dash.gd rename to src/playerB/states/dash.gd diff --git a/fall.gd b/src/playerB/states/fall.gd similarity index 100% rename from fall.gd rename to src/playerB/states/fall.gd diff --git a/fire.gd b/src/playerB/states/fire.gd similarity index 100% rename from fire.gd rename to src/playerB/states/fire.gd diff --git a/hurt.gd b/src/playerB/states/hurt.gd similarity index 100% rename from hurt.gd rename to src/playerB/states/hurt.gd diff --git a/idle.gd b/src/playerB/states/idle.gd similarity index 100% rename from idle.gd rename to src/playerB/states/idle.gd diff --git a/jump.gd b/src/playerB/states/jump.gd similarity index 100% rename from jump.gd rename to src/playerB/states/jump.gd diff --git a/move.gd b/src/playerB/states/move.gd similarity index 100% rename from move.gd rename to src/playerB/states/move.gd diff --git a/state.gd b/src/state.gd similarity index 100% rename from state.gd rename to src/state.gd diff --git a/state_machine.gd b/src/state_machine.gd similarity index 100% rename from state_machine.gd rename to src/state_machine.gd