Generalisations

iHeronGH · Oct 16, 2023 · f723f23 · f723f23
1 parent d8d7868
commit f723f23
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/DLC Template v1.0.0/data/dlc/functions/effects/tribe_1/base.mcfunction b/DLC Template v1.0.0/data/dlc/functions/effects/tribe_1/base.mcfunction
@@ -3,10 +3,10 @@
 # Grants base tribe_1 effects.
 
 #region
- # Base Effects
+ # Base effects
 effect give @a[predicate=dlc:tribes/tribe_1, tag=eoflib.atts] speed 1 0 true
 
- # Check for passive_1 Effects
+ # Check for Passive 2 effects
 execute if entity @a[predicate=dlc:tribes/tribe_1, predicate=dlc:passives/passive_1/1, tag=eoflib.atts] run function dlc:effects/tribe_1/passive_1/1
 execute if entity @a[predicate=dlc:tribes/tribe_1, predicate=dlc:passives/passive_1/2, tag=eoflib.atts] run function dlc:effects/tribe_1/passive_1/2
 

diff --git a/DLC Template v1.0.0/data/dlc/functions/effects/tribe_2/base.mcfunction b/DLC Template v1.0.0/data/dlc/functions/effects/tribe_2/base.mcfunction
@@ -3,11 +3,12 @@
 # Grants base tribe_2 effects.
 
 #region
- # Base Effects
+ # Base effects
 effect give @a[predicate=dlc:tribes/tribe_2, tag=eoflib.atts] strength 1 1 true
 
- # Check for Rejuvenation Effects
-execute if entity @a[predicate=dlc:passives/rejuvenation/1, tag=eoflib.atts, tag=!eof.passives.rejuvenation.init, tag=!eof.passives.rejuvenation.active] run function dlc:effects/tribe_2/rejuvenation/init
+ # Check for Passive 2 effects
+execute if entity @a[predicate=dlc:tribes/tribe_2, predicate=dlc:passives/passive_2/1, tag=eoflib.atts] run function dlc:effects/tribe_2/passive_2/1
+execute if entity @a[predicate=dlc:tribes/tribe_2, predicate=dlc:passives/passive_2/2, tag=eoflib.atts] run function dlc:effects/tribe_2/passive_2/2
 
  # Loop if there are any tribe_2
 execute if entity @a[predicate=dlc:tribes/tribe_2, tag=eoflib.atts] run schedule function dlc:effects/tribe_2/base 1t replace

diff --git a/DLC Template v1.0.0/data/dlc/functions/effects/tribe_3/base.mcfunction b/DLC Template v1.0.0/data/dlc/functions/effects/tribe_3/base.mcfunction
@@ -3,11 +3,12 @@
 # Grants base tribe_3 effects.
 
 #region
- # Base Effects
+ # Base effects
 effect give @a[predicate=dlc:tribes/tribe_3, tag=eoflib.atts] speed 1 1 true
 
- # Check for Camouflage Effects
-execute if entity @a[predicate=dlc:tribes/tribe_3, predicate=dlc:passives/camouflage/1, tag=eoflib.atts] run function dlc:effects/tribe_3/camouflage/1
+ # Check for Passive 2 effects
+execute if entity @a[predicate=dlc:tribes/tribe_3, predicate=dlc:passives/passive_3/1, tag=eoflib.atts] run function dlc:effects/tribe_3/passive_3/1
+execute if entity @a[predicate=dlc:tribes/tribe_3, predicate=dlc:passives/passive_3/2, tag=eoflib.atts] run function dlc:effects/tribe_3/passive_3/2
 
  # Loop if there are any tribe_3
 execute if entity @a[predicate=dlc:tribes/tribe_3, tag=eoflib.atts] run schedule function dlc:effects/tribe_3/base 1t replace

diff --git a/DLC Template v1.0.0/data/dlc/functions/load/gen/scoreboards.mcfunction b/DLC Template v1.0.0/data/dlc/functions/load/gen/scoreboards.mcfunction
@@ -18,7 +18,7 @@
 
  # Variables
  ## Global Vars
- #define score_holder _eoflib.dlc.template The load status of this datapack.
+#define score_holder _eoflib.dlc.template The load status of this datapack.
 execute unless score _eoflib.dlc.template eoflib.dlcs = _eoflib.dlc.template eoflib.dlcs run scoreboard players set _eoflib.dlc.template eoflib.dlcs 0
 
 #endregion