starting a major rework, where all effects are controlled within a contact

Art/DVD_logo.svg.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://c2bxv5ag46gy"
+path="res://.godot/imported/DVD_logo.svg.png-5e83be52b2303068fecc292b205ac7e1.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Art/DVD_logo.svg.png"
+dest_files=["res://.godot/imported/DVD_logo.svg.png-5e83be52b2303068fecc292b205ac7e1.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

Gameplay/Board.cs

@@ -108,7 +108,7 @@ public partial class Board : Sprite2D
         
     }
 
-    public void Start()
+    public void Begin()
     {
         ClearBoard();
         // _player._isTurn = true;

Gameplay/BusinessCard.cs

@@ -1,61 +0,0 @@
-using Godot;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-public partial class BusinessCard : TextureButton
-{
-    public Player _player;
-    public Goal _goal;
-    public GoalName _goalName;
-    public bool _goalMet = false;
-
-    public override void _Ready()
-    {
-        base._Ready();
-        _goal = GetNode<Goal>("Goal");
-    }
-
-    public override void _Pressed()
-    {
-        base._Pressed();
-        _player._busDebug.Text = _goalName.ToString() + (_goalMet ? "": " NOT") + " MET";
-        if (_goalMet)
-        {
-            _player._activeEnemy.Defeat(_goalName);
-            _player.Challenge(_player._activeEnemy._owner._board._owner);
-        }
-    }
-
-    public void AssignGoal(GoalName GOALNAME)
-    {
-        _goalName = GOALNAME;
-    }
-
-    public void AssignRandomGoal()
-    {
-        Random r = new Random();
-        AssignGoal(_goal._conditions.Keys.ElementAt(r.Next(_goal._conditions.Keys.Count)));
-    }
-
-    public void CheckGoal()
-    {
-        List<Shield> ownedShields = _player._board.GetShieldsByOwner(_player);
-        List<int> addresses = _goal.GetAddresses(_goalName);
-        _goalMet = addresses.All(a=>ownedShields.Select(c=>c._address).ToList().IndexOf(a)>-1);
-        if (_goalMet)
-        {
-            Modulate = new Color(1,1,1,1);
-        }
-        else
-        {
-            Modulate = new Color(1,1,1,0.3f);
-        }
-    }
-
-    public void PassPlayer(Player PLAYER)
-    {
-        _player = PLAYER;
-    }
-
-}

Gameplay/BusinessCard.cs.uid

@@ -1 +0,0 @@
-uid://dtcalmvwievft

Gameplay/Contact.cs

@@ -1,54 +0,0 @@
-using Godot;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-
-public partial class Contact : Sprite2D
-{
-    public int _number;
-    public List<Effect> _effects;
-    public PhoneButton _button;
-    // public 
-
-    public override void _Ready()
-    {
-        
-    }
-
-    public virtual void FireEffect()
-    {
-        
-    }
-
-    public virtual void End()
-    {
-        _effects.ForEach(e=>e.End());
-    }
-
-    public void LoadEffect(string EFFECT_NAME, string EFFECT_TYPE)
-    {
-        PackedScene scene = ResourceLoader.Load<PackedScene>("res://Gameplay/Effects/"+EFFECT_TYPE+"/"+EFFECT_NAME+".tscn");
-        Effect instance = scene.Instantiate<Effect>();
-
-        AddChild(instance);
-        Effect newEffect = (Effect)GetChildren().Single(c=>c==instance);
-
-        newEffect.SetContact(this);
-        // TimeEffect1 newEffect = scene.Instantiate();
-        // AddChild(newEffect);
-        // GD.Print(newEffect);
-        // newEffect._contact = this;
-        // _effects.Add(newEffect);
-    }
-
-    public void PassNumber(int NUMBER)
-    {
-        _number = NUMBER;
-    }
-
-    public virtual void Start()
-    {
-        _effects.ForEach(e=>e.Start());
-    }
-}

Gameplay/Contact.cs.uid

@@ -1 +0,0 @@
-uid://bgj2cuqdq0b6l

Gameplay/Contacts/DmitriVonDietmud.cs

@@ -0,0 +1,16 @@
+using Godot;
+using System;
+
+public partial class DmitriVonDietmud : Node2D
+{
+    Button _button;
+    Sprite2D _contactPhoto, _bouncingLogo;
+    public override void _Ready()
+    {
+        base._Ready();
+        _button = GetNode<Button>("Button");
+        _contactPhoto = GetNode<Sprite2D>("ContactPhoto");
+        _bouncingLogo = GetNode<Sprite2D>("BouncingLogo");
+    }
+
+}

Gameplay/Contacts/DmitriVonDietmud.cs.uid

@@ -0,0 +1 @@
+uid://6pl5j2gts8rs

Gameplay/Contacts/dmitri_von_dietmud.tscn

@@ -0,0 +1,45 @@
+[gd_scene format=3 uid="uid://do2jybceg5ff7"]
+
+[ext_resource type="Script" uid="uid://6pl5j2gts8rs" path="res://Gameplay/Contacts/DmitriVonDietmud.cs" id="1_6y476"]
+[ext_resource type="Texture2D" uid="uid://g6ikqlh8yccy" path="res://Art/blanksquare.jpg" id="2_qntos"]
+[ext_resource type="Texture2D" uid="uid://c2bxv5ag46gy" path="res://Art/DVD_logo.svg.png" id="3_qg40i"]
+
+[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_61s5v"]
+radius = 214.0
+height = 998.0
+
+[node name="DmitriVonDietmud" type="Node2D" unique_id=1597238152]
+script = ExtResource("1_6y476")
+
+[node name="Button" type="Button" parent="." unique_id=250025707]
+modulate = Color(1, 1, 1, 0)
+z_index = 1
+offset_left = -120.0
+offset_top = -120.0
+offset_right = 120.0
+offset_bottom = 120.0
+
+[node name="ContactPhoto" type="Sprite2D" parent="." unique_id=224136394]
+texture = ExtResource("2_qntos")
+
+[node name="ProgressBar" type="ProgressBar" parent="ContactPhoto" unique_id=929449245]
+z_index = -1
+offset_left = -120.0
+offset_top = -120.0
+offset_right = 120.0
+offset_bottom = 120.0
+
+[node name="BouncingLogo" type="Sprite2D" parent="." unique_id=780733394]
+visible = false
+scale = Vector2(0.17494087, 0.1749409)
+texture = ExtResource("3_qg40i")
+
+[node name="Area2D" type="Area2D" parent="BouncingLogo" unique_id=1582289528]
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="BouncingLogo/Area2D" unique_id=1067740615]
+rotation = 1.5707964
+shape = SubResource("CapsuleShape2D_61s5v")
+
+[node name="LogoLifespan" type="Timer" parent="BouncingLogo" unique_id=889600374]
+
+[node name="AvailableTimer" type="Timer" parent="." unique_id=2103179733]

Gameplay/Effect.cs

@@ -1,27 +0,0 @@
-using Godot;
-using System;
-
-public partial class Effect : Node
-{
-    public Contact _contact;
-    public virtual void Fire()
-    {
-        
-    }
-
-    public virtual void End()
-    {
-        
-    }
-
-    public virtual void SetContact(Contact CONTACT)
-    {
-        _contact = CONTACT;
-        GD.Print(_contact);
-    }
-
-    public virtual void Start()
-    {
-        
-    }
-}

Gameplay/Effect.cs.uid

@@ -1 +0,0 @@
-uid://cac8dbhhcrjfe

Gameplay/Effects/ClickEffect.cs

@@ -1,61 +0,0 @@
-using Godot;
-using System;
-
-public partial class ClickEffect : Effect
-{
-    public bool _available;
-    public int _calls = 0, _maxCalls = 0;
-    public float _timerSeconds;
-    public Timer _timer;
-
-    public override void _Ready()
-    {
-        base._Ready();
-        _timer = GetNode<Timer>("Timer");
-    }
-
-    public override void _Process(double delta)
-    {
-        base._Process(delta);
-        if (_contact._button._phone._running)
-        {
-            _contact._button._progressBar.Value = Math.Round(_timer.TimeLeft / _timerSeconds * 100, 0);
-        }
-    }
-
-    public override void Fire()
-    {
-        base.Fire();
-        if (_available && (_calls <= _maxCalls || _maxCalls == 0))
-        {
-            _calls++;
-            _timer.Start(_timerSeconds);
-        }
-    }
-
-    public override void End()
-    {
-        _contact._button._progressBar.Value = 0;
-    }
-
-    public virtual void SetTimer(int SECONDS)
-    {
-        _timerSeconds = SECONDS;
-    }
-
-    public override void Start()
-    {
-        base.Start();
-        _available = false;
-        _calls = 0;
-        _timer.Start(_timerSeconds);
-    }
-
-    private void OnTimerTimeout()
-    {
-        if (_calls <= _maxCalls || _maxCalls == 0)
-        {
-            _available = true;
-        }
-    }
-}

Gameplay/Effects/ClickEffect.cs.uid

@@ -1 +0,0 @@
-uid://b2h6prsg8m1y7

Gameplay/Effects/ClickEffects/ClickEffect1.cs

@@ -1,20 +0,0 @@
-using Godot;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-public partial class ClickEffect1 : ClickEffect
-{
-    public override void Fire()
-    {
-        base.Fire();
-        if (_available && (_calls <= _maxCalls || _maxCalls == 0))
-        {
-            List<Shield> shields = _contact._button._phone._player._board._shields.Where(s=>!s._broken).ToList();
-            int shieldNumber = Globals._rng.Next(0, shields.Count);
-            int damage = Globals._rng.Next(-50,-30);
-            shields[shieldNumber].ChangeHealth(damage);
-            _contact._button._phone._player._debug.Text = "Shield "+shieldNumber+" damaged for "+damage+" Damage!";
-        }
-    }
-}

Gameplay/Effects/ClickEffects/ClickEffect1.cs.uid

@@ -1 +0,0 @@
-uid://qmmft72g5uj6

Gameplay/Effects/ClickEffects/click_effect1.tscn

@@ -1,9 +0,0 @@
-[gd_scene format=3 uid="uid://dkio7bpdjyh6q"]
-
-[ext_resource type="PackedScene" uid="uid://fygidhjkgabe" path="res://Gameplay/effect.tscn" id="1_dgxlt"]
-[ext_resource type="Script" uid="uid://qmmft72g5uj6" path="res://Gameplay/Effects/ClickEffects/ClickEffect1.cs" id="2_wfqii"]
-
-[node name="ClickEffect1" unique_id=110922950 instance=ExtResource("1_dgxlt")]
-script = ExtResource("2_wfqii")
-
-[node name="Timer" type="Timer" parent="." index="0" unique_id=801745901]

Gameplay/Effects/PassiveEffect.cs

@@ -1,7 +0,0 @@
-using Godot;
-using System;
-
-public partial class PassiveEffect : Effect
-{
-    
-}

Gameplay/Effects/PassiveEffect.cs.uid

@@ -1 +0,0 @@
-uid://by1gyhcy001o0

Gameplay/Effects/PassiveEffects/PassiveEffect1.cs

@@ -1,7 +0,0 @@
-using Godot;
-using System;
-
-public partial class PassiveEffect1 : PassiveEffect
-{
-    
-}

Gameplay/Effects/PassiveEffects/PassiveEffect1.cs.uid

@@ -1 +0,0 @@
-uid://ctrfj2ixcrwa1

Gameplay/Effects/TimeEffect.cs

@@ -1,58 +0,0 @@
-using Godot;
-using System;
-using System.Runtime.InteropServices.Marshalling;
-
-public partial class TimeEffect : Effect
-{
-    public int _calls = 0, _maxCalls = 0;
-    public float _timerSeconds;
-    public Timer _timer;
-
-    public override void _Ready()
-    {
-        base._Ready();
-        _timer = GetNode<Timer>("Timer");
-    }
-
-    public override void _Process(double delta)
-    {
-        base._Process(delta);
-        if (_contact._button._phone._running)
-        {
-            _contact._button._progressBar.Value = Math.Round(_timer.TimeLeft / _timerSeconds * 100, 0);
-        }
-    }
-
-    public override void Fire()
-    {
-        base.Fire();
-        if (_calls <= _maxCalls || _maxCalls == 0)
-        {
-            _calls++;
-            _timer.Start(_timerSeconds);
-        }
-    }
-
-    public override void End()
-    {
-        _contact._button._progressBar.Value = 0;
-    }
-
-    public virtual void SetTimer(float SECONDS)
-    {
-        _timerSeconds = SECONDS;
-    }
-
-    public override void Start()
-    {
-        base.Start();
-        _calls = 0;
-        _timer.Start(_timerSeconds);
-    }
-
-    private void OnTimerTimeout()
-    {
-        Fire();
-    }
-
-}

Gameplay/Effects/TimeEffect.cs.uid

@@ -1 +0,0 @@
-uid://jvk7ejpb7xnc

Gameplay/Effects/TimeEffects/TimeEffect1.cs

@@ -1,21 +0,0 @@
-using Godot;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-public partial class TimeEffect1 : TimeEffect
-{
-	public override void Fire()
-	{
-		base.Fire();
-		if (_calls <= _maxCalls || _maxCalls == 0)
-		{
-			List<Shield> shields = _contact._button._phone._player._board._shields.Where(s=>!s._broken).ToList();
-			int shieldNumber = Globals._rng.Next(0, shields.Count);
-			int damage = Globals._rng.Next(-12,-8);
-			shields[shieldNumber].ChangeHealth(damage);
-			_contact._button._phone._player._debug.Text = "Shield "+shieldNumber+" damaged for "+damage+" Damage!";
-		}
-
-	}
-}

Gameplay/Effects/TimeEffects/TimeEffect1.cs.uid

@@ -1 +0,0 @@
-uid://b3ql333letuv

Gameplay/Effects/TimeEffects/time_effect_1.tscn

@@ -1,10 +0,0 @@
-[gd_scene format=3 uid="uid://dxr716rnqu2e"]
-
-[ext_resource type="Script" uid="uid://b3ql333letuv" path="res://Gameplay/Effects/TimeEffects/TimeEffect1.cs" id="1_l6ud1"]
-
-[node name="TimeEffect1" type="Node" unique_id=980963154]
-script = ExtResource("1_l6ud1")
-
-[node name="Timer" type="Timer" parent="." unique_id=1364707554]
-
-[connection signal="timeout" from="Timer" to="." method="OnTimerTimeout"]

Gameplay/Effects/click_effect.tscn

@@ -1,9 +0,0 @@
-[gd_scene format=3 uid="uid://dg1haube60fgt"]
-
-[ext_resource type="PackedScene" uid="uid://fygidhjkgabe" path="res://Gameplay/effect.tscn" id="1_udl8u"]
-[ext_resource type="Script" uid="uid://jvk7ejpb7xnc" path="res://Gameplay/Effects/TimeEffect.cs" id="2_uob21"]
-
-[node name="ClickEffect" unique_id=110922950 instance=ExtResource("1_udl8u")]
-script = ExtResource("2_uob21")
-
-[node name="Timer" type="Timer" parent="." index="0" unique_id=801745901]

Gameplay/Effects/passive_effect.tscn

@@ -1,7 +0,0 @@
-[gd_scene format=3 uid="uid://cudff465hbjhq"]
-
-[ext_resource type="PackedScene" uid="uid://fygidhjkgabe" path="res://Gameplay/effect.tscn" id="1_yrp4s"]
-[ext_resource type="Script" uid="uid://jvk7ejpb7xnc" path="res://Gameplay/Effects/TimeEffect.cs" id="2_87klk"]
-
-[node name="PassiveEffect" unique_id=110922950 instance=ExtResource("1_yrp4s")]
-script = ExtResource("2_87klk")

Gameplay/Effects/time_effect.tscn

@@ -1,11 +0,0 @@
-[gd_scene format=3 uid="uid://bi16tiewckt3c"]
-
-[ext_resource type="PackedScene" uid="uid://fygidhjkgabe" path="res://Gameplay/effect.tscn" id="1_dhrm1"]
-[ext_resource type="Script" uid="uid://jvk7ejpb7xnc" path="res://Gameplay/Effects/TimeEffect.cs" id="2_v3kdq"]
-
-[node name="TimeEffect" unique_id=110922950 instance=ExtResource("1_dhrm1")]
-script = ExtResource("2_v3kdq")
-
-[node name="Timer" type="Timer" parent="." index="0" unique_id=801745901]
-
-[connection signal="timeout" from="Timer" to="." method="OnTimerTimeout"]

Gameplay/Globals.cs

@@ -13,4 +13,11 @@ public static partial class Globals
     {
         _rng = new(SEED);
     }
+
+    public static T LoadScene<T>(string SCENE_PATH)
+    {
+        PackedScene scene = ResourceLoader.Load<PackedScene>(SCENE_PATH);
+        T instance = (T)(object)scene.Instantiate();
+        return instance;
+    }
 }

Gameplay/Phone.cs

@@ -7,10 +7,7 @@ using System.Linq;
 public partial class Phone : Sprite2D
 {
     public bool _running = false;
-    public PhoneButton _hoveredButton;
-    public List<PhoneButton> _phoneButtons = new();
     public Player _player;
-    public Contact _loadedContact;
     public CallButton _callButton;
     public RichTextLabel _debug;
     public override void _Ready()
@@ -18,12 +15,6 @@ public partial class Phone : Sprite2D
         _debug = GetNode<RichTextLabel>("Debug");
         _callButton = GetNode<CallButton>("CallButton");
         _callButton._phone = this;
-        _phoneButtons = GetChildren().Where(c=>c is PhoneButton).Cast<PhoneButton>().ToList();
-        for (int i = 0; i < _phoneButtons.Count; i++)
-        {
-            _phoneButtons[i]._phone = this;
-        }
-        _phoneButtons[0]._contact.LoadEffect("time_effect_1", "TimeEffects");
     }
 
     public override void _Process(double DELTA_)
@@ -46,18 +37,12 @@ public partial class Phone : Sprite2D
     public virtual void HangUp()
     {
         _running = false;
-        _phoneButtons.ForEach(b=>b._contact.End());
 
     }
 
     public void PassPlayer(Player PLAYER)
     {
         _player = PLAYER;
-        for (int i = 0; i < _phoneButtons.Count; i++)
-        {
-            _phoneButtons[i]._phone = this;
-            _phoneButtons[i]._contact.PassNumber((i+1)%10);
-        }
     }
 
     public void ResetContact()
@@ -66,9 +51,8 @@ public partial class Phone : Sprite2D
         // _debug.Text = "";
     }
 
-    public virtual void Start()
+    public virtual void Begin()
     {
         _running = true;
-        _phoneButtons.ForEach(b=>b._contact.Start());
     }
 }

Gameplay/PhoneButton.cs

@@ -1,37 +0,0 @@
-using Godot;
-using System;
-
-public partial class PhoneButton : TextureButton
-{
-	// [Signal]
-	// public delegate void HoverEventHandler(Shield THISSHIELD, bool ISHOVERED);
-	public bool _isHovered = false;
-	public Phone _phone;
-	public Contact _contact;
-	public ProgressBar _progressBar;
-
-    public override void _Ready()
-    {
-        base._Ready();
-		_contact = GetNode<Contact>("Contact");
-		_contact._button = this;
-		_progressBar = GetNode<ProgressBar>("ProgressBar");
-    }
-
-    public override void _Pressed()
-    {
-        base._Pressed();
-    }
-
-	// private void OnMouseEntered()
-	// {
-	//     _isHovered = true;
-	//     EmitSignal(SignalName.Hover, this, _isHovered);
-	// }
-
-	// private void OnMouseExited()
-	// {
-	//     _isHovered = false;
-	//     EmitSignal(SignalName.Hover, this, _isHovered);
-	// }
-}

Gameplay/PhoneButton.cs.uid

@@ -1 +0,0 @@
-uid://cd1nniv27ef2f

Gameplay/Player.cs

@@ -12,7 +12,6 @@ public partial class Player : Actor
     public Boss _boss;
     public Enemy _activeEnemy;
     public RichTextLabel _debug, _busDebug;
-    public List<BusinessCard> _businessCards;
 
 	public override void _Ready()
 	{
@@ -27,23 +26,6 @@ public partial class Player : Actor
         _boss = GetNode<Boss>("Boss");
         _boss.PassPlayer(this);
         
-        _businessCards = GetChildren().Where(c=>c is BusinessCard).Cast<BusinessCard>().ToList();
-        for (int i = 0; i < _businessCards.Count; i++)
-        {
-            _businessCards[i].PassPlayer(this);
-            if (_businessCards[i].Name.ToString().IndexOf("Default") > -1)
-            {
-                string goalNameString = _businessCards[i].Name.ToString().Replace("Default","").Replace("Alt","");
-                GoalName goalName;
-                Enum.TryParse(goalNameString, out goalName);
-                _businessCards[i].AssignGoal(goalName);
-            }
-            else
-            {
-                _businessCards[i].AssignRandomGoal();
-            }
-        }
-        
         Challenge(_boss);
 	}
 
@@ -53,7 +35,6 @@ public partial class Player : Actor
         ENEMY._board.Activate();
         _board = ENEMY._board;
         _activeEnemy = ENEMY;
-        CheckGoals();
 
         string text = "";
         if (_activeEnemy is Mook)
@@ -67,11 +48,6 @@ public partial class Player : Actor
         _debug.Text = text;
     }
 
-    public void CheckGoals()
-    {
-        _businessCards.ForEach(b=>b.CheckGoal());
-    }
-
     public void RunLost()
     {
         _debug.Text = "YOU LOSE!!";
@@ -84,10 +60,7 @@ public partial class Player : Actor
 
     public void StartBattle()
     {
-        for (int i = 0; i < _phone._phoneButtons.Count; i++)
+        _phone.Begin();
-        {
-            _phone.Start();
-        }
     }
 
     // public bool CheckWin(List<Shield> SHIELDS)

Gameplay/business_card.tscn

@@ -1,15 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://b0ks34m6smjfd"]
-
-[ext_resource type="Texture2D" uid="uid://g6ikqlh8yccy" path="res://Art/blanksquare.jpg" id="1_8xr8s"]
-[ext_resource type="Script" uid="uid://dtcalmvwievft" path="res://Gameplay/BusinessCard.cs" id="2_rhxm0"]
-[ext_resource type="PackedScene" uid="uid://tk7fjdvu5c0u" path="res://Gameplay/goal.tscn" id="3_ejro6"]
-
-[node name="BusinessCard" type="TextureButton"]
-texture_normal = ExtResource("1_8xr8s")
-texture_pressed = ExtResource("1_8xr8s")
-texture_hover = ExtResource("1_8xr8s")
-texture_disabled = ExtResource("1_8xr8s")
-texture_focused = ExtResource("1_8xr8s")
-script = ExtResource("2_rhxm0")
-
-[node name="Goal" parent="." instance=ExtResource("3_ejro6")]

Gameplay/call_button.tscn

@@ -1,10 +1,9 @@
-[gd_scene load_steps=3 format=3 uid="uid://dh1oddbsjpysy"]
+[gd_scene format=3 uid="uid://dh1oddbsjpysy"]
 
 [ext_resource type="Texture2D" uid="uid://4hculjnuw6ha" path="res://Art/capsule-fill.svg" id="1_r2s83"]
 [ext_resource type="Script" uid="uid://bis1fw8peln2x" path="res://Gameplay/CallButton.cs" id="2_r2s83"]
 
-[node name="CallButton" type="TextureButton"]
+[node name="CallButton" type="TextureButton" unique_id=1775063306]
-modulate = Color(1, 1, 1, 0.2)
 offset_right = 800.0
 offset_bottom = 800.0
 texture_normal = ExtResource("1_r2s83")

Gameplay/contact.tscn

@@ -1,6 +0,0 @@
-[gd_scene format=3 uid="uid://if21pf73w7by"]
-
-[ext_resource type="Script" uid="uid://bgj2cuqdq0b6l" path="res://Gameplay/Contact.cs" id="1_basqx"]
-
-[node name="Contact" type="Sprite2D" unique_id=1143036413]
-script = ExtResource("1_basqx")

Gameplay/effect.tscn

@@ -1,6 +0,0 @@
-[gd_scene format=3 uid="uid://fygidhjkgabe"]
-
-[ext_resource type="Script" uid="uid://cac8dbhhcrjfe" path="res://Gameplay/Effect.cs" id="1_lk435"]
-
-[node name="Effect" type="Node" unique_id=110922950]
-script = ExtResource("1_lk435")

Gameplay/phone.tscn

@@ -1,92 +1,21 @@
-[gd_scene load_steps=5 format=3 uid="uid://yaybgshgeb3d"]
+[gd_scene format=3 uid="uid://yaybgshgeb3d"]
 
 [ext_resource type="Texture2D" uid="uid://buee5y051op2" path="res://Art/phone.png" id="1_lrxfg"]
-[ext_resource type="PackedScene" uid="uid://dj6cr426bn30b" path="res://Gameplay/phone_button.tscn" id="2_pr3bu"]
 [ext_resource type="Script" uid="uid://dgmkhlit1vnf3" path="res://Gameplay/Phone.cs" id="2_ujt17"]
 [ext_resource type="PackedScene" uid="uid://dh1oddbsjpysy" path="res://Gameplay/call_button.tscn" id="4_e164q"]
 
-[node name="Phone" type="Sprite2D"]
+[node name="Phone" type="Sprite2D" unique_id=1047098805]
 texture = ExtResource("1_lrxfg")
 script = ExtResource("2_ujt17")
 
-[node name="PhoneButton1" parent="." instance=ExtResource("2_pr3bu")]
+[node name="CallButton" parent="." unique_id=1818383224 instance=ExtResource("4_e164q")]
-offset_left = -228.0
-offset_top = 230.0
-offset_right = 572.0
-offset_bottom = 1030.0
-scale = Vector2(0.13, 0.13)
-
-[node name="PhoneButton2" parent="." instance=ExtResource("2_pr3bu")]
-offset_left = -41.0
-offset_top = 254.0
-offset_right = 759.0
-offset_bottom = 1054.0
-scale = Vector2(0.13, 0.13)
-
-[node name="PhoneButton3" parent="." instance=ExtResource("2_pr3bu")]
-offset_left = 150.0
-offset_top = 225.0
-offset_right = 950.0
-offset_bottom = 1025.0
-scale = Vector2(0.13, 0.13)
-
-[node name="PhoneButton4" parent="." instance=ExtResource("2_pr3bu")]
-offset_left = -228.0
-offset_top = 339.0
-offset_right = 572.0
-offset_bottom = 1139.0
-scale = Vector2(0.13, 0.13)
-
-[node name="PhoneButton5" parent="." instance=ExtResource("2_pr3bu")]
-offset_left = -38.0
-offset_top = 361.0
-offset_right = 762.0
-offset_bottom = 1161.0
-scale = Vector2(0.13, 0.13)
-
-[node name="PhoneButton6" parent="." instance=ExtResource("2_pr3bu")]
-offset_left = 140.0
-offset_top = 336.0
-offset_right = 940.0
-offset_bottom = 1136.0
-scale = Vector2(0.13, 0.13)
-
-[node name="PhoneButton7" parent="." instance=ExtResource("2_pr3bu")]
-offset_left = -222.0
-offset_top = 447.0
-offset_right = 578.0
-offset_bottom = 1247.0
-scale = Vector2(0.13, 0.13)
-
-[node name="PhoneButton8" parent="." instance=ExtResource("2_pr3bu")]
-offset_left = -39.0
-offset_top = 466.0
-offset_right = 761.0
-offset_bottom = 1266.0
-scale = Vector2(0.13, 0.13)
-
-[node name="PhoneButton9" parent="." instance=ExtResource("2_pr3bu")]
-offset_left = 137.0
-offset_top = 437.0
-offset_right = 937.0
-offset_bottom = 1237.0
-scale = Vector2(0.13, 0.13)
-
-[node name="PhoneButton0" parent="." instance=ExtResource("2_pr3bu")]
-offset_left = -41.0
-offset_top = 565.0
-offset_right = 759.0
-offset_bottom = 1365.0
-scale = Vector2(0.13, 0.13)
-
-[node name="CallButton" parent="." instance=ExtResource("4_e164q")]
 offset_left = -199.0
 offset_top = 123.0
 offset_right = 601.0
 offset_bottom = 923.0
 scale = Vector2(0.13, 0.13)
 
-[node name="Debug" type="RichTextLabel" parent="."]
+[node name="Debug" type="RichTextLabel" parent="." unique_id=880177536]
 offset_left = -209.0
 offset_top = -339.0
 offset_right = 225.0

Gameplay/phone_button.tscn

@@ -1,29 +0,0 @@
-[gd_scene format=3 uid="uid://dj6cr426bn30b"]
-
-[ext_resource type="Texture2D" uid="uid://4hculjnuw6ha" path="res://Art/capsule-fill.svg" id="1_6ytam"]
-[ext_resource type="Script" uid="uid://cd1nniv27ef2f" path="res://Gameplay/PhoneButton.cs" id="1_d1byk"]
-[ext_resource type="PackedScene" uid="uid://if21pf73w7by" path="res://Gameplay/contact.tscn" id="3_3os1s"]
-
-[node name="PhoneButton" type="TextureButton" unique_id=1734514874]
-clip_children = 2
-offset_right = 800.0
-offset_bottom = 800.0
-texture_normal = ExtResource("1_6ytam")
-texture_pressed = ExtResource("1_6ytam")
-texture_hover = ExtResource("1_6ytam")
-texture_disabled = ExtResource("1_6ytam")
-texture_focused = ExtResource("1_6ytam")
-script = ExtResource("1_d1byk")
-
-[node name="Contact" parent="." unique_id=1509012205 instance=ExtResource("3_3os1s")]
-position = Vector2(-228, 230)
-scale = Vector2(0.13, 0.13)
-
-[node name="ProgressBar" type="ProgressBar" parent="." unique_id=2023053611]
-layout_mode = 0
-offset_top = 117.0
-offset_right = 803.0
-offset_bottom = 712.0
-step = 1.0
-fill_mode = 3
-show_percentage = false

Gameplay/player.tscn

@@ -1,250 +1,44 @@
-[gd_scene load_steps=8 format=3 uid="uid://b7vhq2dkltsv"]
+[gd_scene format=3 uid="uid://b7vhq2dkltsv"]
 
 [ext_resource type="Texture2D" uid="uid://c51oi06i4yrvv" path="res://Art/x.png" id="1_c6108"]
 [ext_resource type="Script" uid="uid://dth2vcgkp7iq0" path="res://Gameplay/Player.cs" id="1_ehowo"]
 [ext_resource type="PackedScene" uid="uid://yaybgshgeb3d" path="res://Gameplay/phone.tscn" id="4_1d6nn"]
-[ext_resource type="PackedScene" uid="uid://b0ks34m6smjfd" path="res://Gameplay/business_card.tscn" id="5_ek8wa"]
 [ext_resource type="PackedScene" uid="uid://bmy783a4c0tal" path="res://Gameplay/boss.tscn" id="5_lfxdo"]
-[ext_resource type="Texture2D" uid="uid://dvu33m28odcl0" path="res://Art/DiagonalArrow.png" id="6_ehowo"]
-[ext_resource type="Texture2D" uid="uid://c6q55ex5d5wgi" path="res://Art/RowColArrow.png" id="7_cbnuf"]
 
-[node name="Player" type="Sprite2D"]
+[node name="Player" type="Sprite2D" unique_id=1405686835]
 script = ExtResource("1_ehowo")
 
-[node name="Phone" parent="." instance=ExtResource("4_1d6nn")]
+[node name="Phone" parent="." unique_id=678155199 instance=ExtResource("4_1d6nn")]
 position = Vector2(1600, 540)
 scale = Vector2(0.5, 0.5)
 
-[node name="Boss" parent="." instance=ExtResource("5_lfxdo")]
+[node name="Boss" parent="." unique_id=1895743924 instance=ExtResource("5_lfxdo")]
 position = Vector2(960, 540)
 
-[node name="MarkNormal" type="Sprite2D" parent="."]
+[node name="MarkNormal" type="Sprite2D" parent="." unique_id=759198183]
 visible = false
 texture = ExtResource("1_c6108")
 
-[node name="MarkPressed" type="Sprite2D" parent="."]
+[node name="MarkPressed" type="Sprite2D" parent="." unique_id=72909600]
 visible = false
 texture = ExtResource("1_c6108")
 
-[node name="MarkHovered" type="Sprite2D" parent="."]
+[node name="MarkHovered" type="Sprite2D" parent="." unique_id=2067076280]
 visible = false
 texture = ExtResource("1_c6108")
 
-[node name="MarkDisabled" type="Sprite2D" parent="."]
+[node name="MarkDisabled" type="Sprite2D" parent="." unique_id=2116780469]
 visible = false
 texture = ExtResource("1_c6108")
 
-[node name="MarkFocused" type="Sprite2D" parent="."]
+[node name="MarkFocused" type="Sprite2D" parent="." unique_id=1765829402]
 visible = false
 texture = ExtResource("1_c6108")
 
-[node name="Debug" type="RichTextLabel" parent="."]
+[node name="Debug" type="RichTextLabel" parent="." unique_id=474408926]
 offset_right = 322.0
 offset_bottom = 153.0
 theme_override_font_sizes/normal_font_size = 32
 text = "DEBUG"
 horizontal_alignment = 1
 vertical_alignment = 1
-
-[node name="BusinessCard" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 98.0
-offset_top = 769.0
-offset_right = 298.0
-offset_bottom = 969.0
-
-[node name="DefaultDiagonal1To9" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 610.0
-offset_top = 190.0
-offset_right = 660.0
-offset_bottom = 240.0
-texture_normal = ExtResource("6_ehowo")
-texture_pressed = ExtResource("6_ehowo")
-texture_hover = ExtResource("6_ehowo")
-texture_disabled = ExtResource("6_ehowo")
-texture_focused = ExtResource("6_ehowo")
-
-[node name="DefaultTopRow" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 610.0
-offset_top = 440.0
-offset_right = 810.0
-offset_bottom = 490.0
-rotation = 4.71239
-texture_normal = ExtResource("7_cbnuf")
-texture_pressed = ExtResource("7_cbnuf")
-texture_hover = ExtResource("7_cbnuf")
-texture_disabled = ExtResource("7_cbnuf")
-texture_focused = ExtResource("7_cbnuf")
-
-[node name="DefaultMiddleRow" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 610.0
-offset_top = 640.0
-offset_right = 810.0
-offset_bottom = 690.0
-rotation = 4.71239
-texture_normal = ExtResource("7_cbnuf")
-texture_pressed = ExtResource("7_cbnuf")
-texture_hover = ExtResource("7_cbnuf")
-texture_disabled = ExtResource("7_cbnuf")
-texture_focused = ExtResource("7_cbnuf")
-
-[node name="DefaultBottomRow" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 610.0
-offset_top = 840.0
-offset_right = 810.0
-offset_bottom = 890.0
-rotation = 4.71239
-texture_normal = ExtResource("7_cbnuf")
-texture_pressed = ExtResource("7_cbnuf")
-texture_hover = ExtResource("7_cbnuf")
-texture_disabled = ExtResource("7_cbnuf")
-texture_focused = ExtResource("7_cbnuf")
-
-[node name="DefaultLeftColumn" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 660.0
-offset_top = 190.0
-offset_right = 860.0
-offset_bottom = 240.0
-texture_normal = ExtResource("7_cbnuf")
-texture_pressed = ExtResource("7_cbnuf")
-texture_hover = ExtResource("7_cbnuf")
-texture_disabled = ExtResource("7_cbnuf")
-texture_focused = ExtResource("7_cbnuf")
-
-[node name="DefaultMiddleColumn" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 860.0
-offset_top = 190.0
-offset_right = 1060.0
-offset_bottom = 240.0
-texture_normal = ExtResource("7_cbnuf")
-texture_pressed = ExtResource("7_cbnuf")
-texture_hover = ExtResource("7_cbnuf")
-texture_disabled = ExtResource("7_cbnuf")
-texture_focused = ExtResource("7_cbnuf")
-
-[node name="DefaultRightColumn" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 1060.0
-offset_top = 190.0
-offset_right = 1260.0
-offset_bottom = 240.0
-texture_normal = ExtResource("7_cbnuf")
-texture_pressed = ExtResource("7_cbnuf")
-texture_hover = ExtResource("7_cbnuf")
-texture_disabled = ExtResource("7_cbnuf")
-texture_focused = ExtResource("7_cbnuf")
-
-[node name="DefaultDiagonal3To7" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 1310.0
-offset_top = 190.0
-offset_right = 1360.0
-offset_bottom = 240.0
-rotation = 1.5708
-texture_normal = ExtResource("6_ehowo")
-texture_pressed = ExtResource("6_ehowo")
-texture_hover = ExtResource("6_ehowo")
-texture_disabled = ExtResource("6_ehowo")
-texture_focused = ExtResource("6_ehowo")
-
-[node name="DefaultTopRowAlt" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 1310.0
-offset_top = 240.0
-offset_right = 1510.0
-offset_bottom = 290.0
-rotation = 1.5708
-texture_normal = ExtResource("7_cbnuf")
-texture_pressed = ExtResource("7_cbnuf")
-texture_hover = ExtResource("7_cbnuf")
-texture_disabled = ExtResource("7_cbnuf")
-texture_focused = ExtResource("7_cbnuf")
-
-[node name="DefaultMiddleRowAlt" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 1310.0
-offset_top = 440.0
-offset_right = 1510.0
-offset_bottom = 490.0
-rotation = 1.5708
-texture_normal = ExtResource("7_cbnuf")
-texture_pressed = ExtResource("7_cbnuf")
-texture_hover = ExtResource("7_cbnuf")
-texture_disabled = ExtResource("7_cbnuf")
-texture_focused = ExtResource("7_cbnuf")
-
-[node name="DefaultBottomRowAlt" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 1310.0
-offset_top = 640.0
-offset_right = 1510.0
-offset_bottom = 690.0
-rotation = 1.5708
-texture_normal = ExtResource("7_cbnuf")
-texture_pressed = ExtResource("7_cbnuf")
-texture_hover = ExtResource("7_cbnuf")
-texture_disabled = ExtResource("7_cbnuf")
-texture_focused = ExtResource("7_cbnuf")
-
-[node name="DefaultDiagonal1To9Alt" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 1310.0
-offset_top = 890.0
-offset_right = 1360.0
-offset_bottom = 940.0
-rotation = 3.14159
-texture_normal = ExtResource("6_ehowo")
-texture_pressed = ExtResource("6_ehowo")
-texture_hover = ExtResource("6_ehowo")
-texture_disabled = ExtResource("6_ehowo")
-texture_focused = ExtResource("6_ehowo")
-
-[node name="DefaultDiagonal3To7Alt" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 610.0
-offset_top = 890.0
-offset_right = 660.0
-offset_bottom = 940.0
-rotation = 4.71239
-texture_normal = ExtResource("6_ehowo")
-texture_pressed = ExtResource("6_ehowo")
-texture_hover = ExtResource("6_ehowo")
-texture_disabled = ExtResource("6_ehowo")
-texture_focused = ExtResource("6_ehowo")
-
-[node name="DefaultLeftColumnAlt" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 860.0
-offset_top = 890.0
-offset_right = 1060.0
-offset_bottom = 940.0
-rotation = 3.14159
-texture_normal = ExtResource("7_cbnuf")
-texture_pressed = ExtResource("7_cbnuf")
-texture_hover = ExtResource("7_cbnuf")
-texture_disabled = ExtResource("7_cbnuf")
-texture_focused = ExtResource("7_cbnuf")
-
-[node name="DefaultMiddleColumnAlt" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 1062.0
-offset_top = 889.0
-offset_right = 1262.0
-offset_bottom = 939.0
-rotation = 3.14159
-texture_normal = ExtResource("7_cbnuf")
-texture_pressed = ExtResource("7_cbnuf")
-texture_hover = ExtResource("7_cbnuf")
-texture_disabled = ExtResource("7_cbnuf")
-texture_focused = ExtResource("7_cbnuf")
-
-[node name="DefaultRightColumnAlt" parent="." instance=ExtResource("5_ek8wa")]
-offset_left = 1260.0
-offset_top = 890.0
-offset_right = 1460.0
-offset_bottom = 940.0
-rotation = 3.14159
-texture_normal = ExtResource("7_cbnuf")
-texture_pressed = ExtResource("7_cbnuf")
-texture_hover = ExtResource("7_cbnuf")
-texture_disabled = ExtResource("7_cbnuf")
-texture_focused = ExtResource("7_cbnuf")
-
-[node name="BusDebug" type="RichTextLabel" parent="."]
-offset_top = 276.0
-offset_right = 322.0
-offset_bottom = 429.0
-theme_override_font_sizes/normal_font_size = 32
-text = "BusDEBUG"
-horizontal_alignment = 1
-vertical_alignment = 1