fogwaves/revo-jailbreak
1
0
Fork 0
forked from team-sg/hero-mark-2
Code Pull requests Activity

fixed respawning

Browse source
This commit is contained in:
pennyrigate 2023-01-15 01:41:24 -05:00
parent c3f32de2df
commit 923c28a8df
3 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
maps/test_room.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=12 format=2] [gd_scene load_steps=13 format=2]
[ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1]
[ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2] [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2]
@ -9,6 +9,7 @@
[ext_resource path="res://objects/environment/falling_block/falling_block.tscn" type="PackedScene" id=7] [ext_resource path="res://objects/environment/falling_block/falling_block.tscn" type="PackedScene" id=7]
[ext_resource path="res://graphics/backgrounds/cave.png" type="Texture" id=8] [ext_resource path="res://graphics/backgrounds/cave.png" type="Texture" id=8]
[ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=9] [ext_resource path="res://objects/environment/ladder/ladder.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://maps/map.gd" type="Script" id=11]
[ext_resource path="res://audio/music/smokestack.mp3" type="AudioStream" id=12] [ext_resource path="res://audio/music/smokestack.mp3" type="AudioStream" id=12]
@ -37,10 +38,13 @@ tile_set = ExtResource( 2 )
cell_size = Vector2( 8, 8 ) cell_size = Vector2( 8, 8 )
collision_layer = 9 collision_layer = 9
format = 1 format = 1
tile_data = PoolIntArray( 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 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, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0 ) tile_data = PoolIntArray( 196618, 0, 65537, 196619, 0, 65537, 196620, 0, 65537, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 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, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0 )
[node name="Slime" parent="." instance=ExtResource( 10 )]
position = Vector2( 84, -7 )
[node name="Player" parent="." instance=ExtResource( 1 )] [node name="Player" parent="." instance=ExtResource( 1 )]
position = Vector2( 32, 166 ) position = Vector2( 84, 14 )
[node name="Ladder2" parent="." instance=ExtResource( 9 )] [node name="Ladder2" parent="." instance=ExtResource( 9 )]
position = Vector2( 56, 104 ) position = Vector2( 56, 104 )

12
objects/camera.gd
View file

@ -15,10 +15,14 @@ func _ready():
func _process(delta): func _process(delta):
#Scroll screen when player is on different sector #Scroll screen when player is on different sector
current_sector = (player.global_position / resolution).floor() current_sector = (player.global_position / resolution).floor()
if current_sector != last_sector: if scroll_h && current_sector.x != last_sector.x:
Game.respawn_point = player.global_position + Vector2(8,0) Game.respawn_point = player.global_position + Vector2(8,0) # Set respawn point
if scroll_h: position.x = current_sector.x * resolution.x position.x = current_sector.x * resolution.x # Move camera
if scroll_v: position.y = current_sector.y * resolution.y last_sector = current_sector
Game.current_sector = current_sector
if scroll_v && current_sector.y != last_sector.y:
Game.respawn_point = player.global_position + Vector2(0,-8) # Set respawn point
position.y = current_sector.y * resolution.y # Move camera
last_sector = current_sector last_sector = current_sector
Game.current_sector = current_sector Game.current_sector = current_sector

3
objects/player/player.gd
View file

@ -32,6 +32,9 @@ onready var deathtiles = map.get_node("Death")
##Preload ##Preload
var pre_arrow = preload("res://objects/player/arrow_projectile.tscn") var pre_arrow = preload("res://objects/player/arrow_projectile.tscn")
#Set initial respawn point
func _ready():
Game.respawn_point = global_position
func _physics_process(delta): func _physics_process(delta):
axis = Vector2(Input.get_axis("ui_left","ui_right"),Input.get_axis("ui_up","ui_down")) axis = Vector2(Input.get_axis("ui_left","ui_right"),Input.get_axis("ui_up","ui_down"))