Skip to content

Commit d5239fb

Browse files
committed
Fixed interactable's interactability relative to the nearest light source calculation. Also added a simple debugger that displays general information about the game.
1 parent 559fa4a commit d5239fb

File tree

86 files changed

+979
-223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+979
-223
lines changed

What Lies Below.yyp

+147-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

objects/obj_claire/Create_0.gml

+2-6
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ maxVspd = maxVspdConst;
3232
maxHitpoints = 20;
3333
hitpoints = maxHitpoints;
3434

35-
// Temporarily setting claire to be invincible for testing
35+
// Temporarily setting Claire to be invincible for testing
3636
isInvincible = true;
3737

3838
#endregion
@@ -113,13 +113,9 @@ sanityTimer = 0;
113113

114114
// Variables relating to Claire's current internal temperature. When in rooms that are cold (Ex. normal world
115115
// outside) or really hot (Ex. broken furnace room), her internal temperature will begin to slowly increse,
116-
// and she will being taking damage if she gets too hot or too cold.
116+
// and she will begin taking damage if she gets too hot or too cold.
117117
internalTemperature = 36.5;
118118
externalTemperature = ROOM_TEMPERATURE;
119119
temperatureTimer = 0;
120120

121-
// FOR TESTING
122-
update_hitpoints(-15);
123-
update_hitpoint_regen_ratio(1, 1);
124-
125121
#endregion

objects/obj_controller/Draw_64.gml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ if (global.gameState == GameState.InMenu){
4141
// in order to use draw_sprite_ext. For some reason, it doesn't work whenever the
4242
// outline shader isn't currently active.
4343
event_perform(ev_draw, ev_gui);
44-
}
44+
}
4545
}
4646

4747
/// TODO -- Eventually this draw code should be written in such a way that allows any object/menu to be

objects/obj_controller/KeyPress_32.gml

-9
This file was deleted.
+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/// @description Toggle Debugger On/Off
2+
3+
if (!instance_exists(obj_debugger)){
4+
instance_create_depth(0, 0, GLOBAL_DEPTH, obj_debugger);
5+
return;
6+
}
7+
instance_destroy(obj_debugger);

0 commit comments

Comments
 (0)