Fix rune socket matching and align magic server defaults

src/main/java/net/tfminecraft/magic/gear/GearCache.java

@@ -14,7 +14,7 @@ public final class GearCache {
     public static boolean alignmentEnabled = false;
 
     /** When false, gem socket colour strings omit Common/Rare/Epic/Legendary prefix. */
-    public static boolean socketRarityPrefix = true;
+    public static boolean socketRarityPrefix = false;
 
     /** Weapon tier band in the spell's element -> bonus. Never a penalty. */
     private static final Map<Integer, ModifierTriple> ALIGNMENT = new LinkedHashMap<>();

src/main/java/net/tfminecraft/magic/loader/ConfigLoader.java

@@ -173,7 +173,7 @@ private static void loadGear(ConfigurationSection section) {
         long confirm = section.getLong("confirm_seconds", 5L);
         net.tfminecraft.magic.gear.GearCache.confirmMillis = Math.max(1L, confirm) * 1000L;
         net.tfminecraft.magic.gear.GearCache.socketRarityPrefix =
-                section.getBoolean("socket_rarity_prefix", true);
+                section.getBoolean("socket_rarity_prefix", false);
         loadAlignment(section.getConfigurationSection("alignment"));
     }
 

src/main/resources/config.yml

@@ -28,12 +28,13 @@ equilibrium:
     0:   { mana: 0, damage: 0, cooldown: 0 }
     100: { mana: -0.20, damage: 0.25, cooldown: -0.05 }
 
-# Runes: MMOItems type ids (item-types.yml) that /magic rune keybind can rebind.
-# keybinds: triggers a rune can be set to. The cast listener also treats them as a
-# spell, besides CAST and API. A weapon still has to be attuned to the spell's element.
+# School rune MMOItems type ids (item-types.yml) that /magic rune keybind can rebind.
 runes:
   types:
-    - GEM_STONE
+    - CERRITH_RUNES
+    - OSENI_RUNES
+    - SEITHR_RUNES
+    - MITLAN_RUNES
   keybinds:
     - RIGHT_CLICK
     - LEFT_CLICK
@@ -109,7 +110,7 @@ gear:
 
   # When false, rune socket colours use only the archetype suffix (e.g. "Minor Rune")
   # without the band prefix (Common / Rare / Epic / Legendary). Band still gates attunement.
-  socket_rarity_prefix: true
+  socket_rarity_prefix: false
 
   # One-sided bonus for holding a weapon attuned to the element of the spell you cast.
   # Keyed by the weapon's tier band in that element. A weapon with no attunement in an
@@ -136,4 +137,3 @@ gear:
       mana: 0.00
       damage: 0.10
       cooldown: -0.10
-

src/main/resources/elements/elements.yml

@@ -1,111 +1,115 @@
 # Magic element catalog. Each element has a fixed GUI slot (0-53).
-# color is one "#rrggbb", or a list of hex stops for a gradient across the name.
 # Row 2: Spirit (20), Arcanum (22), Illusion (24)
 # Row 3 (third from bottom): Cerrith, Seithr, Oseni, Mitlan
 # Row 4 (second from bottom): Shadowmancy, Necromancy, Bloodmagic
 
 cerrith:
-  name: Cerrith
-  icon: m.cerrith_runes.rune_of_cerrith_glyph
-  color: "#466629"
+  name: "Cerrith"
+  icon: m.icons.cerrith_rune
+  color:
+    - "#466629"
   slot: 28
   aura_decay_per_hour: 0
   resonance:
     0:   { mana: 0.20, damage: -0.20, cooldown: 0.20 }
     100: { mana: -0.20, damage: 0.20, cooldown: -0.20 }
 
 seithr:
-  name: Seithr
-  icon: m.seithr_runes.rune_of_cold_embrace
-  color: "#15E5FF"
+  name: "Seithr"
+  icon: m.icons.seithr_rune
+  color:
+    - "#15E5FF"
   slot: 30
   aura_decay_per_hour: 0
   resonance:
     0:   { mana: 0.20, damage: -0.20, cooldown: 0.20 }
     100: { mana: -0.20, damage: 0.20, cooldown: -0.20 }
 
 oseni:
-  name: Oseni
-  icon: m.oseni_runes.rune_of_oseni_glyph
-  color: "#e29a00"
+  name: "Oseni"
+  icon: m.icons.oseni_rune
+  color:
+    - "#e29a00"
   slot: 32
   aura_decay_per_hour: 0
   resonance:
     0:   { mana: 0.20, damage: -0.20, cooldown: 0.20 }
     100: { mana: -0.20, damage: 0.20, cooldown: -0.20 }
 
 mitlan:
-  name: Mitlan
-  icon: v.LAPIS_LAZULI
-  color: "#5555ff"
+  name: "Mitlan"
+  icon: m.icons.mitlan_rune
+  color:
+    - "#3b8268"
   slot: 34
   aura_decay_per_hour: 0
   resonance:
     0:   { mana: 0.20, damage: -0.20, cooldown: 0.20 }
     100: { mana: -0.20, damage: 0.20, cooldown: -0.20 }
 
 shadowmancy:
-  name: Shadowmancy
-  icon: v.INK_SAC
-  color: "#555555"
+  name: "Shadowmancy"
+  icon: m.icons.shadowmancy_rune
+  color:
+    - "#716f6f"
   slot: 40
-  permission: magic.shadowmancy
   aura_decay_per_hour: 0
   resonance:
     0:   { mana: 0.20, damage: -0.20, cooldown: 0.20 }
     100: { mana: -0.20, damage: 0.20, cooldown: -0.20 }
 
 necromancy:
-  name: Necromancy
-  icon: v.WITHER_SKELETON_SKULL
-  color: "#00aaaa"
+  name: "Necromancy"
+  icon: m.icons.necromancy_rune
+  color:
+    - "#aa00aa"
   slot: 38
-  permission: magic.necromancy
   aura_decay_per_hour: 0
   resonance:
     0:   { mana: 0.20, damage: -0.20, cooldown: 0.20 }
     100: { mana: -0.20, damage: 0.20, cooldown: -0.20 }
 
 arcanum:
-  name: Arcanum
-  icon: v.ENCHANTED_BOOK
-  color: "#aa00aa"
+  name: "Arcanum"
+  icon: m.icons.arcanum_rune
+  color:
+    - "#c471ed"
   slot: 22
-  permission: magic.arcanum
   decay_per_hour: -0.035
   aura_decay_per_hour: 0
   resonance:
     0:   { mana: 0.20, damage: -0.20, cooldown: 0.20 }
     100: { mana: -0.20, damage: 0.20, cooldown: -0.20 }
 
 spirit:
-  name: Spirit
-  icon: v.FEATHER
-  color: "#e8d5a3"
+  name: "Spirit"
+  icon: m.icons.spiritual_rune
+  color:
+    - "#67b26f"
   slot: 20
-  permission: magic.spirit
   aura_decay_per_hour: 0
   resonance:
     0:   { mana: 0.20, damage: -0.20, cooldown: 0.20 }
     100: { mana: -0.20, damage: 0.20, cooldown: -0.20 }
 
 illusion:
-  name: Illusion
-  icon: v.ENDER_PEARL
-  color: "#e070b0"
+  name: "Illusion"
+  icon: m.icons.illusion_rune
+  color:
+    - "#feac5e"
   slot: 24
-  permission: magic.illusion
   aura_decay_per_hour: 0
   resonance:
     0:   { mana: 0.20, damage: -0.20, cooldown: 0.20 }
     100: { mana: -0.20, damage: 0.20, cooldown: -0.20 }
 
 bloodmagic:
-  name: Bloodmagic
-  icon: v.REDSTONE
-  color: "#aa0000"
-  slot: 42
+  name: "Bloodmagic"
   permission: magic.bloodmagic
+  icon: m.icons.bloodmagic_rune
+  color:
+    - "#d10202"
+  slot: 42
   aura_decay_per_hour: 0
   resonance:
     0:   { mana: 0.20, damage: -0.20, cooldown: 0.20 }

src/main/resources/gear/archetypes.yml

@@ -1,12 +1,12 @@
 # Mage weapon archetypes. Templates are TLibs MMOItems paths Fran owns.
 # slots: id -> TLibs colour suffix. Prefix comes from socket-colours.yml.
-# Colour written = "{prefix} {suffix}", e.g. "Rare Staff Projectile Rune".
+# By default only the suffix is written, matching the school runes' gem-color.
 # icon: ItemRef path for picker/assembly GUIs (v.MATERIAL, m.TYPE.ID, ia.namespace:id).
 
 staff:
   name: Staff
   template: m.mage_staffs.mage_custom_staff
-  icon: v.STICK
+  icon: m.mage_staffs.mage_custom_staff
   melee: false
   required:
     - core
@@ -23,7 +23,7 @@ staff:
 wand:
   name: Wand
   template: m.mage_wands.mage_custom_wand
-  icon: v.BLAZE_ROD
+  icon: m.mage_wands.mage_custom_wand
   melee: false
   required:
     - core
@@ -38,7 +38,7 @@ wand:
 sword:
   name: Sword
   template: m.mage_swords.mage_custom_sword
-  icon: v.IRON_SWORD
+  icon: m.mage_swords.mage_custom_sword
   melee: true
   required:
     - core

src/main/resources/gear/orbs.yml

@@ -49,7 +49,7 @@ rift:
   # Removed once when a later charge completes. Never applied on the first charge.
   per_recharge: 10
 
-# live: max orbs in the air at once
+# live: max orbs in the air at once. The opening set, including rift orbs, spawns within spawn_burst_ticks.
 # good_ratio: chance a spawned orb is good
 # speed: angular speed multiplier
 # good_target: good hits needed for a full capture
@@ -67,14 +67,14 @@ tiers:
     window_ticks: 260
     good_target: 5
   3:
-    live: 6
+    live: 5
     good_ratio: 0.55
     speed: 1.15
     window_ticks: 240
-    good_target: 6
+    good_target: 5
   4:
-    live: 8
-    good_ratio: 0.45
+    live: 5
+    good_ratio: 0.50
     speed: 1.3
-    window_ticks: 220
-    good_target: 8
+    window_ticks: 260
+    good_target: 6

src/main/resources/gear/part-types.yml

@@ -11,7 +11,7 @@ tome:
   name: Tome
 tome2:
   slot: 13
-  name: Tome2
+  name: Tome II
 tome3:
   slot: 14
-  name: Tome3
+  name: Tome III