character switch
This commit is contained in:
parent
d21d95ec86
commit
9391847aea
23 changed files with 692 additions and 112 deletions
|
|
@ -13,26 +13,26 @@ func _ready():
|
|||
add_child(sfx1)
|
||||
if Global.debug:
|
||||
level = load(Global.places[Global.dplace[0]][Global.dplace[1]][Global.dplace[2]][0]).instantiate()
|
||||
player = load(Global.pchars[Global.dcpchar]).instantiate()
|
||||
musictrack = Global.musictracks[Global.places[Global.dplace[0]][Global.dplace[1]][Global.dplace[2]][3]]
|
||||
isboss = Global.places[Global.dplace[0]][Global.dplace[1]][Global.dplace[2]][4]
|
||||
#player = load(Global.pchars[Global.dcpchar]).instantiate()
|
||||
musictrack = Global.musictracks[Global.places[Global.dplace[0]][Global.dplace[1]][Global.dplace[2]][1]]
|
||||
isboss = Global.places[Global.dplace[0]][Global.dplace[1]][Global.dplace[2]][2]
|
||||
else:
|
||||
level = load(Global.places[Global.cplace[0]][Global.cplace[1]][Global.cplace[2]][0]).instantiate()
|
||||
player = load(Global.pchars[Global.cpchar]).instantiate()
|
||||
musictrack = Global.musictracks[Global.places[Global.cplace[0]][Global.cplace[1]][Global.cplace[2]][3]]
|
||||
isboss = Global.places[Global.cplace[0]][Global.cplace[1]][Global.cplace[2]][4]
|
||||
if Global.cspawnarea[0] != null && Global.cspawnarea[0] != null:
|
||||
player.position.x = Global.cspawnarea[0]
|
||||
player.position.y = Global.cspawnarea[1]
|
||||
elif Global.debug:
|
||||
player.position.x = Global.places[Global.dplace[0]][Global.dplace[1]][Global.dplace[2]][1]
|
||||
player.position.y = Global.places[Global.dplace[0]][Global.dplace[1]][Global.dplace[2]][2]
|
||||
else:
|
||||
player.position.x = Global.places[Global.cplace[0]][Global.cplace[1]][Global.cplace[2]][1]
|
||||
player.position.y = Global.places[Global.cplace[0]][Global.cplace[1]][Global.cplace[2]][2]
|
||||
# player = load(Global.pchars[Global.cpchar]).instantiate()
|
||||
musictrack = Global.musictracks[Global.places[Global.cplace[0]][Global.cplace[1]][Global.cplace[2]][1]]
|
||||
isboss = Global.places[Global.cplace[0]][Global.cplace[1]][Global.cplace[2]][2]
|
||||
#if Global.cspawnarea[0] != null && Global.cspawnarea[0] != null:
|
||||
# player.position.x = Global.cspawnarea[0]
|
||||
# player.position.y = Global.cspawnarea[1]
|
||||
#elif Global.debug:
|
||||
# player.position.x = Global.places[Global.dplace[0]][Global.dplace[1]][Global.dplace[2]][1]
|
||||
# player.position.y = Global.places[Global.dplace[0]][Global.dplace[1]][Global.dplace[2]][2]
|
||||
#else:
|
||||
# player.position.x = Global.places[Global.cplace[0]][Global.cplace[1]][Global.cplace[2]][1]
|
||||
# player.position.y = Global.places[Global.cplace[0]][Global.cplace[1]][Global.cplace[2]][2]
|
||||
music = load(musictrack)
|
||||
get_tree().root.add_child.call_deferred(level)
|
||||
get_tree().root.add_child.call_deferred(player)
|
||||
#get_tree().root.add_child.call_deferred(player)
|
||||
bgsound.stream = music
|
||||
if isboss:
|
||||
sfx1.stream = load(Global.sfxtracks[1])
|
||||
|
|
@ -46,7 +46,7 @@ func _process(delta):
|
|||
Global.xm = 0
|
||||
Global.ym = 0
|
||||
var velocity = Vector2.ZERO
|
||||
if Global.live == 1:
|
||||
if Global.live == 1 && !Input.is_key_pressed(KEY_V) && !Input.is_joy_button_pressed(0,JOY_BUTTON_RIGHT_SHOULDER):
|
||||
if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2:
|
||||
Global.xm = Input.get_joy_axis(0,JOY_AXIS_LEFT_X)
|
||||
Global.ym = Input.get_joy_axis(0,JOY_AXIS_LEFT_Y)
|
||||
|
|
@ -59,7 +59,7 @@ func _process(delta):
|
|||
Global.ym = -1
|
||||
if Input.is_action_pressed("ui_down"):
|
||||
Global.ym = 1
|
||||
velocity = (Vector2.RIGHT.rotated(rotation) * -100 * Global.xm * delta)-Vector2.UP.rotated(rotation) * -100 * Global.ym * delta
|
||||
#velocity = (Vector2.RIGHT.rotated(rotation) * -100 * Global.xm * delta)-Vector2.UP.rotated(rotation) * -100 * Global.ym * delta
|
||||
|
||||
func _input(event):
|
||||
if Input.is_key_pressed(KEY_ESCAPE) || Input.is_joy_button_pressed(0,JOY_BUTTON_BACK):
|
||||
|
|
@ -70,3 +70,31 @@ func _input(event):
|
|||
get_tree().change_scene_to_file("res://levels/ui/scene.tscn")
|
||||
else:
|
||||
get_tree().change_scene_to_file("res://title.tscn")
|
||||
if (Input.is_key_pressed(KEY_V) && Input.is_key_pressed(KEY_UP)) ||(Input.is_joy_button_pressed(0,JOY_BUTTON_RIGHT_SHOULDER) && Input.is_joy_button_pressed(0,JOY_BUTTON_DPAD_UP)):
|
||||
if Global.debug:
|
||||
if Global.dparty[0] != null:
|
||||
Global.dcpchar = 0
|
||||
else:
|
||||
if Global.party[0] != null:
|
||||
Global.cpchar = 0
|
||||
elif (Input.is_key_pressed(KEY_V) && Input.is_key_pressed(KEY_RIGHT)) ||(Input.is_joy_button_pressed(0,JOY_BUTTON_RIGHT_SHOULDER) && Input.is_joy_button_pressed(0,JOY_BUTTON_DPAD_RIGHT)):
|
||||
if Global.debug:
|
||||
if Global.dparty[1] != null:
|
||||
Global.dcpchar = 1
|
||||
else:
|
||||
if Global.party[1] != null:
|
||||
Global.cpchar = 1
|
||||
elif (Input.is_key_pressed(KEY_V) && Input.is_key_pressed(KEY_DOWN)) ||(Input.is_joy_button_pressed(0,JOY_BUTTON_RIGHT_SHOULDER) && Input.is_joy_button_pressed(0,JOY_BUTTON_DPAD_DOWN)):
|
||||
if Global.debug:
|
||||
if Global.dparty[2] != null:
|
||||
Global.dcpchar = 2
|
||||
else:
|
||||
if Global.party[2] != null:
|
||||
Global.cpchar = 2
|
||||
elif (Input.is_key_pressed(KEY_V) && Input.is_key_pressed(KEY_LEFT)) ||(Input.is_joy_button_pressed(0,JOY_BUTTON_RIGHT_SHOULDER) && Input.is_joy_button_pressed(0,JOY_BUTTON_DPAD_LEFT)):
|
||||
if Global.debug:
|
||||
if Global.dparty[3] != null:
|
||||
Global.dcpchar = 3
|
||||
else:
|
||||
if Global.party[3] != null:
|
||||
Global.cpchar = 3
|
||||
|
|
|
|||
|
|
@ -52,7 +52,19 @@ func _on_testspawn_pressed():
|
|||
get_tree().change_scene_to_file("res://levels/ui/gameplay.tscn")
|
||||
|
||||
|
||||
func _on_testboss_pressed():
|
||||
func _on_lilytest_pressed():
|
||||
Global.dplace = [0, 1, 1]
|
||||
Global.live = 1
|
||||
get_tree().change_scene_to_file("res://levels/ui/gameplay.tscn")
|
||||
|
||||
|
||||
func _on_dialogtest_pressed():
|
||||
Global.dplace = [0, 2, 0]
|
||||
Global.live = 1
|
||||
get_tree().change_scene_to_file("res://levels/ui/gameplay.tscn")
|
||||
|
||||
|
||||
func _on_bullethell_pressed():
|
||||
Global.dplace = [0, 1, 0]
|
||||
Global.live = 1
|
||||
get_tree().change_scene_to_file("res://levels/ui/gameplay.tscn")
|
||||
|
|
|
|||
|
|
@ -57,13 +57,26 @@ theme_override_font_sizes/font_size = 32
|
|||
theme_override_styles/focus = SubResource("StyleBoxFlat_6u0xs")
|
||||
text = "Test Spawn"
|
||||
|
||||
[node name="Testboss" type="Button" parent="VBoxContainer"]
|
||||
[node name="Lilytest" type="Button" parent="VBoxContainer"]
|
||||
layout_mode = 2
|
||||
theme_override_font_sizes/font_size = 32
|
||||
theme_override_styles/focus = SubResource("StyleBoxFlat_6u0xs")
|
||||
text = "Test Boss
|
||||
text = "Test Boss (Lily)
|
||||
"
|
||||
|
||||
[node name="Dialogtest" type="Button" parent="VBoxContainer"]
|
||||
layout_mode = 2
|
||||
theme_override_font_sizes/font_size = 32
|
||||
theme_override_styles/focus = SubResource("StyleBoxFlat_6u0xs")
|
||||
text = "Dialog Test
|
||||
"
|
||||
|
||||
[node name="Bullethell" type="Button" parent="VBoxContainer"]
|
||||
layout_mode = 2
|
||||
theme_override_font_sizes/font_size = 32
|
||||
theme_override_styles/focus = SubResource("StyleBoxFlat_6u0xs")
|
||||
text = "Bullet hell test (Natasha)"
|
||||
|
||||
[node name="Credits" type="Button" parent="VBoxContainer"]
|
||||
layout_mode = 2
|
||||
theme_override_font_sizes/font_size = 32
|
||||
|
|
@ -87,5 +100,7 @@ layout_mode = 1
|
|||
|
||||
[connection signal="finished" from="nebula" to="nebula" method="_on_finished"]
|
||||
[connection signal="pressed" from="VBoxContainer/Testspawn" to="." method="_on_testspawn_pressed"]
|
||||
[connection signal="pressed" from="VBoxContainer/Testboss" to="." method="_on_testboss_pressed"]
|
||||
[connection signal="pressed" from="VBoxContainer/Lilytest" to="." method="_on_lilytest_pressed"]
|
||||
[connection signal="pressed" from="VBoxContainer/Dialogtest" to="." method="_on_dialogtest_pressed"]
|
||||
[connection signal="pressed" from="VBoxContainer/Bullethell" to="." method="_on_bullethell_pressed"]
|
||||
[connection signal="pressed" from="VBoxContainer/Back" to="." method="_on_back_pressed"]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue