derekdz/fps_project_1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed melee collision being enabled at start

Browse Source
This commit is contained in:
Derek
2025-03-15 00:12:09 -05:00
parent 0f2b5c41e2
commit efb3fee189
5 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
GameModes/DoNotGetHit.tres
View File

@@ -21,6 +21,7 @@ time_slowed_speed = 0.1
stamina_regen = false stamina_regen = false
max_stamina = 100.0 max_stamina = 100.0
stamina_drain = 20.0 stamina_drain = 20.0
stamina_gain = 5.0
air_dash_max = 1 air_dash_max = 1
load_save = false load_save = false
money_multiplier = 1.0 money_multiplier = 1.0

2
GameModes/standard.tres
View File

@@ -10,7 +10,7 @@ win_conditions = 0
survival_time = 160.0 survival_time = 160.0
max_number_of_chests = 3 max_number_of_chests = 3
money_lost_multiplier = 0.5 money_lost_multiplier = 0.5
weapon_penalty = 0 weapon_penalty = 1
weapon_drop_percentage = 0.5 weapon_drop_percentage = 0.5
ammo_drop_percentage = 0.5 ammo_drop_percentage = 0.5
walk_speed = 12.0 walk_speed = 12.0

1
GameModes/standard_stam_regen.tres
View File

@@ -21,6 +21,7 @@ time_slowed_speed = 0.1
stamina_regen = true stamina_regen = true
max_stamina = 100.0 max_stamina = 100.0
stamina_drain = 20.0 stamina_drain = 20.0
stamina_gain = 5.0
air_dash_max = 1 air_dash_max = 1
load_save = false load_save = false
money_multiplier = 1.0 money_multiplier = 1.0

2
gamemode.gd
View File

@@ -9,7 +9,7 @@ class_name gamemode
@export_group("Rewards and Penalties") @export_group("Rewards and Penalties")
@export var max_number_of_chests : int = 3 @export var max_number_of_chests : int = 3
@export var money_lost_multiplier : float = .5 @export var money_lost_multiplier : float = .5
@export_enum("Drop All Weapons","Drop Random","Drop None") var weapon_penalty = 0 @export_enum("Drop All Weapons","Drop Random","Drop None") var weapon_penalty = 1
@export var weapon_drop_percentage : float = .5 @export var weapon_drop_percentage : float = .5
@export var ammo_drop_percentage : float = .5 @export var ammo_drop_percentage : float = .5
@export_group("Player Movement") @export_group("Player Movement")

3
scripts/weapon_uberscript.gd
View File

@@ -42,6 +42,9 @@ var cycle_count
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():
if melee_collision_shape != null:
melee_collision_shape.disabled = true
if weapon_info.weapon_type != 1: if weapon_info.weapon_type != 1:
casings_chamber_last = weapon_info.max_ammo casings_chamber_last = weapon_info.max_ammo