Merge pull request #308 from Teicsoft/goon-changes

Goon changes
Teicsoft · Feb 24, 2024 · e7adaed · e7adaed
2 parents 9a4cf3e + 55c3403
commit e7adaed
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 17 deletions.
diff --git a/scenes/battle/Enemy.tscn b/scenes/battle/Enemy.tscn
@@ -129,32 +129,55 @@ text = "1"
 horizontal_alignment = 1
 vertical_alignment = 1
 
+[node name="CardPlayedTimer" type="Timer" parent="."]
+wait_time = 2.0
+
+[node name="ModifierIcon" type="TextureRect" parent="."]
+visible = false
+offset_left = 58.0
+offset_top = -199.0
+offset_right = 98.0
+offset_bottom = -159.0
+texture = ExtResource("7_3j0ii")
+expand_mode = 3
+
 [node name="CardPlayed" type="Label" parent="."]
 visible = false
 anchors_preset = 5
 anchor_left = 0.5
 anchor_right = 0.5
 offset_left = -136.0
-offset_top = -250.0
+offset_top = 109.0
 offset_right = 123.0
-offset_bottom = -210.0
+offset_bottom = 149.0
 grow_horizontal = 2
 theme = ExtResource("3_df0w2")
+theme_override_colors/font_shadow_color = Color(0, 0, 0, 1)
+theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
+theme_override_constants/shadow_offset_x = 4
+theme_override_constants/shadow_outline_size = 10
 text = "Card Played"
 horizontal_alignment = 1
 vertical_alignment = 1
 
-[node name="CardPlayedTimer" type="Timer" parent="."]
-wait_time = 2.0
+[node name="EnemyName" type="Label" parent="."]
+offset_left = -212.0
+offset_top = -251.0
+offset_right = 213.0
+offset_bottom = -207.0
+theme = ExtResource("3_df0w2")
+theme_override_colors/font_shadow_color = Color(0, 0, 0, 1)
+theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
+theme_override_constants/shadow_offset_x = 3
+theme_override_constants/shadow_outline_size = 10
+text = "Enemy Name"
+horizontal_alignment = 1
+vertical_alignment = 1
 
-[node name="ModifierIcon" type="TextureRect" parent="."]
-visible = false
-offset_left = 58.0
-offset_top = -199.0
-offset_right = 98.0
-offset_bottom = -159.0
-texture = ExtResource("7_3j0ii")
-expand_mode = 3
+[node name="JigglePhysicsTimer" type="Timer" parent="."]
+wait_time = 0.5
+autostart = true
 
 [connection signal="pressed" from="SelectButton" to="." method="OnPress"]
 [connection signal="timeout" from="CardPlayedTimer" to="." method="OnCardPlayedTimer"]
+[connection signal="timeout" from="JigglePhysicsTimer" to="." method="OnJigglePhysicsTimerTimeout"]
diff --git a/scripts/battle/Battle.cs b/scripts/battle/Battle.cs
@@ -102,6 +102,16 @@ private List<Enemy> CreateEnemies(List<string> enemyIds) {
             enemy.Deck = GetEnemyDeck(enemy.DeckId);
             enemy.Position = GetEnemyPosition(i, idsCount);
             enemy.EnemySelected += MoveSelectedIndicator;
+
+            if (GD.Randi() % 2 == 0) {
+                GD.Print(i.ToString());
+                enemy.GetNode<Sprite2D>("EnemySprite").FlipH = false;
+            }
+            else
+            {
+                GD.Print(i.ToString());
+            }
+
             AddChild(enemy);
             enemies.Add(enemy);
         }
@@ -297,7 +307,6 @@ private void OnSpectacleChanged(object sender, EventArgs e) {
     }
 
     private void OnDiscardStateChanged(object sender, EventArgs e) { OnDiscardStateChanged(); }
-
     private void OnDeckShuffled(object sender, EventArgs e) { GD.Print(" Deck Shuffled "); }
     public override string ToString() { return $"Battle: {BattleName}({Id})"; }
 }
diff --git a/scripts/battle/GameState.cs b/scripts/battle/GameState.cs
@@ -115,10 +115,6 @@ public void ComboCheck(Card card) { // largely based on Cath's python code
 
     public Combo ComboCompare() {
         List<string> _blockCards = CardPrototypes.cardPrototypeDict.Where(kvp => kvp.Value.CardType == "Block").Select(kvp => kvp.Value.Id).ToList();
-        foreach (string blockCard in _blockCards)
-        {
-            GD.Print("Block card: " + blockCard);
-        }
 
         foreach (Combo combo in AllCombos) {
             int count = combo.CardList.Count;

diff --git a/scripts/battle/target/Enemy.cs b/scripts/battle/target/Enemy.cs
@@ -105,11 +105,31 @@ public override void _Ready() {
         UpdateHealthBar();
         UpdateDefenseUpperDisplay();
         UpdateDefenseLowerDisplay();
+        GetNode<Label>("EnemyName").Text = Name;
 
         GetNode<Sprite2D>("EnemySprite").Texture = (Texture2D)GD.Load(Image);
     }
 
     public override void _Process(double delta) { }
+
+    private void OnJigglePhysicsTimerTimeout()
+    {
+        GD.RandRange(-5, 5);
+        GetNode<Sprite2D>("EnemySprite").Skew = (float)GD.RandRange(-0.05f, 0.05f);
+
+        if (GD.Randi() % 10 == 0)
+        {
+
+            if (GetNode<Sprite2D>("EnemySprite").FlipH)
+            {
+                GetNode<Sprite2D>("EnemySprite").FlipH = false;
+            }
+            else
+            {
+                GetNode<Sprite2D>("EnemySprite").FlipH = true;
+            }
+        }
+    }
 
     private void OnPress() { EmitSignal(SignalName.EnemySelected, this); }
 
@@ -198,3 +218,4 @@ private void OnCardPlayedTimer() {
         cardPlayedLabel.Visible = false;
     }
 }
+