idk
This commit is contained in:
parent
ac6c4c433f
commit
553f8ea77a
7 changed files with 55 additions and 7 deletions
|
|
@ -14,6 +14,6 @@ background_mode = 2
|
||||||
sky = SubResource("Sky_hb4cm")
|
sky = SubResource("Sky_hb4cm")
|
||||||
ambient_light_color = Color(1, 1, 1, 1)
|
ambient_light_color = Color(1, 1, 1, 1)
|
||||||
tonemap_mode = 3
|
tonemap_mode = 3
|
||||||
|
ssr_enabled = true
|
||||||
ssao_enabled = true
|
ssao_enabled = true
|
||||||
volumetric_fog_enabled = true
|
|
||||||
volumetric_fog_density = 0.0
|
volumetric_fog_density = 0.0
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,6 @@ PlayerGlobal="*res://players/player/player_global.gd"
|
||||||
Lobby="*res://multiplayer/lobby.gd"
|
Lobby="*res://multiplayer/lobby.gd"
|
||||||
Session="*res://multiplayer/session.gd"
|
Session="*res://multiplayer/session.gd"
|
||||||
ClientSettings="*res://gui/client_settings/client_settings.gd"
|
ClientSettings="*res://gui/client_settings/client_settings.gd"
|
||||||
ClientSettingsMenu="res://gui/client_settings/client_settings.tscn"
|
|
||||||
Registry="*res://systems/registry.gd"
|
Registry="*res://systems/registry.gd"
|
||||||
Shop="*res://gui/buy_menu/shop.gd"
|
Shop="*res://gui/buy_menu/shop.gd"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,6 @@ func get_empty_ability_slot() -> StringName:
|
||||||
return "ability_third"
|
return "ability_third"
|
||||||
return "ability_first"
|
return "ability_first"
|
||||||
|
|
||||||
@rpc("authority","call_remote","reliable")
|
|
||||||
func switch(to: StringName, exit: bool = true):
|
func switch(to: StringName, exit: bool = true):
|
||||||
if slots.has(to) == false or slots[to] == null or slots[to] == current_state or (multiplayer.get_remote_sender_id() != 1 and is_multiplayer_authority() == false):
|
if slots.has(to) == false or slots[to] == null or slots[to] == current_state or (multiplayer.get_remote_sender_id() != 1 and is_multiplayer_authority() == false):
|
||||||
return
|
return
|
||||||
|
|
@ -96,8 +95,6 @@ func switch(to: StringName, exit: bool = true):
|
||||||
|
|
||||||
ammo_updated.emit(current_state.ammo,current_state.remaining_ammo)
|
ammo_updated.emit(current_state.ammo,current_state.remaining_ammo)
|
||||||
switched_to.emit(current_state)
|
switched_to.emit(current_state)
|
||||||
if is_multiplayer_authority():
|
|
||||||
switch.rpc(to,exit)
|
|
||||||
|
|
||||||
func return_to_previous(exit: bool = true):
|
func return_to_previous(exit: bool = true):
|
||||||
if last_slot != "":
|
if last_slot != "":
|
||||||
|
|
@ -143,9 +140,17 @@ func check_for_empty() -> void:
|
||||||
return_to_previous(false)
|
return_to_previous(false)
|
||||||
child.queue_free()
|
child.queue_free()
|
||||||
|
|
||||||
|
|
||||||
func on_ammo_updated() -> void:
|
func on_ammo_updated() -> void:
|
||||||
|
if is_multiplayer_authority() == false:
|
||||||
|
return
|
||||||
if current_state != null:
|
if current_state != null:
|
||||||
ammo_updated.emit(current_state.ammo,current_state.remaining_ammo)
|
ammo_updated.emit(current_state.ammo,current_state.remaining_ammo)
|
||||||
|
remote_ammo_update.rpc(current_state.ammo,current_state.remaining_ammo)
|
||||||
|
|
||||||
|
@rpc
|
||||||
|
func remote_ammo_update(ammo: int, remaining_ammo: int):
|
||||||
|
ammo_updated.emit(ammo,remaining_ammo)
|
||||||
|
|
||||||
func disable() -> void:
|
func disable() -> void:
|
||||||
disabled = true
|
disabled = true
|
||||||
|
|
|
||||||
43
textures/icons/icons.svg.import
Normal file
43
textures/icons/icons.svg.import
Normal file
|
|
@ -0,0 +1,43 @@
|
||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="texture"
|
||||||
|
type="CompressedTexture2D"
|
||||||
|
uid="uid://ddplpvk2pofd"
|
||||||
|
path="res://.godot/imported/icons.svg-47acad6a566121ffe50321daf77bf9e3.ctex"
|
||||||
|
metadata={
|
||||||
|
"vram_texture": false
|
||||||
|
}
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://textures/icons/icons.svg"
|
||||||
|
dest_files=["res://.godot/imported/icons.svg-47acad6a566121ffe50321daf77bf9e3.ctex"]
|
||||||
|
|
||||||
|
[params]
|
||||||
|
|
||||||
|
compress/mode=0
|
||||||
|
compress/high_quality=false
|
||||||
|
compress/lossy_quality=0.7
|
||||||
|
compress/uastc_level=0
|
||||||
|
compress/rdo_quality_loss=0.0
|
||||||
|
compress/hdr_compression=1
|
||||||
|
compress/normal_map=0
|
||||||
|
compress/channel_pack=0
|
||||||
|
mipmaps/generate=false
|
||||||
|
mipmaps/limit=-1
|
||||||
|
roughness/mode=0
|
||||||
|
roughness/src_normal=""
|
||||||
|
process/channel_remap/red=0
|
||||||
|
process/channel_remap/green=1
|
||||||
|
process/channel_remap/blue=2
|
||||||
|
process/channel_remap/alpha=3
|
||||||
|
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=1
|
||||||
|
svg/scale=1.0
|
||||||
|
editor/scale_with_editor_scale=false
|
||||||
|
editor/convert_colors_with_editor_theme=false
|
||||||
|
|
@ -20,6 +20,7 @@ registry_entry = &"mm_molik"
|
||||||
visibility_target = &"sp"
|
visibility_target = &"sp"
|
||||||
max_ammo = 3
|
max_ammo = 3
|
||||||
ammo_mags = 0
|
ammo_mags = 0
|
||||||
|
speed_modifier = 0.9
|
||||||
can_be_previous = false
|
can_be_previous = false
|
||||||
destroy_when_empty = true
|
destroy_when_empty = true
|
||||||
enter_state = NodePath("Intro")
|
enter_state = NodePath("Intro")
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ properties/0/replication_mode = 1
|
||||||
collision_layer = 8
|
collision_layer = 8
|
||||||
collision_mask = 2
|
collision_mask = 2
|
||||||
script = ExtResource("1_qokq0")
|
script = ExtResource("1_qokq0")
|
||||||
dps = 25.0
|
dps = 33.333
|
||||||
damage_timer = NodePath("DamageTimer")
|
damage_timer = NodePath("DamageTimer")
|
||||||
|
|
||||||
[node name="Decal" type="Decal" parent="."]
|
[node name="Decal" type="Decal" parent="."]
|
||||||
|
|
|
||||||
|
|
@ -26,4 +26,4 @@ func fire() -> void:
|
||||||
var molotov: CharacterBody3D = molik.instantiate()
|
var molotov: CharacterBody3D = molik.instantiate()
|
||||||
Session.dynamic_objects_parent.add_child(molotov,true)
|
Session.dynamic_objects_parent.add_child(molotov,true)
|
||||||
molotov.global_transform = machine.player_camera.global_transform
|
molotov.global_transform = machine.player_camera.global_transform
|
||||||
molotov.velocity = -molotov.global_basis.z * 25
|
molotov.velocity = -molotov.global_basis.z * 25 + machine.player.velocity
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue