conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
const { newTest } = getTestingFunctions();
const configuration = new testConfiguration.Configuration();
configuration.leader = '<space>';
configuration.otherModesKeyBindingsNonRecursive = [
{
before: ['leader', 'o'],
after: ['o', 'eSc', 'k'],
},
{
before: ['<leader>', 'f', ... |
<<<<<<<
=======
import useCounter from './useCounter';
import useUpdate from './useUpdate'
>>>>>>>
import useUpdate from './useUpdate' |
<<<<<<<
=======
export enum VimSpecialCommands {
Nothing,
ShowCommandLine,
Dot
}
export class ViewChange {
public command: string;
public args: any;
}
>>>>>>>
export class ViewChange {
public command: string;
public args: any;
}
<<<<<<<
public isMultiCursor = false;
=======
public static las... |
<<<<<<<
import useLockFn from './useLockFn';
=======
import useTrackedEffect from './useTrackedEffect';
>>>>>>>
import useLockFn from './useLockFn';
import useTrackedEffect from './useTrackedEffect'; |
<<<<<<<
import useTrackedEffect from './useTrackedEffect';
=======
import useWebSocket from './useWebSocket';
>>>>>>>
import useWebSocket from './useWebSocket';
import useTrackedEffect from './useTrackedEffect';
<<<<<<<
useTrackedEffect,
=======
useWebSocket,
>>>>>>>
useTrackedEffect,
useWebSocket, |
<<<<<<<
import { RecordedState } from './../mode/modeHandler';
import { Configuration } from './../configuration/configuration';
=======
import { RecordedState, VimState } from './../mode/modeHandler';
>>>>>>>
import { Configuration } from './../configuration/configuration';
import { RecordedState, VimState } from '... |
<<<<<<<
liveBlock: borderLiveBlock(format),
=======
standfirstLink: borderStandfirstLink(format),
>>>>>>>
liveBlock: borderLiveBlock(format),
standfirstLink: borderStandfirstLink(format), |
<<<<<<<
type ShareIconSize = 'small' | 'medium';
=======
type LeftColSize = 'compact'|'wide';
>>>>>>>
type ShareIconSize = 'small' | 'medium';
type LeftColSize = 'compact'|'wide'; |
<<<<<<<
import useCookieState from './useCookieState';
=======
import useSetState from './useSetState';
>>>>>>>
import useCookieState from './useCookieState';
import useSetState from './useSetState';
<<<<<<<
useCookieState,
=======
useSetState,
>>>>>>>
useCookieState,
useSetState, |
<<<<<<<
public static _createEnabled: boolean = false;
protected _enabled: boolean = true;
=======
public static _createEnabled = false;
/**
* 是否更新该系统。
*/
public enabled = true;
>>>>>>>
public static _createEnabled: boolean = false;
protecte... |
<<<<<<<
import { signInGateDesignOpt } from '@frontend/web/experiments/tests/sign-in-gate-design-opt';
import { curatedContainerTest } from '@frontend/web/experiments/tests/curated-container-test';
=======
import { curatedContainerTest2 } from '@frontend/web/experiments/tests/curated-container-test';
import { deeplyR... |
<<<<<<<
const backgroundHeadlineByline = (format: Format): string => {
if (format.theme === Special.SpecialReport)
return brandAltBackground.primary;
return 'transparent';
};
=======
const backgroundBullet = (format: Format): string => {
if (format.theme === Special.SpecialReport) return specialReport[300];
re... |
<<<<<<<
contentType: 'Article',
=======
hasRelated: false,
hasStoryPackage: false,
>>>>>>>
contentType: 'Article',
hasRelated: false,
hasStoryPackage: false, |
<<<<<<<
useTextSelection,
useEventTarget
=======
useEventTarget,
useHistoryTravel
>>>>>>>
useTextSelection,
useEventTarget,
useHistoryTravel |
<<<<<<<
const options: Ajv.Options = {
verbose: true,
=======
const options = {
verbose: false,
>>>>>>>
const options: Ajv.Options = {
verbose: false, |
<<<<<<<
contentType: string;
=======
hasRelated: boolean;
hasStoryPackage: boolean;
>>>>>>>
contentType: string;
hasRelated: boolean;
hasStoryPackage: boolean; |
<<<<<<<
const fillCardClock = (format: Format): string => {
// Setting Card clock colour for immersive cards to all be dark grey
if (format.display === Display.Immersive) return neutral[60];
=======
const fillCardIcon = (format: Format): string => {
>>>>>>>
const fillCardIcon = (format: Format): string => {
// Se... |
<<<<<<<
import useCreation from './useCreation'
import { useDrag, useDrop } from './useDrop';
=======
import useCreation from './useCreation';
import useCounter from './useCounter'
>>>>>>>
import useCreation from './useCreation'
import { useDrag, useDrop } from './useDrop';
import useCounter from './useCounter'
<<<... |
<<<<<<<
import { ccpaApplies } from '@root/src/web/lib/ccpaApplies';
import { cmp } from '@guardian/consent-management-platform';
const show = (forceModal?: boolean) => {
if (forceModal) cmp.showPrivacyManager();
};
=======
import { cmp } from '@guardian/consent-management-platform';
import { getPrivacyFramework... |
<<<<<<<
headlineByline: Colour;
=======
bullet: Colour;
>>>>>>>
headlineByline: Colour;
bullet: Colour; |
<<<<<<<
import useNetwork from './useNetwork';
=======
import useTimeout from './useTimeout';
>>>>>>>
import useNetwork from './useNetwork';
import useTimeout from './useTimeout';
<<<<<<<
useNetwork,
=======
useTimeout,
>>>>>>>
useNetwork,
useTimeout, |
<<<<<<<
app.use(languageMiddleware);
=======
customMiddleware.forEach(middlewareElement => app.use(middlewareElement));
>>>>>>>
app.use(languageMiddleware);
customMiddleware.forEach(middlewareElement => app.use(middlewareElement)); |
<<<<<<<
browser.process().kill('SIGKILL');
=======
browser.close();
>>>>>>>
browser.close();
<<<<<<<
=======
if (this.singleUse) {
browser.on('disconnected', () => process.exit(0));
}
const page:any = await ... |
<<<<<<<
animationDuration?: number; // 300
showAnimationDuration?: number; // animationDuration || 300
hideAnimationDuration?: number; // animationDuration || 300
easing?: Animated.TimingAnimationConfig['easing']; // null
showEasing?: Animated.TimingAnimationConfig['easing']; // easing || null
hideEasing?:... |
<<<<<<<
import { Component, ApplicationRef } from '@angular/core';
=======
/* tslint:disable:no-access-missing-member */
import { Component } from '@angular/core';
>>>>>>>
import { Component } from '@angular/core'; |
<<<<<<<
serviceTrie: Trie;
serviceTrieInput: string;
serviceRecommendations: string[];
requestTrie: Trie;
messageTrie: Trie;
messageRecommendations: string[];
messageTrieInput: string;
=======
configArguments: any;
configElements: any;
>>>>>>>
serviceTrie: Trie;
serviceTrieInput: string;
... |
<<<<<<<
// import { RootState } from "./state";
=======
>>>>>>>
// import { RootState } from "./state";
<<<<<<<
import { RootState, Mode } from "../models/MainModel";
import * as cloneDeep from "lodash.clonedeep";
import { LeftFactory } from '../components/Left';
import {
CallType,
BaseConfig,
RequestConfig,... |
<<<<<<<
test(
'changes the href to another bundle if strategy moved it', async () => {
const bundler = new Bundler();
// This strategy moves a file to a different bundle.
const strategy = (bundles: Bundle[]): Bundle[] => {
return [
new Bundle(
... |
<<<<<<<
this.guid = gen_guid(identifier);
this._nextIndex = 1;
=======
this.guid = guid;
>>>>>>>
this._nextIndex = 1;
this.guid = guid; |
<<<<<<<
<div class="a">
<h1 class="e">Hello, <span class="f i {{-css-blocks-classnames 3 4 0 isWorld 1 2 0 3 1 2 (eq isThick 1) 1 3 4 2 1 textStyle "bold" 1 0 "italic" 1 1 "g" 0 "h" 1 "b" 2 "c" 3}}">World</span>!</h1>
<div class={{-css-blocks-classnames 1 2 0 isWorld 1 1 1 0 "d" 0 "b" 1}}>World</d... |
<<<<<<<
=======
// Whether the Producer should call stop() in given tracks.
private _stopTracks: boolean;
>>>>>>>
// Whether the Producer should call stop() in given tracks.
private _stopTracks: boolean; |
<<<<<<<
import CustomButtons from "./CustomButtons";
=======
import Timer from "./Timer";
>>>>>>>
import CustomButtons from "./CustomButtons";
import Timer from "./Timer";
<<<<<<<
CustomButtons,
=======
Timer,
>>>>>>>
CustomButtons,
Timer, |
<<<<<<<
import {
ConnectClient,
EndpointCallContinue,
EndpointError,
EndpointResponseError,
EndpointValidationError,
InvalidSessionMiddleware,
login,
logout
} from "../../main/resources/META-INF/resources/frontend/Connect";
import {openDB} from "idb";
=======
import { ConnectClient, EndpointError, E... |
<<<<<<<
networks?: string[];
=======
row: number;
column: number;
rowLength: number;
children: NodeChild;
>>>>>>>
networks?: string[];
row: number;
column: number;
rowLength: number;
children: NodeChild;
<<<<<<<
export type Roots = {
[service: string]: boolean | number;
};
export type Network... |
<<<<<<<
/**
* Gets the last block on the blockchain.
*/
getLastBlock (): Promise<Block>;
=======
/**
* Gets Sidetree transactions in chronological order.
* The function call may not return all known transactions, moreTransaction indicates if there are more transactions to be fetched.
* When aft... |
<<<<<<<
let operationProcessor = createOperationProcessor(cas, 'did:sidetree:');
let createOp: WriteOperation | undefined;
=======
let operationProcessor = createOperationProcessor(cas, didMethodName);
let createOp;
>>>>>>>
let operationProcessor = createOperationProcessor(cas, didMethodName);
let create... |
<<<<<<<
=======
let isAzure = false;
>>>>>>> |
<<<<<<<
draggable: boolean;
=======
resizeColumn: boolean;
>>>>>>>
resizeColumn: boolean;
draggable: boolean; |
<<<<<<<
public schemaDefinitionResolver!: SchemaDefinitionResolver;
public maxInlinedParameters!: number;
=======
public schemaDefinitionResolver: SchemaDefinitionResolver;
>>>>>>>
public schemaDefinitionResolver!: SchemaDefinitionResolver;
<<<<<<<
const value = await this.state.getValue(key);
retur... |
<<<<<<<
// Syndicate Pirate Raids hook. If it is in effect, then only the syndicate pirate raider will
// retrieve their fleets.
// See Colony.ts for the other half of this effect, and Game.ts which disables it.
if (this.game.syndicatePirateRaider === undefined) {
this.tradesThisTurn = 0;
} el... |
<<<<<<<
public play(player: Player) {
player.victoryPoints++;
=======
public play(player: Player, _game: Game) {
>>>>>>>
public play(player: Player) { |
<<<<<<<
it('Should play', function() {
expect(card.canPlay(player)).is.true;
=======
it('Works in solo mode', function() {
game = Game.newInstance('foobar', [player], player);
expect(card.canPlay()).is.true;
expect(card.play(player, game)).is.undefined;
expect(game.someoneHasRemovedOtherPlayer... |
<<<<<<<
private useTurmoilExtension: boolean = false;
constructor(usePreludeExtension: boolean, useVenusNextExtension: boolean, useColoniesNextExtension: boolean, useTurmoilExtension: boolean, _seed?: number) {
=======
private usePromoCards: boolean = false;
constructor(usePreludeExtension: boolean, u... |
<<<<<<<
private generationPlayed: Map<CardName, number> = new Map();
=======
>>>>>>>
<<<<<<<
generationPlayed: Array.from(this.generationPlayed),
=======
// TODO(kberg): Recast to Map<CardName, number>, make sure it survives JSONification.
>>>>>>>
<<<<<<<
// Rebuild generation played m... |
<<<<<<<
=======
import {GlobalParameter} from '../../GlobalParameter';
import {Units} from '../../Units';
>>>>>>>
import {Units} from '../../Units'; |
<<<<<<<
rulingParty: undefined | IParty | PartyName;
dominantParty: undefined | IParty | PartyName;
=======
rulingParty: IParty;
dominantParty: IParty;
>>>>>>>
rulingParty: IParty | PartyName;
dominantParty: IParty | PartyName; |
<<<<<<<
import { Astrodrill } from "./cards/promo/Astrodrill";
=======
import { AsteroidHollowing } from "./cards/promo/AsteroidHollowing";
import { DeimosDownPromo } from "./cards/promo/DeimosDownPromo";
import { GreatDamPromo } from "./cards/promo/GreatDamPromo";
import { MagneticFieldGeneratorsPromo } from "./card... |
<<<<<<<
import {TestingUtils, setCustomGameOptions, TestPlayers} from './TestingUtils';
=======
import {maxOutOceans, setCustomGameOptions} from './TestingUtils';
import {TestPlayers} from './TestPlayers';
>>>>>>>
import {TestingUtils, setCustomGameOptions} from './TestingUtils';
import {TestPlayers} from './TestPla... |
<<<<<<<
// {cardName: CardName.TEMPEST_CONSULTANCY, Factory: TempestConsultancy, compatibility: GameModule.Turmoil},
{cardName: CardName.THE_DARKSIDE_OF_THE_MOON_SYNDICATE, Factory: TheDarksideofTheMoonSyndicate},
=======
// {cardName: CardName.THE_DARKSIDE_OF_THE_MOON_SYNDICATE, Factory: TheDarksideofThe... |
<<<<<<<
card.play(player, game); // can decrease own production
const input = game.deferredActions.peek()!.execute();
=======
card.play(player); // can decrease own production
const input = game.deferredActions.next()!.execute();
>>>>>>>
card.play(player); // can decrease own production
const... |
<<<<<<<
import { AsteroidHollowing } from "./cards/promo/AsteroidHollowing";
=======
import { DeimosDownPromo } from "./cards/promo/DeimosDownPromo";
import { GreatDamPromo } from "./cards/promo/GreatDamPromo";
import { MagneticFieldGeneratorsPromo } from "./cards/promo/MagneticFieldGeneratorsPromo";
>>>>>>>
import ... |
<<<<<<<
import {Capital} from '../../../src/cards/Capital';
import {TestPlayers} from '../../TestingUtils';
=======
import {Capital} from '../../../src/cards/base/Capital';
>>>>>>>
import {TestPlayers} from '../../TestingUtils';
import {Capital} from '../../../src/cards/base/Capital'; |
<<<<<<<
import { Card } from "./card/Card";
import {
ALL_PRELUDE_PROJECTS_CARDS,
ALL_VENUS_PROJECTS_CARDS,
ALL_COLONIES_PROJECTS_CARDS,
ALL_TURMOIL_PROJECTS_CARDS,
ALL_PROMO_PROJECTS_CARDS,
ALL_PROJECT_CARDS,
ALL_CORP_ERA_PROJECT_CARDS,
ALL_CORPORATION_CARDS,
ALL_CORP_ERA_CORPORATION... |
<<<<<<<
customCorporationsList: Array<CardName>
=======
customCorporationsList: boolean,
corporations: Array<CardName>,
solarPhaseOption: boolean
>>>>>>>
customCorporationsList: Array<CardName>;
solarPhaseOption: boolean;
<<<<<<<
customCorporationsList: []
=======
customCorporation... |
<<<<<<<
=======
const card = new GiantSolarShade();
const player = TestPlayers.BLUE.newPlayer();
const redPlayer = TestPlayers.RED.newPlayer();
const game = Game.newInstance('foobar', [player, redPlayer], player);
>>>>>>>
<<<<<<<
game.turmoil!.rulingParty = new Reds();
PoliticalAgendas.setNe... |
<<<<<<<
export class WavePower implements IProjectCard {
public tags = [Tags.ENERGY];
public cost = 8;
public name = CardName.WAVE_POWER;
public cardType = CardType.AUTOMATED;
public canPlay(player: Player, game: Game): boolean {
return game.checkMinRequirements(player, GlobalParameter.OCEANS,... |
<<<<<<<
player.addResourceTo(this);
=======
this.resourceCount++;
LogHelper.logAddResource(game, player, this);
>>>>>>>
player.addResourceTo(this);
LogHelper.logAddResource(game, player, this);
<<<<<<<
player.addResourceTo(this);
=======
... |
<<<<<<<
import {SerializedPoliticalAgendasData} from './PoliticalAgendas';
=======
import {NeutralPlayer} from './Turmoil';
import {PlayerId} from '../Player';
>>>>>>>
import {SerializedPoliticalAgendasData} from './PoliticalAgendas';
import {NeutralPlayer} from './Turmoil';
import {PlayerId} from '../Player'; |
<<<<<<<
import {TurmoilPolicy} from './turmoil/TurmoilPolicy';
=======
import {CardLoader} from './CardLoader';
>>>>>>>
import {TurmoilPolicy} from './turmoil/TurmoilPolicy';
import {CardLoader} from './CardLoader';
<<<<<<<
this.turmoil = Turmoil.newInstance(this, gameOptions.politicalAgendasExtension);
====... |
<<<<<<<
public name = CardName.RESTRICTED_AREA_ARES;
public adjacencyBonus: IAdjacencyBonus = {bonus: [SpaceBonus.DRAW_CARD]};
public metadata: CardMetadata = {
cardNumber: 'A24',
renderData: CardRenderer.builder((b) => {
b.action('Spend 2 MC to draw a card.', (eb) => {
eb.megacredits(2).st... |
<<<<<<<
import { CardType } from "./cards/CardType";
=======
import { ColonyModel } from "./models/ColonyModel";
>>>>>>>
import { CardType } from "./cards/CardType";
import { ColonyModel } from "./models/ColonyModel"; |
<<<<<<<
const { solution, options } = action.payload
// If the solution options show it as untrusted, but the newly-received options set untrusted to false,
// go ahead and dismiss the message bar.
if (solution.options.isUntrusted && options.isUntrusted === false) {
yield put(messageBar.dismiss())
=======
... |
<<<<<<<
{cardName: CardName.THE_GRAND_LUNA_CAPITAL_GROUP, Factory: TheGrandLunaCapitalGroup},
// {cardName: CardName.INTRAGEN_SANCTUARY_HEADQUARTERS, Factory: IntragenSanctuaryHeadquarters},
=======
// {cardName: CardName.THE_GRAND_LUNA_CAPITAL_GROUP, Factory: TheGrandLunaCapitalGroup},
{cardName: Car... |
<<<<<<<
if (this.canUseMicrobesAsMegaCreditsForPlants && howToPay.microbes !== undefined) {
totalToPay += howToPay.microbes * 2;
}
=======
if (howToPay.megaCredits > this.megaCredits) {
throw "Do not have enough mega credits";
}
>>>>>>... |
<<<<<<<
} else if (type === TileType.GREAT_DAM) {
classes.push('card-tile-symbol-great-dam');
=======
} else if (type === TileType.ECOLOGICAL_ZONE) {
classes.push('card-tile-symbol-ecological-zone');
>>>>>>>
} else if (type === TileType.GREAT_DAM) {
classes.push(... |
<<<<<<<
import {TurmoilHandler} from './turmoil/TurmoilHandler';
import {TurmoilPolicy} from './turmoil/TurmoilPolicy';
=======
import {StandardProjectCard} from './cards/standardProjects/StandardProjectCard';
import {GameLoader} from './database/GameLoader';
import {CardLoader} from './CardLoader';
>>>>>>>
import {... |
<<<<<<<
card.play(player, game);
const input = game.deferredActions.peek()!.execute();
=======
card.play(player);
const input = game.deferredActions.next()!.execute();
>>>>>>>
card.play(player);
const input = game.deferredActions.peek()!.execute(); |
<<<<<<<
import {Player} from '../Player';
import {Game} from '../Game';
=======
import {Units} from '../Units';
>>>>>>>
import {Player} from '../Player';
import {Game} from '../Game';
import {Units} from '../Units';
<<<<<<<
public canPlay(player: Player, _game?: Game) {
if (this.properties.metadata.requiremen... |
<<<<<<<
import {Bonus} from '../Bonus';
import {Policy} from '../Policy';
=======
import {PlayerId} from '../../Player';
import {NeutralPlayer} from '../Turmoil';
>>>>>>>
import {Bonus} from '../Bonus';
import {Policy} from '../Policy';
import {PlayerId} from '../../Player';
import {NeutralPlayer} from '../Turmoil'... |
<<<<<<<
// import {TheArchaicFoundationInstitute} from './TheArchaicFoundationInstitute';
import {TheDarksideofTheMoonSyndicate} from './TheDarksideofTheMoonSyndicate';
import {TheGrandLunaCapitalGroup} from './TheGrandLunaCapitalGroup';
=======
import {TheArchaicFoundationInstitute} from './TheArchaicFoundationInsti... |
<<<<<<<
public play(player: Player) {
player.game.defer(new DiscardCards(player));
player.game.defer(DrawCards.keepAll(player, 3));
const otherPlayers = player.game.getPlayers().filter((p) => p.id !== player.id);
=======
public play(player: Player, game: Game) {
game.defer(new DiscardCards(player)... |
<<<<<<<
import { ICard } from "../ICard";
=======
import { PartyHooks } from "../../turmoil/parties/PartyHooks";
import { PartyName } from "../../turmoil/parties/PartyName";
import { REDS_RULING_POLICY_COST } from "../../constants";
>>>>>>>
import { ICard } from "../ICard";
import { PartyHooks } from "../../turmoil/... |
<<<<<<<
public cb: (howToPay: HowToPay) => SelectSpace | undefined,
public amount: number = 0 ) {
=======
public amount: number,
public cb: (howToPay: HowToPay) => SelectSpace | undefined) {
>>>>>>>
public amount: number,
public cb: (howToPay: HowToPay) => SelectSpace... |
<<<<<<<
card.play(player, game);
const input = game.deferredActions.peek()!.execute();
=======
card.play(player);
const input = game.deferredActions.next()!.execute();
>>>>>>>
card.play(player);
const input = game.deferredActions.peek()!.execute(); |
<<<<<<<
import { AresHandler } from "./ares/AresHandler";
=======
import { RandomMAOptionType } from "./RandomMAOptionType";
>>>>>>>
import { RandomMAOptionType } from "./RandomMAOptionType";
import { AresHandler } from "./ares/AresHandler"; |
<<<<<<<
public tile(selector: string): Builder {
this._addTile(selector);
return this;
}
=======
/**
* add non breakable space or simply empty space between items
*/
public get nbsp(): Builder {
this._checkExistingItem();
this._addSymbol(CardRenderSymbol.nbsp());
return this;
}
... |
<<<<<<<
const bonusText = bonuses.entries().map((elem) => `${elem[1]} ${bonusAsString(elem[0])}`).join(', ');
const tileText = tileTypeAsString(adjacentSpace.tile?.tileType);
player.game.log('${0} gains ${1} for placing next to ${2}', (b) => b.player(player).string(bonusText).string(tileText));
=======
... |
<<<<<<<
import {TurmoilHandler} from './turmoil/TurmoilHandler';
import {TurmoilPolicy} from './turmoil/TurmoilPolicy';
import {StandardProjectCard} from './cards/standardProjects/StandardProjectCard';
=======
>>>>>>>
import {TurmoilHandler} from './turmoil/TurmoilHandler';
import {TurmoilPolicy} from './turmoil/Tur... |
<<<<<<<
// {cardName: CardName.REVOLTING_COLONISTS, Factory: RevoltingColonists},
// {cardName: CardName.COSMIC_RADIATION, Factory: CosmicRadiation},
{cardName: CardName.OFF_WORLD_CITY_LIVING, Factory: OffWorldCityLiving},
=======
{cardName: CardName.REVOLTING_COLONISTS, Factory: RevoltingColonist... |
<<<<<<<
{cardName: CardName.HE3_PRODUCTION_QUOTAS, Factory: HE3ProductionQuotas, compatibility: GameModule.Turmoil},
// {cardName: CardName.LUNA_CONFERENCE, Factory: LunaConference, compatibility: GameModule.Turmoil},
=======
// {cardName: CardName.HE3_PRODUCTION_QUOTAS, Factory: HE3ProductionQuotas, ... |
<<<<<<<
maxPay += this.spendableMegacredits();
return maxPay >= this.getCardCost(card) &&
(card.canPlay === undefined || card.canPlay(this));
=======
return canAfford && (card.canPlay === undefined || card.canPlay(this, this.game));
>>>>>>>
return canAfford && (card.canPlay === undefi... |
<<<<<<<
status.add(`Processing ${file.host}::${file.file_name}`);
let { name, description } = await loadYamlFile<{ name: string, description: string }>(path.resolve('samples', file.path));
status.complete(`Processing ${file.host}::${file.file_name}`);
=======
... |
<<<<<<<
export class Windmills implements IProjectCard {
public cost = 6;
public tags = [Tags.ENERGY, Tags.BUILDING];
public name = CardName.WINDMILLS;
public cardType = CardType.AUTOMATED;
public canPlay(player: Player, game: Game): boolean {
return game.checkMinRequirements(player, GlobalPar... |
<<<<<<<
public addPlayCardDeferredAction(player: Player, game: Game) {
const playableCards = player.cardsInHand.filter((card) => card.resourceType === ResourceType.FLOATER && card.tags.indexOf(Tags.VENUS) !== -1);
=======
public addPlayCardInterrupt(player: Player, game: Game) {
c... |
<<<<<<<
type LoadCallback = (game: Game | undefined) => void;
=======
enum State { WAITING, LOADING, READY }
>>>>>>>
type LoadCallback = (game: Game | undefined) => void;
enum State { WAITING, LOADING, READY }
<<<<<<<
public getGameByGameId(gameId: string, cb: LoadCallback): void {
if (this.loadedGames... |
<<<<<<<
game = new Game('foobar', [player, redPlayer], player, gameOptions);
});
it('Should play: reds', function() {
game.turmoil!.rulingParty = game.turmoil!.getPartyByName(PartyName.REDS)!;
PoliticalAgendas.setNextAgenda(game.turmoil!, game);
expect(card.canPlay(player, game)).is.not.true;
});... |
<<<<<<<
import {TheArchaicFoundationInstitute} from './TheArchaicFoundationInstitute';
=======
import {TempestConsultancy} from './TempestConsultancy';
// import {TheArchaicFoundationInstitute} from './TheArchaicFoundationInstitute';
>>>>>>>
import {TempestConsultancy} from './TempestConsultancy';
import {TheArchaic... |
<<<<<<<
public turmoil: Turmoil | undefined;
=======
private promoCardsOption: boolean;
private startingCorporations: number;
>>>>>>>
public turmoil: Turmoil | undefined;
private promoCardsOption: boolean;
private startingCorporations: number;
<<<<<<<
this.turmoilExtension = gameOptio... |
<<<<<<<
WINDMILLS = "Windmills",
AERIAL_MAPPERS = "Aerial Mappers",
AEROSPORT_TOURNAMENT = "Aerosport Tournament",
AIR_SCRAPPING_EXPEDITION = "Air-Scrapping Expedition",
APHRODITE = "Aphrodite",
ATALANTA_PLANITIA_LAB = "Atalanta Planitia Lab",
ATMOSCOOP = "Atmoscoop",
CELESTIC = "Celest... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
public getResourceCards(resource: ResourceType): Array<IProjectCard> {
const result: Array<IProjectCard> = [];
this.playedCards.forEach((card) => {
if (card.resourceType !== undefined && card.resourceType === resource) {
result.push(card);
... |
<<<<<<<
export class QuantumExtractor implements IProjectCard {
public cost = 13;
public tags = [Tags.SCIENCE, Tags.ENERGY];
public name = CardName.QUANTUM_EXTRACTOR;
public cardType = CardType.ACTIVE;
public canPlay(player: Player): boolean {
return player.getTagCount(Tags.SCIENCE) >= 4;
... |
<<<<<<<
game.runNextInterrupt(() => {});
expect(player.megaCredits).to.eq(9);
expect(player.cardsInHand.length).to.eq(1);
=======
expect(player.megaCredits).to.eq(11);
expect(player.cardsInHand.length).to.eq(3);
>>>>>>>
game.runNextInterrupt(() => {});
expect(p... |
<<<<<<<
import { ProjectInspection } from "./cards/promo/ProjectInspection";
=======
import { OrbitalCleanup } from "./cards/promo/OrbitalCleanup";
>>>>>>>
import { OrbitalCleanup } from "./cards/promo/OrbitalCleanup";
import { ProjectInspection } from "./cards/promo/ProjectInspection";
<<<<<<<
{ cardName: Card... |
<<<<<<<
requirements: CardRequirements.builder((b) => b.party(PartyName.KELVINISTS).miningTiles(1)),
=======
requirements: CardRequirements.builder((b) => b.party(PartyName.KELVINISTS).miningTiles(1).any()),
>>>>>>>
requirements: CardRequirements.builder((b) => b.party(PartyName.KELVINISTS).miningT... |
<<<<<<<
export class VenusianAnimals implements IProjectCard, IResourceCard {
public cost = 15;
public tags = [Tags.VENUS, Tags.ANIMAL, Tags.SCIENCE];
public name = CardName.VENUSIAN_ANIMALS;
public cardType = CardType.ACTIVE;
public resourceType = ResourceType.ANIMAL;
public resourceCount: numb... |
<<<<<<<
public onStandardProject(projectType: StandardProjectCard): void {
if (this.corporationCard !== undefined && this.corporationCard.onStandardProject!== undefined) {
this.corporationCard.onStandardProject(this, projectType);
}
for (const playedCard of this.playedCards) {
if (playedCard.... |
<<<<<<<
if (this.chairman !== 'NEUTRAL') {
const player = game.getPlayerById(this.chairman);
player.increaseTerraformRating();
game.log('${0} is the new chairman and got 1 TR increase', (b) => b.player(player));
} else {
game.log('A neutral delegate is the new cha... |
<<<<<<<
=======
import {GlobalParameter} from '../../GlobalParameter';
import {Units} from '../../Units';
>>>>>>>
import {Units} from '../../Units'; |
<<<<<<<
{cardName: CardName.LUNAR_STEEL, Factory: LunarSteel},
// {cardName: CardName.RUST_EATING_BACTERIA, Factory: RustEatingBacteria},
=======
// {cardName: CardName.LUNAR_STEEL, Factory: LunarSteel},
{cardName: CardName.RUST_EATING_BACTERIA, Factory: RustEatingBacteria},
>>>>>>>
{cardName... |
<<<<<<<
card.action(player);
expect(player.game.deferredActions).has.lengthOf(1);
const selectHowToPay = player.game.deferredActions.next()!.execute() as SelectHowToPay;
=======
card.action(player, game);
expect(game.deferredActions).has.lengthOf(1);
const selectHowToPay = game.deferredActions... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.