major rework on pickups, hud now shows the number and icon of pickup

This commit is contained in:
derek
2025-01-16 17:04:13 -06:00
parent ad89e9813c
commit 5c6f010fdc
30 changed files with 1134 additions and 59 deletions

View File

@@ -621,17 +621,40 @@ func add_ammo(new_gun,gun_name,ammo_type,max_ammo,start_mags):
func _on_pick_up_detection_body_entered(body):
if body.is_in_group("pickup"):
if body.pickupable:
body.picked_up()
if body.is_in_group("weapon_pickup"):
weapon_pickup_audio.play()
Input.start_joy_vibration(0,.1,.1,.1)
if body.is_in_group("item_pickup"):
pass
#if body.pickupable:
#pickup_apply(body.pickup_type,body.ammo_type,body.value)
if body.is_in_group("weapon_pickup"):
body.picked_up()
weapon_pickup_audio.play()
Input.start_joy_vibration(0,.1,.1,.1)
func _on_pick_up_magnet_body_entered(body):
if body.is_in_group("pickup") and body.is_in_group("magnet"):
body.player_follow = self
body.collision_shape.disabled = true
if body.is_in_group("item_pickup") and body.is_in_group("magnet"):
if body.magnetable == true:
body.player_follow = self
body.player = self
body.collision_shape.disabled = true
func pickup_apply(type,ammo_type,value):
pickup_sound.play()
Input.start_joy_vibration(0,.1,.1,.1)
hud.pick_up_notif(type,ammo_type,value)
match type:
0: #AMMO
if ammo_reserve.has(str(ammo_type)):
ammo_reserve[str(ammo_type)] += value
else:
ammo_reserve[str(ammo_type)] = value
1: #STAMINA
remaining_stamina = clamp(remaining_stamina + value,0,100)
2: #HEALTH
level_control.health += value
3: #MONEY
level_control.money += value
func weapon_tilt(input_x, delta):
if !ads: