Diffusion 0 A.D. Public Repository rP20676

Let the template define the actor used for the projectile. Also let projectiles…
rP20676
Actions

Description

Let the template define the actor used for the projectile. Also let projectiles have an impact animation (such as an explosion).

This will enable us in the future to have technologies that change projectiles.
This is also somewhat of a refactoring.

Patch By: Mate-86

Reviewed By: wraitii

Trac Tickets: #1909

Differential Revision: https://code.wildfiregames.com/D945

Details

Committed

wraitii

Dec 23 2017, 10:27 AM

Reviewer

wraitii

Differential Revision

D945: Projectile hit animation

Parents

rP20675: Use an object in splitRatingFromNick instead of an array and some cleanups

Branches

Unknown

Tags

Unknown

Build Status

Buildable 4156
Build 7308: Trigger Windows Autobuild
Build 7307: Post-Commit Build	Jenkins

Event Timeline

wraitii committed rP20676: Let the template define the actor used for the projectile. Also let projectiles….Dec 23 2017, 10:27 AM

Harbormaster completed building B4156: rP20676: Let the template define the actor used for the projectile. Also let projectiles….Dec 23 2017, 11:27 AM

Thanks for the patch and review, an important feature!

/ps/trunk/binaries/data/mods/public/simulation/components/Attack.js
540	Aren't those mandatory properties?
556	(`> 0` unneeded)

wraitii added inline comments.Dec 23 2017, 11:43 AM

/ps/trunk/binaries/data/mods/public/simulation/components/Attack.js
540	Not yet. Could be changed after D1171 imo.

elexis added inline comments.Dec 23 2017, 11:47 AM

/ps/trunk/binaries/data/mods/public/simulation/components/Attack.js
540	One can specify a Projectile without an ActorName?

wraitii added inline comments.Dec 23 2017, 11:58 AM

/ps/trunk/binaries/data/mods/public/simulation/components/Attack.js
540	Yes, see L552 we fall back to the visual actor (for now, though we may keep the behaviour).

elexis added inline comments.Dec 23 2017, 12:06 PM

/ps/trunk/binaries/data/mods/public/simulation/components/Attack.js
540	That sounds kind of problematic. Not applying the [[https://en.wikipedia.org/wiki/Single_source_of_truth\|single source of truth pattern) here means someone specifies the projectile in the actor but then the template changes it. Same for the launch point. Specifying it either in the actor or in the simulation template, means there can't be any confusion or contradiction.

elexis mentioned this in D1171: Move more things in the projectile part of the Attack component.Dec 23 2017, 12:10 PM

wraitii mentioned this in D1973: Support friendly fire for projectile attacks..Jun 15 2019, 11:42 AM

elexis mentioned this in D1989: Allow accessing prop points in the simulation..Mon, Sep 30, 11:51 AM

Changes (10)

				Path	Packages
	A			ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/rock_explosion.xml
	M			ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/rock_flaming.xml
	M			ps/trunk/binaries/data/mods/public/simulation/components/Attack.js
	M			ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
	M			ps/trunk/source/simulation2/components/CCmpProjectileManager.cpp
	M			ps/trunk/source/simulation2/components/CCmpVisualActor.cpp
	M			ps/trunk/source/simulation2/components/ICmpProjectileManager.cpp
	M			ps/trunk/source/simulation2/components/ICmpProjectileManager.h
	M			ps/trunk/source/simulation2/components/ICmpVisual.cpp
	M			ps/trunk/source/simulation2/components/ICmpVisual.h

rP20676

View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/rock_explosion.xml

View Options

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/rock_flaming.xml

View Options

ps/trunk/binaries/data/mods/public/simulation/components/Attack.js

View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml

View Options

ps/trunk/source/simulation2/components/CCmpProjectileManager.cpp

View Options

ps/trunk/source/simulation2/components/CCmpVisualActor.cpp

View Options

ps/trunk/source/simulation2/components/ICmpProjectileManager.cpp

View Options

ps/trunk/source/simulation2/components/ICmpProjectileManager.h

View Options

ps/trunk/source/simulation2/components/ICmpVisual.cpp

View Options

ps/trunk/source/simulation2/components/ICmpVisual.h

Let the template define the actor used for the projectile. Also let projectiles…rP20676Actions

Description

Details

Event Timeline

Changes (10)

rP20676

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/rock_explosion.xml

ps/trunk/binaries/data/mods/public/art/actors/props/units/weapons/rock_flaming.xml

ps/trunk/binaries/data/mods/public/simulation/components/Attack.js

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml

ps/trunk/source/simulation2/components/CCmpProjectileManager.cpp

ps/trunk/source/simulation2/components/CCmpVisualActor.cpp

ps/trunk/source/simulation2/components/ICmpProjectileManager.cpp

ps/trunk/source/simulation2/components/ICmpProjectileManager.h

ps/trunk/source/simulation2/components/ICmpVisual.cpp

ps/trunk/source/simulation2/components/ICmpVisual.h

Let the template define the actor used for the projectile. Also let projectiles…
rP20676
Actions