added voice acting credit and scoring

This commit is contained in:
zoe 2021-09-29 15:07:06 +02:00
parent 5503c2d05a
commit ad8de1dbb7
41 changed files with 323 additions and 57 deletions

View file

@ -11,6 +11,7 @@ func make_green():
func explode():
if can_be_destroyed:
$ScoreCounter.trigger()
spawn_hit_particles(particle_emitting_direction)
queue_free()

View file

@ -1,9 +1,10 @@
[gd_scene load_steps=8 format=2]
[gd_scene load_steps=9 format=2]
[ext_resource path="res://Pegs/Green/bar.png" type="Texture" id=1]
[ext_resource path="res://Pegs/Green/GreenBar.gd" type="Script" id=2]
[ext_resource path="res://Pegs/Green/GraceTimer.tscn" type="PackedScene" id=3]
[ext_resource path="res://Pegs/Green/HitSFX.tscn" type="PackedScene" id=4]
[ext_resource path="res://Pegs/ScoreCounter.tscn" type="PackedScene" id=5]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 16, 3 )
@ -47,4 +48,6 @@ shape = SubResource( 2 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
anims/spawn = SubResource( 3 )
[node name="ScoreCounter" parent="." instance=ExtResource( 5 )]
[connection signal="timeout" from="GraceTimer" to="." method="_on_GraceTimer_timeout"]

View file

@ -9,6 +9,7 @@ func make_green():
func explode():
if(can_be_exploded):
$ScoreCounter.trigger()
spawn_hit_particles(particle_emitting_direction)
queue_free()

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=2]
[gd_scene load_steps=10 format=2]
[ext_resource path="res://Pegs/Green/green.png" type="Texture" id=1]
[ext_resource path="res://Pegs/Green/GreenPeg.gd" type="Script" id=2]
@ -6,6 +6,7 @@
[ext_resource path="res://Pegs/DefaultPegCollisionShape.tscn" type="PackedScene" id=4]
[ext_resource path="res://Pegs/Green/GreenPegAnimationPlayer.gd" type="Script" id=5]
[ext_resource path="res://Pegs/Green/HitSFX.tscn" type="PackedScene" id=6]
[ext_resource path="res://Pegs/ScoreCounter.tscn" type="PackedScene" id=7]
[sub_resource type="PhysicsMaterial" id=1]
@ -43,4 +44,6 @@ script = ExtResource( 5 )
[node name="GraceTimer" parent="." instance=ExtResource( 3 )]
[node name="ScoreCounter" parent="." instance=ExtResource( 7 )]
[connection signal="timeout" from="GraceTimer" to="." method="_on_GraceTimer_timeout"]

View file

@ -16,6 +16,9 @@ func make_green():
var main = get_tree().current_scene
main.add_child(green_peg)
# add score
$ScoreCounter.trigger()
#finally delete the old peg
GameStats.pinks_left -= 1
GameStats.add_to_multiplier()

View file

@ -1,8 +1,9 @@
[gd_scene load_steps=6 format=2]
[gd_scene load_steps=7 format=2]
[ext_resource path="res://Pegs/Pink/PinkPeg.gd" type="Script" id=1]
[ext_resource path="res://Pegs/DefaultPegCollisionShape.tscn" type="PackedScene" id=2]
[ext_resource path="res://Pegs/Pink/Pink.png" type="Texture" id=3]
[ext_resource path="res://Pegs/ScoreCounter.tscn" type="PackedScene" id=4]
[sub_resource type="CircleShape2D" id=1]
radius = 10.2018
@ -36,6 +37,9 @@ collision_mask = 4
[node name="CollisionShape2D" type="CollisionShape2D" parent="LastPegCollision"]
shape = SubResource( 2 )
[node name="ScoreCounter" parent="." instance=ExtResource( 4 )]
base_score = 10
[connection signal="body_entered" from="RegularCollision" to="." method="_on_Area2D_body_entered"]
[connection signal="body_exited" from="RegularCollision" to="." method="_on_Area2D_body_exited"]
[connection signal="timeout" from="SlowmoTimer" to="." method="_on_Timer_timeout"]

View file

@ -8,6 +8,8 @@ func make_green():
green_bar.global_position = global_position
green_bar.global_rotation = global_rotation
$ScoreCounter.trigger()
main.add_child(green_bar)
GameStats.add_to_multiplier()
queue_free()

View file

@ -1,7 +1,8 @@
[gd_scene load_steps=6 format=2]
[gd_scene load_steps=7 format=2]
[ext_resource path="res://Pegs/Purple/PurpleBar.gd" type="Script" id=1]
[ext_resource path="res://Pegs/Purple/bar.png" type="Texture" id=2]
[ext_resource path="res://Pegs/ScoreCounter.tscn" type="PackedScene" id=3]
[sub_resource type="PhysicsMaterial" id=1]
friction = 5.0
@ -25,3 +26,5 @@ shape = SubResource( 2 )
[node name="CollisionShape2D2" type="CollisionShape2D" parent="."]
shape = SubResource( 3 )
[node name="ScoreCounter" parent="." instance=ExtResource( 3 )]

View file

@ -10,6 +10,10 @@ func make_green():
# green_peg.rotation = rotation + 5
green_peg.global_position = global_position
# add score
$ScoreCounter.trigger()
# get the main scene of current peg and add new peg to it
var main = get_tree().current_scene
main.add_child(green_peg)

View file

@ -1,8 +1,9 @@
[gd_scene load_steps=4 format=2]
[gd_scene load_steps=5 format=2]
[ext_resource path="res://Pegs/Purple/PurplePeg.gd" type="Script" id=1]
[ext_resource path="res://Pegs/Purple/purple.png" type="Texture" id=2]
[ext_resource path="res://Pegs/DefaultPegCollisionShape.tscn" type="PackedScene" id=3]
[ext_resource path="res://Pegs/ScoreCounter.tscn" type="PackedScene" id=4]
[node name="PurplePeg" type="StaticBody2D"]
collision_mask = 0
@ -12,3 +13,5 @@ script = ExtResource( 1 )
texture = ExtResource( 2 )
[node name="DefaultPegCollisionShape" parent="." instance=ExtResource( 3 )]
[node name="ScoreCounter" parent="." instance=ExtResource( 4 )]

25
Pegs/ScoreCounter.gd Normal file
View file

@ -0,0 +1,25 @@
extends Node2D
export var base_score = 1
func trigger():
add_score()
func add_score():
var score = base_score * GameStats.multiplier
GameStats.score += score
#Todo remove
print(GameStats.score)
var main = get_tree().current_scene
var Scorelabel = preload("res://Pegs/ScoreLabel.tscn")
var scorelabel = Scorelabel.instance()
main.add_child(scorelabel)
scorelabel.global_position = global_position
scorelabel.trigger(String(score))
func delete():
queue_free()

6
Pegs/ScoreCounter.tscn Normal file
View file

@ -0,0 +1,6 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://Pegs/ScoreCounter.gd" type="Script" id=1]
[node name="ScoreCounter" type="Node2D"]
script = ExtResource( 1 )

12
Pegs/ScoreLabel.gd Normal file
View file

@ -0,0 +1,12 @@
extends Node2D
func trigger(display_text):
$Node2D.global_position = global_position
$Node2D/Label.text = String(display_text)
$Node2D/Label.visible = true
$AnimationPlayer.play("move_up")
func delete():
queue_free()

56
Pegs/ScoreLabel.tscn Normal file
View file

@ -0,0 +1,56 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Menu/Theme.tres" type="Theme" id=1]
[ext_resource path="res://Pegs/ScoreLabel.gd" type="Script" id=2]
[sub_resource type="Animation" id=1]
resource_name = "move_up"
tracks/0/type = "method"
tracks/0/path = NodePath(".")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 1 ),
"transitions": PoolRealArray( 1 ),
"values": [ {
"args": [ ],
"method": "delete"
} ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("Node2D:position")
tracks/1/interp = 2
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0, 0.5, 1 ),
"transitions": PoolRealArray( 1, 1, 1 ),
"update": 0,
"values": [ Vector2( 0, 0 ), Vector2( 0, -60 ), Vector2( 0, -64 ) ]
}
[node name="ScoreLabel" type="Node2D"]
z_index = 1000
script = ExtResource( 2 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
anims/move_up = SubResource( 1 )
[node name="Node2D" type="Node2D" parent="."]
[node name="Label" type="Label" parent="Node2D"]
margin_left = -0.010148
margin_top = 0.00656128
margin_right = 39.9899
margin_bottom = 18.0066
size_flags_horizontal = 3
size_flags_vertical = 5
theme = ExtResource( 1 )
text = "69"
max_lines_visible = 1
__meta__ = {
"_edit_use_anchors_": false
}