Permalink
Browse files

Campaign updates.

-Remove "requiredStructures" from a few research topics.
-Do not share alliance vision in campaign with formAlliance().
-sequence.cpp: Introduce a small hack to make cam2diif.ogg play with hackAddMessage().
-cam2-2: Remove hover inferno from the hover factory.
  • Loading branch information...
KJeff01 committed Sep 12, 2017
1 parent 7515753 commit d4d0688678aa44c9cf93163bd7f073a6d9bec18a
Showing with 14 additions and 38 deletions.
  1. +1 −1 data/base/script/campaign/cam2-2.js
  2. +0 −30 data/base/stats/research.json
  3. +11 −5 lib/sequence/sequence.cpp
  4. +2 −2 src/multigifts.cpp
@@ -187,7 +187,7 @@ function eventStartLevel()
"COFactoryWest": {
assembly: camMakePos("westAssembly"),
throttle: camChangeOnDiff(90000),
templates: [comtath, comih] //Hover lancers/infernos
templates: [comtath] //Hover lancers
},
});
@@ -188,9 +188,6 @@
"R-Struc-Factory-Module",
"R-Cyborg-Wpn-MG"
],
"requiredStructures": [
"A0CyborgFactory"
],
"researchPoints": 1200,
"researchPower": 37,
"results": [
@@ -219,9 +216,6 @@
"requiredResearch": [
"R-Cyborg-Metals01"
],
"requiredStructures": [
"A0CyborgFactory"
],
"researchPoints": 2400,
"researchPower": 75,
"results": [
@@ -252,9 +246,6 @@
"R-Cyborg-Wpn-MG",
"R-Cyborg-Metals02"
],
"requiredStructures": [
"A0CyborgFactory"
],
"researchPoints": 3600,
"researchPower": 112,
"results": [
@@ -603,9 +594,6 @@
"R-Struc-Research-Module",
"R-Struc-Factory-Module"
],
"requiredStructures": [
"A0LightFactory"
],
"researchPoints": 1800,
"researchPower": 56,
"results": [
@@ -634,9 +622,6 @@
"requiredResearch": [
"R-Vehicle-Metals01"
],
"requiredStructures": [
"A0LightFactory"
],
"researchPoints": 3600,
"researchPower": 112,
"results": [
@@ -667,9 +652,6 @@
"requiredResearch": [
"R-Vehicle-Metals02"
],
"requiredStructures": [
"A0LightFactory"
],
"researchPoints": 5400,
"researchPower": 168,
"results": [
@@ -1016,9 +998,6 @@
"R-Wpn-Cannon1Mk1",
"R-Cyborg-Wpn-MG"
],
"requiredStructures": [
"A0CyborgFactory"
],
"researchPoints": 1500,
"researchPower": 46,
"resultComponents": [
@@ -1035,9 +1014,6 @@
"R-Wpn-Flamer01Mk1",
"R-Cyborg-Wpn-MG"
],
"requiredStructures": [
"A0CyborgFactory"
],
"researchPoints": 900,
"researchPower": 28,
"resultComponents": [
@@ -1053,9 +1029,6 @@
"requiredResearch": [
"R-Struc-Factory-Cyborg"
],
"requiredStructures": [
"A0CyborgFactory"
],
"researchPoints": 600,
"researchPower": 18,
"resultComponents": [
@@ -1074,9 +1047,6 @@
"R-Wpn-Rocket01-LtAT",
"R-Cyborg-Wpn-MG"
],
"requiredStructures": [
"A0CyborgFactory"
],
"researchPoints": 900,
"researchPower": 28,
"resultComponents": [
View
@@ -155,6 +155,9 @@ static GLfloat Scrnvidpos[3];
static SCANLINE_MODE use_scanlines;
//HACK: This is used to play a sequence where audio/video is not synced fast enough.
static int playAttempts = 0;
// Helper; just grab some more compressed bitstream and sync it for page extraction
static int buffer_data(PHYSFS_file *in, ogg_sync_state *oy)
{
@@ -442,7 +445,7 @@ static void audio_write(void)
alSourcePlay(audiodata.source);
}
audiobuf_ready = 0;
audiobuf_ready = false;
audiodata.audiobuf_fill = 0;
}
}
@@ -806,6 +809,7 @@ bool seq_Update()
else
{
/* we need more data; break out to suck in another page */
playAttempts += 1;
break;
}
}
@@ -846,10 +850,11 @@ bool seq_Update()
alGetSourcei(audiodata.source, AL_SOURCE_STATE, &sourcestate);
if (PHYSFS_eof(fpInfile)
&& !videobuf_ready
&& ((!audiobuf_ready && (audiodata.audiobuf_fill == 0)) || audio_Disabled())
&& sourcestate != AL_PLAYING
)
&& playAttempts > 2
&& !videobuf_ready
&& ((!audiobuf_ready && (audiodata.audiobuf_fill == 0)) || audio_Disabled())
&& sourcestate != AL_PLAYING
)
{
video_write(false);
seq_Shutdown();
@@ -951,6 +956,7 @@ void seq_Shutdown()
}
videoplaying = false;
playAttempts = 0;
Timer_stop();
audioTime = 0;
View
@@ -508,7 +508,7 @@ void formAlliance(uint8_t p1, uint8_t p2, bool prop, bool allowAudio, bool allow
syncDebug("Form alliance %d %d", p1, p2);
alliances[p1][p2] = ALLIANCE_FORMED;
alliances[p2][p1] = ALLIANCE_FORMED;
if (alliancesSharedVision(game.alliance)) // this is for shared vision only
if (bMultiPlayer && alliancesSharedVision(game.alliance)) // this is for shared vision only
{
alliancebits[p1] |= 1 << p2;
alliancebits[p2] |= 1 << p1;
@@ -520,7 +520,7 @@ void formAlliance(uint8_t p1, uint8_t p2, bool prop, bool allowAudio, bool allow
}
// Not campaign and alliances are transitive
if (alliancesSharedVision(game.alliance))
if (bMultiPlayer && alliancesSharedVision(game.alliance))
{
giftRadar(p1, p2, false);
giftRadar(p2, p1, false);

0 comments on commit d4d0688

Please sign in to comment.