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

Add dialog activity functions, and flag to prevent activity being interrupted #51809

Merged
merged 3 commits into from
Sep 23, 2021

Conversation

Ramza13
Copy link
Contributor

@Ramza13 Ramza13 commented Sep 22, 2021

Summary

none

Purpose of change

Help i-am-erk with exodii bio installation.
Allow assigning activities via dialog effects. Also allow making activities unable to be stopped by the player.

Describe the solution

Describe alternatives you've considered

Testing

Used this json.

  {
    "id": "ACT_OPERATION_TEST",
    "type": "activity_type",
    "activity_level": "NO_EXERCISE",
    "verb": "being tested on",
    "based_on": "time",
    "interruptable": false,
    "suspendable": false,
    "interruptable_with_kb":false
  },
{
    "id": "migo_bio_tech3",
    "type": "TOOL",
    "name": { "str_sp": "test" },
    "conditional_names": [
      { "type": "VAR", "condition": "npctalk_var_DISPLAY_NAME_MORALE", "name": { "str_sp": "%s (happy)" } },
      { "type": "VAR", "condition": "npctalk_var_DISPLAY_NAME_FOCUS", "name": { "str_sp": "%s (focus)" } },
      { "type": "VAR", "condition": "npctalk_var_DISPLAY_NAME_PAIN", "name": { "str_sp": "%s (pain relief)" } },
      { "type": "VAR", "condition": "npctalk_var_DISPLAY_NAME_FATIGUE", "name": { "str_sp": "%s (wake up)" } }
    ],
    "description": "A piece of mi-go biotechnology.",
    "weight": "1 g",
    "volume": "250 ml",
    "price": 3000,
    "price_postapoc": 10000,
    "symbol": "!",
    "color": "light_red",
    "use_action": {
      "type": "effect_on_conditions",
      "description": "Touch the opening.",
      "effect_on_conditions": [

        {
          "id": "EOC_MIGO_BIO_TECH_FATIGUE1",
          
          "effect": [
            { "u_assign_activity": "ACT_OPERATION_TEST", "duration":"10 hours" },
{ "u_add_effect": "blind", "duration": "10 hours" },
        { "u_add_effect": "deaf", "duration": "10 hours"  }
          ]
        }
      ]
    }

Additional context

@actual-nh actual-nh added <Enhancement / Feature> New features, or enhancements on existing [C++] Changes (can be) made in C++. Previously named `Code` Mechanics: Effects / Skills / Stats Effects / Skills / Stats Time / Turns / Duration / Date Issues concerning any activities being too fast or too slow. Also issues about time and date ingame labels Sep 22, 2021
@I-am-Erk I-am-Erk merged commit f45fb00 into CleverRaven:master Sep 23, 2021
@Ramza13 Ramza13 deleted the dialog_activites branch September 23, 2021 18:20
I-am-Erk added a commit to I-am-Erk/Cataclysm-DDA that referenced this pull request Sep 23, 2021
* reorganized to support expansion

* reorganized to support expansion

* removed sentences that shouldn't be there

* fixed log stable appearing as kitchen construction

* Reworked to push expansions back to the top level + doc

* testing disallows base name recipe changes

* removal of characters in middle of token managed to offend secret json format mandate

* Adjusted to CleverRaven#46278

* incorporated some old reverse conflict changes

* reorganized the stuff added while this PR was suspended

* reorganized the stuff added while this PR was suspended

* Fix bike shop variant roof

Fix the bike shop variant 1 having an empty roof

* Change stairs to ladder

Changed stairs down to ladder down

* Update the table of contents

* Remove duplicate shortcut keys from interaction menu

Fixes CleverRaven#51772

Co-authored-by: David Seguin <davidseguin@live.ca>

* Jsonified dead scientists map extra

* Use string_id for update_mapgen and nested_mapgen

These ids were previously just using strings; better to use a dedicated
string_id type.

This required adding an actual type for the string_id to point to in
each case, wrapping the collection of mapgen_function_json objects.

* Update cooking_components.json

* Force recipes to provide (sub)category

As suggested in CleverRaven#50866, require all recipe definitions to provide a
category and subcategory when loading from JSON.

* Add subcategory to Magiclysm recipe

* Clarify description of mon_zombie_dog (CleverRaven#51801)

See <https://discord.com/channels/598523535169945603/598614717799596055/890213920957161472> on the dev discord.

* Test disabling expensive LGTM checks (CleverRaven#51806)

Disable one LGTM checks to see if there's hope of reducing the runtime
thereby.

* Mythos Mod Resubmission (CleverRaven#51796)

* Mythos Mod Resubmission

* Remove Occulti as maintainer

* Fix typo in "Storehouse survey" blueprint name

* Add dialog activity functions, and flag to prevent activity being interrupted (CleverRaven#51809)

* Add dialog stuff

* docs

* Update player_activities.json

* use snippets (CleverRaven#51663)

Co-authored-by: Saicchi <Saicchi@users.noreply.github.com>
Co-authored-by: Kevin Granade <kevin.granade@gmail.com>

* Blacksmithing tongs and cooking tongs are two diffrent things.  (CleverRaven#51672)

* Add blacksmithing tongs.

The tongs in game wouldn't be able to carry around a four kilo zweihander. They are designed for cooking and flipping food, so they are very lightweight and thing, they would most likely bend under the heat of the hot metal.

* Added the need to use blacksmithing (flatjaw) tongs for the Zweihander

Not using tongs for smithing is almost impossible.

* Change the blacksmithing toolset to include the tongs.

I also removed the tongs from the tools on the zweihander.

Co-authored-by: Anton Burmistrov <Night_Pryanik@mail.ru>
Co-authored-by: Kevin Granade <kevin.granade@gmail.com>

* More granular json-style and astyle (CleverRaven#51731)

* More granular json-style and astyle

* Melee practice and training dummies (CleverRaven#51598)

* Melee practice
Added some basic melee practice recipes, including 2 for training dodge.
* Training dummy for practice recipes
* Dummy recipe and resolve problems
* Intermediate recipes and heavy training dummy
* Changed the armored dummy recipe
The recipe is inspired by the scrap suit recipe.
* Added tanto as a possible weapon for stabbing training
* Punching bag

Co-authored-by: Marloss <78324429+MarlossCDDA@users.noreply.github.com>

* Write documentation for neighbor based chunk spawning (CleverRaven#51818)

* Resubmit Fix Tire Rims (CleverRaven#51798)

* Update goblin.json (CleverRaven#51799)

* Fix: Force stereo when opening audio device (CleverRaven#51754)

Co-authored-by: Kevin Granade <kevin.granade@gmail.com>

* Add support for weakpoint damage and crit multipliers (CleverRaven#51770)

* Weakpoints (Part 4.5): Add support for JSON inheritance and default weakpoints (CleverRaven#51822)

* Let contributors specify the default weakpoint, by providing an empty ID

* Add support for weakpoint inheritance.

* Reduce debug.log file size by folding consecutive identical errors (CleverRaven#51791)

* debug_fold_repetition: Fold identical errors to reduce log spam

* debug_fold_repetition: added timestamp and timeout

timestamp for repeated error folding group is that of the last folded
error
timeout is currently hardcoded to 100ms. If another repeated error is
registered that would be folded but is >100ms after the previous error
it starts a new folding group

* debug_fold_repetitions: bookended fold for readability, made output DRY

It's a little easier to read the log as `[First]<folded>[Last]` than
`[First]<folded with last timestamp>`
Need to test folding output during deinit and DebugLog, made a function
to remove repetition.

* debug_fold_repetitions: excess repetition error to forced prompt

As logged error the excessive repetition error causes breaks in folds
which make debug.log less clear while reading, and does not add information
Forced prompting once excess threshold is reached will prompt once per
excessive repetition set.

* Allow using any tool with the drilling quality to make a draw_plate (CleverRaven#51794)

Fixes CleverRaven#51688

* The (impotent) Sound and the Fury (CleverRaven#51803)

* update m231

Updated price(https://www.invaluable.com/auction-lot/incredibly-rare-colt-m231-port-firing-u-s-propert-2086-c-3574a02a1e), adjusted desc, set sight disp to that of other no-sight guns, adjusted mod locations.

* Rapidly changing light levels do not grant max vision to turrets (CleverRaven#51815)

* Update fake.json (CleverRaven#51819)

* Fix process effects crash (CleverRaven#51827)

* Add Complete missions dialog function (CleverRaven#51820)

* Complete missions

* Update npctalk.cpp

* Update npctalk.cpp

Co-authored-by: PatrikLundell <j.patrik.r.lundell@gmail.com>
Co-authored-by: SegaSaturnity <75910217+SegaSaturnity@users.noreply.github.com>
Co-authored-by: kevingranade <kevingranade@users.noreply.github.com>
Co-authored-by: UmbralReaper <67179462+UmbralReaper@users.noreply.github.com>
Co-authored-by: David Seguin <davidseguin@live.ca>
Co-authored-by: Valiant <Night_Pryanik@mail.ru>
Co-authored-by: John Bytheway <52664+jbytheway@users.noreply.github.com>
Co-authored-by: mythosmod <91185016+mythosmod@users.noreply.github.com>
Co-authored-by: Kevin Granade <kevin.granade@gmail.com>
Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com>
Co-authored-by: Angela Graves <rivet.the.zombie@gmail.com>
Co-authored-by: Binrui Dong <brett.browning.dong@gmail.com>
Co-authored-by: Eric <52087122+Ramza13@users.noreply.github.com>
Co-authored-by: Saicchi <47158232+Saicchi@users.noreply.github.com>
Co-authored-by: Saicchi <Saicchi@users.noreply.github.com>
Co-authored-by: GOFLUMPYOURSELFPORCAY <64309930+GOFLUMPYOURSELFPORCAY@users.noreply.github.com>
Co-authored-by: Termineitor244 <termineitor244@hotmail.com>
Co-authored-by: Marloss <78324429+MarlossCDDA@users.noreply.github.com>
Co-authored-by: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com>
Co-authored-by: John Candlebury <johncandlebury@gmail.com>
Co-authored-by: The SzQ <37194372+SzQ1@users.noreply.github.com>
Co-authored-by: Joshua Chin <5422226+Joshua-Chin@users.noreply.github.com>
Co-authored-by: OrenAudeles <orenaudeles@gmail.com>
Co-authored-by: Tonkatsu <7764202+tenmillimaster@users.noreply.github.com>
Co-authored-by: Roy Berube <royberube1965@gmail.com>
Co-authored-by: ISuckM8 <87550905+ISuckM8@users.noreply.github.com>
Co-authored-by: ferociousdork <78301810+ferociousdork@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[C++] Changes (can be) made in C++. Previously named `Code` <Enhancement / Feature> New features, or enhancements on existing Mechanics: Effects / Skills / Stats Effects / Skills / Stats Time / Turns / Duration / Date Issues concerning any activities being too fast or too slow. Also issues about time and date ingame
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants