Merge branch 'main' of https://git.zenny.quest/zenayi/GameJamDungeon

Zennysoft.Game.Ma/src/enemy/EnemyModelView2D.cs

@@ -30,14 +30,14 @@ public partial class EnemyModelView2D : EnemyModelView, IEnemyModelView
 
   public new void OnReady()
   {
-	Hitbox.AreaEntered += Hitbox_AreaEntered;
+    Hitbox.AreaEntered += Hitbox_AreaEntered;
-	base.OnReady();
+    base.OnReady();
   }
 
 
   public override Vector2 GetSize()
   {
-	return Sprite3D.GetItemRect().Size;
+    return Sprite3D.GetItemRect().Size;
   }
 
   private void Hitbox_AreaEntered(Area3D area) => OnPlayerHit(new AttackEventArgs(AttackData));
@@ -46,102 +46,102 @@ public partial class EnemyModelView2D : EnemyModelView, IEnemyModelView
 
   public override void PlayHitAnimation()
   {
-	LoadShader("res://src/vfx/shaders/DamageHit.gdshader");
+    LoadShader("res://src/vfx/shaders/DamageHit.gdshader");
-	var tweener = GetTree().CreateTween();
+    var tweener = GetTree().CreateTween();
-	tweener.TweenMethod(Callable.From((float x) => SetShaderValue(x)), 0.0f, 1.0f, 1.0f);
+    tweener.TweenMethod(Callable.From((float x) => SetShaderValue(x)), 0.0f, 1.0f, 1.0f);
   }
 
   public override void PlayDeathAnimation()
   {
-	LoadShader("res://src/vfx/shaders/PixelMelt.gdshader");
+    LoadShader("res://src/vfx/shaders/PixelMelt.gdshader");
-	var tweener = GetTree().CreateTween();
+    var tweener = GetTree().CreateTween();
-	tweener.TweenMethod(Callable.From((float x) => SetShaderValue(x)), 0.0f, 1.0f, 0.8f);
+    tweener.TweenMethod(Callable.From((float x) => SetShaderValue(x)), 0.0f, 0.1f, 0.8f);
   }
 
   private EnemyDirection GetEnemyDirection(
-	Basis enemyBasis,
+    Basis enemyBasis,
-	Vector3 cameraDirection,
+    Vector3 cameraDirection,
-	float rotateUpperThreshold,
+    float rotateUpperThreshold,
-	float rotateLowerThreshold)
+    float rotateLowerThreshold)
   {
-	var enemyForwardDirection = enemyBasis.Z;
+    var enemyForwardDirection = enemyBasis.Z;
-	var enemyLeftDirection = enemyBasis.X;
+    var enemyLeftDirection = enemyBasis.X;
 
-	var leftDotProduct = enemyLeftDirection.Dot(cameraDirection);
+    var leftDotProduct = enemyLeftDirection.Dot(cameraDirection);
-	var forwardDotProduct = enemyForwardDirection.Dot(cameraDirection);
+    var forwardDotProduct = enemyForwardDirection.Dot(cameraDirection);
 
-	// Check if forward facing. If the dot product is -1, the enemy is facing the camera.
+    // Check if forward facing. If the dot product is -1, the enemy is facing the camera.
-	if (forwardDotProduct < _lowerThreshold)
+    if (forwardDotProduct < _lowerThreshold)
-	{
+    {
-	  SetForward();
+      SetForward();
-	  return EnemyDirection.Forward;
+      return EnemyDirection.Forward;
-	}
+    }
 
-	// Check if backward facing. If the dot product is 1, the enemy is facing the same direction as the camera.
+    // Check if backward facing. If the dot product is 1, the enemy is facing the same direction as the camera.
-	else if (forwardDotProduct > rotateUpperThreshold)
+    else if (forwardDotProduct > rotateUpperThreshold)
-	{
+    {
-	  SetBack();
+      SetBack();
-	  return EnemyDirection.Backward;
+      return EnemyDirection.Backward;
-	}
+    }
-	else
+    else
-	{
+    {
-	  // If the dot product of the perpendicular direction is positive (up to 1), the enemy is facing to the left (since it's mirrored).
+      // If the dot product of the perpendicular direction is positive (up to 1), the enemy is facing to the left (since it's mirrored).
-	  if (leftDotProduct < _lowerThreshold)
+      if (leftDotProduct < _lowerThreshold)
-	  {
+      {
-		SetRight();
+        SetRight();
-		return EnemyDirection.Left;
+        return EnemyDirection.Left;
-	  }
+      }
 
-	  // Check if side facing. If the dot product is close to zero in the positive or negative direction, its close to the threshold for turning.
+      // Check if side facing. If the dot product is close to zero in the positive or negative direction, its close to the threshold for turning.
-	  if (leftDotProduct > rotateUpperThreshold)
+      if (leftDotProduct > rotateUpperThreshold)
-	  {
+      {
-		SetLeft();
+        SetLeft();
-		return EnemyDirection.Right;
+        return EnemyDirection.Right;
-	  }
+      }
-	}
+    }
 
-	return _enemyDirection;
+    return _enemyDirection;
   }
 
   private void LoadShader(string shaderPath)
   {
-	var shader = GD.Load<Shader>(shaderPath);
+    var shader = GD.Load<Shader>(shaderPath);
-	var sprites = FindChildren("*", "AnimatedSprite2D", true).Cast<AnimatedSprite2D>();
+    var sprites = FindChildren("*", "AnimatedSprite2D", true).Cast<AnimatedSprite2D>();
-	foreach (var sprite in sprites)
+    foreach (var sprite in sprites)
-	{
+    {
-	  sprite.Material = new ShaderMaterial();
+      sprite.Material = new ShaderMaterial();
-	  var shaderMaterial = (ShaderMaterial)sprite.Material;
+      var shaderMaterial = (ShaderMaterial)sprite.Material;
-	  shaderMaterial.Shader = shader;
+      shaderMaterial.Shader = shader;
-	}
+    }
   }
 
   private void SetShaderValue(float shaderValue)
   {
-	var sprites = FindChildren("*", "AnimatedSprite2D", true).Cast<AnimatedSprite2D>();
+    var sprites = FindChildren("*", "AnimatedSprite2D", true).Cast<AnimatedSprite2D>();
-	foreach (var sprite in sprites)
+    foreach (var sprite in sprites)
-	{
+    {
-	  var shaderMaterial = (ShaderMaterial)sprite.Material;
+      var shaderMaterial = (ShaderMaterial)sprite.Material;
-	  shaderMaterial.SetShaderParameter("progress", shaderValue);
+      shaderMaterial.SetShaderParameter("progress", shaderValue);
-	}
+    }
   }
 
   private void SetForward()
   {
-	_enemyDirection = EnemyDirection.Forward;
+    _enemyDirection = EnemyDirection.Forward;
   }
 
   private void SetLeft()
   {
-	_enemyDirection = EnemyDirection.Left;
+    _enemyDirection = EnemyDirection.Left;
   }
 
   private void SetRight()
   {
-	_enemyDirection = EnemyDirection.Right;
+    _enemyDirection = EnemyDirection.Right;
   }
 
   private void SetBack()
   {
-	_enemyDirection = EnemyDirection.Backward;
+    _enemyDirection = EnemyDirection.Backward;
   }
 }

Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn

@@ -66,6 +66,13 @@
 script = ExtResource("2_7hf3j")
 Name = "Sproingy"
 Description = "He's smaller than I expected..."
+MaximumHP = ""
+ATK = ""
+DEF = ""
+Affinity = ""
+Weakness = ""
+Drop1 = ""
+Drop2 = ""
 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3"
 
 [sub_resource type="ViewportTexture" id="ViewportTexture_h1kaf"]
@@ -670,21 +677,21 @@ texture = SubResource("ViewportTexture_h1kaf")
 
 [node name="SubViewportContainer" type="SubViewportContainer" parent="Sprite3D"]
 visibility_layer = 0
-offset_right = 40.0
+offset_right = 800.0
-offset_bottom = 40.0
+offset_bottom = 800.0
 
 [node name="SubViewport" type="SubViewport" parent="Sprite3D/SubViewportContainer"]
 disable_3d = true
 transparent_bg = true
 handle_input_locally = false
-size = Vector2i(200, 200)
+size = Vector2i(800, 800)
 render_target_update_mode = 4
 
 [node name="AnimatedSprite" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport"]
 unique_name_in_owner = true
 texture_filter = 1
 material = ExtResource("3_ivy74")
-position = Vector2(100, 100)
+position = Vector2(400, 400)
 sprite_frames = SubResource("SpriteFrames_6drt6")
 animation = &"idle_left_walk"
 

Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/MichaelModelView.tscn

@@ -81,6 +81,13 @@
 script = ExtResource("2_3eot4")
 Name = "Michael"
 Description = "Basic angel guy"
+MaximumHP = ""
+ATK = ""
+DEF = ""
+Affinity = ""
+Weakness = ""
+Drop1 = ""
+Drop2 = ""
 metadata/_custom_type_script = "uid://dlsgyx4i1jmp3"
 
 [sub_resource type="ViewportTexture" id="ViewportTexture_v7t0v"]
@@ -1197,7 +1204,7 @@ offset_bottom = 40.0
 disable_3d = true
 transparent_bg = true
 handle_input_locally = false
-size = Vector2i(200, 200)
+size = Vector2i(800, 800)
 render_target_update_mode = 4
 
 [node name="AnimatedSprite" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport"]
@@ -1205,10 +1212,9 @@ unique_name_in_owner = true
 texture_filter = 1
 texture_repeat = 1
 material = SubResource("ShaderMaterial_wey7h")
-position = Vector2(45, 45)
 sprite_frames = SubResource("SpriteFrames_v4v5p")
 animation = &"idle_front_walk"
-offset = Vector2(45, 45)
+offset = Vector2(400, 400)
 
 [node name="Hitbox" type="Area3D" parent="."]
 unique_name_in_owner = true