Merge pull request #1496 from danielyxie/dev

fix incite violence
This commit is contained in:
hydroflame 2021-10-14 23:39:47 -04:00 committed by GitHub
commit d02e9ecc8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 4 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1172,7 +1172,7 @@ export class Bladeburner implements IBladeburner {
return GeneralActions["Diplomacy"];
case ActionTypes["Hyperbolic Regeneration Chamber"]:
return GeneralActions["Hyperbolic Regeneration Chamber"];
case ActionTypes["stir trouble"]:
case ActionTypes["Incite Violence"]:
return GeneralActions["Incite Violence"];
default:
return null;
@ -1511,6 +1511,10 @@ export class Bladeburner implements IBladeburner {
if (!growthF) throw new Error("trying to generate count for action that doesn't exist? " + operation);
this.operations[operation].count += (60 * 3 * growthF()) / BladeburnerConstants.ActionCountGrowthPeriod;
}
if (this.logging.general) {
this.log(`Incited violence in the synthoid communities.`);
}
this.startAction(player, this.action);
break;
}
default:

@ -12,6 +12,7 @@ export const ActionTypes: {
"Field Analysis": number;
Diplomacy: number;
"Hyperbolic Regeneration Chamber": number;
"Incite Violence": number;
} = {
Idle: 1,
Contract: 2,
@ -24,4 +25,5 @@ export const ActionTypes: {
"Field Analysis": 7,
Diplomacy: 8,
"Hyperbolic Regeneration Chamber": 9,
"Incite Violence": 10,
};

@ -8,6 +8,8 @@ function makeScriptBlob(code: string): Blob {
return new Blob([code], { type: "text/javascript" });
}
export function compile(script: Script, scripts: Script[]): void {}
// Begin executing a user JS script, and return a promise that resolves
// or rejects when the script finishes.
// - script is a script to execute (see Script.js). We depend only on .filename and .code.