This commit is contained in:
Victor Turgeon
2023-01-15 11:17:51 -05:00
parent 96581c5f60
commit 39a399f137
28 changed files with 316 additions and 92 deletions

View File

@@ -4,7 +4,6 @@ extends CharacterBody2D
@export var ACCELERATION = 2000.0;
@export var FRICTION = 3000.0;
@export var HP = 100;
@export var STARTING_WEAPON : PackedScene;
@onready var raycast = $RayCast2D;
var current_weapon = null;
@@ -12,10 +11,6 @@ var weapons = [null,null,null];
func _ready():
call_deferred("call_set_player");
weapons[0] = STARTING_WEAPON.instantiate();
weapons[1] = load("res://Weapons/shotgun.tscn").instantiate();
current_weapon = weapons[0];
raycast.add_child(current_weapon);
func _physics_process(delta):
var input_vector = get_input_vector();
@@ -48,6 +43,14 @@ func take_damage(damage):
if HP <= 0:
kill();
func pickup(item):
if item.Type == "weapon":
for n in 3:
if !weapons[n]:
weapons[n] = item.Item.instantiate();
change_weapon(n);
return;
func kill():
get_tree().reload_current_scene();

View File

@@ -1,7 +1,6 @@
[gd_scene load_steps=6 format=3 uid="uid://xev8p1td1icx"]
[gd_scene load_steps=5 format=3 uid="uid://xev8p1td1icx"]
[ext_resource type="Script" path="res://Player/player.gd" id="1_mbyc2"]
[ext_resource type="PackedScene" uid="uid://cmtuq84761y0i" path="res://Weapons/basic_weapon.tscn" id="2_bo475"]
[ext_resource type="Texture2D" uid="uid://wkeakqjvu3gg" path="res://Sprites/placeholder_player.png" id="2_bqbmq"]
[sub_resource type="SpriteFrames" id="SpriteFrames_mqbrd"]
@@ -20,7 +19,6 @@ size = Vector2(40, 64)
[node name="Player" type="CharacterBody2D"]
script = ExtResource("1_mbyc2")
STARTING_WEAPON = ExtResource("2_bo475")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
frames = SubResource("SpriteFrames_mqbrd")