Changeset 450

Timestamp:

Jul 22, 2009, 8:00:30 AM (15 years ago)

Author:

gumby

Message:

Started Bink.h...I probably did it all wrong. :p
Some minor BSL stuff.

Location:

Daodan/src

Files:

• Bink.h (added)
• Daodan_BSL.c (modified) (4 diffs)

Daodan/src/Daodan_BSL.c

@@ -117 +117 @@
 uint16_t ONICALL bsl_powerup(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
 {
-        char powerup_list[7][16] = {"ammo", "cell", "hypo", "shield", "invis" , "lsi", "bossshield"};
-        int powerup_offset[7] = {    0xE,    0x12,   0x10,   0x24,     0x26,     0x20,  -1};
-        char powerup_type[16] = "\0";
         int index;
         if (numargs < 2 || args[1].type != sl_str32) return 1;
         else if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
         else index = args[0].value_int32;
-        int i;
-        
-        for(i = 0; i < 6; i++) 
-        {
-                if(!strcmp(args[1].value_str32,powerup_list[i])) 
-                {
-                        sprintf(powerup_type,"%s",powerup_list[i]);
-                                break;
+        void* returnval;
+        bool is_lsi = 0;
+        Character* Chr = ONgGameState + 0x1260;
+        if(!strcmp(args[1].value_str32,"ammo")) 
+        {
+                returnval = &(Chr[index].Inventory_.AmmoUsed);
+        }
+        else if(!strcmp(args[1].value_str32,"hypo")) 
+        {
+                returnval = &(Chr[index].Inventory_.HypoUsed);
+        }
+        else if(!strcmp(args[1].value_str32,"cells")) 
+        {
+                returnval = &(Chr[index].Inventory_.CellsUsed);
+        }
+        else if(!strcmp(args[1].value_str32,"invis")) 
+        {
+                returnval = &(Chr[index].Inventory_.CloakUsed);
+        }
+        else if(!strcmp(args[1].value_str32,"shield")) 
+        {
+                returnval = &(Chr[index].Inventory_.ShieldUsed);
+        }
+        else if(!strcmp(args[1].value_str32,"lsi")) 
+        {
+                returnval = &(Chr[index].Inventory_.hasLSI);
+                is_lsi = 1;
+        }
+        else if(!strcmp(args[1].value_str32,"bossshield")) 
+        {
+                ret->value_int32 = Chr[index].Flags & char_bossshield;
+                ret->type = sl_int32;
+                if (numargs >=3) {
+                        if (Chr[index].Flags & char_bossshield) Chr[index].Flags = Chr[index].Flags & ~char_bossshield;
+                        else Chr[index].Flags = Chr[index].Flags | char_bossshield;
                 }
-        }
-        
+                return 0;
+        }
+        else return 1;
         //todo, add setting
         
-        if (powerup_type[0] == 0) return 1;
-        Character* Chr = ONgGameState + 0x1260;
-        void* returnval = &(Chr[index]) + 0x194 + powerup_offset[i];
-        //*returnval = (int)Inv 
-        if (numargs >= 2) 
-        {
-                //*health = args[1].value_int32;
-        }
-        ret->value_int32 = (int)*(uint16_t*)returnval;
-        ret->type = sl_int32;
+        if(is_lsi) ret->value_int32 = (int)*(bool*)returnval;
+        else    ret->value_int32 = *(int*)returnval;
+        ret->type = sl_int32;
+
+        if (numargs >= 3) 
+        {
+                if(is_lsi) *(bool*)returnval = args[2].value_int32;
+                else *(int*)returnval = args[2].value_int32;
+        }
+        
+        
         return 0;
 }
@@ -195 +221 @@
         //broken...not only does it sometimes blam, but it returns a string when i want an int so i can study it :<
         int index;
-        if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
-        else index = args[0].value_int32;
-        
-
-        if(ONrGetActiveCharacter(ONgGameState + 0x1260 + index * 0x16A0)) return 1;
-
-        int attacker= (int)(ONrGetActiveCharacter(ONgGameState + 0x1260 + index * 0x16A0) + 0x120);
-        ret->type = sl_int32;
-        ret->value_int32 = attacker;
-        return 0;
-}
+        if (numargs == 0) index = 0;
+        else    if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
+        else index = args[0].value_int32;
+        
+        Character* Chr = ONgGameState + 0x1260;
+        ActiveCharacter* Active = (ActiveCharacter*)ONrGetActiveCharacter(&Chr[index]);
+        if ((int)Active == 0) return 1;
+        ret->value_int32 = Active->LastDamageSourceCharacter;
+        ret->type = sl_int32;
+        return 0;
+}
+
 
 
@@ -272 +299 @@
         return 0;
 }
+
+uint16_t ONICALL bsl_getactiveoffset(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
+{
+        DDrConsole_PrintF("Character: 0x%x",(int)ONgGameState + 0x1260);
+        DDrConsole_PrintF("ActiveChar: 0x%x",(int)ONrGetActiveCharacter((void*)((int)ONgGameState + 0x1260)));
+        return 0;
+}
 /*
 uint16_t ONICALL bsl_sprintf(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
@@ -371 +405 @@
         SLrScript_Command_Register_ReturnType("d_powerup","Gets or sets a character's powerups", "ai_name:str|script_id:int powerup:str", sl_int32, bsl_powerup);
         //broken. sometimes crashes, and sometimes returns a string... : /
-        SLrScript_Command_Register_ReturnType("d_getattacker","Gets the last person to hurt a character", "[ai_name:string | script_id:int]", sl_int32, bsl_chrname);
-        
+        SLrScript_Command_Register_ReturnType("d_getattacker","Gets the last person to hurt a character", "[ai_name:string | script_id:int]", sl_int32, bsl_getattacker);
+        
+        SLrScript_Command_Register_ReturnType("d_active","Gets the last person to hurt a character", "[ai_name:string | script_id:int]", sl_int32, bsl_getactiveoffset);
+
         SLrScript_Command_Register_ReturnType("sprintf", "C-style sprintf.", "format:string arg1 arg2 ...", sl_str32, bsl_sprintf);
         SLrScript_Command_Register_ReturnType("dprintcolor", "prints to console in color", "text:string [color: r b g] [color: r b g]", sl_void, bsl_dprintcolored);
-}
-
+
+
+
+        SLrScript_Command_Register_ReturnType("d_dprint", "prints to console in color", "text:string [color: r b g] [color: r b g]", sl_void, bsl_dprintcolored);
+}
 void SLrDaodan_Patch()
 {
         DDrPatch_Int32(OniExe + 0x000f3755, (int)cinematic_start_patch);
 }
+