Skip to content

Commit

Permalink
refactored a lotta spell classes & started on guided shot
Browse files Browse the repository at this point in the history
  • Loading branch information
CammiePone committed Jan 18, 2025
1 parent fd6d8f1 commit 44917bd
Show file tree
Hide file tree
Showing 57 changed files with 747 additions and 229 deletions.
4 changes: 2 additions & 2 deletions src/main/generated/assets/arcanuscontinuum/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"arcanuscontinuum.spell_component.arcanuscontinuum.electric_effect": "Electric Effect",
"arcanuscontinuum.spell_component.arcanuscontinuum.empty": "EMPTY",
"arcanuscontinuum.spell_component.arcanuscontinuum.enlarge_effect": "Enlarge Effect",
"arcanuscontinuum.spell_component.arcanuscontinuum.explosion_shape": "Explosion Shape",
"arcanuscontinuum.spell_component.arcanuscontinuum.explosion_shape": "Burst Shape",
"arcanuscontinuum.spell_component.arcanuscontinuum.feather_effect": "Feather Effect",
"arcanuscontinuum.spell_component.arcanuscontinuum.fire_effect": "Fire Effect",
"arcanuscontinuum.spell_component.arcanuscontinuum.float_effect": "Float Effect",
Expand Down Expand Up @@ -127,6 +127,7 @@
"config.arcanuscontinuum.boltShapeProperties": "Bolt Shape",
"config.arcanuscontinuum.bouncyEffectProperties": "Bouncy Effect",
"config.arcanuscontinuum.buildEffectProperties": "Build Effect",
"config.arcanuscontinuum.burstShapeProperties": "Burst Shape",
"config.arcanuscontinuum.canBeRemovedByOthers": "Can Be Removed By Other Players",
"config.arcanuscontinuum.canSuckEntitiesIn": "Can Suck Entities In",
"config.arcanuscontinuum.castingSpeedHasCoolDown": "Use Attack Cool Down for Casting?",
Expand All @@ -144,7 +145,6 @@
"config.arcanuscontinuum.enabled": "Enabled (Requires Restart)",
"config.arcanuscontinuum.enchantments_category": "Enchantments",
"config.arcanuscontinuum.enlargeEffectProperties": "Enlarge Effect",
"config.arcanuscontinuum.explosionShapeProperties": "Explosion Shape",
"config.arcanuscontinuum.featherEffectProperties": "Feather Effect",
"config.arcanuscontinuum.fireEffectProperties": "Fire Effect",
"config.arcanuscontinuum.floatEffectProperties": "Float Effect",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@ public static final class RuneShapeProperties {
public static int delay = 60;
}

@Category(id = "explosionShapeProperties", translation = "config.arcanuscontinuum.explosionShapeProperties", sortOrder = 7)
public static final class ExplosionShapeProperties {
@Category(id = "burstShapeProperties", translation = "config.arcanuscontinuum.burstShapeProperties", sortOrder = 7)
public static final class BurstShapeProperties {
@ConfigEntry(id = "enabled", type = EntryType.BOOLEAN, translation = "config.arcanuscontinuum.enabled")
public static boolean enabled = true;

Expand Down Expand Up @@ -276,6 +276,34 @@ public static final class ExplosionShapeProperties {
public static float strength = 3.5f;
}

// TODO uncomment this when we have guided shot done
// @Category(id = "guidedShotShapeProperties", translation = "config.arcanuscontinuum.guidedShotShapeProperties")
public static final class GuidedShotShapeProperties {
@ConfigEntry(id = "enabled", type = EntryType.BOOLEAN, translation = "config.arcanuscontinuum.enabled")
public static boolean enabled = false;

@ConfigEntry(id = "weight", type = EntryType.ENUM, translation = "config.arcanuscontinuum.weight")
public static Weight weight = Weight.HEAVY;

@ConfigEntry(id = "manaCost", type = EntryType.DOUBLE, translation = "config.arcanuscontinuum.manaCost")
@DoubleRange(min = 0, max = 200)
public static double manaCost = 0;

@ConfigEntry(id = "manaMultiplier", type = EntryType.DOUBLE, translation = "config.arcanuscontinuum.manaMultiplier")
public static double manaMultiplier = 1.2;

@ConfigEntry(id = "coolDown", type = EntryType.INTEGER, translation = "config.arcanuscontinuum.coolDown")
@IntRange(min = 0, max = 24000)
public static int coolDown = 300;

@ConfigEntry(id = "minimumLevel", type = EntryType.INTEGER, translation = "config.arcanuscontinuum.minimumLevel")
@IntRange(min = 0, max = 10)
public static int minimumLevel = 7;

@ConfigEntry(id = "potencyModifier", type = EntryType.DOUBLE, translation = "config.arcanuscontinuum.potencyModifier")
public static double potencyModifier = 0;
}

@Category(id = "counterShapeProperties", translation = "config.arcanuscontinuum.counterShapeProperties", sortOrder = 8)
public static final class CounterShapeProperties {
@ConfigEntry(id = "enabled", type = EntryType.BOOLEAN, translation = "config.arcanuscontinuum.enabled")
Expand Down Expand Up @@ -938,6 +966,28 @@ public static final class DangerSenseEffectProperties {
@DoubleRange(min = 0, max = 1)
public static double baseChanceToActivate = 0.035;
}

// TODO uncomment this when we get temporal dilation working
// @Category(id = "temporalDilationEffectProperties", translation = "config.arcanuscontinuum.temporalDilationEffectProperties", sortOrder = 7)
public static final class TemporalDilationEffectProperties {
@ConfigEntry(id = "enabled", type = EntryType.BOOLEAN, translation = "config.arcanuscontinuum.enabled")
public static boolean enabled = false;

@ConfigEntry(id = "weight", type = EntryType.ENUM, translation = "config.arcanuscontinuum.weight")
public static Weight weight = Weight.NONE;

@ConfigEntry(id = "manaCost", type = EntryType.DOUBLE, translation = "config.arcanuscontinuum.manaCost")
@DoubleRange(min = 0, max = 200)
public static double manaCost = 8;

@ConfigEntry(id = "coolDown", type = EntryType.INTEGER, translation = "config.arcanuscontinuum.coolDown")
@IntRange(min = 0, max = 24000)
public static int coolDown = 0;

@ConfigEntry(id = "minimumLevel", type = EntryType.INTEGER, translation = "config.arcanuscontinuum.minimumLevel")
@IntRange(min = 1, max = 10)
public static int minimumLevel = 10;
}
}

@Category(id = "utilityEffectsCategory", translation = "config.arcanuscontinuum.utilityEffectsCategory", sortOrder = 3)
Expand Down
Loading

0 comments on commit 44917bd

Please sign in to comment.