minor tweaks

This commit is contained in:
derek
2024-08-08 15:14:15 -05:00
parent 5b618f1ab8
commit b140e59ddd
9 changed files with 37 additions and 32 deletions

12
assets/enemy_health.tscn Normal file
View File

@@ -0,0 +1,12 @@
[gd_scene load_steps=3 format=3 uid="uid://hog87a8dbj7t"]
[ext_resource type="FontFile" uid="uid://bckxhcc1eudvn" path="res://assets/fonts/Plane Crash.ttf" id="1_gaihc"]
[ext_resource type="Script" path="res://scripts/enemy_taunt.gd" id="2_s81dc"]
[node name="enemyHealth" type="Label3D" groups=["spawned"]]
billboard = 2
text = "1
"
font = ExtResource("1_gaihc")
font_size = 60
script = ExtResource("2_s81dc")

View File

@@ -5,7 +5,6 @@
[node name="enemyTaunt" type="Label3D" groups=["spawned"]] [node name="enemyTaunt" type="Label3D" groups=["spawned"]]
billboard = 2 billboard = 2
modulate = Color(1, 1, 1, 0)
text = "1 text = "1
" "
font = ExtResource("1_vuoli") font = ExtResource("1_vuoli")

View File

@@ -42,6 +42,7 @@ gun_2 = ExtResource("3_xdb5c")
[node name="Player" parent="." instance=ExtResource("4_a8lcp")] [node name="Player" parent="." instance=ExtResource("4_a8lcp")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26.4194, 1.40016, -29.1943) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26.4194, 1.40016, -29.1943)
AUDIO = false
JUMP_VELOCITY = 6 JUMP_VELOCITY = 6
[node name="WorldEnvironment" type="WorldEnvironment" parent="."] [node name="WorldEnvironment" type="WorldEnvironment" parent="."]

View File

@@ -1169,6 +1169,7 @@ health_drop_enabled = false
[node name="Player" parent="." instance=ExtResource("2_f87c2")] [node name="Player" parent="." instance=ExtResource("2_f87c2")]
transform = Transform3D(-0.866025, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866025, -16.0295, 1.4435, 12.1166) transform = Transform3D(-0.866025, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866025, -16.0295, 1.4435, 12.1166)
AUDIO = false
JUMP_VELOCITY = 6 JUMP_VELOCITY = 6
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]

View File

@@ -35,4 +35,5 @@ func _process(delta):
i.hive_velocity = (next_nav_point - i.global_transform.origin).normalized() * i.SPEED i.hive_velocity = (next_nav_point - i.global_transform.origin).normalized() * i.SPEED
elif i.player_in_view != true and i.player_last_seen != null: elif i.player_in_view != true and i.player_last_seen != null:
i.nav_agent.set_target_position(i.player_last_seen) i.nav_agent.set_target_position(i.player_last_seen)
var next_nav_point = i.nav_agent.get_next_path_position()
i.hive_velocity = (next_nav_point - i.global_transform.origin).normalized() * i.SPEED

View File

@@ -27,6 +27,9 @@ func _ready():
#set FOV #set FOV
camera.fov = respawn_fov camera.fov = respawn_fov
level_control.player.ammo_counter.visible = false
level_control.player.stamina_counter.visible = false
#start timer #start timer
timer.start() timer.start()
@@ -70,7 +73,6 @@ func _process(delta):
look_ray.look_at(Vector3(target.global_position), Vector3.UP) look_ray.look_at(Vector3(target.global_position), Vector3.UP)
camera.rotation = lerp(camera.rotation,look_ray.rotation,delta * CAMERA_LOOK_SPEED) camera.rotation = lerp(camera.rotation,look_ray.rotation,delta * CAMERA_LOOK_SPEED)
camera.fov = lerp(camera.fov, 40.0, delta * 5) camera.fov = lerp(camera.fov, 40.0, delta * 5)
print(camera.fov)
elif respawn == true: elif respawn == true:
position = lerp(position,respawn_position,delta * MOVE_SPEED * 1.5) position = lerp(position,respawn_position,delta * MOVE_SPEED * 1.5)

View File

@@ -5,40 +5,28 @@ var start_position
const SPEED = 3 const SPEED = 3
const SCALE_SPEED = 80 const SCALE_SPEED = 80
var taunts = ["tee hee", var taunts = ["hows your gut now you big cup of dumdum juice?",
"you're all tit and no nipple",
"you might be the shit, but i'm the wet wipe",
"ruh roh raggy, retard!",
"you look gay when you die.",
"maclunkey!",
"did i do that?",
"eat a bag of dicks", "eat a bag of dicks",
"better luck next time", "schwing!",
"that's gotta hurt", "go fuck yourself",
"did i do that", "hee hee",
"who? me?", "stop trying",
"another one down for me", "yowza!"]
"niiiiiiiiice",
"the trick is to not get hit",
"try winning?"]
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():
start_position = position scale.x = .5
scale.y = .5
var rand_scale = randf_range(.5,1.5)
scale.x = .5 * rand_scale
scale.y = .5 * rand_scale
text = taunts.pick_random() text = taunts.pick_random()
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta): func _process(delta):
pass
#scale.x = lerp(0,1,SCALE_SPEED * delta )
#scale.y = lerp(0,1,SCALE_SPEED * delta)
#position.y += SPEED * delta
var position_diff = clamp((position.y - start_position.y)/5,0,1)
modulate = Color(1, 1, 1,1 - position_diff)
outline_modulate = Color(0, 0, 0, 1 - position_diff)
if position_diff == 1:
queue_free()

View File

@@ -77,6 +77,8 @@ var pickupmsg
@onready var ear_wind = $Audio/EarWind @onready var ear_wind = $Audio/EarWind
@onready var hurt_audio = $Audio/Hurt @onready var hurt_audio = $Audio/Hurt
@onready var health_indicator = $HealthIndicator @onready var health_indicator = $HealthIndicator
@onready var ammo_counter = $Head/Camera3D/AmmoCounter
@onready var stamina_counter = $Head/Camera3D/StaminaCounter
@onready var weapon_spawner = $Head/Camera3D/WeaponHolder/WeaponSpawner @onready var weapon_spawner = $Head/Camera3D/WeaponHolder/WeaponSpawner
@onready var pick_up_detection = $pick_up_detection @onready var pick_up_detection = $pick_up_detection

View File

@@ -127,7 +127,6 @@ func _on_area_3d_body_part_hit(dam,bullet_damage):
var av_z = rng.randf_range(-MAX_AV,MAX_AV) var av_z = rng.randf_range(-MAX_AV,MAX_AV)
# Random Item Drop # Random Item Drop
#rand_item = rand_select.instantiate()
rand_item.position = self.global_position rand_item.position = self.global_position
rand_item.transform.basis = self.global_transform.basis rand_item.transform.basis = self.global_transform.basis
rand_item.linear_velocity += self.global_transform.basis * Vector3(lv_x,lv_y,lv_z) rand_item.linear_velocity += self.global_transform.basis * Vector3(lv_x,lv_y,lv_z)