merge
This commit is contained in:
commit
1baf3ba8f3
@ -1,13 +1,14 @@
|
||||
[gd_scene load_steps=3 format=2]
|
||||
|
||||
[ext_resource path="res://Assets/Placeholder.png" type="Texture" id=1]
|
||||
[ext_resource path="res://Scripts/Clopinette.gd" type="Script" id=2]
|
||||
[ext_resource path="res://Scripts/Clopinette.gd" type="Script" id=1]
|
||||
[ext_resource path="res://Assets/Placeholder.png" type="Texture" id=2]
|
||||
|
||||
[node name="Clopinette" type="Node2D"]
|
||||
script = ExtResource( 2 )
|
||||
position = Vector2( 458.947, 226.316 )
|
||||
script = ExtResource( 1 )
|
||||
|
||||
[node name="Sprite" type="Sprite" parent="."]
|
||||
texture = ExtResource( 1 )
|
||||
texture = ExtResource( 2 )
|
||||
|
||||
[node name="Area2D" type="Area2D" parent="."]
|
||||
|
||||
|
@ -4,13 +4,14 @@
|
||||
[ext_resource path="res://Scripts/Player.gd" type="Script" id=2]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id=1]
|
||||
extents = Vector2( 17.014, 16.4616 )
|
||||
extents = Vector2( 16.1674, 5.57349 )
|
||||
|
||||
[node name="Player" type="KinematicBody2D"]
|
||||
[node name="KinematicBody2D" type="KinematicBody2D"]
|
||||
script = ExtResource( 2 )
|
||||
|
||||
[node name="Sprite" type="Sprite" parent="."]
|
||||
texture = ExtResource( 1 )
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||
position = Vector2( 0, 10.3147 )
|
||||
shape = SubResource( 1 )
|
||||
|
@ -1,13 +1,27 @@
|
||||
[gd_scene load_steps=3 format=2]
|
||||
[gd_scene load_steps=4 format=2]
|
||||
|
||||
[ext_resource path="res://Scene/Player.tscn" type="PackedScene" id=1]
|
||||
[ext_resource path="res://Scene/Clopinette.tscn" type="PackedScene" id=2]
|
||||
[ext_resource path="res://Assets/Placeholder.png" type="Texture" id=2]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id=1]
|
||||
extents = Vector2( 15.6178, 15.7669 )
|
||||
|
||||
[node name="World" type="Node2D"]
|
||||
|
||||
[node name="Player1" parent="." instance=ExtResource( 1 )]
|
||||
position = Vector2( 121.087, 85.6409 )
|
||||
position = Vector2( 119.977, 88.9695 )
|
||||
|
||||
[node name="Clopinette4" parent="." instance=ExtResource( 2 )]
|
||||
position = Vector2( 476.728, 110.06 )
|
||||
scriptName = "res://Scripts/PaintEffects/Invisibility.gd"
|
||||
[node name="obstacle" type="StaticBody2D" parent="."]
|
||||
position = Vector2( 57.697, 87.6551 )
|
||||
__meta__ = {
|
||||
"_edit_group_": true
|
||||
}
|
||||
|
||||
[node name="Sprite" type="Sprite" parent="obstacle"]
|
||||
texture = ExtResource( 2 )
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="obstacle"]
|
||||
shape = SubResource( 1 )
|
||||
|
||||
[node name="Player2" parent="." instance=ExtResource( 1 )]
|
||||
position = Vector2( 221.278, 126.847 )
|
||||
|
@ -3,13 +3,21 @@ extends KinematicBody2D
|
||||
const MAX_SPEED = 200
|
||||
const ACCELERATION = 1000
|
||||
const FRICTION = 1000
|
||||
const MAX_LIFE = 30
|
||||
|
||||
var vel = Vector2.ZERO
|
||||
var curLife = MAX_LIFE
|
||||
|
||||
#onready var animationPlayer = $AnimationPlayer
|
||||
#onready var animationTree = $AnimationTree
|
||||
#onready var animationState = animationTree.get("parameters/playback")
|
||||
|
||||
func _process(delta):
|
||||
curLife -= delta
|
||||
if curLife <= 0:
|
||||
#fin du game laul
|
||||
pass
|
||||
|
||||
func _physics_process(delta):
|
||||
var input_vector = Vector2.ZERO
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user