OverviewFilesCommitsIssuesDocsReleasesPeers

hyper-godot4-test commits / c95aaea

fsdgfdhgg
c95aaeaaf4bafa28f18208bc8055409b6cffcc08
by Dresk Spidflisk <dreskspidflisk@gmail.com> · 2022-04-18T20:32:56.000Z

Changed files (4) +7 -7

game/map_decorations/teleporter.gd +3 -3
……@@ -22,12 +22,12 @@ func tryMapChange(mapChangeName : String, sendGossip : bool, playerNode):
2222 var mapCurrentName = playerNode.currentMap.map_name
2323 var mapNode = null
2424 if(mapCurrentName != teleportation_destination):
25 if(mapChangeName == "map_test"):
26 mapNode = mapsNode.get_node("map_test")
27 elif(mapChangeName == "map_cyber"):
25 if(mapChangeName == "map_cyber"):
2826 mapNode = mapsNode.get_node("map_cyber")
2927 elif(mapChangeName == "map_cyber1"):
3028 mapNode = mapsNode.get_node("map_cyber1")
29 else:
30 mapNode = mapsNode.get_node("map_test")
3131 # Find a Respawn Point
3232 playerNode.currentSpawnLocation = playerNode.getSpawnLocationForMapName(mapChangeName)
3333 playerNode.currentMap = mapNode
game/player/player_animation_tree.tres +1 -1
……@@ -187,4 +187,4 @@ nodes/walk_scale/node = SubResource( "AnimationNodeTimeScale_bvg56" )
187187nodes/walk_scale/position = Vector2(-640, 360)
188188nodes/wall_run/node = SubResource( "AnimationNodeTransition_ur2dc" )
189189nodes/wall_run/position = Vector2(720, -60)
190node_connections = [&"output", 0, &"wall_run", &"roll", 0, &"air_transition", &"roll", 1, &"roll_scale", &"iwr_blend", 0, &"Animation 2", &"iwr_blend", 1, &"walk_scale", &"iwr_blend", 2, &"run_scale", &"falling_scale", 0, &"Animation 7", &"TimeScale 3", 0, &"strafe", &"Blend2 2", 0, &"Animation 12", &"Blend2 2", 1, &"Animation 10", &"air_transition", 0, &"air_blend", &"air_transition", 1, &"aim_transition", &"aim_transition", 0, &"TimeScale 3", &"aim_transition", 1, &"iwr_blend", &"jump_scale", 0, &"Animation 6", &"Blend2", 0, &"Animation 8", &"Blend2", 1, &"Animation 9", &"landing_scale", 0, &"Animation 3", &"air_blend", 0, &"jump_scale", &"air_blend", 1, &"falling_scale", &"air_blend", 2, &"landing_scale", &"roll_scale", 0, &"Animation", &"wall_run", 0, &"Blend2", &"wall_run", 1, &"Blend2 2", &"wall_run", 2, &"roll", &"walk_scale", 0, &"Animation 4", &"run_scale", 0, &"Animation 5"]
190node_connections = [&"output", 0, &"wall_run", &"roll", 0, &"air_transition", &"roll", 1, &"roll_scale", &"jump_scale", 0, &"Animation 6", &"roll_scale", 0, &"Animation", &"run_scale", 0, &"Animation 5", &"air_transition", 0, &"air_blend", &"air_transition", 1, &"aim_transition", &"walk_scale", 0, &"Animation 4", &"wall_run", 0, &"Blend2", &"wall_run", 1, &"Blend2 2", &"wall_run", 2, &"roll", &"air_blend", 0, &"jump_scale", &"air_blend", 1, &"falling_scale", &"air_blend", 2, &"landing_scale", &"falling_scale", 0, &"Animation 7", &"Blend2", 0, &"Animation 8", &"Blend2", 1, &"Animation 9", &"landing_scale", 0, &"Animation 3", &"Blend2 2", 0, &"Animation 12", &"Blend2 2", 1, &"Animation 10", &"TimeScale 3", 0, &"strafe", &"aim_transition", 0, &"TimeScale 3", &"aim_transition", 1, &"iwr_blend", &"iwr_blend", 0, &"Animation 2", &"iwr_blend", 1, &"walk_scale", &"iwr_blend", 2, &"run_scale"]
game/player/player_core.gd +1 -1
……@@ -108,7 +108,7 @@ func getSpawnLocationForMapName(mapName : String) -> Vector3:
108108 # Get Map Node
109109 var mapNodes = get_tree().get_current_scene().get_node("Maps").find_nodes(mapName, "", true, false)
110110 if(mapNodes == null or mapNodes.size() == 0):
111 return get_tree().get_current_scene().get_node("Maps").find_nodes("map_test", "", true, false)[0].getSpawnLocation()
111 return get_tree().get_current_scene().get_node("Maps").get_node("map_test").getSpawnLocation()
112112 else:
113113 return mapNodes[0].getSpawnLocation()
114114
main.gd +2 -2
……@@ -1,7 +1,7 @@
11extends Node
22
3@onready var map_test_environment = preload("res://assets/maps/map_test/map_test_environment.scn")
4# @onready var map_cyber_environment = preload("res://assets/maps/map_cyber/map_cyber_environment.scn")
3@onready var map_test_environment = preload("res://game/maps/map_test/map_test.tscn")
4@onready var map_cyber_environment = preload("res://game/maps/map_cyber/map_cyber.tscn")
55# @onready var map_cyber1_environment = preload("res://assets/maps/map_cyber1/map_cyber1_environment.scn")
66
77func _ready():