Update patch 21.05.2023

ProjectCeleste · May 21, 2023 · 40a1239 · 40a1239
1 parent ee95fa8
commit 40a1239
Show file tree

Hide file tree

Showing 14 changed files with 211 additions and 197 deletions.
diff --git a/db/effects.js b/db/effects.js
@@ -188,6 +188,10 @@ export async function convertEffects(effects, civ, isAdvisor) {
     } else if (type === "MaximumRange" && e.action == "BurningAttack") {
       /*type = "MaximumRange"*/
       continue
+    } else if (type === "MaximumRange" && e.action == "Convert") {
+      type = "MaximumRangeConvert"
+    } else if (type === "MaximumRange" && e.action == "Convert2") {
+      continue
     } else if (type === "DamageArea") {
       type = e.action + "DamageArea"
     } else if (
@@ -246,9 +250,13 @@ export async function convertEffects(effects, civ, isAdvisor) {
 }
 
 export function addEffect(name) {
-  if (name.startsWith("Convert") && name !== "ConvertResist" && name !== "ConvertConvertableBuilding" && name !== "Convert2ConvertableBuilding") {
+  if ((name.startsWith("Convert")) && name !== "ConvertResist" && name !== "ConvertConvertableBuilding" && name !== "Convert2ConvertableBuilding") {
     addEffect(name.replace("Convert", "Chaos"))
   }
+  /*
+  if (name.startsWith("Chaos")) {
+    console.log(name)
+  }*/
   if (!effects[name]) {
     const template = getTemplate(name)
     effects[name] = {

diff --git a/db/units/convert-stats.js b/db/units/convert-stats.js
@@ -57,19 +57,24 @@ export async function convertUnitStats(unit) {
         stats["ConvertResist"] = 2
     }
     else if (unit.UnitType.includes('AbstractPriest') || 
-             unit.UnitType.includes('AbstractArtillery')) {
-              stats["ConvertResist"] = 2
-      }
+            unit.UnitType.includes('AbstractArtillery')) {
+            stats["ConvertResist"] = 2
+    }
     else if (unit.UnitType.includes("ConvertableInfantry") || 
-      unit.UnitType.includes("ConvertableCavalry") || 
-      unit.UnitType.includes("ConvertableSiege") || 
-      unit.UnitType.includes("ConvertableBuilding") || 
-      unit.UnitType.includes("StandardConvertable")) {
-        stats["ConvertResist"] = 1
-      }
+    unit.UnitType.includes("ConvertableCavalry") || 
+    unit.UnitType.includes("ConvertableSiege") || 
+    unit.UnitType.includes("ConvertableBuilding") || 
+    unit.UnitType.includes("StandardConvertable")) {
+      stats["ConvertResist"] = 1
+    }
     else {
-        stats["ConvertResist"] = 1000
-      }
+      stats["ConvertResist"] = 1000
+  }
+  if (unit.name === 'Eg_Spc_PriestSet' ) {
+    /*stats["ChaosStandardConvertable"] = 10*/
+    inactiveActions.push("MaximumRangeConvert")
+    inactiveActions.push("MaximumRangeConvert2")
+  }
 
 
   if (unit.MaxVelocity) {
@@ -538,7 +543,7 @@ function convertTactic(tactic, stats, inactiveActions) {
     case "Convert": {
       if (tactic.anim === "Chaos") {
         stats.ChaosStandardConvertable = stats.ConvertStandardConvertable
-        delete stats.ConvertStandardConvertable
+        /*delete stats.ConvertStandardConvertable*/
         if (stats.ConvertConvertableCavalry !== undefined) {
           stats.ChaosConvertableCavalry = stats.ConvertConvertableCavalry
           delete stats.ConvertConvertableCavalry

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-05-20T12:22:45.572Z</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-05-21T19:53:46.760Z</lastmod><changefreq>weekly</changefreq><priority>1.0</priority></url></urlset>
diff --git a/src/components/Unit.vue b/src/components/Unit.vue
@@ -43,13 +43,13 @@
           <div v-for="type in selection.unit.types" :key="type">
             <div v-if="type.indexOf('UnitType') > -1"></div>
             <div v-else-if="type.indexOf('AbstractPriest') > -1">
-              <div v-if="selection.unit.stats.ConvertStandardConvertable > 0">
-                Converting Priest
+              <div v-if="selection.unit.stats.ChaosStandardConvertable > 0">
+                Chaos Priest
               </div>
               <div
-                v-else-if="selection.unit.stats.ChaosStandardConvertable > 0"
+                v-else-if="selection.unit.stats.ConvertStandardConvertable > 0"
               >
-                Chaos Priest
+                Converting Priest
               </div>
               <div v-else>
                 Non-Converting Priest

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/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_tactics.json b/src/gamedb_data/source_tactics.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/styles/sprites/_upgrades.scss b/src/styles/sprites/_upgrades.scss