fixed landing recoil

This commit is contained in:
Derek
2024-12-04 19:52:26 -06:00
parent 478e2822d2
commit f293c6745f
7 changed files with 110 additions and 3203 deletions

View File

@@ -82,12 +82,14 @@ metadata/class = "Greenhouse_LODVariant"
[sub_resource type="Resource" id="Resource_n7bfa"] [sub_resource type="Resource" id="Resource_n7bfa"]
resource_name = "Greenhouse_LODVariant" resource_name = "Greenhouse_LODVariant"
script = ExtResource("1_bm2ld") script = ExtResource("1_bm2ld")
spawned_spatial = ExtResource("5_2jjj0")
cast_shadow = 1 cast_shadow = 1
metadata/class = "Greenhouse_LODVariant" metadata/class = "Greenhouse_LODVariant"
[sub_resource type="Resource" id="Resource_dwxoi"] [sub_resource type="Resource" id="Resource_dwxoi"]
resource_name = "Greenhouse_LODVariant" resource_name = "Greenhouse_LODVariant"
script = ExtResource("1_bm2ld") script = ExtResource("1_bm2ld")
spawned_spatial = ExtResource("5_2jjj0")
cast_shadow = 1 cast_shadow = 1
metadata/class = "Greenhouse_LODVariant" metadata/class = "Greenhouse_LODVariant"
@@ -95,7 +97,7 @@ metadata/class = "Greenhouse_LODVariant"
resource_name = "Greenhouse_Plant" resource_name = "Greenhouse_Plant"
script = ExtResource("3_mbrvh") script = ExtResource("3_mbrvh")
mesh/mesh_LOD_variants = [SubResource("Resource_0o4o0"), SubResource("Resource_n7bfa"), SubResource("Resource_dwxoi")] mesh/mesh_LOD_variants = [SubResource("Resource_0o4o0"), SubResource("Resource_n7bfa"), SubResource("Resource_dwxoi")]
mesh/selected_for_edit_resource = SubResource("Resource_0o4o0") mesh/selected_for_edit_resource = SubResource("Resource_dwxoi")
mesh/mesh_LOD_max_distance = 1000.0 mesh/mesh_LOD_max_distance = 1000.0
mesh/mesh_LOD_kill_distance = -1.0 mesh/mesh_LOD_kill_distance = -1.0
mesh/mesh_LOD_max_capacity = 75 mesh/mesh_LOD_max_capacity = 75
@@ -104,7 +106,7 @@ octree/octree_reconfigure_button = false
octree/octree_recenter_button = false octree/octree_recenter_button = false
density/density_per_units = 100.0 density/density_per_units = 100.0
scale/scale_scaling_type = 4 scale/scale_scaling_type = 4
scale/scale_range = [Vector3(2, 2, 2), Vector3(3, 3, 3)] scale/scale_range = [Vector3(2, 2, 2), Vector3(4, 4, 4)]
up_vector/up_vector_primary_type = 2 up_vector/up_vector_primary_type = 2
up_vector/up_vector_primary = Vector3(0, 0, 0) up_vector/up_vector_primary = Vector3(0, 0, 0)
up_vector/up_vector_secondary_type = 2 up_vector/up_vector_secondary_type = 2
@@ -139,5 +141,5 @@ metadata/class = "Greenhouse_PlantState"
resource_name = "Greenhouse" resource_name = "Greenhouse"
script = ExtResource("1_hmwua") script = ExtResource("1_hmwua")
plant_types/greenhouse_plant_states = [SubResource("Resource_8c4ux"), SubResource("Resource_1idl1")] plant_types/greenhouse_plant_states = [SubResource("Resource_8c4ux"), SubResource("Resource_1idl1")]
plant_types/selected_for_edit_resource = SubResource("Resource_8c4ux") plant_types/selected_for_edit_resource = SubResource("Resource_1idl1")
metadata/class = "Greenhouse" metadata/class = "Greenhouse"

View File

@@ -3,25 +3,26 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://cuokbqee2ob4o" uid="uid://cuokbqee2ob4o"
path="res://.godot/imported/tree1.bark.albedooverlay.001.png-9bdcd1b172884ac9d4d73100a3661788.ctex" path.s3tc="res://.godot/imported/tree1.bark.albedooverlay.001.png-9bdcd1b172884ac9d4d73100a3661788.s3tc.ctex"
metadata={ metadata={
"vram_texture": false "imported_formats": ["s3tc_bptc"],
"vram_texture": true
} }
[deps] [deps]
source_file="res://assets/Models/textures/tree1.bark.albedooverlay.001.png" source_file="res://assets/Models/textures/tree1.bark.albedooverlay.001.png"
dest_files=["res://.godot/imported/tree1.bark.albedooverlay.001.png-9bdcd1b172884ac9d4d73100a3661788.ctex"] dest_files=["res://.godot/imported/tree1.bark.albedooverlay.001.png-9bdcd1b172884ac9d4d73100a3661788.s3tc.ctex"]
[params] [params]
compress/mode=0 compress/mode=2
compress/high_quality=false compress/high_quality=false
compress/lossy_quality=0.7 compress/lossy_quality=0.7
compress/hdr_compression=1 compress/hdr_compression=1
compress/normal_map=0 compress/normal_map=0
compress/channel_pack=0 compress/channel_pack=0
mipmaps/generate=false mipmaps/generate=true
mipmaps/limit=-1 mipmaps/limit=-1
roughness/mode=0 roughness/mode=0
roughness/src_normal="" roughness/src_normal=""
@@ -31,4 +32,4 @@ process/normal_map_invert_y=false
process/hdr_as_srgb=false process/hdr_as_srgb=false
process/hdr_clamp_exposure=false process/hdr_clamp_exposure=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=1 detect_3d/compress_to=0

View File

@@ -16,6 +16,7 @@
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hc8kj"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hc8kj"]
resource_name = "blunderbus.stock" resource_name = "blunderbus.stock"
cull_mode = 2 cull_mode = 2
diffuse_mode = 3
albedo_texture = ExtResource("3_4fcbv") albedo_texture = ExtResource("3_4fcbv")
roughness_texture = ExtResource("5_adrdr") roughness_texture = ExtResource("5_adrdr")
roughness_texture_channel = 1 roughness_texture_channel = 1
@@ -27,8 +28,9 @@ texture_filter = 2
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_211mx"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_211mx"]
resource_name = "blunderbus.metal" resource_name = "blunderbus.metal"
cull_mode = 2 cull_mode = 2
diffuse_mode = 3
albedo_texture = ExtResource("3_5l523") albedo_texture = ExtResource("3_5l523")
metallic = 1.0 metallic = 0.9
roughness_texture = ExtResource("6_x42cq") roughness_texture = ExtResource("6_x42cq")
roughness_texture_channel = 4 roughness_texture_channel = 4
normal_enabled = true normal_enabled = true

View File

@@ -35,7 +35,7 @@ version_control/autoload_on_startup=true
[editor_plugins] [editor_plugins]
enabled=PackedStringArray("res://addons/dreadpon.spatial_gardener/plugin.cfg", "res://addons/terrain_3d/plugin.cfg") enabled=PackedStringArray("res://addons/dreadpon.spatial_gardener/plugin.cfg")
[global_group] [global_group]

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
extends Node3D extends Node3D
@export var load_save : = true
@export var player : Node @export var player : Node
@export var money = 250 @export var money = 250
@export var start_health = 3 @export var start_health = 3
@@ -46,12 +46,10 @@ func _ready():
#connect to signals #connect to signals
SignalBus.enemy_count_changed.connect(enemy_count) SignalBus.enemy_count_changed.connect(enemy_count)
#refresh_scene()
#LOAD DATA #LOAD DATA
SaveLoad.load_persistent_data() SaveLoad.load_persistent_data()
#refresh_scene()
if SaveLoad.data_cleared: if SaveLoad.data_cleared or !load_save:
refresh_scene() refresh_scene()
GameGlobals.game_loaded = true GameGlobals.game_loaded = true
SignalBus.emit_signal("game_loaded") SignalBus.emit_signal("game_loaded")
@@ -59,8 +57,8 @@ func _ready():
SaveLoad.load_save_game_data() SaveLoad.load_save_game_data()
#Spawn Crown #Spawn Crown
var crown_spawn = crown.instantiate()
if SaveLoad.last_hit_path: if SaveLoad.last_hit_path:
var crown_spawn = crown.instantiate()
var crown_target = get_node(SaveLoad.last_hit_path) var crown_target = get_node(SaveLoad.last_hit_path)
if crown_target: if crown_target:
crown_target.add_child(crown_spawn) crown_target.add_child(crown_spawn)

View File

@@ -239,7 +239,7 @@ func _physics_process(delta):
var recoil_amount = Vector3(-.3,0,0) var recoil_amount = Vector3(-.3,0,0)
land_sound.volume_db = land_volume land_sound.volume_db = land_volume
land_sound.play() land_sound.play()
recoil.add_recoil(recoil_amount,10,2) recoil.add_recoil(recoil_amount,10,10)
moving_fast_top_speed = 0.0 moving_fast_top_speed = 0.0
moving_fast = false moving_fast = false