X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_holmes.pas;h=6d52559b7e7c281d5743393e187c574be123dae2;hb=5e0a71e1d35a9037be80c8912060a913d0e98b18;hp=ae7c7b49e67e8c629b8fa7a2f28772048e3c5339;hpb=e540bbf4ebb46a3c4b3ae2fd69ba64a149189a32;p=d2df-sdl.git diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas index ae7c7b4..6d52559 100644 --- a/src/game/g_holmes.pas +++ b/src/game/g_holmes.pas @@ -21,7 +21,7 @@ interface uses e_log, e_input, g_textures, g_basic, e_graphics, g_phys, g_grid, g_player, g_monsters, - g_window, g_map, g_triggers, g_items, g_game, g_panel, g_console, + g_window, g_map, g_triggers, g_items, g_game, g_panel, g_console, g_gfx, xprofiler; @@ -83,7 +83,8 @@ function g_Holmes_MouseEvent (var ev: THMouseEvent): Boolean; // returns `true` function g_Holmes_KeyEvent (var ev: THKeyEvent): Boolean; // returns `true` if event was eaten // hooks for player -procedure g_Holmes_plrView (viewPortX, viewPortY, viewPortW, viewPortH: Integer); +procedure g_Holmes_plrViewPos (viewPortX, viewPortY: Integer); +procedure g_Holmes_plrViewSize (viewPortW, viewPortH: Integer); procedure g_Holmes_plrLaser (ax0, ay0, ax1, ay1: Integer); @@ -96,13 +97,16 @@ operator = (const s: AnsiString; constref ev: THMouseEvent): Boolean; var g_holmes_enabled: Boolean = {$IF DEFINED(D2F_DEBUG)}true{$ELSE}false{$ENDIF}; + g_holmes_ui_scale: Single = 1.0; implementation uses + {rttiobj,} typinfo, SysUtils, Classes, GL, SDL2, - MAPDEF, g_options, utils, hashtable, xparser; + MAPDEF, g_main, g_options, + utils, hashtable, xparser; var @@ -111,13 +115,16 @@ var msY: Integer = -666; msB: Word = 0; // button state kbS: Word = 0; // keyboard modifiers state - showGrid: Boolean = true; + showGrid: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF}; showMonsInfo: Boolean = false; showMonsLOS2Plr: Boolean = false; showAllMonsCells: Boolean = false; showMapCurPos: Boolean = false; showLayersWindow: Boolean = false; showOutlineWindow: Boolean = false; + showTriggers: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF}; + showTraceBox: Boolean = {$IF DEFINED(D2F_DEBUG)}false{$ELSE}false{$ENDIF}; + // ////////////////////////////////////////////////////////////////////////// // {$INCLUDE g_holmes.inc} @@ -244,6 +251,124 @@ begin end; +// ////////////////////////////////////////////////////////////////////////// // +function typeKind2Str (t: TTypeKind): AnsiString; +begin + case t of + tkUnknown: result := 'Unknown'; + tkInteger: result := 'Integer'; + tkChar: result := 'Char'; + tkEnumeration: result := 'Enumeration'; + tkFloat: result := 'Float'; + tkSet: result := 'Set'; + tkMethod: result := 'Method'; + tkSString: result := 'SString'; + tkLString: result := 'LString'; + tkAString: result := 'AString'; + tkWString: result := 'WString'; + tkVariant: result := 'Variant'; + tkArray: result := 'Array'; + tkRecord: result := 'Record'; + tkInterface: result := 'Interface'; + tkClass: result := 'Class'; + tkObject: result := 'Object'; + tkWChar: result := 'WChar'; + tkBool: result := 'Bool'; + tkInt64: result := 'Int64'; + tkQWord: result := 'QWord'; + tkDynArray: result := 'DynArray'; + tkInterfaceRaw: result := 'InterfaceRaw'; + tkProcVar: result := 'ProcVar'; + tkUString: result := 'UString'; + tkUChar: result := 'UChar'; + tkHelper: result := 'Helper'; + tkFile: result := 'File'; + tkClassRef: result := 'ClassRef'; + tkPointer: result := 'Pointer'; + else result := ''; + end; +end; + + +procedure dumpPublishedProperties (obj: TObject); +var + pt: PTypeData; + pi: PTypeInfo; + i, j: Integer; + pp: PPropList; +begin + if (obj = nil) then exit; + e_LogWritefln('Object of type ''%s'':', [obj.ClassName]); + pi := obj.ClassInfo; + pt := GetTypeData(pi); + e_LogWritefln('property count: %s', [pt.PropCount]); + GetMem(pp, pt^.PropCount*sizeof(Pointer)); + try + j := GetPropList(pi, [tkInteger, tkBool, tkSString, tkLString, tkAString, tkSet, tkEnumeration], pp); + //e_LogWritefln('ordinal property count: %s', [j]); + for i := 0 to j-1 do + begin + if (typinfo.PropType(obj, pp^[i].name) in [tkSString, tkLString, tkAString]) then + begin + e_LogWritefln(' #%s: <%s>; type: %s; value: <%s>', [i+1, pp^[i].name, typeKind2Str(typinfo.PropType(obj, pp^[i].name)), GetStrProp(obj, pp^[i])]); + end + else if (typinfo.PropType(obj, pp^[i].name) = tkSet) then + begin + e_LogWritefln(' #%s: <%s>; type: %s; value: %s', [i+1, pp^[i].name, typeKind2Str(typinfo.PropType(obj, pp^[i].name)), GetSetProp(obj, pp^[i], true)]); + end + else if (typinfo.PropType(obj, pp^[i].name) = tkEnumeration) then + begin + e_LogWritefln(' #%s: <%s>; type: %s; value: <%s>', [i+1, pp^[i].name, typeKind2Str(typinfo.PropType(obj, pp^[i].name)), GetEnumProp(obj, pp^[i])]); + end + else + begin + e_LogWritefln(' #%s: <%s>; type: %s; value: %s', [i+1, pp^[i].name, typeKind2Str(typinfo.PropType(obj, pp^[i].name)), GetOrdProp(obj, pp^[i])]); + end; + end; + finally + FreeMem(pp); + end; +end; + + +//FIXME: autogenerate +function trigType2Str (ttype: Integer): AnsiString; +begin + result := ''; + case ttype of + TRIGGER_NONE: result := 'none'; + TRIGGER_EXIT: result := 'exit'; + TRIGGER_TELEPORT: result := 'teleport'; + TRIGGER_OPENDOOR: result := 'opendoor'; + TRIGGER_CLOSEDOOR: result := 'closedoor'; + TRIGGER_DOOR: result := 'door'; + TRIGGER_DOOR5: result := 'door5'; + TRIGGER_CLOSETRAP: result := 'closetrap'; + TRIGGER_TRAP: result := 'trap'; + TRIGGER_PRESS: result := 'press'; + TRIGGER_SECRET: result := 'secret'; + TRIGGER_LIFTUP: result := 'liftup'; + TRIGGER_LIFTDOWN: result := 'liftdown'; + TRIGGER_LIFT: result := 'lift'; + TRIGGER_TEXTURE: result := 'texture'; + TRIGGER_ON: result := 'on'; + TRIGGER_OFF: result := 'off'; + TRIGGER_ONOFF: result := 'onoff'; + TRIGGER_SOUND: result := 'sound'; + TRIGGER_SPAWNMONSTER: result := 'spawnmonster'; + TRIGGER_SPAWNITEM: result := 'spawnitem'; + TRIGGER_MUSIC: result := 'music'; + TRIGGER_PUSH: result := 'push'; + TRIGGER_SCORE: result := 'score'; + TRIGGER_MESSAGE: result := 'message'; + TRIGGER_DAMAGE: result := 'damage'; + TRIGGER_HEALTH: result := 'health'; + TRIGGER_SHOT: result := 'shot'; + TRIGGER_EFFECT: result := 'effect'; + TRIGGER_SCRIPT: result := 'script'; + end; +end; + // ////////////////////////////////////////////////////////////////////////// // {$INCLUDE g_holmes_cmd.inc} procedure holmesInitCommands (); forward; @@ -461,6 +586,7 @@ begin llb.appendItem('monster info', @showMonsInfo); llb.appendItem('monster LOS to player', @showMonsLOS2Plr); llb.appendItem('monster cells (SLOW!)', @showAllMonsCells); + llb.appendItem('draw triggers (SLOW!)', @showTriggers); llb.appendItem('WINDOWS', nil); llb.appendItem('layers window', @showLayersWindow, toggleLayersWindowCB); llb.appendItem('outline window', @showOutlineWindow, toggleOutlineWindowCB); @@ -528,13 +654,19 @@ var laserSet: Boolean = false; laserX0, laserY0, laserX1, laserY1: Integer; monMarkedUID: Integer = -1; + platMarkedGUID: Integer = -1; -procedure g_Holmes_plrView (viewPortX, viewPortY, viewPortW, viewPortH: Integer); +procedure g_Holmes_plrViewPos (viewPortX, viewPortY: Integer); begin vpSet := true; vpx := viewPortX; vpy := viewPortY; +end; + +procedure g_Holmes_plrViewSize (viewPortW, viewPortH: Integer); +begin + vpSet := true; vpw := viewPortW; vph := viewPortH; end; @@ -550,8 +682,8 @@ begin end; -function pmsCurMapX (): Integer; inline; begin result := msX+vpx; end; -function pmsCurMapY (): Integer; inline; begin result := msY+vpy; end; +function pmsCurMapX (): Integer; inline; begin result := round(msX/g_dbg_scale)+vpx; end; +function pmsCurMapY (): Integer; inline; begin result := round(msY/g_dbg_scale)+vpy; end; procedure plrDebugMouse (var ev: THMouseEvent); @@ -783,6 +915,50 @@ procedure plrDebugDraw (); end; end; + procedure drawAwakeCells (); + var + x, y: Integer; + begin + for y := 0 to (mapGrid.gridHeight div mapGrid.tileSize) do + begin + for x := 0 to (mapGrid.gridWidth div mapGrid.tileSize) do + begin + if awmIsSetHolmes(x*mapGrid.tileSize+mapGrid.gridX0+1, y*mapGrid.tileSize++mapGrid.gridY0+1) then + begin + fillRect(x*mapGrid.tileSize++mapGrid.gridX0, y*mapGrid.tileSize++mapGrid.gridY0, monsGrid.tileSize, monsGrid.tileSize, 128, 0, 128, 64); + end; + end; + end; + end; + + procedure drawTraceBox (); + var + plr: TPlayer; + px, py, pw, ph: Integer; + pdx, pdy: Integer; + ex, ey: Integer; + pan: TPanel; + begin + if (Length(gPlayers) < 1) then exit; + plr := gPlayers[0]; + if (plr = nil) then exit; + plr.getMapBox(px, py, pw, ph); + drawRect(px, py, pw, ph, 255, 0, 255, 200); + pdx := pmsCurMapX-(px+pw div 2); + pdy := pmsCurMapY-(py+ph div 2); + drawLine(px+pw div 2, py+ph div 2, px+pw div 2+pdx, py+ph div 2+pdy, 255, 0, 255, 200); + pan := mapGrid.traceBox(ex, ey, px, py, pw, ph, pdx, pdy, nil, GridTagObstacle); + if (pan = nil) then + begin + drawRect(px+pdx, py+pdy, pw, ph, 255, 255, 255, 180); + end + else + begin + drawRect(px+pdx, py+pdy, pw, ph, 255, 255, 0, 180); + end; + drawRect(ex, ey, pw, ph, 255, 127, 0, 180); + end; + procedure hilightCell (cx, cy: Integer); begin fillRect(cx, cy, monsGrid.tileSize, monsGrid.tileSize, 0, 128, 0, 64); @@ -917,6 +1093,115 @@ procedure plrDebugDraw (); monsGrid.forEachBodyCell(mon.proxyId, hilightCell); end; + procedure drawSelectedPlatformCells (); + var + pan: TPanel; + begin + if not showGrid then exit; + pan := g_Map_PanelByGUID(platMarkedGUID); + if (pan = nil) then exit; + mapGrid.forEachBodyCell(pan.proxyId, hilightCell); + drawRect(pan.x, pan.y, pan.width, pan.height, 0, 200, 0, 200); + end; + + procedure drawTrigger (var trig: TTrigger); + + procedure drawPanelDest (pguid: Integer); + var + pan: TPanel; + begin + pan := g_Map_PanelByGUID(pguid); + if (pan = nil) then exit; + drawLine( + trig.trigCenter.x, trig.trigCenter.y, + pan.x+pan.width div 2, pan.y+pan.height div 2, + 255, 0, 255, 220); + end; + + var + tts: AnsiString; + tx: Integer; + begin + fillRect(trig.x, trig.y, trig.width, trig.height, 255, 0, 255, 96); + tts := trigType2Str(trig.TriggerType); + tx := trig.x+(trig.width-Length(tts)*6) div 2; + darkenRect(tx-2, trig.y-10, Length(tts)*6+4, 10, 64); + drawText6(tx, trig.y-9, tts, 255, 127, 0); + tx := trig.x+(trig.width-Length(trig.mapId)*6) div 2; + darkenRect(tx-2, trig.y-20, Length(trig.mapId)*6+4, 10, 64); + drawText6(tx, trig.y-19, trig.mapId, 255, 255, 0); + drawPanelDest(trig.trigPanelGUID); + case trig.TriggerType of + TRIGGER_NONE: begin end; + TRIGGER_EXIT: begin end; + TRIGGER_TELEPORT: begin end; + TRIGGER_OPENDOOR: begin end; + TRIGGER_CLOSEDOOR: begin end; + TRIGGER_DOOR: begin end; + TRIGGER_DOOR5: begin end; + TRIGGER_CLOSETRAP: begin end; + TRIGGER_TRAP: begin end; + TRIGGER_SECRET: begin end; + TRIGGER_LIFTUP: begin end; + TRIGGER_LIFTDOWN: begin end; + TRIGGER_LIFT: begin end; + TRIGGER_TEXTURE: begin end; + TRIGGER_ON, TRIGGER_OFF, TRIGGER_ONOFF, TRIGGER_PRESS: + begin + if (trig.trigDataRec.trigTWidth > 0) and (trig.trigDataRec.trigTHeight > 0) then + begin + fillRect( + trig.trigDataRec.trigTX, trig.trigDataRec.trigTY, + trig.trigDataRec.trigTWidth, trig.trigDataRec.trigTHeight, + 0, 255, 255, 42); + drawLine( + trig.trigCenter.x, trig.trigCenter.y, + trig.trigDataRec.trigTX+trig.trigDataRec.trigTWidth div 2, + trig.trigDataRec.trigTY+trig.trigDataRec.trigTHeight div 2, + 255, 0, 255, 220); + end; + end; + TRIGGER_SOUND: begin end; + TRIGGER_SPAWNMONSTER: begin end; + TRIGGER_SPAWNITEM: begin end; + TRIGGER_MUSIC: begin end; + TRIGGER_PUSH: begin end; + TRIGGER_SCORE: begin end; + TRIGGER_MESSAGE: begin end; + TRIGGER_DAMAGE: begin end; + TRIGGER_HEALTH: begin end; + TRIGGER_SHOT: begin end; + TRIGGER_EFFECT: begin end; + TRIGGER_SCRIPT: begin end; + end; + //trigType2Str + //trigPanelId: Integer; + end; + + procedure drawTriggers (); + var + f: Integer; + begin + for f := 0 to High(gTriggers) do drawTrigger(gTriggers[f]); + end; + + procedure drawGibsBoxes (); + var + f: Integer; + px, py, pw, ph: Integer; + gib: PGib; + begin + for f := 0 to High(gGibs) do + begin + gib := @gGibs[f]; + if gib.alive then + begin + gib.getMapBox(px, py, pw, ph); + drawRect(px, py, pw, ph, 255, 0, 255); + end; + end; + end; + var mon: TMonster; mx, my, mw, mh: Integer; @@ -927,6 +1212,7 @@ begin glScissor(0, gWinSizeY-gPlayerScreenSize.Y-1, vpw, vph); glPushMatrix(); + glScalef(g_dbg_scale, g_dbg_scale, 1.0); glTranslatef(-vpx, -vpy, 0); if (showGrid) then drawTileGrid(); @@ -945,7 +1231,15 @@ begin end; end; - if showAllMonsCells then g_Mons_ForEach(highlightAllMonsterCells); + if showAllMonsCells and showGrid then g_Mons_ForEach(highlightAllMonsterCells); + if showTriggers then drawTriggers(); + if showGrid then drawSelectedPlatformCells(); + + //drawAwakeCells(); + + if showTraceBox then drawTraceBox(); + + //drawGibsBoxes(); glPopMatrix(); @@ -957,16 +1251,21 @@ end; // ////////////////////////////////////////////////////////////////////////// // function g_Holmes_MouseEvent (var ev: THMouseEvent): Boolean; +var + he: THMouseEvent; begin holmesInitCommands(); holmesInitBinds(); result := true; - msX := ev.x; - msY := ev.y; + msX := trunc(ev.x/g_holmes_ui_scale); + msY := trunc(ev.y/g_holmes_ui_scale); msB := ev.bstate; kbS := ev.kstate; msB := msB; - if not uiMouseEvent(ev) then plrDebugMouse(ev); + he := ev; + he.x := trunc(he.x/g_holmes_ui_scale); + he.y := trunc(he.y/g_holmes_ui_scale); + if not uiMouseEvent(he) then plrDebugMouse(he); end; @@ -1034,6 +1333,7 @@ end; // ////////////////////////////////////////////////////////////////////////// // procedure g_Holmes_Draw (); begin + {$IF not DEFINED(HEADLESS)} holmesInitCommands(); holmesInitBinds(); @@ -1047,6 +1347,7 @@ begin begin plrDebugDraw(); end; + {$ENDIF} laserSet := false; end; @@ -1054,20 +1355,43 @@ end; procedure g_Holmes_DrawUI (); begin + {$IF not DEFINED(HEADLESS)} + glPushMatrix(); + glScalef(g_holmes_ui_scale, g_holmes_ui_scale, 1.0); uiDraw(); drawCursor(); + glPopMatrix(); + {$ENDIF} end; // ////////////////////////////////////////////////////////////////////////// // procedure bcOneMonsterThinkStep (); begin gmon_debug_think := false; gmon_debug_one_think_step := true; end; +procedure bcOneMPlatThinkStep (); begin g_dbgpan_mplat_active := false; g_dbgpan_mplat_step := true; end; +procedure bcMPlatToggle (); begin g_dbgpan_mplat_active := not g_dbgpan_mplat_active; end; + procedure bcToggleMonsterInfo (arg: Integer=-1); begin if (arg < 0) then showMonsInfo := not showMonsInfo else showMonsInfo := (arg > 0); end; procedure bcToggleMonsterLOSPlr (arg: Integer=-1); begin if (arg < 0) then showMonsLOS2Plr := not showMonsLOS2Plr else showMonsLOS2Plr := (arg > 0); end; procedure bcToggleMonsterCells (arg: Integer=-1); begin if (arg < 0) then showAllMonsCells := not showAllMonsCells else showAllMonsCells := (arg > 0); end; +procedure bcToggleDrawTriggers (arg: Integer=-1); begin if (arg < 0) then showTriggers := not showTriggers else showTriggers := (arg > 0); end; procedure bcToggleCurPos (arg: Integer=-1); begin if (arg < 0) then showMapCurPos := not showMapCurPos else showMapCurPos := (arg > 0); end; procedure bcToggleGrid (arg: Integer=-1); begin if (arg < 0) then showGrid := not showGrid else showGrid := (arg > 0); end; +procedure bcMonsterSpawn (s: AnsiString); +var + mon: TMonster; +begin + if not gGameOn or g_Game_IsClient then + begin + conwriteln('cannot spawn monster in this mode'); + exit; + end; + mon := g_Mons_SpawnAt(s, pmsCurMapX, pmsCurMapY); + if (mon = nil) then begin conwritefln('unknown monster id: ''%s''', [s]); exit; end; + monMarkedUID := mon.UID; +end; + procedure bcMonsterWakeup (); var mon: TMonster; @@ -1091,15 +1415,33 @@ begin end; end; +procedure dbgToggleTraceBox (arg: Integer=-1); begin if (arg < 0) then showTraceBox := not showTraceBox else showTraceBox := (arg > 0); end; + procedure cbAtcurSelectMonster (); function monsAtDump (mon: TMonster; tag: Integer): Boolean; begin result := true; // stop e_WriteLog(Format('monster #%d (UID:%u) (proxyid:%d)', [mon.arrIdx, mon.UID, mon.proxyId]), MSG_NOTIFY); monMarkedUID := mon.UID; + dumpPublishedProperties(mon); end; +var + plr: TPlayer; + x, y, w, h: Integer; begin monMarkedUID := -1; + if (Length(gPlayers) > 0) then + begin + plr := gPlayers[0]; + if (plr <> nil) then + begin + plr.getMapBox(x, y, w, h); + if (pmsCurMapX >= x) and (pmsCurMapY >= y) and (pmsCurMapX < x+w) and (pmsCurMapY < y+h) then + begin + dumpPublishedProperties(plr); + end; + end; + end; //e_WriteLog('===========================', MSG_NOTIFY); monsGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, monsAtDump); //e_WriteLog('---------------------------', MSG_NOTIFY); @@ -1121,12 +1463,32 @@ procedure cbAtcurDumpWalls (); function wallToggle (pan: TPanel; tag: Integer): Boolean; begin result := false; // don't stop - e_WriteLog(Format('wall #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY); + if (platMarkedGUID = -1) then platMarkedGUID := pan.guid; + e_LogWritefln('wall ''%s'' #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.mapId, pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]); + dumpPublishedProperties(pan); end; +var + hasTrigs: Boolean = false; + f: Integer; + trig: PTrigger; begin + platMarkedGUID := -1; e_WriteLog('=== TOGGLE WALL ===', MSG_NOTIFY); mapGrid.forEachAtPoint(pmsCurMapX, pmsCurMapY, wallToggle, (GridTagWall or GridTagDoor)); e_WriteLog('--- toggle wall ---', MSG_NOTIFY); + if showTriggers then + begin + for f := 0 to High(gTriggers) do + begin + trig := @gTriggers[f]; + if (pmsCurMapX >= trig.x) and (pmsCurMapY >= trig.y) and (pmsCurMapX < trig.x+trig.width) and (pmsCurMapY < trig.y+trig.height) then + begin + if not hasTrigs then begin writeln('=== TRIGGERS ==='); hasTrigs := true; end; + writeln('trigger ''', trig.mapId, ''' of type ''', trigType2Str(trig.TriggerType), ''''); + end; + end; + if hasTrigs then writeln('--- triggers ---'); + end; end; procedure cbAtcurToggleWalls (); @@ -1134,7 +1496,7 @@ procedure cbAtcurToggleWalls (); begin result := false; // don't stop //e_WriteLog(Format('wall #%d(%d); enabled=%d (%d); (%d,%d)-(%d,%d)', [pan.arrIdx, pan.proxyId, Integer(pan.Enabled), Integer(mapGrid.proxyEnabled[pan.proxyId]), pan.X, pan.Y, pan.Width, pan.Height]), MSG_NOTIFY); - if pan.Enabled then g_Map_DisableWall(pan.arrIdx) else g_Map_EnableWall(pan.arrIdx); + if pan.Enabled then g_Map_DisableWallGUID(pan.guid) else g_Map_EnableWallGUID(pan.guid); end; begin //e_WriteLog('=== TOGGLE WALL ===', MSG_NOTIFY); @@ -1156,17 +1518,25 @@ begin cmdAdd('mon_info', bcToggleMonsterInfo, 'toggle monster info', 'monster control'); cmdAdd('mon_los_plr', bcToggleMonsterLOSPlr, 'toggle monster LOS to player', 'monster control'); cmdAdd('mon_cells', bcToggleMonsterCells, 'toggle "show all cells occupied by monsters" (SLOW!)', 'monster control'); - cmdAdd('mon_wakeup', bcMonsterWakeup, 'toggle "show all cells occupied by monsters" (SLOW!)', 'monster control'); + cmdAdd('mon_wakeup', bcMonsterWakeup, 'wake up selected monster', 'monster control'); + + cmdAdd('mon_spawn', bcMonsterSpawn, 'spawn monster', 'monster control'); + + cmdAdd('mplat_step', bcOneMPlatThinkStep, 'one mplat think step', 'mplat control'); + cmdAdd('mplat_toggle', bcMPlatToggle, 'activate/deactivate moving platforms', 'mplat control'); cmdAdd('plr_teleport', bcPlayerTeleport, 'teleport player', 'player control'); cmdAdd('dbg_curpos', bcToggleCurPos, 'toggle "show cursor position on the map"', 'various'); cmdAdd('dbg_grid', bcToggleGrid, 'toggle grid', 'various'); + cmdAdd('dbg_triggers', bcToggleDrawTriggers, 'show/hide triggers (SLOW!)', 'various'); cmdAdd('atcur_select_monster', cbAtcurSelectMonster, 'select monster to operate', 'monster control'); cmdAdd('atcur_dump_monsters', cbAtcurDumpMonsters, 'dump monsters in cell', 'monster control'); cmdAdd('atcur_dump_walls', cbAtcurDumpWalls, 'dump walls in cell', 'wall control'); cmdAdd('atcur_disable_walls', cbAtcurToggleWalls, 'disable walls', 'wall control'); + + cmdAdd('dbg_tracebox', dbgToggleTraceBox, 'test traceBox()', 'player control'); end; @@ -1193,10 +1563,17 @@ begin keybindAdd('M-G', 'mon_cells'); keybindAdd('M-A', 'mon_wakeup'); + keybindAdd('M-P', 'mplat_step'); + keybindAdd('M-O', 'mplat_toggle'); + keybindAdd('C-T', 'plr_teleport'); + keybindAdd('M-T', 'dbg_tracebox'); keybindAdd('C-P', 'dbg_curpos'); keybindAdd('C-G', 'dbg_grid'); + keybindAdd('C-X', 'dbg_triggers'); + + keybindAdd('C-1', 'mon_spawn zombie'); // mouse msbindAdd('LMB', 'atcur_select_monster'); @@ -1206,7 +1583,7 @@ begin // load bindings from file try - st := openDiskFileRO('holmes.rc'); + st := openDiskFileRO(GameDir+'holmes.rc'); pr := TFileTextParser.Create(st); conwriteln('parsing "holmes.rc"...'); while (pr.tokType <> pr.TTEOF) do @@ -1244,4 +1621,6 @@ begin end; +begin + conRegVar('hlm_ui_scale', @g_holmes_ui_scale, 0.01, 5.0, 'Holmes UI scale', '', false); end.