Skip to content

Doors #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RobbinBob merged 3 commits into from
Nov 8, 2025
Merged

Doors #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4711b00
Door fixes
RobbinBob Nov 8, 2025
e79726f
Merge branch 'Doors' of https://github.com/RobbinBob/NLVMCore into Doors
RobbinBob Nov 8, 2025
0fc5561
Merge branch 'main' into Doors
RobbinBob Nov 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions scripts/Door.nlvm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ public abstract class Door extends Behaviour implements InteractionActionListene
m_Config.OpenTime = configJson.Get("open_time").GetFloat();
m_Config.CloseTime = configJson.Get("close_time").GetFloat();

if(configJson.HasKey("interaction_range"))
m_Config.InteractionRange = configJson.Get("interaction_range").GetFloat();


m_DoorOpenDelegate = new Delegate1();
m_DoorCloseDelegate = new Delegate1();
m_DoorStateChangeDelegate = new Delegate1();
Expand Down Expand Up @@ -115,7 +119,7 @@ public abstract class Door extends Behaviour implements InteractionActionListene

public void Open()
{
if(m_DoorState != DOOR_CLOSED)
if(m_DoorState == DOOR_OPEN || m_DoorState == DOOR_OPENING)
return;

SetInteractionHandlesEnabled(false);
Expand All @@ -126,7 +130,7 @@ public abstract class Door extends Behaviour implements InteractionActionListene
}
public void Close()
{
if(m_DoorState != DOOR_OPEN)
if(m_DoorState == DOOR_CLOSED || m_DoorState == DOOR_CLOSING)
return;

SetInteractionHandlesEnabled(false);
Expand Down
1 change: 1 addition & 0 deletions scripts/DoorConfig.nlvm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ public class DoorConfig extends Object
{
public float OpenTime = 1.0f;
public float CloseTime = 1.0f;
public float InteractionRange = 1.0f;

public DoorConfig() { }
}
8 changes: 7 additions & 1 deletion scripts/DoorSingle.nlvm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class DoorSingle extends Door implements InteractionActionListener, IFunc
m_InteractionHandle = new InteractionObject[1];
m_InteractionHandle[0] = InteractionObject.createSimpleButton();
m_InteractionHandle[0].addActionListener(this);
m_InteractionHandle[0].setRadius(1.75f);
m_InteractionHandle[0].setRadius(m_Config.InteractionRange);
m_InteractionHandle[0].setActive(true);


Expand Down Expand Up @@ -65,9 +65,15 @@ public class DoorSingle extends Door implements InteractionActionListener, IFunc
{
int state = ((Door)arg).GetDoorState();
if(state == DOOR_OPENING)
{
m_OpenTween.Play();
m_CloseTween.Cancel();
}
else if(state == DOOR_CLOSING)
{
m_CloseTween.Play();
m_OpenTween.Cancel();
}
}
}
}
Loading