StikmanMann/OpticTraveler
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/StikmanMann/allaroundtheworld

Browse source
This commit is contained in:
Amanda Boegysanto 2025-09-19 14:59:06 +02:00
commit 1a69d5afe9
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Florian/Map/Oktoberfest_new.tscn
View file

@ -1149,6 +1149,7 @@ environment = SubResource("Environment_d5eeg")
[node name="DrunkFollow" parent="." node_paths=PackedStringArray("item_want") instance=ExtResource("20_20xaa")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -36, 2, -8)
item_want = NodePath("../Physics/Beer/GoldenBeer")
speed = 3
[node name="AllTables" type="Node3D" parent="."]

10
Florian/PhysicsProps/DrunkFollow.tscn
View file

@ -1,9 +1,13 @@
[gd_scene load_steps=12 format=3 uid="uid://v86q0i25q2dj"]
[gd_scene load_steps=13 format=3 uid="uid://v86q0i25q2dj"]
[ext_resource type="Script" uid="uid://g0sldpbn2yiu" path="res://Florian/PhysicsProps/drunk_follow.gd" id="1_m5yqb"]
[ext_resource type="Texture2D" uid="uid://dkt1ynydnm1k5" path="res://Amanda/Sprite assets/guy_drink-2.png" id="2_1cami"]
[ext_resource type="PackedScene" uid="uid://c8gnb0kut2n5h" path="res://Florian/PointsLogic/point_thing.tscn" id="3_1cami"]
[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_1cami"]
friction = 2.0
rough = true
[sub_resource type="CylinderShape3D" id="CylinderShape3D_fwpe3"]
radius = 4.0
@ -56,9 +60,9 @@ height = 2.4
[node name="DrunkFollow" type="RigidBody3D"]
axis_lock_angular_x = true
axis_lock_angular_z = true
mass = 30.0
mass = 150.0
physics_material_override = SubResource("PhysicsMaterial_1cami")
script = ExtResource("1_m5yqb")
speed = 1
[node name="SeeArea" type="Area3D" parent="."]

2
Florian/PhysicsProps/drunk_follow.gd
View file

@ -1,7 +1,7 @@
extends RigidBody3D
@export var item_want : RigidBody3D = null
@export var speed : int = 10
@export var speed : int = 3
@onready var see_area: Area3D = $SeeArea
var following_item : RigidBody3D = null

2
Florian/Player/pickup.gd
View file

@ -2,7 +2,7 @@ extends Node3D
@onready var pickup_ray: RayCast3D = $PickupRay
@export var max_heaviness: float = 30.0 # max object mass allowed
@export var max_heaviness: float = 20.0 # max object mass allowed
@export var hold_distance: float = 3.0 # how far in front of player to hold
@export var hold_strength: float = 8.0 # how strongly we pull the object toward target
@export var damping: float = 20.0 # smoothness of movement