From 360adf3fe718f6fb043e3e5fad56651864d12d95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20J=C3=A4mtner?= <hanja189@student.liu.se>
Date: Wed, 15 Jul 2020 16:34:21 +0200
Subject: [PATCH] Correct value for techtree and update on docs started
---
docs/conf.py | 2 +-
docs/types.rst | 10 +++++++++-
src/TechTree.cpp | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 8b78124b4..a5b0d56b4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,7 +13,7 @@
# documentation root, use os.path.abspath to make it absolute, like shown here.
import sys,os
-sys.path.append(os.path.join(os.getcwd(), "..", "build", "python-api-src"))
+sys.path.append(os.path.join(os.getcwd(), "..", "build", "python-api-src", "Release"))
# -- Project information -----------------------------------------------------
diff --git a/docs/types.rst b/docs/types.rst
index a53e024d9..748acf595 100644
--- a/docs/types.rst
+++ b/docs/types.rst
@@ -6,7 +6,7 @@ For more information about a certain unit type, the wrapper class
:class:`library.UnitType` can be used.
For a full list of all abilities and upgrades, see :class:`library.ABILITY_ID`
-and :class:`library.UPGRADE_ID` respectively. Note that these does not have any
+, :class:`library.UPGRADE_ID` and :class:`library.EFFECT_ID` respectively. Note that these does not have any
wrapper classes for them.
UnitType
@@ -40,3 +40,11 @@ UPGRADE_ID
.. autoclass:: library.UPGRADE_ID
:members:
:undoc-members:
+
+EFFECT_ID
+----------
+
+.. autoclass:: library.EFFECT_ID
+ :members:
+ :undoc-members:
+
diff --git a/src/TechTree.cpp b/src/TechTree.cpp
index 68e6e20de..aca2be4e7 100644
--- a/src/TechTree.cpp
+++ b/src/TechTree.cpp
@@ -263,7 +263,7 @@ void TechTree::initUpgradeData()
m_upgradeData[sc2::UPGRADE_ID::HIGHCAPACITYBARRELS] = { sc2::Race::Terran, 150, 150, 0, 1760, false, false, false, false, false, false, false, sc2::ABILITY_ID::RESEARCH_INFERNALPREIGNITER, 0, { UnitType(sc2::UNIT_TYPEID::TERRAN_SCV, m_bot) }, {}, {} };
m_upgradeData[sc2::UPGRADE_ID::HISECAUTOTRACKING] = { sc2::Race::Terran, 100, 100, 0, 1280, false, false, false, false, false, false, false, sc2::ABILITY_ID::RESEARCH_HISECAUTOTRACKING, 0, { UnitType(sc2::UNIT_TYPEID::TERRAN_ENGINEERINGBAY, m_bot) }, {}, {} };
m_upgradeData[sc2::UPGRADE_ID::LIBERATORAGRANGEUPGRADE] = { sc2::Race::Terran, 150, 150, 0, 1760, false, false, false, false, false, false, false, sc2::ABILITY_ID::RESEARCH_ADVANCEDBALLISTICS, 0, { UnitType(sc2::UNIT_TYPEID::TERRAN_STARPORTTECHLAB, m_bot) }, {}, {} };
- m_upgradeData[sc2::UPGRADE_ID::MAGFIELDLAUNCHERS] = { sc2::Race::Terran, 100, 100, 0, 1760, false, false, false, false, false, false, false, sc2::ABILITY_ID::RESEARCH_CYCLONERAPIDFIRELAUNCHERS, 0, { UnitType(sc2::UNIT_TYPEID::TERRAN_SCV, m_bot) }, {}, {} };
+ m_upgradeData[sc2::UPGRADE_ID::MAGFIELDLAUNCHERS] = { sc2::Race::Terran, 100, 100, 0, 1760, false, false, false, false, false, false, false, sc2::ABILITY_ID::RESEARCH_CYCLONELOCKONDAMAGE, 0, { UnitType(sc2::UNIT_TYPEID::TERRAN_SCV, m_bot) }, {}, {} };
m_upgradeData[sc2::UPGRADE_ID::MEDIVACINCREASESPEEDBOOST] = { sc2::Race::Terran, 100, 100, 0, 1280, false, false, false, false, false, false, false, sc2::ABILITY_ID::RESEARCH_HIGHCAPACITYFUELTANKS, 0, { UnitType(sc2::UNIT_TYPEID::TERRAN_SCV, m_bot) }, {}, {} };
m_upgradeData[sc2::UPGRADE_ID::NEOSTEELFRAME] = { sc2::Race::Terran, 100, 100, 0, 1760, false, false, false, false, false, false, false, sc2::ABILITY_ID::RESEARCH_NEOSTEELFRAME, 0, { UnitType(sc2::UNIT_TYPEID::TERRAN_ENGINEERINGBAY, m_bot) }, {}, {} };
m_upgradeData[sc2::UPGRADE_ID::PERSONALCLOAKING] = { sc2::Race::Terran, 150, 150, 0, 1920, false, false, false, false, false, false, false, sc2::ABILITY_ID::RESEARCH_PERSONALCLOAKING, 0, { UnitType(sc2::UNIT_TYPEID::TERRAN_GHOSTACADEMY, m_bot) }, {}, {} };
--
GitLab