Run 'ant cleanwhitespace'
This commit is contained in:
parent
ea1ae94fc3
commit
810d0e6d4f
23 changed files with 50 additions and 54 deletions
|
|
@ -44,26 +44,26 @@ import marauroa.common.game.IRPZone;
|
|||
* HH:MM[:SS] format. Time before the current moment will be interpreted as the
|
||||
* corresponding time of next day. The default is start of April 1, either the
|
||||
* current year, or the next year if run after that moment.
|
||||
* <p>
|
||||
* <p>
|
||||
* Second argument is the freezing duration in HH:MM[:SS] format. Default is one
|
||||
* day.
|
||||
*/
|
||||
public class FreezeHell extends ScriptImpl {
|
||||
private static final Logger LOGGER = Logger.getLogger(FreezeHell.class);
|
||||
|
||||
|
||||
private static final LocalDateTime DEFAULT_FREEZING_TIME = Year.now().atMonth(Month.APRIL).atDay(1).atStartOfDay();
|
||||
private static final Duration DEFAULT_FREEZING_DURATION = Duration.ofDays(1);
|
||||
|
||||
|
||||
@Override
|
||||
public void execute(final Player admin, final List<String> args) {
|
||||
LocalDateTime startTime;
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
startTime = determineStartTime(admin, args, now);
|
||||
int waitSec = (int) Duration.between(now, startTime).getSeconds();
|
||||
|
||||
|
||||
Duration freezingDuration = determineDuration(admin, args);
|
||||
|
||||
String message = "Scheduling freezing hell in " + waitSec
|
||||
|
||||
String message = "Scheduling freezing hell in " + waitSec
|
||||
+ " seconds at " + startTime + ". Freeze for " + freezingDuration + ".";
|
||||
admin.sendPrivateText(message);
|
||||
LOGGER.info(message);
|
||||
|
|
@ -80,7 +80,7 @@ public class FreezeHell extends ScriptImpl {
|
|||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return DEFAULT_FREEZING_DURATION;
|
||||
}
|
||||
|
||||
|
|
@ -119,13 +119,13 @@ public class FreezeHell extends ScriptImpl {
|
|||
throw ex;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return startTime;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* The actual freezing and thawing routine.
|
||||
*
|
||||
*
|
||||
* @param freeze <code>true</code> if the hell freezes
|
||||
*/
|
||||
private void freezeOrThaw(boolean freeze, Duration freezingDuration) {
|
||||
|
|
@ -166,10 +166,10 @@ public class FreezeHell extends ScriptImpl {
|
|||
LOGGER.error("Failed to update map", e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Change zone attributes depending on the freezing state.
|
||||
*
|
||||
*
|
||||
* @param zone hell zone
|
||||
* @param freeze freezing state. <code>true</code> if the hell freezes
|
||||
*/
|
||||
|
|
@ -183,10 +183,10 @@ public class FreezeHell extends ScriptImpl {
|
|||
attr.put("color_method", "softlight");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Update zone from StendhalMapStructure.
|
||||
*
|
||||
*
|
||||
* @param zone zone to be updated
|
||||
* @param map new map data
|
||||
* @throws IOException When encoding the layer data fails
|
||||
|
|
@ -210,7 +210,7 @@ public class FreezeHell extends ScriptImpl {
|
|||
zone.addCollisionLayer(name + ".collision", map.getLayer("collision"));
|
||||
zone.addProtectionLayer(name + ".protection", map.getLayer("protection"));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Load an optional layer, if present, to a zone.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -16,4 +16,4 @@ export abstract class Action {
|
|||
|
||||
abstract execute(type: string, params: string[], remainder: string): void;
|
||||
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ export class OpenWebsiteAction extends Action {
|
|||
|
||||
/**
|
||||
* creates a OpenWebsiteAction
|
||||
*
|
||||
*
|
||||
* @param url website to open
|
||||
*/
|
||||
constructor(private url: string) {
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ marauroa.rpobjectFactory["chest"] = marauroa.util.fromProto(marauroa.rpobjectFac
|
|||
|
||||
openInventoryWindow: function() {
|
||||
if (!this.inventory || !this.inventory.isOpen()) {
|
||||
this.inventory = new FloatingWindow("Chest",
|
||||
this.inventory = new FloatingWindow("Chest",
|
||||
new ItemInventoryComponent(this, "content", 5, 6, false, undefined),
|
||||
160, 370);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ marauroa.rpobjectFactory["corpse"] = marauroa.util.fromProto(marauroa.rpobjectFa
|
|||
}
|
||||
}
|
||||
|
||||
this.inventory = new FloatingWindow("Corpse",
|
||||
this.inventory = new FloatingWindow("Corpse",
|
||||
new ItemInventoryComponent(this, "content", content_row, content_col, true, undefined),
|
||||
160, 370);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,4 +16,4 @@ export abstract class RPEvent {
|
|||
|
||||
abstract execute(entity: any): void;
|
||||
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -37,4 +37,4 @@ export class CombinedTileset {
|
|||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,4 +70,4 @@ export class CombinedTilesetFactory {
|
|||
ctImageLoader.load();
|
||||
return combinedTileset;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ export class CombinedTilesetImageLoader {
|
|||
let base = this.map.firstgids[tileset];
|
||||
let tileIndexInTileset = gid - base;
|
||||
this.drawTile(pixelX, pixelY, image, tileIndexInTileset, flip);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -157,4 +157,4 @@ export class CombinedTilesetImageLoader {
|
|||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ export class IndividualTilesetRenderingStrategy extends LandscapeRenderingStrate
|
|||
}
|
||||
}
|
||||
|
||||
private paintLayer(canvas: HTMLCanvasElement, drawingLayer: number,
|
||||
private paintLayer(canvas: HTMLCanvasElement, drawingLayer: number,
|
||||
tileOffsetX: number, tileOffsetY: number) {
|
||||
const layer = stendhal.data.map.layers[drawingLayer];
|
||||
const yMax = Math.min(tileOffsetY + canvas.height / this.targetTileHeight + 1, stendhal.data.map.zoneSizeY);
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ export class LandscapeRenderer {
|
|||
|
||||
drawLayer(
|
||||
canvas: HTMLCanvasElement,
|
||||
combinedTileset: CombinedTileset, layerNo: number,
|
||||
combinedTileset: CombinedTileset, layerNo: number,
|
||||
tileOffsetX: number, tileOffsetY: number, targetTileWidth: number, targetTileHeight: number): void {
|
||||
if (!combinedTileset) {
|
||||
return;
|
||||
|
|
@ -53,4 +53,4 @@ export class LandscapeRenderer {
|
|||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,11 +42,11 @@ export class CombinedTilesetRenderingStrategy extends LandscapeRenderingStrategy
|
|||
public render(
|
||||
canvas: HTMLCanvasElement, gamewindow: any,
|
||||
tileOffsetX: number, tileOffsetY: number, targetTileWidth: number, targetTileHeight: number): void {
|
||||
|
||||
|
||||
let landscapeRenderder = new LandscapeRenderer();
|
||||
landscapeRenderder.drawLayer(
|
||||
canvas,
|
||||
stendhal.data.map.combinedTileset,
|
||||
stendhal.data.map.combinedTileset,
|
||||
0,
|
||||
tileOffsetX, tileOffsetY, targetTileWidth, targetTileHeight);
|
||||
|
||||
|
|
@ -54,10 +54,9 @@ export class CombinedTilesetRenderingStrategy extends LandscapeRenderingStrategy
|
|||
|
||||
landscapeRenderder.drawLayer(
|
||||
canvas,
|
||||
stendhal.data.map.combinedTileset,
|
||||
stendhal.data.map.combinedTileset,
|
||||
1,
|
||||
tileOffsetX, tileOffsetY, targetTileWidth, targetTileHeight);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
import { Sprite } from "./Sprite";
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* An empty (non-drawing) sprite.
|
||||
*/
|
||||
|
|
@ -42,7 +42,7 @@ export class EmptySprite {
|
|||
createRegion(x: number, y: number, width: number, height: number, ref: object): Sprite {
|
||||
return new EmptySprite(width, height, ref);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Draw the sprite onto the graphics context provided.
|
||||
*
|
||||
|
|
@ -54,7 +54,7 @@ export class EmptySprite {
|
|||
* The y location at which to draw the sprite
|
||||
*/
|
||||
draw(g: CanvasRenderingContext2D, x: number, y: number): void;
|
||||
|
||||
|
||||
/**
|
||||
* Draws the image.
|
||||
*
|
||||
|
|
@ -76,7 +76,7 @@ export class EmptySprite {
|
|||
public draw(g: CanvasRenderingContext2D, destx: number, desty: number, x: number, y: number, w: number, h: number): void;
|
||||
public draw(g: CanvasRenderingContext2D, destx: number, desty: number, x?: number, y?: number, w?: number, h?: number): void {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the height of the drawn sprite.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
/**
|
||||
* A sprite to be displayed on the screen. Note that a sprite contains no state
|
||||
* information, i.e. its just the image and not the location. This allows us to
|
||||
|
|
@ -36,7 +36,7 @@ export abstract class Sprite {
|
|||
* @return A new sprite.
|
||||
*/
|
||||
abstract createRegion(x: number, y: number, width: number, height: number, ref: object): Sprite;
|
||||
|
||||
|
||||
/**
|
||||
* Draw the sprite onto the graphics context provided.
|
||||
*
|
||||
|
|
@ -48,7 +48,7 @@ export abstract class Sprite {
|
|||
* The y location at which to draw the sprite
|
||||
*/
|
||||
abstract draw(g: CanvasRenderingContext2D, x: number, y: number): void;
|
||||
|
||||
|
||||
/**
|
||||
* Draws the image.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ export class ItemContainerImplementation {
|
|||
private timestampMouseDown = 0;
|
||||
|
||||
|
||||
// TODO: replace usage of global document.getElementById()
|
||||
// TODO: replace usage of global document.getElementById()
|
||||
|
||||
/**
|
||||
* slot name, slot size, object (a corpse or chest) or null for marauroa.me,
|
||||
|
|
@ -133,7 +133,7 @@ export class ItemContainerImplementation {
|
|||
};
|
||||
// if ctrl is pressed, we ask for the quantity
|
||||
if (event.ctrlKey) {
|
||||
ui.createSingletonFloatingWindow("Quantity",
|
||||
ui.createSingletonFloatingWindow("Quantity",
|
||||
new DropQuantitySelectorDialog(action),
|
||||
event.pageX - 50, event.pageY - 25);
|
||||
} else {
|
||||
|
|
@ -194,4 +194,3 @@ export class ItemContainerImplementation {
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -197,4 +197,3 @@ export class MiniMapComponent extends Component {
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ export class ShowFloatingWindowComponent extends Component {
|
|||
if (!component) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if ((component.parentComponent as FloatingWindow | null | undefined)?.isOpen()) {
|
||||
(component.parentComponent as FloatingWindow | null | undefined)?.close();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ export class ActionContextMenu extends Component {
|
|||
}
|
||||
content += "</div>";
|
||||
this.componentElement.innerHTML = content;
|
||||
|
||||
|
||||
this.componentElement.addEventListener("click", (event) => {
|
||||
this.onClick(event);
|
||||
});
|
||||
|
|
@ -60,7 +60,7 @@ export class ActionContextMenu extends Component {
|
|||
this.executeFallbackAction(this.actions[i].type)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private executeFallbackAction(type: string) {
|
||||
let action: any = {
|
||||
"type": type,
|
||||
|
|
@ -72,7 +72,7 @@ export class ActionContextMenu extends Component {
|
|||
action['target'] = '#' + this.entity.id;
|
||||
}
|
||||
marauroa.clientFramework.sendAction(action);
|
||||
|
||||
|
||||
}
|
||||
|
||||
private gatherActions(){
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ export class OutfitColorSelector {
|
|||
protected _x: number;
|
||||
protected _y: number;
|
||||
protected hX: number;
|
||||
|
||||
|
||||
constructor(canvas: HTMLCanvasElement, gradientCanvas: HTMLCanvasElement, onColorChanged: Function) {
|
||||
this.ctx = canvas.getContext("2d")!;
|
||||
this.gradCtx = gradientCanvas.getContext("2d")!;
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ export class OutfitDialog extends Component {
|
|||
queueMicrotask( () => {
|
||||
this.createDialog();
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
private createDialog() {
|
||||
let outfit = marauroa.me["outfit_ext_orig"];
|
||||
|
|
@ -85,9 +85,9 @@ export class OutfitDialog extends Component {
|
|||
this.eyesColorSelector = this.createColorSelector(OutfitColorSelector, "eyes", this.eyesSelector);
|
||||
this.dressColorSelector = this.createColorSelector(OutfitColorSelector, "dress", this.dressSelector);
|
||||
this.skinColorSelector = this.createColorSelector(OutfitPaletteColorSelector, "skin", this.headSelector, this.bodySelector);
|
||||
|
||||
|
||||
this.drawComposite();
|
||||
|
||||
|
||||
this.componentElement.querySelector("#setoutfitcancel")!.addEventListener("click", (event) => {
|
||||
this.onCancel(event);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ export class DesktopUserInterfaceFactory {
|
|||
public create() {
|
||||
let topPanel = new Panel("topPanel");
|
||||
ui.registerComponent(UIComponentEnum.LeftPanel, topPanel);
|
||||
|
||||
|
||||
let leftPanel = new Panel("leftColumn");
|
||||
ui.registerComponent(UIComponentEnum.LeftPanel, leftPanel);
|
||||
|
||||
|
|
|
|||
|
|
@ -26,4 +26,3 @@ stendhal.ui.equip = {
|
|||
}
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
export class MapOfSets<K, V> extends Map<K, Set<V>> {
|
||||
|
||||
/**
|
||||
* adds an entry to the map. If the key is already known,
|
||||
* adds an entry to the map. If the key is already known,
|
||||
* the value is added to the associated set. Otherwise
|
||||
* a new set containing the value is created.
|
||||
*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue