Skip to content
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.

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

Spawn searchlights in military/police roadblocks #39984

Merged
merged 5 commits into from
Apr 28, 2020
Merged

Spawn searchlights in military/police roadblocks #39984

merged 5 commits into from
Apr 28, 2020

Conversation

Night-Pryanik
Copy link
Contributor

Summary

SUMMARY: Content "Spawn searchlights in military/police roadblocks"

Purpose of change

Add logical thing to spawn at roadblocks, inspired by discussion in #35500.

Describe the solution

Added searchlight (powered by plutonium generator) roughly in the center of roadblock. Both searchlight and generator are protected by sandbag wall.
Also fixed a small error in roadblock mapgen where it checked for east road twice instead of once for east and once for west.
Also made corpses of soldiers spawn on top of their loot, not the vice versa.

Describe alternatives you've considered

None.

Testing

Debug-spawned several roadblocks, checked if all is ok.

Additional context

изображение

изображение

изображение

…ks map extra

Also fixed small error at mapgen (it checked for east road twice instead of once for east and once for west).
@Night-Pryanik Night-Pryanik added <Enhancement / Feature> New features, or enhancements on existing Map / Mapgen Overmap, Mapgen, Map extras, Map display labels Apr 28, 2020
@ZhilkinSerg ZhilkinSerg merged commit 983cc7f into CleverRaven:master Apr 28, 2020
@CountAlex
Copy link
Contributor

CountAlex commented Apr 28, 2020

Looks nice!
Can you do anything about barbed wire standing on a dirt when there's still supposed to be an asphalt?
UPD: Sorry, commented 1 minute too late.

@ZhilkinSerg
Copy link
Contributor

Looks nice!
Can you do anything about barbed wire standing on a dirt when there's still supposed to be an asphalt?
UPD: Sorry, commented 1 minute too late.

That is just how sprite looks like.

@RickyVanz
Copy link
Contributor

dang, does that mean engaging these roadblocks from far away is still viable choice? or more challenging?

reminds me of my first time raiding a National Guard HQ.

@Night-Pryanik Night-Pryanik deleted the searchlight-2-roadblock branch April 28, 2020 18:41
@Night-Pryanik
Copy link
Contributor Author

dang, does that mean engaging these roadblocks from far away is still viable choice? or more challenging?

From the one side, at night now you see searchlight from far away and have an option to shoot it down. From the other side, if you don't have a weapon with range more than range of these searchlights, you'll have to come closer to them with the risk of being lit up.

Drewscriver pushed a commit to Drewscriver/Cataclysm-DDA that referenced this pull request Apr 30, 2020
* Added searchlight and plutonium generator to military/police roadblocks map extra

Also fixed small error at mapgen (it checked for east road twice instead of once for east and once for west).

* Simplified code

* Sorting

* Corpses spawn last

* Remove empty line
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Enhancement / Feature> New features, or enhancements on existing Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants