diff --git a/project.godot b/project.godot
index d6a72dd..1e7c2d7 100644
--- a/project.godot
+++ b/project.godot
@@ -26,6 +26,41 @@ window/stretch/mode="viewport"
project/assembly_name="1bit-game-jam"
+[input]
+
+character_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":0,"physical_keycode":87,"key_label":0,"unicode":0,"echo":false,"script":null)
+, 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":4194320,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
+}
+character_down={
+"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":83,"key_label":0,"unicode":115,"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":4194322,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
+}
+character_left={
+"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":65,"key_label":0,"unicode":97,"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":4194319,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
+}
+character_right={
+"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":68,"key_label":0,"unicode":100,"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":4194321,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
+}
+
[layer_names]
2d_render/layer_1="Dark World"
diff --git a/scenes/main_scene.tscn b/scenes/main_scene.tscn
index 4123acc..b60b4f7 100644
--- a/scenes/main_scene.tscn
+++ b/scenes/main_scene.tscn
@@ -55,11 +55,12 @@ Circle = NodePath("../Circle")
PlayerCircle = NodePath("../PlayerCircle")
Polygon = NodePath("../Triangle")
-[node name="PlayerCamera" type="Camera2D" parent="."]
+[node name="PlayerCamera" type="Camera2D" parent="." node_paths=PackedStringArray("Player")]
script = ExtResource("6_quua3")
+Player = NodePath("../Player")
+CameraBounds = Vector2(30, 20)
[node name="PointLight2D" type="PointLight2D" parent="PlayerCamera" node_paths=PackedStringArray("LightViewport")]
-energy = 16.0
blend_mode = 2
range_item_cull_mask = 2
script = ExtResource("6_slohe")
diff --git a/scripts/Constants.cs b/scripts/Constants.cs
index 91c9114..265fd12 100644
--- a/scripts/Constants.cs
+++ b/scripts/Constants.cs
@@ -6,4 +6,7 @@ public static class Constants
public static readonly Vector2 HalfScreenSize = ScreenSize / 2;
public const float MaxFlashlightRadius = 32;
+ public const float MinFlashlightRadius = 8;
+ public const float MaxFlashlightDistance = 96;
+ public const float MinFlashlightDistance = 16;
}
\ No newline at end of file
diff --git a/scripts/Flashlight.cs b/scripts/Flashlight.cs
index c8876db..5bd202f 100644
--- a/scripts/Flashlight.cs
+++ b/scripts/Flashlight.cs
@@ -19,12 +19,16 @@ public partial class Flashlight : Node
var playerScreenPosition = playerScreenCenterPosition + Constants.HalfScreenSize;
PlayerCircle.Position = playerScreenPosition;
+ var d = Camera.FlashlightPosition.DistanceTo(Player.Position);
+ FlashlightRadius = Mathf.Lerp(Constants.MinFlashlightRadius, Constants.MaxFlashlightRadius,
+ Mathf.Clamp(d - Constants.MinFlashlightDistance, 0,
+ Constants.MaxFlashlightDistance - Constants.MinFlashlightDistance) / Constants.MaxFlashlightDistance);
+
var flashlightScreenPosition = flashlightScreenCenterPosition + Constants.HalfScreenSize;
var flashlightScale = FlashlightRadius / Constants.MaxFlashlightRadius;
Circle.Position = flashlightScreenPosition;
Circle.Scale = new Vector2(flashlightScale, flashlightScale);
- var d = Camera.FlashlightPosition.DistanceTo(Player.Position);
if (d <= FlashlightRadius)
Polygon.Visible = false;
else
diff --git a/scripts/GameCamera.cs b/scripts/GameCamera.cs
index 1614f37..2106ca0 100644
--- a/scripts/GameCamera.cs
+++ b/scripts/GameCamera.cs
@@ -2,11 +2,41 @@ using Godot;
public partial class GameCamera : Camera2D
{
+ [Export] public Player Player;
+ [Export] public Vector2 CameraBounds;
+
///
/// World position of the flashlight
///
public Vector2 FlashlightPosition;
+ public override void _PhysicsProcess(double delta)
+ {
+ var relativePlayerPosition = Player.Position - Position;
+ var halfCameraBounds = CameraBounds / 2;
+ float x = 0, y = 0;
+ if (relativePlayerPosition.X > halfCameraBounds.X)
+ {
+ x = relativePlayerPosition.X - halfCameraBounds.X;
+ }
+ else if (relativePlayerPosition.X < -halfCameraBounds.X)
+ {
+ x = relativePlayerPosition.X + halfCameraBounds.X;
+ }
+ if (relativePlayerPosition.Y > halfCameraBounds.Y)
+ {
+ y = relativePlayerPosition.Y - halfCameraBounds.Y;
+ }
+ else if (relativePlayerPosition.Y < -halfCameraBounds.Y)
+ {
+ y = relativePlayerPosition.Y + halfCameraBounds.Y;
+ }
+
+ var difference = new Vector2(x, y);
+ Position += difference;
+ FlashlightPosition += difference;
+ }
+
public override void _Input(InputEvent @event)
{
base._Input(@event);
diff --git a/scripts/Player.cs b/scripts/Player.cs
index 865c0e9..d6eb815 100644
--- a/scripts/Player.cs
+++ b/scripts/Player.cs
@@ -19,7 +19,7 @@ public partial class Player : CharacterBody2D
// Get the input direction and handle the movement/deceleration.
// As good practice, you should replace UI actions with custom gameplay actions.
- Vector2 direction = Input.GetVector("ui_left", "ui_right", "ui_up", "ui_down");
+ Vector2 direction = Input.GetVector("character_left", "character_right", "character_up", "character_down");
if (direction != Vector2.Zero)
{
velocity.X = direction.X * Speed;
diff --git a/scripts/PointLight2DWorkaround.cs b/scripts/PointLight2DWorkaround.cs
index 094e9e3..17b0fc3 100644
--- a/scripts/PointLight2DWorkaround.cs
+++ b/scripts/PointLight2DWorkaround.cs
@@ -1,6 +1,9 @@
using Godot;
using System;
+///
+/// https://github.com/godotengine/godot/issues/75868#issuecomment-1524362054 THANK YOU!!!
+///
[Tool]
public partial class PointLight2DWorkaround : PointLight2D
{