Sara/wave-survival
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: replace 'fallback weapon' with 'starting weapon'

Browse source
This commit is contained in:
Sara 2025-07-18 00:45:55 +02:00
parent a93e79cd1c
commit 01b69df872
12 changed files with 233 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
project/assets/models/weapons/rifle.glb
View file

Binary file not shown.

168
project/maps/testmap.tscn
View file

@ -218,3 +218,171 @@ operation = 2
use_collision = true
size = Vector3(1.43066, 2.25876, 1.43037)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D28" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 8.115168, 1.13, -10.086953)
operation = 2
use_collision = true
size = Vector3(9.8421, 3.074, 7.48355)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D29" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 8.115167, 1.13, -1.3881226)
operation = 2
use_collision = true
size = Vector3(9.8421, 3.074, 9.25056)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D30" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 8.115166, 1.13, 7.136897)
operation = 2
use_collision = true
size = Vector3(9.8421, 3.074, 7.48355)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D31" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 8.115168, 4.73767, -10.086953)
operation = 2
use_collision = true
size = Vector3(9.8421, 3.074, 7.48355)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D32" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 8.115167, 4.73767, -1.3881226)
operation = 2
use_collision = true
size = Vector3(9.8421, 3.074, 9.25056)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D33" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 8.115166, 4.73767, 7.136897)
operation = 2
use_collision = true
size = Vector3(9.8421, 3.074, 7.48355)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D34" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 3.1598587, 0.8431771, -9.042843)
operation = 2
use_collision = true
size = Vector3(1.5039063, 2.81146, 1.43037)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D35" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 9.913068, 3.00782, -12.247253)
operation = 2
use_collision = true
size = Vector3(4.11031, 1.01367, 3.05259)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D36" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 3.1837177, 5.15978, -12.238723)
operation = 2
use_collision = true
size = Vector3(1.64708, 1.47165, 1.75998)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D37" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 3.1837177, 5.15978, -8.678133)
operation = 2
use_collision = true
size = Vector3(1.64708, 1.47165, 3.01134)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D38" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 3.1837168, 5.15978, 0.8449067)
operation = 2
use_collision = true
size = Vector3(1.64708, 1.47165, 1.75998)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D39" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 3.1837158, 1.63843, 9.061197)
operation = 2
use_collision = true
size = Vector3(1.64708, 1.47165, 1.75998)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D40" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 3.1837168, 1.63843, 0.42633712)
operation = 2
use_collision = true
size = Vector3(1.64708, 1.47165, 1.75998)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D41" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 3.1837168, 1.63843, -3.8672872)
operation = 2
use_collision = true
size = Vector3(1.64708, 1.47165, 1.75998)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D42" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 3.1837177, 1.63843, -12.144593)
operation = 2
use_collision = true
size = Vector3(1.64708, 1.47165, 1.75998)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D43" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 3.1837163, 5.15978, 5.070767)
operation = 2
use_collision = true
size = Vector3(1.64708, 1.47165, 1.75998)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D44" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 3.1837168, 5.15978, -2.9607549)
operation = 2
use_collision = true
size = Vector3(1.64708, 1.47165, 3.46446)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D45" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 3.1837158, 5.15978, 8.549497)
operation = 2
use_collision = true
size = Vector3(1.64708, 1.47165, 3.46446)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D46" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 2.8529863, 0.8431771, 6.304547)
operation = 2
use_collision = true
size = Vector3(1.20117, 2.81146, 1.43037)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D47" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-4.3711378e-08, 0, -1, 0, 1, 0, 1, 0, -4.3711378e-08, 11.327666, 0.8431771, 3.6254973)
operation = 2
use_collision = true
size = Vector3(1.71875, 2.81146, 1.43037)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D48" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-4.3711378e-08, 0, -1, 0, 1, 0, 1, 0, -4.3711378e-08, 5.6189175, 1.11953, -6.384443)
operation = 2
use_collision = true
size = Vector3(1.43066, 2.25876, 1.43037)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D49" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-4.3711378e-08, 0, -1, 0, 1, 0, 1, 0, -4.3711378e-08, 5.6189175, 4.34085, -6.384443)
operation = 2
use_collision = true
size = Vector3(1.43066, 2.25876, 1.43037)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D50" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(1, 0, 1.4210855e-14, 0, 1, 0, -1.4210855e-14, 0, 1, 13.222718, 4.340849, 5.694529)
operation = 2
use_collision = true
size = Vector3(1.43066, 2.25876, 1.43037)
material = ExtResource("1_ng1ul")
[node name="CSGBox3D51" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(-4.3711378e-08, 0, -1, 0, 1, 0, 1, 0, -4.3711378e-08, 11.184867, 4.34085, 3.3299174)
operation = 2
use_collision = true
size = Vector3(1.43066, 2.25876, 1.43037)
material = ExtResource("1_ng1ul")

2
project/objects/player.tscn
View file

@ -20,4 +20,4 @@ fov = 60.0
[node name="WeaponInventory" type="WeaponInventory" parent="."]
unique_name_in_owner = true
fallback_weapon = ExtResource("1_eqqp1")
starting_weapon = ExtResource("1_eqqp1")

5
project/project.godot
View file

@ -62,3 +62,8 @@ jump={
"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":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null)
]
}
switch_weapon={
"deadzone": 0.2,
"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":4194306,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
]
}