Changesets: spring
develop a9f12a09
Timestamp: 2007-12-02 17:41:33 Author: kloot [ Details ] [ Diff ] |
restore the old computation of CCamera::viewx [tan(aspect * halfFov) != (aspect * tanHalfFov)] git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4914 37977431-3df6-0310-b722-df95706aa16b |
||
mod - rts/Game/Camera.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/Camera.h | [ Diff ] [ File ] | ||
develop f738462f
Timestamp: 2007-12-02 17:04:02 Author: kloot [ Details ] [ Diff ] |
KAIK bugfix: initialize aicb after load for CMetalMaker git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4913 37977431-3df6-0310-b722-df95706aa16b |
||
mod - AI/Global/KAIK-0.13/Defines.h | [ Diff ] [ File ] | ||
mod - AI/Global/KAIK-0.13/GlobalAI.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/KAIK-0.13/MetalMaker.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/KAIK-0.13/MetalMaker.h | [ Diff ] [ File ] | ||
mod - AI/Global/KAIK-0.13/Unit.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/KAIK-0.13/UnitHandler.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/KAIK-0.13/UnitTable.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/KAIK-0.13/UnitTable.h | [ Diff ] [ File ] | ||
develop b2cfc064
Timestamp: 2007-12-02 10:15:39 Author: Victor [ Details ] [ Diff ] |
Forgot to initialize next frame number. git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4912 37977431-3df6-0310-b722-df95706aa16b |
||
mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | ||
develop b6adeece
Timestamp: 2007-12-02 05:06:10 Author: tnowell [ Details ] [ Diff ] |
- fixed an error with ranks and joining channels where the value of the rank settings used the flag check box instead of the rank check box to set itself. git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4911 37977431-3df6-0310-b722-df95706aa16b |
||
develop 00a21038
Timestamp: 2007-12-02 02:54:58 Author: tnowell [ Details ] [ Diff ] |
- changed a login panel label - fixed a bug with parsing BATTLEOPENED protocol command leading to the map value being set as null leading to script generation errors and spaces in the battle list. git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4910 37977431-3df6-0310-b722-df95706aa16b |
||
develop aa79a8b5
Timestamp: 2007-12-01 23:41:23 Author: LordMatt [ Details ] [ Diff ] |
Changes to the installer package: *Remove unused file checkdotnet.nsh *Remove XTA from being included in installer *Remove OTA Content from being included in installer *Add installer section for downloadable mods -Add mod BA filename BA_Installer_Version.sd7 -Add mod XTA filename XTA_Installer_Version.sdz *Add code that downloads OTA content if not already present when installing BA and XTA *Include LogicLib.nsh (for if statements) *Change code that prevents installing Lobby Desktop Shortcut when Lobby is not installed into a more readable form *Add code that prevents installing Lobby StartMenu Shortcut when Lobby is not installed *Fix bug where Lobby Desktop Shortcut was not deleted during uninstall *Remove no longer used gamedata folder related stuff *Remove unnecessary Update installer tags (to do: merge regular and update installers) git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4909 37977431-3df6-0310-b722-df95706aa16b |
||
rm - installer/checkdotnet.nsh | [ Diff ] [ File ] | ||
add - installer/sections/ba.nsh | [ Diff ] [ File ] | ||
mod - installer/sections/main.nsh | [ Diff ] [ File ] | ||
mod - installer/sections/sectiondesc.nsh | [ Diff ] [ File ] | ||
mod - installer/sections/shortcuts.nsh | [ Diff ] [ File ] | ||
add - installer/sections/xta.nsh | [ Diff ] [ File ] | ||
mod - installer/spring.nsi | [ Diff ] [ File ] | ||
develop db57365e
Timestamp: 2007-12-01 19:39:07 Author: Victor [ Details ] [ Diff ] |
Fixed start game right after load savegame. git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4908 37977431-3df6-0310-b722-df95706aa16b |
||
mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/GameServer.h | [ Diff ] [ File ] | ||
mod - rts/System/LoadSaveHandler.cpp | [ Diff ] [ File ] | ||
develop 494d0db3
Timestamp: 2007-12-01 18:44:28 Author: Victor [ Details ] [ Diff ] |
Finished fixing bug git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4907 37977431-3df6-0310-b722-df95706aa16b |
||
mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp | [ Diff ] [ File ] | ||
develop 618303b7
Timestamp: 2007-12-01 17:58:05 Author: Victor [ Details ] [ Diff ] |
Fixed bug: interceptor does not destroy target after load savegame. git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4906 37977431-3df6-0310-b722-df95706aa16b |
||
mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp | [ Diff ] [ File ] | ||
develop 90b5022a
Timestamp: 2007-12-01 14:20:14 Author: Victor [ Details ] [ Diff ] |
* Fixed bugs with pause after load savegame(now after load always set pause) * Added ai unloading after team is destroyed. git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4905 37977431-3df6-0310-b722-df95706aa16b |
||
mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/GameServer.h | [ Diff ] [ File ] | ||
mod - rts/Game/Team.cpp | [ Diff ] [ File ] | ||
mod - rts/System/LoadSaveHandler.cpp | [ Diff ] [ File ] | ||
develop 54b8b73a
Timestamp: 2007-12-01 14:16:56 Author: Victor [ Details ] [ Diff ] |
Fixed another crash after load git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4904 37977431-3df6-0310-b722-df95706aa16b |
||
mod - rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp | [ Diff ] [ File ] | ||
develop 3e5e473f
Timestamp: 2007-12-01 11:43:46 Author: Victor [ Details ] [ Diff ] |
* Fixed possible bug in intercepting - nuke can be not intercepted by team 0 and its allies. * Added reserved space in move info * Fixed crash after load git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4903 37977431-3df6-0310-b722-df95706aa16b |
||
mod - rts/Sim/Misc/InterceptHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/MoveTypes/MoveInfo.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/MoveTypes/TAAirMoveType.cpp | [ Diff ] [ File ] | ||
develop a454a636
Timestamp: 2007-12-01 11:40:30 Author: Victor [ Details ] [ Diff ] |
Fixed crash with saving after nuke was intercepted. git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4902 37977431-3df6-0310-b722-df95706aa16b |
||
mod - rts/Sim/Weapons/Weapon.cpp | [ Diff ] [ File ] | ||
develop 92dcfca6
Timestamp: 2007-12-01 11:38:48 Author: Victor [ Details ] [ Diff ] |
Fixed bug: KAIs cannot build metal extractors if builder has 3D range. git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4901 37977431-3df6-0310-b722-df95706aa16b |
||
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp | [ Diff ] [ File ] | ||
develop a6906506
Timestamp: 2007-12-01 11:32:36 Author: Victor [ Details ] [ Diff ] |
* Fixed bug in map damage loading from savegame. * Fixed possible bug in explosions map damage. git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4900 37977431-3df6-0310-b722-df95706aa16b |
||
mod - rts/Map/BasicMapDamage.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/ReadMap.cpp | [ Diff ] [ File ] | ||
develop e81f3794
Timestamp: 2007-12-01 03:15:17 Author: tnowell [ Details ] [ Diff ] |
hmm there are some changes in my svn folder =s I doubt I'll remember everything I did to aflobby but here it goes: - added an ignore spring version checkbox - some fiddling to fix a mod/map loading bug that went away when you refreshed unitsync - fixed an error in the connection class that tried to send data after a disconnect despite the broken connection - some fiddling of unit name loading from unitsync this commit does not include protocol changes for TASServer git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4899 37977431-3df6-0310-b722-df95706aa16b |
||
develop c40b9abb
Timestamp: 2007-11-30 20:36:59 Author: trepan [ Details ] [ Diff ] |
* buildRange3D defaults to false (backwards compatible) git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4898 37977431-3df6-0310-b722-df95706aa16b |
||
rm - rts/Lua/LuaTODO.txt | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitDefHandler.cpp | [ Diff ] [ File ] | ||
develop 8d2538b3
Timestamp: 2007-11-30 02:35:53 Author: kloot [ Details ] [ Diff ] |
* fix the messed-up simtimes caused by r4896 git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4897 37977431-3df6-0310-b722-df95706aa16b |
||
mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
develop 2618f2cc
Timestamp: 2007-11-29 22:35:34 Author: Auswaschbar [ Details ] [ Diff ] |
* removed unused code from CGame * used sinf() instead of sin() for speed reasons git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4896 37977431-3df6-0310-b722-df95706aa16b |
||
mod - rts/Game/Camera.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
develop 2106710f
Timestamp: 2007-11-29 18:27:12 Author: tnowell [ Details ] [ Diff ] |
- forgot to commit changes to vs2005 project. - added new behaviour files - soem minor organisation of the files into filter folders git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4895 37977431-3df6-0310-b722-df95706aa16b |
||
mod - AI/Global/NTai/AI/AI.vcproj | [ Diff ] [ File ] | ||
develop 199f68e6
Timestamp: 2007-11-29 18:26:12 Author: tnowell [ Details ] [ Diff ] |
- added a behaviour for reclaiming features nearby when a unit gets stuck - removed redundant metatag systems that weren't usable anyway - renamed globalAI.h/cpp and helper.h/cpp to CNTai.h/cpp and Global.h/cpp - various tweaks and minor fixes - more instances of NTais version number changed to use the AI_NAME variable - building spacing refactored out into CUnitTypeData - various code cleanup and removal of useless dead weight code git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4894 37977431-3df6-0310-b722-df95706aa16b |
||
mod - AI/Global/NTai/AI/NTai/Agents/CManufacturer.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Agents/CManufacturer.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Core/Interface.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Core/include.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Log.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Terrain/CBuildingPlacer.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/SDK/AI.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Tasks/CKeywordConstructionTask.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Tasks/CUnitConstructionTask.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Units/Behaviours/AttackBehaviour.h | [ Diff ] [ File ] | ||
add - AI/Global/NTai/AI/NTai/Units/Behaviours/CMoveFailReclaimBehaviour.cpp | [ Diff ] [ File ] | ||
add - AI/Global/NTai/AI/NTai/Units/Behaviours/CMoveFailReclaimBehaviour.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Units/CUnit.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Units/CUnitTypeData.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Units/CUnitTypeData.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Units/IBehaviour.h | [ Diff ] [ File ] | ||
develop afaac094
Timestamp: 2007-11-29 11:31:56 Author: tnowell [ Details ] [ Diff ] |
- added kamikaze behaviour - added static defence Behaviour - masses of whitespace added to make code prettier - macros moved into macro.h - enums moved into enums.h - added macro definition to prevent VS2005 spamming warnings about security and suggesting alternatives that linux cant use - fixed a slew of validunitID checks - got rid of tonnes of redundant or pointless code - removed unnecesary and duplicate headers in include.h - added lots of comments to headers and include directives. git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4893 37977431-3df6-0310-b722-df95706aa16b |
||
mod - AI/Global/NTai/AI/AI.vcproj | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Agents/Chaser.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Agents/Chaser.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Core/NTAI.APS | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Core/NTAI.rc | [ Diff ] [ File ] | ||
add - AI/Global/NTai/AI/NTai/Core/enums.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Core/include.h | [ Diff ] [ File ] | ||
add - AI/Global/NTai/AI/NTai/Core/macros.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Log.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Log.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/TdfParser.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Terrain/CBuildingPlacer.cpp | [ Diff ] [ File ] | ||
rm - AI/Global/NTai/AI/NTai/Helpers/Terrain/CSector.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Terrain/Map.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Terrain/Map.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Terrain/RadarHandler.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Units/Actions.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/grid/CGridCell.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/grid/CGridCell.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/grid/CGridManager.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Tasks/CKeywordConstructionTask.cpp | [ Diff ] [ File ] | ||
add - AI/Global/NTai/AI/NTai/Units/Behaviours/CKamikazeBehaviour.cpp | [ Diff ] [ File ] | ||
add - AI/Global/NTai/AI/NTai/Units/Behaviours/CKamikazeBehaviour.h | [ Diff ] [ File ] | ||
add - AI/Global/NTai/AI/NTai/Units/Behaviours/CStaticDefenceBehaviour.cpp | [ Diff ] [ File ] | ||
add - AI/Global/NTai/AI/NTai/Units/Behaviours/CStaticDefenceBehaviour.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Units/CUnit.cpp | [ Diff ] [ File ] | ||
develop 5a2aebb8
Timestamp: 2007-11-29 08:24:58 Author: tnowell [ Details ] [ Diff ] |
- learning files now output the AI_NAME variable rather than a hard coded string - AI_NAME variable version changed to XE9.79+ - removed a set container in helper.cpp and instead stored and calculated its value in CUnitTypeData and exposed the value via the bool CanConstruct() getter method - minor optimization on the efficiency functions based on the above refactor git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4892 37977431-3df6-0310-b722-df95706aa16b |
||
mod - AI/Global/NTai/AI/NTai/Core/GlobalAI.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Core/helper.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Core/include.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Units/CUnitTypeData.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Units/CUnitTypeData.h | [ Diff ] [ File ] | ||
develop 8bd158f2
Timestamp: 2007-11-29 07:57:17 Author: tnowell [ Details ] [ Diff ] |
- changed all the include directives from helper.h to include.h and removed the include.h include from helper.h - removed the tdf error enum from include.h - added includes for some task classes in include.h - added much needed whitespace in radarhandler chaser and metalhandler headersand source files - removed a lot of unused variables and some functions that had commented out bodies - fixed some line endings git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4891 37977431-3df6-0310-b722-df95706aa16b |
||
mod - AI/Global/NTai/AI/AI.vcproj | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Agents/CManufacturer.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Agents/Chaser.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Agents/Chaser.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Agents/Planning.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Core/CMessage.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Core/GlobalAI.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Core/GlobalAI.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Core/IModule.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Core/helper.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Core/helper.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Core/include.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Engine/COrderRouter.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Engine/COrderRouter.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/CConfigData.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/CEconomy.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Log.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/TdfParser.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Terrain/CBuildingPlacer.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Terrain/DTHandler.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Terrain/Map.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Terrain/MetalHandler.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Terrain/MetalHandler.h | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Terrain/MetalMap.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Terrain/RadarHandler.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Units/Actions.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/Units/CUnitDefLoader.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Helpers/ubuild.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Tasks/CConsoleTask.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Tasks/CKeywordConstructionTask.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Tasks/CLeaveBuildSpotTask.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Tasks/CUnitConstructionTask.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Units/Behaviours/AttackBehaviour.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Units/Behaviours/CDGunBehaviour.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Units/Behaviours/CRetreatBehaviour.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Units/Behaviours/MetalMakerBehaviour.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Units/CUnit.cpp | [ Diff ] [ File ] | ||
mod - AI/Global/NTai/AI/NTai/Units/CUnitTypeData.cpp | [ Diff ] [ File ] | ||
develop ce5f28e9
Timestamp: 2007-11-28 21:33:41 Author: satirik [ Details ] [ Diff ] |
new form to choose the chat colors git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@4890 37977431-3df6-0310-b722-df95706aa16b |
||