fix: Fallen trait improvement and loyalty changes#851
fix: Fallen trait improvement and loyalty changes#851OH296 merged 4 commits intoAdeptus-Dominus:mainfrom
Conversation
|
Important Review skippedAuto incremental reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the 📝 WalkthroughSummary by CodeRabbit
WalkthroughBy the Omnissiah's will, this update augments trait data with explicit gameplay effects, refines loyalty adjustment logic to use a centralised method, and introduces reroll mechanics for charisma tests. Direct attribute manipulation is replaced with method calls, ensuring trait effects are consistently applied across the codebase. Changes
Possibly related PRs
Suggested labels
Suggested reviewers
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
github-actions
bot
added
Area: JSON
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 4
📜 Review details
Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro
📒 Files selected for processing (6)
datafiles/data/traits.json(6 hunks)objects/obj_controller/Alarm_5.gml(1 hunks)scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml(2 hunks)scripts/scr_marine_struct/scr_marine_struct.gml(1 hunks)scripts/scr_pen_And_paper/scr_pen_And_paper.gml(2 hunks)scripts/scr_squads/scr_squads.gml(1 hunks)
🧰 Additional context used
📓 Path-based instructions (3)
`**/*.gml`: - Macro constants require a space between the constant name and value. Without it, the compiler will throw an error. I.e. `#macro ARR_body_parts["arm"]` will crash the ...
**/*.gml: - Macro constants require a space between the constant name and value. Without it, the compiler will throw an error. I.e.#macro ARR_body_parts["arm"]will crash the game, because there is no space between the array and the name of the macro.
- Color codes in the code shouldn't have any spaces in their id. I.e., color code
# 80bf40will crash the game.- All code should comply with the main GML documentation: https://manual.gamemaker.io/beta/en/GameMaker_Language/GML_Reference/GML_Reference.htm
objects/obj_controller/Alarm_5.gmlscripts/scr_marine_struct/scr_marine_struct.gmlscripts/scr_enemy_ai_d/scr_enemy_ai_d.gmlscripts/scr_squads/scr_squads.gmlscripts/scr_pen_And_paper/scr_pen_And_paper.gml
`**/*.*`: - Having humanly understandable and maintainable code is always the top most priority. - DRY (Don't repeat yourself) principle is also very important. - Ensure that the c...
**/*.*: - Having humanly understandable and maintainable code is always the top most priority.
- DRY (Don't repeat yourself) principle is also very important.
- Ensure that the code is compliant with the CODE_STYLE.MD: https://github.com/Adeptus-Dominus/ChapterMaster/blob/main/docs/CODE_STYLE.md
- If a TODO comment is added, ask the user if you should create a GitHub issue for this TODO.
- If a TODO comment is deleted, remind the user if there is an active GitHub issue related to that comment.
objects/obj_controller/Alarm_5.gmlscripts/scr_marine_struct/scr_marine_struct.gmlscripts/scr_enemy_ai_d/scr_enemy_ai_d.gmlscripts/scr_squads/scr_squads.gmldatafiles/data/traits.jsonscripts/scr_pen_And_paper/scr_pen_And_paper.gml
`**/*.json`: - JSON files with comments are supported by the parser used by this team. Don't warn or request changes to remove them.
**/*.json: - JSON files with comments are supported by the parser used by this team. Don't warn or request changes to remove them.
datafiles/data/traits.json
🔇 Additional comments (8)
datafiles/data/traits.json (1)
97-99: Praise the Omnissiah! Explicit trait effects enhance code clarity.The addition of explicit effect descriptions to these traits provides excellent documentation for their gameplay mechanics. This standardisation will aid both developers and players in understanding trait functionality.
Also applies to: 323-325, 423-425, 452-454, 723-723
🧰 Tools
🪛 Biome (1.9.4)
[error] 99-99: Expected a property but instead found '}'.
Expected a property here.
(parse)
scripts/scr_marine_struct/scr_marine_struct.gml (1)
866-879: By the Machine God's blessing, this centralised loyalty modification serves the greater good.The implementation correctly handles trait-based loyalty modifications with proper bounds checking. The logic flow appropriately applies trait effects in the correct order, ensuring consistent behaviour across the codebase.
scripts/scr_pen_And_paper/scr_pen_And_paper.gml (2)
3-10: By the Omnissiah's wisdom, this function is blessed.The logic matrix is sound - charismatic units receive the Emperor's favour in charisma tests.
87-92: The Emperor protects through second chances.Reroll logic is properly implemented - charismatic units receive blessed opportunity to retry failed charisma tests.
objects/obj_controller/Alarm_5.gml (1)
258-258: Sacred protocols demand consistency.Loyalty adjustment now follows the blessed
alter_loyaltymethod, ensuring trait effects are properly applied to the penitorium's influence.scripts/scr_squads/scr_squads.gml (1)
595-597: The machine spirit approves of standardised protocols.Sergeant changes now properly utilise the blessed
alter_loyaltymethod, ensuring trait effects modify loyalty adjustments as the Omnissiah intended.scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml (2)
211-212: Balance protocols recalibrated by the Omnissiah's will.Corruption range reduced for more measured effect (3-6 instead of 3-18), and loyalty adjustments now utilise the blessed
alter_loyaltymethod for consistent trait interactions.
217-223: Chapter-wide notifications updated with precision.Alert text enhanced with specific loyalty penalty information and chaplain observations. Global loyalty penalties reduced from -30 to -10 for balanced punishment whilst maintaining narrative coherence.
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
EttyKitty
changed the title
|
@EttyKitty i know we discussed various changes to this, but as they are all essentially new systems is it ok if this merges as is and i will work on the new systems to allow data driven roll changes in a new pr before i add any more trait roll effects into game? |
Yeah, sure. Not sure if you've fixed the |
2 participants
Purpose
Describe your changes/additions
What can/needs to be improved/changed
Testing done
Related things and/or additional context