add-new-npc-music
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
[
|
||||
{"name": "Газспоровец", "text": "Эй, стоять на месте!"},
|
||||
{"name": "Иван", "text": "Что такое? Мне надо к своему звэру, а труба мешала"},
|
||||
{"name": "Газспоровец", "text": "Компания Газспор не может мешать, мы делаем нашу страну великой, а ты повредил трубу"},
|
||||
{"name": "Иван", "text": "Я её не трогал, она такая и была, вы совсем ебанулись на ветерана выебаться?"},
|
||||
{"name": "Газспоровец", "text": "Рабы газового сектора, убить врага народа и Отечества!"},
|
||||
{"name": "Иван", "text": "Пиздец…."}
|
||||
|
||||
]
|
||||
File diff suppressed because one or more lines are too long
@@ -7,49 +7,6 @@
|
||||
[ext_resource type="Texture2D" uid="uid://dq6lmmv7chko6" path="res://addons/Addon Assets/Weapon Textures/atlass_1_diffuse.png" id="5_ddjun"]
|
||||
[ext_resource type="Script" uid="uid://dgt4q3ev7fhh5" path="res://addons/Weapons/Scripts/AnimationManagerScriptEM.gd" id="6_5krv0"]
|
||||
[ext_resource type="AudioStream" uid="uid://dreqp22wgbfnn" path="res://Sound/effect/pistol.mp3" id="7_4cgil"]
|
||||
[ext_resource type="Animation" uid="uid://c35olcv36un30" path="res://addons/custmode/animation/A_TPose.res" id="8_sylwx"]
|
||||
[ext_resource type="Animation" uid="uid://c0gxmcis6551r" path="res://addons/custmode/animation/Crouch_Fwd.res" id="9_2l6hg"]
|
||||
[ext_resource type="Animation" uid="uid://co8jgyh1w0ocf" path="res://addons/custmode/animation/Crouch_Idle.res" id="10_2aeih"]
|
||||
[ext_resource type="Animation" uid="uid://cr5w0k7jvp7qu" path="res://addons/custmode/animation/Dance.res" id="11_73t45"]
|
||||
[ext_resource type="Animation" uid="uid://de0euajjogn7u" path="res://addons/custmode/animation/Death01.res" id="12_l2xu2"]
|
||||
[ext_resource type="Animation" uid="uid://bhg2fcoy0sch4" path="res://addons/custmode/animation/Driving.res" id="13_hg564"]
|
||||
[ext_resource type="Animation" uid="uid://dnppagy4wcq87" path="res://addons/custmode/animation/Fixing_Kneeling.res" id="14_qcy8o"]
|
||||
[ext_resource type="Animation" uid="uid://ds4cvbr1bmaqy" path="res://addons/custmode/animation/Hit_Chest.res" id="15_r05vh"]
|
||||
[ext_resource type="Animation" uid="uid://ckankjg0stocn" path="res://addons/custmode/animation/Hit_Head.res" id="16_7smad"]
|
||||
[ext_resource type="Animation" uid="uid://cdivfofibnlng" path="res://addons/custmode/animation/Idle.res" id="17_emfrh"]
|
||||
[ext_resource type="Animation" uid="uid://b2j75v1mna2ym" path="res://addons/custmode/animation/Idle_Talking.res" id="18_xc0qi"]
|
||||
[ext_resource type="Animation" uid="uid://dboe5ydn4hmwt" path="res://addons/custmode/animation/Idle_Torch.res" id="19_u20go"]
|
||||
[ext_resource type="Animation" uid="uid://clgac16bw0p37" path="res://addons/custmode/animation/Interact.res" id="20_g88nd"]
|
||||
[ext_resource type="Animation" uid="uid://cbchiuflrpagi" path="res://addons/custmode/animation/Jog_Fwd.res" id="21_0ympm"]
|
||||
[ext_resource type="Animation" uid="uid://bk2tx4hhifpvl" path="res://addons/custmode/animation/Jump.res" id="22_0xwyj"]
|
||||
[ext_resource type="Animation" uid="uid://be4fy6sct8o5m" path="res://addons/custmode/animation/Jump_Land.res" id="23_brk4j"]
|
||||
[ext_resource type="Animation" uid="uid://ct7al2n03wbbk" path="res://addons/custmode/animation/Jump_Start.res" id="24_2s4of"]
|
||||
[ext_resource type="Animation" uid="uid://ceb0f7evfuq61" path="res://addons/custmode/animation/PickUp_Table.res" id="25_efml6"]
|
||||
[ext_resource type="Animation" uid="uid://2io8pkfi0qtu" path="res://addons/custmode/animation/Pistol_Aim_Down.res" id="26_egplj"]
|
||||
[ext_resource type="Animation" uid="uid://duh6km0eawovj" path="res://addons/custmode/animation/Pistol_Aim_Neutral.res" id="27_fbwky"]
|
||||
[ext_resource type="Animation" uid="uid://dh2wwda8pe6nv" path="res://addons/custmode/animation/Pistol_Aim_Up.res" id="28_yitjk"]
|
||||
[ext_resource type="Animation" uid="uid://cbdpuchvoad1e" path="res://addons/custmode/animation/Pistol_Idle.res" id="29_ytv87"]
|
||||
[ext_resource type="Animation" uid="uid://dbcxdaddfi8tn" path="res://addons/custmode/animation/Pistol_Reload.res" id="30_w65ax"]
|
||||
[ext_resource type="Animation" uid="uid://qyce3pmr4m7m" path="res://addons/custmode/animation/Pistol_Shoot.res" id="31_wjlv6"]
|
||||
[ext_resource type="Animation" uid="uid://dc2vl3cx0651v" path="res://addons/custmode/animation/Punch_Cross.res" id="32_pn3q1"]
|
||||
[ext_resource type="Animation" uid="uid://dy86564igvsna" path="res://addons/custmode/animation/Punch_Jab.res" id="33_xthm8"]
|
||||
[ext_resource type="Animation" uid="uid://c5qodyimgs2y4" path="res://addons/custmode/animation/Push.res" id="34_4d5cm"]
|
||||
[ext_resource type="Animation" uid="uid://b41g83vv8c0gm" path="res://addons/custmode/animation/Roll.res" id="35_8agvv"]
|
||||
[ext_resource type="Animation" uid="uid://bhev5pvbb67yf" path="res://addons/custmode/animation/Sitting_Enter.res" id="36_ndfj4"]
|
||||
[ext_resource type="Animation" uid="uid://djqh85lmqx2t1" path="res://addons/custmode/animation/Sitting_Exit.res" id="37_bj61h"]
|
||||
[ext_resource type="Animation" uid="uid://dwwg0iqmrs0yp" path="res://addons/custmode/animation/Sitting_Idle.res" id="38_h4dak"]
|
||||
[ext_resource type="Animation" uid="uid://tc4m782dv73s" path="res://addons/custmode/animation/Sitting_Talking.res" id="39_8qd4v"]
|
||||
[ext_resource type="Animation" uid="uid://yh7sv8gxjwpn" path="res://addons/custmode/animation/Spell_Simple_Enter.res" id="40_1q51s"]
|
||||
[ext_resource type="Animation" uid="uid://bq7f4r7gklu0i" path="res://addons/custmode/animation/Spell_Simple_Exit.res" id="41_hxxf4"]
|
||||
[ext_resource type="Animation" uid="uid://cbincpbl7io6d" path="res://addons/custmode/animation/Spell_Simple_Idle.res" id="42_515ts"]
|
||||
[ext_resource type="Animation" uid="uid://de3tfnj30od6q" path="res://addons/custmode/animation/Spell_Simple_Shoot.res" id="43_puk1y"]
|
||||
[ext_resource type="Animation" uid="uid://c5bpxmnpopygc" path="res://addons/custmode/animation/Sprint.res" id="44_tabc1"]
|
||||
[ext_resource type="Animation" uid="uid://ccf1i0k56r3m1" path="res://addons/custmode/animation/Swim_Fwd.res" id="45_df565"]
|
||||
[ext_resource type="Animation" uid="uid://iobwmvj658ec" path="res://addons/custmode/animation/Swim_Idle.res" id="46_ocgi2"]
|
||||
[ext_resource type="Animation" uid="uid://dywobbcy165i" path="res://addons/custmode/animation/Sword_Attack.res" id="47_x4h3i"]
|
||||
[ext_resource type="Animation" uid="uid://dccj4e647csbg" path="res://addons/custmode/animation/Sword_Idle.res" id="48_0xxcy"]
|
||||
[ext_resource type="Animation" uid="uid://blaskiatvl25f" path="res://addons/custmode/animation/Walk.res" id="49_3u4as"]
|
||||
[ext_resource type="Animation" uid="uid://cq2fn2cjkdvi6" path="res://addons/custmode/animation/Walk_Formal.res" id="50_1euuw"]
|
||||
[ext_resource type="PackedScene" uid="uid://mtk2v8ebbwhq" path="res://addons/custmode/Models/source/cursed_lo-fi_nightmare_fuel.glb" id="51_au7u0"]
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_jkuv2"]
|
||||
@@ -95,53 +52,6 @@ _surfaces = [{
|
||||
blend_shape_mode = 0
|
||||
shadow_mesh = SubResource("ArrayMesh_n0tva")
|
||||
|
||||
[sub_resource type="AnimationLibrary" id="AnimationLibrary_y7ubl"]
|
||||
_data = {
|
||||
&"A_TPose": ExtResource("8_sylwx"),
|
||||
&"Crouch_Fwd": ExtResource("9_2l6hg"),
|
||||
&"Crouch_Idle": ExtResource("10_2aeih"),
|
||||
&"Dance": ExtResource("11_73t45"),
|
||||
&"Death01": ExtResource("12_l2xu2"),
|
||||
&"Driving": ExtResource("13_hg564"),
|
||||
&"Fixing_Kneeling": ExtResource("14_qcy8o"),
|
||||
&"Hit_Chest": ExtResource("15_r05vh"),
|
||||
&"Hit_Head": ExtResource("16_7smad"),
|
||||
&"Idle": ExtResource("17_emfrh"),
|
||||
&"Idle_Talking": ExtResource("18_xc0qi"),
|
||||
&"Idle_Torch": ExtResource("19_u20go"),
|
||||
&"Interact": ExtResource("20_g88nd"),
|
||||
&"Jog_Fwd": ExtResource("21_0ympm"),
|
||||
&"Jump": ExtResource("22_0xwyj"),
|
||||
&"Jump_Land": ExtResource("23_brk4j"),
|
||||
&"Jump_Start": ExtResource("24_2s4of"),
|
||||
&"PickUp_Table": ExtResource("25_efml6"),
|
||||
&"Pistol_Aim_Down": ExtResource("26_egplj"),
|
||||
&"Pistol_Aim_Neutral": ExtResource("27_fbwky"),
|
||||
&"Pistol_Aim_Up": ExtResource("28_yitjk"),
|
||||
&"Pistol_Idle": ExtResource("29_ytv87"),
|
||||
&"Pistol_Reload": ExtResource("30_w65ax"),
|
||||
&"Pistol_Shoot": ExtResource("31_wjlv6"),
|
||||
&"Punch_Cross": ExtResource("32_pn3q1"),
|
||||
&"Punch_Jab": ExtResource("33_xthm8"),
|
||||
&"Push": ExtResource("34_4d5cm"),
|
||||
&"Roll": ExtResource("35_8agvv"),
|
||||
&"Sitting_Enter": ExtResource("36_ndfj4"),
|
||||
&"Sitting_Exit": ExtResource("37_bj61h"),
|
||||
&"Sitting_Idle": ExtResource("38_h4dak"),
|
||||
&"Sitting_Talking": ExtResource("39_8qd4v"),
|
||||
&"Spell_Simple_Enter": ExtResource("40_1q51s"),
|
||||
&"Spell_Simple_Exit": ExtResource("41_hxxf4"),
|
||||
&"Spell_Simple_Idle": ExtResource("42_515ts"),
|
||||
&"Spell_Simple_Shoot": ExtResource("43_puk1y"),
|
||||
&"Sprint": ExtResource("44_tabc1"),
|
||||
&"Swim_Fwd": ExtResource("45_df565"),
|
||||
&"Swim_Idle": ExtResource("46_ocgi2"),
|
||||
&"Sword_Attack": ExtResource("47_x4h3i"),
|
||||
&"Sword_Idle": ExtResource("48_0xxcy"),
|
||||
&"Walk": ExtResource("49_3u4as"),
|
||||
&"Walk_Formal": ExtResource("50_1euuw")
|
||||
}
|
||||
|
||||
[node name="CharacterBody3D" type="CharacterBody3D" unique_id=1156384226]
|
||||
collision_layer = 96
|
||||
collision_mask = 127
|
||||
@@ -204,8 +114,5 @@ script = ExtResource("6_5krv0")
|
||||
unique_name_in_owner = true
|
||||
stream = ExtResource("7_4cgil")
|
||||
|
||||
[node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=765625744]
|
||||
libraries/ = SubResource("AnimationLibrary_y7ubl")
|
||||
|
||||
[node name="Sketchfab_Scene" parent="." unique_id=1617225270 instance=ExtResource("51_au7u0")]
|
||||
transform = Transform3D(-0.01, 0, -8.7422775e-10, 0, 0.01, 0, 8.7422775e-10, 0, -0.01, 0, -0.8445944, 0)
|
||||
|
||||
@@ -326,6 +326,8 @@ bind/64/name = &"ball_leaf_r"
|
||||
bind/64/bone = -1
|
||||
bind/64/pose = Transform3D(-1.0000001, -6.9388815e-18, -1.05879106e-22, 4.879777e-15, -1.490116e-07, 0.9999998, -5.8207675e-11, 1.0000001, -3.5527135e-15, -0.08900002, -0.19209997, -0.015200032)
|
||||
|
||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_fda8e"]
|
||||
|
||||
[sub_resource type="AnimationLibrary" id="AnimationLibrary_y7ubl"]
|
||||
_data = {
|
||||
&"A_TPose": ExtResource("7_5pjsm"),
|
||||
@@ -900,6 +902,7 @@ bones/64/scale = Vector3(1, 1, 0.9999995)
|
||||
mesh = SubResource("ArrayMesh_fda8e")
|
||||
skin = SubResource("Skin_o8w5x")
|
||||
skeleton = NodePath("..")
|
||||
surface_material_override/0 = SubResource("StandardMaterial3D_fda8e")
|
||||
|
||||
[node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=765625744]
|
||||
root_motion_track = NodePath("%GeneralSkeleton:Root")
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,33 @@
|
||||
[gd_scene format=3 uid="uid://b7d5ynkt4f5ab"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://bv488f4v7ly6a" path="res://addons/NPC/script/dialog_npct.gd" id="1_7lvgh"]
|
||||
[ext_resource type="PackedScene" uid="uid://b41r8mfwa3mj1" path="res://addons/custmode/Models/Killers/Character_Killer_03.fbx" id="2_7lvgh"]
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_se2kl"]
|
||||
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_diulm"]
|
||||
size = Vector3(1.6360468, 1.3225784, 2.9930296)
|
||||
|
||||
[node name="npc" type="StaticBody3D" unique_id=2094693982]
|
||||
collision_layer = 64
|
||||
collision_mask = 121
|
||||
script = ExtResource("1_7lvgh")
|
||||
|
||||
[node name="Hitbox" type="CollisionShape3D" parent="." unique_id=1852865682]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.017934263, 0.009854734, 0.019842744)
|
||||
shape = SubResource("CapsuleShape3D_se2kl")
|
||||
debug_color = Color(0.52798665, 0.57221377, 5.7756904e-07, 0.41960785)
|
||||
|
||||
[node name="DetectArea" type="Area3D" parent="." unique_id=798798411]
|
||||
transform = Transform3D(1.15835, 0, 0, 0, 1.5085664, 0, 0, 0, 3.406684, 0.4316032, 0.013125002, 0.15177906)
|
||||
collision_layer = 64
|
||||
collision_mask = 2
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="DetectArea" unique_id=1961649541]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2729469, 0.09678304, 0.4440172)
|
||||
shape = SubResource("BoxShape3D_diulm")
|
||||
|
||||
[node name="Character_Killer_03" parent="." unique_id=1735501213 instance=ExtResource("2_7lvgh")]
|
||||
transform = Transform3D(0.355, 0, 0, 0, 0.355, 0, 0, 0, 0.355, 0, -0.905, 0)
|
||||
|
||||
[connection signal="area_entered" from="DetectArea" to="." method="_on_detect_area_area_entered"]
|
||||
@@ -246,3 +246,4 @@ func enemy_shoot() -> void:
|
||||
var reduced_damage = damage_to_player * 0.8
|
||||
print("[ВРАГ] Бах! Вспышка отрисована. Нанесено урона: ", reduced_damage)
|
||||
player_health.take_damage(reduced_damage)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user