add caravan and fishing boat info

add caravan and fishing boat info

db/effects.js

@@ -563,7 +563,7 @@ const templates = {
   RangedAttackDamageArea: { name: "Ranged Splash Area", icon: "DamageArea", sort: 64 },
   MeleeAttackDamageArea: { name: "Melee Splash Area", icon: "DamageArea", sort: 39 },
   BurningAttackDamageArea: { name: "Burning Splash Area", icon: "DamageArea", sort: 98 },
-  RangedAttack2DamageArea: { name: "Special Building Ranged Splash Area", icon: "DamageArea", sort: 86 },
+  RangedAttack2DamageArea: { name: "Special Building Ranged Splash Area", icon: "DamageArea", sort: 153 },
   AreaDamageReduction: {
     name: "Splash Damage Reduction",
     icon: "AreaDamageReduction",
@@ -670,9 +670,9 @@ const templates = {
   MaximumRange2: {
     name: "Special Building Max Range",
     icon: "MaximumRange",
-    sort: 87
+    sort: 154
   },
-  MinimumRange: { name: "Minimum Range", icon: "MaximumRange", sort: 65 },
+  MinimumRange: { name: "Minimum Range", icon: "MaximumRange", sort: 65, lowerIsBetter: true },
   MaximumRangeConvert: {
     name: "Maximum Conversion Range",
     icon: "MaximumRange",
@@ -922,7 +922,7 @@ const templates = {
   DamageBonusBuildingRangedAttack2: {
     name: "Bonus vs. Building - Special Ranged",
     icon: "DamageBonusBuilding",
-    sort: 81
+    sort: 151
   },
   DamageBonusShip: {
     name: "Bonus vs. Ship",
@@ -1112,7 +1112,7 @@ const templates = {
   DamageSiegeRangedAttack2: {
     name: "Special Building Ranged Crush DPS",
     icon: "DamageSiege",
-    sort: 80
+    sort: 150
   },
   MaximumContained: {
     name: "Transport Capacity",
@@ -1351,6 +1351,41 @@ const templates = {
     icon: "CostWood",
     sort: 0,
     lowerIsBetter: true
+  },
+  CaravanGoldPerSec300: {
+    name: "Gold/Sec for Size 300m",
+    icon: "CostGold",
+    sort: 160
+  },
+  CaravanGoldPerSec500: {
+    name: "Gold/Sec for VOK 500m",
+    icon: "CostGold",
+    sort: 161
+  },
+  CaravanGoldPerSec300_50: {
+    name: "Gold/Sec Trade 50 & Size 300m",
+    icon: "CostGold",
+    sort: 163
+  },
+  CaravanGoldPerSec300_100: {
+    name: "Gold/Sec Trade 100 & Size 300m",
+    icon: "CostGold",
+    sort: 162
+  },
+  FishBoatTimeToFish: {
+    name: "Time to Fish",
+    icon: "BuildPoints",
+    sort: 25
+  },
+  FishBoatTimeToTravel_100Size: {
+    name: "Time to Travel from 100m",
+    icon: "BuildPoints",
+    sort: 26
+  },
+  FishBoatFishPerSec_100Size: {
+    name: "Food/Sec from 100m",
+    icon: "CostFood",
+    sort: 27
   }
 }
 

db/units/convert-stats.js

@@ -163,13 +163,30 @@ export async function convertUnitStats(unit) {
   addEffect("CostStone")
   addEffect("DamageBonusAbstractArtilleryRangedAttack")
   addEffect("MaxDmgMaxContained")
-
+  addEffect("CaravanGoldPerSec300")
+  addEffect("CaravanGoldPerSec500")
+  addEffect("CaravanGoldPerSec300_100")
+  addEffect("CaravanGoldPerSec300_50")
+  addEffect("FishBoatTimeToFish")
+  addEffect("FishBoatTimeToTravel_100Size")
+  addEffect("FishBoatFishPerSec_100Size")
 
   //Too much effort. I am going to just MeleeAttack the TA.
   if (unit.name === "No_Inf_ThrowingAxeman") {
     stats["DamageRanged"] = stats["DamageHand"]
     delete stats["DamageHand"]
   }
+  if (unit.name.endsWith("Civ_Caravan")) {
+    stats["CaravanGoldPerSec300"] = 1
+    stats["CaravanGoldPerSec500"] = 1
+    stats["CaravanGoldPerSec300_50"] = 1
+    stats["CaravanGoldPerSec300_100"] = 1
+  }
+  if (unit.name.endsWith("Civ_FishingBoat")) {
+    stats["FishBoatTimeToFish"] = 1
+    stats["FishBoatTimeToTravel_100Size"] = 1
+    stats["FishBoatFishPerSec_100Size"] = 1
+  }
 
   //Microsoft does some scaling up to lvl 40
   if (unit.UnitType.includes("UnitTypeVillager1")) {

public/sitemap.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"><url><loc>https://unitstats.projectceleste.com</loc><lastmod>2023-07-30T10:32:03.117Z</lastmod><changefreq>weekly</changefreq><priority>1.0</priority></url></urlset>
+<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"><url><loc>https://unitstats.projectceleste.com</loc><lastmod>2023-08-10T21:45:10.697Z</lastmod><changefreq>weekly</changefreq><priority>1.0</priority></url></urlset>

src/components/Stats.vue

@@ -158,6 +158,34 @@ export default {
         stats["Training_Garden8Age3"] = stats["TrainPoints"] * 0.730690205
         stats["Training_Garden12Age4"] = stats["TrainPoints"] * 0.556837418
       }
+      if (stats.CaravanGoldPerSec300) {
+        stats.CaravanGoldPerSec300 =
+          stats["CarryCapacityGold"] /
+          ((Math.sqrt((stats["CarryCapacityGold"] * 300) / stats["Trade"]) *
+            2) /
+            stats["MaximumVelocity"])
+        stats["CaravanGoldPerSec500"] =
+          stats["CarryCapacityGold"] /
+          ((Math.sqrt((stats["CarryCapacityGold"] * 500) / stats["Trade"]) *
+            2) /
+            stats["MaximumVelocity"])
+        stats["CaravanGoldPerSec300_50"] =
+          50 /
+          ((Math.sqrt((50 * 300) / stats["Trade"]) * 2) /
+            stats["MaximumVelocity"])
+        stats["CaravanGoldPerSec300_100"] =
+          100 /
+          ((Math.sqrt((100 * 300) / stats["Trade"]) * 2) /
+            stats["MaximumVelocity"])
+      }
+      if (stats.FishBoatTimeToFish) {
+        stats.FishBoatTimeToFish =
+          stats.CarryCapacityFood / stats.GatherAbstractFish
+        stats.FishBoatTimeToTravel_100Size = 200 / stats.MaximumVelocity
+        stats.FishBoatFishPerSec_100Size =
+          stats.CarryCapacityFood /
+          (stats.FishBoatTimeToFish + stats.FishBoatTimeToTravel_100Size)
+      }
 
       this.$store.commit("setUnitStats", { id: this.unitId, stats })
       return stats