sowelilekusi/mtd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bomb launcher range and rocket launcher selection bugs

Browse Source
This commit is contained in:
Lexi Quinn
2023-11-28 18:02:40 +11:00
parent d5d832f3f2
commit e18ea532bc
8 changed files with 91 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PCs/Universal/ClassCards/BombLauncher/bomb_projectile.gd
View File

@ -6,7 +6,9 @@ var bounces := 0
func _ready() -> void:
apply_central_impulse(direction * force)
apply_central_impulse(direction.normalized() * force)
#print(direction.length())
#print(force)
if owner_id == 0:
max_bounces = 0

2
PCs/Universal/ClassCards/RocketLauncher/weapon_rocket_launcher.gd
View File

@ -23,7 +23,7 @@ func _ready() -> void:
func _process(delta: float) -> void:
super._process(delta)
if !trigger_held or time_since_firing < time_between_shots:
if !trigger_held or time_since_firing < time_between_shots or current_energy < energy_cost:
return
var target_list = targets.duplicate()
for target in target_list:

141
PCs/hero.tscn
View File

@ -45,28 +45,28 @@ _data = {
}
[sub_resource type="ViewportTexture" id="ViewportTexture_8f12g"]
viewport_path = NodePath("SubViewport/Head2/LeftHand/SubViewport")
viewport_path = NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport")
[sub_resource type="ViewportTexture" id="ViewportTexture_v8f6r"]
viewport_path = NodePath("SubViewport/Head2/LeftHand/SubViewport2")
viewport_path = NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport2")
[sub_resource type="ViewportTexture" id="ViewportTexture_xme80"]
viewport_path = NodePath("SubViewport/Head2/LeftHand/SubViewport3")
viewport_path = NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport3")
[sub_resource type="Environment" id="Environment_cilxe"]
background_mode = 1
background_color = Color(0.282353, 0.615686, 0.278431, 1)
[sub_resource type="AtlasTexture" id="AtlasTexture_4tsug"]
[sub_resource type="AtlasTexture" id="AtlasTexture_mac51"]
resource_local_to_scene = true
atlas = ExtResource("6_yyp8i")
region = Rect2(0, 0, 96, 96)
[sub_resource type="ViewportTexture" id="ViewportTexture_m3ots"]
viewport_path = NodePath("Nametag")
viewport_path = NodePath("NametagViewport")
[sub_resource type="ViewportTexture" id="ViewportTexture_mk87g"]
viewport_path = NodePath("SubViewport")
viewport_path = NodePath("FirstPersonViewport")
[sub_resource type="ViewportTexture" id="ViewportTexture_574jy"]
viewport_path = NodePath("MiniMapViewport")
@ -92,25 +92,25 @@ collision_mask = 37
script = ExtResource("1_pihpe")
hero_class = ExtResource("2_dbyo0")
camera = NodePath("ViewMovement/Head")
gun_camera = NodePath("SubViewport/Head2")
left_hand_sprite = NodePath("SubViewport/Head2/LeftHand/Sprite3D")
left_hand = NodePath("SubViewport/Head2/LeftHand")
right_hand = NodePath("SubViewport/Head2/RightHand")
right_hand_animator = NodePath("SubViewport/Head2/RightHand/AnimationPlayer")
gun_camera = NodePath("FirstPersonViewport/Head2")
left_hand_sprite = NodePath("FirstPersonViewport/Head2/LeftHand/Sprite3D")
left_hand = NodePath("FirstPersonViewport/Head2/LeftHand")
right_hand = NodePath("FirstPersonViewport/Head2/RightHand")
right_hand_animator = NodePath("FirstPersonViewport/Head2/RightHand/AnimationPlayer")
edit_tool = NodePath("ViewMovement/Head/EditTool")
gauntlet_sprite = NodePath("SubViewport/Head2/RightHand/Gauntlet")
gauntlet_sprite = NodePath("FirstPersonViewport/Head2/RightHand/Gauntlet")
sprite = NodePath("EightDirectionSprite")
hand_sprite = NodePath("SubViewport/Head2/LeftHand/SubViewport/Sprite2D")
hand_sprite = NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport/Sprite2D")
interaction_raycast = NodePath("ViewMovement/Head/RayCast3D")
inventory = NodePath("Inventory")
card = NodePath("SubViewport/Head2/LeftHand/SubViewport/Node2D")
gauntlet_card_1 = NodePath("SubViewport/Head2/LeftHand/SubViewport2/Node2D")
gauntlet_card_2 = NodePath("SubViewport/Head2/LeftHand/SubViewport3/Node2D")
card = NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport/Node2D")
gauntlet_card_1 = NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport2/Node2D")
gauntlet_card_2 = NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport3/Node2D")
pause_menu_scene = ExtResource("3_avnsx")
hud = NodePath("HUD")
movement = NodePath("PlayerMovement")
player_name_tag = NodePath("Nametag/Label")
weapon_swap_timer = NodePath("Timer")
player_name_tag = NodePath("NametagViewport/Label")
weapon_swap_timer = NodePath("WeaponSwapTimer")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
@ -140,12 +140,12 @@ collision_mask = 24
target_position = Vector3(0, 0, -100)
collision_mask = 65535
[node name="SubViewport" type="SubViewport" parent="."]
[node name="FirstPersonViewport" type="SubViewport" parent="."]
transparent_bg = true
size = Vector2i(1920, 1080)
render_target_update_mode = 4
[node name="Head2" type="Camera3D" parent="SubViewport" node_paths=PackedStringArray("clone_camera")]
[node name="Head2" type="Camera3D" parent="FirstPersonViewport" node_paths=PackedStringArray("clone_camera")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0)
cull_mask = 2
environment = SubResource("Environment_ekmug")
@ -153,62 +153,62 @@ projection = 1
script = ExtResource("11_4sdwe")
clone_camera = NodePath("../../ViewMovement/Head")
[node name="RightHand" type="Node3D" parent="SubViewport/Head2"]
[node name="RightHand" type="Node3D" parent="FirstPersonViewport/Head2"]
transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0.66, -0.255, -1)
[node name="AnimationPlayer" type="AnimationPlayer" parent="SubViewport/Head2/RightHand"]
[node name="AnimationPlayer" type="AnimationPlayer" parent="FirstPersonViewport/Head2/RightHand"]
libraries = {
"": SubResource("AnimationLibrary_2wknc")
}
[node name="Gauntlet" type="Sprite3D" parent="SubViewport/Head2/RightHand"]
[node name="Gauntlet" type="Sprite3D" parent="FirstPersonViewport/Head2/RightHand"]
layers = 2
texture_filter = 0
texture = ExtResource("3_5myy0")
[node name="LeftHand" type="Node3D" parent="SubViewport/Head2"]
[node name="LeftHand" type="Node3D" parent="FirstPersonViewport/Head2"]
transform = Transform3D(0.235, 0, 0, 0, 0.235, 0, 0, 0, 0.235, -0.665, -0.275, -1)
[node name="SubViewport" type="SubViewport" parent="SubViewport/Head2/LeftHand"]
[node name="SubViewport" type="SubViewport" parent="FirstPersonViewport/Head2/LeftHand"]
transparent_bg = true
render_target_update_mode = 4
[node name="Node2D" parent="SubViewport/Head2/LeftHand/SubViewport" instance=ExtResource("4_mwtvp")]
[node name="Node2D" parent="FirstPersonViewport/Head2/LeftHand/SubViewport" instance=ExtResource("4_mwtvp")]
[node name="Sprite2D" type="Sprite2D" parent="SubViewport/Head2/LeftHand/SubViewport"]
[node name="Sprite2D" type="Sprite2D" parent="FirstPersonViewport/Head2/LeftHand/SubViewport"]
texture_filter = 1
position = Vector2(256, 256)
scale = Vector2(8, 8)
texture = ExtResource("9_gxh2h")
[node name="SubViewport2" type="SubViewport" parent="SubViewport/Head2/LeftHand"]
[node name="SubViewport2" type="SubViewport" parent="FirstPersonViewport/Head2/LeftHand"]
transparent_bg = true
render_target_update_mode = 4
[node name="Node2D" parent="SubViewport/Head2/LeftHand/SubViewport2" instance=ExtResource("4_mwtvp")]
[node name="Node2D" parent="FirstPersonViewport/Head2/LeftHand/SubViewport2" instance=ExtResource("4_mwtvp")]
visible = false
[node name="SubViewport3" type="SubViewport" parent="SubViewport/Head2/LeftHand"]
[node name="SubViewport3" type="SubViewport" parent="FirstPersonViewport/Head2/LeftHand"]
transparent_bg = true
render_target_update_mode = 4
[node name="Node2D" parent="SubViewport/Head2/LeftHand/SubViewport3" instance=ExtResource("4_mwtvp")]
[node name="Node2D" parent="FirstPersonViewport/Head2/LeftHand/SubViewport3" instance=ExtResource("4_mwtvp")]
visible = false
[node name="Sprite3D" type="Sprite3D" parent="SubViewport/Head2/LeftHand"]
[node name="Sprite3D" type="Sprite3D" parent="FirstPersonViewport/Head2/LeftHand"]
transform = Transform3D(0.45, 0, 0, 0, 0.45, 0, 0, 0, 0.45, 0.2, 0.19, 0)
layers = 2
texture_filter = 0
texture = SubResource("ViewportTexture_8f12g")
[node name="Sprite3D2" type="Sprite3D" parent="SubViewport/Head2/LeftHand"]
[node name="Sprite3D2" type="Sprite3D" parent="FirstPersonViewport/Head2/LeftHand"]
transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, 4.74969, -0.0599999, 0.0158834)
layers = 2
sorting_offset = 1.0
texture_filter = 0
texture = SubResource("ViewportTexture_v8f6r")
[node name="Sprite3D3" type="Sprite3D" parent="SubViewport/Head2/LeftHand"]
[node name="Sprite3D3" type="Sprite3D" parent="FirstPersonViewport/Head2/LeftHand"]
transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, 6.03, -0.0599999, 0.0158834)
layers = 2
sorting_offset = 1.0
@ -228,12 +228,12 @@ size = 15.0
script = ExtResource("12_3hpi3")
anchor = NodePath("../..")
[node name="Nametag" type="SubViewport" parent="."]
[node name="NametagViewport" type="SubViewport" parent="."]
transparent_bg = true
size = Vector2i(300, 40)
render_target_update_mode = 4
[node name="Label" type="Label" parent="Nametag"]
[node name="Label" type="Label" parent="NametagViewport"]
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
@ -245,7 +245,7 @@ vertical_alignment = 1
[node name="EightDirectionSprite" parent="." instance=ExtResource("2_ib0t5")]
transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0.915529, 0)
texture = SubResource("AtlasTexture_4tsug")
texture = SubResource("AtlasTexture_mac51")
[node name="MinimapIcon" type="Sprite3D" parent="."]
transform = Transform3D(4, 0, 0, 0, 0.0698095, 3.99939, 0, -3.99939, 0.0698095, 0, 2.86288, 0)
@ -253,7 +253,7 @@ layers = 4
texture_filter = 0
texture = ExtResource("15_nhlam")
[node name="Sprite3D" type="Sprite3D" parent="."]
[node name="NametagSprite" type="Sprite3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
layers = 5
sorting_offset = 500.0
@ -271,32 +271,23 @@ script = ExtResource("20_cfhw8")
player = NodePath("..")
head = NodePath("../ViewMovement")
[node name="HUD" type="CanvasLayer" parent="." node_paths=PackedStringArray("wave_count", "lives_count", "enemy_count", "currency_count", "crosshair", "minimap", "minimap_cam", "minimap_viewport", "fps_label", "hover_text", "enemy_sprites", "enemy_counts", "weapon_energy_bar", "offhand_energy_bar")]
[node name="HUD" type="CanvasLayer" parent="." node_paths=PackedStringArray("wave_count", "lives_count", "currency_count", "crosshair", "minimap", "minimap_cam", "minimap_viewport", "fps_label", "hover_text", "enemy_sprites", "enemy_counts", "weapon_energy_bar", "offhand_energy_bar")]
script = ExtResource("8_yl6ka")
wave_count = NodePath("WaveCount")
lives_count = NodePath("LivesCount")
enemy_count = NodePath("EnemyCount")
currency_count = NodePath("Currency")
crosshair = NodePath("ColorRect")
minimap = NodePath("TextureRect2")
currency_count = NodePath("CurrencyCount")
crosshair = NodePath("Crosshair")
minimap = NodePath("Minimap")
minimap_cam = NodePath("../MiniMapViewport/Camera3D")
minimap_viewport = NodePath("../MiniMapViewport")
fps_label = NodePath("Label")
hover_text = NodePath("Label2")
enemy_sprites = [NodePath("TextureRect4/TextureRect"), NodePath("TextureRect4/TextureRect2"), NodePath("TextureRect4/TextureRect3"), NodePath("TextureRect4/TextureRect4"), NodePath("TextureRect4/TextureRect5")]
enemy_counts = [NodePath("TextureRect4/TextureRect/Label"), NodePath("TextureRect4/TextureRect2/Label2"), NodePath("TextureRect4/TextureRect3/Label3"), NodePath("TextureRect4/TextureRect4/Label4"), NodePath("TextureRect4/TextureRect5/Label5")]
fps_label = NodePath("FPSCounter")
hover_text = NodePath("HoverOverText")
enemy_sprites = [NodePath("EnemyTracker/TextureRect"), NodePath("EnemyTracker/TextureRect2"), NodePath("EnemyTracker/TextureRect3"), NodePath("EnemyTracker/TextureRect4"), NodePath("EnemyTracker/TextureRect5")]
enemy_counts = [NodePath("EnemyTracker/TextureRect/Label"), NodePath("EnemyTracker/TextureRect2/Label2"), NodePath("EnemyTracker/TextureRect3/Label3"), NodePath("EnemyTracker/TextureRect4/Label4"), NodePath("EnemyTracker/TextureRect5/Label5")]
weapon_energy_bar = NodePath("PrimaryEnergyBar")
offhand_energy_bar = NodePath("OffhandEnergyBar")
[node name="EnemyCount" type="Label" parent="HUD"]
visible = false
offset_left = 10.0
offset_top = 80.0
offset_right = 123.0
offset_bottom = 106.0
text = "Enemies left: 0"
[node name="TextureRect" type="TextureRect" parent="HUD"]
[node name="FirstPersonCam" type="TextureRect" parent="HUD"]
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
@ -305,7 +296,7 @@ grow_vertical = 2
mouse_filter = 2
texture = SubResource("ViewportTexture_mk87g")
[node name="TextureRect2" type="TextureRect" parent="HUD"]
[node name="Minimap" type="TextureRect" parent="HUD"]
anchors_preset = 1
anchor_left = 1.0
anchor_right = 1.0
@ -317,7 +308,7 @@ grow_horizontal = 0
mouse_filter = 2
texture = SubResource("ViewportTexture_574jy")
[node name="Label" type="Label" parent="HUD"]
[node name="FPSCounter" type="Label" parent="HUD"]
anchors_preset = 1
anchor_left = 1.0
anchor_right = 1.0
@ -353,7 +344,7 @@ text = "120
horizontal_alignment = 1
vertical_alignment = 1
[node name="TextureRect3" type="TextureRect" parent="HUD"]
[node name="MinimapBorder" type="TextureRect" parent="HUD"]
texture_filter = 1
anchors_preset = 1
anchor_left = 1.0
@ -366,7 +357,7 @@ grow_horizontal = 0
mouse_filter = 2
texture = ExtResource("16_x1xjr")
[node name="TextureRect4" type="TextureRect" parent="HUD"]
[node name="EnemyTracker" type="TextureRect" parent="HUD"]
texture_filter = 1
anchors_preset = 5
anchor_left = 0.5
@ -379,14 +370,14 @@ grow_horizontal = 2
mouse_filter = 2
texture = ExtResource("14_l34nu")
[node name="TextureRect" type="TextureRect" parent="HUD/TextureRect4"]
[node name="TextureRect" type="TextureRect" parent="HUD/EnemyTracker"]
visible = false
layout_mode = 0
offset_right = 64.0
offset_bottom = 64.0
texture = ExtResource("15_q3yot")
[node name="Label" type="Label" parent="HUD/TextureRect4/TextureRect"]
[node name="Label" type="Label" parent="HUD/EnemyTracker/TextureRect"]
layout_mode = 0
offset_left = 28.01
offset_top = 41.81
@ -400,7 +391,7 @@ text = "999"
horizontal_alignment = 1
vertical_alignment = 1
[node name="TextureRect2" type="TextureRect" parent="HUD/TextureRect4"]
[node name="TextureRect2" type="TextureRect" parent="HUD/EnemyTracker"]
visible = false
layout_mode = 0
offset_left = 61.0
@ -408,7 +399,7 @@ offset_right = 125.0
offset_bottom = 64.0
texture = ExtResource("15_q3yot")
[node name="Label2" type="Label" parent="HUD/TextureRect4/TextureRect2"]
[node name="Label2" type="Label" parent="HUD/EnemyTracker/TextureRect2"]
layout_mode = 0
offset_left = 28.745
offset_top = 41.81
@ -422,7 +413,7 @@ text = "999"
horizontal_alignment = 1
vertical_alignment = 1
[node name="TextureRect3" type="TextureRect" parent="HUD/TextureRect4"]
[node name="TextureRect3" type="TextureRect" parent="HUD/EnemyTracker"]
visible = false
layout_mode = 0
offset_left = 122.0
@ -430,7 +421,7 @@ offset_right = 186.0
offset_bottom = 64.0
texture = ExtResource("15_q3yot")
[node name="Label3" type="Label" parent="HUD/TextureRect4/TextureRect3"]
[node name="Label3" type="Label" parent="HUD/EnemyTracker/TextureRect3"]
layout_mode = 0
offset_left = 29.29
offset_top = 41.81
@ -444,7 +435,7 @@ text = "999"
horizontal_alignment = 1
vertical_alignment = 1
[node name="TextureRect4" type="TextureRect" parent="HUD/TextureRect4"]
[node name="TextureRect4" type="TextureRect" parent="HUD/EnemyTracker"]
visible = false
layout_mode = 0
offset_left = 183.0
@ -452,7 +443,7 @@ offset_right = 247.0
offset_bottom = 64.0
texture = ExtResource("15_q3yot")
[node name="Label4" type="Label" parent="HUD/TextureRect4/TextureRect4"]
[node name="Label4" type="Label" parent="HUD/EnemyTracker/TextureRect4"]
layout_mode = 0
offset_left = 29.0
offset_top = 41.81
@ -466,7 +457,7 @@ text = "999"
horizontal_alignment = 1
vertical_alignment = 1
[node name="TextureRect5" type="TextureRect" parent="HUD/TextureRect4"]
[node name="TextureRect5" type="TextureRect" parent="HUD/EnemyTracker"]
visible = false
layout_mode = 0
offset_left = 244.0
@ -474,7 +465,7 @@ offset_right = 308.0
offset_bottom = 64.0
texture = ExtResource("15_q3yot")
[node name="Label5" type="Label" parent="HUD/TextureRect4/TextureRect5"]
[node name="Label5" type="Label" parent="HUD/EnemyTracker/TextureRect5"]
layout_mode = 0
offset_left = 29.0
offset_top = 41.81
@ -488,7 +479,7 @@ text = "999"
horizontal_alignment = 1
vertical_alignment = 1
[node name="Currency" type="Label" parent="HUD"]
[node name="CurrencyCount" type="Label" parent="HUD"]
anchors_preset = 1
anchor_left = 1.0
anchor_right = 1.0
@ -503,7 +494,7 @@ text = "20"
horizontal_alignment = 1
vertical_alignment = 1
[node name="Label2" type="Label" parent="HUD"]
[node name="HoverOverText" type="Label" parent="HUD"]
visible = false
anchors_preset = 8
anchor_left = 0.5
@ -539,7 +530,7 @@ text = "1"
horizontal_alignment = 1
vertical_alignment = 1
[node name="ColorRect" type="ColorRect" parent="HUD"]
[node name="Crosshair" type="ColorRect" parent="HUD"]
material = SubResource("ShaderMaterial_lg5jo")
anchors_preset = 15
anchor_right = 1.0
@ -589,8 +580,8 @@ texture_progress = ExtResource("21_apps2")
tint_under = Color(0, 1, 1, 0.168627)
tint_progress = Color(0, 1, 1, 1)
[node name="Timer" type="Timer" parent="."]
[node name="WeaponSwapTimer" type="Timer" parent="."]
wait_time = 0.9
one_shot = true
[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"]
[connection signal="timeout" from="WeaponSwapTimer" to="." method="_on_timer_timeout"]