Skip to content

[Art V3] Integrate approved production assets into M1 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BotTony329 merged 4 commits into from
Aug 2, 2026
Merged

[Art V3] Integrate approved production assets into M1 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df82d46
[Art V3] Add production-ready asset set
BotTony329 Aug 2, 2026
448bd15
[Art V3] Integrate production visuals into M1
BotTony329 Aug 2, 2026
1ff6040
[Art V3] Add production validation and handoff
BotTony329 Aug 2, 2026
d3058df
[Art V3] Merge latest develop into production assets
BotTony329 Aug 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions actors/boss/boss.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[ext_resource type="Script" path="res://core/hurtbox.gd" id="3_hurtbox"]
[ext_resource type="Script" path="res://core/hitbox.gd" id="4_hitbox"]
[ext_resource type="Script" path="res://visuals/death_effect.gd" id="5_death_effect"]
[ext_resource type="Texture2D" path="res://assets_v2/effects/death_dissolve.png" id="6_death_texture"]
[ext_resource type="Texture2D" path="res://assets_v3/production/effects/death.png" id="6_death_texture"]

[sub_resource type="RectangleShape2D" id="RectangleShape2D_body"]
size = Vector2(54, 104)
Expand All @@ -22,11 +22,11 @@ collision_mask = 1
script = ExtResource("1_boss")

[node name="Sprite" type="AnimatedSprite2D" parent="."]
position = Vector2(0, -48)
scale = Vector2(0.4, 0.4)
sprite_frames = ExtResource("2_frames")
animation = &"gate_warden_idle"
autoplay = "gate_warden_idle"
centered = false
offset = Vector2(-96, -176)

[node name="Body" type="CollisionShape2D" parent="."]
position = Vector2(0, -52)
Expand All @@ -51,10 +51,10 @@ position = Vector2(66, -58)
shape = SubResource("RectangleShape2D_hit")

[node name="DeathEffect" type="Sprite2D" parent="."]
position = Vector2(0, -88)
scale = Vector2(2, 2)
position = Vector2(0, -28)
scale = Vector2(0.8, 0.8)
texture = ExtResource("6_death_texture")
hframes = 8
hframes = 6
visible = false
z_index = 3
modulate = Color(1, 1, 1, 0.72)
Expand Down
68 changes: 34 additions & 34 deletions actors/boss/boss_frames.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,111 +2,111 @@
; Do not hand-edit: re-run the generator instead.
[gd_resource type="SpriteFrames" load_steps=31 format=3]

[ext_resource type="Texture2D" path="res://assets/boss/boss_idle.png" id="1_idle"]
[ext_resource type="Texture2D" path="res://assets/boss/boss_run.png" id="2_run"]
[ext_resource type="Texture2D" path="res://assets/boss/boss_attack.png" id="3_attack"]
[ext_resource type="Texture2D" path="res://assets/boss/boss_hurt.png" id="4_hurt"]
[ext_resource type="Texture2D" path="res://assets/boss/boss_death.png" id="5_death"]
[ext_resource type="Texture2D" path="res://assets_v3/production/gate_warden/gate_warden_idle.png" id="1_idle"]
[ext_resource type="Texture2D" path="res://assets_v3/production/gate_warden/gate_warden_walk.png" id="2_run"]
[ext_resource type="Texture2D" path="res://assets_v3/production/gate_warden/gate_warden_attack.png" id="3_attack"]
[ext_resource type="Texture2D" path="res://assets_v3/production/gate_warden/gate_warden_hurt.png" id="4_hurt"]
[ext_resource type="Texture2D" path="res://assets_v3/production/gate_warden/gate_warden_death.png" id="5_death"]

[sub_resource type="AtlasTexture" id="AtlasTexture_idle_0"]
atlas = ExtResource("1_idle")
region = Rect2(0, 0, 96, 96)
region = Rect2(0, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_idle_1"]
atlas = ExtResource("1_idle")
region = Rect2(96, 0, 96, 96)
region = Rect2(320, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_idle_2"]
atlas = ExtResource("1_idle")
region = Rect2(192, 0, 96, 96)
region = Rect2(640, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_idle_3"]
atlas = ExtResource("1_idle")
region = Rect2(288, 0, 96, 96)
region = Rect2(960, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_run_0"]
atlas = ExtResource("2_run")
region = Rect2(0, 0, 96, 96)
region = Rect2(0, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_run_1"]
atlas = ExtResource("2_run")
region = Rect2(96, 0, 96, 96)
region = Rect2(320, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_run_2"]
atlas = ExtResource("2_run")
region = Rect2(192, 0, 96, 96)
region = Rect2(640, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_run_3"]
atlas = ExtResource("2_run")
region = Rect2(288, 0, 96, 96)
region = Rect2(960, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_run_4"]
atlas = ExtResource("2_run")
region = Rect2(384, 0, 96, 96)
region = Rect2(1280, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_run_5"]
atlas = ExtResource("2_run")
region = Rect2(480, 0, 96, 96)
region = Rect2(1600, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_attack_0"]
atlas = ExtResource("3_attack")
region = Rect2(0, 0, 96, 96)
region = Rect2(0, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_attack_1"]
atlas = ExtResource("3_attack")
region = Rect2(96, 0, 96, 96)
region = Rect2(320, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_attack_2"]
atlas = ExtResource("3_attack")
region = Rect2(192, 0, 96, 96)
region = Rect2(640, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_attack_3"]
atlas = ExtResource("3_attack")
region = Rect2(288, 0, 96, 96)
region = Rect2(960, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_attack_4"]
atlas = ExtResource("3_attack")
region = Rect2(384, 0, 96, 96)
region = Rect2(1280, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_hurt_0"]
atlas = ExtResource("4_hurt")
region = Rect2(0, 0, 96, 96)
region = Rect2(0, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_hurt_1"]
atlas = ExtResource("4_hurt")
region = Rect2(96, 0, 96, 96)
region = Rect2(320, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_death_0"]
atlas = ExtResource("5_death")
region = Rect2(0, 0, 96, 96)
region = Rect2(0, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_death_1"]
atlas = ExtResource("5_death")
region = Rect2(96, 0, 96, 96)
region = Rect2(320, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_death_2"]
atlas = ExtResource("5_death")
region = Rect2(192, 0, 96, 96)
region = Rect2(640, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_death_3"]
atlas = ExtResource("5_death")
region = Rect2(288, 0, 96, 96)
region = Rect2(960, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_death_4"]
atlas = ExtResource("5_death")
region = Rect2(384, 0, 96, 96)
region = Rect2(1280, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_death_5"]
atlas = ExtResource("5_death")
region = Rect2(480, 0, 96, 96)
region = Rect2(1600, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_death_6"]
atlas = ExtResource("5_death")
region = Rect2(576, 0, 96, 96)
region = Rect2(1920, 0, 320, 256)

[sub_resource type="AtlasTexture" id="AtlasTexture_death_7"]
atlas = ExtResource("5_death")
region = Rect2(672, 0, 96, 96)
region = Rect2(2240, 0, 320, 256)

[resource]
animations = [{
Expand All @@ -125,7 +125,7 @@ animations = [{
}],
"loop": true,
"name": &"idle",
"speed": 6.0
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
Expand All @@ -148,7 +148,7 @@ animations = [{
}],
"loop": true,
"name": &"run",
"speed": 8.0
"speed": 7.0
}, {
"frames": [{
"duration": 1.0,
Expand All @@ -168,7 +168,7 @@ animations = [{
}],
"loop": false,
"name": &"attack",
"speed": 10.0
"speed": 9.0
}, {
"frames": [{
"duration": 1.0,
Expand All @@ -179,7 +179,7 @@ animations = [{
}],
"loop": false,
"name": &"hurt",
"speed": 8.0
"speed": 7.0
}, {
"frames": [{
"duration": 1.0,
Expand Down
12 changes: 6 additions & 6 deletions actors/enemies/ghost_archer.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[ext_resource type="SpriteFrames" path="res://assets_v2/godot/ghost_archer_frames.tres" id="3_frames"]
[ext_resource type="Resource" path="res://data/actors/ghost_archer_tactics.tres" id="4_tactics"]
[ext_resource type="Script" path="res://visuals/death_effect.gd" id="5_death_effect"]
[ext_resource type="Texture2D" path="res://assets_v2/effects/death_dissolve.png" id="6_death_texture"]
[ext_resource type="Texture2D" path="res://assets_v3/production/effects/death.png" id="6_death_texture"]

[sub_resource type="RectangleShape2D" id="RectangleShape2D_v2_body"]
size = Vector2(20, 48)
Expand All @@ -21,12 +21,11 @@ script = ExtResource("2_script")
archer_config = ExtResource("4_tactics")

[node name="Sprite" parent="." index="0"]
position = Vector2(0, -25.2)
scale = Vector2(0.36, 0.36)
sprite_frames = ExtResource("3_frames")
animation = &"ghost_archer_idle"
autoplay = "ghost_archer_idle"
position = Vector2(0, 0)
centered = false
offset = Vector2(-48, -88)

[node name="Body" parent="." index="1"]
position = Vector2(0, -24)
Expand All @@ -41,9 +40,10 @@ disabled = true
shape = SubResource("RectangleShape2D_v2_hit")

[node name="DeathEffect" type="Sprite2D" parent="." index="4"]
position = Vector2(0, -44)
position = Vector2(0, -20)
scale = Vector2(0.62, 0.62)
texture = ExtResource("6_death_texture")
hframes = 8
hframes = 6
visible = false
z_index = 3
modulate = Color(1, 1, 1, 0.72)
Expand Down
Loading
Loading