Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Godot 3.5.1 + other fixes #3

Merged
merged 11 commits into from Oct 19, 2022
4 changes: 3 additions & 1 deletion project/audio/Cash_Gained.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
4 changes: 3 additions & 1 deletion project/audio/Cash_Lost.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
4 changes: 3 additions & 1 deletion project/audio/Dandelion.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
4 changes: 3 additions & 1 deletion project/audio/Feather.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
4 changes: 3 additions & 1 deletion project/audio/Hard_Click_Close_Book.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
4 changes: 3 additions & 1 deletion project/audio/Mandrake_v2_short.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
4 changes: 3 additions & 1 deletion project/audio/New_Customer.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
4 changes: 3 additions & 1 deletion project/audio/New_Order.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
4 changes: 3 additions & 1 deletion project/audio/Page_turn.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
4 changes: 3 additions & 1 deletion project/audio/Potion_Ready.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
4 changes: 3 additions & 1 deletion project/audio/Potion_ready_v2.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
4 changes: 3 additions & 1 deletion project/audio/Seeds.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
4 changes: 3 additions & 1 deletion project/audio/Soft_Thump_Open_Book.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
4 changes: 3 additions & 1 deletion project/audio/UI_Click.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
4 changes: 3 additions & 1 deletion project/audio/Use_Ingredient.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
2 changes: 1 addition & 1 deletion project/audio/clicker.gd
Expand Up @@ -4,6 +4,6 @@ extends AudioStreamPlayer

func _ready():
get_parent().connect("pressed", self, "handle_button_pressed")

func handle_button_pressed():
play()
7 changes: 0 additions & 7 deletions project/audio/clicker.tscn
Expand Up @@ -5,11 +5,4 @@

[node name="Clicker" type="AudioStreamPlayer"]
stream = ExtResource( 1 )
volume_db = 0.0
pitch_scale = 1.0
autoplay = false
stream_paused = false
mix_target = 0
bus = "Master"
script = ExtResource( 2 )

4 changes: 3 additions & 1 deletion project/audio/mushroom.wav.import
Expand Up @@ -17,5 +17,7 @@ force/max_rate=false
force/max_rate_hz=44100
edit/trim=true
edit/normalize=true
edit/loop=false
edit/loop_mode=0
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0
4 changes: 4 additions & 0 deletions project/beginButton.png.import
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/beginButton.png-5e3aef86f5e2a0f1a29cd245875fec46.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -25,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Expand Down
4 changes: 4 additions & 0 deletions project/beginButtonHover.png.import
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/beginButtonHover.png-84bd0c8250c6321c5a7fe551c9cfe04d.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -25,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Expand Down
4 changes: 4 additions & 0 deletions project/click.png.import
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/click.png-956200b84f044548ccc591573b729680.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -25,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Expand Down
86 changes: 0 additions & 86 deletions project/default_env.tres
@@ -1,102 +1,16 @@
[gd_resource type="Environment" load_steps=2 format=2]

[sub_resource type="ProceduralSky" id=1]

radiance_size = 4
sky_top_color = Color( 0.647059, 0.839216, 0.945098, 1 )
sky_horizon_color = Color( 0.839216, 0.917647, 0.980392, 1 )
sky_curve = 0.09
sky_energy = 1.0
ground_bottom_color = Color( 0.156863, 0.184314, 0.211765, 1 )
ground_horizon_color = Color( 0.423529, 0.396078, 0.372549, 1 )
ground_curve = 0.02
ground_energy = 1.0
sun_color = Color( 1, 1, 1, 1 )
sun_latitude = 35.0
sun_longitude = 0.0
sun_angle_min = 1.0
sun_angle_max = 100.0
sun_curve = 0.05
sun_energy = 16.0
texture_size = 2

[resource]

background_mode = 2
background_sky = SubResource( 1 )
background_sky_custom_fov = 0.0
background_color = Color( 0, 0, 0, 1 )
background_energy = 1.0
background_canvas_max_layer = 0
ambient_light_color = Color( 0, 0, 0, 1 )
ambient_light_energy = 1.0
ambient_light_sky_contribution = 1.0
fog_enabled = false
fog_color = Color( 0.5, 0.6, 0.7, 1 )
fog_sun_color = Color( 1, 0.9, 0.7, 1 )
fog_sun_amount = 0.0
fog_depth_enabled = true
fog_depth_begin = 10.0
fog_depth_curve = 1.0
fog_transmit_enabled = false
fog_transmit_curve = 1.0
fog_height_enabled = false
fog_height_min = 0.0
fog_height_max = 100.0
fog_height_curve = 1.0
tonemap_mode = 0
tonemap_exposure = 1.0
tonemap_white = 1.0
auto_exposure_enabled = false
auto_exposure_scale = 0.4
auto_exposure_min_luma = 0.05
auto_exposure_max_luma = 8.0
auto_exposure_speed = 0.5
ss_reflections_enabled = false
ss_reflections_max_steps = 64
ss_reflections_fade_in = 0.15
ss_reflections_fade_out = 2.0
ss_reflections_depth_tolerance = 0.2
ss_reflections_roughness = true
ssao_enabled = false
ssao_radius = 1.0
ssao_intensity = 1.0
ssao_radius2 = 0.0
ssao_intensity2 = 1.0
ssao_bias = 0.01
ssao_light_affect = 0.0
ssao_ao_channel_affect = 0.0
ssao_color = Color( 0, 0, 0, 1 )
ssao_quality = 0
ssao_blur = 3
ssao_edge_sharpness = 4.0
dof_blur_far_enabled = false
dof_blur_far_distance = 10.0
dof_blur_far_transition = 5.0
dof_blur_far_amount = 0.1
dof_blur_far_quality = 1
dof_blur_near_enabled = false
dof_blur_near_distance = 2.0
dof_blur_near_transition = 1.0
dof_blur_near_amount = 0.1
dof_blur_near_quality = 1
glow_enabled = false
glow_levels/1 = false
glow_levels/2 = false
glow_levels/3 = true
glow_levels/4 = false
glow_levels/5 = true
glow_levels/6 = false
glow_levels/7 = false
glow_intensity = 0.8
glow_strength = 1.0
glow_bloom = 0.0
glow_blend_mode = 2
glow_hdr_threshold = 1.0
glow_hdr_scale = 2.0
glow_bicubic_upscale = false
adjustment_enabled = false
adjustment_brightness = 1.0
adjustment_contrast = 1.0
adjustment_saturation = 1.0

4 changes: 4 additions & 0 deletions project/exitButton.png.import
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/exitButton.png-81d7397bdb56d16f9e9bf567b53096a4.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -25,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Expand Down
4 changes: 4 additions & 0 deletions project/exitButtonHover.png.import
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/exitButtonHover.png-be52bad92cacea6531391faec4e43275.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -25,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Expand Down
4 changes: 2 additions & 2 deletions project/global.gd
Expand Up @@ -9,10 +9,10 @@ signal remove_ingredient
func _ready():
# Deferred rather than autoloaded, prevents music from playing during the initial load
call_deferred("add_music_player")

func add_music_player():
add_child(load("res://music_player.tscn").instance())

func _input(event):
if event.is_action_pressed("toggle_fullscreen"):
OS.window_fullscreen = !OS.window_fullscreen
OS.window_fullscreen = !OS.window_fullscreen
Binary file modified project/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions project/icon.png.import
Expand Up @@ -3,6 +3,9 @@
importer="texture"
type="StreamTexture"
path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
metadata={
"vram_texture": false
}

[deps]

Expand All @@ -25,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Expand Down
2 changes: 1 addition & 1 deletion project/ingredients/dandelion.gd
Expand Up @@ -2,4 +2,4 @@ extends "res://ingredients/ingredient.gd"

func _init():
ingredient_id = Global.ING_DANDELION
mix_color = Color(1, 1, 0, 1)
mix_color = Color(1, 1, 0, 1)