Skip to content

Commit f27979d

Browse files
committed
different objects have different "masses" according to seesaws
1 parent a935493 commit f27979d

File tree

5 files changed

+15
-2
lines changed

5 files changed

+15
-2
lines changed

objects/obj_3d_seesaw/Create_0.gml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,15 @@ self.HandleActivation = function() {
9696
if (is_left && !is_right) {
9797
self.state.change("tilt_left");
9898
} else if (is_right && !is_left) {
99-
self.state.change("tilt_right")
99+
self.state.change("tilt_right");
100100
} else if (is_left && is_right) {
101-
self.state.change("balanced")
101+
if (is_left.reference.seesaw_mass > is_right.reference.seesaw_mass) {
102+
self.state.change("tilt_left");
103+
} else if (is_left.reference.seesaw_mass < is_right.reference.seesaw_mass) {
104+
self.state.change("tilt_right");
105+
} else {
106+
self.state.change("balanced");
107+
}
102108
}
103109
};
104110

objects/obj_3d_spell_block/obj_3d_spell_block.yy

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

objects/obj_3d_spell_boulder/obj_3d_spell_boulder.yy

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

objects/obj_entity/obj_entity.yy

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

objects/obj_game/Create_0.gml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ var block = instance_create_depth(228, 100, -300, obj_3d_spell_block);
9595
block.SetMesh(self.meshes.block);
9696
block.UpdateCollisionPositions();
9797

98+
var block = instance_create_depth(100 - 128, 100, -300, obj_3d_spell_block);
99+
block.SetMesh(self.meshes.block);
100+
block.UpdateCollisionPositions();
101+
98102
enum ECollisionMasks {
99103
NONE = 0b_0000_0000,
100104
DEFAULT = 0b_0000_0001,

0 commit comments

Comments
 (0)