Merge pull request #103 from Project-Funk-Engine/game-balance

Game balance

Author: LifeHckr

Classes/Notes/Note.cs

@@ -37,7 +37,7 @@ public Note(
             ?? (
                 (BD, source, Timing) =>
                 {
-                    BD.GetTarget(this).TakeDamage(source._baseVal);
+                    BD.GetTarget(this).TakeDamage((int)Timing * source._baseVal);
                 }
             );
         _baseVal = baseVal;
@@ -67,4 +67,9 @@ public Note Clone()
         );
         return newNote;
     }
+
+    public int GetBaseVal()
+    {
+        return _baseVal;
+    }
 }

Globals/Scribe.cs

@@ -20,7 +20,7 @@ public partial class Scribe : Node
             1,
             (director, note, timing) =>
             {
-                director.Player.TakeDamage(3 - (int)timing);
+                director.Player.TakeDamage((3 - (int)timing) * note.GetBaseVal());
             }
         ),
         new Note(
@@ -32,7 +32,9 @@ public partial class Scribe : Node
             1,
             (director, note, timing) =>
             {
-                director.Enemy.TakeDamage((int)timing);
+                if (timing == Timing.Miss)
+                    return;
+                director.Enemy.TakeDamage((int)timing * note.GetBaseVal());
             }
         ),
         new Note(
@@ -41,12 +43,12 @@ public partial class Scribe : Node
             "Basic player note, deals double damage to enemy.",
             GD.Load<Texture2D>("res://Classes/Notes/assets/double_note.png"),
             null,
-            1,
+            2,
             (director, note, timing) =>
             {
-                // can change later, but I want it like this instead of changing base
-                // in case we have some relic that messes with timing
-                director.Enemy.TakeDamage(2 * (int)timing);
+                if (timing == Timing.Miss)
+                    return;
+                director.Enemy.TakeDamage(note.GetBaseVal() * (int)timing);
             }
         ),
         new Note(
@@ -58,7 +60,9 @@ public partial class Scribe : Node
             1,
             (director, note, timing) =>
             {
-                director.Player.Heal((int)timing);
+                if (timing == Timing.Miss)
+                    return;
+                director.Player.Heal((int)timing * note.GetBaseVal());
             }
         ),
         new Note(
@@ -70,8 +74,10 @@ public partial class Scribe : Node
             1,
             (director, note, timing) =>
             {
-                director.Player.Heal((int)timing);
-                director.Enemy.TakeDamage((int)timing);
+                if (timing == Timing.Miss)
+                    return;
+                director.Player.Heal((int)timing * note.GetBaseVal());
+                director.Enemy.TakeDamage((int)timing * note.GetBaseVal());
             }
         ),
         new Note(
@@ -83,7 +89,9 @@ public partial class Scribe : Node
             1,
             (director, note, timing) =>
             {
-                director.Enemy.TakeDamage((int)timing);
+                if (timing == Timing.Miss)
+                    return;
+                director.Enemy.TakeDamage((int)timing + note.GetBaseVal());
             },
             0.25f
         ),

Globals/translations.csv

@@ -54,3 +54,7 @@ INVENTORY_TAB_NOTES,Notes,乐谱
 INVENTORY_TAB_RELICS,Relics,遗物
 OPTIONS_VOLUME_LABEL,Master Volume,最终音量设置
 OPTIONS_CONTRAST_LABEL,High Contrast,高对比度模式
+HOW_TO_PLAY,How to Play,如何游玩
+HOW_TO_PLAY_BLOCK1,"Hit notes to\nbuild combo","点击音符\n以建立连击"
+HOW_TO_PLAY_BLOCK2,"Place notes when\ncombo is full","当连击满\n时放置音符"
+HOW_TO_PLAY_BLOCK3,"Only placed notes\nhave effects","只有已放置\n的音符才有效"

project.godot

@@ -37,9 +37,6 @@ window/stretch/scale_mode="integer"
 
 project/assembly_name="Funk Engine"
 
-[game]
-
-
 [input]
 
 ui_accept={

scenes/BattleDirector/scripts/BattleDirector.cs

@@ -43,7 +43,14 @@ private bool PlayerAddNote(ArrowType type, int beat)
     {
         if (!NotePlacementBar.CanPlaceNote())
             return false;
-        if (!CD.AddNoteToLane(type, beat % CM.BeatsPerLoop, NotePlacementBar.PlacedNote(), false))
+        if (
+            !CD.AddNoteToLane(
+                type,
+                beat % CM.BeatsPerLoop,
+                NotePlacementBar.PlacedNote(this),
+                false
+            )
+        ) //TODO: Remove passing BD into NPB
             return false;
         NotePlaced?.Invoke(this);
         return true;

scenes/BattleDirector/scripts/Conductor.cs

@@ -45,11 +45,11 @@ public bool AddNoteToLane(ArrowType type, int beat, Note note, bool isActive = t
     {
         beat %= CM.BeatsPerLoop;
         Note newNote = note.Clone();
-        if (beat == 0 || _laneData[(int)type][beat] != null)
+        if (beat == 0 || _laneData[(int)type][beat] != null) //TODO: Double check if this is still necessary, doesn't seem to matter for player placed notes
             return false;
 
         NoteArrow arrow;
-        if (isActive) //Currently an enemy note.
+        if (isActive) //Currently isActive means an enemy note.
         {
             arrow = CM.AddArrowToLane(type, beat, newNote);
         }

scenes/BattleDirector/scripts/NotePlacementBar.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using FunkEngine;
 using Godot;
 
 public partial class NotePlacementBar : Node
@@ -183,13 +184,16 @@ public void IncreaseCharge(int amount = 1)
     }
 
     // Placing a note resets the note placement bar
-    public Note PlacedNote()
+    public Note PlacedNote(BattleDirector BD)
     {
         _currentBarValue -= (int)(_currentNoteInstance.CostModifier * MaxValue);
 
         UpdateNotePlacementBar(_currentBarValue);
         //fullBarParticles.Emitting = false;
-        return GetNote(Input.IsActionPressed("Secondary"));
+
+        Note placedNote = GetNote(Input.IsActionPressed("Secondary"));
+        placedNote?.OnHit(BD, Timing.Okay); //Hardcode for now, eventually the note itself could have its default
+        return placedNote;
     }
 
     public bool CanPlaceNote()

scenes/Options/OptionsMenu.cs

@@ -21,6 +21,9 @@ public partial class OptionsMenu : CanvasLayer
     [Export]
     private CheckBox _highContrastToggle;
 
+    [Export]
+    private Button _howToPlayButton;
+
     private const float MinVolumeVal = 50f;
 
     public override void _Ready()
@@ -36,6 +39,7 @@ public override void _Ready()
         _closeButton.Pressed += CloseMenu;
         _controlsButton.Pressed += OpenControls;
         _highContrastToggle.Toggled += HighContrastChanged;
+        _howToPlayButton.Pressed += OpenHowToPlay;
     }
 
     public override void _Process(double delta) //TODO: Better method for returning focus
@@ -98,4 +102,12 @@ private void HighContrastChanged(bool toggled)
         StageProducer.ContrastFilter.Visible = toggled;
         SaveSystem.UpdateConfig(SaveSystem.ConfigSettings.HighContrast, toggled);
     }
+
+    private void OpenHowToPlay()
+    {
+        HowToPlay howtoPlay = GD.Load<PackedScene>("res://scenes/UI/HowToPlay.tscn")
+            .Instantiate<HowToPlay>();
+        AddChild(howtoPlay);
+        howtoPlay.OpenMenu(this);
+    }
 }

scenes/Options/OptionsMenu.tscn

@@ -3,14 +3,15 @@
 [ext_resource type="Script" path="res://scenes/Options/scripts/LanguageSelection.cs" id="1_qyvkw"]
 [ext_resource type="Script" path="res://scenes/Options/OptionsMenu.cs" id="1_yjq7i"]
 
-[node name="OptionsMenu" type="CanvasLayer" node_paths=PackedStringArray("_focused", "_volumeSlider", "_closeButton", "_controlsButton", "_highContrastToggle")]
+[node name="OptionsMenu" type="CanvasLayer" node_paths=PackedStringArray("_focused", "_volumeSlider", "_closeButton", "_controlsButton", "_highContrastToggle", "_howToPlayButton")]
 process_mode = 3
 script = ExtResource("1_yjq7i")
 _focused = NodePath("Control/CenterContainer/MarginContainer/MarginContainer/VBoxContainer/LanguageSelection")
 _volumeSlider = NodePath("Control/CenterContainer/MarginContainer/MarginContainer/VBoxContainer/Container/Volume")
 _closeButton = NodePath("Control/CenterContainer/MarginContainer/MarginContainer/VBoxContainer/TitleButton")
 _controlsButton = NodePath("Control/CenterContainer/MarginContainer/MarginContainer/VBoxContainer/ControlsButton")
 _highContrastToggle = NodePath("Control/CenterContainer/MarginContainer/MarginContainer/VBoxContainer/HBoxContainer/CheckBox")
+_howToPlayButton = NodePath("Control/CenterContainer/MarginContainer/MarginContainer/VBoxContainer/HowToPlayButton")
 
 [node name="Control" type="Control" parent="."]
 layout_mode = 3
@@ -59,7 +60,7 @@ theme_override_constants/margin_bottom = 10
 custom_minimum_size = Vector2(240, 0)
 layout_mode = 2
 size_flags_horizontal = 0
-theme_override_constants/separation = 25
+theme_override_constants/separation = 18
 alignment = 1
 
 [node name="Title" type="Label" parent="Control/CenterContainer/MarginContainer/MarginContainer/VBoxContainer"]
@@ -112,6 +113,10 @@ script = ExtResource("1_qyvkw")
 layout_mode = 2
 text = "TITLE_CONTROLS"
 
+[node name="HowToPlayButton" type="Button" parent="Control/CenterContainer/MarginContainer/MarginContainer/VBoxContainer"]
+layout_mode = 2
+text = "HOW_TO_PLAY"
+
 [node name="TitleButton" type="Button" parent="Control/CenterContainer/MarginContainer/MarginContainer/VBoxContainer"]
 layout_mode = 2
 text = "CONTROLS_RETURN_BUTTON"

scenes/Puppets/Enemies/BossBlood/P_BossBlood.cs

@@ -7,6 +7,8 @@ public partial class P_BossBlood : EnemyPuppet
 {
     public override void _Ready()
     {
+        _currentHealth = 100;
+        _maxHealth = 100;
         base._Ready();
         var enemTween = CreateTween();
         enemTween.TweenProperty(Sprite, "position", Vector2.Down * 5, 1f).AsRelative();