techrunner/HorrorGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved setting speeds to inside set_condition instead of physics_process

Browse Source
This commit is contained in:
Willow Behar
2024-06-03 23:46:36 -05:00
parent f21da74555
commit 07b135208e
4 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Assets/scripts/player.gd
View File

@ -3,7 +3,7 @@ extends CharacterBody3D
#Condition Effect #Condition Effect
enum CONDITION {NORMAL, SPRINTING, VAPING, COUGHING, SEVERE_COUGHING} enum CONDITION {NORMAL, SPRINTING, VAPING, COUGHING, SEVERE_COUGHING}
@export var current_condition = CONDITION.NORMAL @export var current_condition:CONDITION = CONDITION.NORMAL
const SPEED_NORMAL = 5.0 const SPEED_NORMAL = 5.0
const SPEED_SPRINTING = 8.0 const SPEED_SPRINTING = 8.0
@ -11,7 +11,7 @@ const SPEED_VAPING = 4.5
const SPEED_SLOWED = 3.0 const SPEED_SLOWED = 3.0
const SPEED_IMMOBILE = 0.0 const SPEED_IMMOBILE = 0.0
const JUMP_VELOCITY = 4.5 const JUMP_VELOCITY = 4.5
var current_speed var current_speed = SPEED_NORMAL
var will_cough = false var will_cough = false
var timealive = 0 var timealive = 0
@ -28,18 +28,6 @@ var gravity = ProjectSettings.get_setting("physics/3d/default_gravity")
func _physics_process(delta): func _physics_process(delta):
if not is_paused: if not is_paused:
match current_condition:
CONDITION.NORMAL:
current_speed = SPEED_NORMAL
CONDITION.SPRINTING:
current_speed = SPEED_SPRINTING
CONDITION.VAPING:
current_speed = SPEED_VAPING
CONDITION.COUGHING:
current_speed = SPEED_SLOWED
CONDITION.SEVERE_COUGHING:
current_speed = SPEED_IMMOBILE
# Add the gravity. # Add the gravity.
if not is_on_floor(): if not is_on_floor():
velocity.y -= gravity * delta velocity.y -= gravity * delta
@ -59,7 +47,6 @@ func _physics_process(delta):
velocity.x = move_toward(velocity.x, 0, current_speed) velocity.x = move_toward(velocity.x, 0, current_speed)
velocity.z = move_toward(velocity.z, 0, current_speed) velocity.z = move_toward(velocity.z, 0, current_speed)
move_and_slide() move_and_slide()
var look_velocity = Input.get_vector("look_left", "look_right", "look_up", "look_down") var look_velocity = Input.get_vector("look_left", "look_right", "look_up", "look_down")
@ -102,27 +89,32 @@ func _input(event):
func set_condition(con): func set_condition(con):
current_condition = con current_condition = con
print("Setting Condition to ", con)
match con: match con:
CONDITION.VAPING: CONDITION.VAPING:
vapes_per_min += 1 vapes_per_min += 1
$Head/VapeLight.on() $Head/VapeLight.on()
$"Coughing Timer".start() $"Coughing Timer".start()
$"Severe Coughing Timer".start() $"Severe Coughing Timer".start()
current_speed = SPEED_VAPING
CONDITION.NORMAL: CONDITION.NORMAL:
$Head/VapeLight.off() $Head/VapeLight.off()
$"Coughing Timer".stop() $"Coughing Timer".stop()
$"Severe Coughing Timer".stop() $"Severe Coughing Timer".stop()
current_speed = SPEED_NORMAL
CONDITION.COUGHING: CONDITION.COUGHING:
$Head/VapeLight.off() $Head/VapeLight.off()
$"Coughing Recovery".start() $"Coughing Recovery".start()
$"Severe Coughing Timer".stop() $"Severe Coughing Timer".stop()
current_speed = SPEED_SLOWED
GlobalSettings.Player_Last_Location = global_transform.origin GlobalSettings.Player_Last_Location = global_transform.origin
CONDITION.SEVERE_COUGHING: CONDITION.SEVERE_COUGHING:
$Head/VapeLight.off() $Head/VapeLight.off()
$"Severe Coughing Recovery".start() $"Severe Coughing Recovery".start()
$"Coughing Timer".stop() $"Coughing Timer".stop()
current_speed = SPEED_IMMOBILE
GlobalSettings.Player_Last_Location = global_transform.origin GlobalSettings.Player_Last_Location = global_transform.origin
CONDITION.SPRINTING:
current_speed = SPEED_SPRINTING
func recover(): func recover():
will_cough = false will_cough = false

14
Assets/textures/Seamless-Black-Asphalt-Road-Texture.jpg.import
View File

@ -3,25 +3,27 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://c5sd1jlq8lvh5" uid="uid://c5sd1jlq8lvh5"
path="res://.godot/imported/Seamless-Black-Asphalt-Road-Texture.jpg-e653b682ca3d31aab9005298ac320d03.ctex" path.s3tc="res://.godot/imported/Seamless-Black-Asphalt-Road-Texture.jpg-e653b682ca3d31aab9005298ac320d03.s3tc.ctex"
path.etc2="res://.godot/imported/Seamless-Black-Asphalt-Road-Texture.jpg-e653b682ca3d31aab9005298ac320d03.etc2.ctex"
metadata={ metadata={
"vram_texture": false "imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
} }
[deps] [deps]
source_file="res://Assets/textures/Seamless-Black-Asphalt-Road-Texture.jpg" source_file="res://Assets/textures/Seamless-Black-Asphalt-Road-Texture.jpg"
dest_files=["res://.godot/imported/Seamless-Black-Asphalt-Road-Texture.jpg-e653b682ca3d31aab9005298ac320d03.ctex"] dest_files=["res://.godot/imported/Seamless-Black-Asphalt-Road-Texture.jpg-e653b682ca3d31aab9005298ac320d03.s3tc.ctex", "res://.godot/imported/Seamless-Black-Asphalt-Road-Texture.jpg-e653b682ca3d31aab9005298ac320d03.etc2.ctex"]
[params] [params]
compress/mode=0 compress/mode=2
compress/high_quality=false compress/high_quality=false
compress/lossy_quality=0.7 compress/lossy_quality=0.7
compress/hdr_compression=1 compress/hdr_compression=1
compress/normal_map=0 compress/normal_map=0
compress/channel_pack=0 compress/channel_pack=0
mipmaps/generate=false mipmaps/generate=true
mipmaps/limit=-1 mipmaps/limit=-1
roughness/mode=0 roughness/mode=0
roughness/src_normal="" roughness/src_normal=""
@ -31,4 +33,4 @@ process/normal_map_invert_y=false
process/hdr_as_srgb=false process/hdr_as_srgb=false
process/hdr_clamp_exposure=false process/hdr_clamp_exposure=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=0

14
Assets/textures/VapeLabel.png.import
View File

@ -3,25 +3,27 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://dr2kytwe0nuys" uid="uid://dr2kytwe0nuys"
path="res://.godot/imported/VapeLabel.png-0d93a32b94f47a9fc4e6d43d19085f29.ctex" path.s3tc="res://.godot/imported/VapeLabel.png-0d93a32b94f47a9fc4e6d43d19085f29.s3tc.ctex"
path.etc2="res://.godot/imported/VapeLabel.png-0d93a32b94f47a9fc4e6d43d19085f29.etc2.ctex"
metadata={ metadata={
"vram_texture": false "imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
} }
[deps] [deps]
source_file="res://Assets/textures/VapeLabel.png" source_file="res://Assets/textures/VapeLabel.png"
dest_files=["res://.godot/imported/VapeLabel.png-0d93a32b94f47a9fc4e6d43d19085f29.ctex"] dest_files=["res://.godot/imported/VapeLabel.png-0d93a32b94f47a9fc4e6d43d19085f29.s3tc.ctex", "res://.godot/imported/VapeLabel.png-0d93a32b94f47a9fc4e6d43d19085f29.etc2.ctex"]
[params] [params]
compress/mode=0 compress/mode=2
compress/high_quality=false compress/high_quality=false
compress/lossy_quality=0.7 compress/lossy_quality=0.7
compress/hdr_compression=1 compress/hdr_compression=1
compress/normal_map=0 compress/normal_map=0
compress/channel_pack=0 compress/channel_pack=0
mipmaps/generate=false mipmaps/generate=true
mipmaps/limit=-1 mipmaps/limit=-1
roughness/mode=0 roughness/mode=0
roughness/src_normal="" roughness/src_normal=""
@ -31,4 +33,4 @@ process/normal_map_invert_y=false
process/hdr_as_srgb=false process/hdr_as_srgb=false
process/hdr_clamp_exposure=false process/hdr_clamp_exposure=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=0

14
Assets/textures/concreteTexture.jpg.import
View File

@ -3,25 +3,27 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://c607tju8pjrje" uid="uid://c607tju8pjrje"
path="res://.godot/imported/concreteTexture.jpg-3621d4ceb1f4d50bb62634d9f3e306c1.ctex" path.s3tc="res://.godot/imported/concreteTexture.jpg-3621d4ceb1f4d50bb62634d9f3e306c1.s3tc.ctex"
path.etc2="res://.godot/imported/concreteTexture.jpg-3621d4ceb1f4d50bb62634d9f3e306c1.etc2.ctex"
metadata={ metadata={
"vram_texture": false "imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
} }
[deps] [deps]
source_file="res://Assets/textures/concreteTexture.jpg" source_file="res://Assets/textures/concreteTexture.jpg"
dest_files=["res://.godot/imported/concreteTexture.jpg-3621d4ceb1f4d50bb62634d9f3e306c1.ctex"] dest_files=["res://.godot/imported/concreteTexture.jpg-3621d4ceb1f4d50bb62634d9f3e306c1.s3tc.ctex", "res://.godot/imported/concreteTexture.jpg-3621d4ceb1f4d50bb62634d9f3e306c1.etc2.ctex"]
[params] [params]
compress/mode=0 compress/mode=2
compress/high_quality=false compress/high_quality=false
compress/lossy_quality=0.7 compress/lossy_quality=0.7
compress/hdr_compression=1 compress/hdr_compression=1
compress/normal_map=0 compress/normal_map=0
compress/channel_pack=0 compress/channel_pack=0
mipmaps/generate=false mipmaps/generate=true
mipmaps/limit=-1 mipmaps/limit=-1
roughness/mode=0 roughness/mode=0
roughness/src_normal="" roughness/src_normal=""
@ -31,4 +33,4 @@ process/normal_map_invert_y=false
process/hdr_as_srgb=false process/hdr_as_srgb=false
process/hdr_clamp_exposure=false process/hdr_clamp_exposure=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=0