revert d44b4cc724

revert initial remaster commit for redundancy, back to gamejam version

SPIKE.GD.gd

@@ -1,15 +0,0 @@
-extends CharacterBody2D
-
-
-
-func _on_area_2d_body_shape_entered(body_rid, body, body_shape_index, local_shape_index):
-	if body.name == "plr" and body.can_move:
-		body.can_move = false
-		var dial = body.get_node("Camera2D/dialogue")
-		dial.visible = true
-		dial.dialogue("Erm...","upsidedown",0.5)
-		await get_parent().proceed
-		dial.dialogue("Get out of my way...","nervous",0.5)
-		await get_parent().proceed
-		dial.dialogue("I HATE spikes in tunnels...", "normal", 0.5)
-		await get_parent().proceed

plr.gd

@@ -9,8 +9,7 @@ var gravity = ProjectSettings.get_setting("physics/2d/default_gravity")
 var dir = "none"
 
 var airjump = false
-var tweener1
+
-var tweener2 
 
 var ignore = Vector2(0,0)
 var wall = "none"
@@ -32,9 +31,6 @@ var can_move = true
 
 var cool = 0.6
 
-func _ready():
-	tweener1 = get_tree().create_tween()
-	tweener2 = get_tree().create_tween()
 func _physics_process(delta):
 	
 	if on_ladder:
@@ -50,7 +46,6 @@ func _physics_process(delta):
 			velocity.y += -1 * SPEED * 0.5
 		if Input.is_action_pressed("ui_down"):
 			velocity.y += 1 * SPEED * 0.5
-			
 		if Input.is_action_just_pressed("ui_accept"):
 			velocity.y = JUMP_VELOCITY
 			on_ladder = false
@@ -61,12 +56,9 @@ func _physics_process(delta):
 			on_ladder = false
 			airjump = true
 			$LedgeAssistWall.start()
-		
 		move_and_slide()
-		
 		return
 	
-	
 	if not can_move:
 		if not Input.is_action_pressed("sprint") and SPEED != defspeed:
 			SPEED = defspeed
@@ -149,17 +141,7 @@ func _physics_process(delta):
 		elif not $AnimatedSprite2D.animation == "jump":
 			$AnimatedSprite2D.play("jump")
 	
-	if Input.is_action_just_pressed("lookdown"):
+
-		if tweener1.is_running():
-			tweener1.stop()
-		tweener2 = get_tree().create_tween()
-		tweener2.tween_property($Camera2D,"offset",Vector2(0,50),0.5)
-	elif  Input.is_action_just_released("lookdown"):
-		if tweener2.is_running():
-			tweener2.stop()
-		tweener1 = get_tree().create_tween()
-		tweener1.tween_property($Camera2D,"offset",Vector2(0,0),0.5)
-	print($Camera2D.offset)
 	
 	if direction:
 		velocity.x = direction * SPEED

plr.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=33 format=3 uid="uid://bdncoo2t66e58"]
+[gd_scene load_steps=32 format=3 uid="uid://bdncoo2t66e58"]
 
 [ext_resource type="Script" path="res://plr.gd" id="1_ub5ic"]
 [ext_resource type="Texture2D" uid="uid://dvrxgvepbbhl7" path="res://silly_fella.png" id="2_hijeb"]
@@ -135,9 +135,6 @@ region = Rect2(417, 193, 14, 11)
 atlas = ExtResource("4_id5lh")
 region = Rect2(433, 193, 14, 11)
 
-[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_1bc3s"]
-load_path = "res://.godot/imported/sheet1.png-df3b94edccf6a27528de01b5fa16fed6.ctex"
-
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_kp2us"]
 shader = ExtResource("9_axrdm")
 shader_parameter/blur_amount = 0.291
@@ -307,14 +304,6 @@ centered = false
 region_enabled = true
 region_rect = Rect2(7, 5, 15, 13)
 
-[node name="spike" type="Sprite2D" parent="Camera2D/dialogue/Icons"]
-visible = false
-position = Vector2(6, 13)
-texture = SubResource("CompressedTexture2D_1bc3s")
-centered = false
-region_enabled = true
-region_rect = Rect2(320, 190, 15, 2)
-
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="Camera2D/dialogue"]
 stream = ExtResource("7_d3xbw")
 volume_db = -10.576

project.godot

@@ -12,7 +12,7 @@ config_version=5
 
 config/name="wicked depths"
 run/main_scene="res://menu.tscn"
-config/features=PackedStringArray("4.2", "GL Compatibility")
+config/features=PackedStringArray("4.1", "GL Compatibility")
 config/icon="res://plr.png"
 
 [autoload]
@@ -34,28 +34,32 @@ ui_accept={
 }
 ui_left={
 "deadzone": 0.5,
-"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194319,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"echo":false,"script":null)
 ]
 }
 ui_right={
 "deadzone": 0.5,
-"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194321,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"echo":false,"script":null)
 ]
 }
 ui_up={
 "deadzone": 0.5,
-"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194320,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"echo":false,"script":null)
 ]
 }
 ui_down={
 "deadzone": 0.5,
-"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194322,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
 , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"echo":false,"script":null)
 ]
@@ -75,11 +79,6 @@ interact={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"echo":false,"script":null)
 ]
 }
-lookdown={
-"deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"echo":false,"script":null)
-]
-}
 
 [rendering]