From 0afda1163a465c5a88d3c9000a4bc7fbaa9cbff2 Mon Sep 17 00:00:00 2001 From: TwistedTwigleg Date: Sat, 6 Jan 2018 18:00:50 -0500 Subject: [PATCH] Fixes for Physics_platformer: - Added the Z key to shoot so that the input follows the same input as Platformer3D - Fixed the particles in the bullet scene so that it follows the same look as Platformer3D - Changed the scaling for the window from none to 2D --- 2d/physics_platformer/bullet.tscn | 102 +++++++++++++++++++++++++--- 2d/physics_platformer/project.godot | 2 + 2 files changed, 93 insertions(+), 11 deletions(-) diff --git a/2d/physics_platformer/bullet.tscn b/2d/physics_platformer/bullet.tscn index e6ac7d12..28a359c7 100644 --- a/2d/physics_platformer/bullet.tscn +++ b/2d/physics_platformer/bullet.tscn @@ -1,23 +1,69 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://bullet.gd" type="Script" id=1] [ext_resource path="res://bullet.png" type="Texture" id=2] -[sub_resource type="CircleShape2D" id=1] +[sub_resource type="CanvasItemMaterial" id=1] + +render_priority = 0 +blend_mode = 1 +light_mode = 0 + +[sub_resource type="ParticlesMaterial" id=4] + +render_priority = 0 +trail_divisor = 1 +emission_shape = 0 +flag_align_y = false +flag_rotate_y = false +flag_disable_z = true +spread = 0.0 +flatness = 0.0 +gravity = Vector3( 0, 0, 0 ) +initial_velocity = 1.0 +initial_velocity_random = 0.0 +angular_velocity = 38.0 +angular_velocity_random = 0.0 +orbit_velocity = 0.0 +orbit_velocity_random = 0.0 +linear_accel = 0.0 +linear_accel_random = 0.0 +radial_accel = 0.0 +radial_accel_random = 0.0 +tangential_accel = 0.0 +tangential_accel_random = 0.0 +damping = 0.0 +damping_random = 0.0 +angle = 0.0 +angle_random = 0.0 +scale = 0.8 +scale_random = 0.0 +color = Color( 1, 1, 1, 1 ) +hue_variation = 0.0 +hue_variation_random = 0.0 +anim_speed = 0.0 +anim_speed_random = 0.0 +anim_offset = 0.0 +anim_offset_random = 0.0 +anim_loop = false +_sections_unfolded = [ "Scale" ] + +[sub_resource type="CircleShape2D" id=2] custom_solver_bias = 0.0 radius = 10.0 -[sub_resource type="Animation" id=2] +[sub_resource type="Animation" id=3] length = 1.5 loop = false -step = 0.0 +step = 0.1 tracks/0/type = "method" tracks/0/path = NodePath(".") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/imported = false +tracks/0/enabled = true tracks/0/keys = { "times": PoolRealArray( 1.31 ), "transitions": PoolRealArray( 1 ), @@ -31,12 +77,25 @@ tracks/1/path = NodePath("sprite:modulate") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/imported = false +tracks/1/enabled = true tracks/1/keys = { "times": PoolRealArray( 0, 1.03 ), "transitions": PoolRealArray( 1, 1 ), "update": 0, "values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ] } +tracks/2/type = "value" +tracks/2/path = NodePath("Particles2D:self_modulate") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0, 0.5 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ] +} [node name="bullet" type="RigidBody2D"] @@ -60,29 +119,50 @@ angular_velocity = 0.0 angular_damp = -1.0 script = ExtResource( 1 ) -[node name="particles" type="Node2D" parent="."] +[node name="Particles2D" type="Particles2D" parent="." index="0"] -[node name="sprite" type="Sprite" parent="."] +material = SubResource( 1 ) +emitting = true +amount = 8 +lifetime = 0.3 +one_shot = false +preprocess = 0.0 +speed_scale = 3.0 +explosiveness = 0.0 +randomness = 0.0 +fixed_fps = 0 +fract_delta = true +visibility_rect = Rect2( -100, -100, 200, 200 ) +local_coords = false +draw_order = 0 +process_material = SubResource( 4 ) +texture = ExtResource( 2 ) +normal_map = null +h_frames = 1 +v_frames = 1 +_sections_unfolded = [ "Process Material", "Time", "Visibility" ] + +[node name="sprite" type="Sprite" parent="." index="1"] texture = ExtResource( 2 ) -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +[node name="CollisionShape2D" type="CollisionShape2D" parent="." index="2"] -shape = SubResource( 1 ) +shape = SubResource( 2 ) -[node name="Timer" type="Timer" parent="."] +[node name="Timer" type="Timer" parent="." index="3"] process_mode = 1 wait_time = 1.0 one_shot = true autostart = false -[node name="anim" type="AnimationPlayer" parent="."] +[node name="anim" type="AnimationPlayer" parent="." index="4"] playback_process_mode = 1 playback_default_blend_time = 0.0 root_node = NodePath("..") -anims/shutdown = SubResource( 2 ) +anims/shutdown = SubResource( 3 ) playback/active = true playback/speed = 1.0 blend_times = [ ] diff --git a/2d/physics_platformer/project.godot b/2d/physics_platformer/project.godot index 9ae00ead..e895fb59 100644 --- a/2d/physics_platformer/project.godot +++ b/2d/physics_platformer/project.godot @@ -18,6 +18,7 @@ config/icon="res://icon.png" window/size/width=800 window/size/height=480 +window/stretch/mode="2d" stretch/aspect="keep_height" stretch/mode="2d" @@ -42,6 +43,7 @@ move_right=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name ] shoot=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":2,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":90,"unicode":0,"echo":false,"script":null) ] spawn=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777244,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null)