team-sg/hero-mark-2
team-sg/hero-mark-2
5
0
Fork 1
Code Issues 12 Releases Activity

fixed bug where game gave you more points for taking longer

Browse source
This commit is contained in:
pennyrigate 2023-01-30 17:34:19 -05:00
parent cf4c987245
commit 1a0e9d5937
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
maps/test_room.tscn
View file

@ -17,7 +17,6 @@
[node name="Map" type="Node2D" groups=["map"]] [node name="Map" type="Node2D" groups=["map"]]
script = ExtResource( 11 ) script = ExtResource( 11 )
save_location = 420
[node name="Camera2D" parent="." instance=ExtResource( 6 )] [node name="Camera2D" parent="." instance=ExtResource( 6 )]
current = false current = false
@ -37,7 +36,7 @@ tile_set = ExtResource( 3 )
cell_size = Vector2( 8, 8 ) cell_size = Vector2( 8, 8 )
collision_layer = 9 collision_layer = 9
format = 1 format = 1
tile_data = PoolIntArray( 917526, 0, 65537, 917527, 0, 65537, 983052, 0, 65537, 983053, 0, 65537, 983062, 0, 65537, 1048591, 0, 65537, 1048592, 0, 65537, 1048593, 0, 65537, 1048594, 0, 65537, 1048597, 0, 65537, 1048598, 0, 65537, 1114127, 0, 65537, 1179663, 0, 65537, 1245199, 0, 65537, 1310732, 0, 65537, 1310733, 0, 65537, 1310734, 0, 65537, 1310735, 0, 65537, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1507328, 0, 65537, 1507329, 0, 65537, 1507330, 0, 65537, 1507331, 0, 65537, 1507332, 0, 65537, 1507333, 0, 65537, 1507334, 0, 65537, 1507335, 0, 65537, 1507336, 0, 65537, 1507337, 0, 65537, 1507338, 0, 65537, 1507339, 0, 65537, 1507340, 0, 65537, 1507341, 0, 65537, 1507342, 0, 65537, 1507343, 0, 65537, 1507344, 0, 65537, 1507345, 0, 65537, 1507346, 0, 65537, 1507347, 0, 65537, 1507348, 0, 65537, 1507349, 0, 65537, 1507350, 0, 65537, 1507351, 0, 65537, 1507352, 0, 65537, 1507353, 0, 65537, 1507354, 0, 65537, 1507355, 0, 65537, 1507356, 0, 65537, 1507357, 0, 65537, 1507358, 0, 65537, 1507359, 0, 65537 ) tile_data = PoolIntArray( 917526, 0, 65537, 917527, 0, 65537, 983052, 0, 65537, 983053, 0, 65537, 983062, 0, 65537, 1048579, 0, 65537, 1048580, 0, 65537, 1048581, 0, 65537, 1048582, 0, 65537, 1048583, 0, 65537, 1048591, 0, 65537, 1048592, 0, 65537, 1048593, 0, 65537, 1048594, 0, 65537, 1048597, 0, 65537, 1048598, 0, 65537, 1114127, 0, 65537, 1179663, 0, 65537, 1245199, 0, 65537, 1310732, 0, 65537, 1310733, 0, 65537, 1310734, 0, 65537, 1310735, 0, 65537, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1507328, 0, 65537, 1507329, 0, 65537, 1507330, 0, 65537, 1507331, 0, 65537, 1507332, 0, 65537, 1507333, 0, 65537, 1507334, 0, 65537, 1507335, 0, 65537, 1507336, 0, 65537, 1507337, 0, 65537, 1507338, 0, 65537, 1507339, 0, 65537, 1507340, 0, 65537, 1507341, 0, 65537, 1507342, 0, 65537, 1507343, 0, 65537, 1507344, 0, 65537, 1507345, 0, 65537, 1507346, 0, 65537, 1507347, 0, 65537, 1507348, 0, 65537, 1507349, 0, 65537, 1507350, 0, 65537, 1507351, 0, 65537, 1507352, 0, 65537, 1507353, 0, 65537, 1507354, 0, 65537, 1507355, 0, 65537, 1507356, 0, 65537, 1507357, 0, 65537, 1507358, 0, 65537, 1507359, 0, 65537 )
[node name="Rock" parent="." instance=ExtResource( 9 )] [node name="Rock" parent="." instance=ExtResource( 9 )]
position = Vector2( 120, 120 ) position = Vector2( 120, 120 )

4
objects/environment/exit/exit.gd
View file

@ -27,11 +27,11 @@ func _on_Area2D_area_entered(area):
#Time bonus #Time bonus
if Game.golds == 50 && Game.shards == 5: if Game.golds == 50 && Game.shards == 5:
if Game.time < map.target_time_100: if Game.time < map.target_time_100:
Game.score += floor(2500 * (Game.time / map.target_time_100)) Game.score += max(2500 - 2500 * int(Game.time / map.target_time_100), 0)
Game.shards_collected[6] = true Game.shards_collected[6] = true
else: else:
if Game.time < map.target_time_any: if Game.time < map.target_time_any:
Game.score += floor(2500 * (Game.time / map.target_time_any)) Game.score += max(2500 - 2500 * int(Game.time / map.target_time_any), 0)
Game.shards_collected[6] = true Game.shards_collected[6] = true
#Life bonus #Life bonus
if Game.lives == 1: Game.score += 500 if Game.lives == 1: Game.score += 500