From 0fdf6eebba1723f3d05e668d78bdc7669e679486 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Fri, 5 Aug 2022 20:27:02 -0400 Subject: Fixed switching scene problem --- game/Characters/Player/Player.gd | 34 ---------------------------------- game/Characters/Player/Player.tscn | 38 -------------------------------------- game/Game.tscn | 2 +- game/characters/player/Player.gd | 34 ++++++++++++++++++++++++++++++++++ game/characters/player/Player.tscn | 38 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 73 deletions(-) delete mode 100644 game/Characters/Player/Player.gd delete mode 100644 game/Characters/Player/Player.tscn create mode 100644 game/characters/player/Player.gd create mode 100644 game/characters/player/Player.tscn (limited to 'game') diff --git a/game/Characters/Player/Player.gd b/game/Characters/Player/Player.gd deleted file mode 100644 index f764015..0000000 --- a/game/Characters/Player/Player.gd +++ /dev/null @@ -1,34 +0,0 @@ -extends KinematicBody2D - -const UP = Vector2(0,-1) -export var GRAVITY = 20 -export var MAXFALLSPEED = 200 -export var MAXSPEED = 80 -export var JUMPFORCE = 300 -export var ACCEL = 10 - -var motion = Vector2() - -# Called when the node enters the scene tree for the first time. -func _ready(): - pass # Replace with function body. - - -func _physics_process(_delta): - - motion.y += GRAVITY - - if motion.y > MAXFALLSPEED: - motion.y = MAXFALLSPEED - - if is_on_floor(): - if Input.is_action_just_released("jump"): - motion.y = -JUMPFORCE - pass - - motion.x = clamp(motion.x,-MAXSPEED,MAXSPEED) - - motion.x += ACCEL - motion = move_and_slide(motion,UP) - - pass diff --git a/game/Characters/Player/Player.tscn b/game/Characters/Player/Player.tscn deleted file mode 100644 index a7ee0e4..0000000 --- a/game/Characters/Player/Player.tscn +++ /dev/null @@ -1,38 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://assets/images/white.png" type="Texture" id=2] - -[sub_resource type="GDScript" id=2] -script/source = "extends KinematicBody2D - - -# Declare member variables here. Examples: -# var a = 2 -# var b = \"text\" - - -# Called when the node enters the scene tree for the first time. -func _ready(): - pass # Replace with function body. - - -# Called every frame. 'delta' is the elapsed time since the previous frame. -#func _process(delta): -# pass -" - -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 160, 160 ) - -[node name="Player" type="KinematicBody2D"] -script = SubResource( 2 ) - -[node name="White" type="Sprite" parent="."] -position = Vector2( -4.76837e-07, 0 ) -scale = Vector2( 20, 20 ) -texture = ExtResource( 2 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource( 1 ) - -[node name="Camera2D" type="Camera2D" parent="."] diff --git a/game/Game.tscn b/game/Game.tscn index 426b2ae..d46136b 100644 --- a/game/Game.tscn +++ b/game/Game.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://game/Interface.tscn" type="PackedScene" id=2] [ext_resource path="res://assets/tilemap.tres" type="TileSet" id=3] [ext_resource path="res://assets/images/white.png" type="Texture" id=4] -[ext_resource path="res://game/Characters/Player/Player.gd" type="Script" id=5] +[ext_resource path="res://game/characters/player/Player.gd" type="Script" id=5] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 8, 8 ) diff --git a/game/characters/player/Player.gd b/game/characters/player/Player.gd new file mode 100644 index 0000000..f764015 --- /dev/null +++ b/game/characters/player/Player.gd @@ -0,0 +1,34 @@ +extends KinematicBody2D + +const UP = Vector2(0,-1) +export var GRAVITY = 20 +export var MAXFALLSPEED = 200 +export var MAXSPEED = 80 +export var JUMPFORCE = 300 +export var ACCEL = 10 + +var motion = Vector2() + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +func _physics_process(_delta): + + motion.y += GRAVITY + + if motion.y > MAXFALLSPEED: + motion.y = MAXFALLSPEED + + if is_on_floor(): + if Input.is_action_just_released("jump"): + motion.y = -JUMPFORCE + pass + + motion.x = clamp(motion.x,-MAXSPEED,MAXSPEED) + + motion.x += ACCEL + motion = move_and_slide(motion,UP) + + pass diff --git a/game/characters/player/Player.tscn b/game/characters/player/Player.tscn new file mode 100644 index 0000000..a7ee0e4 --- /dev/null +++ b/game/characters/player/Player.tscn @@ -0,0 +1,38 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://assets/images/white.png" type="Texture" id=2] + +[sub_resource type="GDScript" id=2] +script/source = "extends KinematicBody2D + + +# Declare member variables here. Examples: +# var a = 2 +# var b = \"text\" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass +" + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 160, 160 ) + +[node name="Player" type="KinematicBody2D"] +script = SubResource( 2 ) + +[node name="White" type="Sprite" parent="."] +position = Vector2( -4.76837e-07, 0 ) +scale = Vector2( 20, 20 ) +texture = ExtResource( 2 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource( 1 ) + +[node name="Camera2D" type="Camera2D" parent="."] -- cgit v1.2.3