feat: Darkflame Cinema #1294

Wincent01 · 2023-11-14T13:03:47Z

Darkflame Cinema is a way to create interactive — acted — experiences in Darkflame Universe. It aims to provide a complement to the ordinary mission structure with static NPCs and mission texts to convey story. Insperation is drawn from games likes of World of Warcraft, where NPCs frequently act out scenes, alone and in combination with both the player and other NPCs.

See the README for documentation.

The tool can be used without modded objects, but will have limited utility. With precedence of tools like VanityNPC this can fit in the main repository — introducing only optional functionality.

* Recorder to recall player actions. * Server precondtions to manage entity visiblity.

Conflicts: dGame/dGameMessages/GameMessages.cpp

Includes documentation of how to create acts, prefabs and scenes.

* Updated logging * Added an image to the README

* Visiblity and effect records * Recorder will catch effects from behaviors * Documentation for setting up a scene to play automatically. * Documentation for server-side preconditions.

* Added the ability to specify a change to play * Added the ability to specify if a scene can play multiple times to the same player

+ Can now specify a cordinate to path find to + Can now enable/disable the combat AI

Wincent01 · 2023-11-14T13:07:29Z

dGame/Player.cpp

-	m_ObservedEntitiesLength = 256;
-	m_ObservedEntitiesUsed = 0;
-	m_ObservedEntities.resize(m_ObservedEntitiesLength);


This had no right being a vector instead of a set

This change should be moved to a separate PR since it is quite isolated and a good improvement.

EmosewaMC

First pass of review feedback, will do a second pass later

CMakeVariables.txt

EmosewaMC · 2023-11-15T00:43:24Z

dCommon/dConfig.cpp

+	static std::string emptyString{};
+
+	const auto& it = this->m_ConfigValues.find(key);
+
+	if (it == this->m_ConfigValues.end()) return emptyString;
+
+	return it->second;


any particular reason you moved away from operator subscripting here? The memory usage here is in the bytes, so I dont see why we'd basically inline the subscripting

When we were troubleshooting the SQL stuff this was where a crash was occuring.

dGame/EntityManager.cpp

EmosewaMC · 2023-11-15T00:45:03Z

dGame/Player.cpp

-	m_ObservedEntitiesLength = 256;
-	m_ObservedEntitiesUsed = 0;
-	m_ObservedEntities.resize(m_ObservedEntitiesLength);


This change should be moved to a separate PR since it is quite isolated and a good improvement.

dGame/dCinema/Play.cpp

EmosewaMC · 2023-11-15T01:44:56Z

dGame/dCinema/Recorder.h

+public:
+	NiPoint3 position;
+	NiQuaternion rotation;
+	NiPoint3 velocity;
+	NiPoint3 angularVelocity;
+	bool onGround;
+	bool dirtyVelocity;
+	bool dirtyAngularVelocity;


member variables should be moved to private if possible

EmosewaMC · 2023-11-15T01:47:29Z

dGame/dCinema/Scene.h

+	std::vector<std::pair<LOT, std::pair<NiPoint3, NiQuaternion>>> m_Objects;
+	std::vector<std::pair<Prefab, NiPoint3>> m_Prefabs;
+	std::vector<std::pair<LOT, std::pair<Recording::Recorder*, std::string>>> m_NPCs;


The first and third objects here can be replaced with std::multimap if I am understanding the use case here correctly

Yeah. Could do either way, isn't going to have a noticable effect on speed/mem. This is a list of LOTs which should be spawned at a specified location/rotation.

EmosewaMC · 2023-11-15T01:48:30Z

dGame/dCinema/Scene.h

+	float m_ChanceToPlay = 1.0f;
+	bool m_Repeatable = true;
+
+	std::vector<std::pair<PreconditionExpression, bool>> m_Preconditions;


Can be replaced with a std::set (std::set is just std::map<T, bool> effectively)

Don't think so? The boolean here specifies weather or not the precondition should be negated.

In that case it could just br replaced with a map instead for lookup

dGame/dUtilities/ServerPreconditions.hpp

dGame/dUtilities/SlashCommandHandler.cpp

Conflicts: dGame/EntityManager.cpp dGame/Player.h dGame/dComponents/RenderComponent.cpp

Conflicts: CMakeLists.txt dGame/CMakeLists.txt dGame/Entity.cpp dGame/dBehaviors/AttackDelayBehavior.cpp dGame/dBehaviors/PlayEffectBehavior.cpp

EmosewaMC · 2024-09-10T22:30:12Z

dGame/dCinema/Recorder.cpp

+	m_Delay = element->DoubleAttribute("t");
+
+	if (element->Attribute("cleanUp")) {
+		cleanUp = element->BoolAttribute("clean-up");


Suggested change

cleanUp = element->BoolAttribute("clean-up");

cleanUp = element->BoolAttribute("cleanUp");

nit: also as a note, bool attribute (really any of the Attribute calls) already does bounds checks for you, the second argument allows you to choose a default value should one not exist in the xml doc.

Wincent01 added 13 commits October 22, 2023 17:36

Initial changes.

9e56725

* Recorder to recall player actions. * Server precondtions to manage entity visiblity.

Merge remote-tracking branch 'refs/remotes/origin/main'

da236f2

Conflicts: dGame/dGameMessages/GameMessages.cpp

Merge fix

01b40ff

Substational additions to dCinema

b274ea1

Includes documentation of how to create acts, prefabs and scenes.

Merge remote-tracking branch 'origin/main' into dCinema

3f90a4d

Brought the branch up to speed

e4320d3

* Updated logging * Added an image to the README

dCinema improvements

cdc9dda

* Visiblity and effect records * Recorder will catch effects from behaviors * Documentation for setting up a scene to play automatically. * Documentation for server-side preconditions.

More scene metadata

9954e20

* Added the ability to specify a change to play * Added the ability to specify if a scene can play multiple times to the same player

Minor refactor

54060f7

Merge remote-tracking branch 'origin/main' into dCinema

a09bbdb

More record types:

14d4c87

+ Can now specify a cordinate to path find to + Can now enable/disable the combat AI

Reverted local CMakeVariables changes

e546737

Removed test script

7a7bdba

Wincent01 added enhancement New feature or request A-game Related to dGame labels Nov 14, 2023

Wincent01 requested review from aronwk-aaron and EmosewaMC November 14, 2023 13:03

Wincent01 marked this pull request as draft November 14, 2023 13:04

Merge remote-tracking branch 'origin/main' into dCinema

25e1482

Wincent01 commented Nov 14, 2023

View reviewed changes

Fix CMake file

32cbd18

EmosewaMC reviewed Nov 15, 2023

View reviewed changes

Wincent01 added 8 commits November 20, 2023 19:52

Resolved some comments

17a62d9

Resolved some more comments

3a60fff

Merge remote-tracking branch 'refs/remotes/origin/main'

a91cf3a

Update to new API

7b7c062

Merge remote-tracking branch 'refs/remotes/origin/main'

88e5f0e

Conflicts: dGame/EntityManager.cpp dGame/Player.h dGame/dComponents/RenderComponent.cpp

Updated to new API

685bd5d

Merge remote-tracking branch 'refs/remotes/origin/main'

d52ce80

Conflicts: CMakeLists.txt dGame/CMakeLists.txt dGame/Entity.cpp dGame/dBehaviors/AttackDelayBehavior.cpp dGame/dBehaviors/PlayEffectBehavior.cpp

Merge remote-tracking branch 'origin/main' into dCinema

3efad8a

Wincent01 added 4 commits September 8, 2024 17:54

Update to new apis

c948e4b

Add a max showing distance

0d37da7

Fixed mission related preconditions

06063c8

Added clean-up param

a086fe7

EmosewaMC reviewed Sep 10, 2024

View reviewed changes

Wincent01 added 4 commits September 12, 2024 15:31

Amend preconditions fix

dfe9240

Additional record types

04e9e74

New records and commands

f78b28b

Added a navmesh for old gf

bd863a6

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Darkflame Cinema #1294

feat: Darkflame Cinema #1294

Wincent01 commented Nov 14, 2023

Wincent01 Nov 14, 2023

EmosewaMC Nov 15, 2023

EmosewaMC left a comment

EmosewaMC Nov 15, 2023

Wincent01 Nov 20, 2023

EmosewaMC Nov 15, 2023

EmosewaMC Nov 15, 2023

EmosewaMC Nov 15, 2023

Wincent01 Nov 20, 2023 •

edited

Loading

EmosewaMC Nov 15, 2023

Wincent01 Nov 20, 2023

EmosewaMC Nov 20, 2023

EmosewaMC Sep 10, 2024

EmosewaMC Sep 10, 2024 •

edited

Loading

	cleanUp = element->BoolAttribute("clean-up");
	cleanUp = element->BoolAttribute("cleanUp");

feat: Darkflame Cinema #1294

Are you sure you want to change the base?

feat: Darkflame Cinema #1294

Conversation

Wincent01 commented Nov 14, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EmosewaMC left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Wincent01 Nov 20, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EmosewaMC Sep 10, 2024 • edited Loading

Choose a reason for hiding this comment

Wincent01 Nov 20, 2023 •

edited

Loading

EmosewaMC Sep 10, 2024 •

edited

Loading