Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .vs/Edgelord/DesignTimeBuild/.dtbcache.v2
Binary file not shown.
Binary file not shown.
Binary file added .vs/Edgelord/v17/.futdcache.v2
Binary file not shown.
Binary file added .vs/Edgelord/v17/.suo
Binary file not shown.
37 changes: 37 additions & 0 deletions .vs/Edgelord/v17/DocumentLayout.backup.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\chris\\Documents\\GitHub\\OER_Gamejam_3_Edgelord_2-Revenge-o\\",
"Documents": [
{
"AbsoluteMoniker": "D:0:0:{EB7DA71A-15DF-43AA-819A-4F0ADB8614C2}|Edgelord.csproj|c:\\users\\chris\\documents\\github\\oer_gamejam_3_edgelord_2-revenge-o\\scripts\\operations\\op_angle_sum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{EB7DA71A-15DF-43AA-819A-4F0ADB8614C2}|Edgelord.csproj|solutionrelative:scripts\\operations\\op_angle_sum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
{
"Orientation": 0,
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 0,
"Children": [
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "op_angle_sum.cs",
"DocumentMoniker": "C:\\Users\\chris\\Documents\\GitHub\\OER_Gamejam_3_Edgelord_2-Revenge-o\\scripts\\operations\\op_angle_sum.cs",
"RelativeDocumentMoniker": "scripts\\operations\\op_angle_sum.cs",
"ToolTip": "C:\\Users\\chris\\Documents\\GitHub\\OER_Gamejam_3_Edgelord_2-Revenge-o\\scripts\\operations\\op_angle_sum.cs",
"RelativeToolTip": "scripts\\operations\\op_angle_sum.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-05-10T11:07:53.825Z",
"EditorCaption": ""
}
]
}
]
}
]
}
12 changes: 12 additions & 0 deletions .vs/Edgelord/v17/DocumentLayout.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\chris\\Documents\\GitHub\\OER_Gamejam_3_Edgelord_2-Revenge-o\\",
"Documents": [],
"DocumentGroupContainers": [
{
"Orientation": 0,
"VerticalTabListWidth": 256,
"DocumentGroups": []
}
]
}
Binary file added .vs/ProjectEvaluation/edgelord.metadata.v9.bin
Binary file not shown.
Binary file added .vs/ProjectEvaluation/edgelord.projects.v9.bin
Binary file not shown.
Binary file added .vs/ProjectEvaluation/edgelord.strings.v9.bin
Binary file not shown.
6 changes: 6 additions & 0 deletions Edgelord.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Project Sdk="Godot.NET.Sdk/4.4.1">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<EnableDynamicLoading>true</EnableDynamicLoading>
</PropertyGroup>
</Project>
19 changes: 19 additions & 0 deletions Edgelord.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Edgelord", "Edgelord.csproj", "{EB7DA71A-15DF-43AA-819A-4F0ADB8614C2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
ExportDebug|Any CPU = ExportDebug|Any CPU
ExportRelease|Any CPU = ExportRelease|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EB7DA71A-15DF-43AA-819A-4F0ADB8614C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB7DA71A-15DF-43AA-819A-4F0ADB8614C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB7DA71A-15DF-43AA-819A-4F0ADB8614C2}.ExportDebug|Any CPU.ActiveCfg = ExportDebug|Any CPU
{EB7DA71A-15DF-43AA-819A-4F0ADB8614C2}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU
{EB7DA71A-15DF-43AA-819A-4F0ADB8614C2}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU
{EB7DA71A-15DF-43AA-819A-4F0ADB8614C2}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU
EndGlobalSection
EndGlobal
6 changes: 5 additions & 1 deletion project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ config_version=5

config/name="Edgelord"
run/main_scene="res://scenes/main.tscn"
config/features=PackedStringArray("4.2", "Mobile")
config/features=PackedStringArray("4.4", "Mobile")
config/icon="res://assets/logo2.png"

[debug]
Expand All @@ -24,6 +24,10 @@ gdscript/warnings/untyped_declaration=1
window/size/viewport_width=500
window/size/viewport_height=800

[dotnet]

project/assembly_name="Edgelord"

[rendering]

renderer/rendering_method="mobile"
Expand Down
2 changes: 1 addition & 1 deletion scenes/angle_2d.tscn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://di3ikqqiyff4x"]

[ext_resource type="Script" path="res://scripts/triangle_angle_2d.gd" id="1_w37vp"]
[ext_resource type="Script" uid="uid://b4r3rg2ji6g2n" path="res://scripts/triangle_angle_2d.gd" id="1_w37vp"]

[node name="Angle2D" type="Node2D"]
script = ExtResource("1_w37vp")
Expand Down
6 changes: 3 additions & 3 deletions scenes/level1.tscn
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[gd_scene load_steps=9 format=3 uid="uid://duckuk8h1lwv4"]

[ext_resource type="Script" path="res://scripts/level.gd" id="1_c3ssa"]
[ext_resource type="Script" uid="uid://ddisnce7n10el" path="res://scripts/level.gd" id="1_c3ssa"]
[ext_resource type="PackedScene" uid="uid://c4ah5udylimr8" path="res://scenes/point.tscn" id="1_ppba2"]
[ext_resource type="Script" path="res://scripts/line.gd" id="2_3fgod"]
[ext_resource type="Script" path="res://scripts/angle.gd" id="3_jvylr"]
[ext_resource type="Script" uid="uid://begmoc5k766xg" path="res://scripts/line.gd" id="2_3fgod"]
[ext_resource type="Script" uid="uid://bjs268np45qkm" path="res://scripts/angle.gd" id="3_jvylr"]

[sub_resource type="Resource" id="Resource_e33lc"]
script = ExtResource("2_3fgod")
Expand Down
6 changes: 3 additions & 3 deletions scenes/level2.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[gd_scene load_steps=12 format=3 uid="uid://dg0n7cfk4nvtc"]

[ext_resource type="Script" path="res://scripts/level.gd" id="1_bsj3o"]
[ext_resource type="Script" path="res://scripts/line.gd" id="2_xxpub"]
[ext_resource type="Script" path="res://scripts/angle.gd" id="3_hhrak"]
[ext_resource type="Script" uid="uid://ddisnce7n10el" path="res://scripts/level.gd" id="1_bsj3o"]
[ext_resource type="Script" uid="uid://begmoc5k766xg" path="res://scripts/line.gd" id="2_xxpub"]
[ext_resource type="Script" uid="uid://bjs268np45qkm" path="res://scripts/angle.gd" id="3_hhrak"]
[ext_resource type="PackedScene" uid="uid://c4ah5udylimr8" path="res://scenes/point.tscn" id="4_ydhg7"]

[sub_resource type="Resource" id="Resource_lyrvh"]
Expand Down
6 changes: 3 additions & 3 deletions scenes/level3.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[gd_scene load_steps=10 format=3 uid="uid://cqjt7afpbbwse"]

[ext_resource type="Script" path="res://scripts/level.gd" id="1_rxa6e"]
[ext_resource type="Script" path="res://scripts/line.gd" id="2_lofo5"]
[ext_resource type="Script" path="res://scripts/angle.gd" id="3_tm01j"]
[ext_resource type="Script" uid="uid://ddisnce7n10el" path="res://scripts/level.gd" id="1_rxa6e"]
[ext_resource type="Script" uid="uid://begmoc5k766xg" path="res://scripts/line.gd" id="2_lofo5"]
[ext_resource type="Script" uid="uid://bjs268np45qkm" path="res://scripts/angle.gd" id="3_tm01j"]
[ext_resource type="PackedScene" uid="uid://c4ah5udylimr8" path="res://scenes/point.tscn" id="4_8ekkc"]

[sub_resource type="Resource" id="Resource_e33lc"]
Expand Down
6 changes: 3 additions & 3 deletions scenes/level4.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[gd_scene load_steps=14 format=3 uid="uid://c0o7s28lr1o5a"]

[ext_resource type="Script" path="res://scripts/level.gd" id="1_uwp2e"]
[ext_resource type="Script" path="res://scripts/line.gd" id="2_wq1vy"]
[ext_resource type="Script" path="res://scripts/angle.gd" id="3_btxdg"]
[ext_resource type="Script" uid="uid://ddisnce7n10el" path="res://scripts/level.gd" id="1_uwp2e"]
[ext_resource type="Script" uid="uid://begmoc5k766xg" path="res://scripts/line.gd" id="2_wq1vy"]
[ext_resource type="Script" uid="uid://bjs268np45qkm" path="res://scripts/angle.gd" id="3_btxdg"]
[ext_resource type="PackedScene" uid="uid://c4ah5udylimr8" path="res://scenes/point.tscn" id="4_gevbb"]

[sub_resource type="Resource" id="Resource_e33lc"]
Expand Down
6 changes: 3 additions & 3 deletions scenes/level5.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[gd_scene load_steps=12 format=3 uid="uid://dadqhwrkln7yo"]

[ext_resource type="Script" path="res://scripts/level.gd" id="1_pay2s"]
[ext_resource type="Script" path="res://scripts/line.gd" id="2_y0ml0"]
[ext_resource type="Script" path="res://scripts/angle.gd" id="3_gmj4l"]
[ext_resource type="Script" uid="uid://ddisnce7n10el" path="res://scripts/level.gd" id="1_pay2s"]
[ext_resource type="Script" uid="uid://begmoc5k766xg" path="res://scripts/line.gd" id="2_y0ml0"]
[ext_resource type="Script" uid="uid://bjs268np45qkm" path="res://scripts/angle.gd" id="3_gmj4l"]
[ext_resource type="PackedScene" uid="uid://c4ah5udylimr8" path="res://scenes/point.tscn" id="4_05kv4"]

[sub_resource type="Resource" id="Resource_e33lc"]
Expand Down
6 changes: 3 additions & 3 deletions scenes/level6.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[gd_scene load_steps=17 format=3 uid="uid://dlanj3u6pipof"]

[ext_resource type="Script" path="res://scripts/level.gd" id="1_35iyw"]
[ext_resource type="Script" path="res://scripts/line.gd" id="2_0s1sj"]
[ext_resource type="Script" path="res://scripts/angle.gd" id="3_6g0he"]
[ext_resource type="Script" uid="uid://ddisnce7n10el" path="res://scripts/level.gd" id="1_35iyw"]
[ext_resource type="Script" uid="uid://begmoc5k766xg" path="res://scripts/line.gd" id="2_0s1sj"]
[ext_resource type="Script" uid="uid://bjs268np45qkm" path="res://scripts/angle.gd" id="3_6g0he"]
[ext_resource type="PackedScene" uid="uid://c4ah5udylimr8" path="res://scenes/point.tscn" id="4_ndqq0"]

[sub_resource type="Resource" id="Resource_e33lc"]
Expand Down
2 changes: 1 addition & 1 deletion scenes/line_2d.tscn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://dvdpor3f0vbvg"]

[ext_resource type="Script" path="res://scripts/triangle_line_2d.gd" id="1_7jgda"]
[ext_resource type="Script" uid="uid://cubb0ripojjnf" path="res://scripts/triangle_line_2d.gd" id="1_7jgda"]

[node name="Line2D" type="Line2D"]
script = ExtResource("1_7jgda")
38 changes: 23 additions & 15 deletions scenes/main.tscn
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
[gd_scene load_steps=22 format=3 uid="uid://d23p3d336a4t2"]
[gd_scene load_steps=23 format=3 uid="uid://d23p3d336a4t2"]

[ext_resource type="Script" path="res://scripts/main.gd" id="1_1wg38"]
[ext_resource type="Script" path="res://scripts/level_manager.gd" id="1_owbby"]
[ext_resource type="Script" uid="uid://q63q17ac685c" path="res://scripts/main.gd" id="1_1wg38"]
[ext_resource type="Script" uid="uid://dro04ndmhbjar" path="res://scripts/level_manager.gd" id="1_owbby"]
[ext_resource type="Theme" uid="uid://dsppqoqt6f3pb" path="res://assets/button_theme.tres" id="3_4a52f"]
[ext_resource type="Script" path="res://scripts/operations/op_deselect.gd" id="3_g2s2r"]
[ext_resource type="Script" path="res://scripts/operations/op_pythagoras.gd" id="4_ux2ua"]
[ext_resource type="Script" path="res://scripts/operations/op_sin.gd" id="5_1xyqm"]
[ext_resource type="Script" path="res://scripts/operations/op_equality.gd" id="5_5dfvc"]
[ext_resource type="Script" path="res://scripts/operations/op_cos.gd" id="6_8sd6l"]
[ext_resource type="Script" uid="uid://yuqtasbq2y75" path="res://scripts/operations/op_deselect.gd" id="3_g2s2r"]
[ext_resource type="Script" uid="uid://bm6e36s3tckse" path="res://scripts/operations/op_pythagoras.gd" id="4_ux2ua"]
[ext_resource type="Script" uid="uid://sas7w6r32tsa" path="res://scripts/operations/op_sin.gd" id="5_1xyqm"]
[ext_resource type="Script" uid="uid://cu1hqcq2qrk6f" path="res://scripts/operations/op_equality.gd" id="5_5dfvc"]
[ext_resource type="Script" uid="uid://duef4542p7vsv" path="res://scripts/operations/op_cos.gd" id="6_8sd6l"]
[ext_resource type="AudioStream" uid="uid://68giwkm4vsn8" path="res://assets/focus.wav" id="7_i72tj"]
[ext_resource type="Script" path="res://scripts/operations/op_tan.gd" id="7_stadj"]
[ext_resource type="Script" uid="uid://cenymxsy8neye" path="res://scripts/operations/op_tan.gd" id="7_stadj"]
[ext_resource type="Script" uid="uid://dhamrkx4gr7c4" path="res://scripts/operations/op_angle_sum.gd" id="10_eb6dy"]
[ext_resource type="Texture2D" uid="uid://c7riaighvddt3" path="res://assets/necklord.svg" id="10_w4e5f"]

[sub_resource type="Gradient" id="Gradient_74otk"]
Expand Down Expand Up @@ -673,11 +674,11 @@ tracks/8/keys = {

[sub_resource type="AnimationLibrary" id="AnimationLibrary_mdmy2"]
_data = {
"RESET": SubResource("Animation_huyb7"),
"game_won": SubResource("Animation_cku44"),
"level_won": SubResource("Animation_aeq6t"),
"nice": SubResource("Animation_gfmbr"),
"too_bad": SubResource("Animation_ha3rr")
&"RESET": SubResource("Animation_huyb7"),
&"game_won": SubResource("Animation_cku44"),
&"level_won": SubResource("Animation_aeq6t"),
&"nice": SubResource("Animation_gfmbr"),
&"too_bad": SubResource("Animation_ha3rr")
}

[sub_resource type="LabelSettings" id="LabelSettings_nbkr0"]
Expand Down Expand Up @@ -788,13 +789,20 @@ theme = ExtResource("3_4a52f")
text = "Equality"
script = ExtResource("5_5dfvc")

[node name="AngleSum" type="Button" parent="BottomUI/Actions"]
custom_minimum_size = Vector2(0, 30)
layout_mode = 2
theme = ExtResource("3_4a52f")
text = "Angle Sum"
script = ExtResource("10_eb6dy")

[node name="AudioPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource("7_i72tj")
autoplay = true

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
"": SubResource("AnimationLibrary_mdmy2")
&"": SubResource("AnimationLibrary_mdmy2")
}

[node name="HeadPivot" type="Node2D" parent="AnimationPlayer"]
Expand Down
2 changes: 1 addition & 1 deletion scenes/point.tscn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[gd_scene load_steps=4 format=3 uid="uid://c4ah5udylimr8"]

[ext_resource type="Script" path="res://scripts/point.gd" id="1_jid7c"]
[ext_resource type="Script" uid="uid://bods3o8e03kec" path="res://scripts/point.gd" id="1_jid7c"]

[sub_resource type="Gradient" id="Gradient_vdq4t"]
resource_local_to_scene = true
Expand Down
1 change: 0 additions & 1 deletion scripts/angle.gd
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ extends Resource

func _to_string() -> String:
return("/%s%s%s" % [point_a, point_b, point_c])

1 change: 1 addition & 0 deletions scripts/angle.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://bjs268np45qkm
1 change: 1 addition & 0 deletions scripts/level.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://ddisnce7n10el
3 changes: 2 additions & 1 deletion scripts/level_manager.gd
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ signal selection_changed

static var angle_selection_mode_active := false


func _ready() -> void:
selection_changed.connect(_on_selection_changed)
current_level = start_level
Expand Down Expand Up @@ -85,6 +84,8 @@ func _on_point_released(point: Point) -> void:


func _on_point_selected(point: Point) -> void:
print("Good job!")
Input.set_default_cursor_shape(Input.CURSOR_HELP)
selected_point = point
for connected_point in point.connected_points:
print(connected_point)
Expand Down
1 change: 1 addition & 0 deletions scripts/level_manager.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://dro04ndmhbjar
1 change: 1 addition & 0 deletions scripts/line.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://begmoc5k766xg
1 change: 1 addition & 0 deletions scripts/main.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://q63q17ac685c
57 changes: 57 additions & 0 deletions scripts/operations/op_angle_sum.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
extends OperationButton



func handles_selection(
selected_lines: Array[TriangleLine2D],
selected_angles: Array[TriangleAngle2D]
) -> bool:
if selected_angles.size() != 3:
return false
if not angles_in_same_triangle(selected_angles):
return false
var known_count := 0
for a in selected_angles:
if a.known:
known_count += 1

if known_count != 2:
return false
return true

func angles_in_same_triangle(angles: Array[TriangleAngle2D]) -> bool:
var base_points := angles[0].get_points()
for i in [1, 2]:
var pts := angles[i].get_points()
if pts.size() != base_points.size():
return false
for p in pts:
if not p in base_points:
return false
return true

func execute() -> bool:
var angles = level_manager.selected_angles
if angles.size() != 3:
return false
if not angles_in_same_triangle(angles):
return false

var sum_angles := 0.0
var known_count := 0

for a in angles:
sum_angles += a.angle()

if a.known:
known_count += 1
print(sum_angles)
if known_count == 2 and is_equal_approx(sum_angles, PI):
for a in angles:
if not a.known:
a.known = true
move_made.emit()

return true

return false
1 change: 1 addition & 0 deletions scripts/operations/op_angle_sum.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://dhamrkx4gr7c4
1 change: 1 addition & 0 deletions scripts/operations/op_cos.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://duef4542p7vsv
1 change: 1 addition & 0 deletions scripts/operations/op_deselect.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://yuqtasbq2y75
1 change: 1 addition & 0 deletions scripts/operations/op_equality.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://cu1hqcq2qrk6f
1 change: 1 addition & 0 deletions scripts/operations/op_pythagoras.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://bm6e36s3tckse
1 change: 1 addition & 0 deletions scripts/operations/op_sin.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://sas7w6r32tsa
1 change: 1 addition & 0 deletions scripts/operations/op_tan.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://cenymxsy8neye
1 change: 1 addition & 0 deletions scripts/operations/operation.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://5m0rv6nfdvme
1 change: 1 addition & 0 deletions scripts/point.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://bods3o8e03kec
1 change: 1 addition & 0 deletions scripts/triangle.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://coo1gsvqrqdf7
1 change: 1 addition & 0 deletions scripts/triangle_angle_2d.gd
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ func _init(start: float = 0, end: float = PI) -> void:

collision_area.input_event.connect(_is_polygon_selected)



func _draw():
const width: int = 3
Expand Down
1 change: 1 addition & 0 deletions scripts/triangle_angle_2d.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://b4r3rg2ji6g2n
1 change: 1 addition & 0 deletions scripts/triangle_line_2d.gd.uid
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://cubb0ripojjnf