New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add place variant building for BaseBuilderBotModule. #19941

Merged

Mailaender merged 1 commit into OpenRA:bleed from dnqbob:AI-place-rotation-building

Apr 12, 2022

Contributor

dnqbob commented Mar 2, 2022 •

edited

Add place variant building for BaseBuilderBotModule.

If it follow the refinery placing logic, then we can use Facings in PlaceBuildingVariants to help BaseBuilderBotModule "rotates" it to minefield.
If it is a normal building, BaseBuilderBotModule will place a random variant actor.

Ingame Picture

Usage

Add Facing to refinery with facings like:

	PlaceBuildingVariants:
		Actors: refinery-nw, refinery-ne, refinery-se
		Facings: 640, 896, 128, 384 ## 640 is the actor itself facing

In AI.yaml, add All related building variants to those lines below:

		RefineryTypes: refinery, refinery-nw, refinery-ne, refinery-se
		PowerTypes: pwrplt, advpwr, pwrplt-3x2
		BarracksTypes: barracks, nhand, nhand-2x3
		VehiclesFactoryTypes: warfactory, airstrip
		ProductionTypes: barracks, nhand, warfactory, airstrip, helipad, nhand-2x3

Contributor Author

dnqbob commented Mar 2, 2022 •

edited

I got probably lots of grammar mistakes in english so... I need help with that in comment

dnqbob force-pushed the AI-place-rotation-building branch from c057919 to dcc2361 Compare

March 5, 2022 14:57

RoosterDragon suggested changes

View reviewed changes

Member

RoosterDragon left a comment •

edited

Looks like a neat feature, have some minor suggestions for you.

The build failure would be resolved by one of my suggestions, or alternatively you can replace new string[0] with Array.Empty<string>() to solve it if you prefer.

OpenRA.Mods.Common/Traits/BotModules/BotModuleLogic/BaseBuilderQueueManager.cs Outdated Show resolved Hide resolved

OpenRA.Mods.Common/Traits/BotModules/BotModuleLogic/BaseBuilderQueueManager.cs Outdated Show resolved Hide resolved

OpenRA.Mods.Common/Traits/BotModules/BotModuleLogic/BaseBuilderQueueManager.cs Show resolved Hide resolved

OpenRA.Mods.Common/Traits/BotModules/BotModuleLogic/BaseBuilderQueueManager.cs Outdated

+              				// Add all the build varriant name in the name list and use it for count
+              				var actorInfo = world.Map.Rules.Actors[name];
+              				var buildingVariantInfo = actorInfo.TraitInfoOrDefault<PlaceBuildingVariantsInfo>();
+              				var variants = (buildingVariantInfo != null && buildingVariantInfo.Actors != null) ? buildingVariantInfo.Actors : new string[0];

Member

RoosterDragon Mar 11, 2022

This might be a bit cleaner, up to you:

var varients = buildingVariantInfo?.Actors;

var count = playerBuildings.Count(a => a.Info.Name == name || variants?.Contains(a.Info.Name));

Contributor Author

dnqbob Mar 12, 2022

It is a pity that || cannot apply to a bool and bool?(by variants?.Contains(a.Info.Name)))

OpenRA.Mods.Common/Traits/BotModules/BotModuleLogic/BaseBuilderQueueManager.cs Outdated Show resolved Hide resolved

OpenRA.Mods.Common/Traits/Buildings/PlaceBuildingVariants.cs Outdated Show resolved Hide resolved

OpenRA.Mods.Common/Traits/BotModules/BotModuleLogic/BaseBuilderQueueManager.cs Outdated Show resolved Hide resolved

dnqbob force-pushed the AI-place-rotation-building branch 4 times, most recently from 047b795 to b7eb360 Compare

March 12, 2022 06:18

Contributor Author

dnqbob commented Mar 12, 2022 •

edited

Fixed and tested.

As for testcase of this branch:
if there is no other grammar and code problem here, I will push an engine upgrade for SP&RV which use current change on engine for building rotation. You can then use RV and SP to test it out.

At that time I need your permission and help @MustaphaTR

RoosterDragon previously approved these changes

View reviewed changes

OpenRA.Mods.Common/Traits/BotModules/BotModuleLogic/BaseBuilderQueueManager.cs Outdated Show resolved Hide resolved

OpenRA.Mods.Common/Traits/Buildings/PlaceBuildingVariants.cs Show resolved Hide resolved

dnqbob dismissed RoosterDragon’s stale review via

f36f5dc

March 12, 2022 11:44

dnqbob force-pushed the AI-place-rotation-building branch from b7eb360 to f36f5dc Compare

March 12, 2022 11:44

RoosterDragon previously approved these changes

View reviewed changes

dnqbob dismissed RoosterDragon’s stale review via

218f91d

March 12, 2022 12:58

dnqbob force-pushed the AI-place-rotation-building branch from f36f5dc to 218f91d Compare

March 12, 2022 12:58

Contributor Author

dnqbob commented Mar 12, 2022

Delete an useless comment right below Func<CPos, CPos, int, int, (CPos? Location, int Variant)> findPos
Add comment Check the number of this structure and its variants


          Add place variant building for BaseBuilderBotModule.

f0a0717

1. If it follow the refinery placing logic, then we can use Facings in PlaceBuildingVariants to help BaseBuilderBotModule "rotates" it to minefield.

2. If it is a normal building, BaseBuilderBotModule will place a random variant actor.

dnqbob force-pushed the AI-place-rotation-building branch from 218f91d to f0a0717 Compare

March 12, 2022 13:02

RoosterDragon approved these changes

View reviewed changes

Smittytron added the PR: Needs +2 label

Contributor Author

dnqbob commented Mar 13, 2022

test case mod:
https://github.com/ABrandau/Shattered-Paradise-SDK

Any AI will do

Mailaender merged commit 4f43b15 into OpenRA:bleed

Member

Mailaender commented Apr 12, 2022

dnqbob deleted the AI-place-rotation-building branch

April 12, 2022 22:35

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment