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

Compare commits

base: sandvich:516d79d86fa19cc444ae68925ef7737abb00b5a5
Branches Tags
sandvich:master
sandvich:fix-worldenv
sandvich:impl-save-inventory
sandvich:wip
sandvich:origin/master
sandvich:phantom-camera
sandvich:refactor
sandvich:issue-templates
sandvich:godot-4.3
sandvich:wip-inventory
sandvich:godot-4.2
sandvich:controller-support
sandvich:godot-4.1.1
sandvich:item-info
sandvich:2023-09-09
..
compare: sandvich:40ba0285f4e708033ec9b170d8565060b7ec5f4c
Branches Tags
sandvich:master
sandvich:fix-worldenv
sandvich:impl-save-inventory
sandvich:wip
sandvich:origin/master
sandvich:phantom-camera
sandvich:refactor
sandvich:issue-templates
sandvich:godot-4.3
sandvich:wip-inventory
sandvich:godot-4.2
sandvich:controller-support
sandvich:godot-4.1.1
sandvich:item-info
sandvich:2023-09-09

No commits in common. "516d79d86fa19cc444ae68925ef7737abb00b5a5" and "40ba0285f4e708033ec9b170d8565060b7ec5f4c" have entirely different histories.
516d79d86f ... 40ba0285f4

7 changed files with 5 additions and 34 deletions
Show Stats Expand all files Collapse all files

2
Assets/Dialogue/books.dialogue.import
View File

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

2
Assets/Dialogue/clone-machine.dialogue.import
View File

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

2
Assets/Dialogue/doc.dialogue.import
View File

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

BIN
Assets/Music/alleyways.mp3
View File

Binary file not shown.

19
Assets/Music/alleyways.mp3.import
View File

@ -1,19 +0,0 @@
[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

4
Characters/Doc.tscn
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://cboxekwt0xc6o" path="res://Assets/Music/alleyways.mp3" id="3_qnxmu"]
[ext_resource type="AudioStream" uid="uid://ipss4y2gkk3y" path="res://Assets/Music/gillette.mp3" id="3_eo4lg"]
[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_qnxmu")
Music = ExtResource("3_eo4lg")
MaxHealth = 900.0
DefaultSelectedItem = NodePath("Inventory/DocLance")
ThinkerStateMachine = NodePath("ThinkerStateMachine")

10
Utils/IFaction.cs
View File

@ -9,14 +9,4 @@ 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;
}
}