Cleanup. Organize. Moves done outside of git.
This commit is contained in:
parent
aaad967476
commit
e4159c58b9
22
Main.gd
22
Main.gd
|
|
@ -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
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
[gd_scene load_steps=18 format=2]
|
[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://assets/Tiles/Assets/Assets.png" type="Texture" id=3]
|
||||||
[ext_resource path="res://Position2D.gd" type="Script" id=5]
|
[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]
|
[sub_resource type="ConvexPolygonShape2D" id=2]
|
||||||
points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 )
|
points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 )
|
||||||
|
|
|
||||||
|
|
@ -17,27 +17,27 @@ _global_script_classes=[ {
|
||||||
"base": "KinematicBody2D",
|
"base": "KinematicBody2D",
|
||||||
"class": "Enemy2",
|
"class": "Enemy2",
|
||||||
"language": "GDScript",
|
"language": "GDScript",
|
||||||
"path": "res://Enemy2-KinematicBody2D.gd"
|
"path": "res://src/enemyB/Enemy2-KinematicBody2D.gd"
|
||||||
}, {
|
}, {
|
||||||
"base": "Position2D",
|
"base": "Reference",
|
||||||
"class": "Gun",
|
"class": "Gun",
|
||||||
"language": "GDScript",
|
"language": "GDScript",
|
||||||
"path": "res://Gun.gd"
|
"path": "res://src/playerB/Gun.gd"
|
||||||
}, {
|
}, {
|
||||||
"base": "Node",
|
"base": "Node",
|
||||||
"class": "Movement",
|
"class": "Movement",
|
||||||
"language": "GDScript",
|
"language": "GDScript",
|
||||||
"path": "res://player_move_component.gd"
|
"path": "res://src/playerB/player_move_component.gd"
|
||||||
}, {
|
}, {
|
||||||
"base": "KinematicBody2D",
|
"base": "KinematicBody2D",
|
||||||
"class": "Player",
|
"class": "Player",
|
||||||
"language": "GDScript",
|
"language": "GDScript",
|
||||||
"path": "res://Player-KinematicBody2D.gd"
|
"path": "res://src/playerB/Player-KinematicBody2D.gd"
|
||||||
}, {
|
}, {
|
||||||
"base": "Node",
|
"base": "Node",
|
||||||
"class": "State",
|
"class": "State",
|
||||||
"language": "GDScript",
|
"language": "GDScript",
|
||||||
"path": "res://state.gd"
|
"path": "res://src/state.gd"
|
||||||
} ]
|
} ]
|
||||||
_global_script_class_icons={
|
_global_script_class_icons={
|
||||||
"Enemy": "",
|
"Enemy": "",
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,16 @@
|
||||||
[gd_scene load_steps=35 format=2]
|
[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://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/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/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/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/idle.gd" type="Script" id=7]
|
||||||
[ext_resource path="res://src/states/enemy/attack.gd" type="Script" id=8]
|
[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://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]
|
[sub_resource type="StreamTexture" id=149]
|
||||||
load_path = "res://.import/botEnemy.png-46efd539a38730ff15fb4ddb087329c6.stex"
|
load_path = "res://.import/botEnemy.png-46efd539a38730ff15fb4ddb087329c6.stex"
|
||||||
|
|
@ -1,15 +1,15 @@
|
||||||
[gd_scene load_steps=86 format=2]
|
[gd_scene load_steps=86 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://Player-KinematicBody2D.gd" type="Script" id=1]
|
[ext_resource path="res://src/playerB/Player-KinematicBody2D.gd" type="Script" id=1]
|
||||||
[ext_resource path="res://idle.gd" type="Script" id=2]
|
[ext_resource path="res://src/playerB/states/idle.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://fall.gd" type="Script" id=4]
|
[ext_resource path="res://src/playerB/states/fall.gd" type="Script" id=4]
|
||||||
[ext_resource path="res://move.gd" type="Script" id=5]
|
[ext_resource path="res://src/playerB/states/move.gd" type="Script" id=5]
|
||||||
[ext_resource path="res://player_move_component.gd" type="Script" id=6]
|
[ext_resource path="res://src/playerB/player_move_component.gd" type="Script" id=6]
|
||||||
[ext_resource path="res://jump.gd" type="Script" id=7]
|
[ext_resource path="res://src/playerB/states/jump.gd" type="Script" id=7]
|
||||||
[ext_resource path="res://hurt.gd" type="Script" id=8]
|
[ext_resource path="res://src/playerB/states/hurt.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://fire.gd" type="Script" id=10]
|
[ext_resource path="res://src/playerB/states/fire.gd" type="Script" id=10]
|
||||||
|
|
||||||
[sub_resource type="StreamTexture" id=75]
|
[sub_resource type="StreamTexture" id=75]
|
||||||
load_path = "res://.import/MegaMan.png-dc2c293e5a0f5d183ee961942ac90e4a.stex"
|
load_path = "res://.import/MegaMan.png-dc2c293e5a0f5d183ee961942ac90e4a.stex"
|
||||||
|
|
@ -409,7 +409,7 @@ script = ExtResource( 1 )
|
||||||
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
|
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
|
||||||
frames = SubResource( 147 )
|
frames = SubResource( 147 )
|
||||||
animation = "idle"
|
animation = "idle"
|
||||||
frame = 6
|
frame = 13
|
||||||
playing = true
|
playing = true
|
||||||
flip_h = true
|
flip_h = true
|
||||||
__meta__ = {
|
__meta__ = {
|
||||||
Loading…
Reference in New Issue
Block a user