Skip to content

Commit

Permalink
Final Ludum Dare Commit. Bien joué les amis ! <3
Browse files Browse the repository at this point in the history
  • Loading branch information
furan0 committed Oct 2, 2023
1 parent 7ba9077 commit e1e7c3b
Show file tree
Hide file tree
Showing 7 changed files with 73 additions and 8 deletions.
5 changes: 2 additions & 3 deletions assets/defaultUiTheme.tres
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
[ext_resource type="StyleBox" uid="uid://buyqtt2u146cs" path="res://assets/flatBoxTexture.tres" id="1_bn2r4"]
[ext_resource type="FontFile" uid="uid://fn53c8yvt8d4" path="res://assets/fonts/Comicy.otf" id="1_ftnx0"]
[ext_resource type="FontFile" uid="uid://bbw0wvbc7ucxs" path="res://assets/fonts/Spicy Soup.otf" id="1_ml30x"]

[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_cjabj"]
[ext_resource type="StyleBox" uid="uid://b4nphew8nlnq2" path="res://assets/flatBoxTexture_activated.tres" id="2_u418o"]

[resource]
default_font = ExtResource("1_ftnx0")
default_font_size = 12
Button/colors/font_pressed_color = Color(0.613281, 0.230469, 0.230469, 1)
Button/styles/disabled = ExtResource("1_bn2r4")
Button/styles/focus = SubResource("StyleBoxTexture_cjabj")
Button/styles/focus = ExtResource("2_u418o")
Button/styles/hover = ExtResource("1_bn2r4")
Button/styles/normal = ExtResource("1_bn2r4")
Button/styles/pressed = ExtResource("1_bn2r4")
Expand Down
10 changes: 10 additions & 0 deletions assets/flatBoxTexture_activated.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://b4nphew8nlnq2"]

[ext_resource type="Texture2D" uid="uid://bp7cd4e06slca" path="res://assets/art/UI/panel_small_activated.png" id="1_2v5q2"]

[resource]
texture = ExtResource("1_2v5q2")
texture_margin_left = 31.8391
texture_margin_top = 38.0633
texture_margin_right = 31.121
texture_margin_bottom = 34.2331
45 changes: 45 additions & 0 deletions project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,51 @@ enabled=PackedStringArray("res://addons/godot_state_charts/plugin.cfg", "res://a

[input]

ui_accept={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194309,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194310,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"key_label":0,"unicode":32,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":75,"key_label":0,"unicode":107,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":76,"key_label":0,"unicode":108,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":71,"key_label":0,"unicode":103,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":72,"key_label":0,"unicode":104,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":true,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":1,"pressure":0.0,"pressed":true,"script":null)
]
}
ui_left={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194319,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":113,"echo":false,"script":null)
]
}
ui_right={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194321,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"echo":false,"script":null)
]
}
ui_up={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194320,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":122,"echo":false,"script":null)
]
}
ui_down={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194322,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"echo":false,"script":null)
]
}
charge={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":75,"key_label":0,"unicode":107,"echo":false,"script":null)
Expand Down
13 changes: 12 additions & 1 deletion scenes/UI/CreditUI.tscn
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
[gd_scene load_steps=4 format=3 uid="uid://p7o51iq35snm"]
[gd_scene load_steps=5 format=3 uid="uid://p7o51iq35snm"]

[ext_resource type="Theme" uid="uid://mxwvwg8snm7m" path="res://assets/defaultUiTheme.tres" id="1_7r0io"]
[ext_resource type="Script" path="res://scripts/UI/StandardUiPanel.gd" id="1_uo0fe"]
[ext_resource type="Texture2D" uid="uid://d2bvnqvaqpgxc" path="res://assets/art/UI/credit.png" id="3_qr4wi"]

[sub_resource type="GDScript" id="GDScript_x7pnd"]
script/source = "extends Button


func _ready():
visibility_changed.connect(func ():
if visible:
grab_focus())
"

[node name="CreditUI" type="Control"]
layout_mode = 3
anchors_preset = 15
Expand Down Expand Up @@ -43,5 +53,6 @@ offset_right = 827.96
offset_bottom = 494.296
rotation = 0.774886
text = "Let me out of here"
script = SubResource("GDScript_x7pnd")

[connection signal="pressed" from="Button" to="." method="goBack"]
1 change: 0 additions & 1 deletion scenes/UI/MainMenuUi.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ text = "Two player
Duel"

[node name="Option" type="Button" parent="MarginContainer/HBoxContainer/VBoxContainer/VBoxContainer"]
visible = false
layout_mode = 2
theme_override_font_sizes/font_size = 26
text = "Option"
Expand Down
6 changes: 3 additions & 3 deletions scenes/levels/proto.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -891,17 +891,17 @@ bus = &"Music"
[connection signal="wrestlingStarted" from="Player" to="Camera" method="doShake" binds= [0.45]]
[connection signal="endOfGame" from="GameManager" to="GameManager/StateMachine" method="send_event" binds= ["finish"]]
[connection signal="endOfRound" from="GameManager" to="GameManager/StateMachine" method="send_event" binds= ["endOfRound"]]
[connection signal="enemyWonGame" from="GameManager" to="UIText" method="showUIAfterDelay" binds= ["gameLost", 1.0]]
[connection signal="enemyWonGame" from="GameManager" to="UIText" method="showUI" binds= ["defeat", false]]
[connection signal="enemyWonGame" from="GameManager" to="UIText" method="showUIAfterDelay" binds= ["gameLost", 1.0]]
[connection signal="enemyWonRound" from="GameManager" to="UIRounds" method="setRound" binds= [false]]
[connection signal="playerWonGame" from="GameManager" to="Arena/CrowdHandler" method="superHappy"]
[connection signal="playerWonGame" from="GameManager" to="Audio_lvl/youpi" method="play_sound"]
[connection signal="playerWonGame" from="GameManager" to="UIText" method="showUIAfterDelay" binds= ["gameWon", 1.0]]
[connection signal="playerWonGame" from="GameManager" to="UIText" method="showUI" binds= ["victory", false]]
[connection signal="playerWonGame" from="GameManager" to="UIText" method="showUIAfterDelay" binds= ["gameWon", 1.0]]
[connection signal="playerWonMatch" from="GameManager" to="Arena/CrowdHandler" method="superHappy"]
[connection signal="playerWonMatch" from="GameManager" to="Audio_lvl/youpi" method="play_sound"]
[connection signal="playerWonMatch" from="GameManager" to="UIText" method="showUIAfterDelay" binds= ["nextMatch", 0.5]]
[connection signal="playerWonMatch" from="GameManager" to="UIText" method="showUI" binds= ["victory", false]]
[connection signal="playerWonMatch" from="GameManager" to="UIText" method="showUIAfterDelay" binds= ["nextMatch", 0.5]]
[connection signal="playerWonRound" from="GameManager" to="UIRounds" method="setRound" binds= [true]]
[connection signal="resetPlayerPositions" from="GameManager" to="GameManager/StateMachine" method="send_event" binds= ["resetRound"]]
[connection signal="startRound" from="GameManager" to="GameManager/StateMachine" method="send_event" binds= ["startRound"]]
Expand Down
1 change: 1 addition & 0 deletions scenes/peon_king_ultime.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ inputProvider = 3

[node name="IA" parent="." index="10"]
start_on_load = true
i_am_robot = true
level = 1.0

[node name="2D_character_rig" parent="." index="12"]
Expand Down

0 comments on commit e1e7c3b

Please sign in to comment.