Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PulsGameJam2025
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Fabian Keßler
PulsGameJam2025
Commits
7b037a86
Commit
7b037a86
authored
1 month ago
by
Fabian Keßler
Browse files
Options
Downloads
Plain Diff
Merge branch 'main' of
https://gitlab2.informatik.uni-wuerzburg.de/s476696/pulsgamejam2025
parents
e6173555
b08d53f2
Loading
Loading
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
pulsjam2025/NPC/penguin/group.gd
+4
-4
4 additions, 4 deletions
pulsjam2025/NPC/penguin/group.gd
pulsjam2025/Player/PlayerMovement.gd
+4
-1
4 additions, 1 deletion
pulsjam2025/Player/PlayerMovement.gd
pulsjam2025/Player/PlayerScene.tscn
+1
-0
1 addition, 0 deletions
pulsjam2025/Player/PlayerScene.tscn
with
9 additions
and
5 deletions
pulsjam2025/NPC/penguin/group.gd
+
4
−
4
View file @
7b037a86
...
...
@@ -47,13 +47,13 @@ func notify_pengu_suspend():
p
.
suspend
()
func
_on_timer_timeout
():
var
coin
=
randf_range
(
0
,
1
)
var
coin
=
randf_range
(
0
,
2
)
var
pengu_to_move
:
Penguin
if
(
coin
==
1
):
pengu_to_move
=
penguins
.
reduce
(
func
(
best
,
current
):
return
best
if
best
.
cluster_score
>
current
.
cluster_score
else
current
)
else
:
pengu_to_move
=
penguins
[
randf_range
(
0
,
len
(
penguins
)
-
1
)]
else
:
pengu_to_move
=
penguins
.
reduce
(
func
(
best
,
current
):
return
best
if
best
.
cluster_score
>
current
.
cluster_score
else
current
)
if
not
is_instance_valid
(
pengu_to_move
):
return
if
pengu_to_move
.
get_parent
()
is
IceFloe
:
...
...
This diff is collapsed.
Click to expand it.
pulsjam2025/Player/PlayerMovement.gd
+
4
−
1
View file @
7b037a86
...
...
@@ -166,7 +166,6 @@ func _ungrapple() -> void:
print
(
"Un-Grabbed"
)
Grappled
=
false
lastGrabbedEisscholle
=
null
Grappled
=
false
# Apply a slight dampening when releasing to further reduce slingshot effect
velocity
*=
0.85
...
...
@@ -180,3 +179,7 @@ func _on_fish_cooldown_timer_timeout() -> void:
func
_on_area_2d_body_entered
(
body
:
Node2D
)
->
void
:
CurrentEisscholle
=
body
func
_on_area_2d_body_exited
(
body
:
Node2D
)
->
void
:
CurrentEisscholle
=
null
This diff is collapsed.
Click to expand it.
pulsjam2025/Player/PlayerScene.tscn
+
1
−
0
View file @
7b037a86
...
...
@@ -78,3 +78,4 @@ shape = SubResource("CircleShape2D_b3kip")
[connection signal="timeout" from="FishCooldownTimer" to="." method="_on_fish_cooldown_timer_timeout"]
[connection signal="timeout" from="FishDespawnTimer" to="." method="_on_fish_despawn_timer_timeout"]
[connection signal="body_entered" from="Area2D" to="." method="_on_area_2d_body_entered"]
[connection signal="body_exited" from="Area2D" to="." method="_on_area_2d_body_exited"]
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment