Skip to content

Commit

Permalink
Merge pull request #34 from Paulsville/new_stage
Browse files Browse the repository at this point in the history
New stage - adding end point to stage 3
  • Loading branch information
DanPerry1808 committed Nov 3, 2019
2 parents 68fe666 + 1fb8f64 commit a79ba4b
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .import/track_enemy.png-3977378655a02b74b7918ee765897968.md5
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="9d5b3fbe6f7f477c39969b6072539107"
dest_md5="065f6782310f0794e3488bd78c4e0756"
source_md5="adaa9464dc3f7ea2139ace65b4b84f68"
dest_md5="ec30c474e59b36805413f26e1217f0b3"

Binary file modified .import/track_enemy.png-3977378655a02b74b7918ee765897968.stex
Binary file not shown.
2 changes: 2 additions & 0 deletions Stage2.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ scale = Vector2( 2, 2 )
position = Vector2( 2368.32, 345.728 )

[node name="ParallaxBg" parent="." instance=ExtResource( 8 )]
scale = Vector2( 1.5, 1.5 )
transform = Transform2D( 1.5, 0, 0, 1.5, 0, 0 )

[node name="GUI" type="CanvasLayer" parent="."]

Expand Down
9 changes: 8 additions & 1 deletion Stage3.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=10 format=2]
[gd_scene load_steps=11 format=2]

[ext_resource path="res://Metal.tres" type="TileSet" id=1]
[ext_resource path="res://platform/OneWayPlatform.tscn" type="PackedScene" id=2]
Expand All @@ -9,6 +9,7 @@
[ext_resource path="res://background/ParallaxBg.tscn" type="PackedScene" id=7]
[ext_resource path="res://enemy/tank_enemy/TankEnemy.tscn" type="PackedScene" id=8]
[ext_resource path="res://enemy/basic_enemy/BasicEnemy.tscn" type="PackedScene" id=9]
[ext_resource path="res://End point/EndPoint.tscn" type="PackedScene" id=10]

[node name="Stage" type="Node2D"]

Expand Down Expand Up @@ -59,6 +60,8 @@ height = 2
[node name="EnergyBar" parent="GUI" instance=ExtResource( 6 )]

[node name="ParallaxBg" parent="." instance=ExtResource( 7 )]
scale = Vector2( 1.5, 1.5 )
transform = Transform2D( 1.5, 0, 0, 1.5, 0, 0 )

[node name="Enemies" type="Node2D" parent="."]

Expand All @@ -69,4 +72,8 @@ scale = Vector2( 1.5, 1.5 )
[node name="BasicEnemy" parent="Enemies" instance=ExtResource( 9 )]
position = Vector2( 1048.55, 172.62 )
scale = Vector2( 1.5, 1.5 )

[node name="EndPoint" parent="." instance=ExtResource( 10 )]
position = Vector2( 3214.26, 112.984 )
next_scene = "Stage4"
[connection signal="energy_updated" from="Player" to="GUI/EnergyBar" method="_on_Player_energy_updated"]
2 changes: 1 addition & 1 deletion Stage4.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ format = 1
tile_data = PoolIntArray( 262173, 536870913, 0, 262174, 0, 0, 262175, 0, 0, 262176, 0, 0, 262177, 1, 0, 327680, 536870913, 0, 327681, 0, 0, 327682, 0, 0, 327683, 0, 0, 327684, 0, 0, 327685, 0, 0, 327686, 0, 0, 327687, 1, 0, 327707, 536870913, 0, 327708, 0, 0, 327709, 2, 0, 327710, 2, 0, 327711, 2, 0, 327712, 2, 0, 327713, 2, 0, 327714, 0, 0, 327715, 1, 0, 393223, 3, 0, 393227, 536870913, 0, 393228, 536870912, 0, 393229, 0, 0, 393230, 0, 0, 393231, 0, 0, 393232, 1, 0, 393237, 536870913, 0, 393238, 0, 0, 393239, 0, 0, 393240, 1, 0, 393254, 536870913, 0, 393255, 0, 0, 393256, 0, 0, 393257, 0, 0, 393258, 1, 0, 393261, 536870913, 0, 393262, 0, 0, 393263, 1, 0, 393266, 536870913, 0, 393267, 0, 0, 393268, 1, 0, 458759, 3, 0, 458773, 536870915, 0, 458774, 2, 0, 458775, 2, 0, 458776, 3, 0, 458790, 536870915, 0, 458791, 2, 0, 458792, 2, 0, 458793, 2, 0, 458794, 3, 0, 458797, 536870915, 0, 458798, 2, 0, 458799, 3, 0, 458802, 536870915, 0, 458803, 2, 0, 458804, 3, 0, 524295, 3, 0, 524296, 0, 0, 524297, 0, 0, 524298, 0, 0, 524299, 0, 0, 524300, 0, 0, 524301, 0, 0, 524302, 0, 0, 524303, 0, 0, 524304, 0, 0, 524305, 0, 0, 524306, 0, 0, 524307, 0, 0, 524308, 0, 0, 524309, 536870915, 0, 524310, 2, 0, 524311, 2, 0, 524312, 3, 0, 524313, 0, 0, 524314, 0, 0, 524315, 0, 0, 524316, 0, 0, 524317, 0, 0, 524318, 0, 0, 524319, 0, 0, 524320, 0, 0, 524321, 0, 0, 524322, 0, 0, 524323, 0, 0, 524324, 0, 0, 524325, 0, 0, 524326, 536870915, 0, 524327, 2, 0, 524328, 2, 0, 524329, 2, 0, 524330, 3, 0, 524333, 536870915, 0, 524334, 2, 0, 524335, 3, 0, 524338, 536870915, 0, 524339, 2, 0, 524340, 3, 0, 589866, 3, 0, 589869, 536870915, 0, 589870, 2, 0, 589871, 3, 0, 589874, 536870915, 0, 589875, 2, 0, 589876, 3, 0, 589879, 536870913, 0, 589880, 0, 0, 589881, 0, 0, 589882, 0, 0, 589883, 0, 0, 589884, 0, 0, 589885, 0, 0, 589886, 0, 0, 589887, 1, 0, 655402, 3, 0, 655415, 536870915, 0, 655416, 2, 0, 655417, 2, 0, 655418, 2, 0, 655419, 2, 0, 655420, 2, 0, 655421, 2, 0, 655422, 2, 0, 655423, 3, 0, 720938, 2, 0, 720939, 0, 0, 720940, 0, 0, 720941, 0, 0, 720942, 0, 0, 720943, 0, 0, 720944, 0, 0, 720945, 0, 0, 720946, 0, 0, 720947, 0, 0, 720948, 0, 0, 720949, 0, 0, 720950, 0, 0, 720951, 2, 0, 720952, 2, 0, 720953, 2, 0, 720954, 2, 0, 720955, 2, 0, 720956, 2, 0, 720957, 2, 0, 720958, 2, 0, 720959, 3, 0 )

[node name="Player" parent="." instance=ExtResource( 2 )]
position = Vector2( 2566.58, 329.887 )
position = Vector2( 105.971, 283.613 )

[node name="Battery" parent="." instance=ExtResource( 3 )]
position = Vector2( 3136, 512 )
Expand Down
3 changes: 2 additions & 1 deletion enemy/track_enemy/TrackEnemy.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ extents = Vector2( 8, 8 )
[sub_resource type="CircleShape2D" id=3]
radius = 16.1265

[node name="TrackEnemy" index="0" instance=ExtResource( 1 )]
[node name="TrackEnemy" instance=ExtResource( 1 )]
scale = Vector2( 2, 2 )
script = ExtResource( 2 )

Expand All @@ -35,6 +35,7 @@ anims/spin = SubResource( 1 )

[node name="Sprite" parent="." index="2"]
rotation = 3.43952
scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 3 )
hframes = 1

Expand Down
2 changes: 1 addition & 1 deletion enemy/track_enemy/track_enemy.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
detect_3d=false
svg/scale=1.0
2 changes: 1 addition & 1 deletion export_presets.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path="C:/Users/danpe/Desktop/Fully Charged.exe"
export_path="C:/Users/danpe/Desktop/Fully Charged Hack Sheff Demo/Fully Charged.exe"
patch_list=PoolStringArray( )
script_export_mode=1
script_encryption_key=""
Expand Down
2 changes: 1 addition & 1 deletion project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ _global_script_class_icons={
[application]

config/name="Fully Charged"
run/main_scene="res://Stage4.tscn"
run/main_scene="res://Stage2.tscn"
config/icon="res://icon.png"
target_fps="60"

Expand Down

0 comments on commit a79ba4b

Please sign in to comment.