wet-health

Author: fourcels

app/src/main/cpp/wet-wealth.cpp

@@ -78,6 +78,7 @@ BNM::Class UserCharacterFactory{};
 BNM::Class CharacterStaticUsecase{};
 BNM::Class UserCharactersUsecase{};
 BNM::Class CharacterStatic{};
+BNM::Class List{};
 
 void (*old_AddItem)(void *instance, void *item, int count);
 
@@ -88,25 +89,31 @@ void new_AddItem(void *instance, void *item, int count) {
 void (*old_AddCharacterTemptation)(void *instance, void *character, int added);
 
 void new_AddCharacterTemptation(void *instance, void *character, int added) {
-    return new_AddCharacterTemptation(instance, character, added * feature.temptation);
+    return old_AddCharacterTemptation(instance, character, added * feature.temptation);
 }
 
 void (*old_Load)(void *instance);
 
 void new_Load(void *instance) {
     old_Load(instance);
     if (feature.characters) {
-        auto userCharacterFactory = static_cast<BNM::Field<BNM::IL2CPP::Il2CppObject *>>(UserCharacterFactory.GetField(
+        auto userCharacterFactory = static_cast<BNM::Field<BNM::IL2CPP::Il2CppObject *>>(UserCharactersUsecase.GetField(
                 "userCharacterFactory"))[instance]();
-        auto characterStaticUsecase = static_cast<BNM::Field<BNM::IL2CPP::Il2CppObject *>>(CharacterStaticUsecase.GetField(
-                "userCharacterFactory"))[userCharacterFactory]();
-        auto characters = static_cast<BNM::Property<BNM::Structures::Mono::List<BNM::IL2CPP::Il2CppObject *> >>(UserCharacterFactory.GetProperty(
+        auto characterStaticUsecase = static_cast<BNM::Field<BNM::IL2CPP::Il2CppObject *>>(UserCharacterFactory.GetField(
+                "characterStaticUsecase"))[userCharacterFactory]();
+        auto characters = static_cast<BNM::Property<BNM::IL2CPP::Il2CppObject *>>(CharacterStaticUsecase.GetProperty(
                 "Characters"))[characterStaticUsecase]();
+        auto CharactersList = List.GetGeneric(
+                {CharacterStatic});
+        auto count = static_cast<BNM::Property<int>>(CharactersList.GetProperty(
+                "Count"))[characters]();
+        auto getItem = static_cast<BNM::Method<BNM::IL2CPP::Il2CppObject *>>(CharactersList.GetMethod(
+                "get_Item"))[characters];
         BNM::Method<void> AddCharacterOrExperience = UserCharactersUsecase.GetMethod(
                 "AddCharacterOrExperience")[instance];
         BNM::Property<int> Id = CharacterStatic.GetProperty("Id");
-        for (int i = 0; i < characters.size; ++i) {
-            AddCharacterOrExperience(Id[characters[i]](), 100);
+        for (int i = 0; i < count; ++i) {
+            AddCharacterOrExperience(Id[getItem(i)](), 100);
         }
     }
 }
@@ -129,6 +136,7 @@ void OnLoaded() {
                                  AssemblyCSharp);
     UserCharactersUsecase = BNM::Class("WetWealth.Characters", "UserCharactersUsecase",
                                        AssemblyCSharp);
+    List = BNM::Class("System.Collections.Generic", "List`1", BNM::Image("mscorlib"));
     auto AddCharacterTemptation = UserCharactersUsecase.GetMethod("AddCharacterTemptation");
     auto Load = UserCharactersUsecase.GetMethod("Load");
 

app/src/main/java/com/android/support/Menu.kt

@@ -27,7 +27,6 @@ import android.widget.SeekBar
 import android.widget.Switch
 import android.widget.TextView
 import android.widget.Toast
-import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.edit
 import androidx.core.graphics.toColorInt
 import androidx.core.view.setPadding
@@ -46,7 +45,7 @@ const val POS_X = 20
 const val POS_Y = 50
 
 const val MENU_WIDTH = 290
-const val MENU_HEIGHT = 300
+const val MENU_HEIGHT = 250
 
 val MENU_BG_COLOR = "#EE1C2A35".toColorInt()//#AARRGGBB
 val MENU_FEATURE_BG_COLOR = "#DD141C22".toColorInt() //#AARRGGBB
@@ -238,21 +237,12 @@ class Menu(val context: Activity) {
 
     fun generateFeatureList(): View {
         //********** Mod menu feature list **********
-
-        val constraintLayout = ConstraintLayout(context)
-        constraintLayout.layoutParams = ConstraintLayout.LayoutParams(
-            ConstraintLayout.LayoutParams.MATCH_PARENT,
-            ConstraintLayout.LayoutParams.WRAP_CONTENT,
-        )
-
         val scrollView = ScrollView(context)
-        constraintLayout.addView(scrollView)
         //Auto size. To set size manually, change the width and height example 500, 500
-        val layoutParams = ConstraintLayout.LayoutParams(
-            ConstraintLayout.LayoutParams.MATCH_PARENT,
-            ConstraintLayout.LayoutParams.WRAP_CONTENT,
+        val layoutParams = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.MATCH_PARENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT,
         )
-        layoutParams.matchConstraintMaxHeight = dp(MENU_HEIGHT)
         scrollView.layoutParams = layoutParams
         scrollView.setBackgroundColor(MENU_FEATURE_BG_COLOR)
         val mods = LinearLayout(context)
@@ -304,7 +294,7 @@ class Menu(val context: Activity) {
             }
         }
         scrollView.addView(mods)
-        return constraintLayout
+        return scrollView
     }