Fixed explosions and mapping

ExternalMaterial/HexGrid/Singles/Floors/Floor119.tres

@@ -0,0 +1,8 @@
+[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://dgfdnhkmmhiy8"]
+
+[ext_resource type="Texture2D" uid="uid://dkss3dgeqf0jj" path="res://textures/Floors/Floor119.png" id="1_8xfbf"]
+
+[resource]
+albedo_texture = ExtResource("1_8xfbf")
+metallic_specular = 0.0
+texture_filter = 2

ExternalMaterial/HexGrid/Singles/Floors/Floor87.tres

@@ -0,0 +1,8 @@
+[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://5ht7tifebdfo"]
+
+[ext_resource type="Texture2D" uid="uid://cbpp2r6hnpqml" path="res://textures/Floors/Floor87.png" id="1_sedrg"]
+
+[resource]
+albedo_texture = ExtResource("1_sedrg")
+metallic_specular = 0.0
+texture_filter = 2

Resources/Bullets/3D/Explosion_Harmless_3D.tres

@@ -6,19 +6,15 @@
 [resource]
 script = ExtResource("2_w8pa3")
 BulletScene = ExtResource("1_x52yr")
+BulletSize = 0.0
 BulletSpeed = 0.0
 Direction = Vector2(1, 0)
 BulletDamage = 0.0
 MaxDamage = 0.0
 Knockback = 0.0
 LifeTime = 1.0
-DestroyOnCollision = false
 Owner = 0
 DamageType = 4
-RotateSprite = false
-Controllable = false
-Freezable = false
-Grazeable = false
 GrazeValue = 1.0
-Attributes = 0
+Attributes = 16
 TimeModifiers = []

Resources/Bullets/3D/Explosion_Harmless_Small_3D.tres

@@ -6,19 +6,15 @@
 [resource]
 script = ExtResource("2_spahw")
 BulletScene = ExtResource("1_3cxov")
+BulletSize = 0.0
 BulletSpeed = 0.0
 Direction = Vector2(1, 0)
 BulletDamage = 0.0
 MaxDamage = 0.0
 Knockback = 0.0
 LifeTime = 1.0
-DestroyOnCollision = false
 Owner = 0
 DamageType = 4
-RotateSprite = false
-Controllable = false
-Freezable = false
-Grazeable = false
 GrazeValue = 1.0
-Attributes = 0
+Attributes = 16
 TimeModifiers = []

Scenes/Actors/IsoPlayer_FSM.tscn

@@ -402,7 +402,7 @@ Square = NodePath("MagicSquare")
 RotationSpeed = 1.0
 
 [node name="MagicCircle" type="AnimatedSprite3D" parent="StrafeSpriteProvider"]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, -0.3, 0)
+transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, -0.2, 0)
 modulate = Color(1, 1, 1, 0.501961)
 pixel_size = 0.05
 texture_filter = 0
@@ -410,7 +410,7 @@ render_priority = -1
 sprite_frames = SubResource("SpriteFrames_h1heu")
 
 [node name="MagicSquare" type="AnimatedSprite3D" parent="StrafeSpriteProvider"]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, -0.3, 0)
+transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, -0.2, 0)
 modulate = Color(1, 1, 1, 0.501961)
 pixel_size = 0.05
 texture_filter = 0
@@ -418,8 +418,10 @@ render_priority = -1
 sprite_frames = SubResource("SpriteFrames_nwocn")
 
 [node name="Hitbox" type="AnimatedSprite3D" parent="StrafeSpriteProvider"]
+transform = Transform3D(0.707107, -0.5, 0.5, 0, 0.707107, 0.707107, -0.707107, -0.5, 0.5, 0, 0, 0)
 pixel_size = 0.05
-billboard = 1
+double_sided = false
+no_depth_test = true
 texture_filter = 0
 render_priority = 1
 sprite_frames = SubResource("SpriteFrames_nk07c")

Scenes/Weapons/Explosion_Bullet_3D.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=6 format=3 uid="uid://cmd3j4xc2f287"]
+[gd_scene load_steps=5 format=3 uid="uid://cmd3j4xc2f287"]
 
 [ext_resource type="Script" uid="uid://cg6y36s7buapp" path="res://Scripts/Weapons/Bullet3D.cs" id="1_l2l87"]
-[ext_resource type="Texture2D" uid="uid://cybpmpb0d8yva" path="res://Sprites/Projectile.png" id="2_rmbhq"]
 [ext_resource type="SpriteFrames" uid="uid://lh1q76788ixw" path="res://Resources/Sprites/explosion_proc_1.tres" id="3_rmbhq"]
 [ext_resource type="Script" uid="uid://cvk4jbit45sfi" path="res://Scripts/Components/Actors/PooledAnimatedSpritePlayer3D.cs" id="4_ny3mn"]
 
@@ -15,21 +14,14 @@ script = ExtResource("1_l2l87")
 Speed = 200.0
 metadata/_edit_group_ = true
 
-[node name="Sprite" type="Sprite3D" parent="."]
-visible = false
-pixel_size = 0.05
-billboard = 1
-texture_filter = 0
-texture = ExtResource("2_rmbhq")
-
 [node name="CollisionShape" type="CollisionShape3D" parent="."]
 shape = SubResource("SphereShape3D_pklkt")
 
 [node name="VisibleOnScreenNotifier" type="VisibleOnScreenNotifier3D" parent="."]
 
 [node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="."]
+transform = Transform3D(0.707107, -0.5, 0.5, 0, 0.707107, 0.707107, -0.707107, -0.5, 0.5, 0, 0, 0)
 pixel_size = 0.05
-billboard = 1
 texture_filter = 0
 sprite_frames = ExtResource("3_rmbhq")
 autoplay = "default"

Scenes/Weapons/Explosion_Bullet_Small_3D.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=6 format=3 uid="uid://bu464cgcdnihv"]
+[gd_scene load_steps=5 format=3 uid="uid://bu464cgcdnihv"]
 
 [ext_resource type="Script" uid="uid://cg6y36s7buapp" path="res://Scripts/Weapons/Bullet3D.cs" id="1_uud1m"]
-[ext_resource type="Texture2D" uid="uid://cybpmpb0d8yva" path="res://Sprites/Projectile.png" id="2_alu0c"]
 [ext_resource type="SpriteFrames" uid="uid://lh1q76788ixw" path="res://Resources/Sprites/explosion_proc_1.tres" id="3_qsphx"]
 [ext_resource type="Script" uid="uid://cvk4jbit45sfi" path="res://Scripts/Components/Actors/PooledAnimatedSpritePlayer3D.cs" id="4_5oowj"]
 
@@ -15,21 +14,14 @@ script = ExtResource("1_uud1m")
 Speed = 200.0
 metadata/_edit_group_ = true
 
-[node name="Sprite" type="Sprite3D" parent="."]
-visible = false
-pixel_size = 0.05
-billboard = 1
-texture_filter = 0
-texture = ExtResource("2_alu0c")
-
 [node name="CollisionShape" type="CollisionShape3D" parent="."]
 shape = SubResource("SphereShape3D_pklkt")
 
 [node name="VisibleOnScreenNotifier" type="VisibleOnScreenNotifier3D" parent="."]
 
 [node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="."]
+transform = Transform3D(0.707107, -0.5, 0.5, 0, 0.707107, 0.707107, -0.707107, -0.5, 0.5, 0, 0, 0)
 pixel_size = 0.025
-billboard = 1
 texture_filter = 0
 sprite_frames = ExtResource("3_qsphx")
 autoplay = "default"

Scripts/GameController.cs

@@ -21,6 +21,8 @@ public partial class GameController : Node
     public Vector3? PlayerPosition => _player?.GlobalPosition ?? null;
     public Vector3? PlayerVelocity => _player?.Velocity ?? null;
 
+    [Export] public bool DebugDraw { get; set; }
+    
     [Signal]
     public delegate void ManagerReadyEventHandler();
 

Scripts/Weapons/Bullet3D.cs

@@ -117,6 +117,7 @@ public partial class Bullet3D : Area3D, IBullet
 
     private void SetSpriteRotationToDirection()
     {
+        if (!BulletInfo.Attributes.HasFlag(BulletFlags.Rotateable)) return;
         _sprite?.SetRotation(MakeRotationFromDirection(_direction));
     }
 
@@ -283,6 +284,11 @@ public partial class Bullet3D : Area3D, IBullet
         {
             Destroy();
         }
+
+        if (GameController.Instance is not null && GameController.Instance.DebugDraw)
+        {
+            DebugDraw3D.DrawSphere(this.GlobalPosition, this._bulletInfo.OriginalBulletResource.BulletSize, Colors.DarkRed);
+        }
     }
 
     public override void _PhysicsProcess(double delta)