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

Weakpoints can use conditions and eocs #75946

Merged
merged 7 commits into from
Aug 27, 2024

Conversation

GuardianDll
Copy link
Member

Summary

None

Purpose of change

Json power

Describe the solution

Move npc_opinion into it's own header, to fix circular dependency (thanks Snup)
Add condition field for weakpoints
Replace required_effects and disabled_by fields with condition
Add effect_on_conditions field

Testing

pseudo_weakpoint_mon with no changes
image
pseudo_weakpoint_mon with condition math: n_hp(all) > 5000
image
pseudo_weakpoint_mon with

"effects": [ { "effect_on_conditions": [ "EOC_TEST" ], "chance": 50, "message": "The %s is disorientated." } ]
  {
    "type": "effect_on_condition",
    "id": "EOC_TEST",
    "effect": [
      { "u_message": "u_message, u_name: <u_name>, npc_name: <npc_name>" },
      { "message": "message, u_name: <u_name>, npc_name: <npc_name>" }
    ]
  },

image

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. NPC / Factions NPCs, AI, Speech, Factions, Ownership Info / User Interface Game - player communication, menus, etc. [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies [C++] Changes (can be) made in C++. Previously named `Code` Monsters Monsters both friendly and unfriendly. [Markdown] Markdown issues and PRs Mods: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Martial Arts Arts, Techniques, weapons and anything touching martial arts. Mods: Xedra Evolved Anything to do with Xedra Evolved astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Aug 25, 2024
@github-actions github-actions bot added the Code: Tests Measurement, self-control, statistics, balancing. label Aug 25, 2024
@GuardianDll GuardianDll force-pushed the weakpoint_conditions branch from 49f42a2 to 16aa61a Compare August 25, 2024 15:56
@GuardianDll GuardianDll force-pushed the weakpoint_conditions branch from 1bdd0a3 to aacf40b Compare August 25, 2024 18:31
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 26, 2024
@Maleclypse Maleclypse merged commit 4a935ad into CleverRaven:master Aug 27, 2024
24 of 27 checks passed
@GuardianDll GuardianDll deleted the weakpoint_conditions branch August 27, 2024 05:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [C++] Changes (can be) made in C++. Previously named `Code` Code: Tests Measurement, self-control, statistics, balancing. <Documentation> Design documents, internal info, guides and help. Info / User Interface Game - player communication, menus, etc. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs Martial Arts Arts, Techniques, weapons and anything touching martial arts. Mods: Dark Days of the Dead Anything related to the DDotD mod (classic style zombies) Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Mods: Xedra Evolved Anything to do with Xedra Evolved Mods Issues related to mods or modding Monsters Monsters both friendly and unfriendly. Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants