From 449afceb0d5d011d9f7b1fb9bdae7eda2ac9b3b9 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Mon, 23 Sep 2024 11:15:07 -0700 Subject: [PATCH] aero --- global.gd | 2 +- sprites/common/bullet/{sword.gd => aero.gd} | 0 sprites/common/bullet/{sword.png => aero.png} | Bin .../bullet/{sword.png.import => aero.png.import} | 6 +++--- sprites/common/bullet/{sword.tscn => aero.tscn} | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) rename sprites/common/bullet/{sword.gd => aero.gd} (100%) rename sprites/common/bullet/{sword.png => aero.png} (100%) rename sprites/common/bullet/{sword.png.import => aero.png.import} (72%) rename sprites/common/bullet/{sword.tscn => aero.tscn} (76%) diff --git a/global.gd b/global.gd index 681ec25..51d1d17 100644 --- a/global.gd +++ b/global.gd @@ -26,7 +26,7 @@ var cdialog = [] const places = [[[["res://levels/Ceres/map.tscn", 5, false], [null, null, false]], [["res://levels/Testrooms/bullethell.tscn", 11, true], ["res://levels/Testrooms/lilytest.tscn", 6, false]], [["res://levels/Testrooms/dialogtest.tscn", 19, false], ["res://levels/Testrooms/testspawn.tscn", 2 ,false]]], [null, [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, ["res://levels/Ceres/troublemakers.tscn", 6, true]], null, null, null, null, null, null, [null, null, null, null, null, null, null, null, null, null, null, ["res://levels/Ceres/honkerrailway.tscn", 19, false]], null, null, [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, ["res://levels/Ceres/L20.tscn", 3, true]]]] var cplace = [0,2,1] var dplace = [null, null, null] -const pbbullets = ["res://sprites/common/bullet/fireball.tscn", "res://sprites/common/bullet/sword.tscn", null, "res://sprites/common/bullet/arrow.tscn", null, null, null, null, null, "res://sprites/common/bullet/snowflake.tscn"] +const pbbullets = ["res://sprites/common/bullet/fireball.tscn", "res://sprites/common/bullet/aero.tscn", null, "res://sprites/common/bullet/arrow.tscn", null, null, null, null, null, "res://sprites/common/bullet/snowflake.tscn"] const pcspecialities = [1, 2, null, 3, null, null, null, null, null, 0] const pchars = [["res://sprites/common/midori/sprite.png"], ["res://sprites/common/tuna/sprite.png"], [null], ["res://sprites/common/kimberly/sprite.png"], [null], [null], [null], [null], [null], ["res://sprites/common/natasha/sprite.png"]] const npchars = ["res://sprites/common/midori/sprite.png", null, null, null, null, null, null, null, null, "res://sprites/common/natasha/sprite.png"] diff --git a/sprites/common/bullet/sword.gd b/sprites/common/bullet/aero.gd similarity index 100% rename from sprites/common/bullet/sword.gd rename to sprites/common/bullet/aero.gd diff --git a/sprites/common/bullet/sword.png b/sprites/common/bullet/aero.png similarity index 100% rename from sprites/common/bullet/sword.png rename to sprites/common/bullet/aero.png diff --git a/sprites/common/bullet/sword.png.import b/sprites/common/bullet/aero.png.import similarity index 72% rename from sprites/common/bullet/sword.png.import rename to sprites/common/bullet/aero.png.import index 39ce767..571867d 100644 --- a/sprites/common/bullet/sword.png.import +++ b/sprites/common/bullet/aero.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://ca17ddf0kokpv" -path="res://.godot/imported/sword.png-b74bc94f384d21eae7c7d6c961dab98b.ctex" +path="res://.godot/imported/aero.png-3707eb778efaef5b9ea78dce49a33f16.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/common/bullet/sword.png" -dest_files=["res://.godot/imported/sword.png-b74bc94f384d21eae7c7d6c961dab98b.ctex"] +source_file="res://sprites/common/bullet/aero.png" +dest_files=["res://.godot/imported/aero.png-3707eb778efaef5b9ea78dce49a33f16.ctex"] [params] diff --git a/sprites/common/bullet/sword.tscn b/sprites/common/bullet/aero.tscn similarity index 76% rename from sprites/common/bullet/sword.tscn rename to sprites/common/bullet/aero.tscn index 9c0be67..0790ec6 100644 --- a/sprites/common/bullet/sword.tscn +++ b/sprites/common/bullet/aero.tscn @@ -1,18 +1,18 @@ [gd_scene load_steps=4 format=3 uid="uid://bex0xeqbq5uci"] -[ext_resource type="Script" path="res://sprites/common/bullet/sword.gd" id="1_7tric"] -[ext_resource type="Texture2D" uid="uid://ca17ddf0kokpv" path="res://sprites/common/bullet/sword.png" id="2_pgywo"] +[ext_resource type="Script" path="res://sprites/common/bullet/aero.gd" id="1_rovd1"] +[ext_resource type="Texture2D" uid="uid://ca17ddf0kokpv" path="res://sprites/common/bullet/aero.png" id="2_omcs8"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_g125y"] size = Vector2(128, 28) -[node name="Sword" type="Area2D"] -script = ExtResource("1_7tric") +[node name="Aero" type="Area2D"] +script = ExtResource("1_rovd1") [node name="Sprite2D" type="Sprite2D" parent="."] position = Vector2(0, 64) rotation = 1.5708 -texture = ExtResource("2_pgywo") +texture = ExtResource("2_omcs8") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2(0, 64)