From 4f13f8b98e421296f12cc10e91dae403f89e1efa Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 29 May 2019 22:29:06 -0400 Subject: [PATCH 1/8] Change version num to v2, disable 1.0.x demo compatiblity --- CMakeLists.txt | 2 +- appveyor.yml | 4 ++-- src/doomdef.h | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7995034d3..13a6bbaca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0) # DO NOT CHANGE THIS SRB2 STRING! Some variable names depend on this string. # Version change is fine. project(SRB2 - VERSION 1.1.0 + VERSION 2.0.0 LANGUAGES C) if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR}) diff --git a/appveyor.yml b/appveyor.yml index 3d46cf6de..cc5a01741 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.1.0.{branch}-{build} +version: 2.0.0.{branch}-{build} os: MinGW environment: @@ -29,7 +29,7 @@ environment: ############################## DPL_ENABLED: 0 DPL_TAG_ENABLED: 0 - DPL_INSTALLER_NAME: srb2kart-v110 + DPL_INSTALLER_NAME: srb2kart-v200 # Asset handling is barebones vs. Travis Deployer. We operate on 7z only. # Include the README files and the OpenGL batch in the main and patch archives. # The x86/x64 archives contain the DLL binaries. diff --git a/src/doomdef.h b/src/doomdef.h index 4d3934773..4fc563dff 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -149,17 +149,17 @@ extern FILE *logstream; // most interface strings are ignored in development mode. // we use comprevision and compbranch instead. #else -#define VERSION 110 // Game version +#define VERSION 200 // Game version #define SUBVERSION 0 // more precise version number -#define VERSIONSTRING "v1.1" -#define VERSIONSTRINGW L"v1.1" +#define VERSIONSTRING "v2.0" +#define VERSIONSTRINGW L"v2.0" // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates! // And change CMakeLists.txt, for CMake users! // AND appveyor.yml, for the build bots! #endif // Maintain compatibility with 1.0.x record attack replays? -#define DEMO_COMPAT_100 +//#define DEMO_COMPAT_100 // Does this version require an added patch file? // Comment or uncomment this as necessary. @@ -222,7 +222,7 @@ extern FILE *logstream; // it's only for detection of the version the player is using so the MS can alert them of an update. // Only set it higher, not lower, obviously. // Note that we use this to help keep internal testing in check; this is why v2.1.0 is not version "1". -#define MODVERSION 5 +#define MODVERSION 6 // Filter consvars by version // To version config.cfg, MAJOREXECVERSION is set equal to MODVERSION automatically. From 4e24831e33bcac73caa3031afe296ff2cbd7d789 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 29 May 2019 22:38:08 -0400 Subject: [PATCH 2/8] Reduce kartspeed increase to draftpower --- src/k_kart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index e48f0ec27..1c8083f1e 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -2240,7 +2240,7 @@ static void K_GetKartBoostPower(player_t *player) if (player->kartstuff[k_draftpower] > 0) // Drafting { - fixed_t draftspeed = ((3*FRACUNIT)/10) + ((player->kartspeed-1) * ((3*FRACUNIT)/100); // min is 30%, max is 54% + fixed_t draftspeed = ((3*FRACUNIT)/10) + ((player->kartspeed-1) * (FRACUNIT/50); // min is 30%, max is 46% speedboost += FixedMul(draftspeed, player->kartstuff[k_draftpower]); // (Drafting suffers no boost stack penalty.) numboosts++; } From d7374d33d6af3dbd6e6a2ea0353c4be73c6b8e52 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 29 May 2019 22:53:31 -0400 Subject: [PATCH 3/8] missed a parathesis --- src/k_kart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index 1c8083f1e..c56c7c982 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -2240,7 +2240,7 @@ static void K_GetKartBoostPower(player_t *player) if (player->kartstuff[k_draftpower] > 0) // Drafting { - fixed_t draftspeed = ((3*FRACUNIT)/10) + ((player->kartspeed-1) * (FRACUNIT/50); // min is 30%, max is 46% + fixed_t draftspeed = ((3*FRACUNIT)/10) + ((player->kartspeed-1) * (FRACUNIT/50)); // min is 30%, max is 46% speedboost += FixedMul(draftspeed, player->kartstuff[k_draftpower]); // (Drafting suffers no boost stack penalty.) numboosts++; } From cba86ee6ea000faffc4ae894e6a4e2ba36fd1af8 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 29 May 2019 22:55:59 -0400 Subject: [PATCH 4/8] Unused i --- src/p_enemy.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index 5ade446ef..6986e15a9 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -3582,7 +3582,6 @@ void A_AttractChase(mobj_t *actor) if (actor->extravalue1 >= 21) { - UINT8 i; mobj_t *sparkle; // Base add is 3 tics for 9,9, adds 1 tic for each point closer to the 1,1 end From 8ca96168b9623185618e1c54f74f92de8faf78a9 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 29 May 2019 23:19:52 -0400 Subject: [PATCH 5/8] enable patch file --- src/doomdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doomdef.h b/src/doomdef.h index 4d3934773..7730a4df0 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -163,7 +163,7 @@ extern FILE *logstream; // Does this version require an added patch file? // Comment or uncomment this as necessary. -//#define USE_PATCH_FILE +#define USE_PATCH_FILE // Use .kart extension addons #define USE_KART From dfe197b3807eccfa7c42b3bc31465c0b0320a477 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 29 May 2019 23:21:58 -0400 Subject: [PATCH 6/8] Double ring rotate speed, base it off current angle, slightly offset it --- src/p_enemy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index 6986e15a9..5f0c20498 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -3590,7 +3590,7 @@ void A_AttractChase(mobj_t *actor) sparkle = P_SpawnMobj(actor->target->x, actor->target->y, actor->target->z, MT_RINGSPARKS); P_SetTarget(&sparkle->target, actor->target); - sparkle->angle = FixedAngle(18<target->player->kartstuff[k_sparkleanim]; + sparkle->angle = (actor->target->angle + ANGLE_22h) + (FixedAngle(36<target->player->kartstuff[k_sparkleanim]); actor->target->player->kartstuff[k_sparkleanim] = (actor->target->player->kartstuff[k_sparkleanim]+1) % 20; P_KillMobj(actor, actor->target, actor->target); From ccdcb1dbd4f38747a9f85e1ff664bb05b4c4470b Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 29 May 2019 23:31:33 -0400 Subject: [PATCH 7/8] Minor change --- src/p_enemy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index 5f0c20498..34c606f32 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -3583,6 +3583,7 @@ void A_AttractChase(mobj_t *actor) if (actor->extravalue1 >= 21) { mobj_t *sparkle; + angle_t offset = FixedAngle(36<target->player->kartstuff[k_ringboost] += RINGBOOSTPWR+3; @@ -3590,7 +3591,7 @@ void A_AttractChase(mobj_t *actor) sparkle = P_SpawnMobj(actor->target->x, actor->target->y, actor->target->z, MT_RINGSPARKS); P_SetTarget(&sparkle->target, actor->target); - sparkle->angle = (actor->target->angle + ANGLE_22h) + (FixedAngle(36<target->player->kartstuff[k_sparkleanim]); + sparkle->angle = (actor->target->angle + (offset>>1)) + (offset * actor->target->player->kartstuff[k_sparkleanim]); actor->target->player->kartstuff[k_sparkleanim] = (actor->target->player->kartstuff[k_sparkleanim]+1) % 20; P_KillMobj(actor, actor->target, actor->target); From 3967a5d409a3212079a03a7f84059aee62f22af5 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Thu, 30 May 2019 01:46:25 -0400 Subject: [PATCH 8/8] Reduce angle offset back down again --- src/p_enemy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index 34c606f32..7baca2adc 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -3583,7 +3583,7 @@ void A_AttractChase(mobj_t *actor) if (actor->extravalue1 >= 21) { mobj_t *sparkle; - angle_t offset = FixedAngle(36<target->player->kartstuff[k_ringboost] += RINGBOOSTPWR+3;