zenayi/GameJamDungeon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working on item rescue

Browse Source
This commit is contained in:
Zenny
2024-12-19 15:42:40 -08:00
parent d135be4318
commit e525ede13d
43 changed files with 794 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/player/Player.cs
View File

@@ -49,6 +49,11 @@ namespace GameJamDungeon
[Export]
public PlayerStatResource PlayerStatResource { get; set; } = default!;
[Export]
private WeaponStats _defaultWeapon { get; set; } = default!;
[Export]
private ArmorStats _defaultArmor { get; set; } = default!;
public PlayerLogic.Settings Settings { get; set; } = default!;
public PlayerLogic PlayerLogic { get; set; } = default!;
@@ -113,6 +118,14 @@ namespace GameJamDungeon
PlayerLogic.Set(GameRepo);
PlayerLogic.Set(PlayerData);
var defaultWeapon = new Weapon() { WeaponStats = _defaultWeapon };
var defaultArmor = new Armor() { ArmorStats = _defaultArmor };
PlayerData.Inventory.TryAdd(defaultWeapon);
PlayerData.Inventory.TryAdd(defaultArmor);
PlayerData.Inventory.Equip(defaultWeapon);
PlayerData.Inventory.Equip(defaultArmor);
PlayerData.Inventory.EquippedAccessory.Sync += EquippedAccessory_Sync;
PlayerData.CurrentHP.Sync += CurrentHP_Sync;
@@ -256,11 +269,11 @@ namespace GameJamDungeon
{
if (PlayerData.Inventory.EquippedAccessory.Value.AccessoryStats.AccessoryTags.Contains(AccessoryTag.HalfVTConsumption))
{
if (reduceOnTick)
PlayerData.SetCurrentVT(PlayerData.CurrentVT.Value - 1);
reduceOnTick = !reduceOnTick;
}
PlayerData.SetCurrentHP(PlayerData.CurrentHP.Value + 1);
if (reduceOnTick)
PlayerData.SetCurrentVT(PlayerData.CurrentVT.Value - 1);
}
else
PlayerData.SetCurrentHP(PlayerData.CurrentHP.Value - 1);

6
src/player/Player.tscn
View File

@@ -1,8 +1,10 @@
[gd_scene load_steps=47 format=3 uid="uid://cfecvvav8kkp6"]
[gd_scene load_steps=49 format=3 uid="uid://cfecvvav8kkp6"]
[ext_resource type="Script" path="res://src/player/Player.cs" id="1_xcol5"]
[ext_resource type="Script" path="res://src/hitbox/Hitbox.cs" id="2_lb3qc"]
[ext_resource type="Script" path="res://src/player/PlayerStatResource.cs" id="2_xq68d"]
[ext_resource type="Resource" uid="uid://b7xr0l4a8g1gk" path="res://src/items/weapons/resources/SealingRod.tres" id="3_ebyyx"]
[ext_resource type="Resource" uid="uid://ce2vfa2t3io67" path="res://src/items/armor/resources/AtonersAdornments.tres" id="4_bj1ma"]
[ext_resource type="Texture2D" uid="uid://c6r3dhnkuw22w" path="res://src/vfx/hit_effects/FIRE_STRIKE_1.0.png" id="5_wr6lo"]
[ext_resource type="Texture2D" uid="uid://b5qjlbcesth53" path="res://src/vfx/Weapon Strikes/NON ELEMENTAL SLASH.png" id="6_p34sl"]
[ext_resource type="Texture2D" uid="uid://mjobx7ph7hf1" path="res://src/vfx/playerdot.png" id="7_8hi2n"]
@@ -347,6 +349,8 @@ collision_layer = 806
collision_mask = 775
script = ExtResource("1_xcol5")
PlayerStatResource = SubResource("Resource_btp2w")
_defaultWeapon = ExtResource("3_ebyyx")
_defaultArmor = ExtResource("4_bj1ma")
[node name="Hitbox" type="Area3D" parent="."]
unique_name_in_owner = true