Skip to content

Commit 670f04f

Browse files
zaknafeanzaknafean
authored
Jam bug fixes (#198)
* Jam Feedback Patch Fixed Cellphone interaction (was +50 score, -50 alert => now +50 score, -1 sanity) Fixed lamp/light switch interaction (was +15 sanity, now +15 alert) Slightly sped up BOTH you and the enemy (starting values were 25 and 75, now 35 and 85) Slightly sped up natural Alert decay (was 1 moving, 5 standing; now 1.5 moving, 5.5 standing) Provided feedback as to why you got a gameover Fixed a reported crash bug (the 'event' runner would sometimes try to reference a freed event if you clicked really fast) Fixed a reported issue with Windows 11 executable (game would run, but start wouldn't work) Fixed a bug where the enemy spawn timer would continue even if the game was paused Fixed some (but not all) sprite Ysorting bugs Fixed missing attribution in about page * Bug Patch 2 Added some shout outs Fixed monsters being hidden from you under rugs Fixed lights being clickable forever Added missing Fonts attributions Fixed bug where Enemy could forget he can hit you * 'Softlock' patch Fixed bug where Enemy could repeatedly attack you during dialog Fixed a bug where a nonexistent property was referenced in the Enemy animation player Fixed a bug that prevented use of the submit score button if you restart the level Fixed room connection logic at difficulty 1 Adjusted dialogic settings to avoid errors when spam clicking Fixed double spawning of opening dialog Fixed a broken animation on the Cats dialog exit * Crash fix Crash caused by lingering capitalization errors. Moving all files in offending folders and deleting them is the only github usable fix.
1 parent e886de5 commit 670f04f

31 files changed

+96
-96
lines changed

assets/Tilesets/EnvironmentTileset.tres renamed to assets/tiles/EnvironmentTileset.tres

File renamed without changes.

‎dialogic/folder_structure.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
},
161161
"metadata": {
162162
"color": null,
163-
"folded": true
163+
"folded": false
164164
}
165165
},
166166
"Stimulants": {

‎game/GameMain.gd‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ func change_room(newRoom: String, directionFrom: String, _delay=2):
112112

113113
if newRoom == 'livingroom':
114114
curRoom = livingRoom.instance()
115-
elif newRoom == 'bathroom':
116-
curRoom = bathRoom.instance()
117115
elif newRoom == 'bedroom':
118116
curRoom = bedRoom.instance()
119117
elif newRoom == 'hallwayroom':

‎levels/BaseRoom.tscn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[gd_scene load_steps=7 format=2]
22

33
[ext_resource path="res://player/Player.tscn" type="PackedScene" id=1]
4-
[ext_resource path="res://assets/tilesets/EnvironmentTileset.tres" type="TileSet" id=2]
5-
[ext_resource path="res://enemies/ChaseEnemy.tscn" type="PackedScene" id=3]
4+
[ext_resource path="res://assets/tiles/EnvironmentTileset.tres" type="TileSet" id=2]
5+
[ext_resource path="res://npcs/ChaseEnemy.tscn" type="PackedScene" id=3]
66
[ext_resource path="res://levels/floatingtext/Floating_Text_Manager.tscn" type="PackedScene" id=4]
77
[ext_resource path="res://levels/HudLayer.tscn" type="PackedScene" id=5]
88
[ext_resource path="res://levels/BaseLevel.gd" type="Script" id=7]

‎levels/noninteractables/Rug.tscn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ animations = [ {
2626

2727
[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
2828
frames = SubResource( 4 )
29-
frame = 11
30-
speed_scale = 0.1
29+
frame = 16
30+
speed_scale = 0.5
3131
playing = true

‎levels/rooms/BedRoom.tscn‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[gd_scene load_steps=34 format=2]
22

33
[ext_resource path="res://levels/BaseRoom.tscn" type="PackedScene" id=1]
4-
[ext_resource path="res://assets/tilesets/EnvironmentTileset.tres" type="TileSet" id=2]
4+
[ext_resource path="res://assets/tiles/EnvironmentTileset.tres" type="TileSet" id=2]
55
[ext_resource path="res://assets/doorNorthBlueClosed.png" type="Texture" id=3]
66
[ext_resource path="res://assets/doorEastBlueClosed.png" type="Texture" id=4]
77
[ext_resource path="res://levels/interactables/clickable/BedClickable.tscn" type="PackedScene" id=5]
88
[ext_resource path="res://levels/interactables/clickable/SpriteClickable.tscn" type="PackedScene" id=6]
99
[ext_resource path="res://levels/interactables/events/DialogEvent.tscn" type="PackedScene" id=7]
1010
[ext_resource path="res://assets/shaders/sprite_uv_control.shader" type="Shader" id=8]
1111
[ext_resource path="res://levels/interactables/clickable/WindowClickable.tscn" type="PackedScene" id=9]
12-
[ext_resource path="res://enemies/Lamp.tscn" type="PackedScene" id=10]
13-
[ext_resource path="res://enemies/ImAStove.tscn" type="PackedScene" id=11]
12+
[ext_resource path="res://npcs/Lamp.tscn" type="PackedScene" id=10]
13+
[ext_resource path="res://npcs/ImAStove.tscn" type="PackedScene" id=11]
1414
[ext_resource path="res://levels/interactables/clickable/FloorLampClickable.tscn" type="PackedScene" id=12]
1515
[ext_resource path="res://levels/interactables/clickable/CurtainsClickable.tscn" type="PackedScene" id=13]
1616
[ext_resource path="res://levels/interactables/clickable/LightSwitchClickable.tscn" type="PackedScene" id=14]
@@ -24,7 +24,7 @@
2424
[ext_resource path="res://levels/noninteractables/SideTable.tscn" type="PackedScene" id=22]
2525
[ext_resource path="res://levels/interactables/clickable/CellphoneClickable.tscn" type="PackedScene" id=23]
2626
[ext_resource path="res://levels/interactables/clickable/CatLampTalk.tscn" type="PackedScene" id=24]
27-
[ext_resource path="res://enemies/Sleep_Gremlin.tscn" type="PackedScene" id=25]
27+
[ext_resource path="res://npcs/Sleep_Gremlin.tscn" type="PackedScene" id=25]
2828

2929
[sub_resource type="ShaderMaterial" id=3]
3030
resource_local_to_scene = true

‎levels/rooms/HallwayRoom.tscn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
[ext_resource path="res://levels/interactables/clickable/SpriteClickable.tscn" type="PackedScene" id=5]
88
[ext_resource path="res://levels/interactables/events/DialogEvent.tscn" type="PackedScene" id=6]
99
[ext_resource path="res://assets/shaders/sprite_uv_control.shader" type="Shader" id=7]
10-
[ext_resource path="res://enemies/Sleep_Gremlin.tscn" type="PackedScene" id=8]
11-
[ext_resource path="res://enemies/Lamp.tscn" type="PackedScene" id=9]
12-
[ext_resource path="res://enemies/ImAStove.tscn" type="PackedScene" id=10]
10+
[ext_resource path="res://npcs/Sleep_Gremlin.tscn" type="PackedScene" id=8]
11+
[ext_resource path="res://npcs/Lamp.tscn" type="PackedScene" id=9]
12+
[ext_resource path="res://npcs/ImAStove.tscn" type="PackedScene" id=10]
1313
[ext_resource path="res://levels/noninteractables/SideWallVent.tscn" type="PackedScene" id=11]
1414
[ext_resource path="res://levels/noninteractables/PhotoPortrait.tscn" type="PackedScene" id=12]
1515
[ext_resource path="res://levels/noninteractables/WallJunk.tscn" type="PackedScene" id=13]

‎levels/rooms/KitchenRoom.tscn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
[ext_resource path="res://assets/doorNorthBlueClosed.png" type="Texture" id=5]
88
[ext_resource path="res://assets/shaders/sprite_uv_control.shader" type="Shader" id=6]
99
[ext_resource path="res://levels/interactables/events/DialogEvent.tscn" type="PackedScene" id=7]
10-
[ext_resource path="res://enemies/Sleep_Gremlin.tscn" type="PackedScene" id=8]
11-
[ext_resource path="res://enemies/Lamp.tscn" type="PackedScene" id=9]
12-
[ext_resource path="res://enemies/ImAStove.tscn" type="PackedScene" id=10]
10+
[ext_resource path="res://npcs/Sleep_Gremlin.tscn" type="PackedScene" id=8]
11+
[ext_resource path="res://npcs/Lamp.tscn" type="PackedScene" id=9]
12+
[ext_resource path="res://npcs/ImAStove.tscn" type="PackedScene" id=10]
1313
[ext_resource path="res://levels/interactables/clickable/CoffeeClickable.tscn" type="PackedScene" id=11]
1414
[ext_resource path="res://levels/interactables/clickable/LightSwitchClickable.tscn" type="PackedScene" id=12]
1515
[ext_resource path="res://levels/noninteractables/FloorRug.tscn" type="PackedScene" id=13]

‎levels/rooms/LivingRoom.tscn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
[ext_resource path="res://levels/interactables/events/DialogEvent.tscn" type="PackedScene" id=5]
88
[ext_resource path="res://assets/doorEastBlueClosed.png" type="Texture" id=6]
99
[ext_resource path="res://assets/doorNorthBlueClosed.png" type="Texture" id=7]
10-
[ext_resource path="res://enemies/Sleep_Gremlin.tscn" type="PackedScene" id=8]
11-
[ext_resource path="res://enemies/Lamp.tscn" type="PackedScene" id=9]
12-
[ext_resource path="res://enemies/ImAStove.tscn" type="PackedScene" id=10]
10+
[ext_resource path="res://npcs/Sleep_Gremlin.tscn" type="PackedScene" id=8]
11+
[ext_resource path="res://npcs/Lamp.tscn" type="PackedScene" id=9]
12+
[ext_resource path="res://npcs/ImAStove.tscn" type="PackedScene" id=10]
1313
[ext_resource path="res://levels/interactables/clickable/TelevisionClickable.tscn" type="PackedScene" id=11]
1414
[ext_resource path="res://levels/interactables/clickable/FloorLampClickable.tscn" type="PackedScene" id=12]
1515
[ext_resource path="res://levels/interactables/clickable/CoffeeTableClickable.tscn" type="PackedScene" id=13]

‎levels/rooms/UnknownRoom.tscn‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[gd_scene load_steps=33 format=2]
22

33
[ext_resource path="res://levels/BaseRoom.tscn" type="PackedScene" id=1]
4-
[ext_resource path="res://assets/tilesets/EnvironmentTileset.tres" type="TileSet" id=2]
4+
[ext_resource path="res://assets/tiles/EnvironmentTileset.tres" type="TileSet" id=2]
55
[ext_resource path="res://assets/doorNorthBlueClosed.png" type="Texture" id=3]
66
[ext_resource path="res://assets/doorEastBlueClosed.png" type="Texture" id=4]
77
[ext_resource path="res://levels/noninteractables/Rug.tscn" type="PackedScene" id=5]
88
[ext_resource path="res://levels/interactables/clickable/SpriteClickable.tscn" type="PackedScene" id=6]
99
[ext_resource path="res://levels/interactables/events/DialogEvent.tscn" type="PackedScene" id=7]
1010
[ext_resource path="res://assets/shaders/sprite_uv_control.shader" type="Shader" id=8]
11-
[ext_resource path="res://enemies/Sleep_Gremlin.tscn" type="PackedScene" id=9]
12-
[ext_resource path="res://enemies/Lamp.tscn" type="PackedScene" id=10]
13-
[ext_resource path="res://enemies/ImAStove.tscn" type="PackedScene" id=11]
11+
[ext_resource path="res://npcs/Sleep_Gremlin.tscn" type="PackedScene" id=9]
12+
[ext_resource path="res://npcs/Lamp.tscn" type="PackedScene" id=10]
13+
[ext_resource path="res://npcs/ImAStove.tscn" type="PackedScene" id=11]
1414
[ext_resource path="res://levels/noninteractables/CupJunk.tscn" type="PackedScene" id=12]
1515
[ext_resource path="res://levels/noninteractables/PhotoPortrait.tscn" type="PackedScene" id=13]
1616
[ext_resource path="res://levels/noninteractables/Vent.tscn" type="PackedScene" id=14]

0 commit comments

Comments
 (0)