Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upRadio contact with followers, NPC overmap movement. #29094
+435
−66
Conversation
This comment has been minimized.
This comment has been minimized.
|
This pull request has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there: |
Night-Pryanik
reviewed
Mar 29, 2019
data/json/npcs/TALK_COMMON_ALLY.json Outdated
Night-Pryanik
reviewed
Mar 29, 2019
data/json/npcs/TALK_COMMON_ALLY.json Outdated
Night-Pryanik
reviewed
Mar 29, 2019
data/json/npcs/TALK_COMMON_ALLY.json Outdated
Night-Pryanik
reviewed
Mar 29, 2019
data/json/tool_qualities.json Outdated
Night-Pryanik
reviewed
Mar 29, 2019
src/faction.cpp Outdated
Night-Pryanik
reviewed
Mar 29, 2019
src/faction.cpp Outdated
Night-Pryanik
reviewed
Mar 29, 2019
src/faction.cpp Outdated
Night-Pryanik
reviewed
Mar 29, 2019
src/faction.cpp Outdated
Night-Pryanik
reviewed
Mar 29, 2019
src/faction.cpp Outdated
Night-Pryanik
reviewed
Mar 29, 2019
src/faction_camp.cpp Outdated
Night-Pryanik
reviewed
Mar 29, 2019
src/game.cpp Outdated
Night-Pryanik
reviewed
Mar 29, 2019
src/npcmove.cpp Outdated
Night-Pryanik
reviewed
Mar 29, 2019
src/npctalk_funcs.cpp Outdated
davidpwbrown
force-pushed the
davidpwbrown:radio_contact_2
branch
from
6671f1e
to
015acad
Mar 29, 2019
Night-Pryanik
reviewed
Mar 29, 2019
data/json/tool_qualities.json Outdated
This comment has been minimized.
This comment has been minimized.
adamkad1
commented
Mar 29, 2019
|
OBEY ME! |
davidpwbrown
added some commits
Mar 29, 2019
mlangsdorf
added this to In progress
in NPC dialog overhaul
via automation
Mar 29, 2019
mlangsdorf
added
<Enhancement / Feature>
NPC / Factions
[C++]
Player Faction Base / Camp
labels
Mar 29, 2019
davidpwbrown
changed the title
[WIP]Radio contact with followers, NPC overmap movement.
Radio contact with followers, NPC overmap movement.
Mar 31, 2019
kevingranade
merged commit 3bfa17a
into
CleverRaven:master
Apr 3, 2019
NPC dialog overhaul
automation
moved this from In progress
to Done
Apr 3, 2019
davidpwbrown
deleted the
davidpwbrown:radio_contact_2
branch
Apr 3, 2019
This comment has been minimized.
This comment has been minimized.
|
This pull request has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there: https://discourse.cataclysmdda.org/t/yelling-commands-and-using-military-hand-signals/19487/7 |
ZhilkinSerg
reviewed
Apr 5, 2019
This comment has been minimized.
This comment has been minimized.
|
This pull request has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there: https://discourse.cataclysmdda.org/t/latest-experimental-features/5582/1106 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
davidpwbrown commentedMar 28, 2019
Summary
SUMMARY: Features "Radio contact with followers, NPC overmap movement"Purpose of change
If you and your follower both have a two-way radio, you can select them in your follower menu, and talk to them.
All I've enabled in that menu so far is "go to location" the location being either a) player location or b) location of one of your camps. and " stay where you are " so they stop moving.
The NPC will then path to that location on the overmap and inform you when they are there.
( this functionality has also been added to the standard talk menu )
There is a debug menu option to show NPC path as an overlay.
NPC will use the A* to find best overmap route ( they prefer roads )
This is the first step towards https://github.com/CleverRaven/Cataclysm-DDA/projects/7 and #28393
I have only enabled NPC followers to be ordered to move, but theoretically all dynamic NPCs could be allowed to travel on the overmap now.
This is a rough first-pass. there are some caveats and limitations.
Describe the solution
Added code to check for a radio with follower and player, in faction menu.
made a new talk menu for radio contact.
made a new mission type, making use of existing pathfinding omt goal that NPCs have.
added code to do_turn() that checks for follower NPCs with travelling missions.
do some pathfinding, and spawn them in appropiate submaps every x minutes.
ensured that overmapbuffer keeps track if they switch overmap.
added some more robust follower validation and serialization for player followers ( pathfinding may take them too far away for the standard validation to find )
Describe alternatives you've considered
Had lots of ideas for other things, but its already getting too big, and wanted the first pass out the door for feedback.
Additional context
Things this may enable further work on :
Radio towers in camps.
vehicle mounted radio transmitters for further range.
remote administration of a basecamp
radio contact with non-follower faction NPCs ( old guard etc )
( NPC takes path through forest trail instead of through forest )