Skip to content

Commit

Permalink
Fisrt Prototype
Browse files Browse the repository at this point in the history
  • Loading branch information
TheKingOfShadows98 committed Jun 10, 2022
1 parent 8f001d6 commit 283c45d
Show file tree
Hide file tree
Showing 29 changed files with 631 additions and 18 deletions.
1 change: 1 addition & 0 deletions Proyect/AutoLoads/Data.gd
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ extends Node

var field_dimsx = Vector2(70, 70 + 880)
var field_dimsy = Vector2(78, 78 + 440)
var score = Vector2(0,0)

var PlayerInputs=[
{
Expand Down
14 changes: 14 additions & 0 deletions Proyect/AutoLoads/Globals.gd
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,18 @@ extends Node
var game
var score_board
var goalAnim
var main_scene
var timescale:float = 1
var in_match:bool = false

func on_match_start():
yield(get_tree().create_timer(1),"timeout")
in_match = true

func on_match_end():
in_match = false

func _ready():
Signals.connect("on_match_start",self,"on_match_start")
Signals.connect("on_match_end",self,"on_match_end")
pass
5 changes: 5 additions & 0 deletions Proyect/AutoLoads/Signals.gd
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,8 @@ extends Node
signal add_goal(team)
signal on_goal()
signal on_match_start()
signal on_match_end()
signal on_resume()
signal on_pause()
signal on_transition()
signal start_versus()
2 changes: 1 addition & 1 deletion Proyect/Components/Ball/Ball.gd
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ func _process(delta):
timestamp = OS.get_unix_time()

func _physics_process(delta):
if(!Globals.in_match): return
var speed = linear_velocity.x
var sprite = $CollisionShape2D/Sprite
var rotation = rotation_speed * speed * delta
sprite.transform = sprite.transform.rotated(rotation)

func make_strike(force ):
print(last_player_touched)
linear_velocity += force
linear_velocity = Vector2(clamp(linear_velocity.x, -450, 450), clamp(linear_velocity.y, -450, 450))

Expand Down
8 changes: 5 additions & 3 deletions Proyect/Components/Characters/MainCharacter.gd
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ func pass_ball(target:Node2D):
func _ready():
_played_ndicator = $Sprite/PlayableIndicator
Signals.connect("on_goal",self,"on_goal")
Signals.connect("on_match_start",self,"on_match_start")
Signals.connect("on_resume",self,"on_resume")
_played_ndicator.visible = is_controlled
_original_position = position;
_target_move = Data.get_random_field_coord()
$AnimationPlayer.play("Idle")
Expand All @@ -61,7 +62,7 @@ func _ready():


func _physics_process(delta):

if(!Globals.in_match): return
if !is_controlled: _auto_target()
_base_physics(_set_delta(delta))

Expand All @@ -78,6 +79,7 @@ func _base_physics(delta):
_machine_move(delta)

func _process(_delta):
if(!Globals.in_match): return
_played_ndicator.visible = is_controlled
if not active: return
$AnimationPlayer.playback_speed = Globals.timescale
Expand Down Expand Up @@ -152,7 +154,7 @@ func on_goal():
_ia_active = false
reset_position()

func on_match_start():
func on_resume():
_ia_active = true

# Movement
Expand Down
Binary file added Proyect/Components/Sprites/Temp_Title.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions Proyect/Components/Sprites/Temp_Title.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="StreamTexture"
path="res://.import/Temp_Title.png-cc07282401aaa9d16ba857b8de47962b.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Components/Sprites/Temp_Title.png"
dest_files=[ "res://.import/Temp_Title.png-cc07282401aaa9d16ba857b8de47962b.stex" ]

[params]

compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0
31 changes: 31 additions & 0 deletions Proyect/Components/UI/EndMatchUI/EndMatchUI.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
extends Control

onready var animation = get_node("Animation")
onready var result_label = get_node("Panel/ResultLabel")
onready var winner_label = get_node("Panel/WinnerLabel")
onready var wistle_sound = get_node("WistleSound")
# Called when the node enters the scene tree for the first time.
func _ready():
Signals.connect("on_match_end",self,"on_match_end")
pass # Replace with function body.

func on_match_end():
animation.play("OpenWinBoard")
result_label.text = str("P1 ",Data.score.x, " - ", Data.score.y, " P2")
var winner = "P1"
if Data.score.y > Data.score.x : winner = "P2"
else: if Data.score.y == Data.score.x : winner = "Tie"
winner_label.text = str("Winner: ", winner)
wistle_sound.play()
pass




func _on_BackMainMenu_button_down():
animation.play("CloseEndMatch")
Signals.emit_signal("on_transition")
yield(get_tree().create_timer(1.1),"timeout")
Globals.main_scene.show_main_menu()

pass # Replace with function body.
191 changes: 191 additions & 0 deletions Proyect/Components/UI/EndMatchUI/EndMatchUI.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
[gd_scene load_steps=9 format=2]

[ext_resource path="res://Fonts/Theme1.tres" type="Theme" id=1]
[ext_resource path="res://Fonts/Roboto Slab/RobotoMono-VariableFont_wght.ttf" type="DynamicFontData" id=2]
[ext_resource path="res://Sounds/whistle_sfx.ogg" type="AudioStream" id=3]
[ext_resource path="res://Components/UI/EndMatchUI/EndMatchUI.gd" type="Script" id=4]

[sub_resource type="DynamicFont" id=1]
size = 48
font_data = ExtResource( 2 )

[sub_resource type="Animation" id=4]
resource_name = "CloseEndMatch"
length = 1.5
tracks/0/type = "value"
tracks/0/path = NodePath("Panel:margin_bottom")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 1.5 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 1,
"values": [ 0.0, -751.0 ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("Panel:margin_top")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0, 1.5 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 1,
"values": [ 0.0, -751.0 ]
}

[sub_resource type="Animation" id=2]
resource_name = "OpenWinBoard"
length = 1.5
tracks/0/type = "value"
tracks/0/path = NodePath("Panel:margin_bottom")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 1.5 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ -780.0, 0.0 ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("Panel:margin_top")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0, 1.5 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ -780.0, 0.0 ]
}
tracks/2/type = "value"
tracks/2/path = NodePath("Panel/BackMainMenu:disabled")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/keys = {
"times": PoolRealArray( 0, 1.5 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 1,
"values": [ true, false ]
}

[sub_resource type="Animation" id=3]
length = 0.001
tracks/0/type = "value"
tracks/0/path = NodePath("Panel:margin_bottom")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ -723.0 ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("Panel:margin_top")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ -723.0 ]
}
tracks/2/type = "value"
tracks/2/path = NodePath("Panel/BackMainMenu:disabled")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ true ]
}

[node name="EndMatchUI" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( 4 )

[node name="Panel" type="Panel" parent="."]
anchor_left = 0.2
anchor_top = 0.1
anchor_right = 0.875
anchor_bottom = 0.9
margin_top = -723.0
margin_bottom = -723.0
theme = ExtResource( 1 )

[node name="Title Label" type="Label" parent="Panel"]
anchor_right = 1.0
anchor_bottom = 0.158
margin_bottom = 0.159996
custom_colors/font_color = Color( 1, 0.831373, 0.0627451, 1 )
custom_fonts/font = SubResource( 1 )
text = "Result"
align = 1
valign = 1

[node name="ResultLabel" type="Label" parent="Panel"]
anchor_top = 0.187
anchor_right = 1.0
anchor_bottom = 0.346
margin_top = 0.239998
margin_bottom = -0.0800018
custom_colors/font_color = Color( 1, 0.831373, 0.0627451, 1 )
custom_fonts/font = SubResource( 1 )
text = "P1 0 - 0 P2"
align = 1
valign = 1

[node name="WinnerLabel" type="Label" parent="Panel"]
anchor_top = 0.46
anchor_right = 1.0
anchor_bottom = 0.619
margin_top = 0.199997
margin_bottom = -0.119995
custom_colors/font_color = Color( 1, 0.831373, 0.0627451, 1 )
custom_fonts/font = SubResource( 1 )
text = "Winner: P1"
align = 1
valign = 1

[node name="BackMainMenu" type="Button" parent="Panel"]
anchor_top = 0.842
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = -0.160034
margin_right = -0.400024
disabled = true

[node name="ButtonLabel" type="Label" parent="Panel/BackMainMenu"]
anchor_right = 1.0
anchor_bottom = 1.0
theme = ExtResource( 1 )
text = "Back to main menu"
align = 1
valign = 1

[node name="WistleSound" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 3 )

[node name="Animation" type="AnimationPlayer" parent="."]
anims/CloseEndMatch = SubResource( 4 )
anims/OpenWinBoard = SubResource( 2 )
anims/RESET = SubResource( 3 )

[connection signal="button_down" from="Panel/BackMainMenu" to="." method="_on_BackMainMenu_button_down"]
22 changes: 22 additions & 0 deletions Proyect/Components/UI/MainMenu/MainMenu.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
extends Control


# Declare member variables here. Examples:
# var a = 2
# var b = "text"


# Called when the node enters the scene tree for the first time.
func _ready():
Globals.in_match = false


func _on_Exit_button_down():
get_tree().quit()
pass # Replace with function body.


func _on_Versus_button_down():
Signals.emit_signal("start_versus");
Globals.in_match = false
pass # Replace with function body.
Loading

0 comments on commit 283c45d

Please sign in to comment.