lua

LunaHook/CMakeLists.txt

@@ -1,10 +1,10 @@
 include_directories(. util engines)
 if(${CMAKE_SIZEOF_VOID_P} EQUAL 8) 
-	set(enginessrc livecaptions Kincaid vita3k rpcs3 yuzusuyu TYPEMOON ENTERGRAM AGES7 mono Godot Renpy 5pb lucasystem LightVN V8 pchooks Artemis KiriKiri YOX PPSSPP CMVS Suika2 )
+	set(enginessrc livecaptions Kincaid vita3k rpcs3 yuzusuyu TYPEMOON ENTERGRAM AGES7 mono Godot 5pb lucasystem LightVN V8 pchooks Artemis KiriKiri YOX PPSSPP CMVS Suika2 )
 	set(enginepath "engine64")
 	set(collector "enginecollection64.cpp")
 else()
-	set(enginessrc TeethingRing Fizz CoffeeMaker VALKYRIA mirage CisLugI tamasoft FrontWing solfasys Diskdream splushwave ransel akatombo GASTRO GSX Aksys ScrPlayer SYSD KISS IGScript Jellyfish BKEngine Overflow SRPGStudio Suika2 FVP LCScript Ohgetsu RPGMakerRGSS3 ONScripterru OVERDRIVE HXP Palette Purple Ruf RUNE Tarte Tomato Sakuradog Troy VitaminSoft Unknown TSSystem Xbangbang Anisetta Nijyuei Interheart LovaGame Giga Jisatu101 lua51 EntisGLS Ciel ACTGS TerraLunar PPSSPP jukujojidai PCSX2 VanillawareGC cef V8 mono pchooks PONScripter Bishop sakanagl Renpy Lightvn KiriKiri SideB BGI Bootup morning shyakunage Regista NNNConfig Eushully Majiro littlecheese Elf Silkys CMVS Wolf Circus1 Circus2 Cotopha Artemis CatSystem Atelier Tenco QLIE Pal AIL2 NeXAS LunaSoft Unicorn Rejet Interlude AdobeAir Retouch Malie Live Nexton Lucifen Waffle TinkerBell SystemAoi Yuris Nitroplus2 Bruns EME RRE Candy Speed ApricoT Triangle AB2Try MBLMED GameMaker DxLib CodeX Minori Sprite RpgmXP Eagls Debonosu C4 WillPlus Tanuki GXP AOS Mink YukaSystem2 sakusesu Exp Syuntada Pensil Anim hibiki Nitroplus Reallive Siglus Taskforce2 RUGP IronGameSystem Anex86 ShinyDaysGame MarineHeart ShinaRio CaramelBox UnisonShift Escude Ryokucha Alice Footy2 utawarerumono System4x Abalone Abel 5pb HorkEye XUSE Leaf Nekopack AXL AGS AdobeFlash10 FocasLens Tamamo Ages3ResT)
+	set(enginessrc TeethingRing Fizz CoffeeMaker VALKYRIA mirage CisLugI tamasoft FrontWing solfasys Diskdream splushwave ransel akatombo GASTRO GSX Aksys ScrPlayer SYSD KISS IGScript Jellyfish BKEngine Overflow SRPGStudio Suika2 FVP LCScript Ohgetsu RPGMakerRGSS3 ONScripterru OVERDRIVE HXP Palette Purple Ruf RUNE Tarte Tomato Sakuradog Troy VitaminSoft Unknown TSSystem Xbangbang Anisetta Nijyuei Interheart LovaGame Giga Jisatu101 EntisGLS Ciel ACTGS TerraLunar PPSSPP jukujojidai PCSX2 VanillawareGC cef V8 mono pchooks PONScripter Bishop sakanagl Lightvn KiriKiri SideB BGI Bootup morning shyakunage Regista NNNConfig Eushully Majiro littlecheese Elf Silkys CMVS Wolf Circus1 Circus2 Cotopha Artemis CatSystem Atelier Tenco QLIE Pal AIL2 NeXAS LunaSoft Unicorn Rejet Interlude AdobeAir Retouch Malie Live Nexton Lucifen Waffle TinkerBell SystemAoi Yuris Nitroplus2 Bruns EME RRE Candy Speed ApricoT Triangle AB2Try MBLMED GameMaker DxLib CodeX Minori Sprite RpgmXP Eagls Debonosu C4 WillPlus Tanuki GXP AOS Mink YukaSystem2 sakusesu Exp Syuntada Pensil Anim hibiki Nitroplus Reallive Siglus Taskforce2 RUGP IronGameSystem Anex86 ShinyDaysGame MarineHeart ShinaRio CaramelBox UnisonShift Escude Ryokucha Alice Footy2 utawarerumono System4x Abalone Abel 5pb HorkEye XUSE Leaf Nekopack AXL AGS AdobeFlash10 FocasLens Tamamo Ages3ResT)
 	set(enginepath "engine32")
 	set(collector "enginecollection32.cpp")
 endif()

LunaHook/engine32/Renpy.cpp

@@ -1,8 +0,0 @@
-#include"Renpy.h"
-
-#include"python/python.h" 
-	
-bool Renpy::attach_function() {
-    
-    return InsertRenpyHook();
-}  

LunaHook/engine64/Renpy.cpp

@@ -1,7 +0,0 @@
-#include"Renpy.h"
- 
-#include"python/python.h" 
- 
-bool Renpy::attach_function() {
-    return InsertRenpyHook()||InsertRenpy3Hook();
-}  

LunaHook/engine64/Renpy.h

@@ -1,15 +0,0 @@
-
-
-class Renpy:public ENGINE{
-    public:
-    Renpy(){
-        
-        check_by=CHECK_BY::ALL_TRUE;
-        // check_by=CHECK_BY::CUSTOM; 
-        // check_by_target=[](){
-        //     //Renpy - sample game https://vndb.org/v19843
-        //     return Util::CheckFile(L"*.py")|| GetModuleHandleW(L"librenpython.dll");
-        // };
-    }; 
-    bool attach_function(); 
-};

LunaHook/enginecollection32.cpp

@@ -22,7 +22,6 @@
 #include"engine32/Fizz.h"
 #include"engine32/Ruf.h"
 #include"engine32/SYSD.h"
-#include"engine32/Renpy.h"
 #include"engine32/Diskdream.h"
 #include"engine32/RPGMakerRGSS3.h"
 #include"engine32/RUNE.h"
@@ -162,13 +161,14 @@
 #include"engine32/Overflow.h"
 #include"engine32/Ages3ResT.h"
 #include"engine32/AXL.h"
-#include"engine32/lua51.h"
 #include"engine32/UnisonShift.h"
-#include"NoEngine.h"
 #include"engine32/EntisGLS.h"
 #include"engine32/Ciel.h"
 #include"engine32/CisLugI.h"
 #include"engine32/ACTGS.h"
+#include"NoEngine.h"
+#include"engines/lua/lua51.h"
+#include"engines/python/Renpy.h"
 std::vector<ENGINE*> check_engines(){ 
     return  { 
         new LovaGame,
@@ -282,7 +282,6 @@ std::vector<ENGINE*> check_engines(){
         new System4x,
         new Ages3ResT,
         new AXL,
-        new lua51,
         new Ciel,
         new ACTGS,
         new Nijyuei,
@@ -335,7 +334,8 @@ std::vector<ENGINE*> check_engines(){
         new CoffeeMaker,
         new Fizz,
         new CaramelBox2,
-        new TeethingRing
+        new TeethingRing,
+        new lua51,
     };
      
 }

LunaHook/enginecollection64.cpp

@@ -1,7 +1,6 @@
 #include"engine64/PPSSPP.h"
 #include"engine64/Godot.h"
 #include"engine64/V8.h"
-#include"engine64/Renpy.h"
 #include"engine64/mono.h"
 #include"engine64/AGES7.h"
 #include"engine64/pchooks.h"
@@ -20,6 +19,8 @@
 #include"engine64/yuzusuyu.h"
 #include"engine64/vita3k.h"
 #include"engine64/rpcs3.h"
+#include"engines/lua/lua51.h"
+#include"engines/python/Renpy.h"
 std::vector<ENGINE*> ignore_engines(){ return{ }; }
 std::vector<ENGINE*> unsafe_check_atlast(){   return{ }; }
 
@@ -46,7 +47,8 @@ std::vector<ENGINE*> check_engines(){
         new vita3k,
         new rpcs3,
         new Kincaid,
-        new livecaptions
+        new livecaptions,
+        new lua51,
     };
      
 }

LunaHook/engines/CMakeLists.txt

@@ -1,4 +1,4 @@
 
-add_library(commonengine mono/impl_mono.cpp mono/monoil2cpp.cpp mono/impl_il2cpp.cpp ppsspp/ppsspp.cpp mages/mages.cpp v8/v8.cpp python/python2.cpp python/python3.cpp python/python.cpp pchooks/pchooks.cpp)
+add_library(commonengine mono/impl_mono.cpp mono/monoil2cpp.cpp mono/impl_il2cpp.cpp ppsspp/ppsspp.cpp mages/mages.cpp v8/v8.cpp python/python2.cpp python/python3.cpp python/python.cpp pchooks/pchooks.cpp lua/lua51.cpp)
 target_precompile_headers(commonengine REUSE_FROM pchhook)
 

LunaHook/engines/lua/lua51.cpp

@@ -3,14 +3,18 @@
 bool lua51::attach_function() {  
      //[180330][TOUCHABLE] 想聖天使クロスエモーション外伝5 (認証回避済)
     auto hlua51=GetModuleHandleW(L"lua5.1.dll");
+    if(hlua51==0)
+      hlua51=GetModuleHandleW(L"lua51.dll");
     if(hlua51==0)return false;
     auto lua_pushstring=GetProcAddress(hlua51,"lua_pushstring");
     if(lua_pushstring==0)return false;
     HookParam hp;
 		hp.address =(uintptr_t) lua_pushstring;
-		hp.offset=get_stack(2);
 		hp.type = CODEC_UTF8 | USING_STRING; 
-    
+    hp.text_fun=[](hook_stack* stack, HookParam* hp, uintptr_t* data, uintptr_t* split, size_t* len){
-    hp.filter_fun=all_ascii_Filter;
+      *data=stack->ARG2;
+      *len=strlen((char*)*data);
+      *split=all_ascii((char*)*data,*len);
+    };
     return NewHook(hp,"lua51");
 } 

LunaHook/engines/lua/lua51.h

@@ -4,10 +4,10 @@ class lua51:public ENGINE{
     public:
     lua51(){
         
-        check_by=CHECK_BY::FILE;
+        check_by=CHECK_BY::FILE_ANY;
-        check_by_target=L"lua5.1.dll";
+        check_by_target=check_by_list{L"lua5.1.dll",L"lua51.dll"};
         is_engine_certain=false;
-        dontstop=true;
+        //dontstop=true;
     };
      bool attach_function();
 };

LunaHook/engines/python/Renpy.h

@@ -1,4 +1,5 @@
 
+#include"python/python.h" 
 
 class Renpy:public ENGINE{
     public:
@@ -11,5 +12,11 @@ class Renpy:public ENGINE{
         //     return Util::CheckFile(L"*.py")|| GetModuleHandleW(L"librenpython.dll");
         // };
     }; 
-    bool attach_function(); 
+    bool attach_function(){
+        #ifndef _WIN64
+        return InsertRenpyHook();
+        #else
+        return InsertRenpyHook()||InsertRenpy3Hook();
+        #endif
+    }
 };