From 2892503dee60b77073de2003f953d2bb4c2b7ddb Mon Sep 17 00:00:00 2001 From: Nolan A Casey Date: Thu, 30 May 2024 15:56:16 -0400 Subject: [PATCH] Bug fixes, transitions - Fixed some spell animations - Fixed crash with healing spells - Added scene transitions - Added boolean for web build to disable window type selection - Fixed some random errors --- Resources/Credits/soundEffects.tres | 10 + Resources/Spells/common/acidSpray.tres | 3 +- Resources/Spells/common/cauterizeWound.tres | 3 +- Resources/Spells/common/firebolt.tres | 3 +- Resources/Spells/common/iceSpear.tres | 3 +- Resources/Spells/common/poisonSting.tres | 3 +- Resources/Spells/common/rockThrow.tres | 3 +- Resources/Spells/godlike/duckSwarm.tres | 3 +- Resources/Spells/legendary/fireball.tres | 3 +- Resources/Spells/legendary/stoneWall.tres | 3 +- Resources/Spells/rare/icyWind.tres | 3 +- Resources/Spells/rare/poisonShield.tres | 3 +- Resources/Spells/rare/sandstorm.tres | 3 +- Resources/Spells/rare/wallOfFire.tres | 9 +- Resources/spell.gd | 4 +- Scenes/Animations/acidSprayAnim.tscn | 343 +++++++++- Scenes/Animations/poisonStingAnim.tscn | 63 ++ Scenes/Animations/rockThrowAnim.tscn | 8 +- Scenes/UI/mainMenu.tscn | 5 +- Scenes/chargingParticles.tscn | 708 -------------------- Scenes/data.tscn | 1 + Scenes/root.tscn | 9 +- Scenes/sceneTransitioner.tscn | 419 ++++++++++++ Scripts/Animations/ChargingAnim.gd | 39 -- Scripts/Animations/rockThrowAnim.gd | 9 - Scripts/Queue.gd | 15 - Scripts/SceneTransitioner.gd | 12 + Scripts/Settings.gd | 15 +- Scripts/TitleScreen.gd | 4 + Scripts/animationBase.gd | 6 +- Scripts/arena.gd | 2 + Scripts/combatant.gd | 1 + Scripts/data.gd | 12 +- Scripts/tavern.gd | 5 +- Themes/default.tres | 24 +- project.godot | 4 + unfinishedSpells.txt | 8 +- 37 files changed, 931 insertions(+), 840 deletions(-) create mode 100644 Resources/Credits/soundEffects.tres delete mode 100644 Scenes/chargingParticles.tscn create mode 100644 Scenes/sceneTransitioner.tscn delete mode 100644 Scripts/Animations/ChargingAnim.gd delete mode 100644 Scripts/Animations/rockThrowAnim.gd delete mode 100644 Scripts/Queue.gd create mode 100644 Scripts/SceneTransitioner.gd diff --git a/Resources/Credits/soundEffects.tres b/Resources/Credits/soundEffects.tres new file mode 100644 index 0000000..d54ad10 --- /dev/null +++ b/Resources/Credits/soundEffects.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" script_class="Credit" load_steps=2 format=3 uid="uid://dif2suudut0wr"] + +[ext_resource type="Script" path="res://Resources/credit.gd" id="1_ifdvs"] + +[resource] +script = ExtResource("1_ifdvs") +title = "Sound Effects" +name = "GDC Library" +description = Array[String]([]) +links = Array[String](["https://sonniss.com/gameaudiogdc"]) diff --git a/Resources/Spells/common/acidSpray.tres b/Resources/Spells/common/acidSpray.tres index 320bdff..7f5ae5a 100644 --- a/Resources/Spells/common/acidSpray.tres +++ b/Resources/Spells/common/acidSpray.tres @@ -22,5 +22,6 @@ blockStrength = { 1: 0.9, 2: 0.9, 3: 0.8, -4: 1.0 +4: 1.0, +5: 1.0 } diff --git a/Resources/Spells/common/cauterizeWound.tres b/Resources/Spells/common/cauterizeWound.tres index 7f6a4dd..82f0d27 100644 --- a/Resources/Spells/common/cauterizeWound.tres +++ b/Resources/Spells/common/cauterizeWound.tres @@ -22,5 +22,6 @@ blockStrength = { 1: 1.0, 2: 1.0, 3: 1.0, -4: 1.0 +4: 1.0, +5: 1.0 } diff --git a/Resources/Spells/common/firebolt.tres b/Resources/Spells/common/firebolt.tres index 53e7807..2031229 100644 --- a/Resources/Spells/common/firebolt.tres +++ b/Resources/Spells/common/firebolt.tres @@ -22,5 +22,6 @@ blockStrength = { 1: 1.0, 2: 1.0, 3: 1.0, -4: 1.0 +4: 1.0, +5: 1.0 } diff --git a/Resources/Spells/common/iceSpear.tres b/Resources/Spells/common/iceSpear.tres index 3349887..faa7084 100644 --- a/Resources/Spells/common/iceSpear.tres +++ b/Resources/Spells/common/iceSpear.tres @@ -22,5 +22,6 @@ blockStrength = { 1: 0.95, 2: 1.0, 3: 0.9, -4: 0.85 +4: 0.85, +5: 1.0 } diff --git a/Resources/Spells/common/poisonSting.tres b/Resources/Spells/common/poisonSting.tres index 5319aff..a9f7817 100644 --- a/Resources/Spells/common/poisonSting.tres +++ b/Resources/Spells/common/poisonSting.tres @@ -22,5 +22,6 @@ blockStrength = { 1: 1.0, 2: 1.0, 3: 1.0, -4: 1.0 +4: 1.0, +5: 1.0 } diff --git a/Resources/Spells/common/rockThrow.tres b/Resources/Spells/common/rockThrow.tres index 96709ba..340982d 100644 --- a/Resources/Spells/common/rockThrow.tres +++ b/Resources/Spells/common/rockThrow.tres @@ -22,5 +22,6 @@ blockStrength = { 1: 0.8, 2: 0.8, 3: 0.9, -4: 0.6 +4: 0.6, +5: 1.0 } diff --git a/Resources/Spells/godlike/duckSwarm.tres b/Resources/Spells/godlike/duckSwarm.tres index 28cc5be..4f777e1 100644 --- a/Resources/Spells/godlike/duckSwarm.tres +++ b/Resources/Spells/godlike/duckSwarm.tres @@ -22,5 +22,6 @@ blockStrength = { 1: 0.25, 2: 0.1, 3: 0.0, -4: 0.25 +4: 0.25, +5: 1.0 } diff --git a/Resources/Spells/legendary/fireball.tres b/Resources/Spells/legendary/fireball.tres index b00ffd2..54d7fd4 100644 --- a/Resources/Spells/legendary/fireball.tres +++ b/Resources/Spells/legendary/fireball.tres @@ -22,5 +22,6 @@ blockStrength = { 1: 0.6, 2: 0.4, 3: 0.2, -4: 0.7 +4: 0.7, +5: 1.0 } diff --git a/Resources/Spells/legendary/stoneWall.tres b/Resources/Spells/legendary/stoneWall.tres index 37590f6..77e68ff 100644 --- a/Resources/Spells/legendary/stoneWall.tres +++ b/Resources/Spells/legendary/stoneWall.tres @@ -22,5 +22,6 @@ blockStrength = { 1: 0.0, 2: 0.0, 3: 0.0, -4: 0.0 +4: 0.0, +5: 1.0 } diff --git a/Resources/Spells/rare/icyWind.tres b/Resources/Spells/rare/icyWind.tres index b5ab1aa..08655b6 100644 --- a/Resources/Spells/rare/icyWind.tres +++ b/Resources/Spells/rare/icyWind.tres @@ -22,5 +22,6 @@ blockStrength = { 1: 0.6, 2: 0.9, 3: 0.9, -4: 1.0 +4: 1.0, +5: 1.0 } diff --git a/Resources/Spells/rare/poisonShield.tres b/Resources/Spells/rare/poisonShield.tres index 4bb9806..e80d6b2 100644 --- a/Resources/Spells/rare/poisonShield.tres +++ b/Resources/Spells/rare/poisonShield.tres @@ -22,5 +22,6 @@ blockStrength = { 1: 0.3, 2: 0.4, 3: 0.25, -4: 0.6 +4: 0.6, +5: 1.0 } diff --git a/Resources/Spells/rare/sandstorm.tres b/Resources/Spells/rare/sandstorm.tres index 97ad216..c51ce10 100644 --- a/Resources/Spells/rare/sandstorm.tres +++ b/Resources/Spells/rare/sandstorm.tres @@ -22,5 +22,6 @@ blockStrength = { 1: 0.6, 2: 0.85, 3: 0.8, -4: 0.9 +4: 0.9, +5: 1.0 } diff --git a/Resources/Spells/rare/wallOfFire.tres b/Resources/Spells/rare/wallOfFire.tres index 2e2b2aa..eba5882 100644 --- a/Resources/Spells/rare/wallOfFire.tres +++ b/Resources/Spells/rare/wallOfFire.tres @@ -18,9 +18,10 @@ stunning = false timeout = 5.0 cooldown = 7.0 blockStrength = { -0: 1.0, +0: 0.8, 1: 1.0, -2: 1.0, -3: 1.0, -4: 1.0 +2: 0.6, +3: 0.5, +4: 1.0, +5: 1.0 } diff --git a/Resources/spell.gd b/Resources/spell.gd index 960fd44..df4d408 100644 --- a/Resources/spell.gd +++ b/Resources/spell.gd @@ -1,6 +1,4 @@ -extends Resource - -class_name Spell +class_name Spell extends Resource @export var icon: CompressedTexture2D @export var name: String diff --git a/Scenes/Animations/acidSprayAnim.tscn b/Scenes/Animations/acidSprayAnim.tscn index 17c6ba9..f17348b 100644 --- a/Scenes/Animations/acidSprayAnim.tscn +++ b/Scenes/Animations/acidSprayAnim.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=109 format=3 uid="uid://b3pnua4nrjtkw"] +[gd_scene load_steps=112 format=3 uid="uid://b3pnua4nrjtkw"] [ext_resource type="Script" path="res://Scripts/animationBase.gd" id="1_3iwpy"] [ext_resource type="Texture2D" uid="uid://b17v1e34ell73" path="res://Sprites/Particles/Particles Cleaned/20_magicbubbles_spritesheet.png" id="2_to6au"] @@ -513,7 +513,7 @@ tracks/1/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [Vector2(298, 471)] +"values": [Vector2(310, 417)] } tracks/2/type = "value" tracks/2/imported = false @@ -576,9 +576,348 @@ tracks/6/keys = { "values": [Vector3(1, 0, 0)] } +[sub_resource type="Animation" id="Animation_vrgn0"] +resource_name = "attackInverse0" +length = 0.2 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("GPUParticles2D:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(833, 588)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("GPUParticles2D:lifetime") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [3.0] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("GPUParticles2D:process_material:scale_min") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [1.0] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("GPUParticles2D:process_material:scale_max") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [1.0] +} +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("GPUParticles2D:process_material:linear_accel_min") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [1.0] +} +tracks/5/type = "value" +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/path = NodePath("GPUParticles2D:process_material:linear_accel_max") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [1.0] +} +tracks/6/type = "value" +tracks/6/imported = false +tracks/6/enabled = true +tracks/6/path = NodePath("GPUParticles2D:process_material:tangential_accel_min") +tracks/6/interp = 1 +tracks/6/loop_wrap = true +tracks/6/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [1.0] +} +tracks/7/type = "value" +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/path = NodePath("GPUParticles2D:process_material:tangential_accel_max") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [2.0] +} +tracks/8/type = "value" +tracks/8/imported = false +tracks/8/enabled = true +tracks/8/path = NodePath("AnimatedSprite2D:position") +tracks/8/interp = 1 +tracks/8/loop_wrap = true +tracks/8/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(845, 414)] +} +tracks/9/type = "value" +tracks/9/imported = false +tracks/9/enabled = true +tracks/9/path = NodePath("AnimatedSprite2D:scale") +tracks/9/interp = 1 +tracks/9/loop_wrap = true +tracks/9/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(1e-05, 1e-05)] +} +tracks/10/type = "value" +tracks/10/imported = false +tracks/10/enabled = true +tracks/10/path = NodePath("AnimatedSprite2D:speed_scale") +tracks/10/interp = 1 +tracks/10/loop_wrap = true +tracks/10/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [1.0] +} +tracks/11/type = "value" +tracks/11/imported = false +tracks/11/enabled = true +tracks/11/path = NodePath("GPUParticles2D:emitting") +tracks/11/interp = 1 +tracks/11/loop_wrap = true +tracks/11/keys = { +"times": PackedFloat32Array(0.01), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} +tracks/12/type = "value" +tracks/12/imported = false +tracks/12/enabled = true +tracks/12/path = NodePath("GPUParticles2D:amount_ratio") +tracks/12/interp = 1 +tracks/12/loop_wrap = true +tracks/12/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [0.2] +} +tracks/13/type = "value" +tracks/13/imported = false +tracks/13/enabled = true +tracks/13/path = NodePath("GPUParticles2D:process_material:initial_velocity_max") +tracks/13/interp = 1 +tracks/13/loop_wrap = true +tracks/13/keys = { +"times": PackedFloat32Array(0.2), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [100.0] +} +tracks/14/type = "value" +tracks/14/imported = false +tracks/14/enabled = true +tracks/14/path = NodePath("GPUParticles2D:process_material:initial_velocity_min") +tracks/14/interp = 1 +tracks/14/loop_wrap = true +tracks/14/keys = { +"times": PackedFloat32Array(0.2), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [100.0] +} +tracks/15/type = "value" +tracks/15/imported = false +tracks/15/enabled = true +tracks/15/path = NodePath("GPUParticles2D:process_material:direction") +tracks/15/interp = 1 +tracks/15/loop_wrap = true +tracks/15/keys = { +"times": PackedFloat32Array(0.2), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector3(0, -1, 0)] +} +tracks/16/type = "value" +tracks/16/imported = false +tracks/16/enabled = true +tracks/16/path = NodePath("GPUParticles2D:process_material:tangential_accel_curve:curve") +tracks/16/interp = 1 +tracks/16/loop_wrap = true +tracks/16/keys = { +"times": PackedFloat32Array(0.2), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [SubResource("Curve_p12s0")] +} +tracks/17/type = "value" +tracks/17/imported = false +tracks/17/enabled = true +tracks/17/path = NodePath("GPUParticles2D:process_material:linear_accel_curve") +tracks/17/interp = 1 +tracks/17/loop_wrap = true +tracks/17/keys = { +"times": PackedFloat32Array(0.2), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [SubResource("CurveTexture_s88ht")] +} + +[sub_resource type="Animation" id="Animation_0i6bj"] +resource_name = "attackInverse1" +length = 0.4 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("AnimatedSprite2D:scale") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(0, 0), Vector2(1, 1)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("GPUParticles2D:amount_ratio") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [0.2, 0.4] +} + +[sub_resource type="Animation" id="Animation_42ow4"] +resource_name = "attackInverse2" +length = 2.0 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("AnimatedSprite2D:scale") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(1, 1), Vector2(1e-05, 1e-05)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("GPUParticles2D:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(845, 414)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("GPUParticles2D:process_material:initial_velocity_min") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0.1), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [350.0] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("GPUParticles2D:process_material:initial_velocity_max") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0.1), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [550.0] +} +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("GPUParticles2D:amount_ratio") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0, 0.08, 0.11), +"transitions": PackedFloat32Array(1, 1, 1), +"update": 0, +"values": [0.4, 0.0, 1.0] +} +tracks/5/type = "value" +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/path = NodePath("GPUParticles2D:emitting") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/keys = { +"times": PackedFloat32Array(0.11), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [true] +} +tracks/6/type = "value" +tracks/6/imported = false +tracks/6/enabled = true +tracks/6/path = NodePath("GPUParticles2D:process_material:direction") +tracks/6/interp = 1 +tracks/6/loop_wrap = true +tracks/6/keys = { +"times": PackedFloat32Array(0.11), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector3(-1, 0, 0)] +} + [sub_resource type="AnimationLibrary" id="AnimationLibrary_im4uk"] _data = { "RESET": SubResource("Animation_aewhu"), +"attackInverse0": SubResource("Animation_vrgn0"), +"attackInverse1": SubResource("Animation_0i6bj"), +"attackInverse2": SubResource("Animation_42ow4"), "attackSegment0": SubResource("Animation_afodu"), "attackSegment1": SubResource("Animation_gwdc1"), "attackSegment2": SubResource("Animation_g732k") diff --git a/Scenes/Animations/poisonStingAnim.tscn b/Scenes/Animations/poisonStingAnim.tscn index 151bf92..ad873c6 100644 --- a/Scenes/Animations/poisonStingAnim.tscn +++ b/Scenes/Animations/poisonStingAnim.tscn @@ -45,12 +45,75 @@ tracks/2/keys = { [sub_resource type="Animation" id="Animation_l0kop"] resource_name = "attackInverse0" +length = 0.3 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.3), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(755, 744), Vector2(755, 205)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Sprite2D:rotation") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [0.0] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("Sprite2D:scale") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(1, 1)] +} [sub_resource type="Animation" id="Animation_q64gy"] resource_name = "attackInverse1" +length = 0.2 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:rotation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.2), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [0.0, -1.91986] +} [sub_resource type="Animation" id="Animation_7v42t"] resource_name = "attackInverse2" +length = 0.15 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.15), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(755, 205), Vector2(250, 328)] +} [sub_resource type="Animation" id="Animation_b83wi"] resource_name = "attackSegment0" diff --git a/Scenes/Animations/rockThrowAnim.tscn b/Scenes/Animations/rockThrowAnim.tscn index a762696..e3d5bc2 100644 --- a/Scenes/Animations/rockThrowAnim.tscn +++ b/Scenes/Animations/rockThrowAnim.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=14 format=3 uid="uid://c44hesqr12wxd"] +[gd_scene load_steps=13 format=3 uid="uid://c44hesqr12wxd"] -[ext_resource type="Script" path="res://Scripts/Animations/rockThrowAnim.gd" id="1_owh0v"] +[ext_resource type="Script" path="res://Scripts/animationBase.gd" id="1_veu0o"] [ext_resource type="Texture2D" uid="uid://dwsd0hggrxbdq" path="res://Sprites/Animations/Rock Pack/Rocks 64x64 by Captainskeleto.png" id="2_addwy"] -[ext_resource type="Resource" uid="uid://dl6nv6lp460n3" path="res://Resources/Spells/common/rockThrow.tres" id="2_apcu7"] [sub_resource type="AtlasTexture" id="AtlasTexture_wqvpx"] atlas = ExtResource("2_addwy") @@ -135,9 +134,8 @@ _data = { } [node name="RockThrowAnim" type="Node2D"] -script = ExtResource("1_owh0v") +script = ExtResource("1_veu0o") finalIndex = 3 -spell = ExtResource("2_apcu7") soundEffect = "res://Sound/Effects/Spell Effects/rock impact medium 26.wav" soundPlayedIndex = 3 diff --git a/Scenes/UI/mainMenu.tscn b/Scenes/UI/mainMenu.tscn index ce2740c..e807c85 100644 --- a/Scenes/UI/mainMenu.tscn +++ b/Scenes/UI/mainMenu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=54 format=3 uid="uid://cme8avdi3w0sg"] +[gd_scene load_steps=55 format=3 uid="uid://cme8avdi3w0sg"] [ext_resource type="Texture2D" uid="uid://s86ux2sxmlff" path="res://Sprites/Backgrounds/Castle Pack by CaptainSkeleto/castle pack5.png" id="1_7mj66"] [ext_resource type="Theme" uid="uid://bh8kyg4qt8rt7" path="res://Themes/default.tres" id="1_wybs8"] @@ -28,6 +28,7 @@ [ext_resource type="Resource" uid="uid://brxahbi4vjugq" path="res://Resources/Credits/characters.tres" id="25_g7b4v"] [ext_resource type="Resource" uid="uid://3pyt3kpxrmg3" path="res://Resources/Credits/music3.tres" id="25_xj44e"] [ext_resource type="Resource" uid="uid://br28lfq7y7wq6" path="res://Resources/Credits/particles.tres" id="26_ceuxk"] +[ext_resource type="Resource" uid="uid://dif2suudut0wr" path="res://Resources/Credits/soundEffects.tres" id="26_uqxdy"] [sub_resource type="Animation" id="Animation_eu62g"] length = 0.001 @@ -1646,7 +1647,7 @@ mouse_filter = 2 theme = ExtResource("1_wybs8") script = ExtResource("20_ecqdj") spawnTimer = 0.8 -credits = Array[Resource("res://Resources/credit.gd")]([ExtResource("21_7nm4r"), ExtResource("22_23x55"), ExtResource("22_laxdl"), ExtResource("24_v3coc"), ExtResource("25_xj44e"), ExtResource("24_crwn2"), ExtResource("25_g7b4v"), ExtResource("26_ceuxk")]) +credits = Array[Resource("res://Resources/credit.gd")]([ExtResource("21_7nm4r"), ExtResource("22_23x55"), ExtResource("22_laxdl"), ExtResource("24_v3coc"), ExtResource("25_xj44e"), ExtResource("26_uqxdy"), ExtResource("24_crwn2"), ExtResource("25_g7b4v"), ExtResource("26_ceuxk")]) [node name="Home" type="TextureButton" parent="Credits"] layout_mode = 1 diff --git a/Scenes/chargingParticles.tscn b/Scenes/chargingParticles.tscn deleted file mode 100644 index 74b757f..0000000 --- a/Scenes/chargingParticles.tscn +++ /dev/null @@ -1,708 +0,0 @@ -[gd_scene load_steps=101 format=3 uid="uid://davqo20o2ncpj"] - -[ext_resource type="Texture2D" uid="uid://dryw0wl4n2keo" path="res://Sprites/Particles/Particles Cleaned/1_magicspell_spritesheet.png" id="1_1enuo"] -[ext_resource type="Script" path="res://Scripts/Animations/ChargingAnim.gd" id="2_0nus5"] -[ext_resource type="Texture2D" uid="uid://bla8rw5wnahkt" path="res://Sprites/Particles/Particles Cleaned/Effect_Anima_1_437x437.png" id="2_12tb4"] -[ext_resource type="Texture2D" uid="uid://cdli5isggagei" path="res://Sprites/Particles/Particles Cleaned/Effect_Worm_1_413x369.png" id="2_71agl"] -[ext_resource type="Texture2D" uid="uid://byvrltgpcb788" path="res://Sprites/Particles/Particles Cleaned/Effect_Tentacles_1_453x337.png" id="3_lamaw"] - -[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_4dqlh"] -particles_animation = true -particles_anim_h_frames = 9 -particles_anim_v_frames = 9 -particles_anim_loop = false - -[sub_resource type="Curve" id="Curve_vvthl"] -max_value = 3.0 -_data = [Vector2(0, 1.02198), 0.0, -0.575006, 0, 0, Vector2(0.6, 1.02198), 0.0, 0.0, 0, 0, Vector2(1, 0.593407), -2.30769, 0.0, 0, 0] -point_count = 3 - -[sub_resource type="CurveTexture" id="CurveTexture_hh7ro"] -curve = SubResource("Curve_vvthl") - -[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_j4hsn"] -particle_flag_disable_z = true -emission_shape = 3 -emission_box_extents = Vector3(40, 50, 1) -orbit_velocity_min = -0.1 -orbit_velocity_max = 0.1 -radial_velocity_min = -50.0 -radial_velocity_max = 50.0 -gravity = Vector3(0, -50, 0) -scale_over_velocity_curve = SubResource("CurveTexture_hh7ro") -hue_variation_min = -0.1 -hue_variation_max = 0.1 -anim_speed_min = 1.0 -anim_speed_max = 1.0 -turbulence_enabled = true -turbulence_noise_strength = 0.2 - -[sub_resource type="AtlasTexture" id="AtlasTexture_pm4em"] -atlas = ExtResource("2_12tb4") -region = Rect2(0, 0, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_sd6t5"] -atlas = ExtResource("2_12tb4") -region = Rect2(437, 0, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_aqp85"] -atlas = ExtResource("2_12tb4") -region = Rect2(874, 0, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_4x51y"] -atlas = ExtResource("2_12tb4") -region = Rect2(1311, 0, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_c3l5r"] -atlas = ExtResource("2_12tb4") -region = Rect2(1748, 0, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_y850j"] -atlas = ExtResource("2_12tb4") -region = Rect2(2185, 0, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_cjl1a"] -atlas = ExtResource("2_12tb4") -region = Rect2(0, 437, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_gwn6n"] -atlas = ExtResource("2_12tb4") -region = Rect2(437, 437, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_ipdro"] -atlas = ExtResource("2_12tb4") -region = Rect2(874, 437, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_r3asw"] -atlas = ExtResource("2_12tb4") -region = Rect2(1311, 437, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_2303r"] -atlas = ExtResource("2_12tb4") -region = Rect2(1748, 437, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_ndupk"] -atlas = ExtResource("2_12tb4") -region = Rect2(2185, 437, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_3y7g3"] -atlas = ExtResource("2_12tb4") -region = Rect2(0, 874, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_2mi34"] -atlas = ExtResource("2_12tb4") -region = Rect2(437, 874, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_e71nj"] -atlas = ExtResource("2_12tb4") -region = Rect2(874, 874, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_0ie6k"] -atlas = ExtResource("2_12tb4") -region = Rect2(1311, 874, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_mu6dc"] -atlas = ExtResource("2_12tb4") -region = Rect2(1748, 874, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_bc864"] -atlas = ExtResource("2_12tb4") -region = Rect2(2185, 874, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_hkebx"] -atlas = ExtResource("2_12tb4") -region = Rect2(0, 1311, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_aekvf"] -atlas = ExtResource("2_12tb4") -region = Rect2(437, 1311, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_txplu"] -atlas = ExtResource("2_12tb4") -region = Rect2(874, 1311, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_hmt31"] -atlas = ExtResource("2_12tb4") -region = Rect2(1311, 1311, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_rsyaj"] -atlas = ExtResource("2_12tb4") -region = Rect2(1748, 1311, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_vsebt"] -atlas = ExtResource("2_12tb4") -region = Rect2(2185, 1311, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_26cob"] -atlas = ExtResource("2_12tb4") -region = Rect2(0, 1748, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_chx4e"] -atlas = ExtResource("2_12tb4") -region = Rect2(437, 1748, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_t8tur"] -atlas = ExtResource("2_12tb4") -region = Rect2(874, 1748, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_phln4"] -atlas = ExtResource("2_12tb4") -region = Rect2(1311, 1748, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_qymew"] -atlas = ExtResource("2_12tb4") -region = Rect2(1748, 1748, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_oi1jr"] -atlas = ExtResource("2_12tb4") -region = Rect2(2185, 1748, 437, 437) - -[sub_resource type="AtlasTexture" id="AtlasTexture_k4pyb"] -atlas = ExtResource("3_lamaw") -region = Rect2(0, 0, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_nius0"] -atlas = ExtResource("3_lamaw") -region = Rect2(453, 0, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_cww6d"] -atlas = ExtResource("3_lamaw") -region = Rect2(906, 0, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_x102l"] -atlas = ExtResource("3_lamaw") -region = Rect2(1359, 0, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_ntrf4"] -atlas = ExtResource("3_lamaw") -region = Rect2(1812, 0, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_mhr5r"] -atlas = ExtResource("3_lamaw") -region = Rect2(2265, 0, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_pvxaw"] -atlas = ExtResource("3_lamaw") -region = Rect2(0, 337, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_lven4"] -atlas = ExtResource("3_lamaw") -region = Rect2(453, 337, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_sq572"] -atlas = ExtResource("3_lamaw") -region = Rect2(906, 337, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_ihiad"] -atlas = ExtResource("3_lamaw") -region = Rect2(1359, 337, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_gyv0x"] -atlas = ExtResource("3_lamaw") -region = Rect2(1812, 337, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_unmib"] -atlas = ExtResource("3_lamaw") -region = Rect2(2265, 337, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_ahas2"] -atlas = ExtResource("3_lamaw") -region = Rect2(0, 674, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_6wvhk"] -atlas = ExtResource("3_lamaw") -region = Rect2(453, 674, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_ckjm3"] -atlas = ExtResource("3_lamaw") -region = Rect2(906, 674, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_3giv7"] -atlas = ExtResource("3_lamaw") -region = Rect2(1359, 674, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_ruwr4"] -atlas = ExtResource("3_lamaw") -region = Rect2(1812, 674, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_lpnug"] -atlas = ExtResource("3_lamaw") -region = Rect2(2265, 674, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_n7x01"] -atlas = ExtResource("3_lamaw") -region = Rect2(0, 1011, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_yxage"] -atlas = ExtResource("3_lamaw") -region = Rect2(453, 1011, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_yvhf5"] -atlas = ExtResource("3_lamaw") -region = Rect2(906, 1011, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_3xpjc"] -atlas = ExtResource("3_lamaw") -region = Rect2(1359, 1011, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_ei7dr"] -atlas = ExtResource("3_lamaw") -region = Rect2(1812, 1011, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_e1brr"] -atlas = ExtResource("3_lamaw") -region = Rect2(2265, 1011, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_v2xwh"] -atlas = ExtResource("3_lamaw") -region = Rect2(0, 1348, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_wi46y"] -atlas = ExtResource("3_lamaw") -region = Rect2(453, 1348, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_hfbp7"] -atlas = ExtResource("3_lamaw") -region = Rect2(906, 1348, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_772j0"] -atlas = ExtResource("3_lamaw") -region = Rect2(1359, 1348, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_i3rfo"] -atlas = ExtResource("3_lamaw") -region = Rect2(1812, 1348, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_ci0at"] -atlas = ExtResource("3_lamaw") -region = Rect2(2265, 1348, 453, 337) - -[sub_resource type="AtlasTexture" id="AtlasTexture_bjmba"] -atlas = ExtResource("2_71agl") -region = Rect2(0, 0, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_kugda"] -atlas = ExtResource("2_71agl") -region = Rect2(413, 0, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_0hn1v"] -atlas = ExtResource("2_71agl") -region = Rect2(826, 0, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_rc52g"] -atlas = ExtResource("2_71agl") -region = Rect2(1239, 0, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_yb7sb"] -atlas = ExtResource("2_71agl") -region = Rect2(1652, 0, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_6it24"] -atlas = ExtResource("2_71agl") -region = Rect2(2065, 0, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_dcvki"] -atlas = ExtResource("2_71agl") -region = Rect2(0, 369, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_533mc"] -atlas = ExtResource("2_71agl") -region = Rect2(413, 369, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_dhlxf"] -atlas = ExtResource("2_71agl") -region = Rect2(826, 369, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_4aicg"] -atlas = ExtResource("2_71agl") -region = Rect2(1239, 369, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_4nfmi"] -atlas = ExtResource("2_71agl") -region = Rect2(1652, 369, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_376o1"] -atlas = ExtResource("2_71agl") -region = Rect2(2065, 369, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_ix0ce"] -atlas = ExtResource("2_71agl") -region = Rect2(0, 738, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_lrfsd"] -atlas = ExtResource("2_71agl") -region = Rect2(413, 738, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_1m70v"] -atlas = ExtResource("2_71agl") -region = Rect2(826, 738, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_2rnxx"] -atlas = ExtResource("2_71agl") -region = Rect2(1239, 738, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_rapds"] -atlas = ExtResource("2_71agl") -region = Rect2(1652, 738, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_s4b85"] -atlas = ExtResource("2_71agl") -region = Rect2(2065, 738, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_4dt21"] -atlas = ExtResource("2_71agl") -region = Rect2(0, 1107, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_2bblx"] -atlas = ExtResource("2_71agl") -region = Rect2(413, 1107, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_vkml1"] -atlas = ExtResource("2_71agl") -region = Rect2(826, 1107, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_vk6tk"] -atlas = ExtResource("2_71agl") -region = Rect2(1239, 1107, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_0jo01"] -atlas = ExtResource("2_71agl") -region = Rect2(1652, 1107, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_1vcrk"] -atlas = ExtResource("2_71agl") -region = Rect2(2065, 1107, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_ltu7m"] -atlas = ExtResource("2_71agl") -region = Rect2(0, 1476, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_6u01c"] -atlas = ExtResource("2_71agl") -region = Rect2(413, 1476, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_b55u1"] -atlas = ExtResource("2_71agl") -region = Rect2(826, 1476, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_cq4km"] -atlas = ExtResource("2_71agl") -region = Rect2(1239, 1476, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_u2qga"] -atlas = ExtResource("2_71agl") -region = Rect2(1652, 1476, 413, 369) - -[sub_resource type="AtlasTexture" id="AtlasTexture_eepr7"] -atlas = ExtResource("2_71agl") -region = Rect2(2065, 1476, 413, 369) - -[sub_resource type="SpriteFrames" id="SpriteFrames_8ue2d"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_pm4em") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_sd6t5") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_aqp85") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_4x51y") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_c3l5r") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_y850j") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_cjl1a") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_gwn6n") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_ipdro") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_r3asw") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_2303r") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_ndupk") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_3y7g3") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_2mi34") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_e71nj") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_0ie6k") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_mu6dc") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_bc864") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_hkebx") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_aekvf") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_txplu") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_hmt31") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_rsyaj") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_vsebt") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_26cob") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_chx4e") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_t8tur") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_phln4") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_qymew") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_oi1jr") -}], -"loop": true, -"name": &"anima", -"speed": 30.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_k4pyb") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_nius0") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_cww6d") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_x102l") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_ntrf4") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_mhr5r") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_pvxaw") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_lven4") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_sq572") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_ihiad") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_gyv0x") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_unmib") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_ahas2") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_6wvhk") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_ckjm3") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_3giv7") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_ruwr4") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_lpnug") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_n7x01") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_yxage") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_yvhf5") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_3xpjc") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_ei7dr") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_e1brr") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_v2xwh") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_wi46y") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_hfbp7") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_772j0") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_i3rfo") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_ci0at") -}], -"loop": true, -"name": &"tentacles", -"speed": 30.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_bjmba") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_kugda") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_0hn1v") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_rc52g") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_yb7sb") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_6it24") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_dcvki") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_533mc") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_dhlxf") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_4aicg") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_4nfmi") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_376o1") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_ix0ce") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_lrfsd") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_1m70v") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_2rnxx") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_rapds") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_s4b85") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_4dt21") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_2bblx") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_vkml1") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_vk6tk") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_0jo01") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_1vcrk") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_ltu7m") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_6u01c") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_b55u1") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_cq4km") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_u2qga") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_eepr7") -}], -"loop": true, -"name": &"worm", -"speed": 30.0 -}] - -[node name="ChargingParticles" type="GPUParticles2D"] -material = SubResource("CanvasItemMaterial_4dqlh") -emitting = false -amount = 6 -process_material = SubResource("ParticleProcessMaterial_j4hsn") -texture = ExtResource("1_1enuo") -lifetime = 5.0 -speed_scale = 2.94 -fixed_fps = 60 -trail_sections = 4 -script = ExtResource("2_0nus5") -top = Vector2(0, 95) -bottom = Vector2(0, 164) - -[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] -position = Vector2(0, 164) -scale = Vector2(0.4, 0.4) -sprite_frames = SubResource("SpriteFrames_8ue2d") -animation = &"worm" -autoplay = "worm" -frame_progress = 0.331503 diff --git a/Scenes/data.tscn b/Scenes/data.tscn index 4e8960e..ffd734c 100644 --- a/Scenes/data.tscn +++ b/Scenes/data.tscn @@ -18,4 +18,5 @@ [node name="Data" type="Node"] script = ExtResource("1_m1o6d") +forWeb = false unlockedSpells = Array[Resource("res://Resources/spell.gd")]([ExtResource("3_qjws8"), ExtResource("6_jp3r2"), ExtResource("2_rphxk"), ExtResource("14_16c1w"), ExtResource("11_jfuyr"), ExtResource("10_u8r30"), ExtResource("13_wlfl7"), ExtResource("8_vogb5"), ExtResource("12_wcscn"), ExtResource("11_mohfk"), ExtResource("10_t1kk2"), ExtResource("5_gakij"), ExtResource("4_facpx"), ExtResource("14_11wtp")]) diff --git a/Scenes/root.tscn b/Scenes/root.tscn index 4bed97f..6daa833 100644 --- a/Scenes/root.tscn +++ b/Scenes/root.tscn @@ -1,22 +1,25 @@ -[gd_scene load_steps=7 format=3 uid="uid://bix346il46rme"] +[gd_scene load_steps=8 format=3 uid="uid://bix346il46rme"] [ext_resource type="PackedScene" uid="uid://c8ni0t7brphc7" path="res://Scenes/musicPlayer.tscn" id="1_60q85"] [ext_resource type="PackedScene" uid="uid://d2owoq5q27v8q" path="res://Scenes/data.tscn" id="2_ba8tb"] [ext_resource type="PackedScene" uid="uid://cme8avdi3w0sg" path="res://Scenes/UI/mainMenu.tscn" id="3_vjpnb"] [ext_resource type="Resource" uid="uid://bxtiv2esuer8v" path="res://Resources/Spellbooks/oldBook.tres" id="4_vnce4"] [ext_resource type="PackedScene" uid="uid://b7s5qx8fhk0pg" path="res://Scenes/UI/fpsMonitor.tscn" id="5_qao58"] +[ext_resource type="PackedScene" uid="uid://c36m315ygy0ds" path="res://Scenes/sceneTransitioner.tscn" id="5_w1ywm"] [sub_resource type="AudioStream" id="AudioStream_ibb28"] [node name="Root" type="Node"] +[node name="Data" parent="." instance=ExtResource("2_ba8tb")] +spellbook = ExtResource("4_vnce4") + [node name="MainMenu" parent="." instance=ExtResource("3_vjpnb")] [node name="MusicPlayer" parent="." instance=ExtResource("1_60q85")] stream = SubResource("AudioStream_ibb28") -[node name="Data" parent="." instance=ExtResource("2_ba8tb")] -spellbook = ExtResource("4_vnce4") +[node name="SceneTransitioner" parent="." instance=ExtResource("5_w1ywm")] [node name="FPSMonitor" parent="." instance=ExtResource("5_qao58")] visible = false diff --git a/Scenes/sceneTransitioner.tscn b/Scenes/sceneTransitioner.tscn new file mode 100644 index 0000000..8df5932 --- /dev/null +++ b/Scenes/sceneTransitioner.tscn @@ -0,0 +1,419 @@ +[gd_scene load_steps=12 format=3 uid="uid://c36m315ygy0ds"] + +[ext_resource type="Script" path="res://Scripts/SceneTransitioner.gd" id="1_1o5bt"] + +[sub_resource type="Animation" id="Animation_1a6uh"] +resource_name = "slideOutLeft" +length = 0.4 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("SceneTransitioner/ColorRect:scale") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(1, 1), Vector2(1e-05, 1)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("SceneTransitioner/ColorRect:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(0, 0)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("SceneTransitioner/ColorRect:anchors_preset") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [15] +} + +[sub_resource type="Animation" id="Animation_5sv4i"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("SceneTransitioner/ColorRect:scale") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(1, 1)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("SceneTransitioner/ColorRect:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(0, 0)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("SceneTransitioner/ColorRect:anchors_preset") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [12] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("SceneTransitioner/ColorRect:size") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(1152, 648)] +} + +[sub_resource type="Animation" id="Animation_qd2ek"] +resource_name = "slideInRight" +length = 0.4 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("SceneTransitioner/ColorRect:scale") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(1e-05, 1), Vector2(1, 1)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("SceneTransitioner/ColorRect:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(0, 0)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("SceneTransitioner/ColorRect:anchors_preset") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [15] +} + +[sub_resource type="Animation" id="Animation_hwcsr"] +resource_name = "slideInDown" +length = 0.4 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("SceneTransitioner/ColorRect:scale") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(1, 1e-05), Vector2(1, 1)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("SceneTransitioner/ColorRect:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(0, 0)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("SceneTransitioner/ColorRect:anchors_preset") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [15] +} + +[sub_resource type="Animation" id="Animation_6gk55"] +resource_name = "slideOutUp" +length = 0.4 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("SceneTransitioner/ColorRect:scale") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(1, 1), Vector2(1, 1e-05)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("SceneTransitioner/ColorRect:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(0, 0)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("SceneTransitioner/ColorRect:anchors_preset") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [15] +} + +[sub_resource type="Animation" id="Animation_62mse"] +resource_name = "slideInUp" +length = 0.4 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("SceneTransitioner/ColorRect:anchors_preset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [12] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("SceneTransitioner/ColorRect:size") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(5000, 648)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("SceneTransitioner/ColorRect:scale") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(1, 1e-05), Vector2(1, -1)] +} + +[sub_resource type="Animation" id="Animation_y1uel"] +resource_name = "slideOutDown" +length = 0.4 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("SceneTransitioner/ColorRect:scale") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(1, -1), Vector2(1, 1e-05)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("SceneTransitioner/ColorRect:anchors_preset") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [12] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("SceneTransitioner/ColorRect:size") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(5000, 648)] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("SceneTransitioner/ColorRect:position") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(0, 648)] +} + +[sub_resource type="Animation" id="Animation_dlqa5"] +resource_name = "slideInLeft" +length = 0.4 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("SceneTransitioner/ColorRect:anchors_preset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [11] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("SceneTransitioner/ColorRect:scale") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(1e-05, 1), Vector2(-1, 1)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("SceneTransitioner/ColorRect:size") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(5000, 648)] +} + +[sub_resource type="Animation" id="Animation_77wi1"] +resource_name = "slideOutRight" +length = 0.4 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("SceneTransitioner/ColorRect:anchors_preset") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [11] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("SceneTransitioner/ColorRect:size") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(5000, 648)] +} +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("SceneTransitioner/ColorRect:scale") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0, 0.4), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(-1, 1), Vector2(1e-05, 1)] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_q1p50"] +_data = { +"RESET": SubResource("Animation_5sv4i"), +"slideInDown": SubResource("Animation_hwcsr"), +"slideInLeft": SubResource("Animation_dlqa5"), +"slideInRight": SubResource("Animation_qd2ek"), +"slideInUp": SubResource("Animation_62mse"), +"slideOutDown": SubResource("Animation_y1uel"), +"slideOutLeft": SubResource("Animation_1a6uh"), +"slideOutRight": SubResource("Animation_77wi1"), +"slideOutUp": SubResource("Animation_6gk55") +} + +[node name="SceneTransitioner" type="AnimationPlayer"] +libraries = { +"": SubResource("AnimationLibrary_q1p50") +} +script = ExtResource("1_1o5bt") +transitionsAway = Array[String](["slideInRight", "slideInDown", "slideInUp", "slideInLeft"]) +transitionsInto = Array[String](["slideOutLeft", "slideOutUp", "slideOutDown", "slideOutRight"]) + +[node name="ColorRect" type="ColorRect" parent="."] +z_index = 4095 +anchors_preset = 11 +anchor_left = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_right = 5000.0 +grow_horizontal = 0 +grow_vertical = 2 +scale = Vector2(1.00136e-05, 1) +color = Color(0.0923971, 0.0923971, 0.0923971, 1) diff --git a/Scripts/Animations/ChargingAnim.gd b/Scripts/Animations/ChargingAnim.gd deleted file mode 100644 index f40bbcd..0000000 --- a/Scripts/Animations/ChargingAnim.gd +++ /dev/null @@ -1,39 +0,0 @@ -extends GPUParticles2D - -class_name ChargingAnim - -@export var top: Vector2 -@export var bottom: Vector2 - -@onready var effect: AnimatedSprite2D = $AnimatedSprite2D - -var charging: bool = false -var timer: float = 1 - -# Called when the node enters the scene tree for the first time. -func _ready(): - pass # Replace with function body. - -# Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(delta): - if charging: - effect.position = lerp(bottom, top, timer) - else: - effect.position = lerp(top, bottom, timer) - timer = clampf(timer + delta, 0, 1) - -func charge(strength: float, element: Data.Element) -> void: - charging = true - emitting = true - process_material.orbit_velocity_min = strength / 50 - process_material.orbit_velocity_max = strength / 40 - process_material.scale_min = strength / 5 - process_material.scale_max = strength / 4 - process_material.anim_speed_min = strength / 5 - process_material.anim_speed_max = strength / 4 - timer = 0 - -func disable() -> void: - charging = false - emitting = false - timer = 0 diff --git a/Scripts/Animations/rockThrowAnim.gd b/Scripts/Animations/rockThrowAnim.gd deleted file mode 100644 index 2328fa6..0000000 --- a/Scripts/Animations/rockThrowAnim.gd +++ /dev/null @@ -1,9 +0,0 @@ -extends AnimationBase - -@onready var texture: TextureRect = $TextureRect - -var failIndex: int = 0 -var animQueue: Queue = Queue.new() - -func castFailed() -> void: - queue_free() diff --git a/Scripts/Queue.gd b/Scripts/Queue.gd deleted file mode 100644 index 84565c3..0000000 --- a/Scripts/Queue.gd +++ /dev/null @@ -1,15 +0,0 @@ -class_name Queue extends Object - -var items: Array - -func push(item): - items.append(item) - -func pop(): - return items.pop_front() - -func peek(): - return items[0] - -func size(): - return items.size() diff --git a/Scripts/SceneTransitioner.gd b/Scripts/SceneTransitioner.gd new file mode 100644 index 0000000..91f8111 --- /dev/null +++ b/Scripts/SceneTransitioner.gd @@ -0,0 +1,12 @@ +class_name SceneTransitioner extends AnimationPlayer + +@export var transitionsAway: Array[String] +@export var transitionsInto: Array[String] + +func hideScreen(): + play(transitionsAway[randi_range(0, transitionsAway.size() - 1)]) + await get_tree().create_timer(current_animation_length).timeout + +func showScreen(): + play(transitionsInto[randi_range(0, transitionsInto.size() - 1)]) + await get_tree().create_timer(current_animation_length).timeout diff --git a/Scripts/Settings.gd b/Scripts/Settings.gd index 64bfcf8..7cc6b34 100644 --- a/Scripts/Settings.gd +++ b/Scripts/Settings.gd @@ -11,6 +11,7 @@ extends Control @onready var musicSlide: HSlider = $/root/Root/MainMenu/Settings/NinePatchRect/ScrollContainer/GridContainer/MusicSlide @onready var effectsSlide: HSlider = $/root/Root/MainMenu/Settings/NinePatchRect/ScrollContainer/GridContainer/EffectsSlide @onready var difficulty: OptionButton = $/root/Root/MainMenu/Settings/NinePatchRect/ScrollContainer/GridContainer/OptionButton +@onready var windowModeLabel: RichTextLabel = $/root/Root/MainMenu/Settings/NinePatchRect/ScrollContainer/GridContainer/WindowMode @onready var windowMode: OptionButton = $/root/Root/MainMenu/Settings/NinePatchRect/ScrollContainer/GridContainer/OptionButton2 @onready var vsync: OptionButton = $/root/Root/MainMenu/Settings/NinePatchRect/ScrollContainer/GridContainer/OptionButton3 @onready var maxFPS: OptionButton = $/root/Root/MainMenu/Settings/NinePatchRect/ScrollContainer/GridContainer/OptionButton4 @@ -24,10 +25,14 @@ func _ready(): effectsSlide.value = volumeEffects musicSlide.value = volumeMusic masterSlide.value = volumeMaster - match DisplayServer.window_get_mode(): - DisplayServer.WINDOW_MODE_WINDOWED: windowMode.selected = 0 - DisplayServer.WINDOW_MODE_FULLSCREEN: windowMode.selected = 1 - DisplayServer.WINDOW_MODE_EXCLUSIVE_FULLSCREEN: windowMode.selected = 1 + if (data.forWeb): + windowMode.disabled = true + windowModeLabel.modulate = Color("dfdfdf80") + else: + match DisplayServer.window_get_mode(): + DisplayServer.WINDOW_MODE_WINDOWED: windowMode.selected = 0 + DisplayServer.WINDOW_MODE_FULLSCREEN: windowMode.selected = 1 + DisplayServer.WINDOW_MODE_EXCLUSIVE_FULLSCREEN: windowMode.selected = 2 match DisplayServer.window_get_vsync_mode(): DisplayServer.VSYNC_DISABLED: vsync.selected = 0 DisplayServer.VSYNC_ENABLED: vsync.selected = 1 @@ -73,7 +78,7 @@ func vsyncChanged(index: int): 3: DisplayServer.window_set_vsync_mode(DisplayServer.VSYNC_MAILBOX) func toggleFPSMonitor(toggled_on: bool): - fpsMonitor.visible = toggled_on + $/root/Root/FPSMonitor.visible = toggled_on func fpsChanged(index: int): match index: diff --git a/Scripts/TitleScreen.gd b/Scripts/TitleScreen.gd index 7c7893f..4004eee 100644 --- a/Scripts/TitleScreen.gd +++ b/Scripts/TitleScreen.gd @@ -18,7 +18,11 @@ extends Control var aboutOut: bool = false +func _ready(): + data.transitioner.showScreen() + func _on_play_pressed(): + await data.transitioner.hideScreen() var t: Tavern = load(data.locations[data.Location.TAVERN]).instantiate() $/root/Root.add_child(t) data.musicPlayer.setLoc(Data.Location.TAVERN) diff --git a/Scripts/animationBase.gd b/Scripts/animationBase.gd index dd10c4b..c9f0543 100644 --- a/Scripts/animationBase.gd +++ b/Scripts/animationBase.gd @@ -20,7 +20,7 @@ var stream: AudioStream # Called when the node enters the scene tree for the first time. func _ready(): - if (soundEffect != null): + if (soundEffect != ""): stream = load(soundEffect) if (stream == null): print(spell.name + " failed") if inverted: @@ -37,13 +37,13 @@ func setProgress(target: float, final: float = finalProg) -> void: finalProg = final if (index > -1): animationPlayer.queue(attackName + str(index)) - if (index == soundPlayedIndex): + if (index == soundPlayedIndex && soundEffect != ""): data.playSound(stream) index += 1 func animFinished(_s: String): if (index == finalIndex): - if (index == soundPlayedIndex): + if (index == soundPlayedIndex && soundEffect != ""): data.playSound(stream) animationFinished.emit(spell) die() diff --git a/Scripts/arena.gd b/Scripts/arena.gd index 1943f59..dae4d12 100644 --- a/Scripts/arena.gd +++ b/Scripts/arena.gd @@ -6,6 +6,8 @@ extends Node2D func _ready(): data.player.connect("died", combatantDied) data.opponent.connect("died", combatantDied) + await data.transitioner.showScreen() + data.playing = true # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): diff --git a/Scripts/combatant.gd b/Scripts/combatant.gd index 0785efe..1aa8418 100644 --- a/Scripts/combatant.gd +++ b/Scripts/combatant.gd @@ -70,6 +70,7 @@ func cast() -> void: spell = spellOptions[randi_range(0, spellOptions.size() - 1)] spellIndex = spellbook.spells.find(spell) anim = data.animations[spell.animation].instantiate() + if (anim == null): print("Spell animation failed: " + spell.name) anim.setProgress(0, spell.castCombo.size()) anim.inverted = true casting = true diff --git a/Scripts/data.gd b/Scripts/data.gd index 63aa5d3..847072a 100644 --- a/Scripts/data.gd +++ b/Scripts/data.gd @@ -32,9 +32,11 @@ enum Rarity{ } @onready var musicPlayer: MusicPlayer = $/root/Root/MusicPlayer +@onready var transitioner: SceneTransitioner = $/root/Root/SceneTransitioner @onready var opponentBook: Spellbook = load("res://Resources/Spellbooks/wizardSpellbook.tres") @onready var soundEffectScene: PackedScene = load("res://Scenes/soundEffectPlayer.tscn") +@export var forWeb: bool = true @export var spellbook: Spellbook @export var difficulty: Difficulty = Difficulty.NORMAL @export var animations: Dictionary = {} @@ -50,7 +52,6 @@ enum Rarity{ @export var godlikeChance: int = 1 @export var locations: Dictionary = { Location.MAINMENU: "res://Scenes/UI/mainMenu.tscn", - Location.CREDITS: "", Location.TAVERN: "res://Scenes/tavern.tscn", Location.ARENA: "res://Scenes/arena.tscn" } @@ -58,10 +59,6 @@ enum Rarity{ func getSpellbook(): var spells: Array[Spell] = lockedSpells.duplicate() spells.append_array(unlockedSpells) - #print("Initial List") - #for spel: Spell in spells: - #print(spel.name) - #print() var spellCount: int var rarityChance: Dictionary var rar: Rarity @@ -120,11 +117,6 @@ func getSpellbook(): var spell: Spell = options[randi_range(0, options.size() - 1)] chosenSpells.append(spell) spells.erase(spell) - #print("Chosen spell: " + spell.name) - #print("List after " + str(i) + " choices") - #for spel: Spell in spells: - #print(spel.name) - #print() opponentBook.spells = chosenSpells func getNewSpell() -> Spell: diff --git a/Scripts/tavern.gd b/Scripts/tavern.gd index 0dee89e..af1ba45 100644 --- a/Scripts/tavern.gd +++ b/Scripts/tavern.gd @@ -29,6 +29,7 @@ func _ready(): button.spell = spell button.connect("spellClicked", displaySpell) library.add_child(button) + data.transitioner.showScreen() func displaySpell(spellButton: SpellButton): zone.show() @@ -69,6 +70,7 @@ func _on_choice_pressed(): selected.add_child(selectedButton) func _on_main_menu_pressed(): + await data.transitioner.hideScreen() var m: Control = load(data.locations[data.Location.MAINMENU]).instantiate() $/root/Root.add_child(m) data.musicPlayer.setLoc(Data.Location.MAINMENU) @@ -76,9 +78,10 @@ func _on_main_menu_pressed(): self.queue_free() func _on_continue_pressed(): + await data.transitioner.hideScreen() var a: Node2D = load(data.locations[data.Location.ARENA]).instantiate() $/root/Root.add_child(a) data.musicPlayer.setLoc(Data.Location.ARENA) data.loc = data.Location.ARENA self.queue_free() - data.playing = true + #data.playing = true diff --git a/Themes/default.tres b/Themes/default.tres index f87468a..5939acc 100644 --- a/Themes/default.tres +++ b/Themes/default.tres @@ -9,7 +9,7 @@ [ext_resource type="Texture2D" uid="uid://dunedrjwjxgea" path="res://Sprites/UI/Edinnu_UI_asset_pack/Target/Target (10).png" id="6_4cx20"] [ext_resource type="FontFile" uid="uid://bhggfnolqg5hu" path="res://Fonts/breathe_fire/Breathe Fire.otf" id="9_yxmfa"] -[sub_resource type="Image" id="Image_c8xe7"] +[sub_resource type="Image" id="Image_7ev2y"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 35, 255, 255, 255, 153, 255, 255, 255, 190, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 190, 255, 255, 255, 152, 255, 255, 255, 33, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 153, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 151, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 190, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 237, 237, 237, 195, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 190, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 177, 177, 177, 209, 37, 37, 37, 252, 178, 178, 178, 209, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 176, 176, 176, 209, 32, 32, 32, 254, 26, 26, 26, 255, 84, 84, 84, 235, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 176, 176, 176, 209, 32, 32, 32, 254, 26, 26, 26, 255, 78, 78, 78, 237, 248, 248, 248, 193, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 191, 255, 255, 255, 191, 253, 253, 253, 192, 222, 222, 222, 198, 255, 255, 255, 191, 255, 255, 255, 191, 175, 175, 175, 210, 32, 32, 32, 254, 26, 26, 26, 255, 79, 79, 79, 237, 248, 248, 248, 193, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 191, 253, 253, 253, 192, 90, 90, 90, 234, 45, 45, 45, 249, 212, 212, 212, 200, 174, 174, 174, 210, 32, 32, 32, 254, 26, 26, 26, 255, 79, 79, 79, 237, 248, 248, 248, 193, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 191, 232, 232, 232, 196, 54, 54, 54, 246, 26, 26, 26, 255, 43, 43, 43, 250, 32, 32, 32, 254, 26, 26, 26, 255, 81, 81, 81, 237, 248, 248, 248, 193, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 191, 255, 255, 255, 191, 226, 226, 226, 197, 54, 54, 54, 246, 26, 26, 26, 255, 26, 26, 26, 255, 81, 81, 81, 237, 248, 248, 248, 193, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 226, 226, 226, 197, 54, 54, 54, 246, 81, 81, 81, 236, 248, 248, 248, 193, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 190, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 230, 230, 230, 197, 248, 248, 248, 193, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 189, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 152, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 150, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 33, 255, 255, 255, 151, 255, 255, 255, 190, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 191, 255, 255, 255, 189, 255, 255, 255, 150, 255, 255, 255, 32, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0), "format": "RGBA8", @@ -19,9 +19,9 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_pqkb6"] -image = SubResource("Image_c8xe7") +image = SubResource("Image_7ev2y") -[sub_resource type="Image" id="Image_ax4sq"] +[sub_resource type="Image" id="Image_jjw7x"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 13, 255, 255, 255, 96, 255, 255, 255, 136, 255, 255, 255, 173, 255, 255, 255, 173, 255, 255, 255, 136, 255, 255, 255, 95, 255, 255, 255, 11, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 56, 255, 255, 255, 171, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 255, 255, 255, 168, 255, 255, 255, 51, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 56, 255, 255, 255, 191, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 255, 255, 255, 190, 255, 255, 255, 50, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 12, 255, 255, 255, 171, 198, 198, 198, 255, 198, 198, 198, 255, 176, 176, 176, 255, 81, 81, 81, 255, 43, 43, 43, 255, 43, 43, 43, 255, 83, 83, 83, 255, 177, 177, 177, 255, 198, 198, 198, 255, 198, 198, 198, 255, 255, 255, 255, 168, 255, 255, 255, 10, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 97, 198, 198, 198, 255, 198, 198, 198, 255, 176, 176, 176, 255, 37, 37, 37, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 39, 39, 39, 255, 179, 179, 179, 255, 198, 198, 198, 255, 198, 198, 198, 255, 255, 255, 255, 96, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 137, 198, 198, 198, 255, 198, 198, 198, 255, 81, 81, 81, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 86, 86, 86, 255, 198, 198, 198, 255, 198, 198, 198, 255, 255, 255, 255, 154, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 174, 198, 198, 198, 255, 198, 198, 198, 255, 43, 43, 43, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 43, 43, 43, 255, 198, 198, 198, 255, 198, 198, 198, 255, 255, 255, 255, 180, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 173, 198, 198, 198, 255, 198, 198, 198, 255, 43, 43, 43, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 44, 44, 44, 255, 198, 198, 198, 255, 198, 198, 198, 255, 255, 255, 255, 180, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 136, 198, 198, 198, 255, 198, 198, 198, 255, 83, 83, 83, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 88, 88, 88, 255, 198, 198, 198, 255, 198, 198, 198, 255, 255, 255, 255, 152, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 95, 198, 198, 198, 255, 198, 198, 198, 255, 178, 178, 178, 255, 39, 39, 39, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 26, 26, 26, 255, 42, 42, 42, 255, 181, 181, 181, 255, 198, 198, 198, 255, 198, 198, 198, 255, 255, 255, 255, 94, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 11, 255, 255, 255, 169, 198, 198, 198, 255, 198, 198, 198, 255, 179, 179, 179, 255, 86, 86, 86, 255, 43, 43, 43, 255, 44, 44, 44, 255, 88, 88, 88, 255, 181, 181, 181, 255, 198, 198, 198, 255, 198, 198, 198, 255, 255, 255, 255, 165, 255, 255, 255, 9, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 52, 255, 255, 255, 190, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 255, 255, 255, 189, 255, 255, 255, 46, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 50, 255, 255, 255, 168, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 198, 198, 198, 255, 255, 255, 255, 165, 255, 255, 255, 46, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 10, 255, 255, 255, 96, 255, 255, 255, 154, 255, 255, 255, 180, 255, 255, 255, 180, 255, 255, 255, 152, 255, 255, 255, 94, 255, 255, 255, 9, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0), "format": "RGBA8", @@ -31,9 +31,9 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_sogt1"] -image = SubResource("Image_ax4sq") +image = SubResource("Image_jjw7x") -[sub_resource type="Image" id="Image_xi1hr"] +[sub_resource type="Image" id="Image_4o7qk"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 42, 42, 42, 12, 26, 26, 26, 67, 26, 26, 26, 105, 27, 27, 27, 122, 27, 27, 27, 122, 26, 26, 26, 105, 27, 27, 27, 66, 46, 46, 46, 11, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 29, 29, 29, 44, 27, 27, 27, 122, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 27, 27, 27, 122, 30, 30, 30, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 29, 29, 29, 44, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 30, 30, 30, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 42, 42, 42, 12, 27, 27, 27, 122, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 27, 27, 27, 121, 46, 46, 46, 11, 255, 255, 255, 0, 255, 255, 255, 0, 26, 26, 26, 67, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 27, 27, 27, 65, 255, 255, 255, 0, 255, 255, 255, 0, 26, 26, 26, 105, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 27, 27, 27, 104, 255, 255, 255, 0, 255, 255, 255, 0, 27, 27, 27, 122, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 27, 27, 27, 122, 255, 255, 255, 0, 255, 255, 255, 0, 27, 27, 27, 122, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 27, 27, 27, 121, 255, 255, 255, 0, 255, 255, 255, 0, 26, 26, 26, 105, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 27, 27, 27, 103, 255, 255, 255, 0, 255, 255, 255, 0, 27, 27, 27, 66, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 27, 27, 27, 65, 255, 255, 255, 0, 255, 255, 255, 0, 46, 46, 46, 11, 27, 27, 27, 122, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 27, 27, 27, 121, 51, 51, 51, 10, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 30, 30, 30, 42, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 31, 31, 31, 41, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 30, 30, 30, 42, 27, 27, 27, 121, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 27, 27, 27, 121, 31, 31, 31, 41, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 46, 46, 46, 11, 27, 27, 27, 65, 27, 27, 27, 104, 27, 27, 27, 122, 27, 27, 27, 121, 27, 27, 27, 103, 27, 27, 27, 65, 51, 51, 51, 10, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0), "format": "RGBA8", @@ -43,9 +43,9 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_bym57"] -image = SubResource("Image_xi1hr") +image = SubResource("Image_4o7qk") -[sub_resource type="Image" id="Image_6mrcr"] +[sub_resource type="Image" id="Image_5pahk"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 33, 33, 33, 23, 27, 27, 27, 103, 26, 26, 26, 127, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 127, 27, 27, 27, 102, 34, 34, 34, 22, 255, 255, 255, 0, 255, 255, 255, 0, 27, 27, 27, 103, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 27, 27, 27, 101, 255, 255, 255, 0, 255, 255, 255, 0, 26, 26, 26, 127, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 127, 255, 255, 255, 0, 255, 255, 255, 0, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 255, 255, 255, 0, 255, 255, 255, 0, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 255, 255, 255, 0, 255, 255, 255, 0, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 255, 255, 255, 0, 255, 255, 255, 0, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 255, 255, 255, 0, 255, 255, 255, 0, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 255, 255, 255, 0, 255, 255, 255, 0, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 255, 255, 255, 0, 255, 255, 255, 0, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 255, 255, 255, 0, 255, 255, 255, 0, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 255, 255, 255, 0, 255, 255, 255, 0, 26, 26, 26, 127, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 127, 255, 255, 255, 0, 255, 255, 255, 0, 27, 27, 27, 102, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 28, 28, 28, 100, 255, 255, 255, 0, 255, 255, 255, 0, 34, 34, 34, 22, 27, 27, 27, 101, 26, 26, 26, 127, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 128, 26, 26, 26, 127, 28, 28, 28, 100, 36, 36, 36, 21, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0), "format": "RGBA8", @@ -55,7 +55,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_n26h3"] -image = SubResource("Image_6mrcr") +image = SubResource("Image_5pahk") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_t8gt0"] content_margin_left = 4.0 @@ -84,7 +84,7 @@ expand_margin_top = 2.0 expand_margin_right = 2.0 expand_margin_bottom = 2.0 -[sub_resource type="Image" id="Image_ndasl"] +[sub_resource type="Image" id="Image_7mf8f"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 179, 179, 179, 30, 178, 178, 178, 103, 178, 178, 178, 46, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 181, 181, 181, 31, 178, 178, 178, 115, 178, 178, 178, 115, 176, 176, 176, 48, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 176, 176, 176, 48, 178, 178, 178, 115, 178, 178, 178, 115, 176, 176, 176, 48, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 176, 176, 176, 48, 178, 178, 178, 115, 178, 178, 178, 115, 173, 173, 173, 31, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 181, 181, 181, 48, 178, 178, 178, 115, 178, 178, 178, 115, 181, 181, 181, 31, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 181, 181, 181, 48, 178, 178, 178, 115, 178, 178, 178, 115, 179, 179, 179, 47, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 181, 181, 181, 31, 178, 178, 178, 115, 178, 178, 178, 115, 179, 179, 179, 47, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 179, 179, 179, 30, 178, 178, 178, 103, 178, 178, 178, 46, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0), "format": "RGBA8", @@ -94,9 +94,9 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_mqdbu"] -image = SubResource("Image_ndasl") +image = SubResource("Image_7mf8f") -[sub_resource type="Image" id="Image_ipnwr"] +[sub_resource type="Image" id="Image_ssmb1"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 178, 178, 178, 46, 178, 178, 178, 103, 176, 176, 176, 29, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 181, 181, 181, 48, 178, 178, 178, 115, 178, 178, 178, 115, 181, 181, 181, 31, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 181, 181, 181, 48, 178, 178, 178, 115, 178, 178, 178, 115, 179, 179, 179, 47, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 181, 181, 181, 31, 178, 178, 178, 115, 178, 178, 178, 115, 179, 179, 179, 47, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 181, 181, 181, 31, 178, 178, 178, 115, 178, 178, 178, 115, 176, 176, 176, 48, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 176, 176, 176, 48, 178, 178, 178, 115, 178, 178, 178, 115, 176, 176, 176, 48, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 176, 176, 176, 48, 178, 178, 178, 115, 178, 178, 178, 115, 173, 173, 173, 31, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 178, 178, 178, 46, 178, 178, 178, 103, 179, 179, 179, 30, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0), "format": "RGBA8", @@ -106,7 +106,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_2lr15"] -image = SubResource("Image_ipnwr") +image = SubResource("Image_ssmb1") [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_m1ydj"] content_margin_left = 4.0 diff --git a/project.godot b/project.godot index 75d7504..2727d5b 100644 --- a/project.godot +++ b/project.godot @@ -13,6 +13,10 @@ config_version=5 config/name="Raise Your Wand" run/main_scene="res://Scenes/root.tscn" config/features=PackedStringArray("4.2", "Forward Plus") +boot_splash/bg_color=Color(0.0941176, 0.0941176, 0.0941176, 1) +boot_splash/show_image=false +boot_splash/fullsize=false +boot_splash/use_filter=false config/icon="res://icon.svg" [display] diff --git a/unfinishedSpells.txt b/unfinishedSpells.txt index 7a7b668..1f6ee9e 100644 --- a/unfinishedSpells.txt +++ b/unfinishedSpells.txt @@ -2,15 +2,9 @@ Common: Rare: - ~~Healing Wave: - ~~Player Animation - ~~Enemy Animation - ~~Wall of Fire: - ~~Enemy Animation + Legendary: - ~~Stone Wall: - ~~Enemy Animation Ice Age: Spell Player Animation