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.

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

[WIP]3. NPC multi-tile butchery activity #33056

Closed
wants to merge 19 commits into from
Closed

[WIP]3. NPC multi-tile butchery activity #33056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
cdf1e92
initial attempt
Jun 19, 2019
1e09dfb
folded move_loot activity into new generic loop structure
Jul 29, 2019
3d3ef8e
astyle and debug message removal
Jul 29, 2019
a32178f
remove requrements.cpp change
Jul 29, 2019
c62817c
from review :remove pointer usage, use item weight/volume instead of …
Jul 29, 2019
e164093
clang tidy warning used unitialized
Jul 30, 2019
4dcf23f
Merge branch 'master' into npc_activity_rework
Aug 3, 2019
cb7ab7d
fix for farming task fetch near work spot
Aug 3, 2019
4ca433d
ensure no traps on target tile before adding partial_con trap marker
Aug 3, 2019
03ff5fb
Merge branch 'master' into npc_activity_rework
Aug 4, 2019
995ec05
remove const-ness to satisfy clang-tidy which wants consty things to …
Aug 7, 2019
fb156b8
Update activity_item_handling.cpp
Aug 8, 2019
9bac82b
NPC activity to chop logs into planks
Aug 8, 2019
36e5887
remove debug messages
Aug 8, 2019
bae43a0
added tidy up activity to chop planks task
Aug 8, 2019
9f95b85
requirements and loop done, not yet done the final activity
Aug 8, 2019
e84924c
added first part of butchery task
Aug 8, 2019
7205607
got butchering working
Aug 8, 2019
77a511b
finalize and astyle
Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions data/json/npcs/TALK_COMMON_ALLY.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,16 +741,28 @@
"effect": "sort_loot"
},
{
"text": "Please work on any unfinished construction task that you know how to finish.",
"text": "Please do any construction work that you can.",
"topic": "TALK_DONE",
"condition": { "not": "npc_has_activity" },
"effect": "do_construction"
},
{
"text": "Please work on any contruction blueprint zones nearby.",
"text": "Please chop logs into planks.",
"topic": "TALK_DONE",
"condition": { "not": "npc_has_activity" },
"effect": "do_blueprint_construction"
"effect": "do_chop_plank"
},
{
"text": "Please butcher any corpses that you can.",
"topic": "TALK_DONE",
"condition": { "not": "npc_has_activity" },
"effect": "do_butcher"
},
{
"text": "Please do some farming work.",
"topic": "TALK_DONE",
"condition": { "not": "npc_has_activity" },
"effect": "do_farming"
}
]
},
Expand Down
49 changes: 46 additions & 3 deletions data/json/player_activities.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,28 @@
"no_resume": true
},
{
"id": "ACT_BLUEPRINT_CONSTRUCTION",
"id": "ACT_MULTIPLE_CHOP_PLANKS",
"type": "activity_type",
"activity_level": "ACTIVE_EXERCISE",
"verb": "constructing",
"activity_level": "EXTRA_EXERCISE",
"verb": "chopping logs",
"suspendable": false,
"based_on": "neither",
"no_resume": true
},
{
"id": "ACT_MULTIPLE_BUTCHER",
"type": "activity_type",
"activity_level": "MODERATE_EXERCISE",
"verb": "butchering",
"suspendable": false,
"based_on": "neither",
"no_resume": true
},
{
"id": "ACT_TIDY_UP",
"type": "activity_type",
"activity_level": "MODERATE_EXERCISE",
"verb": "tidying up",
"suspendable": false,
"based_on": "neither",
"no_resume": true
Expand Down Expand Up @@ -306,6 +324,24 @@
"based_on": "neither",
"no_resume": true
},
{
"id": "ACT_FETCH_REQUIRED",
"type": "activity_type",
"activity_level": "MODERATE_EXERCISE",
"verb": "fetching components",
"suspendable": false,
"based_on": "neither",
"no_resume": true
},
{
"id": "ACT_MULTIPLE_FARM",
"type": "activity_type",
"activity_level": "ACTIVE_EXERCISE",
"verb": "farming",
"suspendable": false,
"based_on": "neither",
"no_resume": true
},
{
"id": "ACT_PLANT_PLOT",
"type": "activity_type",
Expand Down Expand Up @@ -533,6 +569,13 @@
"verb": "drilling",
"based_on": "speed"
},
{
"id": "ACT_CHURN",
"type": "activity_type",
"activity_level": "EXTRA_EXERCISE",
"verb": "churning earth",
"based_on": "time"
},
{
"id": "ACT_DIG",
"type": "activity_type",
Expand Down
Loading