mirror of
https://git.krews.org/morningstar/Arcturus-Community.git
synced 2025-01-18 23:46:28 +01:00
Wired At Set Time param times 500
This commit is contained in:
parent
eefcc5b89c
commit
0a14f35093
@ -62,6 +62,8 @@ public abstract class InteractionWired extends InteractionDefault implements IWi
|
|||||||
|
|
||||||
if(wiredData.startsWith("{")) {
|
if(wiredData.startsWith("{")) {
|
||||||
this.wiredSettings = WiredHandler.getObjectMapper().readValue(wiredData, WiredSettings.class);
|
this.wiredSettings = WiredHandler.getObjectMapper().readValue(wiredData, WiredSettings.class);
|
||||||
|
} else {
|
||||||
|
//TODO READ OLD DATA SAVING
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -184,4 +184,4 @@ public class WiredEffectMoveRotateFurni extends InteractionWiredEffect implement
|
|||||||
public WiredEffectType getType() {
|
public WiredEffectType getType() {
|
||||||
return WiredEffectType.MOVE_ROTATE;
|
return WiredEffectType.MOVE_ROTATE;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -28,7 +28,7 @@ public class WiredTriggerAtSetTime extends InteractionWiredTrigger implements Wi
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean execute(RoomUnit roomUnit, Room room, Object[] stuff) {
|
public boolean execute(RoomUnit roomUnit, Room room, Object[] stuff) {
|
||||||
Emulator.getThreading().run(new WiredExecuteTask(this, Emulator.getGameEnvironment().getRoomManager().getRoom(this.getRoomId())), this.getWiredSettings().getIntegerParams().get(PARAM_EXECUTE_TIME)); //TODO *500?
|
Emulator.getThreading().run(new WiredExecuteTask(this, Emulator.getGameEnvironment().getRoomManager().getRoom(this.getRoomId())), this.getWiredSettings().getIntegerParams().get(PARAM_EXECUTE_TIME) * 500);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -42,8 +42,7 @@ public class WiredTriggerAtSetTime extends InteractionWiredTrigger implements Wi
|
|||||||
@Override
|
@Override
|
||||||
public void resetTimer() {
|
public void resetTimer() {
|
||||||
this.taskId++;
|
this.taskId++;
|
||||||
|
Emulator.getThreading().run(new WiredExecuteTask(this, Emulator.getGameEnvironment().getRoomManager().getRoom(this.getRoomId())), this.getWiredSettings().getIntegerParams().get(PARAM_EXECUTE_TIME) * 500);
|
||||||
Emulator.getThreading().run(new WiredExecuteTask(this, Emulator.getGameEnvironment().getRoomManager().getRoom(this.getRoomId())), this.getWiredSettings().getIntegerParams().get(PARAM_EXECUTE_TIME));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
Reference in New Issue
Block a user