Rendo/Chelimbalo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Many fixes

Browse source
This commit is contained in:
Rendo 2025-12-17 01:59:35 +05:00
commit e758c9f042
11 changed files with 8784 additions and 8739 deletions
Download patch file Download diff file Expand all files Collapse all files

6
weapons/gun/sp/starting_pistol.tscn
View file

@ -50,9 +50,9 @@ vertical_curve = SubResource("Curve_cmn6f")
horizontal_curve = SubResource("Curve_016ti")
damage_reduction_curve = SubResource("Curve_bwg3m")
emptyable = true
torso_damage = 22
head_damage = 60
limb_damage = 12
torso_damage = 35
head_damage = 80
limb_damage = 22
fire_timer = NodePath("../FireTimer")
[node name="Reload" type="Node" parent="."]

5
weapons/molikman/molik/molik.gd
View file

@ -15,14 +15,15 @@ func _physics_process(delta: float) -> void:
var collision = move_and_collide(velocity * delta)
if collision:
if collision.get_normal().y > 0:
if collision.get_normal().y > 0.05:
var fire: Node3D = preload("res://weapons/molikman/molik/molikman_molotov_fire.tscn").instantiate()
Session.dynamic_objects_parent.add_child(fire,true)
fire.global_position = global_position
fire.quaternion *= Quaternion(Vector3.UP,collision.get_normal())
queue_free()
else:
var normal = collision.get_normal()
velocity = velocity.bounce(normal) * 0.5
$MultiplayerAudio3D.multiplayer_play()
$molotov2.quaternion *= Quaternion($molotov2.basis.y, velocity.normalized())
$molotov.quaternion *= Quaternion($molotov.basis.y, velocity.normalized())

2
weapons/molikman/molik/molik.tscn
View file

@ -18,7 +18,7 @@ properties/0/replication_mode = 1
collision_layer = 8
script = ExtResource("1_aqokr")
[node name="molotov2" parent="." instance=ExtResource("2_dcuri")]
[node name="molotov" parent="." instance=ExtResource("2_dcuri")]
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
shape = SubResource("SphereShape3D_aqokr")

62
weapons/molikman/molik/molikman_molotov_fire.tscn
View file

@ -12,6 +12,33 @@
[ext_resource type="Texture2D" uid="uid://va158xyrsvb4" path="res://textures/players/molikman/molotov/fire_particle.png" id="7_18xly"]
[ext_resource type="AudioStream" uid="uid://blnblkd6eoldv" path="res://audio/molik_idle.ogg" id="7_apqju"]
[sub_resource type="Animation" id="Animation_bwl5g"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Decal:texture_albedo")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [ExtResource("2_fm7jn")]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Decal:texture_emission")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [ExtResource("2_fm7jn")]
}
[sub_resource type="Animation" id="Animation_m625o"]
resource_name = "main"
loop_mode = 1
@ -41,33 +68,6 @@ tracks/1/keys = {
"values": [ExtResource("2_fm7jn"), ExtResource("3_18xly"), ExtResource("4_wpp30"), ExtResource("5_66mwf"), ExtResource("6_bt4sy")]
}
[sub_resource type="Animation" id="Animation_bwl5g"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Decal:texture_albedo")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [ExtResource("2_fm7jn")]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Decal:texture_emission")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [ExtResource("2_fm7jn")]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_oujc3"]
_data = {
&"RESET": SubResource("Animation_bwl5g"),
@ -75,6 +75,7 @@ _data = {
}
[sub_resource type="CylinderShape3D" id="CylinderShape3D_fm7jn"]
height = 1.0615234
radius = 3.5
[sub_resource type="Gradient" id="Gradient_18xly"]
@ -168,6 +169,9 @@ properties/0/replication_mode = 1
properties/1/path = NodePath("Decal:size")
properties/1/spawn = true
properties/1/replication_mode = 1
properties/2/path = NodePath(".:rotation")
properties/2/spawn = true
properties/2/replication_mode = 1
[node name="MolikmanMolotovFire" type="Area3D" node_paths=PackedStringArray("damage_timer")]
collision_layer = 8
@ -177,10 +181,11 @@ dps = 33.333
damage_timer = NodePath("DamageTimer")
[node name="Decal" type="Decal" parent="."]
size = Vector3(7.5, 3, 7.5)
size = Vector3(7.5, 3.2404785, 7.5)
texture_albedo = ExtResource("2_fm7jn")
texture_emission = ExtResource("2_fm7jn")
emission_energy = 0.25
normal_fade = 0.75
cull_mask = 1048572
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
@ -190,6 +195,7 @@ libraries = {
autoplay = "main"
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.46923828, 0)
shape = SubResource("CylinderShape3D_fm7jn")
[node name="IdleParticles" type="GPUParticles3D" parent="."]