Skip to content

Commit

Permalink
mobs use multiply instead of multiply_base
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheThanathor
TheThanathor committed Oct 27, 2023
1 parent 6635873 commit 3d16c63
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion ...mbat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/cave_spider.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# base stat nerf
attribute @s generic.max_health modifier add e94edf94-a98a-4dcc-bb23-2b59890663fd "gm4_ce_base_health_nerf" -16 add
attribute @s generic.attack_damage modifier add 3182427e-beb4-4f9a-9f39-674baf1d5ee4 "gm4_ce_base_damage_nerf" -1.5 add
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.12 multiply_base
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.12 multiply

# max stat buffs
scoreboard players set $mob_health gm4_ce_data 20
Expand Down
6 changes: 3 additions & 3 deletions gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/enderman.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# base stat nerf
attribute @s[predicate=!gm4_combat_expanded:mob/modifier/the_end] generic.max_health modifier add e94edf94-a98a-4dcc-bb23-2b59890663fd "gm4_ce_base_health_nerf" -2 add
attribute @s generic.attack_damage modifier add 3182427e-beb4-4f9a-9f39-674baf1d5ee4 "gm4_ce_base_damage_nerf" -3 add
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.1 multiply_base
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.1 multiply

# max stat buffs
scoreboard players set $mob_health gm4_ce_data 10
Expand Down Expand Up @@ -37,8 +37,8 @@ scoreboard players operation $mob_armor gm4_ce_data /= #100 gm4_ce_data
# flowering
execute if predicate gm4_combat_expanded:mob/modifier/flowering if predicate gm4_combat_expanded:technical/chance/replace_enderman run function gm4_combat_expanded:mob/init/modifier/special/flowering_enderman
# the end
attribute @s[predicate=gm4_combat_expanded:mob/modifier/the_end] generic.attack_damage modifier add 0872b8ed-f482-4a29-94dc-22df9a28dddb "gm4_ce_modifier_end" 0.2 multiply_base
attribute @s[predicate=gm4_combat_expanded:mob/modifier/the_end] generic.movement_speed modifier add 17004032-9186-4202-b662-14841061fbb2 "gm4_ce_modifier_end" 0.15 multiply_base
attribute @s[predicate=gm4_combat_expanded:mob/modifier/the_end] generic.attack_damage modifier add 0872b8ed-f482-4a29-94dc-22df9a28dddb "gm4_ce_modifier_end" 0.2 multiply
attribute @s[predicate=gm4_combat_expanded:mob/modifier/the_end] generic.movement_speed modifier add 17004032-9186-4202-b662-14841061fbb2 "gm4_ce_modifier_end" 0.15 multiply
# warped forest

# set modifiers
Expand Down
2 changes: 1 addition & 1 deletion gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/hoglin.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# base stat nerf
attribute @s generic.max_health modifier add e94edf94-a98a-4dcc-bb23-2b59890663fd "gm4_ce_base_health_nerf" -16 add
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.14 multiply_base
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.14 multiply

# max stat buffs
scoreboard players set $mob_health gm4_ce_data 80
Expand Down
2 changes: 1 addition & 1 deletion gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/piglin.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# base stat nerf
attribute @s generic.max_health modifier add e94edf94-a98a-4dcc-bb23-2b59890663fd "gm4_ce_base_health_nerf" -2 add
attribute @s generic.attack_damage modifier add 3182427e-beb4-4f9a-9f39-674baf1d5ee4 "gm4_ce_base_damage_nerf" -1 add
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.04 multiply_base
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.04 multiply

# max stat buffs
scoreboard players set $mob_health gm4_ce_data 60
Expand Down
2 changes: 1 addition & 1 deletion gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/skeleton.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# base stat nerf
attribute @s generic.max_health modifier add e94edf94-a98a-4dcc-bb23-2b59890663fd "gm4_ce_base_health_nerf" -8 add
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.08 multiply_base
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.08 multiply

# max stat buffs
scoreboard players set $mob_health gm4_ce_data 12
Expand Down
2 changes: 1 addition & 1 deletion gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/slime.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ tag @s[type=slime,predicate=gm4_combat_expanded:mob/modifier/toxic] add gm4_ce_p
execute if score $size gm4_ce_data matches 1.. if entity @s[type=slime,tag=!gm4_ce_extra_mob,predicate=gm4_combat_expanded:mob/modifier/growth] run function gm4_combat_expanded:mob/init/modifier/special/growth_slime
# basalt deltas
execute if score $size gm4_ce_data matches 1..2 if entity @s[type=magma_cube,predicate=gm4_combat_expanded:mob/modifier/nether/basalt_deltas] run scoreboard players add $size gm4_ce_data 1
attribute @s generic.attack_damage modifier add 1c2ac6d1-109f-4724-aafb-7cc43049ee99 "gm4_ce_modifier_basalt_deltas" 0.15 multiply_base
attribute @s generic.attack_damage modifier add 1c2ac6d1-109f-4724-aafb-7cc43049ee99 "gm4_ce_modifier_basalt_deltas" 0.15 multiply

# size changes based on difficulty
execute if score $difficulty gm4_ce_data matches 50.. if score $size gm4_ce_data matches 1..3 if predicate gm4_combat_expanded:technical/chance/slime_grow_rare run scoreboard players add $size gm4_ce_data 1
Expand Down
2 changes: 1 addition & 1 deletion gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/spider.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# base stat nerf
attribute @s generic.max_health modifier add e94edf94-a98a-4dcc-bb23-2b59890663fd "gm4_ce_base_health_nerf" -14 add
attribute @s generic.attack_damage modifier add 3182427e-beb4-4f9a-9f39-674baf1d5ee4 "gm4_ce_base_damage_nerf" -1.5 add
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.08 multiply_base
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.08 multiply

# max stat buffs
scoreboard players set $mob_health gm4_ce_data 30
Expand Down
2 changes: 1 addition & 1 deletion ..._expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/wither_skeleton.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# base stat nerf
attribute @s generic.max_health modifier add e94edf94-a98a-4dcc-bb23-2b59890663fd "gm4_ce_base_health_nerf" -2 add
attribute @s generic.attack_damage modifier add 3182427e-beb4-4f9a-9f39-674baf1d5ee4 "gm4_ce_base_damage_nerf" -7 add
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.04 multiply_base
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.04 multiply

# max stat buffs
scoreboard players set $mob_health gm4_ce_data 22
Expand Down
8 changes: 4 additions & 4 deletions gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/zombie.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# base stat nerf
attribute @s generic.max_health modifier add e94edf94-a98a-4dcc-bb23-2b59890663fd "gm4_ce_base_health_nerf" -5 add
attribute @s generic.attack_damage modifier add 3182427e-beb4-4f9a-9f39-674baf1d5ee4 "gm4_ce_base_damage_nerf" -2 add
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.04 multiply_base
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.04 multiply

# max stat buffs
scoreboard players set $mob_health gm4_ce_data 15
Expand Down Expand Up @@ -53,14 +53,14 @@ execute if entity @s[tag=gm4_ce_spore_zombie] run function gm4_combat_expanded:m
# toxic
tag @s[predicate=gm4_combat_expanded:mob/modifier/toxic] add gm4_ce_weakness_attacks
# deep
attribute @s[type=drowned,predicate=gm4_combat_expanded:mob/modifier/deep] generic.attack_damage modifier add 34e4955b-8f75-4292-89e9-7a1639499717 "gm4_ce_modifier_deep" 0.2 multiply_base
attribute @s[type=drowned,predicate=gm4_combat_expanded:mob/modifier/deep] generic.attack_damage modifier add 34e4955b-8f75-4292-89e9-7a1639499717 "gm4_ce_modifier_deep" 0.2 multiply
# reef
execute if entity @s[type=drowned,predicate=gm4_combat_expanded:mob/modifier/reef] run function gm4_combat_expanded:mob/init/modifier/special/reef_drowned
# growth
execute if entity @s[type=!zombie_villager,predicate=gm4_combat_expanded:mob/modifier/growth] run function gm4_combat_expanded:mob/init/modifier/special/growth_zombie
# dark
attribute @s[predicate=gm4_combat_expanded:mob/modifier/dark] generic.armor_toughness modifier add e25ac14f-4a06-48e0-adce-2e95e773d4a2 "gm4_ce_modifier_dark" 0.15 multiply_base
attribute @s[predicate=gm4_combat_expanded:mob/modifier/dark] zombie.spawn_reinforcements modifier add 88708a3a-b8f0-46f8-8dd9-1f8fb0f315d6 "gm4_ce_modifier_dark" 0.25 multiply_base
attribute @s[predicate=gm4_combat_expanded:mob/modifier/dark] generic.armor_toughness modifier add e25ac14f-4a06-48e0-adce-2e95e773d4a2 "gm4_ce_modifier_dark" 0.15 multiply
attribute @s[predicate=gm4_combat_expanded:mob/modifier/dark] zombie.spawn_reinforcements modifier add 88708a3a-b8f0-46f8-8dd9-1f8fb0f315d6 "gm4_ce_modifier_dark" 0.25 multiply

# half droprate of armor in "Dark"
data modify entity @s[predicate=gm4_combat_expanded:mob/modifier/dark] ArmorDropChances set value [0.0452F,0.0452F,0.0452F,0.0452F]
Expand Down
2 changes: 1 addition & 1 deletion ...expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/zombified_piglin.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# base stat nerf
attribute @s generic.max_health modifier add e94edf94-a98a-4dcc-bb23-2b59890663fd "gm4_ce_base_health_nerf" -3 add
attribute @s generic.attack_damage modifier add 3182427e-beb4-4f9a-9f39-674baf1d5ee4 "gm4_ce_base_damage_nerf" -1 add
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.02 multiply_base
attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.02 multiply

# max stat buffs
scoreboard players set $mob_health gm4_ce_data 50
Expand Down
6 changes: 3 additions & 3 deletions ...expanded/data/gm4_combat_expanded/functions/mob/init/modifier/special/dark_mob.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# at @s
# run from mob/init/stat/prep

attribute @s generic.max_health modifier add 57c2eda2-b31d-4220-89ba-0a38ed00ab91 "gm4_ce_modifier_dark" 0.15 multiply_base
attribute @s generic.attack_damage modifier add 93b69c69-f865-4b3a-8e2b-306da32c33de "gm4_ce_modifier_dark" 0.1 multiply_base
attribute @s generic.movement_speed modifier add c5b329f2-71c5-4a02-9538-15b04fb94f5c "gm4_ce_modifier_dark" 0.05 multiply_base
attribute @s generic.max_health modifier add 57c2eda2-b31d-4220-89ba-0a38ed00ab91 "gm4_ce_modifier_dark" 0.15 multiply
attribute @s generic.attack_damage modifier add 93b69c69-f865-4b3a-8e2b-306da32c33de "gm4_ce_modifier_dark" 0.1 multiply
attribute @s generic.movement_speed modifier add c5b329f2-71c5-4a02-9538-15b04fb94f5c "gm4_ce_modifier_dark" 0.05 multiply
6 changes: 3 additions & 3 deletions ...nded/data/gm4_combat_expanded/functions/mob/init/modifier/special/reef_drowned.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# at @s
# run from mob/init/mob_type/zombie

attribute @s generic.movement_speed modifier add 7641c49f-772a-410a-aa7a-f2375af40fce "gm4_ce_modifier_reef" 1 multiply_base
attribute @s generic.armor modifier add 21a622ae-7a5f-4d4c-8f6f-6aff894cafe9 "gm4_ce_modifier_reef" 0.1 multiply_base
attribute @s generic.armor_toughness modifier add 022348f2-efe3-4b83-9be5-6490cbb90381 "gm4_ce_modifier_reef" 0.75 multiply_base
attribute @s generic.movement_speed modifier add 7641c49f-772a-410a-aa7a-f2375af40fce "gm4_ce_modifier_reef" 1 multiply
attribute @s generic.armor modifier add 21a622ae-7a5f-4d4c-8f6f-6aff894cafe9 "gm4_ce_modifier_reef" 0.1 multiply
attribute @s generic.armor_toughness modifier add 022348f2-efe3-4b83-9be5-6490cbb90381 "gm4_ce_modifier_reef" 0.75 multiply

execute if predicate gm4_combat_expanded:technical/chance/extra_drowned_spawn if entity @s[tag=!gm4_ce_extra_mob] store success score $mob_extras gm4_ce_data run summon drowned ~ ~ ~ {Tags:["gm4_ce_extra_mob"]}
execute if predicate gm4_combat_expanded:technical/chance/extra_drowned_spawn if entity @s[tag=!gm4_ce_extra_mob] store success score $mob_extras gm4_ce_data run summon drowned ~ ~ ~ {Tags:["gm4_ce_extra_mob"]}
Expand Down
2 changes: 1 addition & 1 deletion ...combat_expanded/data/gm4_combat_expanded/functions/mob/init/modifier/stat/eval.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

$execute if score $mob_health gm4_ce_data matches 1.. run attribute @s generic.max_health modifier add e1d4262d-fa9d-47e7-a98e-e83ad748796e "gm4_ce_modifier_health" $(health) add
$execute if score $mob_damage gm4_ce_data matches 1.. run attribute @s generic.attack_damage modifier add 6d6d4eb0-a826-4697-9280-75cc603c68df "gm4_ce_modifier_damage" $(damage) add
$execute if score $mob_speed gm4_ce_data matches 1.. run attribute @s generic.movement_speed modifier add 873a5399-42e3-46b1-b5f8-12cf22caf6c6 "gm4_ce_modifier_speed" $(speed) multiply_base
$execute if score $mob_speed gm4_ce_data matches 1.. run attribute @s generic.movement_speed modifier add 873a5399-42e3-46b1-b5f8-12cf22caf6c6 "gm4_ce_modifier_speed" $(speed) multiply
$execute if score $mob_armor gm4_ce_data matches 1.. run attribute @s generic.armor modifier add 71fb9281-7a7a-4dce-b1a3-b83cbb05dfe4 "gm4_ce_modifier_armor" $(armor) add
$execute if score $mob_toughness gm4_ce_data matches 1.. run attribute @s generic.armor_toughness modifier add 444fe678-a6d3-4909-9014-abfa49235594 "gm4_ce_modifier_toughness" $(toughness) add
10 changes: 5 additions & 5 deletions ...combat_expanded/data/gm4_combat_expanded/functions/mob/init/modifier/stat/prep.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
# | Biome Modifiers
# snowy
attribute @s[predicate=gm4_combat_expanded:mob/modifier/snowy] generic.movement_speed modifier add 8b68cb8f-b3ac-489b-bb24-ed6cca2fcacf "gm4_ce_modifier_snowy" -0.15 multiply
attribute @s[predicate=gm4_combat_expanded:mob/modifier/snowy] generic.max_health modifier add 9e950abf-f1d2-407d-a886-749059c29325 "gm4_ce_modifier_snowy" 0.15 multiply_base
attribute @s[predicate=gm4_combat_expanded:mob/modifier/snowy] generic.max_health modifier add 9e950abf-f1d2-407d-a886-749059c29325 "gm4_ce_modifier_snowy" 0.15 multiply
# mountainous
attribute @s[predicate=gm4_combat_expanded:mob/modifier/mountainous] generic.attack_damage modifier add ba452899-be21-45b2-860c-c28947ba8c23 "gm4_ce_modifier_mountainous" 0.1 multiply_base
attribute @s[predicate=gm4_combat_expanded:mob/modifier/mountainous] generic.armor_toughness modifier add 899a6423-93ed-4293-bde3-d993a3c50d33 "gm4_ce_modifier_mountainous" 0.5 multiply_base
attribute @s[predicate=gm4_combat_expanded:mob/modifier/mountainous] generic.attack_damage modifier add ba452899-be21-45b2-860c-c28947ba8c23 "gm4_ce_modifier_mountainous" 0.1 multiply
attribute @s[predicate=gm4_combat_expanded:mob/modifier/mountainous] generic.armor_toughness modifier add 899a6423-93ed-4293-bde3-d993a3c50d33 "gm4_ce_modifier_mountainous" 0.5 multiply
# burned
attribute @s[predicate=gm4_combat_expanded:mob/modifier/burned] generic.movement_speed modifier add 00a0987e-646e-4c9e-911e-8b07ad12df20 "gm4_ce_modifier_burned" 0.1 multiply_base
attribute @s[predicate=gm4_combat_expanded:mob/modifier/burned] generic.movement_speed modifier add 00a0987e-646e-4c9e-911e-8b07ad12df20 "gm4_ce_modifier_burned" 0.1 multiply
# flowering
# toxic
attribute @s[predicate=gm4_combat_expanded:mob/modifier/tocix] generic.attack_damage modifier add 0bb9ee29-b563-4cf7-b665-716391af0085 "gm4_ce_modifier_toxic" -0.25 multiply
# deep
attribute @s[predicate=gm4_combat_expanded:mob/modifier/deep] generic.armor_toughness modifier add 5f5931f9-24d8-41ae-bab1-1468b5c8f35c "gm4_ce_modifier_deep" 0.6 multiply_base
attribute @s[predicate=gm4_combat_expanded:mob/modifier/deep] generic.armor_toughness modifier add 5f5931f9-24d8-41ae-bab1-1468b5c8f35c "gm4_ce_modifier_deep" 0.6 multiply
# reef
# growth
# dark
Expand Down

0 comments on commit 3d16c63

Please sign in to comment.