mirror of
https://github.com/PfandBoss/SemesterGameJam2022.git
synced 2025-11-12 12:16:14 +01:00
fixed minigame!
This commit is contained in:
@@ -170,6 +170,27 @@ hframes = 5
|
|||||||
vframes = 8
|
vframes = 8
|
||||||
frame = 26
|
frame = 26
|
||||||
|
|
||||||
|
[node name="MiniGameButton3" type="Sprite3D" parent="CharacterBody3D"]
|
||||||
|
transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, -50, 0)
|
||||||
|
texture = ExtResource("13_d8wle")
|
||||||
|
hframes = 5
|
||||||
|
vframes = 8
|
||||||
|
frame = 26
|
||||||
|
|
||||||
|
[node name="MiniGameButton4" type="Sprite3D" parent="CharacterBody3D"]
|
||||||
|
transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, -50, 0)
|
||||||
|
texture = ExtResource("13_d8wle")
|
||||||
|
hframes = 5
|
||||||
|
vframes = 8
|
||||||
|
frame = 26
|
||||||
|
|
||||||
|
[node name="MiniGameButton5" type="Sprite3D" parent="CharacterBody3D"]
|
||||||
|
transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, -50, 0)
|
||||||
|
texture = ExtResource("13_d8wle")
|
||||||
|
hframes = 5
|
||||||
|
vframes = 8
|
||||||
|
frame = 26
|
||||||
|
|
||||||
[node name="Storage" parent="." instance=ExtResource("4_5jw5g")]
|
[node name="Storage" parent="." instance=ExtResource("4_5jw5g")]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.31598, 0.0193453, -5.2771)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.31598, 0.0193453, -5.2771)
|
||||||
|
|
||||||
|
|||||||
@@ -154,27 +154,48 @@ animation = &"walking_giant"
|
|||||||
speed_scale = 2.0
|
speed_scale = 2.0
|
||||||
playing = true
|
playing = true
|
||||||
|
|
||||||
[node name="MiniGameButton0" type="Sprite3D" parent="CharacterBody3D"]
|
[node name="MiniGameButton3" type="Sprite3D" parent="CharacterBody3D"]
|
||||||
transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, 6, 0)
|
transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, 6, 0)
|
||||||
texture = ExtResource("14_otf4l")
|
texture = ExtResource("14_otf4l")
|
||||||
hframes = 5
|
hframes = 5
|
||||||
vframes = 8
|
vframes = 8
|
||||||
frame = 26
|
frame = 26
|
||||||
|
|
||||||
[node name="MiniGameButton1" type="Sprite3D" parent="CharacterBody3D"]
|
[node name="MiniGameButton4" type="Sprite3D" parent="CharacterBody3D"]
|
||||||
transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 1.5, 6, 0)
|
transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 1.5, 6, 0)
|
||||||
texture = ExtResource("14_otf4l")
|
texture = ExtResource("14_otf4l")
|
||||||
hframes = 5
|
hframes = 5
|
||||||
vframes = 8
|
vframes = 8
|
||||||
frame = 26
|
frame = 26
|
||||||
|
|
||||||
[node name="MiniGameButton2" type="Sprite3D" parent="CharacterBody3D"]
|
[node name="MiniGameButton5" type="Sprite3D" parent="CharacterBody3D"]
|
||||||
transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 3, 6, 0)
|
transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 3, 6, 0)
|
||||||
texture = ExtResource("14_otf4l")
|
texture = ExtResource("14_otf4l")
|
||||||
hframes = 5
|
hframes = 5
|
||||||
vframes = 8
|
vframes = 8
|
||||||
frame = 26
|
frame = 26
|
||||||
|
|
||||||
|
[node name="MiniGameButton0" type="Sprite3D" parent="CharacterBody3D"]
|
||||||
|
transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, -50, 0)
|
||||||
|
texture = ExtResource("14_otf4l")
|
||||||
|
hframes = 5
|
||||||
|
vframes = 8
|
||||||
|
frame = 26
|
||||||
|
|
||||||
|
[node name="MiniGameButton1" type="Sprite3D" parent="CharacterBody3D"]
|
||||||
|
transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, -50, 0)
|
||||||
|
texture = ExtResource("14_otf4l")
|
||||||
|
hframes = 5
|
||||||
|
vframes = 8
|
||||||
|
frame = 26
|
||||||
|
|
||||||
|
[node name="MiniGameButton2" type="Sprite3D" parent="CharacterBody3D"]
|
||||||
|
transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, -50, 0)
|
||||||
|
texture = ExtResource("14_otf4l")
|
||||||
|
hframes = 5
|
||||||
|
vframes = 8
|
||||||
|
frame = 26
|
||||||
|
|
||||||
[node name="Bin" parent="." instance=ExtResource("14_n2rwc")]
|
[node name="Bin" parent="." instance=ExtResource("14_n2rwc")]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.18577, 0.622175, 10.6544)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.18577, 0.622175, 10.6544)
|
||||||
|
|
||||||
|
|||||||
@@ -23,20 +23,33 @@ var rng = RandomNumberGenerator.new()
|
|||||||
func _ready():
|
func _ready():
|
||||||
walking = "walking"
|
walking = "walking"
|
||||||
idle = "idle"
|
idle = "idle"
|
||||||
get_parent().find_child("CharacterBody3D").find_child("MiniGameButton0").hide()
|
$MiniGameButton0.hide()
|
||||||
get_parent().find_child("CharacterBody3D").find_child("MiniGameButton1").hide()
|
$MiniGameButton1.hide()
|
||||||
get_parent().find_child("CharacterBody3D").find_child("MiniGameButton2").hide()
|
$MiniGameButton2.hide()
|
||||||
|
$MiniGameButton3.hide()
|
||||||
|
$MiniGameButton4.hide()
|
||||||
|
$MiniGameButton5.hide()
|
||||||
|
#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):
|
func miniGameColor(input: int, red: int):
|
||||||
if(input == 0):
|
if(input == 0):
|
||||||
get_parent().find_child("CharacterBody3D").find_child("MiniGameButton0").modulate = Color(1,1,red)
|
$MiniGameButton0.modulate = Color(1,1,red)
|
||||||
if(input == 1):
|
if(input == 1):
|
||||||
get_parent().find_child("CharacterBody3D").find_child("MiniGameButton1").modulate = Color(1,1,red)
|
$MiniGameButton1.modulate = Color(1,1,red)
|
||||||
if(input == 2):
|
if(input == 2):
|
||||||
get_parent().find_child("CharacterBody3D").find_child("MiniGameButton2").modulate = Color(1,1,red)
|
$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():
|
func miniGameReset():
|
||||||
MiniGamePos = 0
|
MiniGamePos = 0
|
||||||
|
if(is_player1):
|
||||||
miniGameColor(0,1)
|
miniGameColor(0,1)
|
||||||
miniGameColor(1,1)
|
miniGameColor(1,1)
|
||||||
miniGameColor(2,1)
|
miniGameColor(2,1)
|
||||||
@@ -46,19 +59,33 @@ func miniGameReset():
|
|||||||
miniGameSetArrow(1)
|
miniGameSetArrow(1)
|
||||||
MiniGame[2] = rng.randi_range(0, 3)
|
MiniGame[2] = rng.randi_range(0, 3)
|
||||||
miniGameSetArrow(2)
|
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):
|
func miniGameSetArrow(buttonNr: int):
|
||||||
if(buttonNr == 0):
|
if(buttonNr == 0):
|
||||||
get_parent().find_child("CharacterBody3D").find_child("MiniGameButton0").frame = 26 + MiniGame[0]
|
$MiniGameButton0.frame = 26 + MiniGame[0]
|
||||||
#$MiniGameButton0.frame = 26 + MiniGame[0]
|
|
||||||
if(buttonNr == 1):
|
if(buttonNr == 1):
|
||||||
get_parent().find_child("CharacterBody3D").find_child("MiniGameButton1").frame = 26 + MiniGame[1]
|
$MiniGameButton1.frame = 26 + MiniGame[1]
|
||||||
#$MiniGameButton1.frame = 26 + MiniGame[1]
|
|
||||||
if(buttonNr == 2):
|
if(buttonNr == 2):
|
||||||
get_parent().find_child("CharacterBody3D").find_child("MiniGameButton2").frame = 26 + MiniGame[2]
|
$MiniGameButton2.frame = 26 + MiniGame[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):
|
func miniGameCheck(input : int):
|
||||||
|
if(is_player1):
|
||||||
if(input == MiniGame[MiniGamePos]):
|
if(input == MiniGame[MiniGamePos]):
|
||||||
miniGameColor(MiniGamePos, 0)
|
miniGameColor(MiniGamePos, 0)
|
||||||
MiniGamePos = MiniGamePos +1
|
MiniGamePos = MiniGamePos +1
|
||||||
@@ -66,12 +93,22 @@ func miniGameCheck(input : int):
|
|||||||
miniGameReset()
|
miniGameReset()
|
||||||
|
|
||||||
if(MiniGamePos >= 3):
|
if(MiniGamePos >= 3):
|
||||||
get_parent().find_child("CharacterBody3D").find_child("MiniGameButton0").hide()
|
$MiniGameButton0.hide()
|
||||||
get_parent().find_child("CharacterBody3D").find_child("MiniGameButton1").hide()
|
$MiniGameButton1.hide()
|
||||||
get_parent().find_child("CharacterBody3D").find_child("MiniGameButton2").hide()
|
$MiniGameButton2.hide()
|
||||||
if(is_player1):
|
|
||||||
P1inMiniGame = 0
|
P1inMiniGame = 0
|
||||||
|
miniGameReset()
|
||||||
else:
|
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
|
P2inMiniGame = 0
|
||||||
miniGameReset()
|
miniGameReset()
|
||||||
|
|
||||||
@@ -79,9 +116,16 @@ func _process(delta):
|
|||||||
if Input.is_action_just_pressed("p1_extra"):
|
if Input.is_action_just_pressed("p1_extra"):
|
||||||
if(P1inMiniGame == 0):
|
if(P1inMiniGame == 0):
|
||||||
P1inMiniGame = 1
|
P1inMiniGame = 1
|
||||||
get_parent().find_child("CharacterBody3D").find_child("MiniGameButton0").show()
|
$MiniGameButton0.show()
|
||||||
get_parent().find_child("CharacterBody3D").find_child("MiniGameButton1").show()
|
$MiniGameButton1.show()
|
||||||
get_parent().find_child("CharacterBody3D").find_child("MiniGameButton2").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):
|
func _physics_process(delta):
|
||||||
if(velocity.length() > 0):
|
if(velocity.length() > 0):
|
||||||
|
|||||||
Reference in New Issue
Block a user