Merge branch 'main' into farm,-resource,-monastary-assets

Author: coleshin27

.claude/scheduled_tasks.lock

@@ -0,0 +1 @@
+{"sessionId":"fe18cf3c-f8f6-453b-ab10-ed27610bef8e","pid":62175,"procStart":"Fri Apr 24 18:52:49 2026","acquiredAt":1777171150784}

Open Empires/Assets/Scripts/Buildings/BuildingData.cs

@@ -30,16 +30,9 @@ public enum BuildingType
 
     public enum TechnologyType
     {
-        // Blacksmith (Age 2)
-        MeleeAttack1,       // +1 melee attack
-        MeleeArmor1,        // +1 melee armor
-        RangedAttack1,      // +1 ranged attack
-        RangedArmor1,       // +1 ranged armor
-        // Blacksmith (Age 3)
-        MeleeAttack2,       // +2 melee attack (cumulative)
-        MeleeArmor2,        // +2 melee armor
-        RangedAttack2,      // +2 ranged attack
-        RangedArmor2,       // +2 ranged armor
+        // Blacksmith
+        BlacksmithDamage,   // +N to both melee AND ranged attack
+        BlacksmithDefense,  // +N to both melee AND ranged armor
         // University (Age 3)
         Ballistics,         // Projectiles lead targets
         SiegeEngineering,   // +40 siege unit HP

Open Empires/Assets/Scripts/Buildings/BuildingView.cs

@@ -1186,7 +1186,10 @@ private void UpdateBuildingOverlayUI()
 
             bool damaged = buildingData.CurrentHealth < buildingData.MaxHealth;
             bool training = buildingData.IsTraining;
-            bool upgrading = buildingData.Type == BuildingType.Tower && buildingData.IsUpgrading;
+            // Reuse the upgrade-bar widget for both Tower upgrades AND research progress
+            // (Blacksmith / University). Single visual, two underlying systems.
+            bool towerUpgrading = buildingData.Type == BuildingType.Tower && buildingData.IsUpgrading;
+            bool upgrading = towerUpgrading || buildingData.IsResearching;
 
             // Check influence periodically (not every frame)
             if (--influenceCheckCooldown <= 0)
@@ -1312,20 +1315,25 @@ private void UpdateBuildingOverlayUI()
                     queueContainer.gameObject.SetActive(false);
             }
 
-            // Upgrade bar
+            // Upgrade bar — drives off whichever progress source is active.
             if (upgrading)
             {
                 if (!upgradeBarGO.activeSelf)
                     upgradeBarGO.SetActive(true);
 
-                float upgradeFraction = Mathf.Clamp01(buildingData.UpgradeProgress);
+                float upgradeFraction = towerUpgrading
+                    ? Mathf.Clamp01(buildingData.UpgradeProgress)
+                    : Mathf.Clamp01(buildingData.ResearchProgress);
                 upgradeFillRT.anchorMax = new Vector2(upgradeFraction, 1f);
 
-                bool showQueueCount = buildingData.UpgradeQueue.Count > 1;
+                int queueCount = towerUpgrading
+                    ? buildingData.UpgradeQueue.Count
+                    : buildingData.ResearchQueue.Count;
+                bool showQueueCount = queueCount > 1;
                 if (upgradeQueueText.gameObject.activeSelf != showQueueCount)
                     upgradeQueueText.gameObject.SetActive(showQueueCount);
                 if (showQueueCount)
-                    upgradeQueueText.text = $"Queue: {buildingData.UpgradeQueue.Count}";
+                    upgradeQueueText.text = $"Queue: {queueCount}";
             }
             else
             {

Open Empires/Assets/Scripts/Buildings/ResearchSystem.cs

@@ -62,16 +62,9 @@ public static int GetResearchTicks(SimulationConfig config, TechnologyType tech)
         {
             switch (tech)
             {
-                case TechnologyType.MeleeAttack1:
-                case TechnologyType.MeleeArmor1:
-                case TechnologyType.RangedAttack1:
-                case TechnologyType.RangedArmor1:
-                    return config.ResearchTicks_Age2;
-                case TechnologyType.MeleeAttack2:
-                case TechnologyType.MeleeArmor2:
-                case TechnologyType.RangedAttack2:
-                case TechnologyType.RangedArmor2:
-                    return config.ResearchTicks_Age3;
+                case TechnologyType.BlacksmithDamage:
+                case TechnologyType.BlacksmithDefense:
+                    return config.ResearchTicks_Age3;       // longer than Age 2; tuned for the consolidated +2 bonus
                 case TechnologyType.Ballistics:
                 case TechnologyType.SiegeEngineering:
                 case TechnologyType.Chemistry:

Open Empires/Assets/Scripts/Core/GameSimulation.cs

@@ -2015,29 +2015,12 @@ private void ApplyTechnologyToUnits(int playerId, TechnologyType tech)
 
                 switch (tech)
                 {
-                    case TechnologyType.MeleeAttack1:
-                        if (!unit.IsRanged) unit.AttackDamage += config.MeleeAttackBonus1;
+                    case TechnologyType.BlacksmithDamage:
+                        unit.AttackDamage += config.BlacksmithDamageBonus;
                         break;
-                    case TechnologyType.MeleeAttack2:
-                        if (!unit.IsRanged) unit.AttackDamage += config.MeleeAttackBonus2;
-                        break;
-                    case TechnologyType.RangedAttack1:
-                        if (unit.IsRanged) unit.AttackDamage += config.RangedAttackBonus1;
-                        break;
-                    case TechnologyType.RangedAttack2:
-                        if (unit.IsRanged) unit.AttackDamage += config.RangedAttackBonus2;
-                        break;
-                    case TechnologyType.MeleeArmor1:
-                        unit.MeleeArmor += config.MeleeArmorBonus1;
-                        break;
-                    case TechnologyType.MeleeArmor2:
-                        unit.MeleeArmor += config.MeleeArmorBonus2;
-                        break;
-                    case TechnologyType.RangedArmor1:
-                        unit.RangedArmor += config.RangedArmorBonus1;
-                        break;
-                    case TechnologyType.RangedArmor2:
-                        unit.RangedArmor += config.RangedArmorBonus2;
+                    case TechnologyType.BlacksmithDefense:
+                        unit.MeleeArmor += config.BlacksmithDefenseBonus;
+                        unit.RangedArmor += config.BlacksmithDefenseBonus;
                         break;
                     case TechnologyType.Chemistry:
                         if (unit.IsRanged) unit.AttackDamage += config.ChemistryRangedBonus;
@@ -2056,39 +2039,6 @@ public bool HasTechnology(int playerId, TechnologyType tech)
             return playerTechnologies[playerId].Contains(tech);
         }
 
-        public int GetMeleeAttackBonus(int playerId)
-        {
-            int bonus = 0;
-            if (HasTechnology(playerId, TechnologyType.MeleeAttack1)) bonus += config.MeleeAttackBonus1;
-            if (HasTechnology(playerId, TechnologyType.MeleeAttack2)) bonus += config.MeleeAttackBonus2;
-            return bonus;
-        }
-
-        public int GetRangedAttackBonus(int playerId)
-        {
-            int bonus = 0;
-            if (HasTechnology(playerId, TechnologyType.RangedAttack1)) bonus += config.RangedAttackBonus1;
-            if (HasTechnology(playerId, TechnologyType.RangedAttack2)) bonus += config.RangedAttackBonus2;
-            if (HasTechnology(playerId, TechnologyType.Chemistry)) bonus += config.ChemistryRangedBonus;
-            return bonus;
-        }
-
-        public int GetMeleeArmorBonus(int playerId)
-        {
-            int bonus = 0;
-            if (HasTechnology(playerId, TechnologyType.MeleeArmor1)) bonus += config.MeleeArmorBonus1;
-            if (HasTechnology(playerId, TechnologyType.MeleeArmor2)) bonus += config.MeleeArmorBonus2;
-            return bonus;
-        }
-
-        public int GetRangedArmorBonus(int playerId)
-        {
-            int bonus = 0;
-            if (HasTechnology(playerId, TechnologyType.RangedArmor1)) bonus += config.RangedArmorBonus1;
-            if (HasTechnology(playerId, TechnologyType.RangedArmor2)) bonus += config.RangedArmorBonus2;
-            return bonus;
-        }
-
         private void ProcessResearchCommand(ResearchCommand cmd)
         {
             if (cmd.PlayerId < 0 || cmd.PlayerId >= playerCount) return;
@@ -2099,22 +2049,14 @@ private void ProcessResearchCommand(ResearchCommand cmd)
 
             var tech = (TechnologyType)cmd.TechType;
 
-            // Already researched or queued
             if (playerTechnologies[cmd.PlayerId].Contains(tech)) return;
             if (building.ResearchQueue.Contains(tech)) return;
 
-            // Check building type matches tech
             bool validBuilding = false;
             switch (tech)
             {
-                case TechnologyType.MeleeAttack1:
-                case TechnologyType.MeleeArmor1:
-                case TechnologyType.RangedAttack1:
-                case TechnologyType.RangedArmor1:
-                case TechnologyType.MeleeAttack2:
-                case TechnologyType.MeleeArmor2:
-                case TechnologyType.RangedAttack2:
-                case TechnologyType.RangedArmor2:
+                case TechnologyType.BlacksmithDamage:
+                case TechnologyType.BlacksmithDefense:
                     validBuilding = building.Type == BuildingType.Blacksmith;
                     break;
                 case TechnologyType.Ballistics:
@@ -2126,17 +2068,9 @@ private void ProcessResearchCommand(ResearchCommand cmd)
             }
             if (!validBuilding) return;
 
-            // Age requirement: tier 2 techs need age 3
             int reqAge = GetRequiredAgeForTech(tech);
             if (playerAges[cmd.PlayerId] < reqAge) return;
 
-            // Prerequisite: tier 2 requires tier 1
-            if (tech == TechnologyType.MeleeAttack2 && !playerTechnologies[cmd.PlayerId].Contains(TechnologyType.MeleeAttack1)) return;
-            if (tech == TechnologyType.MeleeArmor2 && !playerTechnologies[cmd.PlayerId].Contains(TechnologyType.MeleeArmor1)) return;
-            if (tech == TechnologyType.RangedAttack2 && !playerTechnologies[cmd.PlayerId].Contains(TechnologyType.RangedAttack1)) return;
-            if (tech == TechnologyType.RangedArmor2 && !playerTechnologies[cmd.PlayerId].Contains(TechnologyType.RangedArmor1)) return;
-
-            // Check cost
             var resources = ResourceManager.GetPlayerResources(cmd.PlayerId);
             int foodCost, goldCost;
             GetResearchCost(tech, out foodCost, out goldCost);
@@ -2153,10 +2087,8 @@ private int GetRequiredAgeForTech(TechnologyType tech)
         {
             switch (tech)
             {
-                case TechnologyType.MeleeAttack1:
-                case TechnologyType.MeleeArmor1:
-                case TechnologyType.RangedAttack1:
-                case TechnologyType.RangedArmor1:
+                case TechnologyType.BlacksmithDamage:
+                case TechnologyType.BlacksmithDefense:
                     return 2;
                 default:
                     return 3;
@@ -2168,14 +2100,8 @@ private void GetResearchCost(TechnologyType tech, out int food, out int gold)
             food = 0;
             switch (tech)
             {
-                case TechnologyType.MeleeAttack1: gold = config.MeleeAttack1Cost; break;
-                case TechnologyType.MeleeArmor1: gold = config.MeleeArmor1Cost; break;
-                case TechnologyType.RangedAttack1: gold = config.RangedAttack1Cost; break;
-                case TechnologyType.RangedArmor1: gold = config.RangedArmor1Cost; break;
-                case TechnologyType.MeleeAttack2: gold = config.MeleeAttack2Cost; break;
-                case TechnologyType.MeleeArmor2: gold = config.MeleeArmor2Cost; break;
-                case TechnologyType.RangedAttack2: gold = config.RangedAttack2Cost; break;
-                case TechnologyType.RangedArmor2: gold = config.RangedArmor2Cost; break;
+                case TechnologyType.BlacksmithDamage: gold = config.BlacksmithDamageCost; break;
+                case TechnologyType.BlacksmithDefense: gold = config.BlacksmithDefenseCost; break;
                 case TechnologyType.Ballistics: food = config.BallisticsFoodCost; gold = config.BallisticsGoldCost; break;
                 case TechnologyType.SiegeEngineering: food = config.SiegeEngineeringFoodCost; gold = config.SiegeEngineeringGoldCost; break;
                 case TechnologyType.Chemistry: food = config.ChemistryFoodCost; gold = config.ChemistryGoldCost; break;
@@ -5192,18 +5118,12 @@ private UnitData CreateTrainedUnit(int playerId, int unitType, FixedVector3 spaw
                 {
                     switch (tech)
                     {
-                        case TechnologyType.MeleeAttack1:
-                            if (!unitData.IsRanged) unitData.AttackDamage += config.MeleeAttackBonus1; break;
-                        case TechnologyType.MeleeAttack2:
-                            if (!unitData.IsRanged) unitData.AttackDamage += config.MeleeAttackBonus2; break;
-                        case TechnologyType.RangedAttack1:
-                            if (unitData.IsRanged) unitData.AttackDamage += config.RangedAttackBonus1; break;
-                        case TechnologyType.RangedAttack2:
-                            if (unitData.IsRanged) unitData.AttackDamage += config.RangedAttackBonus2; break;
-                        case TechnologyType.MeleeArmor1: unitData.MeleeArmor += config.MeleeArmorBonus1; break;
-                        case TechnologyType.MeleeArmor2: unitData.MeleeArmor += config.MeleeArmorBonus2; break;
-                        case TechnologyType.RangedArmor1: unitData.RangedArmor += config.RangedArmorBonus1; break;
-                        case TechnologyType.RangedArmor2: unitData.RangedArmor += config.RangedArmorBonus2; break;
+                        case TechnologyType.BlacksmithDamage:
+                            unitData.AttackDamage += config.BlacksmithDamageBonus; break;
+                        case TechnologyType.BlacksmithDefense:
+                            unitData.MeleeArmor += config.BlacksmithDefenseBonus;
+                            unitData.RangedArmor += config.BlacksmithDefenseBonus;
+                            break;
                         case TechnologyType.Chemistry:
                             if (unitData.IsRanged) unitData.AttackDamage += config.ChemistryRangedBonus; break;
                         case TechnologyType.SiegeEngineering:

Open Empires/Assets/Scripts/Core/SimulationConfig.cs

@@ -508,14 +508,8 @@ public static int GetMapSize(int playerCount)
         public int ResearchTicks_Age3 => 900;       // 30s
         public int ResearchTicks_University => 750; // 25s
         // Blacksmith costs (gold)
-        public int MeleeAttack1Cost => 100;
-        public int MeleeArmor1Cost => 100;
-        public int RangedAttack1Cost => 100;
-        public int RangedArmor1Cost => 100;
-        public int MeleeAttack2Cost => 200;
-        public int MeleeArmor2Cost => 200;
-        public int RangedAttack2Cost => 200;
-        public int RangedArmor2Cost => 200;
+        public int BlacksmithDamageCost => 200;     // bumps both melee + ranged attack
+        public int BlacksmithDefenseCost => 200;    // bumps both melee + ranged armor
         // University costs (food + gold)
         public int BallisticsFoodCost => 200;
         public int BallisticsGoldCost => 200;
@@ -526,14 +520,8 @@ public static int GetMapSize(int playerCount)
         public int MurderHolesFoodCost => 100;
         public int MurderHolesGoldCost => 100;
         // Research bonuses
-        public int MeleeAttackBonus1 => 1;
-        public int MeleeAttackBonus2 => 2;
-        public int MeleeArmorBonus1 => 1;
-        public int MeleeArmorBonus2 => 2;
-        public int RangedAttackBonus1 => 1;
-        public int RangedAttackBonus2 => 2;
-        public int RangedArmorBonus1 => 1;
-        public int RangedArmorBonus2 => 2;
+        public int BlacksmithDamageBonus => 2;      // applied to both melee + ranged units
+        public int BlacksmithDefenseBonus => 2;     // applied to both melee + ranged armor on every military unit
         public int ChemistryRangedBonus => 1;
         public int SiegeEngineeringHPBonus => 40;