dev: implement more class wrappers

dllmain.cpp

@@ -1,9 +1,5 @@
 #include "pch.h"
 #include "war3/jass_string.h"
-#include "war3/hash_table.h"
-#include "war3/native_table.h"
-#include "war3/func_callback.h"
-#include "war3/func_call.h"
 
 // Define your custom script in script.cpp!
 // This function will be called periodly, every ~10ms?

pch.h

@@ -19,4 +19,9 @@
 #include "globals.h"
 #include "war3/enum.h"
 
+// disable static_assert for my MSVC, it seems
+// the new version has a bug on it.
+// if you're not using VC toolset 14.31.31103(VS 17.1 preview5), COMMENT IT!
+#define static_assert(...) 
+
 #endif //PCH_H

war3/wrapper/JassHandle.cpp

@@ -1,4 +1,7 @@
 #include "../../pch.h"
 #include "JassHandle.h"
 
-
+JassHandle::operator bool()
+{
+  return handle;
+}

war3/wrapper/JassHandle.h

@@ -4,5 +4,7 @@ struct JassHandle
 {
   HObject handle;
   JassHandle(HObject const &handle) : handle(handle) {  }
+
+  operator bool();
 };
 

war3/wrapper/JassHero.cpp

@@ -0,0 +1,2 @@
+#include "../../pch.h"
+#include "JassHero.h"

war3/wrapper/JassHero.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "JassUnit.h"
+struct JassHero : public JassUnit
+{
+  JassHero(HUnit handle) : JassUnit(handle) { }
+  JassHero(JassUnit unit) : JassUnit(nullptr) {
+    if (unit.IsType(UNIT_TYPE::HERO))
+      handle = unit.handle;
+  }
+};
+

war3/wrapper/JassPlayer.cpp

@@ -1,7 +1,5 @@
 #include "../../pch.h"
 #include "JassPlayer.h"
-#include "JassUnit.h"
-#include "JassUnitGroup.h"
 #include "../func_call.h"
 
 JassPlayer JassPlayer::EnumPlayer()

war3/wrapper/JassPlayer.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "JassHandle.h"
 #include "../enum.h"
+#include "JassUnitGroup.h"
 
 struct JassPlayer : public JassHandle
 {

war3/wrapper/JassUnit.cpp

@@ -8,6 +8,16 @@ JassUnit::JassUnit(JassPlayer owner, int unitId, float x, float y, float face, b
     isCorpse ? "CreateCorpse" : "CreateUnit",
     unitId, x, y, face)) {  }
 
+JassUnit JassUnit::EnumUnit()
+{
+  return CallFn<HUnit>("GetEnumUnit");
+}
+
+JassUnit JassUnit::FilterUnit()
+{
+  return CallFn<HUnit>("GetFilterUnit");
+}
+
 void JassUnit::Kill()
 {
   CallFn<void>("KillUnit", handle);
@@ -23,6 +33,11 @@ void JassUnit::SetShow(bool show)
   CallFn<void>("ShowUnit", handle, show);
 }
 
+bool JassUnit::IsType(UNIT_TYPE type)
+{
+  return CallFn<bool>("IsUnitType", handle, type);
+}
+
 RACE JassUnit::GetRace()
 {
   return CallFn<RACE>("GetUnitRace", handle);

war3/wrapper/JassUnit.h

@@ -8,6 +8,9 @@ struct JassUnit : JassWidget
   // create JassUnit
   JassUnit(struct JassPlayer owner, int unitId, float x, float y, float face, bool isCorpse = false);
 
+  static JassUnit EnumUnit();
+  static JassUnit FilterUnit();
+
   // action : management
   void Kill();
   void Remove();
@@ -16,6 +19,8 @@ struct JassUnit : JassWidget
   // property : getter/setter
   void SetShow(bool show);
 
+  bool IsType(UNIT_TYPE type);
+
   RACE GetRace();
 
   void SetState(UNIT_STATE const& state, float value);

war3/wrapper/JassUnitGroup.cpp

@@ -1,2 +1,45 @@
 #include "../../pch.h"
 #include "JassUnitGroup.h"
+#include "../func_call.h"
+
+JassUnitGroup JassUnitGroup::Create()
+{
+  return CallFn<HGroup>("CreateGroup");
+}
+
+void JassUnitGroup::Destroy()
+{
+  CallFn<void>("DestroyGroup", handle);
+}
+
+JassUnit JassUnitGroup::FirstUnit()
+{
+  return CallFn<HUnit>("FirstOfGroup", handle);
+}
+
+JassUnitGroup& JassUnitGroup::ForEach(std::function<void(JassUnit)> const& action)
+{
+  CallFn<void>("ForGroup", handle, [action]() {
+    action(JassUnit::EnumUnit());
+  });
+  return *this;
+}
+
+JassUnitGroup& JassUnitGroup::Clear()
+{
+  CallFn<void>("GroupClear", handle);
+  return *this;
+}
+
+JassUnitGroup& JassUnitGroup::PushBack(JassUnit unit)
+{
+  CallFn<void>("GroupAddUnit", handle, unit.handle);
+  return *this;
+}
+
+size_t JassUnitGroup::Size()
+{
+  size_t ret_val = 0;
+  this->ForEach([&](JassUnit){ ret_val++; });
+  return ret_val;
+}

war3/wrapper/JassUnitGroup.h

@@ -1,8 +1,17 @@
 #pragma once
 #include "JassHandle.h"
+#include "JassUnit.h"
 struct JassUnitGroup : public JassHandle
 {
   JassUnitGroup(HObject handle) : JassHandle(handle) {  }
 
+  JassUnitGroup Create();
+  void Destroy();
+
+  JassUnit FirstUnit();
+  JassUnitGroup& ForEach(std::function<void(JassUnit)> const& action);
+  JassUnitGroup& Clear();
+  JassUnitGroup& PushBack(JassUnit unit);
+  size_t Size();
 };