more balance changes

Gamemode4Dev · Oct 29, 2023 · 5b895b6 · 5b895b6
1 parent 0a48b36
commit 5b895b6
Show file tree

Hide file tree

Showing 18 changed files with 150 additions and 157 deletions.
diff --git a/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/initiate.mcfunction b/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/initiate.mcfunction
@@ -54,7 +54,6 @@ execute if entity @s[type=phantom] run function gm4_combat_expanded:mob/init/mob
 execute if entity @s[type=wither_skeleton] run function gm4_combat_expanded:mob/init/mob_type/wither_skeleton
 execute if entity @s[type=piglin] run function gm4_combat_expanded:mob/init/mob_type/piglin
 execute if entity @s[type=zombified_piglin] run function gm4_combat_expanded:mob/init/mob_type/zombified_piglin
-execute if entity @s[type=blaze] run function gm4_combat_expanded:mob/init/mob_type/blaze
 execute if entity @s[type=hoglin] run function gm4_combat_expanded:mob/init/mob_type/hoglin
 execute if entity @s[type=#gm4_combat_expanded:basic_modifiers_only] run function gm4_combat_expanded:mob/init/mob_type/other
 

diff --git a/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/blaze.mcfunction b/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/blaze.mcfunction
diff --git a/...mbat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/cave_spider.mcfunction b/...mbat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/cave_spider.mcfunction
@@ -33,6 +33,8 @@ tag @s[predicate=gm4_combat_expanded:mob/modifier/toxic] add gm4_ce_poison_bite
 # growth
 execute if entity @s[tag=!gm4_ce_extra_mob,predicate=gm4_combat_expanded:mob/modifier/growth] store success score $mob_extras gm4_ce_data run summon cave_spider ~ ~ ~ {Tags:["gm4_ce_extra_mob"]}
 execute if entity @s[tag=!gm4_ce_extra_mob,predicate=gm4_combat_expanded:mob/modifier/growth,predicate=gm4_combat_expanded:technical/chance/extra_spider_spawn] store success score $mob_extras gm4_ce_data run summon cave_spider ~ ~ ~ {Tags:["gm4_ce_extra_mob"]}
+# dark
+attribute @s[predicate=gm4_combat_expanded:mob/modifier/dark] generic.movement_speed modifier add 4e3983be-5075-4cb8-a05d-3911e619b780 "gm4_ce_modifier_dark" 0.15 multiply_base
 
 # set modifiers
 execute unless score $replaced_mob gm4_ce_data matches 1 run function gm4_combat_expanded:mob/init/modifier/stat/prep

diff --git a/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/creeper.mcfunction b/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/creeper.mcfunction
@@ -7,9 +7,9 @@
 attribute @s generic.max_health modifier add e94edf94-a98a-4dcc-bb23-2b59890663fd "gm4_ce_base_health_nerf" -5 add
 
 # max stat buffs
-scoreboard players set $mob_health gm4_ce_data 22
+scoreboard players set $mob_health gm4_ce_data 30
 scoreboard players set $mob_damage gm4_ce_data 0
-scoreboard players set $mob_speed gm4_ce_data 10
+scoreboard players set $mob_speed gm4_ce_data 20
 scoreboard players set $mob_armor gm4_ce_data 14
 scoreboard players set $mob_toughness gm4_ce_data 0
 
@@ -20,13 +20,20 @@ scoreboard players set $mob_armor.cap gm4_ce_data 7
 scoreboard players set $mob_toughness.cap gm4_ce_data 0
 
 # | Biome Modifiers
+# snowy
+attribute @s[predicate=gm4_combat_expanded:mob/modifier/snowy] generic.max_health modifier add 18020ad6-a3a9-46df-9b13-82bbdef4cc7b "gm4_ce_modifier_mountainous" 0.3 multiply
+attribute @s[predicate=gm4_combat_expanded:mob/modifier/snowy] generic.movement_speed modifier add 33ebfb5d-a203-4492-8d40-400212d03085 "gm4_ce_modifier_mountainous" -0.1 multiply_base
+# mountainous
+attribute @s[predicate=gm4_combat_expanded:mob/modifier/mountainous] generic.knockback_resistance modifier add d1a07954-66f4-4da8-86a4-42fc863b760b "gm4_ce_modifier_mountainous" 0.4 add
 # burned
 execute if predicate gm4_combat_expanded:mob/modifier/burned store result entity @s Fuse int 0.75 run data get entity @s Fuse
 # flowering 
 execute if predicate gm4_combat_expanded:mob/modifier/flowering run function gm4_combat_expanded:mob/init/modifier/special/flowering_creeper
 # toxic
 execute if predicate gm4_combat_expanded:mob/modifier/toxic run function gm4_combat_expanded:mob/process/toxic_creeper
 tag @s[predicate=gm4_combat_expanded:mob/modifier/toxic] add gm4_ce_toxic_creeper
+# growth
+attribute @s[predicate=gm4_combat_expanded:mob/modifier/growth] generic.movement_speed modifier add abf4db3b-a9b1-407b-a012-38c1c5c14e5f "gm4_ce_modifier_growth" 0.2 multiply_base
 # dark
 data modify entity @s[predicate=gm4_combat_expanded:mob/modifier/dark] ExplosionRadius set value 4s
 

diff --git a/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/enderman.mcfunction b/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/enderman.mcfunction
@@ -28,7 +28,7 @@ execute if predicate gm4_combat_expanded:mob/modifier/flowering if predicate gm4
 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
-execute if predicate gm4_combat_expanded:mob/modifier/nether/warped_forest if predicate gm4_combat_expanded:technical/chance/replace_enderman_spore_zombie run function gm4_combat_expanded:mob/init/modifier/special/warped_forest_enderman
+execute if predicate gm4_combat_expanded:mob/modifier/nether/warped_forest if predicate gm4_combat_expanded:technical/chance/replace_enderman_skeleton run function gm4_combat_expanded:mob/init/modifier/special/warped_forest_enderman
 # nether wastes
 execute if predicate gm4_combat_expanded:mob/modifier/nether/nether_wastes if predicate gm4_combat_expanded:technical/chance/replace_enderman_blaze run function gm4_combat_expanded:mob/init/modifier/special/nether_wastes_enderman
 # soul sand valley

diff --git a/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/phantom.mcfunction b/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/phantom.mcfunction
@@ -8,13 +8,13 @@ attribute @s generic.max_health modifier add e94edf94-a98a-4dcc-bb23-2b59890663f
 attribute @s generic.attack_damage modifier add 3182427e-beb4-4f9a-9f39-674baf1d5ee4 "gm4_ce_base_damage_nerf" -1.5 add
 
 # max stat buffs
-scoreboard players set $mob_health gm4_ce_data 30
-scoreboard players set $mob_damage gm4_ce_data 8
+scoreboard players set $mob_health gm4_ce_data 33
+scoreboard players set $mob_damage gm4_ce_data 11
 scoreboard players set $mob_speed gm4_ce_data 0
 scoreboard players set $mob_armor gm4_ce_data 8
 scoreboard players set $mob_toughness gm4_ce_data 0
 
-scoreboard players set $mob_health.cap gm4_ce_data 22
+scoreboard players set $mob_health.cap gm4_ce_data 16
 scoreboard players set $mob_damage.cap gm4_ce_data 6
 scoreboard players set $mob_speed.cap gm4_ce_data 0
 scoreboard players set $mob_armor.cap gm4_ce_data 5
@@ -28,7 +28,7 @@ effect give @s[predicate=gm4_combat_expanded:mob/modifier/burned] fire_resistanc
 data modify entity @s[predicate=gm4_combat_expanded:mob/modifier/burned,predicate=gm4_combat_expanded:technical/chance/grow_phantom_slight] Size set value 1
 # flowering
 data modify entity @s[predicate=gm4_combat_expanded:mob/modifier/flowering,predicate=gm4_combat_expanded:technical/chance/grow_phantom_slight] Size set value 1
-data modify entity @s[predicate=gm4_combat_expanded:mob/modifier/flowering,predicate=gm4_combat_expanded:technical/chance/grow_phantom_large] Size set value 3
+data modify entity @s[predicate=gm4_combat_expanded:mob/modifier/flowering,predicate=gm4_combat_expanded:technical/chance/grow_phantom_large] Size set value 2
 
 # set modifiers
 execute unless score $replaced_mob gm4_ce_data matches 1 run function gm4_combat_expanded:mob/init/modifier/stat/prep

diff --git a/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/piglin.mcfunction b/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/piglin.mcfunction
@@ -27,7 +27,6 @@ loot replace entity @s armor.feet loot gm4_combat_expanded:mob/equip_armor/pigli
 # set weapon
 loot replace entity @s weapon.mainhand loot gm4_combat_expanded:mob/equip_weapon/piglin
 
-
 # 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]
 

diff --git a/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/skeleton.mcfunction b/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/skeleton.mcfunction
@@ -47,6 +47,8 @@ execute if predicate gm4_combat_expanded:mob/modifier/dark run scoreboard player
 execute if predicate gm4_combat_expanded:mob/modifier/dark run scoreboard players add $mob_toughness gm4_ce_data 2
 # soul sand valley
 execute if predicate gm4_combat_expanded:mob/modifier/nether/soul_sand_valley run effect give @s fire_resistance infinite 0 true
+# warped forest
+execute if predicate gm4_combat_expanded:mob/modifier/nether/warped_forest run function gm4_combat_expanded:mob/init/modifier/special/warped_forest_skeleton
 
 # drop rate for custom arrows
 execute if score $arrow gm4_ce_data matches 1 run data modify entity @s HandDropChances[1] set value 0.25F

diff --git a/..._expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/wither_skeleton.mcfunction b/..._expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/wither_skeleton.mcfunction
@@ -5,7 +5,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.attack_damage modifier add 3182427e-beb4-4f9a-9f39-674baf1d5ee4 "gm4_ce_base_damage_nerf" -6 add
 attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd7173297b "gm4_ce_base_speed_nerf" -0.04 multiply_base
 
 # max stat buffs

diff --git a/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/zombie.mcfunction b/gm4_combat_expanded/data/gm4_combat_expanded/functions/mob/init/mob_type/zombie.mcfunction
@@ -10,13 +10,13 @@ attribute @s generic.movement_speed modifier add 811e516b-a6b2-40e4-b56e-0ffd717
 
 # max stat buffs
 scoreboard players set $mob_health gm4_ce_data 20
-scoreboard players set $mob_damage gm4_ce_data 44
+scoreboard players set $mob_damage gm4_ce_data 35
 scoreboard players set $mob_speed gm4_ce_data 15
 scoreboard players set $mob_armor gm4_ce_data 10
 scoreboard players set $mob_toughness gm4_ce_data 25
 
 scoreboard players set $mob_health.cap gm4_ce_data 15
-scoreboard players set $mob_damage.cap gm4_ce_data 10
+scoreboard players set $mob_damage.cap gm4_ce_data 7
 scoreboard players set $mob_speed.cap gm4_ce_data 6
 scoreboard players set $mob_armor.cap gm4_ce_data 4
 scoreboard players set $mob_toughness.cap gm4_ce_data 8

diff --git a/.../data/gm4_combat_expanded/functions/mob/init/modifier/special/flowering_zombie.mcfunction b/.../data/gm4_combat_expanded/functions/mob/init/modifier/special/flowering_zombie.mcfunction
@@ -3,13 +3,13 @@
 # at @s
 # run from mob/init/mob_type/zombie
 
-# let generation determine dropchance of spore
-scoreboard players set $spore_dropchange gm4_ce_data 10
-execute store result entity @s ArmorDropChances[3] int 0.1 run scoreboard players operation $spore_dropchange gm4_ce_data -= @s gm4_ce_generation
-
 # in cherry grove make stronger spore zombie
 execute if biome ~ ~ ~ cherry_grove run tag @s add gm4_ce_spore_zombie.cherry
 
 # put spore on head and store generation
 loot replace entity @s armor.head loot gm4_combat_expanded:mob/equip_armor/spore
 execute store result entity @s ArmorItems[3].tag.gm4_ce_spore.generation int 1 run scoreboard players add @s gm4_ce_generation 1
+
+# let generation determine dropchance of spore
+scoreboard players set $spore_dropchange gm4_ce_data 11
+execute store result entity @s ArmorDropChances[3] float 0.1 run scoreboard players operation $spore_dropchange gm4_ce_data -= @s gm4_ce_generation
diff --git a/...gm4_combat_expanded/functions/mob/init/modifier/special/warped_forest_enderman.mcfunction b/...gm4_combat_expanded/functions/mob/init/modifier/special/warped_forest_enderman.mcfunction
@@ -1,10 +1,11 @@
-# replace enderman with warped spore zombie
+# replace enderman with skeletons
 # @s = enderman
 # at @s
 # run from mob/init/mob_type/enderman
 
-summon zombie ~-0.05 ~ ~0.05 {Tags:["gm4_ce_extra_mob","gm4_ce_spore_mob","gm4_ce_spore_zombie.warped"]}
-summon zombie ~0.1 ~0.05 ~ {Tags:["gm4_ce_extra_mob","gm4_ce_spore_mob","gm4_ce_spore_zombie.warped"]}
+summon skeleton ~-0.05 ~ ~0.05 {Tags:["gm4_ce_extra_mob"]}
+summon skeleton ~0.1 ~0.05 ~ {Tags:["gm4_ce_extra_mob"]}
+summon skeleton ~0.1 ~0.05 ~ {Tags:["gm4_ce_extra_mob"]}
 tp @s ~ ~-2050 ~
 kill @s
 scoreboard players set $mob_extras gm4_ce_data 1

diff --git a/...gm4_combat_expanded/functions/mob/init/modifier/special/warped_forest_skeleton.mcfunction b/...gm4_combat_expanded/functions/mob/init/modifier/special/warped_forest_skeleton.mcfunction
@@ -0,0 +1,9 @@
+# apply warped forest effects to skeleton
+# @s = skeleton
+# at @s
+# run from mob/init/mob_type/skeleton
+
+item replace entity @s weapon.mainhand with air
+attribute @s generic.max_health modifier add f1f26b22-9f93-4fea-8416-96bae6867d80 "gm4_ce_modifier_warped_forest" 0.35 multiply
+attribute @s generic.movement_speed modifier add 0f98404f-d7ab-40bf-92a3-4944640b5b0e "gm4_ce_modifier_warped_forest" -0.06 multiply_base
+attribute @s generic.attack_damage modifier add f1f26b22-9f93-4fea-8416-96bae6867d80 "gm4_ce_modifier_warped_forest" 3 add