Skip to content

Commit

Permalink
Adjusted utils paths.
Browse files Browse the repository at this point in the history
  • Loading branch information
Neloreck committed Jul 3, 2023
1 parent 44f1518 commit 9eb7b8a
Show file tree
Hide file tree
Showing 79 changed files with 226 additions and 233 deletions.
2 changes: 1 addition & 1 deletion src/engine/core/database/logic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { registry } from "@/engine/core/database/registry";
import { closeLoadMarker, closeSaveMarker, openLoadMarker, openSaveMarker } from "@/engine/core/database/save_markers";
import { IRegistryObjectState } from "@/engine/core/database/types";
import { ESchemeEvent, IBaseSchemeState } from "@/engine/core/schemes/base/types";
import { readTimeFromPacket, writeTimeToPacket } from "@/engine/core/utils/game/game_time";
import { emitSchemeEvent } from "@/engine/core/utils/scheme/scheme_event";
import { readTimeFromPacket, writeTimeToPacket } from "@/engine/core/utils/time";
import { NIL } from "@/engine/lib/constants/words";
import {
ClientObject,
Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/managers/debug/DebugManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { AbstractCoreManager } from "@/engine/core/managers/base/AbstractCoreMan
import { EStateActionId } from "@/engine/core/objects/state";
import { StalkerStateManager } from "@/engine/core/objects/state/StalkerStateManager";
import { EActionId } from "@/engine/core/schemes";
import { gameTimeToString } from "@/engine/core/utils/game/game_time";
import { LuaLogger } from "@/engine/core/utils/logging";
import { getNumberRelationBetweenCommunities } from "@/engine/core/utils/relation";
import { gameTimeToString } from "@/engine/core/utils/time";
import { toJSON } from "@/engine/core/utils/transform/json";
import { stalkerCommunities, TCommunity } from "@/engine/lib/constants/communities";
import { NIL } from "@/engine/lib/constants/words";
Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/managers/debug/ProfilingManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { profile_timer } from "xray16";

import { AbstractCoreManager } from "@/engine/core/managers/base/AbstractCoreManager";
import { abort } from "@/engine/core/utils/assertion";
import { executeConsoleCommand } from "@/engine/core/utils/console";
import { executeConsoleCommand } from "@/engine/core/utils/game/game_console";
import { LuaLogger } from "@/engine/core/utils/logging";
import { gameConfig } from "@/engine/lib/configs/GameConfig";
import { consoleCommands } from "@/engine/lib/constants/console_commands";
Expand Down
4 changes: 2 additions & 2 deletions src/engine/core/managers/interaction/SleepManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import { ActorInputManager } from "@/engine/core/managers/interface";
import { SurgeManager } from "@/engine/core/managers/world/SurgeManager";
import { WeatherManager } from "@/engine/core/managers/world/WeatherManager";
import { SleepDialog } from "@/engine/core/ui/interaction/SleepDialog";
import { executeConsoleCommand, getConsoleFloatCommand } from "@/engine/core/utils/console";
import { disableInfo, giveInfo } from "@/engine/core/utils/info_portion";
import { executeConsoleCommand, getConsoleFloatCommand } from "@/engine/core/utils/game/game_console";
import { LuaLogger } from "@/engine/core/utils/logging";
import { disableInfo, giveInfo } from "@/engine/core/utils/object/object_info_portion";
import { animations } from "@/engine/lib/constants/animation/animations";
import { postProcessors } from "@/engine/lib/constants/animation/post_processors";
import { consoleCommands } from "@/engine/lib/constants/console_commands";
Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/managers/interaction/TravelManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { SquadStayOnTargetAction } from "@/engine/core/objects/server/squad/acti
import { Squad } from "@/engine/core/objects/server/squad/Squad";
import { TSimulationObject } from "@/engine/core/objects/server/types";
import { abort } from "@/engine/core/utils/assertion";
import { createAutoSave } from "@/engine/core/utils/game_save";
import { createAutoSave } from "@/engine/core/utils/game/game_save";
import { parseConditionsList, pickSectionFromCondList, TConditionList } from "@/engine/core/utils/ini";
import { LuaLogger } from "@/engine/core/utils/logging";
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { EAchievement } from "@/engine/core/managers/interaction/achievements/ty
import { ENotificationType, ITipNotification } from "@/engine/core/managers/interface";
import { StatisticsManager } from "@/engine/core/managers/interface/StatisticsManager";
import { WeatherManager } from "@/engine/core/managers/world/WeatherManager";
import { disableInfo, giveInfo, hasAlifeInfo } from "@/engine/core/utils/info_portion";
import { disableInfo, giveInfo, hasAlifeInfo } from "@/engine/core/utils/object/object_info_portion";
import { captions } from "@/engine/lib/constants/captions";
import { communities } from "@/engine/lib/constants/communities";
import { infoPortions, TInfoPortion } from "@/engine/lib/constants/info_portions";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,16 @@ import {
notificationManagerIcons,
} from "@/engine/core/managers/interface/notifications";
import { StatisticsManager } from "@/engine/core/managers/interface/StatisticsManager";
import { giveInfo, hasAlifeInfo, hasAlifeInfos, hasFewAlifeInfos } from "@/engine/core/utils/info_portion";
import { readTimeFromPacket, writeTimeToPacket } from "@/engine/core/utils/game/game_time";
import { LuaLogger } from "@/engine/core/utils/logging";
import {
giveInfo,
hasAlifeInfo,
hasAlifeInfos,
hasFewAlifeInfos,
} from "@/engine/core/utils/object/object_info_portion";
import { spawnItemsForObjectFromList } from "@/engine/core/utils/object/object_spawn";
import { increaseCommunityGoodwillToId } from "@/engine/core/utils/relation";
import { spawnItemsForObjectFromList } from "@/engine/core/utils/spawn";
import { readTimeFromPacket, writeTimeToPacket } from "@/engine/core/utils/time";
import { captions } from "@/engine/lib/constants/captions/captions";
import { communities } from "@/engine/lib/constants/communities";
import { infoPortions } from "@/engine/lib/constants/info_portions/info_portions";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import {
TPRTTable,
} from "@/engine/core/managers/interaction/dialog/types";
import { assert } from "@/engine/core/utils/assertion";
import { hasAlifeInfo } from "@/engine/core/utils/info_portion";
import { parseInfoPortions, parseStringsList } from "@/engine/core/utils/ini";
import { LuaLogger } from "@/engine/core/utils/logging";
import { getCharacterCommunity, isObjectWounded } from "@/engine/core/utils/object";
import { hasAlifeInfo } from "@/engine/core/utils/object/object_info_portion";
import { FALSE, TRUE } from "@/engine/lib/constants/words";
import {
ClientObject,
Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/managers/interaction/tasks/TaskObject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { ETaskState, ETaskStatus, POSSIBLE_STATES } from "@/engine/core/managers
import { NotificationManager } from "@/engine/core/managers/interface/notifications";
import { assertDefined } from "@/engine/core/utils/assertion";
import { getExtern } from "@/engine/core/utils/binding";
import { readTimeFromPacket, writeTimeToPacket } from "@/engine/core/utils/game/game_time";
import {
parseConditionsList,
parseStringsList,
Expand All @@ -23,7 +24,6 @@ import {
} from "@/engine/core/utils/ini";
import { LuaLogger } from "@/engine/core/utils/logging";
import { giveMoneyToActor, transferItemsToActor } from "@/engine/core/utils/task_reward";
import { readTimeFromPacket, writeTimeToPacket } from "@/engine/core/utils/time";
import { levels, TLevel } from "@/engine/lib/constants/levels";
import { storyNames } from "@/engine/lib/constants/story_names";
import { NIL } from "@/engine/lib/constants/words";
Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/managers/interface/ActorInputManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { game, get_hud, level } from "xray16";
import { closeLoadMarker, closeSaveMarker, openLoadMarker, openSaveMarker, registry } from "@/engine/core/database";
import { AbstractCoreManager, EGameEvent, EventsManager } from "@/engine/core/managers";
import { SchemeNoWeapon } from "@/engine/core/schemes/sr_no_weapon";
import { readTimeFromPacket, writeTimeToPacket } from "@/engine/core/utils/game/game_time";
import { LuaLogger } from "@/engine/core/utils/logging";
import { readTimeFromPacket, writeTimeToPacket } from "@/engine/core/utils/time";
import { misc } from "@/engine/lib/constants/items/misc";
import { ClientObject, GameHud, NetPacket, NetProcessor, Optional, TDuration, Time, TIndex } from "@/engine/lib/types";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { system_ini } from "xray16";

import { AbstractCoreManager } from "@/engine/core/managers/base/AbstractCoreManager";
import { executeConsoleCommand } from "@/engine/core/utils/console";
import { executeConsoleCommand } from "@/engine/core/utils/game/game_console";
import { readIniString } from "@/engine/core/utils/ini";
import { LuaLogger } from "@/engine/core/utils/logging";
import { consoleCommands } from "@/engine/lib/constants/console_commands";
Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/managers/interface/GameSettingsManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { level } from "xray16";

import { closeLoadMarker, closeSaveMarker, openLoadMarker, openSaveMarker } from "@/engine/core/database";
import { AbstractCoreManager } from "@/engine/core/managers";
import { executeConsoleCommand } from "@/engine/core/utils/console";
import { executeConsoleCommand } from "@/engine/core/utils/game/game_console";
import { consoleCommands } from "@/engine/lib/constants/console_commands";
import { EGameDifficulty, gameDifficultiesByNumber } from "@/engine/lib/constants/game_difficulties";
import { NetPacket, NetProcessor } from "@/engine/lib/types";
Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/managers/interface/MapDisplayManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import {
primaryMapSpotObjects,
sleepZones,
} from "@/engine/core/managers/interface/MapDisplayManagerObjects";
import { hasAlifeInfo } from "@/engine/core/utils/info_portion";
import { parseConditionsList, pickSectionFromCondList, readIniString, TConditionList } from "@/engine/core/utils/ini";
import { LuaLogger } from "@/engine/core/utils/logging";
import { anomalyHasArtefact } from "@/engine/core/utils/object/object_anomaly";
import { hasAlifeInfo } from "@/engine/core/utils/object/object_info_portion";
import { captions } from "@/engine/lib/constants/captions/captions";
import { infoPortions } from "@/engine/lib/constants/info_portions/info_portions";
import { levels } from "@/engine/lib/constants/levels";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import { abort, assert } from "@/engine/core/utils/assertion";
import { isStalkerClassId } from "@/engine/core/utils/check/is";
import { LuaLogger } from "@/engine/core/utils/logging";
import { isObjectWounded } from "@/engine/core/utils/object";
import { getInventoryNameForItemSection } from "@/engine/core/utils/spawn";
import { getInventoryNameForItemSection } from "@/engine/core/utils/object/object_spawn";
import { captions, TCaption } from "@/engine/lib/constants/captions/captions";
import { scriptSounds } from "@/engine/lib/constants/sound/script_sounds";
import { textures, TTexture } from "@/engine/lib/constants/textures";
Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/managers/sounds/DynamicMusicManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { dynamicMusicThemes } from "@/engine/core/managers/sounds/dynamic_music"
import { SurgeManager } from "@/engine/core/managers/world/SurgeManager";
import { StereoSound } from "@/engine/core/objects/sounds/StereoSound";
import { abort } from "@/engine/core/utils/assertion";
import { executeConsoleCommand, getConsoleFloatCommand } from "@/engine/core/utils/console";
import { executeConsoleCommand, getConsoleFloatCommand } from "@/engine/core/utils/game/game_console";
import { LuaLogger } from "@/engine/core/utils/logging";
import { clampNumber } from "@/engine/core/utils/number";
import { consoleCommands } from "@/engine/lib/constants/console_commands";
Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/managers/world/DropManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { isAmmoItem, isArtefact, isGrenade, isLootableItem, isWeapon } from "@/e
import { parseNumbersList, parseStringsList } from "@/engine/core/utils/ini";
import { LuaLogger } from "@/engine/core/utils/logging";
import { getCharacterCommunity, setItemCondition } from "@/engine/core/utils/object";
import { spawnItemsForObject } from "@/engine/core/utils/spawn";
import { spawnItemsForObject } from "@/engine/core/utils/object/object_spawn";
import { logicsConfig } from "@/engine/lib/configs/LogicsConfig";
import { communities, TCommunity } from "@/engine/lib/constants/communities";
import { TInventoryItem } from "@/engine/lib/constants/items";
Expand Down
8 changes: 4 additions & 4 deletions src/engine/core/managers/world/SurgeManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import { AnomalyZoneBinder, SmartTerrain } from "@/engine/core/objects";
import { Squad } from "@/engine/core/objects/server/squad/Squad";
import { isBlackScreen, isImmuneToSurge, isSurgeEnabledOnLevel } from "@/engine/core/utils/check/check";
import { isArtefact, isStoryObject } from "@/engine/core/utils/check/is";
import { executeConsoleCommand, getConsoleFloatCommand } from "@/engine/core/utils/console";
import { createAutoSave } from "@/engine/core/utils/game_save";
import { disableInfo, giveInfo, hasAlifeInfo } from "@/engine/core/utils/info_portion";
import { executeConsoleCommand, getConsoleFloatCommand } from "@/engine/core/utils/game/game_console";
import { createAutoSave } from "@/engine/core/utils/game/game_save";
import { readTimeFromPacket, writeTimeToPacket } from "@/engine/core/utils/game/game_time";
import { parseConditionsList, pickSectionFromCondList, TConditionList } from "@/engine/core/utils/ini";
import { LuaLogger } from "@/engine/core/utils/logging";
import { disableInfo, giveInfo, hasAlifeInfo } from "@/engine/core/utils/object/object_info_portion";
import { isObjectOnLevel } from "@/engine/core/utils/object/object_location";
import { readTimeFromPacket, writeTimeToPacket } from "@/engine/core/utils/time";
import { createVector } from "@/engine/core/utils/vector";
import { surgeConfig } from "@/engine/lib/configs/SurgeConfig";
import { animations } from "@/engine/lib/constants/animation/animations";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { PH_BOX_GENERIC_LTX } from "@/engine/core/database";
import { abort } from "@/engine/core/utils/assertion";
import { parseNumbersList, parseStringsList, readIniString } from "@/engine/core/utils/ini";
import { LuaLogger } from "@/engine/core/utils/logging";
import { spawnItemsForObject } from "@/engine/core/utils/spawn";
import { spawnItemsForObject } from "@/engine/core/utils/object/object_spawn";
import { TInventoryItem } from "@/engine/lib/constants/items";
import { ClientObject, IniFile, LuaArray, Optional, TCount, TName, TProbability, TSection } from "@/engine/lib/types";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ import {
} from "@/engine/core/objects/server/types";
import { abort, assert, assertDefined } from "@/engine/core/utils/assertion";
import { isMonster, isStalker } from "@/engine/core/utils/check/is";
import { readTimeFromPacket, writeTimeToPacket } from "@/engine/core/utils/game/game_time";
import {
getSchemeFromSection,
IConfigSwitchCondition,
Expand All @@ -78,7 +79,6 @@ import {
switchObjectSchemeToSection,
} from "@/engine/core/utils/scheme";
import { getTableSize, isEmpty } from "@/engine/core/utils/table";
import { readTimeFromPacket, writeTimeToPacket } from "@/engine/core/utils/time";
import { toJSON } from "@/engine/core/utils/transform/json";
import { gameConfig } from "@/engine/lib/configs/GameConfig";
import { logicsConfig } from "@/engine/lib/configs/LogicsConfig";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import { GlobalSoundManager } from "@/engine/core/managers/sounds/GlobalSoundMan
import { SmartTerrain } from "@/engine/core/objects/server/smart_terrain/SmartTerrain";
import { ESmartTerrainStatus } from "@/engine/core/objects/server/smart_terrain/types";
import { isWeapon } from "@/engine/core/utils/check/is";
import { readTimeFromPacket, writeTimeToPacket } from "@/engine/core/utils/game/game_time";
import { parseConditionsList, pickSectionFromCondList, readIniString, TConditionList } from "@/engine/core/utils/ini";
import { LuaLogger } from "@/engine/core/utils/logging";
import { ERelation, updateSquadIdRelationToActor } from "@/engine/core/utils/relation";
import { readTimeFromPacket, writeTimeToPacket } from "@/engine/core/utils/time";
import { logicsConfig } from "@/engine/lib/configs/LogicsConfig";
import {
ClientObject,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import { IRegistryObjectState, registry } from "@/engine/core/database";
import { SurgeManager } from "@/engine/core/managers/world/SurgeManager";
import type { SmartTerrain } from "@/engine/core/objects/server/smart_terrain/SmartTerrain";
import { IJobDescriptor, IObjectJobDescriptor, TJobDescriptor } from "@/engine/core/objects/server/smart_terrain/types";
import { isInTimeInterval } from "@/engine/core/utils/game/game_time";
import { pickSectionFromCondList } from "@/engine/core/utils/ini/ini_config";
import { getSchemeFromSection, parseConditionsList, parseWaypointData } from "@/engine/core/utils/ini/ini_parse";
import { readIniBoolean, readIniNumber, readIniString } from "@/engine/core/utils/ini/ini_read";
import { TConditionList } from "@/engine/core/utils/ini/ini_types";
import { LuaLogger } from "@/engine/core/utils/logging";
import { initializeObjectSchemeLogic } from "@/engine/core/utils/scheme";
import { isInTimeInterval } from "@/engine/core/utils/time";
import { communities } from "@/engine/lib/constants/communities";
import { MAX_U16 } from "@/engine/lib/constants/memory";
import { roots } from "@/engine/lib/constants/roots";
Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/objects/server/squad/Squad.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ import {
import { StoryManager } from "@/engine/core/objects/sounds/stories";
import { abort, assertDefined } from "@/engine/core/utils/assertion";
import { isSquadMonsterCommunity } from "@/engine/core/utils/check/is";
import { hasAlifeInfo } from "@/engine/core/utils/info_portion";
import {
parseConditionsList,
parseStringsList,
Expand All @@ -56,6 +55,7 @@ import {
} from "@/engine/core/utils/ini";
import { LuaLogger } from "@/engine/core/utils/logging";
import { areObjectsOnSameLevel } from "@/engine/core/utils/object";
import { hasAlifeInfo } from "@/engine/core/utils/object/object_info_portion";
import {
areCommunitiesEnemies,
ERelation,
Expand Down
4 changes: 2 additions & 2 deletions src/engine/core/objects/server/squad/simulation_activities.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { SurgeManager } from "@/engine/core/managers/world/SurgeManager";
import { ISimulationActivityDescriptor, SmartTerrain } from "@/engine/core/objects";
import { Squad } from "@/engine/core/objects/server/squad/Squad";
import { hasAlifeInfo } from "@/engine/core/utils/info_portion";
import { isInTimeInterval } from "@/engine/core/utils/game/game_time";
import { LuaLogger } from "@/engine/core/utils/logging";
import { getServerDistanceBetween } from "@/engine/core/utils/object";
import { hasAlifeInfo } from "@/engine/core/utils/object/object_info_portion";
import { isAnySquadMemberEnemyToActor } from "@/engine/core/utils/relation";
import { isInTimeInterval } from "@/engine/core/utils/time";
import { communities, TCommunity } from "@/engine/lib/constants/communities";
import { infoPortions } from "@/engine/lib/constants/info_portions";
import { storyNames } from "@/engine/lib/constants/story_names";
Expand Down
2 changes: 1 addition & 1 deletion src/engine/core/objects/state/StalkerMoveManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { pickSectionFromCondList } from "@/engine/core/utils/ini/ini_config";
import { parseConditionsList } from "@/engine/core/utils/ini/ini_parse";
import { IWaypointData, TConditionList } from "@/engine/core/utils/ini/ini_types";
import { LuaLogger } from "@/engine/core/utils/logging";
import { isStalkerAtWaypoint } from "@/engine/core/utils/position";
import { isStalkerAtWaypoint } from "@/engine/core/utils/object";
import { TRUE } from "@/engine/lib/constants/words";
import {
AnyCallable,
Expand Down
3 changes: 1 addition & 2 deletions src/engine/core/schemes/camper/actions/ActionCamperPatrol.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import { StalkerMoveManager } from "@/engine/core/objects/state/StalkerMoveManag
import { ICampPoint, ISchemeCamperState } from "@/engine/core/schemes/camper/ISchemeCamperState";
import { abort } from "@/engine/core/utils/assertion";
import { parseWaypointsData } from "@/engine/core/utils/ini";
import { isObjectFacingDanger } from "@/engine/core/utils/object";
import { isStalkerAtWaypoint } from "@/engine/core/utils/position";
import { isObjectFacingDanger, isStalkerAtWaypoint } from "@/engine/core/utils/object";
import { createVector } from "@/engine/core/utils/vector";
import { ClientObject, DangerObject, Optional, Vector } from "@/engine/lib/types";

Expand Down
Loading

0 comments on commit 9eb7b8a

Please sign in to comment.