Compare commits

...

3 Commits

7 changed files with 34 additions and 5 deletions

View File

@ -1,6 +1,6 @@
[remap]
importer="dialogue_manager_compiler_8"
importer="dialogue_manager_compiler_11"
type="Resource"
uid="uid://dilmuoilweoeh"
path="res://.godot/imported/books.dialogue-cc272ebae322ae3ca46820dca11a3437.tres"

View File

@ -1,6 +1,6 @@
[remap]
importer="dialogue_manager_compiler_8"
importer="dialogue_manager_compiler_11"
type="Resource"
uid="uid://c2om4y0fm81yr"
path="res://.godot/imported/clone-machine.dialogue-8810934a67eacdad52469e9ef5f970fb.tres"

View File

@ -1,6 +1,6 @@
[remap]
importer="dialogue_manager_compiler_8"
importer="dialogue_manager_compiler_11"
type="Resource"
uid="uid://dntkvjjr8mrgf"
path="res://.godot/imported/doc.dialogue-8f95f6a09d3ac685b71d7e07c49df1c6.tres"

Binary file not shown.

View File

@ -0,0 +1,19 @@
[remap]
importer="mp3"
type="AudioStreamMP3"
uid="uid://cboxekwt0xc6o"
path="res://.godot/imported/alleyways.mp3-4be87baeb71799fa6e64746fe04d2985.mp3str"
[deps]
source_file="res://Assets/Music/alleyways.mp3"
dest_files=["res://.godot/imported/alleyways.mp3-4be87baeb71799fa6e64746fe04d2985.mp3str"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

View File

@ -2,7 +2,7 @@
[ext_resource type="Script" path="res://Characters/Doc.cs" id="2_3elet"]
[ext_resource type="Shader" path="res://Shaders/Flash.gdshader" id="2_5jxom"]
[ext_resource type="AudioStream" uid="uid://ipss4y2gkk3y" path="res://Assets/Music/gillette.mp3" id="3_eo4lg"]
[ext_resource type="AudioStream" uid="uid://cboxekwt0xc6o" path="res://Assets/Music/alleyways.mp3" id="3_qnxmu"]
[ext_resource type="Texture2D" uid="uid://baiuqgrqipppt" path="res://Assets/Sprites/Characters/doc.png" id="3_rs44f"]
[ext_resource type="Script" path="res://State/Character/CharacterStateMachine.cs" id="3_t5jjc"]
[ext_resource type="Texture2D" uid="uid://dpepm54hjuyga" path="res://Assets/Sprites/Characters/forsen-hand.png" id="4_8lqj6"]
@ -562,7 +562,7 @@ script = ExtResource("2_3elet")
Lance = NodePath("Inventory/DocLance")
BossStateMachine = NodePath("BossStateMachine")
BossName = "Doc, The Two-Time"
Music = ExtResource("3_eo4lg")
Music = ExtResource("3_qnxmu")
MaxHealth = 900.0
DefaultSelectedItem = NodePath("Inventory/DocLance")
ThinkerStateMachine = NodePath("ThinkerStateMachine")

View File

@ -9,4 +9,14 @@ public interface IFaction
/// </summary>
[Export]
public ushort Faction { get; set; }
public bool AlignsWith(IFaction other)
{
return (Faction & other.Faction) > 0;
}
public bool AlignsFullyWith(IFaction other)
{
return Faction == other.Faction;
}
}