Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux

godot/.import/Swquish.glb-3e3dc141b46b70f3509deec27ed54697.md5

@@ -0,0 +1,3 @@
+source_md5="f38c0e0c6a5c291be960060075a367ea"
+dest_md5="e321353acdd21ef0254a3931ca60a375"
+

godot/.import/bridge.glb-e3c55adc4c25e74b8b5e53cb73d57231.md5

@@ -0,0 +1,3 @@
+source_md5="b55252b193b820230f43f7e9c800ec75"
+dest_md5="d35a34792cc21a09cd2504f4154b6cb2"
+

godot/.import/squish.glb-3efab3657b34da4ea2053e0bbd485f76.md5

@@ -0,0 +1,3 @@
+source_md5="d95362b0ffbf1b0eeb55a2de9b4c9b50"
+dest_md5="b4f8e811c04fd3fa08e5a398ce1ea03b"
+

godot/assets/meat_bore/Swquish.tscn

@@ -0,0 +1,20 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://effects/SinkBlock.gd" type="Script" id=1]
+[ext_resource path="res://assets/meat_bore/Swquish.glb" type="PackedScene" id=2]
+
+[sub_resource type="SphereShape" id=1]
+
+[node name="Swquish" instance=ExtResource( 2 )]
+
+[node name="Swquish" parent="." index="0"]
+script = ExtResource( 1 )
+
+[node name="Area" type="Area" parent="Swquish" index="0"]
+
+[node name="CollisionShape" type="CollisionShape" parent="Swquish/Area" index="0"]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 11.7008 )
+shape = SubResource( 1 )
+
+[connection signal="body_entered" from="Swquish/Area" to="Swquish" method="_on_SinkRegion_body_entered"]
+[connection signal="body_exited" from="Swquish/Area" to="Swquish" method="_on_SinkRegion_body_exited"]

godot/assets/meat_bore/bridge.tscn

@@ -0,0 +1,13 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://assets/meat_bore/bridge.glb" type="PackedScene" id=1]
+
+[sub_resource type="ConcavePolygonShape" id=1]
+data = PoolVector3Array( -2.1426, -2.1426, 67.711, -2.1426, 2.1426, -67.711, -2.1426, 2.1426, 67.711, -2.1426, -2.1426, 67.711, -2.1426, -2.1426, -67.711, -2.1426, 2.1426, -67.711, -2.1426, -2.1426, -67.711, 2.1426, 2.1426, -67.711, -2.1426, 2.1426, -67.711, -2.1426, -2.1426, -67.711, 2.1426, -2.1426, -67.711, 2.1426, 2.1426, -67.711, 2.1426, -2.1426, -67.711, 2.1426, 2.1426, 67.711, 2.1426, 2.1426, -67.711, 2.1426, -2.1426, -67.711, 2.1426, -2.1426, 67.711, 2.1426, 2.1426, 67.711, 2.1426, -2.1426, 67.711, -2.1426, 2.1426, 67.711, 2.1426, 2.1426, 67.711, 2.1426, -2.1426, 67.711, -2.1426, -2.1426, 67.711, -2.1426, 2.1426, 67.711, -2.1426, -2.1426, -67.711, 2.1426, -2.1426, 67.711, 2.1426, -2.1426, -67.711, -2.1426, -2.1426, -67.711, -2.1426, -2.1426, 67.711, 2.1426, -2.1426, 67.711, 2.1426, 2.1426, -67.711, -2.1426, 2.1426, 67.711, -2.1426, 2.1426, -67.711, 2.1426, 2.1426, -67.711, 2.1426, 2.1426, 67.711, -2.1426, 2.1426, 67.711 )
+
+[node name="bridge" instance=ExtResource( 1 )]
+
+[node name="StaticBody" type="StaticBody" parent="bridge" index="0"]
+
+[node name="CollisionShape" type="CollisionShape" parent="bridge/StaticBody" index="0"]
+shape = SubResource( 1 )

godot/assets/meat_bore/meat_module/level_jackie.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://assets/meat_bore/meat_module/meat_module.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_5.png" type="Texture" id=2]
 [ext_resource path="res://assets/meat_bore/npcs/inherited/jackie.tscn" type="PackedScene" id=3]
 [ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=4]
+[ext_resource path="res://effects/SinkBlock.tscn" type="PackedScene" id=5]
 
 [node name="level_jackie" type="Spatial"]
 
@@ -19,3 +20,6 @@ transform = Transform( 0.293757, 0, 0.95588, 0, 1, 0, -0.95588, 0, 0.293757, -33
 
 [node name="dialogue_platform2" parent="." instance=ExtResource( 4 )]
 transform = Transform( 0.957214, 0.289383, 0, -0.289383, 0.957214, 0, 0, 0, 1, -30.7244, -520.836, -8.76617 )
+
+[node name="SinkBlock" parent="." instance=ExtResource( 5 )]
+transform = Transform( 30, 0, 0, 0, 1, 0, 0, 0, 30, -0.004, -469.575, 0.012 )

godot/assets/meat_bore/sink_platform_insides.tres

@@ -0,0 +1,24 @@
+[gd_resource type="ShaderMaterial" load_steps=3 format=2]
+
+[ext_resource path="res://effects/sink_block_tiled_texture.png" type="Texture" id=1]
+
+[sub_resource type="Shader" id=12]
+code = "shader_type spatial;
+render_mode unshaded, cull_front;
+
+uniform sampler2D texture_albedo : hint_albedo;
+uniform float alpha = 1.0;
+
+void fragment() {
+	vec2 uv = SCREEN_UV;
+	uv.x += sin((TIME + SCREEN_UV.y) * 5.0)/5.0;
+	ALBEDO = texture(texture_albedo, uv).rgb;
+	ALPHA = alpha;
+}
+"
+
+[resource]
+render_priority = 1
+shader = SubResource( 12 )
+shader_param/alpha = 1.0
+shader_param/texture_albedo = ExtResource( 1 )

godot/assets/meat_bore/squish.tscn

@@ -0,0 +1,21 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://assets/meat_bore/Material_005.material" type="Material" id=1]
+[ext_resource path="res://effects/SinkBlock.gd" type="Script" id=3]
+[ext_resource path="res://assets/meat_bore/squish_roundcube.tres" type="ArrayMesh" id=4]
+
+[sub_resource type="BoxShape" id=4]
+
+[node name="squish" type="Spatial"]
+
+[node name="SquishPlatform" type="MeshInstance" parent="."]
+transform = Transform( 2.8811, 0, 0, 0, 1, 0, 0, 0, 1.70233, 0, 0, 0 )
+material_override = ExtResource( 1 )
+mesh = ExtResource( 4 )
+script = ExtResource( 3 )
+
+[node name="SinkRegion" type="Area" parent="SquishPlatform"]
+transform = Transform( 0.347089, 0, 0, 0, 1, 0, 0, 0, 0.58743, -0.00144031, 0.00430012, 0.00679557 )
+
+[node name="CollisionShape" type="CollisionShape" parent="SquishPlatform/SinkRegion"]
+shape = SubResource( 4 )

godot/assets/meat_bore/squish1.tres

@@ -0,0 +1,55 @@
+[gd_resource type="ShaderMaterial" load_steps=4 format=2]
+
+[ext_resource path="res://assets/meat_bore/sink_platform_insides.tres" type="Material" id=1]
+[ext_resource path="res://effects/sink_block_tiled_texture.png" type="Texture" id=2]
+
+[sub_resource type="Shader" id=5]
+code = "// NOTE: Shader automatically converted from Godot Engine 3.5.1.stable's SpatialMaterial.
+
+shader_type spatial;
+render_mode async_visible,blend_mix,depth_draw_opaque,cull_back,diffuse_burley,specular_schlick_ggx;
+uniform vec4 albedo : hint_color;
+uniform sampler2D texture_albedo : hint_albedo;
+uniform float specular;
+uniform float metallic;
+uniform float roughness : hint_range(0,1);
+uniform float point_size : hint_range(0,128);
+uniform vec3 uv1_scale;
+uniform vec3 uv1_offset;
+uniform vec3 uv2_scale;
+uniform vec3 uv2_offset;
+
+
+void vertex() {
+	float offset = TIME / 100.0;
+	UV=UV*uv1_scale.xy+vec2(offset, offset);
+}
+
+
+
+
+void fragment() {
+	vec2 base_uv = UV;
+	vec4 albedo_tex = texture(texture_albedo,base_uv);
+	albedo_tex *= COLOR;
+	ALBEDO = albedo.rgb * albedo_tex.rgb;
+	METALLIC = metallic;
+	ROUGHNESS = roughness;
+	SPECULAR = specular;
+}
+"
+
+[resource]
+resource_name = "tiled_sink_material"
+next_pass = ExtResource( 1 )
+shader = SubResource( 5 )
+shader_param/albedo = Color( 1, 1, 1, 1 )
+shader_param/specular = 0.5
+shader_param/metallic = 0.0
+shader_param/roughness = 0.5
+shader_param/point_size = 1.0
+shader_param/uv1_scale = Vector3( 10, 10, 1 )
+shader_param/uv1_offset = Vector3( 0, -99, 0 )
+shader_param/uv2_scale = Vector3( 1, 1, 1 )
+shader_param/uv2_offset = Vector3( 0, 0, 0 )
+shader_param/texture_albedo = ExtResource( 2 )

godot/screens/TitleScreen_Planet.tscn

@@ -13,6 +13,7 @@
 
 [node name="Camera" type="Camera" parent="."]
 transform = Transform( -0.262413, -0.132575, 0.955805, -0.0204041, 0.991058, 0.131863, -0.96474, 0.0151002, -0.262772, 4.34589, 1.41359, 1.05785 )
+current = true
 
 [node name="meat_planet" parent="." instance=ExtResource( 4 )]
 transform = Transform( -0.0182938, 0.353447, -0.54052, 0.529643, -0.301205, -0.214884, -0.369546, -0.44919, -0.281219, 0.0736001, 0.18823, -0.0757823 )

godot/tests/bore_hole/test_level_common.tscn

@@ -9,7 +9,7 @@
 [node name="test_level_common" type="Spatial"]
 
 [node name="MeatSinkParameters" parent="." instance=ExtResource( 2 )]
-sink_factor = Vector3( 0.9, 0.001, 0.9 )
+sink_factor = Vector3( 0.9, 0.2, 0.9 )
 
 [node name="Player" parent="MeatSinkParameters" instance=ExtResource( 1 )]
 transform = Transform( -0.167027, 0, 0.985952, 0, 1, 0, -0.985952, 0, -0.167027, 17.4571, 45.3387, -5.13576 )

godot/tests/bore_hole/test_level_jackie.tscn

@@ -1,18 +1,11 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://assets/meat_bore/meat_module/level_jackie.tscn" type="PackedScene" id=1]
 [ext_resource path="res://tests/bore_hole/test_level_common.tscn" type="PackedScene" id=2]
-[ext_resource path="res://effects/SinkBlock.tscn" type="PackedScene" id=4]
 
 [node name="Spatial" type="Spatial"]
 
 [node name="level_jackie" parent="." instance=ExtResource( 1 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 500, 0 )
 
-[node name="SinkBlock" parent="." instance=ExtResource( 4 )]
-transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 19.8, 24.8621, 42.319, 1.22013 )
-
-[node name="SinkBlock2" parent="." instance=ExtResource( 4 )]
-transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 19.8, 24.8621, 23.3509, 1.22013 )
-
 [node name="test_level_common" parent="." instance=ExtResource( 2 )]

godot/tests/sink_block/test_sink_block.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://player/player.tscn" type="PackedScene" id=1]
 [ext_resource path="res://effects/SinkBlock.tscn" type="PackedScene" id=2]
+[ext_resource path="res://assets/meat_bore/squish.tscn" type="PackedScene" id=3]
 
 [sub_resource type="CubeMesh" id=1]
 
@@ -23,3 +24,6 @@ shape = SubResource( 2 )
 
 [node name="SinkBlock" parent="." instance=ExtResource( 2 )]
 transform = Transform( 4.12455, 0, 0, 0, 0.264811, 0, 0, 0, 1, 8.77048, -0.686236, 0 )
+
+[node name="squish" parent="." instance=ExtResource( 3 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.57007, 0.672275, -14.9386 )