[PATCH] Allow the ResourceDropsite to be modified through tech research

[Niek]

It would be nice to be able to modify which resources a Dropsite accepts through technology research.

This patch also includes a small fix the AI API to fix an undefined error which occured due to the ResourceDropsite fix.

The technology could look like this:

{
	"genericName": "Advanced Dropsite",
	"description": "Citizens are now able to drop food at the house",
	"cost": {"food": 0, "wood": 0, "stone": 0, "metal": 100},
	"requirements": {"tech": "phase_village"},
	"requirementsTooltip": "Unlocked in Village Phase.",
	"icon": "upgrade_advanced.png",
	"researchTime": 10,
	"tooltip": "Citizens are now able to drop food at the house",
	"modifications": [
		{"value": "ResourceDropsite/Types", "replace": "food"}
	],
	"affects": ["House"],
	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}

The value ("food" in this case) should be a string to be accepted. Also the building that is being modified should have a ResourceDropsite/Types tag. But this tag is allowed to be empty e.g. this:

  <ResourceDropsite>
    <Types> </Types>
  </ResourceDropsite>

[leper]

patch that modifies both the API and the ResourceDropsite component

[leper]

Splitting "" results in [""] which is not what is wanted here. Checking if it is empty before splitting and returning [] is what should be done.

The AI change would be nicer with an early return.

[Niek]

New patch

[Nikos]

Tested and it works perfectly fine. No errors and workers dropped food in the house.

[scythetwirler]

Braces around line 24-26 can be removed.

Also, it'd be nicer to use another variable instead of copy and pasting the same long expression.

[Niek]

Removes curly bracket and uses a variable instead of copying over the whole expression

[agentx]

Just a tip: If branching is not needed, don't use if.

if (this.types) == "") 
 	return []; 
	 
return this.types.split(/\s+/);

better:

return this.types === "" ? [] : this.types.split(/\s+/);

Avoids also the not matching brackets pitfall.

[Niek]

Without the 'if'-statement

[scythetwirler]

Extra tab whitespace on line 379 of binaries/data/mods/public/simulation/ai/common-api/entity.js

[Niek]

Replying to scythetwirler:

Extra tab whitespace on line 379 of binaries/data/mods/public/simulation/ai/common-api/entity.js

I should add one?

[Niek]

Replying to scythetwirler:

Extra tab whitespace on line 379 of binaries/data/mods/public/simulation/ai/common-api/entity.js

I mean, the empty line has the same indentation as line 380 (which is correct I believe).

[scythetwirler]

Replying to niektb:

Replying to scythetwirler:

Extra tab whitespace on line 379 of binaries/data/mods/public/simulation/ai/common-api/entity.js

I mean, the empty line has the same indentation as line 380 (which is correct I believe).

Not according to leper. :P

[Niek]

Replying to scythetwirler:

Replying to niektb:

Replying to scythetwirler:

Extra tab whitespace on line 379 of binaries/data/mods/public/simulation/ai/common-api/entity.js

I mean, the empty line has the same indentation as line 380 (which is correct I believe).

Not according to leper. :P

I just checked and it isn't the case here :D

[leper]

In 16003:

Allow techs to modify the resources that can be dropped of at dropsite. Patch by niektb. Fixes #2629.

[leper]

Thanks for the patch.

[Niek]

Replying to leper:

Thanks for the patch.

Np, thank you for commiting.