JSON-ify hallucinations #69919

MNG-cataclysm · 2023-12-02T16:26:33Z

Summary

Infrastructure "JSON-ify hallucinations"

Purpose of change

Hallucinations are interesting, and something that could be developed some more. The big issues with that are the barrier to entry on their codebase, as few people here know enough C++ to do something like that. This will also implement #68846.

Describe the solution

~~Currently, there's a lot of work to do on this:~~

Add the different levels of hallucinations
Implement minor auditory, mental, and ocular hallucinations.
Implement intermediate effects, like olfactory and tactile hallucinations that cause the character to do something.
Add larger hallucinations, like seeing full-on monsters and NPCs, or nonexistent extraplanar entities (unrelated to portal shenanigans)
Add extreme forms of hallucinations: panic attacks, full-body sensations, and other things of that nature.
Divide these tiers up based on effects: drinking and mushrooms should not cause more extreme forms, Kaluptic Psychosis should, etc.
Allow these to be blocked or managed by antipsychotics.
Delete the old C++ after cross-referencing is finished.

The basic work is done with this, though I would like to expand it some more.

Describe alternatives you've considered

Not doing this.

Testing

Everything works quite well, no observable issues.

Additional context

~~I've been trying to locate the C++ that controls hallucinations for Kaluptic Psychosis and related effects, but I can't find it yet.~~ Thanks to @GuardianDll for pointing me to the right file.

There's more I'd like to do with this, but this PR is already quite large in and of itself. So, that will have to wait.

Also, should hallucinations stemming from portal-related issues get worse during portal storms?

GuardianDll · 2023-12-02T17:13:17Z

my apologies as i misguided you, the effect for kaluptic psychosis are stored in suffer::from_schizophrenia
https://github.com/CleverRaven/Cataclysm-DDA/blob/master/src/suffer.cpp#L551

MNG-cataclysm · 2023-12-02T17:20:20Z

my apologies as i misguided you, the effect for kaluptic psychosis are stored in suffer::from_schizophrenia

https://github.com/CleverRaven/Cataclysm-DDA/blob/master/src/suffer.cpp#L551

Thank you, and there's no need to apologize. Mistakes happen.

MNG-cataclysm · 2023-12-03T01:21:09Z

I would like to implement weapon dropping, but the effect for it doesn't currently work. See #69902.

src/player_hardcoded_effects.cpp

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

data/json/effects_on_condition/npc_eocs/hallucination_eocs.json

Maleclypse · 2023-12-03T22:58:58Z

I'm going to have to keep trying to test this because for some reason it's failed to compile two times in a row on my computer.

edit: hahaha figured out why it wasn't compiling. it pulled in changes from another PR I was working on.

MNG-cataclysm · 2023-12-04T01:08:16Z

In that case, do you think this is good to go?

Maleclypse · 2023-12-04T02:33:48Z

In that case, do you think this is good to go?

Yeah bleed isn't referenced by anything else in suffer than the things you pulled over weirdly. I'm testing kaluptic right now wish me luck :)

data/json/effects_on_condition/npc_eocs/hallucination_eocs.json

Maleclypse · 2023-12-04T03:38:45Z

Ok I managed to experience all of the effects except the weapon talking from bleeding so this is close to ready. :) Thank you for doing this!

data/json/effects_on_condition/npc_eocs/hallucination_eocs.json

Maleclypse · 2023-12-04T03:47:49Z

Found a bug in the weapon talk snippets.

MNG-cataclysm · 2023-12-04T03:52:06Z

Ok I managed to experience all of the effects except the weapon talking from bleeding so this is close to ready. :) Thank you for doing this!

Quite welcome. I think that weapon bleed talking might have something to do with the global book being defined, it was working when I tested it for development stuff. I'll figure out something for it.

MNG-cataclysm · 2023-12-04T03:55:00Z

Found a bug in the weapon talk snippets.

Do you know of any way to get a name of something, and save it as a string of some form of variable for dialogue with JSON? If not, could the old get.name C++ be hooked up to JSON stuff to make that happen? If it's not possible right now, I'll just use vaguer terms in place of #%$! for now.

GuardianDll · 2023-12-04T06:30:17Z

There is no such thing in EoC. Potential solution might be if run_inv_eocs would be able to store found item in variable, but it can't do this at this moment

Maleclypse · 2023-12-04T06:43:35Z

There is no such thing in EoC. Potential solution might be if run_inv_eocs would be able to store found item in variable, but it can't do this at this moment

Would #69857 make that possible?

GuardianDll · 2023-12-04T09:25:31Z

no, this one just allow to pass custom variable for run_eocs/queue_eocs, it doesn't modify run_inv_eocs

MNG-cataclysm · 2023-12-04T18:46:49Z

I guess I could put in a feature request for that.

MNG-cataclysm · 2023-12-04T20:19:38Z

Alright, that should fix all of the bugs.

data/json/effects_on_condition/npc_eocs/hallucination_eocs.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* WIP part 1 * WIP part 2 * WIP part 3 * Delete old C++ * Oops * Bugfix 1 * Bugfix 2 * Bugfix 3 * Update src/player_hardcoded_effects.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Bugfix 4 * Un-inline the EOCs, separate * Fix bleed EOCs and symbol messup * Update hallucination_eocs.json * Update hallucination_eocs.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

GuardianDll · 2024-01-04T20:33:52Z

src/player_hardcoded_effects.cpp

-        if( u.has_trait( trait_SCHIZOPHRENIC ) && !u.has_effect( effect_took_thorazine ) &&
-            one_in( 43200 ) && u.is_avatar() ) {
-            if( one_in( 2 ) ) {
-                u.sound_hallu();
-            } else {
-                int max_count = rng( 1, 3 );
-                int count = 0;
-                for( const tripoint &mp : here.points_in_radius( u.pos(), 1 ) ) {
-                    if( mp == u.pos() ) {
-                        continue;
-                    }
-                    if( here.has_flag( ter_furn_flag::TFLAG_FLAT, mp ) &&
-                        here.pl_sees( mp, 2 ) ) {
-                        g->spawn_hallucination( mp );
-                        if( ++count > max_count ) {
-                            break;
-                        }
-                    }
-                }
-            }
-            it.set_duration( 0_turns );
-            woke_up = true;
-        }


was this part ported to json, because i can't find anything that can spawn hallucinations in the hallucination_eocs.json

I didn't port this to JSON, I just used the hallucinating effect to do that.

isn't hallucination effect is what was jsonified here?
i just tested, applied hallu, and got no hallucinations (aka hallucination of monsters that tries to attack you) at all, and i assume this piece of code respond for it
(i want to expand it a bit, hence the quesion)

WIP part 1

daa28ef

MNG-cataclysm added 2 commits December 2, 2023 19:26

WIP part 2

108ed0c

WIP part 3

60ff58d

github-actions bot added the Lore Game lore, in-game communication. Also the Lore tab. label Dec 3, 2023

Delete old C++

c61eac2

github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Dec 3, 2023

Oops

29c591a

MNG-cataclysm marked this pull request as ready for review December 3, 2023 01:22

MNG-cataclysm changed the title ~~[WIP] JSON-ify hallucinations~~ JSON-ify hallucinations Dec 3, 2023

MNG-cataclysm added 3 commits December 2, 2023 20:31

Bugfix 1

8d8ff8b

Bugfix 2

f75b9e1

Bugfix 3

9784f86

github-actions bot reviewed Dec 3, 2023

View reviewed changes

src/player_hardcoded_effects.cpp Outdated Show resolved Hide resolved

github-actions bot removed the astyled astyled PR, label is assigned by github actions label Dec 3, 2023

Update src/player_hardcoded_effects.cpp

f070d8d

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions bot added the astyled astyled PR, label is assigned by github actions label Dec 3, 2023

Bugfix 4

6fd8d87

github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Dec 3, 2023

GuardianDll reviewed Dec 3, 2023

View reviewed changes