Skip to content

Conversation

@TheThanathor
Copy link
Member

This PR serves to replace Combat Expanded with Survival Refightalized & Monsters Unbound. The last part, named Augmented Armor is not included here, this is as replacement of the old PR (#1025)

Survival Refightalized

  • Reworks Armor points to serve as a "second health bar". Armor points regenerate quickly out of combat
  • Reworks Health regeneration to only work out of combat. It also no longer consumes saturation.
  • Rebalances Shields to be temporarily disabled after an attack, and adds a parry mechanic
  • Rebalances mobs to be stronger based on environment (like deeper underground)

Monsters Unbound

  • Adds custom mob modifiers in different biomes
  • Adds special Elite mob variants that are much stronger

@misode misode added feature-update An additional feature has been added to a module needs-testing Requires in-game testing labels Jun 2, 2025
@TheThanathor TheThanathor marked this pull request as ready for review June 9, 2025 21:21
- spamming the shield now disables parries
- all elite head blocks now have binding curse
- pearlescent laser no longer pierces armor
- re-added chicken jockeys for Lava Chicken music disk
- added more sounds to shield parry
Copy link
Member

@misode misode left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've looked through a fair amount of the code now. Great job on the documentation and general neat-ness of the mcfunction files! I've got a couple of nitpicks, but otherwise this looks good to merge.


# initiate unless mob is pre-marked
execute unless entity @s[tag=gm4_sr_processed] if dimension minecraft:overworld run function gm4_survival_refightalized:mob/init/calc_difficulty_overworld
execute unless entity @s[tag=gm4_sr_processed] unless dimension minecraft:overworld run function gm4_survival_refightalized:mob/init/calc_difficulty_else
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check should use a dimension tag so that other data packs can make overworld-like dimensions where mobs behave the same as in minecraft:overworld.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there such a thing as a dimension tag? I can't find anything about it

- death messages only play if showDeathMessages is true
- removed useless function tag calls
- improved baby zombie predicate
- renamed tick_fire_delay function to clock_fire_delay
@Bloo-dev Bloo-dev self-assigned this Jul 28, 2025
@Bloo-dev Bloo-dev merged commit 3ca984f into Gamemode4Dev:master Aug 11, 2025
7 of 8 checks passed
github-actions bot pushed a commit that referenced this pull request Aug 11, 2025
* add 1.21.4 modules

* what even happened here?

* update survival refightalized to 1.21.5

* add missing headers

* fix monsters unbound for 1.21.5

* add missing headers and translations

* some of the playtest feedback

* add custom death messages

* fix the last few playtest things

- spamming the shield now disables parries
- all elite head blocks now have binding curse
- pearlescent laser no longer pierces armor

* update to 1.21.7

- re-added chicken jockeys for Lava Chicken music disk
- added more sounds to shield parry

* update from misode's comments

- death messages only play if showDeathMessages is true
- removed useless function tag calls
- improved baby zombie predicate
- renamed tick_fire_delay function to clock_fire_delay

* add empty function tags
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

feature-update An additional feature has been added to a module needs-testing Requires in-game testing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants