From 139b862a478a5a0085ca20aa5f55f8c581c4531a Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Wed, 25 Jan 2023 17:07:51 -0500 Subject: [PATCH] renamed turning platform --- .../{turniwood.png => turning_platform.png} | Bin ...png.import => turning_platform.png.import} | 6 +-- ...yellow.png => turning_platform_yellow.png} | Bin ...ort => turning_platform_yellow.png.import} | 6 +-- maps/canopy.tscn | 2 +- maps/cave.tscn | 2 +- maps/map01.tscn | 2 +- maps/test_room.tscn | 2 +- .../{turniwood.gd => turning_platform.gd} | 0 .../{turniwood.tscn => turning_platform.tscn} | 6 +-- objects/environment/turret/turret.tscn | 38 +++++++++++------- 11 files changed, 37 insertions(+), 27 deletions(-) rename graphics/turniwood/{turniwood.png => turning_platform.png} (100%) rename graphics/turniwood/{turniwood.png.import => turning_platform.png.import} (68%) rename graphics/turniwood/{turniwood_yellow.png => turning_platform_yellow.png} (100%) rename graphics/turniwood/{turniwood_yellow.png.import => turning_platform_yellow.png.import} (66%) rename objects/environment/turniwood/{turniwood.gd => turning_platform.gd} (100%) rename objects/environment/turniwood/{turniwood.tscn => turning_platform.tscn} (93%) diff --git a/graphics/turniwood/turniwood.png b/graphics/turniwood/turning_platform.png similarity index 100% rename from graphics/turniwood/turniwood.png rename to graphics/turniwood/turning_platform.png diff --git a/graphics/turniwood/turniwood.png.import b/graphics/turniwood/turning_platform.png.import similarity index 68% rename from graphics/turniwood/turniwood.png.import rename to graphics/turniwood/turning_platform.png.import index 6395ee5..b25a3b5 100644 --- a/graphics/turniwood/turniwood.png.import +++ b/graphics/turniwood/turning_platform.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/turniwood.png-129c22553b3d66b3252dfc2c7ecbb083.stex" +path="res://.import/turning_platform.png-405be9d001f90f3e9c015264ea0c68cb.stex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/turniwood/turniwood.png" -dest_files=[ "res://.import/turniwood.png-129c22553b3d66b3252dfc2c7ecbb083.stex" ] +source_file="res://graphics/turniwood/turning_platform.png" +dest_files=[ "res://.import/turning_platform.png-405be9d001f90f3e9c015264ea0c68cb.stex" ] [params] diff --git a/graphics/turniwood/turniwood_yellow.png b/graphics/turniwood/turning_platform_yellow.png similarity index 100% rename from graphics/turniwood/turniwood_yellow.png rename to graphics/turniwood/turning_platform_yellow.png diff --git a/graphics/turniwood/turniwood_yellow.png.import b/graphics/turniwood/turning_platform_yellow.png.import similarity index 66% rename from graphics/turniwood/turniwood_yellow.png.import rename to graphics/turniwood/turning_platform_yellow.png.import index 308bf3f..d9cae78 100644 --- a/graphics/turniwood/turniwood_yellow.png.import +++ b/graphics/turniwood/turning_platform_yellow.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/turniwood_yellow.png-daf009113c5daf504d58a9354a706f88.stex" +path="res://.import/turning_platform_yellow.png-8d317bd7f86d755ec853b54eb3a60c3b.stex" metadata={ "vram_texture": false } [deps] -source_file="res://graphics/turniwood/turniwood_yellow.png" -dest_files=[ "res://.import/turniwood_yellow.png-daf009113c5daf504d58a9354a706f88.stex" ] +source_file="res://graphics/turniwood/turning_platform_yellow.png" +dest_files=[ "res://.import/turning_platform_yellow.png-8d317bd7f86d755ec853b54eb3a60c3b.stex" ] [params] diff --git a/maps/canopy.tscn b/maps/canopy.tscn index 458fc39..90bf901 100644 --- a/maps/canopy.tscn +++ b/maps/canopy.tscn @@ -12,7 +12,7 @@ [ext_resource path="res://objects/enemy/jumping_spider.tscn" type="PackedScene" id=10] [ext_resource path="res://objects/collectibles/gold.tscn" type="PackedScene" id=11] [ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=12] -[ext_resource path="res://objects/environment/turniwood/turniwood.tscn" type="PackedScene" id=13] +[ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=13] [ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=14] [ext_resource path="res://objects/environment/barrier/barrier.tscn" type="PackedScene" id=15] [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=16] diff --git a/maps/cave.tscn b/maps/cave.tscn index a8ccb2c..1bbfe3b 100644 --- a/maps/cave.tscn +++ b/maps/cave.tscn @@ -20,7 +20,7 @@ [ext_resource path="res://objects/environment/falling_block/falling_block.tscn" type="PackedScene" id=18] [ext_resource path="res://scripts/delete_on_game_running.gd" type="Script" id=19] [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=20] -[ext_resource path="res://objects/environment/turniwood/turniwood.tscn" type="PackedScene" id=21] +[ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=21] [ext_resource path="res://objects/environment/death tile/death_tile.tscn" type="PackedScene" id=22] [ext_resource path="res://objects/environment/barrier/barrier.tscn" type="PackedScene" id=23] [ext_resource path="res://objects/environment/exit/exit.tscn" type="PackedScene" id=24] diff --git a/maps/map01.tscn b/maps/map01.tscn index 7670bf6..027771c 100644 --- a/maps/map01.tscn +++ b/maps/map01.tscn @@ -15,7 +15,7 @@ [ext_resource path="res://objects/enemy/bat.tscn" type="PackedScene" id=13] [ext_resource path="res://objects/enemy/snake.tscn" type="PackedScene" id=14] [ext_resource path="res://objects/environment/barrier/barrier.tscn" type="PackedScene" id=15] -[ext_resource path="res://objects/environment/turniwood/turniwood.tscn" type="PackedScene" id=16] +[ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=16] [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=17] [ext_resource path="res://maps/map.gd" type="Script" id=18] [ext_resource path="res://audio/music/rumble_loop.mp3" type="AudioStream" id=19] diff --git a/maps/test_room.tscn b/maps/test_room.tscn index 2767171..75a5f6d 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -11,7 +11,7 @@ [ext_resource path="res://objects/environment/rock/rock.tscn" type="PackedScene" id=9] [ext_resource path="res://objects/enemy/slime.tscn" type="PackedScene" id=10] [ext_resource path="res://maps/map.gd" type="Script" id=11] -[ext_resource path="res://objects/environment/turniwood/turniwood.tscn" type="PackedScene" id=12] +[ext_resource path="res://objects/environment/turniwood/turning_platform.tscn" type="PackedScene" id=12] [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=13] [node name="Map" type="Node2D" groups=["map"]] diff --git a/objects/environment/turniwood/turniwood.gd b/objects/environment/turniwood/turning_platform.gd similarity index 100% rename from objects/environment/turniwood/turniwood.gd rename to objects/environment/turniwood/turning_platform.gd diff --git a/objects/environment/turniwood/turniwood.tscn b/objects/environment/turniwood/turning_platform.tscn similarity index 93% rename from objects/environment/turniwood/turniwood.tscn rename to objects/environment/turniwood/turning_platform.tscn index 73b0de0..bdeb679 100644 --- a/objects/environment/turniwood/turniwood.tscn +++ b/objects/environment/turniwood/turning_platform.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://objects/environment/turniwood/turniwood.gd" type="Script" id=1] -[ext_resource path="res://graphics/turniwood/turniwood_yellow.png" type="Texture" id=2] +[ext_resource path="res://objects/environment/turniwood/turning_platform.gd" type="Script" id=1] +[ext_resource path="res://graphics/turniwood/turning_platform_yellow.png" type="Texture" id=2] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 4, 1 ) @@ -100,7 +100,7 @@ tracks/3/keys = { "values": [ Vector2( 4, 4 ), Vector2( 5, 4 ), Vector2( 3, 4 ), Vector2( 4, 4 ) ] } -[node name="Turniwood" type="Node2D"] +[node name="TurningPlatform" type="Node2D"] script = ExtResource( 1 ) [node name="Sprite" type="Sprite" parent="."] diff --git a/objects/environment/turret/turret.tscn b/objects/environment/turret/turret.tscn index 860be13..b8c1998 100644 --- a/objects/environment/turret/turret.tscn +++ b/objects/environment/turret/turret.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=21 format=2] [ext_resource path="res://objects/environment/turret/turret.gd" type="Script" id=1] [ext_resource path="res://graphics/enemy/turret.png" type="Texture" id=2] @@ -306,6 +306,27 @@ graph_offset = Vector2( -880, -243 ) [sub_resource type="Curve" id=15] _data = [ Vector2( 0, 1 ), 0.0, -2.23455, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ] +[sub_resource type="CurveTexture" id=16] +width = 32 +curve = SubResource( 15 ) + +[sub_resource type="ParticlesMaterial" id=17] +emission_shape = 2 +emission_box_extents = Vector3( 2, 0, 0 ) +flag_disable_z = true +direction = Vector3( 0, 1, 0 ) +spread = 60.0 +gravity = Vector3( 0, 0, 0 ) +initial_velocity = 50.0 +orbit_velocity = 0.0 +orbit_velocity_random = 0.0 +angle = 720.0 +angle_random = 1.0 +scale = 0.25 +scale_random = 0.5 +scale_curve = SubResource( 16 ) +color = Color( 1, 0.968627, 0.431373, 1 ) + [node name="Turret" type="Node2D"] script = ExtResource( 1 ) fire_rate = 20.0 @@ -344,21 +365,10 @@ __meta__ = { "_gizmo_extents_": 2.0 } -[node name="MuzzleFlash" type="CPUParticles2D" parent="BarrelStart/BarrelEnd"] +[node name="MuzzleFlash" type="Particles2D" parent="BarrelStart/BarrelEnd"] z_index = -1 emitting = false lifetime = 0.15 explosiveness = 0.5 +process_material = SubResource( 17 ) texture = ExtResource( 3 ) -emission_shape = 2 -emission_rect_extents = Vector2( 2, 0 ) -direction = Vector2( 0, 1 ) -spread = 60.0 -gravity = Vector2( 0, 0 ) -initial_velocity = 50.0 -angle = 720.0 -angle_random = 1.0 -scale_amount = 0.25 -scale_amount_random = 0.5 -scale_amount_curve = SubResource( 15 ) -color = Color( 1, 0.968627, 0.431373, 1 )