stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-17 10:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated item weights

Browse source 
Fix attempt for thrown items
This commit is contained in:
ZTsukei 2017-10-10 21:09:35 -04:00
parent b59246f413
commit b95f1d568a
3 changed files with 35 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/doomdef.h
View file

@ -143,16 +143,16 @@ extern FILE *logstream;
#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3 #define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
#ifdef DEVELOP #ifdef DEVELOP
#define VERSION 104 // Game version #define VERSION 104 // Game version
#define SUBVERSION 2 // more precise version number #define SUBVERSION 3 // more precise version number
#define VERSIONSTRING "Development EXE" #define VERSIONSTRING "Development EXE"
#define VERSIONSTRINGW "v1.4.2" #define VERSIONSTRINGW "v1.4.3"
// most interface strings are ignored in development mode. // most interface strings are ignored in development mode.
// we use comprevision and compbranch instead. // we use comprevision and compbranch instead.
#else #else
#define VERSION 104 // Game version #define VERSION 104 // Game version
#define SUBVERSION 2 // more precise version number #define SUBVERSION 3 // more precise version number
#define VERSIONSTRING "DevEXE v1.4.2" #define VERSIONSTRING "DevEXE v1.4.3"
#define VERSIONSTRINGW L"v1.4.2" #define VERSIONSTRINGW L"v1.4.3"
// Hey! If you change this, add 1 to the MODVERSION below! // Hey! If you change this, add 1 to the MODVERSION below!
// Otherwise we can't force updates! // Otherwise we can't force updates!
#endif #endif

20
src/g_game.c
View file

@ -2022,17 +2022,19 @@ void G_Ticker(boolean run)
cmd = &players[i].cmd; cmd = &players[i].cmd;
if (playeringame[i]) if (playeringame[i])
{
G_CopyTiccmd(cmd, &netcmds[buf][i], 1); G_CopyTiccmd(cmd, &netcmds[buf][i], 1);
// SRB2kart // SRB2kart
// Save the dir the player is holding // Save the dir the player is holding
// to allow items to be thrown forward or backward. // to allow items to be thrown forward or backward.
if (cmd->buttons & BT_FORWARD) if (cmd->buttons & BT_FORWARD)
players[i].kartstuff[k_throwdir] = 1; players[i].kartstuff[k_throwdir] = 1;
else if (cmd->buttons & BT_BACKWARD) else if (cmd->buttons & BT_BACKWARD)
players[i].kartstuff[k_throwdir] = -1; players[i].kartstuff[k_throwdir] = -1;
else else
players[i].kartstuff[k_throwdir] = 0; players[i].kartstuff[k_throwdir] = 0;
}
} }
// do main actions // do main actions

38
src/k_kart.c
View file

@ -671,22 +671,22 @@ static INT32 K_KartItemOddsDistance_Retro[NUMKARTITEMS][9] =
//P-Odds 0 1 2 3 4 5 6 7 8 //P-Odds 0 1 2 3 4 5 6 7 8
/*Magnet*/ { 0, 1, 2, 0, 0, 0, 0, 0, 0 }, // Magnet /*Magnet*/ { 0, 1, 2, 0, 0, 0, 0, 0, 0 }, // Magnet
/*Boo*/ { 0, 0, 2, 2, 1, 0, 0, 0, 0 }, // Boo /*Boo*/ { 0, 0, 2, 2, 1, 0, 0, 0, 0 }, // Boo
/*Mushroom*/ { 1, 0, 0, 3, 5, 5, 0, 0, 0 }, // Mushroom /*Mushroom*/ { 1, 0, 0, 3, 7, 6, 0, 0, 0 }, // Mushroom
/*Triple Mushroom*/ { 0, 0, 0, 1, 3, 7, 6, 4, 0 }, // Triple Mushroom /*Triple Mushroom*/ { 0, 0, 0, 0, 3, 8, 6, 4, 0 }, // Triple Mushroom
/*Mega Mushroom*/ { 0, 0, 0, 0, 1, 2, 1, 0, 0 }, // Mega Mushroom /*Mega Mushroom*/ { 0, 0, 0, 0, 1, 2, 1, 0, 0 }, // Mega Mushroom
/*Gold Mushroom*/ { 0, 0, 0, 0, 0, 1, 6, 8,12 }, // Gold Mushroom /*Gold Mushroom*/ { 0, 0, 0, 0, 0, 1, 6, 8,12 }, // Gold Mushroom
/*Star*/ { 0, 0, 0, 0, 0, 0, 4, 6, 8 }, // Star /*Star*/ { 0, 0, 0, 0, 0, 0, 4, 6, 8 }, // Star
/*Triple Banana*/ { 0, 0, 1, 1, 0, 0, 0, 0, 0 }, // Triple Banana /*Triple Banana*/ { 0, 0, 1, 1, 0, 0, 0, 0, 0 }, // Triple Banana
/*Fake Item*/ { 0, 4, 3, 2, 0, 0, 0, 0, 0 }, // Fake Item /*Fake Item*/ { 0, 4, 2, 1, 0, 0, 0, 0, 0 }, // Fake Item
/*Banana*/ { 0, 9, 6, 2, 1, 0, 0, 0, 0 }, // Banana /*Banana*/ { 0, 9, 4, 2, 1, 0, 0, 0, 0 }, // Banana
/*Green Shell*/ { 0, 6, 5, 3, 2, 0, 0, 0, 0 }, // Green Shell /*Green Shell*/ { 0, 6, 4, 3, 2, 0, 0, 0, 0 }, // Green Shell
/*Red Shell*/ { 0, 0, 1, 4, 3, 1, 0, 0, 0 }, // Red Shell /*Red Shell*/ { 0, 0, 3, 2, 1, 0, 0, 0, 0 }, // Red Shell
/*Triple Green Shell*/ { 0, 0, 0, 1, 1, 1, 0, 0, 0 }, // Triple Green Shell /*Triple Green Shell*/ { 0, 0, 0, 1, 1, 1, 0, 0, 0 }, // Triple Green Shell
/*Bob-omb*/ { 0, 0, 0, 1, 1, 0, 0, 0, 0 }, // Bob-omb /*Bob-omb*/ { 0, 0, 1, 2, 2, 0, 0, 0, 0 }, // Bob-omb
/*Blue Shell*/ { 0, 0, 0, 0, 0, 1, 1, 0, 0 }, // Blue Shell /*Blue Shell*/ { 0, 0, 0, 0, 0, 2, 2, 0, 0 }, // Blue Shell
/*Fire Flower*/ { 0, 0, 0, 0, 1, 1, 1, 0, 0 }, // Fire Flower /*Fire Flower*/ { 0, 0, 1, 2, 1, 0, 0, 0, 0 }, // Fire Flower
/*Triple Red Shell*/ { 0, 0, 0, 0, 1, 1, 0, 0, 0 }, // Triple Red Shell /*Triple Red Shell*/ { 0, 0, 0, 1, 0, 0, 0, 0, 0 }, // Triple Red Shell
/*Lightning*/ { 0, 0, 0, 0, 0, 0, 1, 2, 0 } // Lightning /*Lightning*/ { 0, 0, 0, 0, 0, 0, 1, 2, 0 } // Lightning
}; };
@ -920,7 +920,7 @@ static void K_KartItemRouletteByDistance(player_t *player, ticcmd_t *cmd)
INT32 pdis = 0, useodds = 0; INT32 pdis = 0, useodds = 0;
INT32 spawnchance[NUMKARTITEMS * NUMKARTODDS]; INT32 spawnchance[NUMKARTITEMS * NUMKARTODDS];
INT32 chance = 0, numchoices = 0; INT32 chance = 0, numchoices = 0;
INT32 distvar = (64*15);
// This makes the roulette cycle through items - if this is 0, you shouldn't be here. // This makes the roulette cycle through items - if this is 0, you shouldn't be here.
if (player->kartstuff[k_itemroulette]) if (player->kartstuff[k_itemroulette])
@ -968,14 +968,14 @@ static void K_KartItemRouletteByDistance(player_t *player, ticcmd_t *cmd)
player->kartstuff[k_itemclose] = 0; // Reset the item window closer. player->kartstuff[k_itemclose] = 0; // Reset the item window closer.
if (pingame == 1) useodds = 0; if (pingame == 1) useodds = 0;
else if (pdis <= 0) useodds = 1; else if (pdis <= distvar * 0) useodds = 1;
else if (pdis <= 1000) useodds = 2; else if (pdis <= distvar * 1) useodds = 2;
else if (pdis <= 2000) useodds = 3; else if (pdis <= distvar * 2) useodds = 3;
else if (pdis <= 3500) useodds = 4; else if (pdis <= distvar * 4) useodds = 4;
else if (pdis <= 5500) useodds = 5; else if (pdis <= distvar * 6) useodds = 5;
else if (pdis <= 8000) useodds = 6; else if (pdis <= distvar * 9) useodds = 6;
else if (pdis <= 11000) useodds = 7; else if (pdis <= distvar * 12) useodds = 7;
else useodds = 8; else useodds = 8;
#define SETITEMRESULT(pos, itemnum) \ #define SETITEMRESULT(pos, itemnum) \