This commit is contained in:
2022-12-11 02:19:40 +01:00
parent a852fe8894
commit 0d9acc5f47
11 changed files with 36 additions and 200 deletions

View File

@@ -156,7 +156,7 @@ func approach():
tween.tween_property(p1_train, "position", Vector3(p1_train.position.x, p1_train.position.y, p2_train.position.z), 0.7)
else:
tween.tween_property(p2_train, "position", Vector3(p2_train.position.x, p2_train.position.y, p1_train.position.z), 0.7)
emit_signal("shoot")
tween.tween_callback(func(): emit_signal("shoot")).set_delay(0.5)
tween.tween_callback(fight).set_delay(1)
func fight():

View File

@@ -17,6 +17,7 @@ func _ready():
currentStashValue = 10
$Sprite3D2.texture = icon
$AudioStreamPlayer.stream = audioClip
$Sprite3D2.visible = false
func interact(player):
if currentStashValue >= 1:

View File

@@ -24,104 +24,7 @@ var rng = RandomNumberGenerator.new()
func _ready():
walking = "walking"
idle = "idle"
#get_parent().find_child("CharacterBody3D").find_child("MiniGameButton0").hide()
#get_parent().find_child("CharacterBody3D").find_child("MiniGameButton1").hide()
#get_parent().find_child("CharacterBody3D").find_child("MiniGameButton2").hide()
func miniGameColor(input: int, red: int):
if(input == 0):
$MiniGameButton0.modulate = Color(1,1,red)
if(input == 1):
$MiniGameButton1.modulate = Color(1,1,red)
if(input == 2):
$MiniGameButton2.modulate = Color(1,1,red)
if(input == 3):
$MiniGameButton3.modulate = Color(1,1,red)
if(input == 4):
$MiniGameButton4.modulate = Color(1,1,red)
if(input == 5):
$MiniGameButton5.modulate = Color(1,1,red)
func miniGameReset():
MiniGamePos = 0
if(is_player1):
miniGameColor(0,1)
miniGameColor(1,1)
miniGameColor(2,1)
MiniGame[0] = rng.randi_range(0, 3)
miniGameSetArrow(0)
MiniGame[1] = rng.randi_range(0, 3)
miniGameSetArrow(1)
MiniGame[2] = rng.randi_range(0, 3)
miniGameSetArrow(2)
else:
miniGameColor(3,1)
miniGameColor(4,1)
miniGameColor(5,1)
MiniGame[0] = rng.randi_range(0, 3)
miniGameSetArrow(3)
MiniGame[1] = rng.randi_range(0, 3)
miniGameSetArrow(4)
MiniGame[2] = rng.randi_range(0, 3)
miniGameSetArrow(5)
func miniGameSetArrow(buttonNr: int):
if(buttonNr == 0):
$MiniGameButton0.frame = 26 + MiniGame[0]
if(buttonNr == 1):
$MiniGameButton1.frame = 26 + MiniGame[1]
if(buttonNr == 2):
$MiniGameButton2.frame = 26 + MiniGame[2]
if(buttonNr == 3):
$MiniGameButton3.frame = 26 + MiniGame[0]
if(buttonNr == 4):
$MiniGameButton4.frame = 26 + MiniGame[1]
if(buttonNr == 5):
$MiniGameButton5.frame = 26 + MiniGame[2]
func miniGameCheck(input : int):
if(is_player1):
if(input == MiniGame[MiniGamePos]):
miniGameColor(MiniGamePos, 0)
MiniGamePos = MiniGamePos +1
else:
miniGameReset()
if(MiniGamePos >= 3):
$MiniGameButton0.hide()
$MiniGameButton1.hide()
$MiniGameButton2.hide()
P1inMiniGame = 0
miniGameReset()
else:
if(input == MiniGame[MiniGamePos]):
miniGameColor(MiniGamePos+3, 0)
MiniGamePos = MiniGamePos +1
else:
miniGameReset()
if(MiniGamePos >= 3):
$MiniGameButton3.hide()
$MiniGameButton4.hide()
$MiniGameButton5.hide()
P2inMiniGame = 0
miniGameReset()
func _process(delta):
if Input.is_action_just_pressed("p1_extra"):
if(P1inMiniGame == 0):
P1inMiniGame = 1
$MiniGameButton0.show()
$MiniGameButton1.show()
$MiniGameButton2.show()
if Input.is_action_just_pressed("p2_extra"):
if(P2inMiniGame == 0):
P2inMiniGame = 1
$MiniGameButton3.show()
$MiniGameButton4.show()
$MiniGameButton5.show()
func _physics_process(delta):
if(velocity.length() > 0):
@@ -144,44 +47,24 @@ func _physics_process(delta):
func check_input():
if is_player1:
if(!P1inMiniGame):
if Input.is_action_pressed("p1_left"):
movement.x -= 1
if Input.is_action_pressed("p1_right"):
movement.x += 1
if Input.is_action_pressed("p1_up"):
movement.z -= 1
if Input.is_action_pressed("p1_down"):
movement.z += 1
else:
if Input.is_action_just_pressed("p1_up"):
miniGameCheck(0)
if Input.is_action_just_pressed("p1_right"):
miniGameCheck(1)
if Input.is_action_just_pressed("p1_down"):
miniGameCheck(2)
if Input.is_action_just_pressed("p1_left"):
miniGameCheck(3)
if Input.is_action_pressed("p1_left"):
movement.x -= 1
if Input.is_action_pressed("p1_right"):
movement.x += 1
if Input.is_action_pressed("p1_up"):
movement.z -= 1
if Input.is_action_pressed("p1_down"):
movement.z += 1
else:
if(!P2inMiniGame):
if Input.is_action_pressed("p2_left"):
movement.x -= 1
if Input.is_action_pressed("p2_right"):
movement.x += 1
if Input.is_action_pressed("p2_up"):
movement.z -= 1
if Input.is_action_pressed("p2_down"):
movement.z += 1
else:
if Input.is_action_just_pressed("p2_up"):
miniGameCheck(0)
if Input.is_action_just_pressed("p2_right"):
miniGameCheck(1)
if Input.is_action_just_pressed("p2_down"):
miniGameCheck(2)
if Input.is_action_just_pressed("p2_left"):
miniGameCheck(3)
if Input.is_action_pressed("p2_left"):
movement.x -= 1
if Input.is_action_pressed("p2_right"):
movement.x += 1
if Input.is_action_pressed("p2_up"):
movement.z -= 1
if Input.is_action_pressed("p2_down"):
movement.z += 1
func check_interaction():
var action
if is_player1: