Skip to content

Commit

Permalink
Fixes for Platformer:
Browse files Browse the repository at this point in the history
- Added the Z key to shoot so that it follows the same input as Platformer3D
- Fixed the particles in the bullet scene so that it follows the same looks as Platformer3D
- Changed the scaling for the window from none to 2D
  • Loading branch information
TwistedTwigleg committed Jan 6, 2018
1 parent 0afda11 commit 1d9305f
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 31 deletions.
63 changes: 32 additions & 31 deletions 2d/platformer/bullet.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,24 @@ render_priority = 0
blend_mode = 0
light_mode = 0

[sub_resource type="CanvasItemMaterial" id=2]
[sub_resource type="CanvasItemMaterial" id=8]

render_priority = 0
blend_mode = 1
light_mode = 0
_sections_unfolded = [ "Resource" ]

[sub_resource type="ParticlesMaterial" id=3]
[sub_resource type="ParticlesMaterial" id=7]

render_priority = 0
trail_divisor = 1
emission_shape = 0
flag_align_y = false
flag_rotate_y = false
flag_disable_z = true
spread = 10.0
spread = 0.0
flatness = 0.0
gravity = Vector3( 0, 98, 0 )
initial_velocity = 1.0
gravity = Vector3( 0, 0, 0 )
initial_velocity = 0.0
initial_velocity_random = 0.0
angular_velocity = 0.0
angular_velocity_random = 0.0
Expand All @@ -43,17 +42,17 @@ damping = 0.0
damping_random = 0.0
angle = 0.0
angle_random = 0.0
scale = 1.0
scale = 0.8
scale_random = 0.0
color = Color( 1, 1, 1, 1 )
color = Color( 1, 1, 1, 0.705882 )
hue_variation = 0.0
hue_variation_random = 0.0
anim_speed = 1.0
anim_speed = 0.0
anim_speed_random = 0.0
anim_offset = 0.0
anim_offset_random = 0.0
anim_loop = false
_sections_unfolded = [ "Angle", "Angular Velocity", "Animation", "Color", "Damping", "Emission Shape", "Flags", "Gravity", "Hue Variation", "Initial Velocity", "Linear Accel", "Orbit Velocity", "Radial Accel", "Scale", "Spread", "Tangential Accel", "Trail" ]
_sections_unfolded = [ "Color", "Trail" ]

[sub_resource type="CanvasItemMaterial" id=4]

Expand All @@ -70,12 +69,13 @@ radius = 10.0

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 ),
Expand All @@ -89,25 +89,27 @@ tracks/1/path = NodePath("sprite:self_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 ),
"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("particles:emitting")
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 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
"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"]
[node name="bullet" type="RigidBody2D" index="0"]

material = SubResource( 1 )
input_pickable = false
Expand All @@ -131,49 +133,48 @@ angular_damp = -1.0
script = ExtResource( 1 )
_sections_unfolded = [ "Angular", "Collision", "Linear", "Material", "Pickable", "Transform", "Visibility", "Z" ]

[node name="particles" type="Particles2D" parent="."]
[node name="Particles2D" type="Particles2D" parent="." index="0"]

modulate = Color( 1, 1, 1, 0.56 )
material = SubResource( 2 )
emitting = false
amount = 24
lifetime = 0.1
material = SubResource( 8 )
emitting = true
amount = 8
lifetime = 0.3
one_shot = false
preprocess = 0.0
speed_scale = 1.0
explosiveness = 1.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( 3 )
process_material = SubResource( 7 )
texture = ExtResource( 2 )
normal_map = null
h_frames = 1
v_frames = 1
_sections_unfolded = [ "Drawing", "Material", "Process Material", "Textures", "Time", "Transform", "Visibility", "Z" ]
_sections_unfolded = [ "Drawing", "Process Material", "Time", "Visibility" ]

[node name="sprite" type="Sprite" parent="."]
[node name="sprite" type="Sprite" parent="." index="1"]

material = SubResource( 4 )
texture = ExtResource( 2 )
_sections_unfolded = [ "Animation", "Material", "Offset", "Region", "Transform", "Visibility", "Z" ]

[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="." index="2"]

shape = SubResource( 5 )
_sections_unfolded = [ "Material", "Transform", "Visibility", "Z" ]

[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 = true

[node name="anim" type="AnimationPlayer" parent="."]
[node name="anim" type="AnimationPlayer" parent="." index="4"]

playback_process_mode = 1
playback_default_blend_time = 0.0
Expand Down
2 changes: 2 additions & 0 deletions 2d/platformer/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ target_fps="60"

window/size/width=800
window/size/height=480
window/stretch/mode="2d"
stretch/aspect="keep_height"
stretch/mode="2d"

Expand All @@ -43,6 +44,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)
Expand Down

0 comments on commit 1d9305f

Please sign in to comment.