Complete hero unit interpreter coverage

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/jassinterpreter/providers/UnitProvider.java

@@ -394,7 +394,9 @@ public ILconstBool IsHeroUnitId(ILconstInt unitId) {
         String rawcode = ObjectHelper.objectIdIntToString(unitId.getVal());
         return ILconstBool.instance(!rawcode.isEmpty() && Character.isUpperCase(rawcode.charAt(0)));
     }
-    public ILconstBool IsUnitIdType(ILconstInt unitId, IlConstHandle unitType) { return ILconstBool.FALSE; }
+    public ILconstBool IsUnitIdType(ILconstInt unitId, IlConstHandle unitType) {
+        return IsHeroUnitId(unitId);
+    }
 
     public ILconstBool UnitAddType(IlConstHandle unit, IlConstHandle unitType) {
         UnitMock unitMock = unitOrNull(unit);
@@ -594,7 +596,13 @@ public ILconstBool UnitStripHeroLevel(IlConstHandle unit, ILconstInt levels) {
     public ILconstString GetHeroProperName(IlConstHandle unit) { return GetUnitName(unit); }
     public void SuspendHeroXP(IlConstHandle unit, ILconstBool flag) { UnitMock m = unitOrNull(unit); if (m != null) m.suspendedXp = flag.getVal(); }
     public ILconstBool IsSuspendedXP(IlConstHandle unit) { UnitMock m = unitOrNull(unit); return ILconstBool.instance(m != null && m.suspendedXp); }
-    public void SelectHeroSkill(IlConstHandle unit, ILconstInt abilityId) { UnitAddAbility(unit, abilityId); }
+    public void SelectHeroSkill(IlConstHandle unit, ILconstInt abilityId) {
+        UnitMock m = unitOrNull(unit);
+        if (m == null || m.skillPoints.getVal() <= 0) return;
+        int level = m.abilityLevels.getOrDefault(abilityId.getVal(), ILconstInt.create(0)).getVal();
+        m.abilityLevels.put(abilityId.getVal(), ILconstInt.create(level + 1));
+        m.skillPoints = ILconstInt.create(m.skillPoints.getVal() - 1);
+    }
 
     public ILconstBool ReviveHero(IlConstHandle unit, ILconstReal x, ILconstReal y, ILconstBool doEyeCandy) {
         UnitMock m = unitOrNull(unit);

de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/InterpreterTests.java

@@ -118,6 +118,8 @@ public void unitStateAbilityAndOrderNatives() {
             "        testFail(\"type\")",
             "    if not IsHeroUnitId('Hpal') or IsHeroUnitId('hfoo')",
             "        testFail(\"hero id\")",
+            "    if not IsUnitIdType('Hpal', UNIT_TYPE_HERO)",
+            "        testFail(\"hero type\")",
             "    if GetUnitX(u) != 12.5",
             "        testFail(\"x\")",
             "    if GetUnitY(u) != -3.25",
@@ -151,6 +153,11 @@ public void unitStateAbilityAndOrderNatives() {
             "        testFail(\"remove ability\")",
             "    if GetUnitAbilityLevel(u, 'Afoo') != 0",
             "        testFail(\"ability removed\")",
+            "    UnitModifySkillPoints(u, 2)",
+            "    SelectHeroSkill(u, 'Afoo')",
+            "    SelectHeroSkill(u, 'Afoo')",
+            "    if GetUnitAbilityLevel(u, 'Afoo') != 2 or GetHeroSkillPoints(u) != 0",
+            "        testFail(\"hero skill\")",
             "    if not IssueImmediateOrderById(u, 851971)",
             "        testFail(\"immediate order\")",
             "    if GetUnitCurrentOrder(u) != 851971",