diff --git a/godot/.import/sicky_drone_2.ogg-2840f8c9e588a8dc24ba32874f0439b2.md5 b/godot/.import/sicky_drone_2.ogg-2840f8c9e588a8dc24ba32874f0439b2.md5 new file mode 100644 index 0000000..6664fc9 --- /dev/null +++ b/godot/.import/sicky_drone_2.ogg-2840f8c9e588a8dc24ba32874f0439b2.md5 @@ -0,0 +1,3 @@ +source_md5="7c7297785e72c853ef99942fb2a995d0" +dest_md5="92315a7fb8e813c3a546ecd8d2eeb343" + diff --git a/godot/.import/sicky_drone_2.ogg-2840f8c9e588a8dc24ba32874f0439b2.oggstr b/godot/.import/sicky_drone_2.ogg-2840f8c9e588a8dc24ba32874f0439b2.oggstr new file mode 100644 index 0000000..8a54911 Binary files /dev/null and b/godot/.import/sicky_drone_2.ogg-2840f8c9e588a8dc24ba32874f0439b2.oggstr differ diff --git a/godot/assets/audio/sicky_drone_2.ogg b/godot/assets/audio/sicky_drone_2.ogg new file mode 100644 index 0000000..8fa6dbc --- /dev/null +++ b/godot/assets/audio/sicky_drone_2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:546a5527b1b269ee9cf7b96447a5cc8ee164531035e52f32d9dd35271e3c5993 +size 128501 diff --git a/godot/assets/audio/sicky_drone_2.ogg.import b/godot/assets/audio/sicky_drone_2.ogg.import new file mode 100644 index 0000000..ea9e2cd --- /dev/null +++ b/godot/assets/audio/sicky_drone_2.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/sicky_drone_2.ogg-2840f8c9e588a8dc24ba32874f0439b2.oggstr" + +[deps] + +source_file="res://assets/audio/sicky_drone_2.ogg" +dest_files=[ "res://.import/sicky_drone_2.ogg-2840f8c9e588a8dc24ba32874f0439b2.oggstr" ] + +[params] + +loop=false +loop_offset=0 diff --git a/godot/effects/grainy_shader.gd b/godot/effects/grainy_shader.gd new file mode 100644 index 0000000..5b0a28e --- /dev/null +++ b/godot/effects/grainy_shader.gd @@ -0,0 +1,19 @@ +extends Spatial + +func madness(): + $CanvasLayer/ColorRect.visible = false + $CanvasLayer/ColorRect2.visible = true + $CanvasLayer/ColorRect2/AudioStreamPlayer.play() + yield($CanvasLayer/ColorRect2/AudioStreamPlayer, "finished") + $CanvasLayer/ColorRect.visible = true + $CanvasLayer/ColorRect2.visible = false + + +export var frequency = 600 +var seconds = 0.0 + +func _process(delta): + seconds += delta + if seconds > frequency: + seconds = 0 + madness() diff --git a/godot/effects/grainy_shader.tscn b/godot/effects/grainy_shader.tscn index 1c21970..da5c975 100644 --- a/godot/effects/grainy_shader.tscn +++ b/godot/effects/grainy_shader.tscn @@ -1,33 +1,40 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://effects/dithering/screen_space_shader.tres" type="Shader" id=1] [ext_resource path="res://effects/grainy_shader.tres" type="Material" id=2] +[ext_resource path="res://effects/grainy_shader.gd" type="Script" id=3] +[ext_resource path="res://assets/audio/sicky_drone_2.ogg" type="AudioStream" id=4] [sub_resource type="ShaderMaterial" id=3] shader = ExtResource( 1 ) shader_param/seed = 81.0 shader_param/power = 0.0022 shader_param/speed = 0.1 -shader_param/param = 23.0 +shader_param/param = 9.0 shader_param/scale = 2.0 shader_param/grid = 4 shader_param/anim_period = 0.1 shader_param/amount = 0.06 -shader_param/factor = 200.0 +shader_param/factor = 500.0 [node name="shader" type="Spatial"] +script = ExtResource( 3 ) [node name="CanvasLayer" type="CanvasLayer" parent="."] layer = 100 [node name="ColorRect" type="ColorRect" parent="CanvasLayer"] -visible = false material = ExtResource( 2 ) anchor_right = 1.0 anchor_bottom = 1.0 mouse_filter = 2 [node name="ColorRect2" type="ColorRect" parent="CanvasLayer"] +visible = false material = SubResource( 3 ) anchor_right = 1.0 anchor_bottom = 1.0 + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="CanvasLayer/ColorRect2"] +stream = ExtResource( 4 ) +volume_db = 15.0 diff --git a/godot/effects/npc/wall_struggler/WallStruggler.tscn b/godot/effects/npc/wall_struggler/WallStruggler.tscn index 0e7d6ab..1635002 100644 --- a/godot/effects/npc/wall_struggler/WallStruggler.tscn +++ b/godot/effects/npc/wall_struggler/WallStruggler.tscn @@ -114,7 +114,7 @@ shader_param/normal_map = ExtResource( 2 ) extents = Vector3( 1.72965, 1.52498, 0.0716956 ) [sub_resource type="BoxShape" id=4] -extents = Vector3( 0.415364, 0.271899, 0.607307 ) +extents = Vector3( 1, 1, 1.66041 ) [node name="WallStruggler" type="MeshInstance"] transform = Transform( 0.75, 0, 0, 0, 0.75, 0, 0, 0, 0.75, 0, 0, 0 ) diff --git a/godot/player/player.tscn b/godot/player/player.tscn index 613b719..c01c10e 100644 --- a/godot/player/player.tscn +++ b/godot/player/player.tscn @@ -52,7 +52,7 @@ tracks/0/keys = { "times": PoolRealArray( 0, 0.549, 2.928 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 0, -"values": [ 70.0, 70.0, 110.0 ] +"values": [ 70.0, 70.0, 130.0 ] } [sub_resource type="CylinderShape" id=4] diff --git a/godot/project.godot b/godot/project.godot index 9c7af08..40d2760 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -100,6 +100,7 @@ config/icon="res://meat_madness_icon.png" Util="*res://util.gd" GlobalEventBus="*res://global_event_bus.gd" SavedDialogueProgress="*res://saved_dialogue_progress.gd" +DebugTools="*res://DebugTools.tscn" [display]