sandvich
/
SupaLidlGame
mirror of https://github.com/humanoidsandvichdispenser/SupaLidlgame
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'godot-4.3' of github.com:HumanoidSandvichDispenser/SupaLidlGame into godot-4.3

godot-4.3
John Montagu, the 4th Earl of Sandvich 2024-01-13 22:30:15 -08:00
parent d5f6d9708d 5efbd5b006
commit e7e2a7b999
Signed by: sandvich
GPG Key ID: 9A39BE37E602B22D
4 changed files with 190 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Items/ItemMetadata.cs
View File

@ -16,4 +16,10 @@ public partial class ItemMetadata : Resource
[Export(PropertyHint.MultilineText)] [Export(PropertyHint.MultilineText)]
public string Description { get; set; } public string Description { get; set; }
[Export]
public int BuyPrice { get; set; }
[Export]
public int SellPrice { get; set; }
} }

180
Scenes/Maps/ForestNew.tscn
View File

File diff suppressed because one or more lines are too long

5
State/Thinker/DashDefensive.cs
View File

@ -41,6 +41,11 @@ public partial class DashDefensive : AttackState
} }
} }
if (PursueOnNoLOS && !NPC.HasLineOfSight(bestTarget))
{
return PursueState;
}
if (NPC.CanAttack && NPC.StunTime <= 0) if (NPC.CanAttack && NPC.StunTime <= 0)
{ {
bool isTargetStunned = bestTarget.StunTime > 0; bool isTargetStunned = bestTarget.StunTime > 0;

3
UI/Base.tscn
View File

@ -89,8 +89,9 @@ layout_mode = 2
theme_override_constants/margin_top = 16 theme_override_constants/margin_top = 16
theme_override_constants/margin_right = 16 theme_override_constants/margin_right = 16
[node name="GridContainer" parent="SubViewportContainer/UIViewport/MainUILayer/Main/Top/Right" instance=ExtResource("5_mmp18")] [node name="GridContainer" parent="SubViewportContainer/UIViewport/MainUILayer/Main/Top/Right" node_paths=PackedStringArray("_slots") instance=ExtResource("5_mmp18")]
layout_mode = 2 layout_mode = 2
_slots = [NodePath("InventorySlot"), NodePath("InventorySlot2"), NodePath("InventorySlot3")]
[node name="Bottom" type="HBoxContainer" parent="SubViewportContainer/UIViewport/MainUILayer/Main"] [node name="Bottom" type="HBoxContainer" parent="SubViewportContainer/UIViewport/MainUILayer/Main"]
layout_mode = 1 layout_mode = 1