Update 27.06.2023

ProjectCeleste · Jun 28, 2023 · 5a4a137 · 5a4a137
1 parent d408b10
commit 5a4a137
Show file tree

Hide file tree

Showing 19 changed files with 58 additions and 43 deletions.
diff --git a/db/effects.js b/db/effects.js
@@ -9,14 +9,14 @@ const ignoredEffects = [
   "Market",
   "TributePenalty",
   "UpdateVisual",
-  "CostBuildingTechs",
+  /*"CostBuildingTechs",*/
   "CostBuildingAll",
   "ResourceTrickleRate",
   "Resource",
   "PopulationCapExtra"
 ]
 
-const ignoredTargets = ["TechAll"]
+/*const ignoredTargets = ["TechAll"]*/
 
 export async function convertEffects(effects, civ, isAdvisor) {
   if (!Array.isArray(effects)) {
@@ -56,7 +56,7 @@ export async function convertEffects(effects, civ, isAdvisor) {
           })
         }
       }
-      if (e.type === "Data") {
+      /*if (e.type === "Data") {
         if (e.status !== "obtainable" && isAdvisor && e.subtype === "Enable" && e.relativity === "Absolute") {
           const civs = ["greek","egyptian","celtic","persian","babylonian","roman","norse"]
     
@@ -76,7 +76,7 @@ export async function convertEffects(effects, civ, isAdvisor) {
             })
           }
         }
-      }
+      }*/
       continue
     }
 
@@ -222,8 +222,12 @@ export async function convertEffects(effects, civ, isAdvisor) {
     }
 
     if (e.target && e.target.type !== "Player") {
-      if (ignoredTargets.includes(e.target.type)) {
+      /*if (ignoredTargets.includes(e.target.type)) {
         continue
+      }*/
+      if (e.target.type === "TechAll") {
+        effect.target = e.target.type
+        addUnitType(e.target.type)
       }
       if (type === "ConvertConvertableBuilding") {
         effect.target = "Eg_Spc_PriestPtah"
@@ -1321,6 +1325,23 @@ const templates = {
     name: "Train Time 12x Age IV Gardens",
     icon: "BuildPoints",
     sort: 198
+  },
+  ResearchPoints: {
+    name: "Research Time",
+    icon: "BuildPoints",
+    sort: 199
+  },
+  CostBuildingTechs: {
+    name: "Tech Cost",
+    icon: "CostWood",
+    sort: 0,
+    lowerIsBetter: true
+  },
+  CostBuildingAll: {
+    name: "Tech Cost",
+    icon: "CostWood",
+    sort: 0,
+    lowerIsBetter: true
   }
 }
 

diff --git a/db/upgrades/build.js b/db/upgrades/build.js
@@ -151,11 +151,11 @@ async function convertUpgrade(tech, civ) {
 }
 
 function includeEffect(tech, effect) {
-  if (tech.name === "TechPhilosophy") {
+  /*if (tech.name === "TechPhilosophy") {
     if (effect.target === "Unit") {
       return false
     }
-  }
+  }*/
   return true
 }
 

diff --git a/public/assets/sprites/upgrades.webp b/public/assets/sprites/upgrades.webp
diff --git a/public/sitemap.xml b/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-06-25T19:48:09.310Z</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-06-28T22:56:49.014Z</lastmod><changefreq>weekly</changefreq><priority>1.0</priority></url></urlset>
diff --git a/server/gear.json b/server/gear.json
diff --git a/src/components/AdvisorSelector.vue b/src/components/AdvisorSelector.vue
@@ -133,20 +133,6 @@ export default {
         rarity: this.selectedRarity,
         effects: rarity.effects.slice()
       }
-      /*if (advisor.rarities[0].effects[0]) {
-        if (advisor.rarities[0].effects[0].type === "AdvisorUniqueUnit") {
-          const units = civs[this.civ]
-          const unit = findByAttribute(
-            units,
-            "id",
-            advisor.rarities[0].effects[0].tech
-          )
-          if (unit) {
-            console.log(unit)
-            this.$emit("advisorUnit", unit)
-          }
-        }
-      }*/
       this.$emit("update:modelValue", a)
     },
     onRaritySelected(r) {

diff --git a/src/components/Unit.vue b/src/components/Unit.vue
@@ -151,6 +151,7 @@
         :civ="selection.civ"
         :unlocked-tech="unlockedTech"
         class="card-content"
+        :milestones-selection="milestones"
       />
     </Collapse>
     <Collapse v-if="selection.unit.name !== 'None'" title="Stats">

diff --git a/src/components/UpgradeSelector.vue b/src/components/UpgradeSelector.vue
@@ -48,7 +48,13 @@ export default {
     },
     civ: { type: String, required: true },
     unit: { type: Object, required: true },
-    unlockedTech: { type: Array, default: () => [] }
+    unlockedTech: { type: Array, default: () => [] },
+    milestonesSelection: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
   },
   emits: ["update:modelValue"],
   data() {

diff --git a/src/data/advisors.json b/src/data/advisors.json
diff --git a/src/data/effects.json b/src/data/effects.json
diff --git a/src/data/gear.json b/src/data/gear.json
diff --git a/src/data/milestones.json b/src/data/milestones.json
diff --git a/src/data/units.json b/src/data/units.json
diff --git a/src/data/upgrades.json b/src/data/upgrades.json
diff --git a/src/gamedb_data/source_stringtablexEnglish.json b/src/gamedb_data/source_stringtablexEnglish.json
diff --git a/src/gamedb_data/source_techtree.json b/src/gamedb_data/source_techtree.json
diff --git a/src/gamedb_data/source_units.json b/src/gamedb_data/source_units.json
diff --git a/src/gamedb_data/source_vendors.json b/src/gamedb_data/source_vendors.json
diff --git a/src/styles/sprites/_upgrades.scss b/src/styles/sprites/_upgrades.scss
@@ -156,7 +156,7 @@
 .sprite--upgrades--NFjxMIyn{ background-position: 71.428571% 76.923077% !important; }
 .sprite--upgrades--QUr2Lq3Y{ background-position: 71.428571% 84.615385% !important; }
 .sprite--upgrades--uhuyodXf{ background-position: 71.428571% 92.307692% !important; }
-.sprite--upgrades--YGOIE7Kj{ background-position: 71.428571% 100% !important; }
+.sprite--upgrades--Yef5qaQH{ background-position: 71.428571% 100% !important; }
 .sprite--upgrades--Nmboo2Lf{ background-position: 78.571429% 0 !important; }
 .sprite--upgrades--nrnjskqR{ background-position: 78.571429% 7.692308% !important; }
 .sprite--upgrades--nUocJvP3{ background-position: 78.571429% 15.384615% !important; }
@@ -170,7 +170,7 @@
 .sprite--upgrades--p1SUwX4H{ background-position: 78.571429% 76.923077% !important; }
 .sprite--upgrades--Raor0JgI{ background-position: 78.571429% 84.615385% !important; }
 .sprite--upgrades--uKNLhmFl{ background-position: 78.571429% 92.307692% !important; }
-.sprite--upgrades--YHb9m6Qz{ background-position: 78.571429% 100% !important; }
+.sprite--upgrades--YGOIE7Kj{ background-position: 78.571429% 100% !important; }
 .sprite--upgrades--RBE53Rek{ background-position: 85.714286% 0 !important; }
 .sprite--upgrades--rD83VqgF{ background-position: 85.714286% 7.692308% !important; }
 .sprite--upgrades--reGx5UNC{ background-position: 85.714286% 15.384615% !important; }
@@ -184,7 +184,7 @@
 .sprite--upgrades--syq6Yu3N{ background-position: 85.714286% 76.923077% !important; }
 .sprite--upgrades--te0WBseg{ background-position: 85.714286% 84.615385% !important; }
 .sprite--upgrades--UMYJ0JRe{ background-position: 85.714286% 92.307692% !important; }
-.sprite--upgrades--yHjyqBT8{ background-position: 85.714286% 100% !important; }
+.sprite--upgrades--YHb9m6Qz{ background-position: 85.714286% 100% !important; }
 .sprite--upgrades--Uvk4eRrI{ background-position: 92.857143% 0 !important; }
 .sprite--upgrades--uXP60iSG{ background-position: 92.857143% 7.692308% !important; }
 .sprite--upgrades--V8vcBeDb{ background-position: 92.857143% 15.384615% !important; }
@@ -198,9 +198,10 @@
 .sprite--upgrades--WbwcXabG{ background-position: 92.857143% 76.923077% !important; }
 .sprite--upgrades--wLxvZGpr{ background-position: 92.857143% 84.615385% !important; }
 .sprite--upgrades--wZ8RUgmu{ background-position: 92.857143% 92.307692% !important; }
-.sprite--upgrades--yL3us2gq{ background-position: 92.857143% 100% !important; }
-.sprite--upgrades--ZccRAv7i{ background-position: 100% 0 !important; }
-.sprite--upgrades--ZCfj2VJz{ background-position: 100% 7.692308% !important; }
-.sprite--upgrades--zCUr3nNd{ background-position: 100% 15.384615% !important; }
-.sprite--upgrades--ZiuOOxeb{ background-position: 100% 23.076923% !important; }
-.sprite--upgrades--zxV06lX8{ background-position: 100% 30.769231% !important; }
+.sprite--upgrades--yHjyqBT8{ background-position: 92.857143% 100% !important; }
+.sprite--upgrades--yL3us2gq{ background-position: 100% 0 !important; }
+.sprite--upgrades--ZccRAv7i{ background-position: 100% 7.692308% !important; }
+.sprite--upgrades--ZCfj2VJz{ background-position: 100% 15.384615% !important; }
+.sprite--upgrades--zCUr3nNd{ background-position: 100% 23.076923% !important; }
+.sprite--upgrades--ZiuOOxeb{ background-position: 100% 30.769231% !important; }
+.sprite--upgrades--zxV06lX8{ background-position: 100% 38.461538% !important; }