fixed the issue where enemies could walk over a gap if it wasnt on a pathfinding node

This commit is contained in:
2024-03-29 21:58:40 +11:00
parent 3c28999cd9
commit 62d0dc0130
40 changed files with 205 additions and 138 deletions

View File

@ -8,6 +8,7 @@
[ext_resource type="AudioStream" uid="uid://cu654fn5nke3n" path="res://PCs/Entomologist/ClassCards/Blowdart/shot1.wav" id="6_bfygd"]
[sub_resource type="AtlasTexture" id="AtlasTexture_85web"]
resource_local_to_scene = true
atlas = ExtResource("5_rvf06")
region = Rect2(0, 0, 64, 64)

View File

@ -8,6 +8,7 @@
[ext_resource type="AudioStream" uid="uid://cxiluyamsxson" path="res://PCs/Mage/ClassCards/Fireball/shot1.wav" id="6_o5rjg"]
[sub_resource type="AtlasTexture" id="AtlasTexture_hfmm6"]
resource_local_to_scene = true
atlas = ExtResource("5_r42ic")
region = Rect2(0, 0, 64, 64)

View File

@ -8,6 +8,7 @@
[ext_resource type="AudioStream" uid="uid://dgqmtmty7ekmc" path="res://PCs/Mage/ClassCards/Icicle/shot1.wav" id="6_ilpsp"]
[sub_resource type="AtlasTexture" id="AtlasTexture_7uf3s"]
resource_local_to_scene = true
atlas = ExtResource("5_iremk")
region = Rect2(0, 0, 64, 64)

View File

@ -7,6 +7,7 @@
[ext_resource type="Material" uid="uid://ckung57mij7ue" path="res://PCs/Mage/ClassCards/Refrigerator/cold_particles.tres" id="5_8q1lc"]
[sub_resource type="AtlasTexture" id="AtlasTexture_0yua2"]
resource_local_to_scene = true
atlas = ExtResource("4_y5ps0")
region = Rect2(0, 0, 64, 64)

View File

@ -6,6 +6,7 @@
[ext_resource type="AudioStream" uid="uid://chrf1dcq2ujw0" path="res://PCs/Mechanic/ClassCards/Assault/shot1.wav" id="4_gdaci"]
[sub_resource type="AtlasTexture" id="AtlasTexture_604rb"]
resource_local_to_scene = true
atlas = ExtResource("3_kuj4t")
region = Rect2(0, 0, 64, 64)

View File

@ -8,6 +8,7 @@
[ext_resource type="AudioStream" uid="uid://qeav4v23p0dd" path="res://PCs/Mechanic/ClassCards/BombLauncher/shot1.wav" id="6_rg62n"]
[sub_resource type="AtlasTexture" id="AtlasTexture_4fobv"]
resource_local_to_scene = true
atlas = ExtResource("5_iyrt8")
region = Rect2(0, 0, 64, 64)

View File

@ -22,4 +22,4 @@ value = 3.0
script = ExtResource("2_wptab")
target_type = 1
attributes = Array[ExtResource("1_ikp33")]([SubResource("Resource_j28f4"), SubResource("Resource_likes"), SubResource("Resource_b65mk")])
text = "Hold to apply Burning to enemies in front of you"
text = "Applies burning to enemies in front of it"

View File

@ -8,6 +8,7 @@
[ext_resource type="Material" uid="uid://gyeamtekshor" path="res://PCs/Mechanic/ClassCards/Flamethrower/flame_particles.tres" id="6_idhp2"]
[sub_resource type="AtlasTexture" id="AtlasTexture_3hank"]
resource_local_to_scene = true
atlas = ExtResource("5_wdw3e")
region = Rect2(0, 0, 64, 64)

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dkb8e0uu5vikw"
path="res://.godot/imported/accelerator.png-a0973046062ee4662a163fa426169703.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://PCs/Mechanic/ClassCards/Gatling/accelerator.png"
dest_files=["res://.godot/imported/accelerator.png-a0973046062ee4662a163fa426169703.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

View File

@ -2,12 +2,13 @@
[ext_resource type="PackedScene" uid="uid://difwo7wlyqr3h" path="res://Scenes/Weapons/hitscan_weapon.tscn" id="1_fwlu5"]
[ext_resource type="Resource" uid="uid://cj2x1jvo8l4ot" path="res://PCs/Mechanic/ClassCards/Gatling/weapon_stats.tres" id="2_fnyjd"]
[ext_resource type="Texture2D" uid="uid://bjh6e8t8br6rq" path="res://PCs/Mechanic/ClassCards/Gatling/gatling.png" id="2_rv8ps"]
[ext_resource type="Script" path="res://PCs/Mechanic/ClassCards/Gatling/weapon_gatling.gd" id="2_wm4al"]
[ext_resource type="Texture2D" uid="uid://dkb8e0uu5vikw" path="res://PCs/Mechanic/ClassCards/Gatling/accelerator.png" id="4_gi42y"]
[ext_resource type="AudioStream" uid="uid://1j0rquv4awjs" path="res://PCs/Mechanic/ClassCards/Gatling/shot1.wav" id="5_gelfi"]
[sub_resource type="AtlasTexture" id="AtlasTexture_0im1y"]
atlas = ExtResource("2_rv8ps")
resource_local_to_scene = true
atlas = ExtResource("4_gi42y")
region = Rect2(0, 0, 64, 64)
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_778e1"]

View File

@ -8,6 +8,7 @@
[ext_resource type="AudioStream" uid="uid://v3j5lw827y85" path="res://PCs/Mechanic/ClassCards/GlueLauncher/shot1.wav" id="6_6qk7c"]
[sub_resource type="AtlasTexture" id="AtlasTexture_ehcsl"]
resource_local_to_scene = true
atlas = ExtResource("5_obawu")
region = Rect2(0, 0, 64, 64)

View File

@ -8,6 +8,7 @@
[ext_resource type="Material" uid="uid://bjab6t4n0s5ac" path="res://PCs/Mechanic/ClassCards/Reactor/radiation_particles.tres" id="6_0sgt1"]
[sub_resource type="AtlasTexture" id="AtlasTexture_0dpt5"]
resource_local_to_scene = true
atlas = ExtResource("5_bawfy")
region = Rect2(0, 0, 64, 64)

View File

@ -10,6 +10,7 @@
[ext_resource type="AudioStream" uid="uid://n0w2kj5j2x4e" path="res://PCs/Mechanic/ClassCards/RocketLauncher/shot1.wav" id="8_genbv"]
[sub_resource type="AtlasTexture" id="AtlasTexture_f4p4w"]
resource_local_to_scene = true
atlas = ExtResource("4_iygkf")
region = Rect2(0, 0, 64, 64)

View File

@ -8,6 +8,7 @@
[ext_resource type="AudioStream" uid="uid://bixe14jkki8be" path="res://PCs/Mechanic/ClassCards/Sniper/shot1.wav" id="6_pd8iu"]
[sub_resource type="AtlasTexture" id="AtlasTexture_cussn"]
resource_local_to_scene = true
atlas = ExtResource("4_ub37g")
region = Rect2(0, 0, 64, 64)

View File

@ -57,19 +57,19 @@ func _ready() -> void:
if is_multiplayer_authority():
right_hand_animator.play("weapon_sway")
right_hand_animator.speed_scale = 0
ears.make_current()
camera.make_current()
sprite.queue_free()
hand_sprite.texture = hero_class.hand_texture
player_name_tag.queue_free()
ears.make_current()
for card: Card in hero_class.deck:
inventory.add(card)
else:
camera.set_visible(false)
gun_camera.set_visible(false)
hud.set_visible(false)
if weapon != null:
weapon.set_raycast_origin(camera)
for card: Card in hero_class.deck:
inventory.add(card)
sprite.texture.atlas = hero_class.texture
check_left_hand_valid()
Input.mouse_mode = Input.MOUSE_MODE_CAPTURED
@ -109,7 +109,7 @@ func _process(delta: float) -> void:
if interaction_raycast.get_collider() is InteractButton:
var button: InteractButton = interaction_raycast.get_collider() as InteractButton
if currency >= button.press_cost:
button.press()
button.press(self)
currency -= button.press_cost
if interaction_raycast.get_collider() is ItemCard:
add_card(interaction_raycast.get_collider().pick_up())
@ -172,7 +172,7 @@ func increment_selected() -> void:
func decrement_selected() -> void:
inventory_selected_index -= 1
if inventory_selected_index < 0:
inventory_selected_index = inventory.contents.keys().size() - 1
inventory_selected_index = max(inventory.contents.keys().size() - 1, 0)
func _unhandled_input(event: InputEvent) -> void:

View File

@ -10,7 +10,7 @@
[ext_resource type="PackedScene" uid="uid://dqt1ggtkpkuhs" path="res://Scenes/gauntlet.tscn" id="5_jlxb3"]
[ext_resource type="Script" path="res://Scripts/inventory.gd" id="6_cf5ap"]
[ext_resource type="Texture2D" uid="uid://cjqxkraykhxxk" path="res://PCs/Mechanic/red.png" id="6_yyp8i"]
[ext_resource type="Script" path="res://Scripts/HUD.gd" id="8_yl6ka"]
[ext_resource type="Script" path="res://Scripts/hud.gd" id="8_yl6ka"]
[ext_resource type="Texture2D" uid="uid://ctkixdue3o7ec" path="res://PCs/Mechanic/red_hand.png" id="9_gxh2h"]
[ext_resource type="Script" path="res://Scripts/on_top_camera.gd" id="11_4sdwe"]
[ext_resource type="Script" path="res://Scripts/minimap_cam.gd" id="12_3hpi3"]
@ -127,7 +127,6 @@ gauntlet_card_2 = NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport3/Node
pause_menu_scene = ExtResource("3_avnsx")
hud = NodePath("HUD")
movement = NodePath("PlayerMovement")
sprint_zoom_speed = null
player_name_tag = NodePath("NametagViewport/Label")
weapon_swap_timer = NodePath("WeaponSwapTimer")
ears = NodePath("AudioListener3D")

View File

@ -50,7 +50,6 @@ func _physics_process(delta: float) -> void:
#TODO: maybe make the speed slower/faster on slopes?
var player_speed: float = Vector2(player.velocity.x, player.velocity.z).length()
speed_factor = lerp(speed_factor, player_speed / head_bob_max_effect_speed, 20.0 * delta)
sample_point += delta * head_bob_frequency * speed_factor
else:
speed_factor = lerp(speed_factor, 0.0, 20.0 * delta)
@ -69,6 +68,7 @@ func _process(delta: float) -> void:
#constant_trauma = min(1.0, constant_trauma + 0.1)
#if Input.is_action_just_pressed("decrease_trauma"):
#constant_trauma = max(0.0, constant_trauma - 0.1)
sample_point += delta * head_bob_frequency * speed_factor
var camera_translation: Vector3 = Vector3.ZERO
var camera_tilt: Vector3 = Vector3.ZERO
camera_translation = minecraft_translation(head_bob_amplitude * speed_factor)
@ -133,10 +133,13 @@ func focus_target() -> Vector3:
return focus_raycast.global_position + -focus_raycast.global_transform.basis.z * 30.0
func tilt_camera(tilt: Vector3, speed: float) -> void:
camera.rotation.x = lerp(camera.rotation.x, tilt.x, speed)
camera.rotation.y = lerp(camera.rotation.y, tilt.y, speed)
camera.rotation.z = lerp(camera.rotation.z, tilt.z, speed)
#func tilt_camera(tilt: Vector3, speed: float) -> void:
##camera.rotation.x = lerp(camera.rotation.x, tilt.x, speed)
##camera.rotation.y = lerp(camera.rotation.y, tilt.y, speed)
##camera.rotation.z = lerp(camera.rotation.z, tilt.z, speed)
#camera.rotation.x = tilt.x
#camera.rotation.y = tilt.y
#camera.rotation.z = tilt.z
func get_strafe_tilt(player_velocity: Vector3) -> Vector3: