[ViewVC] Diff of: Oni2/Daodan/src/Daodan

Comparing Daodan/src/Daodan_BSL.c (file contents):
Revision 445 by rossy, Sun Jul 19 11:03:44 2009 UTC vs.
Revision 446 by gumby, Mon Jul 20 02:06:23 2009 UTC

+#include "Oni.h"
+#include "Oni_Character.h"
+#include "dSFMT\dSFMT.h"
-+
+#include "Daodan_Character.h"
+uint16_t ONICALL bsl_int32mul(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
+        int index;
+        if (numargs == 0) index = 0;
-+
+        else if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
+        else index = args[0].value_int32;
+        int* killcount = ONgGameState + index * 0x16A0 + 0x1260 + 0x1670;
+        ret->value_int32 = *killcount;
+        int index;
+        if (numargs == 0) index = 0;
-+
+        else if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
+        else index = args[0].value_int32;
+        int* killcount = ONgGameState + index * 0x16A0 + 0x1260 + 0x1674;
+        ret->value_int32 = *killcount;
+        ret->type = sl_int32;
+        return 0;
-+
-+
+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;
-+
+                }
-+
+        }
-+
-+
+        //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;
-+
+        return 0;
-+
+}
-+
-+
+uint16_t ONICALL bsl_health(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
-+
+{
-+
+        int index;
-+
+        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 ;
-+
+        int* health = &Chr[index].Health;
-+
-+
+        ret->value_int32 = *health;
-+
+        ret->type = sl_int32;
-+
-+
+        if (numargs >= 2) {
-+
+                *health = args[1].value_int32;
-+
+        }
-+
+        ret->value_int32 = *health;
-+
+        ret->type = sl_int32;
-+
+        return 0;
-+
+}
-+
-+
+uint16_t ONICALL bsl_maxhealth(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
-+
+{
-+
+        int index;
-+
+        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 ;
-+
+        int* maxhealth = &Chr[index].MaxHealth;
-+
+        int oldmaxhealth = Chr[index].MaxHealth;
-+
+        int oldhealth = Chr->Health;
-+
+        if (numargs >= 2) {
-+
+                *maxhealth = args[1].value_int32;
-+
+        }
-+
+        if (numargs >= 3 && args[2].value_bool) {
-+
+                Chr->Health = (int)(((float)args[1].value_int32 / (float)oldmaxhealth) * (float)oldhealth);
-+
+        }
-+
+        ret->value_int32 = oldmaxhealth;
-+
+        ret->type = sl_int32;
-+
+        return 0;
-+
+}
-+
-+
+uint16_t ONICALL bsl_getattacker(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
-+
+{
-+
+        //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;
-+
+}
-+
-+
-+
+uint16_t ONICALL bsl_chrname(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
-+
+{
-+
+        int index;
-+
+        if (numargs == 0) index = 0;
-+
+        else if (args[0].type == sl_str32) index = DDrGetCharacterIndexFromName(args[0].value_str32);
-+
+        else index = args[0].value_int32;
-+
+        if (index == -1) {
-+
+                ret->type = sl_str32;
-+
+                ret->value_str32 = "NULL";
-+
+                return 0;
-+
+        }
-+
+        char* name = ONgGameState + 0x1260  + index * 0x16A0 + 0x14;
-+
+        if (numargs == 2) {
-+
+                strncpy(name, (char*)args[1].value_str32, 31);
-+
+        }
-+
-+
+        ret->type = sl_str32;
-+
+        ret->value_str32 = name;
-+
-+
+        return 0;
-+
+}
-+
-+
-+
+uint16_t ONICALL bsl_count(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
-+
+{
-+
+        //testing numargs...
-+
+        ret->type = sl_int32;
-+
+        ret->value_int32 = numargs;
-+
+        return 0;
-+
+}
-+
-+
+uint16_t ONICALL bsl_dprintcolored(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
-+
+{
-+
+        //TODO: figure out why our implementation of dprint shows after dev mode is turned off
-+
+        RGBA color;
-+
+        RGBA shade;
-+
-+
+        if(numargs == 0) return 0;
-+
+        if(numargs > 1 ) color.R = (char)args[1].value_int32;
-+
+        else color.R = 255;
-+
+        if(numargs > 2 ) color.G = (char)args[2].value_int32;
-+
+        else color.G = 255;
-+
+        if(numargs > 3 ) color.B = (char)args[3].value_int32;
-+
+        else color.B = 255;
-+
+        color.A = 0;
-+
+        if(numargs > 5 ) shade.R = (char)args[5].value_int32;
-+
+        else shade.R = 0x3F;
-+
+        if(numargs > 6 ) shade.G = (char)args[6].value_int32;
-+
+        else shade.G = 0x3F;
-+
+        if(numargs > 7 ) shade.B = (char)args[7].value_int32;
-+
+        else shade.B = 0x3F;
-+
+        shade.A = 0;
-+
-+
+        DDrConsole_PrintColored(args[0].value_str32, 1, color, shade);
-+
+        return 0;
-+
+}
-+
-+
-+
+uint16_t ONICALL bsl_nametoindex(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
-+
+{
-+
+        ret->type = sl_int32;
-+
+        ret->value_int32 = DDrGetCharacterIndexFromName(args[0].value_str32);
-+
+        return 0;
-+
+}
+/*
+uint16_t ONICALL bsl_sprintf(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], void* dontuse1, void* dontuse2, sl_arg* ret)
+        dsfmt_gv_init_gen_rand((uint32_t)time(NULL));
+        SLrScript_Command_Register_ReturnType("int32rand", "Returns a pseudo-random number between two numbers (inclusive).", "start:int end:int", sl_int32, bsl_int32rand);
-<
+        SLrScript_Command_Register_ReturnType("chr_getkills","Gets the number of kills a character has", "[chrindex:int]", sl_int32, bsl_getkills);
-<
+        SLrScript_Command_Register_ReturnType("chr_getdamage","Gets the amount of damage a character has caused", "[chrindex:int]", sl_int32, bsl_getdamage);
->
+        SLrScript_Command_Register_ReturnType("d_getkills","Gets the number of kills a character has", "[ai_name:str | script_id:int]", sl_int32, bsl_getkills);
->
+        SLrScript_Command_Register_ReturnType("d_getdamage","Gets the amount of damage a character has caused", "[ai_name:string | script_id:int]", sl_int32, bsl_getdamage);
->
+        SLrScript_Command_Register_ReturnType("d_name","Gets or sets a character's name", "[ai_name:str | script_id:int] [newname:string]", sl_str32, bsl_chrname);
->
+        SLrScript_Command_Register_ReturnType("d_getindex","Converts a character's name to its index", "script_id:int", sl_int32, bsl_nametoindex);
->
+        SLrScript_Command_Register_ReturnType("d_health","Gets or sets a character's health", "[ai_name:str | script_id:int] [newhealth:int]", sl_str32, bsl_health);
->
+        SLrScript_Command_Register_ReturnType("d_maxhealth","Gets or sets a character's maximum health", "[ai_name:str | script_id:int] [newmaxhealth:int] [scalehealth:bool]", sl_str32, bsl_maxhealth);
->
+        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("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);
->
+}

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines (old)
->
+Changed lines (new)

Comparing Daodan/src/Daodan_BSL.c (file contents): Revision 445 by rossy, Sun Jul 19 11:03:44 2009 UTC vs. Revision 446 by gumby, Mon Jul 20 02:06:23 2009 UTC

Diff Legend

Comparing Daodan/src/Daodan_BSL.c (file contents):
Revision 445 by rossy, Sun Jul 19 11:03:44 2009 UTC vs.
Revision 446 by gumby, Mon Jul 20 02:06:23 2009 UTC