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

Fix labels

Browse Source
This commit is contained in:
Zenny
2024-09-08 15:42:08 -07:00
parent a47d1306b9
commit 1dfc61f003
242 changed files with 5502 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/player/Player.cs
View File

@@ -125,7 +125,7 @@ namespace GameJamDungeon
})
.Handle((in PlayerLogic.Output.Animations.Attack output) =>
{
var weaponInfo = (WeaponInfo)GameRepo.EquippedWeapon.Info;
var weaponInfo = GameRepo.EquippedWeapon.WeaponInfo;
var attackSpeed = (float)weaponInfo.AttackSpeed;
AnimationPlayer.SetSpeedScale(attackSpeed);
AnimationPlayer.Play("attack");
@@ -216,7 +216,7 @@ namespace GameJamDungeon
AnimationPlayer.AnimationFinished -= OnAnimationFinished;
}
private void OnEquippedWeaponChanged(Weapon info) => Hitbox.Damage = ((WeaponInfo)info.Info).Damage;
private void OnEquippedWeaponChanged(Weapon info) => Hitbox.Damage = info.WeaponInfo.Damage;
private void OnHPChanged(double newHP)
{

4
src/player/Player.tscn
View File

@@ -157,8 +157,8 @@ mesh = SubResource("CapsuleMesh_dmans")
[node name="CollisionDetector" type="Area3D" parent="CollisionShape3D"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.937567, 0)
collision_layer = 192
collision_mask = 128
collision_layer = 196
collision_mask = 132
[node name="CollisionShape3D" type="CollisionShape3D" parent="CollisionShape3D/CollisionDetector"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0479561, 0.982638, -0.04021)