conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
private _mineEnergy: KnockoutObservable<number>;
private _maxMineEnergy: KnockoutObservable<number>;
private _mineEnergyGain: number;
private _mineInventory: KnockoutObservableArray<any>;
private _diamonds: KnockoutObservable<number>;
private _maxDailyDeals: number;
=======
private _shardUpgrades: Array<Array<KnockoutObservable<number>>>;
private _shardsCollected: Array<KnockoutObservable<number>>;
>>>>>>>
private _mineEnergy: KnockoutObservable<number>;
private _maxMineEnergy: KnockoutObservable<number>;
private _mineEnergyGain: number;
private _mineInventory: KnockoutObservableArray<any>;
private _diamonds: KnockoutObservable<number>;
private _maxDailyDeals: number;
private _shardUpgrades: Array<Array<KnockoutObservable<number>>>;
private _shardsCollected: Array<KnockoutObservable<number>>;
<<<<<<<
this._mineEnergy = ko.observable((typeof savedPlayer._mineEnergy == 'number') ? savedPlayer._mineEnergy : 50);
this._maxMineEnergy = ko.observable(savedPlayer._maxMineEnergy || 50);
this._mineEnergyGain = savedPlayer._mineEnergyGain || 3;
this._mineInventory = ko.observableArray(savedPlayer._mineInventory || []);
for (let item of this._mineInventory()) {
item.amount = ko.observable(item.amount);
}
this._diamonds = ko.observable(savedPlayer._diamonds || 0);
this._maxDailyDeals = savedPlayer._maxDailyDeals || 3;
=======
savedPlayer._eggList = savedPlayer._eggList || [null, null, null, null];
this._eggList = savedPlayer._eggList.map((egg) => {
return ko.observable( egg ? new Egg(egg.totalSteps, egg.pokemon, egg.type, egg.steps, egg.shinySteps, egg.notified) : null )
});
this._eggSlots = ko.observable(savedPlayer._eggSlots != null ? savedPlayer._eggSlots : 1);
this._shardUpgrades = Save.initializeShards(savedPlayer._shardUpgrades);
this._shardsCollected = Array.apply(null, Array<number>(18)).map((value, index) => {
return ko.observable(savedPlayer._shardsCollected ? savedPlayer._shardsCollected[index] : 0);
});
>>>>>>>
this._mineEnergy = ko.observable((typeof savedPlayer._mineEnergy == 'number') ? savedPlayer._mineEnergy : 50);
this._maxMineEnergy = ko.observable(savedPlayer._maxMineEnergy || 50);
this._mineEnergyGain = savedPlayer._mineEnergyGain || 3;
this._mineInventory = ko.observableArray(savedPlayer._mineInventory || []);
for (let item of this._mineInventory()) {
item.amount = ko.observable(item.amount);
}
this._diamonds = ko.observable(savedPlayer._diamonds || 0);
this._maxDailyDeals = savedPlayer._maxDailyDeals || 3;
savedPlayer._eggList = savedPlayer._eggList || [null, null, null, null];
this._eggList = savedPlayer._eggList.map((egg) => {
return ko.observable( egg ? new Egg(egg.totalSteps, egg.pokemon, egg.type, egg.steps, egg.shinySteps, egg.notified) : null )
});
this._eggSlots = ko.observable(savedPlayer._eggSlots != null ? savedPlayer._eggSlots : 1);
this._shardUpgrades = Save.initializeShards(savedPlayer._shardUpgrades);
this._shardsCollected = Array.apply(null, Array<number>(18)).map((value, index) => {
return ko.observable(savedPlayer._shardsCollected ? savedPlayer._shardsCollected[index] : 0);
});
<<<<<<<
get mineEnergy() {
return this._mineEnergy();
}
set mineEnergy(n: number) {
this._mineEnergy(n);
}
get diamonds() {
return this._diamonds();
}
set diamonds(n: number) {
this._diamonds(n);
}
=======
get eggList(): Array<KnockoutObservable<Egg|void>> {
return this._eggList;
}
set eggList(value: Array<KnockoutObservable<Egg|void>>) {
this._eggList = value;
}
get eggSlots(): KnockoutObservable<number> {
return this._eggSlots;
}
public gainEggSlot() {
this._eggSlots(this._eggSlots() + 1);
}
get shardUpgrades(): Array<Array<KnockoutObservable<number>>> {
return this._shardUpgrades;
}
set shardUpgrades(value: Array<Array<KnockoutObservable<number>>>) {
this._shardUpgrades = value;
}
get shardsCollected(): Array<KnockoutObservable<number>> {
return this._shardsCollected;
}
set shardsCollected(value: Array<KnockoutObservable<number>>) {
this._shardsCollected = value;
}
>>>>>>>
get mineEnergy() {
return this._mineEnergy();
}
set mineEnergy(n: number) {
this._mineEnergy(n);
}
get diamonds() {
return this._diamonds();
}
set diamonds(n: number) {
this._diamonds(n);
}
get eggList(): Array<KnockoutObservable<Egg|void>> {
return this._eggList;
}
set eggList(value: Array<KnockoutObservable<Egg|void>>) {
this._eggList = value;
}
get eggSlots(): KnockoutObservable<number> {
return this._eggSlots;
}
public gainEggSlot() {
this._eggSlots(this._eggSlots() + 1);
}
get shardUpgrades(): Array<Array<KnockoutObservable<number>>> {
return this._shardUpgrades;
}
set shardUpgrades(value: Array<Array<KnockoutObservable<number>>>) {
this._shardUpgrades = value;
}
get shardsCollected(): Array<KnockoutObservable<number>> {
return this._shardsCollected;
}
set shardsCollected(value: Array<KnockoutObservable<number>>) {
this._shardsCollected = value;
}
<<<<<<<
"_keyItems",
"_mineEnergy",
"_maxMineEnergy",
"_mineEnergyGain",
"_mineInventory",
"_maxDailyDeals"];
=======
"_keyItems",
"_eggList",
"_eggSlots",
"_shardUpgrades",
"_shardsCollected"
];
>>>>>>>
"_keyItems",
"_mineEnergy",
"_maxMineEnergy",
"_mineEnergyGain",
"_mineInventory",
"_maxDailyDeals",
"_eggList",
"_eggSlots",
"_shardUpgrades",
"_shardsCollected"
]; |
<<<<<<<
//Safari
export const Safari = {
"SizeY": 21,
"SizeX": 25,
}
export const SAFARI_BATTLE_CHANCE = 5;
export const LEGAL_WALK_BLOCKS = [
0,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
20,
21,
22,
23,
24
];
export const SAFARI_CATCH_MESSAGES = [
"Oh, no!<br>The Pokemon broke free!",
"Aww! It appeared to be caught!",
"Aargh! Almost had it!",
"Shoot! It was so close, too!"
];
export const SAFARI_OUT_OF_BALLS = "Game Over!<br>You have run out of safari balls to use."
=======
//Quests
// Numbers calculated by Dimava assumes ability to 1 shot on high routes and some use oak items,
// which are now nerfed slightly until upgraded, so those numbers may need further adjusting
const questBase = 1; // change this to scale all quest points
export const DEFEAT_POKEMONS_BASE_REWARD = questBase * 1;
export const CAPTURE_POKEMONS_BASE_REWARD = GameConstants.DEFEAT_POKEMONS_BASE_REWARD / 0.8; // Defeat reward divided by chance to catch (guessed)
export const GAIN_MONEY_BASE_REWARD = questBase * 0.0017; // Dimava
export const GAIN_TOKENS_BASE_REWARD = CAPTURE_POKEMONS_BASE_REWARD / 13 // <route number> tokens gained for every capture
export const HATCH_EGGS_BASE_REWARD = questBase * 33; // Dimava
export const MINE_LAYERS_BASE_REWARD = questBase * 720; // Average of 1/4 squares revealed = 75 energy ~ 12 minutes ~ 720 pokemons
export const SHINY_BASE_REWARD = questBase * 6000; // Dimava
export const USE_OAK_ITEM_BASE_REWARD = GameConstants.DEFEAT_POKEMONS_BASE_REWARD; // not balanced at all for some oak items
export const ACTIVE_QUEST_MULTIPLIER = 4;
export const QuestTypes = [
"DefeatPokemons",
"CapturePokemons",
"GainMoney",
"GainTokens",
"GainShards",
"HatchEggs",
"MineLayers",
"CatchShinies",
"DefeatGym",
"DefeatDungeon",
"UsePokeball",
"UseOakItem",
];
export const QUESTS_PER_SET = 10;
>>>>>>>
//Safari
export const Safari = {
"SizeY": 21,
"SizeX": 25,
}
export const SAFARI_BATTLE_CHANCE = 5;
export const LEGAL_WALK_BLOCKS = [
0,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
20,
21,
22,
23,
24
];
export const SAFARI_CATCH_MESSAGES = [
"Oh, no!<br>The Pokemon broke free!",
"Aww! It appeared to be caught!",
"Aargh! Almost had it!",
"Shoot! It was so close, too!"
];
export const SAFARI_OUT_OF_BALLS = "Game Over!<br>You have run out of safari balls to use."
//Quests
// Numbers calculated by Dimava assumes ability to 1 shot on high routes and some use oak items,
// which are now nerfed slightly until upgraded, so those numbers may need further adjusting
const questBase = 1; // change this to scale all quest points
export const DEFEAT_POKEMONS_BASE_REWARD = questBase * 1;
export const CAPTURE_POKEMONS_BASE_REWARD = GameConstants.DEFEAT_POKEMONS_BASE_REWARD / 0.8; // Defeat reward divided by chance to catch (guessed)
export const GAIN_MONEY_BASE_REWARD = questBase * 0.0017; // Dimava
export const GAIN_TOKENS_BASE_REWARD = CAPTURE_POKEMONS_BASE_REWARD / 13 // <route number> tokens gained for every capture
export const HATCH_EGGS_BASE_REWARD = questBase * 33; // Dimava
export const MINE_LAYERS_BASE_REWARD = questBase * 720; // Average of 1/4 squares revealed = 75 energy ~ 12 minutes ~ 720 pokemons
export const SHINY_BASE_REWARD = questBase * 6000; // Dimava
export const USE_OAK_ITEM_BASE_REWARD = GameConstants.DEFEAT_POKEMONS_BASE_REWARD; // not balanced at all for some oak items
export const ACTIVE_QUEST_MULTIPLIER = 4;
export const QuestTypes = [
"DefeatPokemons",
"CapturePokemons",
"GainMoney",
"GainTokens",
"GainShards",
"HatchEggs",
"MineLayers",
"CatchShinies",
"DefeatGym",
"DefeatDungeon",
"UsePokeball",
"UseOakItem",
];
export const QUESTS_PER_SET = 10; |
<<<<<<<
User,
Registry,
Feedback,
Course,
=======
>>>>>>>
Registry,
<<<<<<<
export {
Stage,
User,
Registry,
TaskChecker,
Feedback,
TaskArtefact,
CourseTask,
Course,
Task,
Student,
Mentor,
TaskResult,
};
=======
export {
Course,
CourseTask,
Feedback,
Mentor,
Stage,
Student,
Task,
TaskArtefact,
TaskChecker,
TaskInterviewResult,
TaskResult,
User,
StudentFeedback,
};
>>>>>>>
export {
Course,
CourseTask,
Feedback,
Mentor,
Stage,
Student,
Registry,
Task,
TaskArtefact,
TaskChecker,
TaskInterviewResult,
TaskResult,
User,
StudentFeedback,
}; |
<<<<<<<
TownList["Pewter City"] = new Town("Pewter City", [2], new Shop([ItemList["Pokeball"], ItemList["Greatball"]]));
TownList["Cerulean City"] = new Town("Cerulean City", [4]);
=======
TownList["Pewter City"] = new Town("Pewter City", [2]);
TownList["Cerulean City"] = new Town("Cerulean City", [4], null, dungeonList["Cerulean Cave"]);
>>>>>>>
TownList["Pewter City"] = new Town("Pewter City", [2], new Shop([ItemList["Pokeball"], ItemList["Greatball"]]));
TownList["Cerulean City"] = new Town("Cerulean City", [4], null, dungeonList["Cerulean Cave"]); |
<<<<<<<
BreedingHelper.progressEggs(Math.floor(Math.sqrt(this.gym.badgeReq * 3 + 1)));
=======
player.gainShards(this.enemyPokemon());
>>>>>>>
BreedingHelper.progressEggs(Math.floor(Math.sqrt(this.gym.badgeReq * 3 + 1)));
player.gainShards(this.enemyPokemon()); |
<<<<<<<
if (!isNaN(route) && !(route == Player.route())) {
=======
console.log("called");
console.log(region);
if (!isNaN(route) && !(route == player.route())) {
>>>>>>>
if (!isNaN(route) && !(route == player.route())) {
<<<<<<<
Game.gameState(GameConstants.GameState.fighting);
$("[data-route='" + Player.route() + "']").removeClass('currentRoute').addClass('unlockedRoute');
Player.route(route);
$("[data-route='" + route + "']").removeClass('unlockedRoute').addClass('currentRoute');
=======
$("[data-route='" + player.route() + "']").removeClass('currentRoute').addClass('unlockedRoute');
player.route(route);
$("[data-route='" + route + "']").removeClass('unlockedRoute').addClass('currentRoute')
>>>>>>>
Game.gameState(GameConstants.GameState.fighting);
$("[data-route='" + player.route() + "']").removeClass('currentRoute').addClass('unlockedRoute');
player.route(route);
$("[data-route='" + route + "']").removeClass('unlockedRoute').addClass('currentRoute');
<<<<<<<
if (!Player.hasBadge(GameConstants.routeBadgeRequirements[region][route])) {
=======
console.log("Checking route: " + route);
if (!player.hasBadge(GameConstants.routeBadgeRequirements[region][route])) {
console.log("Missing badge: " + GameConstants.routeBadgeRequirements[region][route]);
>>>>>>>
if (!player.hasBadge(GameConstants.routeBadgeRequirements[region][route])) {
<<<<<<<
if (Player.routeKillsObservable(route)() < Player.routeKillsNeeded()) {
=======
if (player.routeKillsObservable(route)() < player.routeKillsNeeded) {
console.log("Not enough kills on route: " + route);
>>>>>>>
if (player.routeKillsObservable(route)() < player.routeKillsNeeded) { |
<<<<<<<
private _routeKills: Array<KnockoutObservable<number>>;
private _routeKillsNeeded: KnockoutObservable<number>;
private _region: GameConstants.Region;
private _gymBadges: KnockoutObservableArray<GameConstants.Badge>;
private _pokeballs: Array<KnockoutObservable<number>>;
private _notCaughtBallSelection: KnockoutObservable<GameConstants.Pokeball>;
private _alreadyCaughtBallSelection: KnockoutObservable<GameConstants.Pokeball>;
private _sortOption: KnockoutObservable<GameConstants.SortOptionsEnum>;
private _sortDescending: KnockoutObservable<boolean>;
private _town: KnockoutObservable<Town>;
private _starter: GameConstants.Starter;
private _oakItemExp: Array<KnockoutObservable<number>>;
private _oakItemsEquipped: string[];
private _itemList: {[name: string]: number};
private _itemMultipliers: {[name: string]: number};
private _eggList: Array<KnockoutObservable<Egg|void>>;
private _eggSlots: KnockoutObservable<number>;
private _shardUpgrades: Array<Array<KnockoutObservable<number>>>;
private _shardsCollected: Array<KnockoutObservable<number>>;
private _keyItems: KnockoutObservableArray<string> = ko.observableArray<string>();
public clickAttackObservable: KnockoutComputed<number>;
public recentKeyItem: KnockoutObservable<string> = ko.observable("Teachy tv");
public pokemonAttackObservable: KnockoutComputed<number>;
public achievementsCompleted: {[name: string]: boolean};
public statistics: Statistics;
public routeKillsObservable(route: number): KnockoutComputed<number> {
return ko.computed(function () {
return Math.min(this.routeKillsNeeded, this.routeKills[route]());
}, this);
}
public pokeballsObservable(ball: GameConstants.Pokeball): KnockoutComputed<number> {
return ko.computed(function () {
return this._pokeballs[ball]();
}, this);
}
public setAlreadyCaughtBallSelection(ball: GameConstants.Pokeball) {
this._alreadyCaughtBallSelection(ball);
}
public setNotCaughtBallSelection(ball: GameConstants.Pokeball) {
this._notCaughtBallSelection(ball);
}
public gainPokeballs(ball: GameConstants.Pokeball, amount: number) {
this._pokeballs[ball](this._pokeballs[ball]() + amount)
}
public usePokeball(ball: GameConstants.Pokeball): void {
this._pokeballs[ball](this._pokeballs[ball]() - 1)
}
=======
>>>>>>>
<<<<<<<
"_shardsCollected",
"statistics",
=======
"_shardsCollected",
"achievementsCompleted"
>>>>>>>
"_shardsCollected",
"statistics",
"achievementsCompleted", |
<<<<<<<
private _caughtShinyList: KnockoutObservableArray<string>;
private _route: KnockoutObservable<number>;
private _caughtPokemonList: KnockoutObservableArray<CaughtPokemon>;
private _routeKills: Array<KnockoutObservable<number>>;
private _routeKillsNeeded: KnockoutObservable<number>;
private _region: GameConstants.Region;
private _gymBadges: KnockoutObservableArray<GameConstants.Badge>;
private _pokeballs: Array<KnockoutObservable<number>>;
private _notCaughtBallSelection: KnockoutObservable<GameConstants.Pokeball>;
private _alreadyCaughtBallSelection: KnockoutObservable<GameConstants.Pokeball>;
private _sortOption: KnockoutObservable<GameConstants.SortOptionsEnum>;
private _sortDescending: KnockoutObservable<boolean>;
private _town: KnockoutObservable<Town>;
private _starter: GameConstants.Starter;
private _oakItemExp: Array<KnockoutObservable<number>>;
private _oakItemsEquipped: string[];
private _eggList: Array<KnockoutObservable<Egg|void>>;
private _eggSlots: KnockoutObservable<number>;
private _itemList: { [name: string]: number };
private _itemMultipliers: { [name: string]: number };
private _mineEnergy: KnockoutObservable<number>;
private _maxMineEnergy: KnockoutObservable<number>;
private _mineEnergyGain: KnockoutObservable<number>;
private _mineInventory: KnockoutObservableArray<any>;
private _diamonds: KnockoutObservable<number>;
private _maxDailyDeals: KnockoutObservable<number>;
private _maxUndergroundItems: KnockoutObservable<number>;
private _mineEnergyRegenTime: KnockoutObservable<number>;
private _shardUpgrades: Array<Array<KnockoutObservable<number>>>;
private _shardsCollected: Array<KnockoutObservable<number>>;
private _keyItems: KnockoutObservableArray<string> = ko.observableArray<string>();
public clickAttackObservable: KnockoutComputed<number>;
public recentKeyItem: KnockoutObservable<string> = ko.observable("Teachy tv");
public pokemonAttackObservable: KnockoutComputed<number>;
public achievementsCompleted: {[name: string]: boolean};
public plotList: KnockoutObservable<Plot>[];
public farmPoints: KnockoutObservable<number>;
public berryList: KnockoutObservable<number>[];
public routeKillsObservable(route: number): KnockoutComputed<number> {
return ko.computed(function () {
return Math.min(this.routeKillsNeeded, this.routeKills[route]());
}, this);
}
public pokeballsObservable(ball: GameConstants.Pokeball): KnockoutComputed<number> {
return ko.computed(function () {
return this._pokeballs[ball]();
}, this);
}
public setAlreadyCaughtBallSelection(ball: GameConstants.Pokeball) {
this._alreadyCaughtBallSelection(ball);
}
public setNotCaughtBallSelection(ball: GameConstants.Pokeball) {
this._notCaughtBallSelection(ball);
}
public gainPokeballs(ball: GameConstants.Pokeball, amount: number) {
this._pokeballs[ball](this._pokeballs[ball]() + amount)
}
public usePokeball(ball: GameConstants.Pokeball): void {
this._pokeballs[ball](this._pokeballs[ball]() - 1)
}
=======
>>>>>>>
<<<<<<<
this.farmPoints = ko.observable(savedPlayer.farmPoints || 0);
this.berryList = Array.apply(null, Array(GameConstants.AMOUNT_OF_BERRIES)).map(function (val, index) {
return ko.observable(savedPlayer.berryList ? (savedPlayer.berryList[index] || 0) : 0)
});
this.plotList = Save.initializePlots(savedPlayer.plotList);
=======
let today = new Date();
let lastSeen = new Date(this._lastSeen);
if (today.toLocaleDateString() == lastSeen.toLocaleDateString()) {
this.questRefreshes = savedPlayer.questRefreshes;
if (savedPlayer.completedQuestList) {
this.completedQuestList = savedPlayer.completedQuestList.map((bool) => {return ko.observable(bool)});
} else {
this.completedQuestList = Array.apply(null, Array(GameConstants.QUESTS_PER_SET)).map(() => {return ko.observable(false)});
}
this.currentQuest = ko.observable(savedPlayer.currentQuest);
} else {
this.questRefreshes = 0;
this.completedQuestList = Array.apply(null, Array(GameConstants.QUESTS_PER_SET)).map(() => {return ko.observable(false)});
this.currentQuest = ko.observable(null);
}
this._questXP = ko.observable(savedPlayer._questXP || 0);
this._questPoints = ko.observable(savedPlayer._questPoints || 0);
this._shinyCatches = ko.observable(savedPlayer._shinyCatches || 0);
this._lastSeen = Date.now();
this.statistics = new Statistics(savedPlayer.statistics);
>>>>>>>
let today = new Date();
let lastSeen = new Date(this._lastSeen);
if (today.toLocaleDateString() == lastSeen.toLocaleDateString()) {
this.questRefreshes = savedPlayer.questRefreshes;
if (savedPlayer.completedQuestList) {
this.completedQuestList = savedPlayer.completedQuestList.map((bool) => {return ko.observable(bool)});
} else {
this.completedQuestList = Array.apply(null, Array(GameConstants.QUESTS_PER_SET)).map(() => {return ko.observable(false)});
}
this.currentQuest = ko.observable(savedPlayer.currentQuest);
} else {
this.questRefreshes = 0;
this.completedQuestList = Array.apply(null, Array(GameConstants.QUESTS_PER_SET)).map(() => {return ko.observable(false)});
this.currentQuest = ko.observable(null);
}
this._questXP = ko.observable(savedPlayer._questXP || 0);
this._questPoints = ko.observable(savedPlayer._questPoints || 0);
this._shinyCatches = ko.observable(savedPlayer._shinyCatches || 0);
this._lastSeen = Date.now();
this.statistics = new Statistics(savedPlayer.statistics);
this.farmPoints = ko.observable(savedPlayer.farmPoints || 0);
this.berryList = Array.apply(null, Array(GameConstants.AMOUNT_OF_BERRIES)).map(function (val, index) {
return ko.observable(savedPlayer.berryList ? (savedPlayer.berryList[index] || 0) : 0)
});
this.plotList = Save.initializePlots(savedPlayer.plotList);
<<<<<<<
=======
private _routeKills: Array<KnockoutObservable<number>>;
private _routeKillsNeeded: KnockoutObservable<number>;
private _region: GameConstants.Region;
private _gymBadges: KnockoutObservableArray<GameConstants.Badge>;
private _pokeballs: Array<KnockoutObservable<number>>;
private _notCaughtBallSelection: KnockoutObservable<GameConstants.Pokeball>;
private _alreadyCaughtBallSelection: KnockoutObservable<GameConstants.Pokeball>;
private _sortOption: KnockoutObservable<GameConstants.SortOptionsEnum>;
private _sortDescending: KnockoutObservable<boolean>;
private _town: KnockoutObservable<Town>;
private _currentTown: KnockoutObservable<string>;
private _starter: GameConstants.Starter;
private _oakItemExp: Array<KnockoutObservable<number>>;
private _oakItemsEquipped: string[];
private _eggList: Array<KnockoutObservable<Egg | void>>;
private _eggSlots: KnockoutObservable<number>;
private _itemList: { [name: string]: number };
private _itemMultipliers: { [name: string]: number };
private _mineEnergy: KnockoutObservable<number>;
private _maxMineEnergy: KnockoutObservable<number>;
private _mineEnergyGain: KnockoutObservable<number>;
private _mineInventory: KnockoutObservableArray<any>;
private _diamonds: KnockoutObservable<number>;
private _maxDailyDeals: KnockoutObservable<number>;
private _maxUndergroundItems: KnockoutObservable<number>;
private _mineEnergyRegenTime: KnockoutObservable<number>;
private _shardUpgrades: Array<Array<KnockoutObservable<number>>>;
private _shardsCollected: Array<KnockoutObservable<number>>;
private _keyItems: KnockoutObservableArray<string> = ko.observableArray<string>();
public clickAttackObservable: KnockoutComputed<number>;
public recentKeyItem: KnockoutObservable<string> = ko.observable("Teachy tv");
public pokemonAttackObservable: KnockoutComputed<number>;
public achievementsCompleted: { [name: string]: boolean };
public statistics: Statistics;
public completedQuestList: Array<KnockoutObservable<boolean>>;
public questRefreshes: number;
public _questPoints: KnockoutObservable<number>;
public _questXP: KnockoutObservable<number>;
public _lastSeen: number;
public currentQuest: KnockoutObservable<any>;
private _shinyCatches: KnockoutObservable<number>;
public routeKillsObservable(route: number): KnockoutComputed<number> {
return ko.computed(function () {
return Math.min(this.routeKillsNeeded, this.routeKills[route]());
}, this);
}
public pokeballsObservable(ball: GameConstants.Pokeball): KnockoutComputed<number> {
return ko.computed(function () {
return this._pokeballs[ball]();
}, this);
}
public setAlreadyCaughtBallSelection(ball: GameConstants.Pokeball) {
this._alreadyCaughtBallSelection(ball);
}
public setNotCaughtBallSelection(ball: GameConstants.Pokeball) {
this._notCaughtBallSelection(ball);
}
public gainPokeballs(ball: GameConstants.Pokeball, amount: number) {
this._pokeballs[ball](this._pokeballs[ball]() + amount)
}
public usePokeball(ball: GameConstants.Pokeball): void {
this._pokeballs[ball](this._pokeballs[ball]() - 1)
GameHelper.incrementObservable(this.statistics.pokeballsUsed[ball]);
}
>>>>>>>
private _routeKills: Array<KnockoutObservable<number>>;
private _routeKillsNeeded: KnockoutObservable<number>;
private _region: GameConstants.Region;
private _gymBadges: KnockoutObservableArray<GameConstants.Badge>;
private _pokeballs: Array<KnockoutObservable<number>>;
private _notCaughtBallSelection: KnockoutObservable<GameConstants.Pokeball>;
private _alreadyCaughtBallSelection: KnockoutObservable<GameConstants.Pokeball>;
private _sortOption: KnockoutObservable<GameConstants.SortOptionsEnum>;
private _sortDescending: KnockoutObservable<boolean>;
private _town: KnockoutObservable<Town>;
private _currentTown: KnockoutObservable<string>;
private _starter: GameConstants.Starter;
private _oakItemExp: Array<KnockoutObservable<number>>;
private _oakItemsEquipped: string[];
private _eggList: Array<KnockoutObservable<Egg | void>>;
private _eggSlots: KnockoutObservable<number>;
private _itemList: { [name: string]: number };
private _itemMultipliers: { [name: string]: number };
private _mineEnergy: KnockoutObservable<number>;
private _maxMineEnergy: KnockoutObservable<number>;
private _mineEnergyGain: KnockoutObservable<number>;
private _mineInventory: KnockoutObservableArray<any>;
private _diamonds: KnockoutObservable<number>;
private _maxDailyDeals: KnockoutObservable<number>;
private _maxUndergroundItems: KnockoutObservable<number>;
private _mineEnergyRegenTime: KnockoutObservable<number>;
private _shardUpgrades: Array<Array<KnockoutObservable<number>>>;
private _shardsCollected: Array<KnockoutObservable<number>>;
private _keyItems: KnockoutObservableArray<string> = ko.observableArray<string>();
public clickAttackObservable: KnockoutComputed<number>;
public recentKeyItem: KnockoutObservable<string> = ko.observable("Teachy tv");
public pokemonAttackObservable: KnockoutComputed<number>;
public achievementsCompleted: { [name: string]: boolean };
public statistics: Statistics;
public completedQuestList: Array<KnockoutObservable<boolean>>;
public questRefreshes: number;
public _questPoints: KnockoutObservable<number>;
public _questXP: KnockoutObservable<number>;
public _lastSeen: number;
public currentQuest: KnockoutObservable<any>;
private _shinyCatches: KnockoutObservable<number>;
public plotList: KnockoutObservable<Plot>[];
public farmPoints: KnockoutObservable<number>;
public berryList: KnockoutObservable<number>[];
public routeKillsObservable(route: number): KnockoutComputed<number> {
return ko.computed(function () {
return Math.min(this.routeKillsNeeded, this.routeKills[route]());
}, this);
}
public pokeballsObservable(ball: GameConstants.Pokeball): KnockoutComputed<number> {
return ko.computed(function () {
return this._pokeballs[ball]();
}, this);
}
public setAlreadyCaughtBallSelection(ball: GameConstants.Pokeball) {
this._alreadyCaughtBallSelection(ball);
}
public setNotCaughtBallSelection(ball: GameConstants.Pokeball) {
this._notCaughtBallSelection(ball);
}
public gainPokeballs(ball: GameConstants.Pokeball, amount: number) {
this._pokeballs[ball](this._pokeballs[ball]() + amount)
}
public usePokeball(ball: GameConstants.Pokeball): void {
this._pokeballs[ball](this._pokeballs[ball]() - 1)
GameHelper.incrementObservable(this.statistics.pokeballsUsed[ball]);
}
<<<<<<<
"achievementsCompleted",
"farmPoints",
"plotList",
"berryList"
=======
"achievementsCompleted",
"completedQuestList",
"questRefreshes",
"_questXP",
"_questPoints",
"_lastSeen",
"currentQuest",
"_shinyCatches",
"gymDefeats",
"statistics",
>>>>>>>
"achievementsCompleted",
"completedQuestList",
"questRefreshes",
"_questXP",
"_questPoints",
"_lastSeen",
"currentQuest",
"_shinyCatches",
"gymDefeats",
"statistics",
"achievementsCompleted",
"farmPoints",
"plotList",
"berryList" |
<<<<<<<
import * as notificationService from './notification.service';
=======
import * as studentService from './student.service';
export { RepositoryService } from './repository.service';
>>>>>>>
import * as notificationService from './notification.service';
import * as studentService from './student.service';
export { RepositoryService } from './repository.service';
<<<<<<<
export {
userService,
taskService,
courseService,
taskResultsService,
awsTaskService,
stageInterviewService,
notificationService,
};
=======
export {
studentService,
userService,
taskService,
courseService,
taskResultsService,
awsTaskService,
stageInterviewService,
};
>>>>>>>
export {
studentService,
userService,
taskService,
courseService,
taskResultsService,
awsTaskService,
stageInterviewService,
notificationService,
}; |
<<<<<<<
import inspect from 'unist-util-inspect'
import { selectAll } from 'unist-util-select'
import { mdast2tweet, TweetComponent } from './markdown/tweet'
=======
import { homedir } from 'os'
import { createInterface, Interface } from 'readline'
>>>>>>>
import inspect from 'unist-util-inspect'
import { selectAll } from 'unist-util-select'
import { mdast2tweet, TweetComponent } from './markdown/tweet'
import { homedir } from 'os'
import { createInterface, Interface } from 'readline' |
<<<<<<<
NavigationTabsService, NavigationTreeContextMenuService,
SettingsMenuService, LogViewerService, LogViewerMenuService, TopNavService,
AppScreenService, CoreSettingsService, AdministrationTopAppBarBootstrapService, SessionExpireService
=======
NavigationTabsService,
NavigationTreeContextMenuService,
SettingsMenuService,
LogViewerService,
LogViewerMenuService,
TopNavService,
AppScreenService,
CoreSettingsService,
AdministrationTopAppBarBootstrapService,
AppLocaleService,
>>>>>>>
NavigationTabsService,
NavigationTreeContextMenuService,
SettingsMenuService,
LogViewerService,
LogViewerMenuService,
TopNavService,
AppScreenService,
CoreSettingsService,
AdministrationTopAppBarBootstrapService,
AppLocaleService,
SessionExpireService |
<<<<<<<
export * from './useFocus';
export * from './Snackbars';
=======
export * from './useFocus';
export * from './BlocksLocaleService';
>>>>>>>
export * from './useFocus';
export * from './Snackbars';
export * from './BlocksLocaleService'; |
<<<<<<<
import * as userService from './userService';
import * as studentsService from './studentsService';
import * as courseService from './courseService';
import * as taskResultsService from './taskResultsService';
import * as taskService from './tasksService';
import * as awsTaskService from './awsTaskService';
import * as stageInterviewService from './stageInterviewService';
import * as consentService from './consentService';
import * as notificationService from './notificationService';
=======
import * as userService from './user.service';
import * as courseService from './course.service';
import * as taskResultsService from './taskResults.service';
import * as taskService from './tasks.service';
import * as awsTaskService from './aws.service';
import * as stageInterviewService from './stageInterview.service';
>>>>>>>
import * as userService from './user.service';
import * as courseService from './course.service';
import * as taskResultsService from './taskResults.service';
import * as taskService from './tasks.service';
import * as awsTaskService from './aws.service';
import * as stageInterviewService from './stageInterview.service';
import * as consentService from './consent.service';
import * as notificationService from './notification.service';
<<<<<<<
export {
userService,
taskService,
studentsService,
courseService,
taskResultsService,
awsTaskService,
stageInterviewService,
consentService,
notificationService,
};
=======
export { userService, taskService, courseService, taskResultsService, awsTaskService, stageInterviewService };
>>>>>>>
export {
userService,
taskService,
courseService,
taskResultsService,
awsTaskService,
stageInterviewService,
consentService,
notificationService,
}; |
<<<<<<<
/** Include previously received partial responses into a final message */
public mergePartialMessages(partials: Message[]) {
// This is highly message dependent
// Overwrite this in derived classes
}
=======
>>>>>>>
/** Include previously received partial responses into a final message */
public mergePartialMessages(partials: Message[]) {
// This is highly message dependent
// Overwrite this in derived classes
}
<<<<<<<
"unexpected" // a message that does not belong to this transaction
| "confirmation" // a confirmation response, e.g. controller reporting that a message was sent
| "partial" // a partial response, that (once assembled) will become final. E.g. a multi-report CC container
=======
| "unexpected" // a message that does not belong to this transaction
| "intermediate" // an intermediate response, e.g. controller ACK that is not fatal
>>>>>>>
| "unexpected" // a message that does not belong to this transaction
| "confirmation" // a confirmation response, e.g. controller reporting that a message was sent
| "partial" // a partial response, that (once assembled) will become final. E.g. a multi-report CC container |
<<<<<<<
const controllerSuccess = createSendDataMessage(MessageType.Response, Buffer.from([1]));
// "A SendDataResponse with wasSent=true was not detected as confirmation!"
expect(predicate(undefined, controllerSuccess)).toBe("confirmation");
=======
const controllerSuccess = createSendDataMessage(
MessageType.Response,
Buffer.from([1]),
);
// "A SendDataResponse with wasSent=true was not detected as intermediate!"
expect(predicate(undefined, controllerSuccess)).toBe("intermediate");
>>>>>>>
const controllerSuccess = createSendDataMessage(
MessageType.Response,
Buffer.from([1]),
);
// "A SendDataResponse with wasSent=true was not detected as confirmation!"
expect(predicate(undefined, controllerSuccess)).toBe("confirmation"); |
<<<<<<<
setTimeout(() => {
if (!this.currentTransaction) return;
this.rejectCurrentTransaction(
new ZWaveError(
"The transaction timed out",
ZWaveErrorCodes.Controller_MessageTimeout,
=======
this.currentTransaction.timeoutInstance = setTimeout(
() =>
this.rejectCurrentTransaction(
new ZWaveError(
"The transaction timed out",
ZWaveErrorCodes.Controller_MessageTimeout,
),
>>>>>>>
this.currentTransaction.timeoutInstance = setTimeout(() => {
if (!this.currentTransaction) return;
this.rejectCurrentTransaction(
new ZWaveError(
"The transaction timed out",
ZWaveErrorCodes.Controller_MessageTimeout, |
<<<<<<<
log("io", ` received confirmation response to current transaction`, "debug");
=======
log(
"io",
` received intermediate response to current transaction`,
"debug",
);
>>>>>>>
log(
"io",
` received confirmation response to current transaction`,
"debug",
); |
<<<<<<<
import { MAX_NODES, ZWaveError, ZWaveErrorCodes } from "@zwave-js/core";
import { getEnumMemberName, JSONObject, num2hex } from "@zwave-js/shared";
import { clamp } from "alcalzone-shared/math";
import type {
=======
import {
MAX_NODES,
MessageOrCCLogEntry,
ZWaveError,
ZWaveErrorCodes,
} from "@zwave-js/core";
import {
getEnumMemberName,
JSONObject,
num2hex,
staticExtends,
} from "@zwave-js/shared";
import {
CCResponseRole,
>>>>>>>
import {
MAX_NODES,
MessageOrCCLogEntry,
ZWaveError,
ZWaveErrorCodes,
} from "@zwave-js/core";
import { getEnumMemberName, JSONObject, num2hex } from "@zwave-js/shared";
import { clamp } from "alcalzone-shared/math";
import type {
<<<<<<<
import { MAX_SEND_ATTEMPTS } from "../driver/Transaction";
import type { MessageOrCCLogEntry } from "../log/shared";
=======
>>>>>>>
import { MAX_SEND_ATTEMPTS } from "../driver/Transaction"; |
<<<<<<<
'Kuvio esittää varmennetut tapaukset verkostona. Numero on tartunnan järjestysnumero. Mikäli suoraa tartuttajaa ei tiedetä linkitetään tartunta alkuperämaahan. Kuvasta on jätetty pois tartunnat joiden suoraa aiheuttajaa tai alkuperämaata ei ole tiedossa. Suomeen merkatut tartunnat liittyvät suurella todennäköisyydellä muihin tartuntaverkostoihin. Solun väri kertoo maan jossa tartunta on todennäköisesti tapahtunut.',
'unknown': 'tuntematon'
=======
'Kuvio esittää tartunnat verkostona. Numero on tartunnan järjestysnumero. Mikäli suoraa tartuttajaa ei tiedetä linkitetään tartunta alkuperämaahan. Kuvasta on jätetty pois tartunnat joiden suoraa aiheuttajaa tai alkuperämaata ei ole tiedossa. Suomeen merkatut tartunnat liittyvät suurella todennäköisyydellä muihin tartuntaverkostoihin. Solun väri kertoo maan jossa tartunta on todennäköisesti tapahtunut.',
unknown: 'tuntematon'
>>>>>>>
'Kuvio esittää varmennetut tapaukset verkostona. Numero on tartunnan järjestysnumero. Mikäli suoraa tartuttajaa ei tiedetä linkitetään tartunta alkuperämaahan. Kuvasta on jätetty pois tartunnat joiden suoraa aiheuttajaa tai alkuperämaata ei ole tiedossa. Suomeen merkatut tartunnat liittyvät suurella todennäköisyydellä muihin tartuntaverkostoihin. Solun väri kertoo maan jossa tartunta on todennäköisesti tapahtunut.',
unknown: 'tuntematon' |
<<<<<<<
'Corona virus prevention tips': 'Toimintaohjeet koronaviruksen tartunnan ehkäisyyn',
'infectionsPerDisrictAndSize': 'Tartunnat sairaanhoitopiireittäin / sairaanhoitopiirin koko',
'originCountryFooter': 'Suomen tartuntojen lukumäärät alkuperämaittain',
'log': 'Tartuntaloki',
'logFooter': 'Kaikki suomen tartunnat listana, uusimmat ensin. Jokin id saattaa puuttua välistä',
'infectionNetwork': 'Tartuntaverkosto',
'infectionNetworkFooter': 'Kuvio esittää tartunnat verkostona. Numero on tartunnan järjestysnumero. Mikäli suoraa tartuttajaa ei tiedetä linkitetään tartunta alkuperämaahan. Kuvasta on jätetty pois tartunnat joiden suoraa aiheuttajaa tai alkuperämaata ei ole tiedossa. Suomeen merkatut tartunnat liittyvät suurella todennäköisyydellä muihin tartuntaverkostoihin. Solun väri kertoo maan jossa tartunta on todennäköisesti tapahtunut.',
'unknown': 'tuntematon'
},
=======
'Corona virus prevention tips':
'Toimintaohjeet koronaviruksen tartunnan ehkäisyyn',
infectionsPerDisrictAndSize:
'Tartunnat sairaanhoitopiireittäin / sairaanhoitopiirin koko',
originCountryFooter: 'Suomen tartuntojen lukumäärät alkuperämaittain',
log: 'Tartuntaloki',
logFooter:
'Kaikki suomen tartunnat listana, uusimmat ensin. Jokin id saattaa puuttua välistä',
infectionNetwork: 'Tartuntaverkosto',
infectionNetworkFooter:
'Kuvio esittää tartunnat verkostona. Numero on tartunnan järjestysnumero. Mikäli suoraa tartuttajaa ei tiedetä linkitetään tartunta alkuperämaahan. Kuvasta on jätetty pois tartunnat joiden suoraa aiheuttajaa tai alkuperämaata ei ole tiedossa. Suomeen merkatut tartunnat liittyvät suurella todennäköisyydellä muihin tartuntaverkostoihin. Solun väri kertoo maan jossa tartunta on todennäköisesti tapahtunut.'
},
>>>>>>>
'Corona virus prevention tips':
'Toimintaohjeet koronaviruksen tartunnan ehkäisyyn',
infectionsPerDisrictAndSize:
'Tartunnat sairaanhoitopiireittäin / sairaanhoitopiirin koko',
originCountryFooter: 'Suomen tartuntojen lukumäärät alkuperämaittain',
log: 'Tartuntaloki',
logFooter:
'Kaikki suomen tartunnat listana, uusimmat ensin. Jokin id saattaa puuttua välistä',
infectionNetwork: 'Tartuntaverkosto',
infectionNetworkFooter:
'Kuvio esittää tartunnat verkostona. Numero on tartunnan järjestysnumero. Mikäli suoraa tartuttajaa ei tiedetä linkitetään tartunta alkuperämaahan. Kuvasta on jätetty pois tartunnat joiden suoraa aiheuttajaa tai alkuperämaata ei ole tiedossa. Suomeen merkatut tartunnat liittyvät suurella todennäköisyydellä muihin tartuntaverkostoihin. Solun väri kertoo maan jossa tartunta on todennäköisesti tapahtunut.',
'unknown': 'tuntematon'
},
<<<<<<<
'infectionsPerDisrictAndSize': 'Infections in healthcare district / healthcare district size',
'originCountryFooter': 'Origin countries of the cases in Finland',
'log': 'Infection Log',
'logFooter': 'All cases in Finland as a list, latest first. Id is not a running number.',
'infectionNetwork': 'Infection network graph',
'infectionNetworkFooter': 'Number is the id of the case. Cases withouth origin are left out.',
'unknown': 'unknown'
=======
infectionsPerDisrictAndSize:
'Infections in healthcare district / healthcare district size',
originCountryFooter: 'Origin countries of the cases in Finland',
log: 'Infection Log',
logFooter:
'All cases in Finland as a list, latest first. Id is not a running number.',
infectionNetwork: 'Infection network graph',
infectionNetworkFooter:
'Number is the id of the case. Cases withouth origin are left out.'
>>>>>>>
infectionsPerDisrictAndSize:
'Infections in healthcare district / healthcare district size',
originCountryFooter: 'Origin countries of the cases in Finland',
log: 'Infection Log',
logFooter:
'All cases in Finland as a list, latest first. Id is not a running number.',
infectionNetwork: 'Infection network graph',
infectionNetworkFooter:
'Number is the id of the case. Cases withouth origin are left out.',
'unknown': 'unknown'
<<<<<<<
'infectionsPerDisrictAndSize': 'Infections in healthcare district / healthcare district size',
'originCountryFooter': 'Origin countries of the cases in Finland',
'log': 'Infection Log',
'logFooter': 'All cases in Finland as a list, latest first. Id is not a running number.',
'infectionNetwork': 'Infection network graph',
'infectionNetworkFooter': 'Number is the id of the case. Cases withouth origin are left out.',
'unknown': 'ناشناخته'
=======
infectionsPerDisrictAndSize:
'Infections in healthcare district / healthcare district size',
originCountryFooter: 'Origin countries of the cases in Finland',
log: 'Infection Log',
logFooter:
'All cases in Finland as a list, latest first. Id is not a running number.',
infectionNetwork: 'Infection network graph',
infectionNetworkFooter:
'Number is the id of the case. Cases withouth origin are left out.'
>>>>>>>
infectionsPerDisrictAndSize:
'Infections in healthcare district / healthcare district size',
originCountryFooter: 'Origin countries of the cases in Finland',
log: 'Infection Log',
logFooter:
'All cases in Finland as a list, latest first. Id is not a running number.',
infectionNetwork: 'Infection network graph',
infectionNetworkFooter:
'Number is the id of the case. Cases withouth origin are left out.',
'unknown': 'ناشناخته' |
<<<<<<<
import { Router, ActivatedRoute, Params } from '@angular/router';
import {Measure} from './measures/measure.model';
=======
import { Http } from '@angular/http';
import { Pia } from '../pia.model';
import 'rxjs/add/operator/map'
>>>>>>>
import { Measure } from './measures/measure.model';
import { Http } from '@angular/http';
import { Pia } from '../pia.model';
import 'rxjs/add/operator/map'
<<<<<<<
pia_id: number;
@Input() measureName: string;
@Input() section: string;
=======
@Input() section: {};
@Input() item: {};
@Input() pia: Pia;
>>>>>>>
@Input() measureName: string;
@Input() section: {};
@Input() item: {};
@Input() pia: Pia; |
<<<<<<<
asyncApply<A, B>(this: Maybe<(a: Promise<A> | A) => Promise<B>>, arg: Maybe<Promise<A> | A>): Promise<Maybe<B>>;
asyncApply<A, B>(this: Maybe<Promise<A> | A>, fn: Maybe<(a: Promise<A> | A) => Promise<B>>): Promise<Maybe<B>>;
=======
asyncApply<A, B>(
this: Maybe<(a: A) => Promise<B>>,
arg: Maybe<Promise<A> | A>
): Promise<Maybe<B>>;
asyncApply<A, B>(
this: Maybe<Promise<A> | A>,
fn: Maybe<(a: A) => Promise<B>>
): Promise<Maybe<B>>;
>>>>>>>
asyncApply<A, B>(this: Maybe<(a: A) => Promise<B>>, arg: Maybe<Promise<A> | A>): Promise<Maybe<B>>;
asyncApply<A, B>(this: Maybe<Promise<A> | A>, fn: Maybe<(a: A) => Promise<B>>): Promise<Maybe<B>>; |
<<<<<<<
tooltip: {
background: white,
table: {
backgroundEven: gray100,
backgroundOdd: gray200,
},
},
country: {
legend: {
lineIcon: {
thickness: 2,
width: 20,
height: 20,
},
},
},
=======
cartesianGrid: {
stroke: '#2222',
},
>>>>>>>
tooltip: {
background: white,
table: {
backgroundEven: gray100,
backgroundOdd: gray200,
},
},
country: {
legend: {
lineIcon: {
thickness: 2,
width: 20,
height: 20,
},
},
},
cartesianGrid: {
stroke: '#2222',
}, |
<<<<<<<
=======
import { AddressHelper } from '../../../core/util/utils';
>>>>>>>
import { AddressHelper } from '../../../core/util/utils';
<<<<<<<
import { AddressHelper } from '../../../core/util/utils';
=======
>>>>>>> |
<<<<<<<
specialPoll(): void {
// A poll only for address changes, triggered from the GUI!
const _call = (element) => {
this.call(
element.instance,
element.method,
element.params && element.params.typeOf === 'function' ? element.params() : element.params,
element.successCB,
element.errorCB);
};
this._callOnAddress.forEach(_call);
}
=======
/**
* Start a temporary loop that polls the RPC every 3 seconds.
*
* @returns void
*/
>>>>>>>
specialPoll(): void {
// A poll only for address changes, triggered from the GUI!
const _call = (element) => {
this.call(
element.instance,
element.method,
element.params && element.params.typeOf === 'function' ? element.params() : element.params,
element.successCB,
element.errorCB);
};
this._callOnAddress.forEach(_call);
}
/**
* Start a temporary loop that polls the RPC every 3 seconds.
*
* @returns void
*/ |
<<<<<<<
import { DateFormatter } from '../../../../../core/util/utils';
import { RpcService } from '../../../../../core/core.module';
=======
import { DateFormatter } from '../../../../../wallet/shared/util/utils';
import { RpcService, RpcStateService } from '../../../../../core/core.module';
>>>>>>>
import { DateFormatter } from '../../../../../core/util/utils';
import { RpcService, RpcStateService } from '../../../../../core/core.module'; |
<<<<<<<
import { MdDialog } from '@angular/material';
import { QrCodeModalComponent} from '../qr-code-modal/qr-code-modal.component';
import { DeleteConfirmationModalComponent } from '../../../shared/delete-confirmation-modal/delete-confirmation-modal.component';
import { FlashNotificationService } from '../../../services/flash-notification.service';
=======
import { ModalsService } from '../../../modals/modals.service';
>>>>>>>
import { MdDialog } from '@angular/material';
import { QrCodeModalComponent} from '../qr-code-modal/qr-code-modal.component';
import { DeleteConfirmationModalComponent } from '../../../shared/delete-confirmation-modal/delete-confirmation-modal.component';
import { FlashNotificationService } from '../../../services/flash-notification.service';
import { ModalsService } from '../../../modals/modals.service';
import {ModalsComponent} from '../../../modals/modals.component';
<<<<<<<
=======
public singleAddress: any = {
label: 'Empty label',
address: 'Empty address',
owned: false
};
>>>>>>>
public singleAddress: any = {
label: 'Empty label',
address: 'Empty address',
owned: false
};
<<<<<<<
private _rpc: RPCService,
public dialog: MdDialog,
public flashNotification: FlashNotificationService
=======
private _rpc: RPCService,
private _modals: ModalsService
>>>>>>>
private _rpc: RPCService,
public dialog: MdDialog,
public flashNotification: FlashNotificationService,
private _modals: ModalsService
<<<<<<<
const dialogRef = this.dialog.open(DeleteConfirmationModalComponent);
dialogRef.componentInstance.dialogContent = `${label}: ${address}`;
dialogRef.componentInstance.onDelete.subscribe(() => {
this._rpc.call('manageaddressbook', ['del', address])
.subscribe(response => {
this.rpc_deleteAddress_success(response);
},
error => console.log(`${error.error.message}`));
});
=======
if (confirm(`Are you sure you want to delete ${label}: ${address}`)) {
// this._rpc.call(this, 'manageaddressbook', ['del', address], this.rpc_deleteAddress_success);
if (this._rpc.state.get('locked')) {
// unlock wallet and send transaction
this._modals.open('unlock', {
forceOpen: true, timeout: 3, callback: this.deleteAddressCallBack.bind(this, address)
});
} else {
// wallet already unlocked
this.deleteAddressCallBack(address);
}
}
>>>>>>>
const dialogRef = this.dialog.open(DeleteConfirmationModalComponent);
dialogRef.componentInstance.dialogContent = `${label}: ${address}`;
dialogRef.componentInstance.onDelete.subscribe(() => {
if (this._rpc.state.get('locked')) {
// unlock wallet and send transaction
this.dialog.open(ModalsComponent, {disableClose: true, width: '100%', height: '100%'});
this._modals.open('unlock', {
forceOpen: true, timeout: 3, callback: this.deleteAddressCallBack.bind(this, address)
});
} else {
// wallet already unlocked
this.deleteAddressCallBack(address);
}
}); |
<<<<<<<
import { StateService } from '../../../../core/core.module';
import { Amount, Duration } from '../../../../core/util/utils';
=======
import { RpcStateService } from '../../../../core/core.module';
import { Amount, Duration } from '../../../shared/util/utils';
>>>>>>>
import { RpcStateService } from '../../../../core/core.module';
import { Amount, Duration } from '../../../../core/util/utils'; |
<<<<<<<
import { ModalsComponent } from '../../modals/modals.component';
import { FlashNotificationService } from '../../services/flash-notification.service';
=======
import { SignatureAddressModalComponent } from '../shared/signature-address-modal/signature-address-modal.component';
>>>>>>>
import { FlashNotificationService } from '../../services/flash-notification.service';
import { SignatureAddressModalComponent } from '../shared/signature-address-modal/signature-address-modal.component'; |
<<<<<<<
this.listingService.search(pageNumber, max, null, search).take(1).subscribe((listings: Array<any>) => {
this.isLoading = false;
// new page
const page = {
pageNumber: pageNumber,
listings: listings.map(listing => new Template(listing))
};
// should we clear all existing pages? e.g search
if (clear === true) {
this.pages = [page];
this.noMoreListings = false;
} else { // infinite scroll
if (listings.length > 0) {
this.pushNewPage(page);
} else {
this.noMoreListings = true;
=======
const country = this.filters.country;
this.listingService.search(pageNumber, max, null, search, country)
.take(1).subscribe((listings: Array<any>) => {
// new page
const page = {
pageNumber: pageNumber,
listings: listings.map(listing => new Template(listing))
};
if (page.listings.length === 0) {
this.pages = [];
return ;
}
// should we clear all existing pages? e.g search
if (clear === true) {
this.pages = [page];
this.noMoreListings = false;
} else { // infinite scroll
if (listings.length > 0) {
this.pushNewPage(page);
} else {
this.noMoreListings = true;
}
>>>>>>>
const country = this.filters.country;
this.listingService.search(pageNumber, max, null, search, country)
.take(1).subscribe((listings: Array<any>) => {
this.isLoading = false;
// new page
const page = {
pageNumber: pageNumber,
listings: listings.map(listing => new Template(listing))
};
if (page.listings.length === 0) {
this.pages = [];
return ;
}
// should we clear all existing pages? e.g search
if (clear === true) {
this.pages = [page];
this.noMoreListings = false;
} else { // infinite scroll
if (listings.length > 0) {
this.pushNewPage(page);
} else {
this.noMoreListings = true;
} |
<<<<<<<
ngOnInit() {
this._sub = this.balanceService.getBalances()
.subscribe(
balances => {
this._balance = balances;
},
error => this.log.er('balanceService subscription error:' + error));
}
ngOnDestroy() {
this._sub.unsubscribe();
}
/*
UI logic
*/
sendTab(tabIndex: number) {
if (tabIndex) {
this.type = 'balanceTransfer';
} else {
this.type = 'sendPayment';
}
=======
/** Select tab */
selectTab(type: string) {
this.type = type;
if (this.type === 'balanceTransfer') {
this.send.toAddress = '';
this.verifyAddress();
}
>>>>>>>
/*
UI logic
*/
sendTab(tabIndex: number) {
if (tabIndex) {
this.type = 'balanceTransfer';
} else {
this.type = 'sendPayment';
}
<<<<<<<
=======
this.closeValidate();
>>>>>>>
<<<<<<<
if (this.send.output === 'private' && this.send.toAddress.length < 35) {
this.flashNotification.open('Stealth address required for private transactions!');
=======
if (this.send.output === 'anon_balance' && this.send.toAddress.length < 35) {
alert('Stealth address required for private transactions!');
>>>>>>>
if (this.send.output === 'private' && this.send.toAddress.length < 35) {
this.flashNotification.open('Stealth address required for private transactions!'); |
<<<<<<<
export { Shimmer } from './Shimmer';
=======
export { CommandBar as ExperimentCommandBar } from './CommandBar';
export { Shimmer } from './Shimmer';
export { Chiclet } from './Chiclet';
>>>>>>>
export { Shimmer } from './Shimmer';
export { Chiclet } from './Chiclet'; |
<<<<<<<
=======
isCollapsed: boolean = true;
isFixed: boolean = false;
title: string = '';
>>>>>>>
<<<<<<<
blocks: number = 0;
error: string = '';
=======
walletInitialized: boolean = false;
daemonRunning: boolean = false;
multiwallet: any = [];
>>>>>>>
// multiwallet: any = [];
<<<<<<<
_iconRegistry
=======
iconRegistry
>>>>>>>
_iconRegistry |
<<<<<<<
clearCache() {
this.profileService.shippingDetails = new ShippingDetails()
}
setSteperIndex() {
// @TODO: set stepper completed on 3 index.
this.stepper.selectedIndex = this.profileService.stepper;
}
updateSteperIndex() {
this.profileService.stepper = this.stepper.selectedIndex;
}
=======
>>>>>>>
clearCache() {
this.profileService.shippingDetails = new ShippingDetails()
}
setSteperIndex() {
// @TODO: set stepper completed on 3 index.
this.stepper.selectedIndex = this.profileService.stepper;
}
updateSteperIndex() {
this.profileService.stepper = this.stepper.selectedIndex;
} |
<<<<<<<
=======
/*
RPC logic
*/
>>>>>>>
/*
RPC logic
*/
<<<<<<<
constructor(
private sendService: SendService,
private balanceService: BalanceService,
private _rpc: RPCService,
private _modals: ModalsService,
private _encryptionStatus: EncryptionStatusService
) {
}
callback_walletUnlocked(t: boolean) {
console.log(t);
}
=======
private _sub: Subscription;
private _balance: any;
constructor(private sendService: SendService, private balanceService: BalanceService, private _rpc: RPCService) { }
>>>>>>>
private _sub: Subscription;
private _balance: any;
constructor(
private sendService: SendService,
private balanceService: BalanceService,
private _rpc: RPCService,
private _modals: ModalsService,
private _encryptionStatus: EncryptionStatusService
) {
}
<<<<<<<
// Check if wallet is unlocked
if (this._encryptionStatus.getEncryptionStatusState() !== 'Unlocked') {
// unlock wallet and send transaction
this._modals.unlockWallet(this,
this.sendTransaction,
2);
} else {
// wallet already unlocked
this.sendTransaction();
}
/*
Balance transfer - validation
*/
=======
// edit label of address
this.addLabelToAddress();
// send transaction
this.sendService.sendTransaction(input, output, address, amount, comment, substractfee, narration, ringsize, numsigs);
>>>>>>>
// Check if wallet is unlocked
if (this._encryptionStatus.getEncryptionStatusState() !== 'Unlocked') {
// unlock wallet and send transaction
this._modals.unlockWallet(this,
this.sendTransaction,
2);
} else {
// wallet already unlocked
this.sendTransaction();
}
/*
Balance transfer - validation
*/
<<<<<<<
if (this.send.output === '') {
alert('You need to select an output type (public, blind or anon)!');
return;
}
if (this.send.input === this.send.output) {
alert('You have selected "' + this.send.input + '"" twice!\n Balance transfers can only happen between two different types.');
return;
}
if (this._encryptionStatus.getEncryptionStatusState() !== 'Unlocked') {
// unlock wallet and transfer balance
this._modals.unlockWallet(this,
this.transferBalance,
2);
} else {
this.transferBalance();
}
=======
// perform balance transfer
this.sendService.transferBalance(input, output, address, amount, ringsize, numsigs);
>>>>>>>
if (this.send.output === '') {
alert('You need to select an output type (public, blind or anon)!');
return;
}
if (this.send.input === this.send.output) {
alert('You have selected "' + this.send.input + '"" twice!\n Balance transfers can only happen between two different types.');
return;
}
if (this._encryptionStatus.getEncryptionStatusState() !== 'Unlocked') {
// unlock wallet and transfer balance
this._modals.unlockWallet(this,
this.transferBalance,
2);
} else {
this.transferBalance();
} |
<<<<<<<
let params = this.command.trim().split(' ')
.filter(cmd => cmd.trim() !== '');
=======
const params = this.queryParser(this.command);
>>>>>>>
let params = this.queryParser(this.command); |
<<<<<<<
export * from './Customizations';
export * from './Customizer';
=======
export * from './BaseComponent.types';
export * from './Context';
>>>>>>>
export * from './BaseComponent.types'; |
<<<<<<<
=======
this.formData = new ShippingDetails();
this._profileService.get(1).take(1).subscribe(profile => {
this.profile = profile;
// TODO: Select default address..
if (profile.ShippingAddresses && profile.ShippingAddresses.length) {
this.formData.firstName = profile.ShippingAddresses[0].firstName;
this.formData.lastName = profile.ShippingAddresses[0].lastName;
this.formData.addressLine1 = profile.ShippingAddresses[0].addressLine1;
this.formData.addressLine2 = profile.ShippingAddresses[0].addressLine2;
this.formData.city = profile.ShippingAddresses[0].city;
this.formData.state = profile.ShippingAddresses[0].state;
this.formData.country = profile.ShippingAddresses[0].country;
this.formData.zip = profile.ShippingAddresses[0].zipCode;
}
});
>>>>>>>
<<<<<<<
state: [''],
country: ['', Validators.required],
zipCode: ['', Validators.required]
=======
state: ['', Validators.required],
countryCode: ['', Validators.required],
zipCode: ['', Validators.required],
save: ['']
>>>>>>>
state: [''],
country: ['', Validators.required],
zipCode: ['', Validators.required] |
<<<<<<<
export interface IComboBoxProps extends ISelectableDroppableTextProps<IComboBox, IComboBox> {
=======
/**
* {@docCategory ComboBox}
*/
export interface IComboBoxProps extends ISelectableDroppableTextProps<IComboBox> {
>>>>>>>
/**
* {@docCategory ComboBox}
*/
export interface IComboBoxProps extends ISelectableDroppableTextProps<IComboBox, IComboBox> { |
<<<<<<<
import { Component } from '@angular/core';
import { MatDialog, MatDialogRef } from '@angular/material';
import { ManageWidgetsComponent } from '../../modals/manage-widgets/manage-widgets.component';
=======
import { Component, OnInit } from '@angular/core';
import { RpcStateService } from '../../core/core.module';
>>>>>>>
import { Component, OnInit } from '@angular/core';
import { RpcStateService } from '../../core/core.module';
import { MatDialog, MatDialogRef } from '@angular/material';
import { ManageWidgetsComponent } from '../../modals/manage-widgets/manage-widgets.component';
<<<<<<<
constructor( public dialog: MatDialog, ) {}
openWidgetManager(): void {
const dialogRef = this.dialog.open(ManageWidgetsComponent);
}
=======
ngOnInit() {
// check if testnet -> Show/Hide Anon Balance
this.rpcState.observe('getblockchaininfo', 'chain').take(1)
.subscribe(chain => this.testnet = chain === 'test');
}
>>>>>>>
constructor( public dialog: MatDialog, ) {}
openWidgetManager(): void {
const dialogRef = this.dialog.open(ManageWidgetsComponent);
}
ngOnInit() {
// check if testnet -> Show/Hide Anon Balance
this.rpcState.observe('getblockchaininfo', 'chain').take(1)
.subscribe(chain => this.testnet = chain === 'test');
} |
<<<<<<<
import { Favorite } from '../../core/market/api/favorites/favorite.model';
import { Listing } from '../../core/market/api/listing/listing.model';
=======
import { Template } from 'app/core/market/api/template/template.model';
import { CountryList } from 'app/core/market/api/listing/countrylist.model';
>>>>>>>
import { Favorite } from '../../core/market/api/favorites/favorite.model';
import { Listing } from '../../core/market/api/listing/listing.model';
import { CountryList } from 'app/core/market/api/listing/countrylist.model'; |
<<<<<<<
private favoritesService: FavoritesService) {
}
=======
private favoritesService: FavoritesService,
private countryList: CountryListService
) { }
>>>>>>>
private favoritesService: FavoritesService,
public countryList: CountryListService
) { }
<<<<<<<
static ShippingDetails = class {
static firstName: string;
static lastName: string;
static addressLine1: string;
static addressLine2: string;
static city: string;
static zip: string;
static state: string;
static country: string;
}
onKeyFirstName(value: string) {
BuyComponent.ShippingDetails.firstName = value;
}
onKeyLastName(value: string) {
BuyComponent.ShippingDetails.lastName = value;
}
onKeyAddressLine1(value: string) {
BuyComponent.ShippingDetails.addressLine1 = value;
}
onKeyAddressLine2(value: string) {
BuyComponent.ShippingDetails.addressLine2 = value;
}
onKeyCity(value: string) {
BuyComponent.ShippingDetails.city = value;
}
onKeyZip(value: string) {
BuyComponent.ShippingDetails.zip = value;
}
onKeyState(value: string) {
BuyComponent.ShippingDetails.state = value;
}
onChange(ev) {
BuyComponent.ShippingDetails.country = ev.value;
}
fillAddress(address) {
=======
// TODO: remove type any
fillAddress(address: any) {
>>>>>>>
static ShippingDetails = class {
static firstName: string;
static lastName: string;
static addressLine1: string;
static addressLine2: string;
static city: string;
static zip: string;
static state: string;
static country: string;
}
onKeyFirstName(value: string) {
BuyComponent.ShippingDetails.firstName = value;
}
onKeyLastName(value: string) {
BuyComponent.ShippingDetails.lastName = value;
}
onKeyAddressLine1(value: string) {
BuyComponent.ShippingDetails.addressLine1 = value;
}
onKeyAddressLine2(value: string) {
BuyComponent.ShippingDetails.addressLine2 = value;
}
onKeyCity(value: string) {
BuyComponent.ShippingDetails.city = value;
}
onKeyZip(value: string) {
BuyComponent.ShippingDetails.zip = value;
}
onKeyState(value: string) {
BuyComponent.ShippingDetails.state = value;
}
onChange(ev) {
BuyComponent.ShippingDetails.country = ev.value;
}
// TODO: remove type any
fillAddress(address: any) { |
<<<<<<<
=======
import { MultiwalletComponent } from './multiwallet/multiwallet.component';
>>>>>>>
import { MultiwalletComponent } from './multiwallet/multiwallet.component'; |
<<<<<<<
import { SnackbarService } from '../../../core/snackbar/snackbar.service';
import { MdSnackBarModule } from '@angular/material';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
=======
>>>>>>>
<<<<<<<
providers: [ SnackbarService, ModalsService ]
=======
providers: [ FlashNotificationService, ModalsService, IpcService ]
>>>>>>>
providers: [ SnackbarService, ModalsService ] |
<<<<<<<
Description: "",
Player: "",
Version: process.env.VERSION,
})
=======
Description: '',
Player: '',
Version: '1.0.0',
ImageURL: '',
});
>>>>>>>
Description: "",
Player: "",
Version: process.env.VERSION,
ImageURL: "",
}) |
<<<<<<<
import { TurnTimer } from "./Widgets/TurnTimer";
=======
import { SavedEncounter } from "./Encounter/SavedEncounter";
import {Tag} from "./Combatant/Tag";
>>>>>>>
import { TurnTimer } from "./Widgets/TurnTimer";
<<<<<<<
private roundCounterVisible = ko.observable(false);
=======
private imageCount: KnockoutObservable<number> = ko.observable(0);
>>>>>>>
private roundCounterVisible = ko.observable(false);
private imageCount: KnockoutObservable<number> = ko.observable(0);
<<<<<<<
private LoadSettings(settings: PlayerViewSettings) {
this.userStyles.innerHTML = CSSFrom(settings.CustomStyles);
this.additionalUserCSS.innerHTML = settings.CustomCSS;
this.allowSuggestions(settings.AllowPlayerSuggestions);
this.turnTimerVisible(settings.DisplayTurnTimer);
this.roundCounterVisible(settings.DisplayRoundCounter);
}
=======
>>>>>>>
private LoadSettings(settings: PlayerViewSettings) {
this.userStyles.innerHTML = CSSFrom(settings.CustomStyles);
this.additionalUserCSS.innerHTML = settings.CustomCSS;
this.allowSuggestions(settings.AllowPlayerSuggestions);
this.turnTimerVisible(settings.DisplayTurnTimer);
this.roundCounterVisible(settings.DisplayRoundCounter);
}
<<<<<<<
=======
this.imageCount((this.combatants().filter(c => c.ImageURL).length));
this.turnTimerVisible(encounter.DisplayTurnTimer);
>>>>>>>
this.imageCount((this.combatants().filter(c => c.ImageURL).length));
<<<<<<<
}
function CSSFrom(customStyles: PlayerViewCustomStyles): string {
const declarations = [];
if (customStyles.combatantText) {
declarations.push(`li.combatant { color: ${customStyles.combatantText}; }`);
}
if (customStyles.combatantBackground) {
const baseColor = Color(customStyles.combatantBackground);
let zebraColor = "", activeColor = "";
if (baseColor.isDark()) {
zebraColor = baseColor.lighten(0.1).string();
activeColor = baseColor.lighten(0.2).string();
} else {
zebraColor = baseColor.darken(0.1).string();
activeColor = baseColor.darken(0.2).string();
}
declarations.push(`li.combatant { background-color: ${customStyles.combatantBackground}; }`);
declarations.push(`li.combatant:nth-child(2n) { background-color: ${zebraColor}; }`);
declarations.push(`li.combatant.active { background-color: ${activeColor}; }`);
}
if (customStyles.activeCombatantIndicator) {
declarations.push(`.combatant.active { border-color: ${customStyles.activeCombatantIndicator} }`);
}
if (customStyles.headerText) {
declarations.push(`.combatant.header, .combat-footer { color: ${customStyles.headerText}; }`);
}
if (customStyles.headerBackground) {
declarations.push(`.combatant.header, .combat-footer { background-color: ${customStyles.headerBackground}; border-color: ${customStyles.headerBackground} }`);
}
if (customStyles.mainBackground) {
declarations.push(`#playerview { background-color: ${customStyles.mainBackground}; }`);
if (!customStyles.backgroundUrl) {
declarations.push(`#playerview { background-image: none; }`);
}
}
if (customStyles.backgroundUrl) {
declarations.push(`#playerview { background-image: url(${customStyles.backgroundUrl}); }`);
}
if (customStyles.font) {
declarations.push(`* { font-family: "${customStyles.font}", sans-serif; }`);
}
return declarations.join(" ");
=======
private ShowImageModal = (SelectedId:string, didClick:boolean) => {
if (didClick) this.imageModalIsViewing(true);
var combatant = this.combatants().filter(c => c.Id == SelectedId).pop();
this.imageModalName(didClick?combatant.Name:'Start of Turn: '+combatant.Name);
this.imageModalHPDisplay(combatant.HPDisplay);
this.imageModalURL(combatant.ImageURL);
this.imageModalTags(combatant.Tags);
this.imageModalVisible(true);
}
private CloseImageModal = () => {
this.imageModalVisible(false);
this.imageModalIsViewing(false);
clearTimeout(this.imageModalTimer);
}
>>>>>>>
private ShowImageModal = (SelectedId: string, didClick: boolean) => {
if (didClick) this.imageModalIsViewing(true);
const combatant = this.combatants().filter(c => c.Id == SelectedId).pop();
this.imageModalName(didClick ? combatant.Name : "Start of Turn: " + combatant.Name);
this.imageModalHPDisplay(combatant.HPDisplay);
this.imageModalURL(combatant.ImageURL);
this.imageModalTags(combatant.Tags);
this.imageModalVisible(true);
}
private CloseImageModal = () => {
this.imageModalVisible(false);
this.imageModalIsViewing(false);
clearTimeout(this.imageModalTimer);
}
}
function CSSFrom(customStyles: PlayerViewCustomStyles): string {
const declarations = [];
if (customStyles.combatantText) {
declarations.push(`li.combatant { color: ${customStyles.combatantText}; }`);
}
if (customStyles.combatantBackground) {
const baseColor = Color(customStyles.combatantBackground);
let zebraColor = "", activeColor = "";
if (baseColor.isDark()) {
zebraColor = baseColor.lighten(0.1).string();
activeColor = baseColor.lighten(0.2).string();
} else {
zebraColor = baseColor.darken(0.1).string();
activeColor = baseColor.darken(0.2).string();
}
declarations.push(`li.combatant { background-color: ${customStyles.combatantBackground}; }`);
declarations.push(`li.combatant:nth-child(2n) { background-color: ${zebraColor}; }`);
declarations.push(`li.combatant.active { background-color: ${activeColor}; }`);
}
if (customStyles.activeCombatantIndicator) {
declarations.push(`.combatant.active { border-color: ${customStyles.activeCombatantIndicator} }`);
}
if (customStyles.headerText) {
declarations.push(`.combatant.header, .combat-footer { color: ${customStyles.headerText}; }`);
}
if (customStyles.headerBackground) {
declarations.push(`.combatant.header, .combat-footer { background-color: ${customStyles.headerBackground}; border-color: ${customStyles.headerBackground} }`);
}
if (customStyles.mainBackground) {
declarations.push(`#playerview { background-color: ${customStyles.mainBackground}; }`);
if (!customStyles.backgroundUrl) {
declarations.push(`#playerview { background-image: none; }`);
}
}
if (customStyles.backgroundUrl) {
declarations.push(`#playerview { background-image: url(${customStyles.backgroundUrl}); }`);
}
if (customStyles.font) {
declarations.push(`* { font-family: "${customStyles.font}", sans-serif; }`);
}
return declarations.join(" "); |
<<<<<<<
if (!this.playerViewClient) {
return;
}
this.playerViewClient.UpdateEncounter(this.EncounterId, this.SavePlayerDisplay());
Store.Save<EncounterState<CombatantState>>(Store.AutoSavedEncounters, this.EncounterId, this.Save(this.EncounterId, ""));
=======
this.playerViewClient.UpdateEncounter(this.EncounterId, this.GetPlayerView());
Store.Save<SavedEncounter<SavedCombatant>>(Store.AutoSavedEncounters, this.EncounterId, this.Save(this.EncounterId, ""));
>>>>>>>
if (!this.playerViewClient) {
return;
}
this.playerViewClient.UpdateEncounter(this.EncounterId, this.GetPlayerView());
Store.Save<EncounterState<CombatantState>>(Store.AutoSavedEncounters, this.EncounterId, this.Save(this.EncounterId, ""));
<<<<<<<
public SavePlayerDisplay = (): EncounterState<StaticCombatantViewModel> => {
=======
public GetPlayerView = (): SavedEncounter<StaticCombatantViewModel> => {
>>>>>>>
public GetPlayerView = (): EncounterState<StaticCombatantViewModel> => {
<<<<<<<
public LoadSavedEncounter = (savedEncounter: EncounterState<CombatantState>, autosavedEncounter = false) => {
=======
private lastVisibleActiveCombatantId = null;
private getPlayerViewActiveCombatantId() {
const activeCombatant = this.ActiveCombatant();
if (!activeCombatant) {
this.lastVisibleActiveCombatantId = null;
return this.lastVisibleActiveCombatantId;
}
if (activeCombatant.Hidden()) {
return this.lastVisibleActiveCombatantId;
}
this.lastVisibleActiveCombatantId = activeCombatant.Id;
return this.lastVisibleActiveCombatantId;
}
public LoadSavedEncounter = (savedEncounter: SavedEncounter<SavedCombatant>, autosavedEncounter = false) => {
>>>>>>>
private lastVisibleActiveCombatantId = null;
private getPlayerViewActiveCombatantId() {
const activeCombatant = this.ActiveCombatant();
if (!activeCombatant) {
this.lastVisibleActiveCombatantId = null;
return this.lastVisibleActiveCombatantId;
}
if (activeCombatant.Hidden()) {
return this.lastVisibleActiveCombatantId;
}
this.lastVisibleActiveCombatantId = activeCombatant.Id;
return this.lastVisibleActiveCombatantId;
}
public LoadSavedEncounter = (savedEncounter: EncounterState<CombatantState>, autosavedEncounter = false) => { |
<<<<<<<
import { Server } from 'http';
import { Connection } from 'typeorm';
=======
import { WriteStream } from 'fs';
import { IncomingMessage, Server, ServerResponse } from 'http';
>>>>>>>
import { IncomingMessage, Server, ServerResponse } from 'http';
import { Connection } from 'typeorm'; |
<<<<<<<
metadataServerHost: '',
lastSync: 0,
=======
onDemandBaseUrl: 'https://unstable.life/Flashpoint/Data/Images/',
>>>>>>>
metadataServerHost: '',
lastSync: 0,
onDemandBaseUrl: 'https://unstable.life/Flashpoint/Data/Images/',
<<<<<<<
parser.prop('metaEditsFolderPath', v => source.metaEditsFolderPath = parseVarStr(str(v)));
parser.prop('useCustomTitlebar', v => source.useCustomTitlebar = !!v);
parser.prop('startServer', v => source.startServer = !!v);
parser.prop('disableExtremeGames', v => source.disableExtremeGames = !!v);
parser.prop('showBrokenGames', v => source.showBrokenGames = !!v);
parser.prop('nativePlatforms', v => source.nativePlatforms = strArray(v));
parser.prop('backPortMin', v => source.backPortMin = num(v));
parser.prop('backPortMax', v => source.backPortMax = num(v));
parser.prop('imagesPortMin', v => source.imagesPortMin = num(v));
parser.prop('imagesPortMax', v => source.imagesPortMax = num(v));
parser.prop('metadataServerHost', v => source.metadataServerHost = str(v)); // Server Host, won't contain vars
parser.prop('lastSync', v => source.lastSync = num(v));
parser.prop('server', v => source.server = str(v));
=======
parser.prop('useCustomTitlebar', v => source.useCustomTitlebar = !!v);
parser.prop('startServer', v => source.startServer = !!v);
parser.prop('startRedirector', v => source.startRedirector = !!v);
parser.prop('useFiddler', v => source.useFiddler = !!v);
parser.prop('disableExtremeGames', v => source.disableExtremeGames = !!v);
parser.prop('showBrokenGames', v => source.showBrokenGames = !!v);
parser.prop('nativePlatforms', v => source.nativePlatforms = strArray(v));
parser.prop('backPortMin', v => source.backPortMin = num(v));
parser.prop('backPortMax', v => source.backPortMax = num(v));
parser.prop('imagesPortMin', v => source.imagesPortMin = num(v));
parser.prop('imagesPortMax', v => source.imagesPortMax = num(v));
parser.prop('onDemandBaseUrl', v => source.onDemandBaseUrl = parseVarStr(str(v)));
>>>>>>>
parser.prop('metaEditsFolderPath', v => source.metaEditsFolderPath = parseVarStr(str(v)));
parser.prop('useCustomTitlebar', v => source.useCustomTitlebar = !!v);
parser.prop('startServer', v => source.startServer = !!v);
parser.prop('disableExtremeGames', v => source.disableExtremeGames = !!v);
parser.prop('showBrokenGames', v => source.showBrokenGames = !!v);
parser.prop('nativePlatforms', v => source.nativePlatforms = strArray(v));
parser.prop('backPortMin', v => source.backPortMin = num(v));
parser.prop('backPortMax', v => source.backPortMax = num(v));
parser.prop('imagesPortMin', v => source.imagesPortMin = num(v));
parser.prop('imagesPortMax', v => source.imagesPortMax = num(v));
parser.prop('metadataServerHost', v => source.metadataServerHost = str(v)); // Server Host, won't contain vars
parser.prop('lastSync', v => source.lastSync = num(v));
parser.prop('server', v => source.server = str(v));
parser.prop('onDemandBaseUrl', v => source.onDemandBaseUrl = parseVarStr(str(v))); |
<<<<<<<
import { BackOut, DevConsoleStatusResponse } from '@shared/back/types';
import { BrowserApplicationOpts } from '@shared/extensions/interfaces';
=======
import { BackOut } from '@shared/back/types';
>>>>>>>
import { BackOut } from '@shared/back/types';
import { BrowserApplicationOpts } from '@shared/extensions/interfaces';
<<<<<<<
state.apiEmitters.services.onServiceRemove.fire(service);
state.socketServer.broadcast<string>({
id: '',
type: BackOut.SERVICE_REMOVED,
data: processId,
});
=======
state.socketServer.broadcast(BackOut.SERVICE_REMOVED, processId);
>>>>>>>
state.apiEmitters.services.onServiceRemove.fire(service);
state.socketServer.broadcast(BackOut.SERVICE_REMOVED, processId);
<<<<<<<
case 'devConsole':
state.socketServer.broadcast<DevConsoleStatusResponse>({
id: '',
type: BackOut.DEV_CONSOLE_CHANGE,
data: {
text: val
},
});
=======
case 'devConsoleText':
state.socketServer.broadcast(BackOut.DEV_CONSOLE_CHANGE, val);
>>>>>>>
case 'devConsole':
state.socketServer.broadcast(BackOut.DEV_CONSOLE_CHANGE, val); |
<<<<<<<
respond<GetRendererInitDataResponse>(event.target, {
id: req.id,
type: BackOut.GENERIC_RESPONSE,
data: {
preferences: state.preferences,
config: state.config,
fileServerPort: state.fileServerPort,
log: state.log,
services: Array.from(state.services.values()).map(s => procToService(s)),
customVersion: state.customVersion,
languages: state.languages,
language: state.languageContainer,
themes: Array.from(state.registry.themes.values()),
playlists: await GameManager.findPlaylists(),
libraries: libraries,
serverNames: serverNames,
mad4fpEnabled: mad4fpEnabled,
platforms: platforms,
localeCode: state.localeCode,
tagCategories: await TagManager.findTagCategories(),
extensions: (await state.extensionsService.getExtensions()).map(e => {
return {
id: e.id,
...e.manifest
};
}),
devScripts: await state.extensionsService.getContributions('devScripts'),
contextButtons: await state.extensionsService.getContributions('contextButtons'),
logoSets: Array.from(state.registry.logoSets.values()),
},
});
=======
return {
preferences: state.preferences,
config: state.config,
fileServerPort: state.fileServerPort,
log: state.log,
services: Array.from(state.services.values()).map(s => procToService(s)),
customVersion: state.customVersion,
languages: state.languages,
language: state.languageContainer,
themes: Array.from(state.registry.themes.values()),
playlists: await GameManager.findPlaylists(),
libraries: libraries,
serverNames: serverNames,
mad4fpEnabled: mad4fpEnabled,
platforms: platforms,
localeCode: state.localeCode,
tagCategories: await TagManager.findTagCategories(),
extensions: (await state.extensionsService.getExtensions()).map(e => {
return {
id: e.id,
...e.manifest
};
}),
devScripts: await state.extensionsService.getContributions('devScripts'),
logoSets: Array.from(state.registry.logoSets.values()),
};
>>>>>>>
return {
preferences: state.preferences,
config: state.config,
fileServerPort: state.fileServerPort,
log: state.log,
services: Array.from(state.services.values()).map(s => procToService(s)),
customVersion: state.customVersion,
languages: state.languages,
language: state.languageContainer,
themes: Array.from(state.registry.themes.values()),
playlists: await GameManager.findPlaylists(),
libraries: libraries,
serverNames: serverNames,
mad4fpEnabled: mad4fpEnabled,
platforms: platforms,
localeCode: state.localeCode,
tagCategories: await TagManager.findTagCategories(),
extensions: (await state.extensionsService.getExtensions()).map(e => {
return {
id: e.id,
...e.manifest
};
}),
devScripts: await state.extensionsService.getContributions('devScripts'),
contextButtons: await state.extensionsService.getContributions('contextButtons'),
logoSets: Array.from(state.registry.logoSets.values()),
};
<<<<<<<
providers: await getProviders(state),
openDialog: state.socketServer.showMessageBoxBack(event.target),
openExternal: state.socketServer.openExternal(event.target),
runGame: runGameFactory(state)
=======
openDialog: state.socketServer.showMessageBoxBack(event.client),
openExternal: state.socketServer.openExternal(event.client),
>>>>>>>
providers: await getProviders(state),
openDialog: state.socketServer.showMessageBoxBack(event.client),
openExternal: state.socketServer.openExternal(event.client),
runGame: runGameFactory(state)
<<<<<<<
providers: await getProviders(state),
openDialog: state.socketServer.showMessageBoxBack(event.target),
openExternal: state.socketServer.openExternal(event.target),
runGame: runGameFactory(state),
},
state.apiEmitters.games.onWillLaunchGame);
=======
openDialog: state.socketServer.showMessageBoxBack(event.client),
openExternal: state.socketServer.openExternal(event.client),
});
>>>>>>>
providers: await getProviders(state),
openDialog: state.socketServer.showMessageBoxBack(event.client),
openExternal: state.socketServer.openExternal(event.client),
runGame: runGameFactory(state),
},
state.apiEmitters.games.onWillLaunchGame);
<<<<<<<
state.socketServer.register<GetPlaylistData>(BackIn.GET_PLAYLIST, async (event, req) => {
const playlist = await GameManager.findPlaylist(req.data, true);
respond<GetPlaylistResponse>(event.target, {
id: req.id,
type: BackOut.GENERIC_RESPONSE,
data: playlist
});
=======
state.socketServer.register(BackIn.GET_PLAYLIST, async (event, playlistId) => {
return await GameManager.findPlaylist(playlistId) as Playlist; // @TYPESAFE fix this?
>>>>>>>
state.socketServer.register(BackIn.GET_PLAYLIST, async (event, playlistId) => {
return await GameManager.findPlaylist(playlistId, true) as Playlist; // @TYPESAFE fix this?
<<<<<<<
runService(state, 'server', 'Server', state.config.flashpointPath, {}, mad4fpServerCopy);
} else if (!req.data.mad4fp && activeServerInfo && activeServerInfo.mad4fp && !configServer.mad4fp) {
=======
runService(state, 'server', 'Server', state.config.flashpointPath, mad4fpServerCopy);
} else if (!data.mad4fp && activeServerInfo && activeServerInfo.mad4fp && !configServer.mad4fp) {
>>>>>>>
runService(state, 'server', 'Server', state.config.flashpointPath, {}, mad4fpServerCopy);
} else if (!data.mad4fp && activeServerInfo && activeServerInfo.mad4fp && !configServer.mad4fp) {
<<<<<<<
providers: await getProviders(state),
openDialog: state.socketServer.showMessageBoxBack(event.target),
openExternal: state.socketServer.openExternal(event.target),
runGame: runGameFactory(state),
=======
openDialog: state.socketServer.showMessageBoxBack(event.client),
openExternal: state.socketServer.openExternal(event.client),
>>>>>>>
providers: await getProviders(state),
openDialog: state.socketServer.showMessageBoxBack(event.client),
openExternal: state.socketServer.openExternal(event.client),
runGame: runGameFactory(state),
<<<<<<<
providers: await getProviders(state),
openDialog: state.socketServer.showMessageBoxBack(event.target),
openExternal: state.socketServer.openExternal(event.target),
runGame: runGameFactory(state),
=======
openDialog: state.socketServer.showMessageBoxBack(event.client),
openExternal: state.socketServer.openExternal(event.client),
>>>>>>>
providers: await getProviders(state),
openDialog: state.socketServer.showMessageBoxBack(event.client),
openExternal: state.socketServer.openExternal(event.client),
runGame: runGameFactory(state), |
<<<<<<<
dialog: DialogLang;
=======
libraries: LibrariesLang;
>>>>>>>
dialog: DialogLang;
libraries: LibrariesLang;
<<<<<<<
export type DialogLang = LangObject<
'programNotFound' |
'phpNotFound' |
'wineNotFound' |
'fileNotFound' |
'pathNotFound' |
'selectFileToExportMeta' |
'selectFolderToExportMetaAndImages' |
'replaceFilesQuestion' |
'exportedAlreadyExistsYesNo' |
'selectScreenshot' |
'selectThumbnail' |
'selectThemeFile' |
'selectCurationFolder' |
'selectCurationArchive' |
'selectCurationMeta'
>;
=======
export type ExternalLang = LangObject<
'otherTechnologies' |
'otherTechnologiesDesc' |
'screenshots' |
'screenshotsDesc'
>;
export type LibrariesLang = Partial<LangObject<string>>;
>>>>>>>
export type DialogLang = LangObject<
'programNotFound' |
'phpNotFound' |
'wineNotFound' |
'fileNotFound' |
'pathNotFound' |
'selectFileToExportMeta' |
'selectFolderToExportMetaAndImages' |
'replaceFilesQuestion' |
'exportedAlreadyExistsYesNo' |
'selectScreenshot' |
'selectThumbnail' |
'selectThemeFile' |
'selectCurationFolder' |
'selectCurationArchive' |
'selectCurationMeta'
>;
export type LibrariesLang = Partial<LangObject<string>>; |
<<<<<<<
const proc = exec(
createCommand(appPath, appArgs),
{ env: getEnvironment(opts.fpPath) }
=======
const useWine: boolean = process.platform != 'win32' && appPath.endsWith('.exe');
const proc = launch(
createCommand(appPath, appArgs, useWine),
{ env: getEnvironment(opts.fpPath) },
opts.log
>>>>>>>
const useWine: boolean = process.platform != 'win32' && appPath.endsWith('.exe');
const proc = exec(
createCommand(appPath, appArgs, useWine),
{ env: getEnvironment(opts.fpPath) }
<<<<<<<
let proc: ChildProcess;
const appPath: string = getApplicationPath(opts.game.applicationPath, opts.execMappings, opts.native)
switch (appPath) {
case ':flash:': {
const env = getEnvironment(opts.fpPath);
if ('ELECTRON_RUN_AS_NODE' in env) {
delete env['ELECTRON_RUN_AS_NODE']; // If this flag is present, it will disable electron features from the process
}
proc = execFile(
process.execPath, // path.join(__dirname, '../main/index.js'),
[path.join(__dirname, '../main/index.js'), 'flash=true', opts.game.launchCommand],
{ env, cwd: process.cwd() }
);
logProcessOutput(proc, opts.log);
opts.log({
source: logSource,
content: `Launch Game "${opts.game.title}" (PID: ${proc.pid}) [\n`+
` applicationPath: "${appPath}",\n`+
` launchCommand: "${opts.game.launchCommand}" ]`
});
} break;
default: {
const gamePath: string = fixSlashes(path.join(opts.fpPath, appPath));
const gameArgs: string = opts.game.launchCommand;
const command: string = createCommand(gamePath, gameArgs);
proc = exec(command, { env: getEnvironment(opts.fpPath) });
logProcessOutput(proc, opts.log);
opts.log({
source: logSource,
content: `Launch Game "${opts.game.title}" (PID: ${proc.pid}) [\n`+
` applicationPath: "${appPath}",\n`+
` launchCommand: "${opts.game.launchCommand}",\n`+
` command: "${command}" ]`
});
} break;
}
=======
const gamePath: string = fixSlashes(path.join(opts.fpPath, getApplicationPath(opts.game.applicationPath, opts.execMappings, opts.native)));
const gameArgs: string = opts.game.launchCommand;
const useWine: boolean = process.platform != 'win32' && gamePath.endsWith('.exe');
const command: string = createCommand(gamePath, gameArgs, useWine);
const proc = launch(command, { env: getEnvironment(opts.fpPath) }, opts.log);
opts.log({
source: logSource,
content: `Launch Game "${opts.game.title}" (PID: ${proc.pid}) [\n`+
` applicationPath: "${opts.game.applicationPath}",\n`+
` launchCommand: "${opts.game.launchCommand}",\n`+
` command: "${command}" ]`
});
>>>>>>>
let proc: ChildProcess;
const appPath: string = getApplicationPath(opts.game.applicationPath, opts.execMappings, opts.native)
switch (appPath) {
case ':flash:': {
const env = getEnvironment(opts.fpPath);
if ('ELECTRON_RUN_AS_NODE' in env) {
delete env['ELECTRON_RUN_AS_NODE']; // If this flag is present, it will disable electron features from the process
}
proc = execFile(
process.execPath, // path.join(__dirname, '../main/index.js'),
[path.join(__dirname, '../main/index.js'), 'flash=true', opts.game.launchCommand],
{ env, cwd: process.cwd() }
);
logProcessOutput(proc, opts.log);
opts.log({
source: logSource,
content: `Launch Game "${opts.game.title}" (PID: ${proc.pid}) [\n`+
` applicationPath: "${appPath}",\n`+
` launchCommand: "${opts.game.launchCommand}" ]`
});
} break;
default: {
const gamePath: string = fixSlashes(path.join(opts.fpPath, getApplicationPath(opts.game.applicationPath, opts.execMappings, opts.native)));
const gameArgs: string = opts.game.launchCommand;
const useWine: boolean = process.platform != 'win32' && gamePath.endsWith('.exe');
const command: string = createCommand(gamePath, gameArgs, useWine);
const proc = exec(command, { env: getEnvironment(opts.fpPath) });
logProcessOutput(proc, opts.log);
opts.log({
source: logSource,
content: `Launch Game "${opts.game.title}" (PID: ${proc.pid}) [\n`+
` applicationPath: "${opts.game.applicationPath}",\n`+
` launchCommand: "${opts.game.launchCommand}",\n`+
` command: "${command}" ]`
});
} break;
} |
<<<<<<<
import { FontWeights } from '../../Styling';
=======
import { getWindow } from '../../Utilities';
>>>>>>>
import { FontWeights } from '../../Styling';
import { getWindow } from '../../Utilities'; |
<<<<<<<
export function launchCuration(curation: EditCuration, lang: LangContainer['dialog']) {
linkContentFolder(curation.key);
=======
export async function launchCuration(curation: EditCuration) {
await linkContentFolder(curation.key);
console.log(`Launching Curation ${curation.meta.title}`);
curationLog(`Launching Curation ${curation.meta.title}`);
>>>>>>>
export async function launchCuration(curation: EditCuration, lang: LangContainer['dialog']) {
await linkContentFolder(curation.key);
console.log(`Launching Curation ${curation.meta.title}`);
curationLog(`Launching Curation ${curation.meta.title}`);
<<<<<<<
export function launchAddAppCuration(curationKey: string, native: boolean, appCuration: EditAddAppCuration) {
linkContentFolder(curationKey);
=======
export async function launchAddAppCuration(curationKey: string, appCuration: EditAddAppCuration) {
await linkContentFolder(curationKey);
>>>>>>>
export async function launchAddAppCuration(curationKey: string, native: boolean, appCuration: EditAddAppCuration) {
await linkContentFolder(curationKey); |
<<<<<<<
frame: !this._main.config.useCustomTitlebar,
=======
icon: path.join(__dirname, '../window/images/icon.png'),
frame: !this._main.config.data.useCustomTitlebar,
>>>>>>>
frame: !this._main.config.useCustomTitlebar,
icon: path.join(__dirname, '../window/images/icon.png'), |
<<<<<<<
import * as YAML from 'yaml';
=======
import { Coerce } from '../../shared/utils/Coerce';
>>>>>>>
import * as YAML from 'yaml';
import { Coerce } from '../../shared/utils/Coerce';
<<<<<<<
export function convertMeta(data: any, onError?: (error: string) => void): ParsedCurationMeta {
=======
function convertMeta(data: any, onError?: (error: string) => void): ParsedCurationMeta {
// Treat field names case-insensitively
const lowerCaseData: any = {};
for (let key of Object.keys(data)) {
lowerCaseData[key.toLowerCase()] = data[key];
}
>>>>>>>
function convertMeta(data: any, onError?: (error: string) => void): ParsedCurationMeta {
// Default parsed data
<<<<<<<
parser.prop('Author Notes', v => parsed.game.authorNotes = str(v));
parser.prop('Genre', v => parsed.game.tags = str(v));
parser.prop('Notes', v => parsed.game.notes = str(v));
=======
parser.prop('author notes', v => parsed.game.authorNotes = str(v));
parser.prop('genre', v => parsed.game.genre = str(v));
parser.prop('notes', v => parsed.game.notes = str(v));
>>>>>>>
parser.prop('author notes', v => parsed.game.authorNotes = str(v));
parser.prop('genre', v => parsed.game.tags = str(v));
parser.prop('notes', v => parsed.game.notes = str(v));
<<<<<<<
parser.prop('Application Path', v => parsed.game.applicationPath = str(v));
parser.prop('Curation Notes', v => parsed.game.authorNotes = str(v));
parser.prop('Developer', v => parsed.game.developer = str(v));
parser.prop('Extreme', v => parsed.game.extreme = str(v));
parser.prop('Game Notes', v => parsed.game.notes = str(v));
parser.prop('Genres', v => parsed.game.tags = str(v));
parser.prop('Languages', v => parsed.game.language = str(v));
parser.prop('Launch Command', v => parsed.game.launchCommand = str(v));
parser.prop('Original Description', v => parsed.game.originalDescription = str(v));
parser.prop('Play Mode', v => parsed.game.playMode = str(v));
parser.prop('Platform', v => parsed.game.platform = str(v));
parser.prop('Publisher', v => parsed.game.publisher = str(v));
parser.prop('Release Date', v => parsed.game.releaseDate = str(v));
parser.prop('Series', v => parsed.game.series = str(v));
parser.prop('Source', v => parsed.game.source = str(v));
parser.prop('Status', v => parsed.game.status = str(v));
parser.prop('Tags', v => parsed.game.tags = str(v));
parser.prop('Title', v => parsed.game.title = str(v));
parser.prop('Library', v => parsed.game.library = str(v).toLowerCase()); // must be lower case
parser.prop('Version', v => parsed.game.version = str(v));
=======
parser.prop('application path', v => parsed.game.applicationPath = str(v));
parser.prop('curation notes', v => parsed.game.authorNotes = str(v));
parser.prop('developer', v => parsed.game.developer = str(v));
parser.prop('extreme', v => parsed.game.extreme = str(v));
parser.prop('game notes', v => parsed.game.notes = str(v));
parser.prop('genres', v => parsed.game.genre = str(v));
parser.prop('languages', v => parsed.game.language = str(v));
parser.prop('launch command', v => parsed.game.launchCommand = str(v));
parser.prop('original description', v => parsed.game.originalDescription = str(v));
parser.prop('play mode', v => parsed.game.playMode = str(v));
parser.prop('platform', v => parsed.game.platform = str(v));
parser.prop('publisher', v => parsed.game.publisher = str(v));
parser.prop('release date', v => parsed.game.releaseDate = str(v));
parser.prop('series', v => parsed.game.series = str(v));
parser.prop('source', v => parsed.game.source = str(v));
parser.prop('status', v => parsed.game.status = str(v));
parser.prop('tags', v => parsed.game.genre = str(v));
parser.prop('title', v => parsed.game.title = str(v));
parser.prop('version', v => parsed.game.version = str(v));
parser.prop('library', v => parsed.game.library = str(v));
>>>>>>>
parser.prop('application path', v => parsed.game.applicationPath = str(v));
parser.prop('curation notes', v => parsed.game.authorNotes = str(v));
parser.prop('developer', v => parsed.game.developer = str(v));
parser.prop('extreme', v => parsed.game.extreme = str(v));
parser.prop('game notes', v => parsed.game.notes = str(v));
parser.prop('genres', v => parsed.game.tags = str(v));
parser.prop('languages', v => parsed.game.language = str(v));
parser.prop('launch command', v => parsed.game.launchCommand = str(v));
parser.prop('original description', v => parsed.game.originalDescription = str(v));
parser.prop('play mode', v => parsed.game.playMode = str(v));
parser.prop('platform', v => parsed.game.platform = str(v));
parser.prop('publisher', v => parsed.game.publisher = str(v));
parser.prop('release date', v => parsed.game.releaseDate = str(v));
parser.prop('series', v => parsed.game.series = str(v));
parser.prop('source', v => parsed.game.source = str(v));
parser.prop('status', v => parsed.game.status = str(v));
parser.prop('tags', v => parsed.game.tags = str(v));
parser.prop('title', v => parsed.game.title = str(v));
parser.prop('version', v => parsed.game.version = str(v));
parser.prop('library', v => parsed.game.library = str(v).toLowerCase()); // must be lower case |
<<<<<<<
import { TableRow } from "./table-row.class";
=======
import { DocumentationModule } from "../documentation-component/documentation.module";
>>>>>>>
import { TableRow } from "./table-row.class";
import { DocumentationModule } from "../documentation-component/documentation.module"; |
<<<<<<<
ariaLabel="Close menu">
</ibm-icon-chevron-down>
=======
[title]="open ? closeMenuAria : openMenuAria"
[ariaLabel]="open ? closeMenuAria : openMenuAria">
</ibm-icon-chevron-down16>
>>>>>>>
[title]="open ? closeMenuAria : openMenuAria"
[ariaLabel]="open ? closeMenuAria : openMenuAria">
</ibm-icon-chevron-down> |
<<<<<<<
class="bx--select"
style="width: 100%">
<label [attr.for]="id" class="bx--label">{{label}}</label>
=======
class="bx--select">
<label *ngIf="!skeleton" [attr.for]="id" class="bx--label">{{label}}</label>
>>>>>>>
class="bx--select"
style="width: 100%">
<label *ngIf="!skeleton" [attr.for]="id" class="bx--label">{{label}}</label> |
<<<<<<<
=======
@HostBinding("attr.role") role = "checkbox";
>>>>>>>
@HostBinding("attr.role") role = "checkbox"; |
<<<<<<<
[sortable]="sortable"
=======
[skeleton]="skeleton"
>>>>>>>
[sortable]="sortable"
[skeleton]="skeleton"
<<<<<<<
[sortable]="sortable"
=======
[skeleton]="skeleton"
>>>>>>>
[sortable]="sortable"
[skeleton]="skeleton"
<<<<<<<
[sortable]="sortable"
=======
[skeleton]="skeleton"
>>>>>>>
[sortable]="sortable"
[skeleton]="skeleton"
<<<<<<<
<app-pagination-table [sortable]="sortable" [totalDataLength]="totalDataLength" [model]="model"></app-pagination-table>
=======
<app-pagination-table
[skeleton]="skeleton"
[totalDataLength]="totalDataLength"
[model]="model">
</app-pagination-table>
>>>>>>>
<app-pagination-table
[skeleton]="skeleton"
[sortable]="sortable"
[totalDataLength]="totalDataLength"
[model]="model">
</app-pagination-table> |
<<<<<<<
=======
* (size `"default"` is being deprecated as of neutrino v1.2.0, please use `"md"` instead)
* @type {("sm" | "md" | "default")}
* @memberof Switch
>>>>>>> |
<<<<<<<
import {
ChevronDownModule,
CaretLeftModule,
CaretRightModule,
OverflowMenuHorizontalModule
} from "@carbon/icons-angular";
=======
>>>>>>>
import {
ChevronDownModule,
CaretLeftModule,
CaretRightModule,
OverflowMenuHorizontalModule
} from "@carbon/icons-angular";
<<<<<<<
import { PaginationNav } from "./pagination-nav";
import { PaginationNavItem } from "./pagination-nav";
import { PaginationOverflow } from "./pagination-nav";
=======
import { IconModule } from "carbon-components-angular/icon";
>>>>>>>
import { PaginationNav } from "./pagination-nav";
import { PaginationNavItem } from "./pagination-nav";
import { PaginationOverflow } from "./pagination-nav";
import { IconModule } from "carbon-components-angular/icon";
<<<<<<<
ChevronDownModule,
CaretLeftModule,
CaretRightModule,
OverflowMenuHorizontalModule
=======
IconModule
>>>>>>>
ChevronDownModule,
CaretLeftModule,
CaretRightModule,
OverflowMenuHorizontalModule
IconModule |
<<<<<<<
inline="true"
aria-label="Select row"
=======
[attr.aria-label]="checkboxRowLabel | async"
>>>>>>>
inline="true"
[attr.aria-label]="checkboxRowLabel | async" |
<<<<<<<
Renderer2,
ViewChild
=======
ViewChild,
HostBinding
>>>>>>>
Renderer2,
ViewChild,
HostBinding
<<<<<<<
constructor(private changeDetectorRef: ChangeDetectorRef, private _elementRef: ElementRef, private renderer: Renderer2) {
=======
@HostBinding("attr.role") role = "radiogroup";
private _isInitialized = false;
private _disabled = false;
private _value: any = null;
private _selected: RadioComponent = null;
private _name = `radio-group-${RadioGroup.radioGroupCount}`;
constructor(private changeDetectorRef: ChangeDetectorRef) {
>>>>>>>
@HostBinding("attr.role") role = "radiogroup";
private _isInitialized = false;
private _disabled = false;
private _value: any = null;
private _selected: RadioComponent = null;
private _name = `radio-group-${RadioGroup.radioGroupCount}`;
constructor(private changeDetectorRef: ChangeDetectorRef, private _elementRef: ElementRef, private renderer: Renderer2) { |
<<<<<<<
[theme]="type"
[ariaLabel]="title"
[open]="open"
=======
[theme]="modalType"
[hasScrollingContent]="hasScrollingContent"
[modalLabel]="modalTitle"
>>>>>>>
[theme]="type"
[ariaLabel]="title"
[hasScrollingContent]="hasScrollingContent"
[open]="open"
<<<<<<<
<p class="bx--modal-header__label bx--type-delta">{{label}}</p>
<p class="bx--modal-header__heading bx--type-beta">{{title}}</p>
=======
<p class="bx--modal-header__label bx--type-delta">{{modalLabel}}</p>
<p class="bx--modal-header__heading bx--type-beta">{{modalTitle}}</p>
>>>>>>>
<p class="bx--modal-header__label bx--type-delta">{{label}}</p>
<p class="bx--modal-header__heading bx--type-beta">{{title}}</p> |
<<<<<<<
[size]="size === 'sm' ? size : 'md'"
=======
[size]="size !== 'lg' ? 'sm' : 'default'"
>>>>>>>
[size]="size !== 'lg' ? 'sm' : 'md'" |
<<<<<<<
<ibm-table [sortable]="sortable" style="display: block; width: 650px;" [model]="model" (sort)="paginationSort($event)"></ibm-table>
=======
<ibm-table
style="display: block; width: 650px;"
[skeleton]="skeleton"
[model]="model"
(sort)="paginationSort($event)">
</ibm-table>
>>>>>>>
<ibm-table
style="display: block; width: 650px;"
[sortable]="sortable"
[skeleton]="skeleton"
[model]="model"
(sort)="paginationSort($event)">
</ibm-table>
<<<<<<<
@Input() sortable = true;
=======
@Input() skeleton = false;
>>>>>>>
@Input() sortable = true;
@Input() skeleton = false; |
<<<<<<<
<ibm-icon-chevron-down size="16" *ngIf="!skeleton" class="bx--select__arrow"></ibm-icon-chevron-down>
=======
<svg ibmIconChevronDown16 *ngIf="!skeleton" class="bx--select__arrow"></svg>
</div>
>>>>>>>
<ibm-icon-chevron-down size="16" *ngIf="!skeleton" class="bx--select__arrow"></ibm-icon-chevron-down>
</div> |
<<<<<<<
Renderer2,
ViewChild
=======
ViewChild,
HostBinding
>>>>>>>
Renderer2,
ViewChild,
HostBinding
<<<<<<<
constructor(private changeDetectorRef: ChangeDetectorRef, private _elementRef: ElementRef, private renderer: Renderer2) {
=======
@HostBinding("attr.role") role = "radiogroup";
private _isInitialized = false;
private _disabled = false;
private _value: any = null;
private _selected: RadioComponent = null;
private _name = `radio-group-${RadioGroup.radioGroupCount}`;
constructor(private changeDetectorRef: ChangeDetectorRef) {
>>>>>>>
@HostBinding("attr.role") role = "radiogroup";
private _isInitialized = false;
private _disabled = false;
private _value: any = null;
private _selected: RadioComponent = null;
private _name = `radio-group-${RadioGroup.radioGroupCount}`;
constructor(private changeDetectorRef: ChangeDetectorRef, private _elementRef: ElementRef, private renderer: Renderer2) { |
<<<<<<<
ignoretz: boolean
tzinfos: any | null
=======
>>>>>>>
<<<<<<<
// @ts-ignore
dtstart: options.dtstart || dtstart,
ignoretz: options.ignoretz,
tzinfos: options.tzinfos
=======
dtstart: options.dtstart || dtstart
>>>>>>>
// @ts-ignore
dtstart: options.dtstart || dtstart
<<<<<<<
// @ts-ignore
dtstart: options.dtstart || dtstart,
ignoretz: options.ignoretz,
tzinfos: options.tzinfos
=======
dtstart: options.dtstart || dtstart
>>>>>>>
// @ts-ignore
dtstart: options.dtstart || dtstart |
<<<<<<<
=======
import IterResult, { IterArgs } from './iterresult';
>>>>>>>
import IterResult from './iterresult';
<<<<<<<
private _iter;
}
=======
_iter(iterResult: IterResult): Date | Date[] | null;
}
export {};
>>>>>>>
_iter(iterResult: IterResult): Date | Date[] | null;
} |
<<<<<<<
import { includes, isPresent, isArray, isNumber, toArray } from './helpers'
import Weekday from './weekday'
=======
import { includes, isPresent, isArray, isNumber } from './helpers'
import { Weekday } from './weekday'
>>>>>>>
import { includes, isPresent, isArray, isNumber, toArray } from './helpers'
import { Weekday } from './weekday' |
<<<<<<<
import { parseMarkers, getConfigDefault } from './utils';
=======
import { getConfigDefault } from './tb-config';
import { parseMarkers } from './utils';
import deviceSettings, { EmulateDeviceSetting } from './simulate-device-options';
>>>>>>>
import { parseMarkers, getConfigDefault } from './utils';
import deviceSettings, { EmulateDeviceSetting } from './simulate-device-options';
<<<<<<<
export const traceFrame = flags.build({
default: () => getConfigDefault('traceFrame'),
description: 'Specifiy a trace insights frame',
=======
export const marks = flags.build({
default: () => getConfigDefault('marks'),
description: 'Show user timing marks',
});
export const urlOrFrame = flags.build({
default: () => getConfigDefault('urlOrFrame'),
description: 'URL or Frame',
});
export const emulateDevice = flags.build({
char: 'e',
default: () => getConfigDefault('emulateDevice', defaultFlagArgs.emulateDevice),
description: 'Simulate a device\'s screen size.',
options: deviceSettings.map(setting => `${setting.typeable}`),
parse: (s: string): EmulateDeviceSetting | undefined => {
for(const option of deviceSettings) {
if (s === option.typeable) {
return option;
}
}
},
>>>>>>>
export const traceFrame = flags.build({
default: () => getConfigDefault('traceFrame'),
description: 'Specifiy a trace insights frame',
});
export const emulateDevice = flags.build({
char: 'e',
default: () => getConfigDefault('emulateDevice', defaultFlagArgs.emulateDevice),
description: 'Simulate a device\'s screen size.',
options: deviceSettings.map(setting => `${setting.typeable}`),
parse: (s: string): EmulateDeviceSetting | undefined => {
for(const option of deviceSettings) {
if (s === option.typeable) {
return option;
}
}
}, |
<<<<<<<
import { GirParameter } from './gir-parameter'
// Declaring these two together is the easiest way to prevent circular
// imports
=======
import { GirBoolean } from './gir-boolean'
>>>>>>>
import { GirParameter } from './gir-parameter'
import { GirBoolean } from './gir-boolean'
// Declaring these two together is the easiest way to prevent circular
// imports
<<<<<<<
callback?: GirFunction[]
}
export interface GirFunction extends TsForGjsExtended {
$: {
name: string
version?: string
'c-identifier'?: string
introspectable?: string
'moved-to'?: string
'shadowed-by'?: string
}
doc?: GirDoc[]
parameters?: GirParameter[]
'return-value'?: GirVariable[]
=======
varargs?: string[]
>>>>>>>
callback?: GirFunction[]
varargs?: string[]
}
export interface GirFunction extends TsForGjsExtended {
$: {
name: string
version?: string
'c:identifier'?: string
introspectable?: GirBoolean
'moved-to'?: string
'shadowed-by'?: string
when?: 'first' | 'last'
detailed?: GirBoolean
throws?: GirBoolean
}
doc?: GirDoc[]
parameters?: GirParameter[]
'return-value'?: GirVariable[] |
<<<<<<<
list_sizes(): [ /* sizes */ number[] | null, /* n_sizes */ number ]
/* Methods of GObject.Object */
=======
list_sizes(): /* sizes */ number[] | null
/* Methods of Object */
>>>>>>>
list_sizes(): /* sizes */ number[] | null
/* Methods of GObject.Object */
<<<<<<<
vfunc_list_sizes(): [ /* sizes */ number[] | null, /* n_sizes */ number ]
/* Virtual methods of GObject.Object */
=======
vfunc_list_sizes(): /* sizes */ number[] | null
/* Virtual methods of Object */
>>>>>>>
vfunc_list_sizes(): /* sizes */ number[] | null
/* Virtual methods of GObject.Object */
<<<<<<<
list_faces(): [ /* faces */ FontFace[] | null, /* n_faces */ number ]
/* Methods of GObject.Object */
=======
list_faces(): /* faces */ FontFace[] | null
/* Methods of Object */
>>>>>>>
list_faces(): /* faces */ FontFace[] | null
/* Methods of GObject.Object */
<<<<<<<
vfunc_list_faces(): [ /* faces */ FontFace[] | null, /* n_faces */ number ]
/* Virtual methods of GObject.Object */
=======
vfunc_list_faces(): /* faces */ FontFace[] | null
/* Virtual methods of Object */
>>>>>>>
vfunc_list_faces(): /* faces */ FontFace[] | null
/* Virtual methods of GObject.Object */ |
<<<<<<<
export function convert_with_fallback(str: Gjs.byteArray.ByteArray, to_codeset: string, from_codeset: string, fallback: string): [ /* returnType */ Gjs.byteArray.ByteArray, /* bytes_read */ number | null ]
export function datalist_foreach(datalist: Data, func: DataForeachFunc): void
export function datalist_get_data(datalist: Data, key: string): object | null
=======
export function convert_with_fallback(str: string, len: number, to_codeset: string, from_codeset: string, fallback: string, bytes_read: number, bytes_written: number): string
export function convert_with_iconv(str: string, len: number, converter: IConv, bytes_read: number, bytes_written: number): string
export function datalist_clear(datalist: Data): void
>>>>>>>
export function convert_with_fallback(str: Gjs.byteArray.ByteArray, to_codeset: string, from_codeset: string, fallback: string): [ /* returnType */ Gjs.byteArray.ByteArray, /* bytes_read */ number | null ]
export function datalist_foreach(datalist: Data, func: DataForeachFunc): void
export function datalist_get_data(datalist: Data, key: string): object | null
<<<<<<<
export function datalist_id_get_data(datalist: Data, key_id: Quark): object | null
=======
export function datalist_id_replace_data(datalist: Data, key_id: Quark, oldval?: object | null, newval?: object | null, destroy?: DestroyNotify | null, old_destroy?: DestroyNotify | null): boolean
export function datalist_id_set_data_full(datalist: Data, key_id: Quark, data: object | null, destroy_func: DestroyNotify): void
export function datalist_init(datalist: Data): void
>>>>>>>
export function datalist_id_get_data(datalist: Data, key_id: Quark): object | null
<<<<<<<
export function dataset_foreach(dataset_location: object, func: DataForeachFunc): void
export function dataset_id_get_data(dataset_location: object, key_id: Quark): object | null
=======
export function dataset_id_set_data_full(dataset_location: object, key_id: Quark, data: object, destroy_func: DestroyNotify): void
>>>>>>>
export function dataset_foreach(dataset_location: object, func: DataForeachFunc): void
export function dataset_id_get_data(dataset_location: object, key_id: Quark): object | null
<<<<<<<
export function filename_from_utf8(utf8string: string, len: number): [ /* returnType */ string, /* bytes_read */ number | null, /* bytes_written */ number | null ]
export function filename_to_uri(filename: any, hostname?: string | null): string
export function filename_to_utf8(opsysstring: any, len: number): [ /* returnType */ string, /* bytes_read */ number | null, /* bytes_written */ number | null ]
export function find_program_in_path(program: any): string
=======
export function filename_from_utf8(utf8string: string, len: number): [ /* returnType */ Gjs.byteArray.ByteArray, /* bytes_read */ number | null ]
export function filename_to_uri(filename: string, hostname?: string | null): string
export function filename_to_utf8(opsysstring: string, len: number, bytes_read: number, bytes_written: number): string
export function find_program_in_path(program: string): string
>>>>>>>
export function filename_from_utf8(utf8string: string, len: number): [ /* returnType */ string, /* bytes_read */ number | null, /* bytes_written */ number | null ]
export function filename_to_uri(filename: any, hostname?: string | null): string
export function filename_to_utf8(opsysstring: any, len: number): [ /* returnType */ string, /* bytes_read */ number | null, /* bytes_written */ number | null ]
export function find_program_in_path(program: any): string
<<<<<<<
export function get_system_config_dirs(): any
export function get_system_data_dirs(): any
export function get_tmp_dir(): any
export function get_user_cache_dir(): any
export function get_user_config_dir(): any
export function get_user_data_dir(): any
export function get_user_name(): any
export function get_user_runtime_dir(): any
export function get_user_special_dir(directory: UserDirectory): any
export function getenv(variable: any): any
export function hash_table_add(hash_table: HashTable, key?: object | null): boolean
export function hash_table_contains(hash_table: HashTable, key?: object | null): boolean
=======
export function get_system_config_dirs(): string[]
export function get_system_data_dirs(): string[]
export function get_tmp_dir(): string
export function get_user_cache_dir(): string
export function get_user_config_dir(): string
export function get_user_data_dir(): string
export function get_user_name(): string
export function get_user_runtime_dir(): string
export function get_user_special_dir(directory: UserDirectory): string
export function getenv(variable: string): string
export function hash_table_add(hash_table: HashTable, key: object): boolean
export function hash_table_contains(hash_table: HashTable, key: object): boolean
>>>>>>>
export function get_system_config_dirs(): any
export function get_system_data_dirs(): any
export function get_tmp_dir(): any
export function get_user_cache_dir(): any
export function get_user_config_dir(): any
export function get_user_data_dir(): any
export function get_user_name(): any
export function get_user_runtime_dir(): any
export function get_user_special_dir(directory: UserDirectory): any
export function getenv(variable: any): any
export function hash_table_add(hash_table: HashTable, key?: object | null): boolean
export function hash_table_contains(hash_table: HashTable, key?: object | null): boolean
<<<<<<<
export function idle_add(priority: number, function_: SourceFunc, notify?: DestroyNotify | null): number
export function idle_remove_by_data(data?: object | null): boolean
=======
export function iconv(converter: IConv, inbuf: string, inbytes_left: number, outbuf: string, outbytes_left: number): number
export function idle_add(priority: number, function_: SourceFunc): number
export function idle_remove_by_data(data: object): boolean
>>>>>>>
export function idle_add(priority: number, function_: SourceFunc): number
export function idle_remove_by_data(data?: object | null): boolean
<<<<<<<
export function listenv(): any
export function locale_from_utf8(utf8string: string, len: number): [ /* returnType */ Gjs.byteArray.ByteArray, /* bytes_read */ number | null ]
export function locale_to_utf8(opsysstring: Gjs.byteArray.ByteArray): [ /* returnType */ string, /* bytes_read */ number | null, /* bytes_written */ number | null ]
export function log_default_handler(log_domain: string | null, log_level: LogLevelFlags, message?: string | null, unused_data?: object | null): void
=======
export function listenv(): string[]
export function locale_from_utf8(utf8string: string, len: number, bytes_read: number, bytes_written: number): string
export function locale_to_utf8(opsysstring: string, len: number, bytes_read: number, bytes_written: number): string
export function log_default_handler(log_domain: string, log_level: LogLevelFlags, message: string, unused_data: object): void
>>>>>>>
export function listenv(): any
export function locale_from_utf8(utf8string: string, len: number): [ /* returnType */ Gjs.byteArray.ByteArray, /* bytes_read */ number | null ]
export function locale_to_utf8(opsysstring: Gjs.byteArray.ByteArray): [ /* returnType */ string, /* bytes_read */ number | null, /* bytes_written */ number | null ]
export function log_default_handler(log_domain: string | null, log_level: LogLevelFlags, message?: string | null, unused_data?: object | null): void
<<<<<<<
export function memdup(mem: object | null, byte_size: number): object | null
export function mkdir_with_parents(pathname: any, mode: number): number
=======
export function mkdir_with_parents(pathname: string, mode: number): number
export function mkdtemp(tmpl: string): string
export function mkdtemp_full(tmpl: string, mode: number): string
export function mkstemp(tmpl: string): number
export function mkstemp_full(tmpl: string, flags: number, mode: number): number
>>>>>>>
export function memdup(mem: object | null, byte_size: number): object | null
export function mkdir_with_parents(pathname: any, mode: number): number
<<<<<<<
export function path_get_basename(file_name: any): string
export function path_get_dirname(file_name: any): string
export function path_is_absolute(file_name: any): boolean
export function path_skip_root(file_name: any): any
=======
export function path_get_basename(file_name: string): string
export function path_get_dirname(file_name: string): string
export function path_is_absolute(file_name: string): boolean
export function path_skip_root(file_name: string): string | null
>>>>>>>
export function path_get_basename(file_name: any): string
export function path_get_dirname(file_name: any): string
export function path_is_absolute(file_name: any): boolean
export function path_skip_root(file_name: any): any
<<<<<<<
export function rmdir(filename: any): number
export function sequence_get(iter: SequenceIter): object | null
export function sequence_insert_before(iter: SequenceIter, data?: object | null): SequenceIter
=======
export function return_if_fail_warning(log_domain: string, pretty_function: string, expression: string): void
export function rmdir(filename: string): number
>>>>>>>
export function rmdir(filename: any): number
export function sequence_get(iter: SequenceIter): object | null
export function sequence_insert_before(iter: SequenceIter, data?: object | null): SequenceIter
<<<<<<<
export function shell_parse_argv(command_line: any): [ /* returnType */ boolean, /* argvp */ any[] ]
export function shell_quote(unquoted_string: any): string
export function shell_unquote(quoted_string: any): string
export function slice_alloc(block_size: number): object | null
export function slice_alloc0(block_size: number): object | null
export function slice_copy(block_size: number, mem_block?: object | null): object | null
export function slice_free1(block_size: number, mem_block?: object | null): void
export function slice_free_chain_with_offset(block_size: number, mem_chain: object | null, next_offset: number): void
=======
export function shell_parse_argv(command_line: string): [ /* returnType */ boolean, /* argvp */ string[] | null ]
export function shell_quote(unquoted_string: string): string
export function shell_unquote(quoted_string: string): string
export function slice_free1(block_size: number, mem_block: object): void
export function slice_free_chain_with_offset(block_size: number, mem_chain: object, next_offset: number): void
>>>>>>>
export function shell_parse_argv(command_line: any): [ /* returnType */ boolean, /* argvp */ any[] ]
export function shell_quote(unquoted_string: any): string
export function shell_unquote(quoted_string: any): string
export function slice_alloc(block_size: number): object | null
export function slice_alloc0(block_size: number): object | null
export function slice_copy(block_size: number, mem_block?: object | null): object | null
export function slice_free1(block_size: number, mem_block?: object | null): void
export function slice_free_chain_with_offset(block_size: number, mem_chain: object | null, next_offset: number): void
<<<<<<<
export function spawn_async(working_directory: any, argv: any, envp: any, flags: SpawnFlags, child_setup?: SpawnChildSetupFunc | null): [ /* returnType */ boolean, /* child_pid */ Pid | null ]
export function spawn_async_with_pipes(working_directory: any, argv: any, envp: any, flags: SpawnFlags, child_setup?: SpawnChildSetupFunc | null): [ /* returnType */ boolean, /* child_pid */ Pid | null, /* standard_input */ number | null, /* standard_output */ number | null, /* standard_error */ number | null ]
=======
export function spawn_async(working_directory: string | null, argv: string[], envp: string[] | null, flags: SpawnFlags, child_setup: SpawnChildSetupFunc | null): [ /* returnType */ boolean, /* child_pid */ Pid | null ]
export function spawn_async_with_pipes(working_directory: string | null, argv: string[], envp: string[] | null, flags: SpawnFlags, child_setup: SpawnChildSetupFunc | null): [ /* returnType */ boolean, /* child_pid */ Pid | null, /* standard_input */ number | null, /* standard_output */ number | null, /* standard_error */ number | null ]
>>>>>>>
export function spawn_async(working_directory: any, argv: any, envp: any, flags: SpawnFlags, child_setup?: SpawnChildSetupFunc | null): [ /* returnType */ boolean, /* child_pid */ Pid | null ]
export function spawn_async_with_pipes(working_directory: any, argv: any, envp: any, flags: SpawnFlags, child_setup?: SpawnChildSetupFunc | null): [ /* returnType */ boolean, /* child_pid */ Pid | null, /* standard_input */ number | null, /* standard_output */ number | null, /* standard_error */ number | null ]
<<<<<<<
export function spawn_sync(working_directory: any, argv: any, envp: any, flags: SpawnFlags, child_setup?: SpawnChildSetupFunc | null): [ /* returnType */ boolean, /* standard_output */ Gjs.byteArray.ByteArray | null, /* standard_error */ Gjs.byteArray.ByteArray | null, /* exit_status */ number | null ]
=======
export function spawn_sync(working_directory: string | null, argv: string[], envp: string[] | null, flags: SpawnFlags, child_setup: SpawnChildSetupFunc | null): [ /* returnType */ boolean, /* standard_output */ Gjs.byteArray.ByteArray | null, /* standard_error */ Gjs.byteArray.ByteArray | null, /* exit_status */ number | null ]
>>>>>>>
export function spawn_sync(working_directory: any, argv: any, envp: any, flags: SpawnFlags, child_setup?: SpawnChildSetupFunc | null): [ /* returnType */ boolean, /* standard_output */ Gjs.byteArray.ByteArray | null, /* standard_error */ Gjs.byteArray.ByteArray | null, /* exit_status */ number | null ]
<<<<<<<
export function uuid_string_is_valid(str: string): boolean
export function uuid_string_random(): string
export function variant_get_gtype(): GObject.Type
=======
export function variant_get_gtype(): number
>>>>>>>
export function uuid_string_is_valid(str: string): boolean
export function uuid_string_random(): string
export function variant_get_gtype(): GObject.Type
<<<<<<<
load_from_data(data: Gjs.byteArray.ByteArray): boolean
load_from_data_dirs(file: any): [ /* returnType */ boolean, /* full_path */ any ]
load_from_file(filename: any): boolean
=======
load_from_data(data: string, length: number): boolean
load_from_data_dirs(file: string, full_path?: string | null): boolean
load_from_file(filename: string): boolean
>>>>>>>
load_from_data(data: Gjs.byteArray.ByteArray): boolean
load_from_data_dirs(file: any): [ /* returnType */ boolean, /* full_path */ any ]
load_from_file(filename: any): boolean |
<<<<<<<
/* Signals of Gio.Application */
connect(sigName: "activate", callback: ((obj: Application) => void))
connect(sigName: "command-line", callback: ((obj: Application, command_line: ApplicationCommandLine) => number))
connect(sigName: "handle-local-options", callback: ((obj: Application, options: GLib.VariantDict) => number))
connect(sigName: "open", callback: ((obj: Application, files: File[], n_files: number, hint: string) => void))
connect(sigName: "shutdown", callback: ((obj: Application) => void))
connect(sigName: "startup", callback: ((obj: Application) => void))
/* Signals of GObject.Object */
connect(sigName: "notify", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::action-group", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::application-id", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::flags", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::inactivity-timeout", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::is-busy", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::is-registered", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::is-remote", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::resource-base-path", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
=======
/* Signals of Application */
connect(sigName: "activate", callback: (() => void))
connect(sigName: "command-line", callback: ((command_line: ApplicationCommandLine) => number))
connect(sigName: "handle-local-options", callback: ((options: GLib.VariantDict) => number))
connect(sigName: "open", callback: ((files: File[], hint: string) => void))
connect(sigName: "shutdown", callback: (() => void))
connect(sigName: "startup", callback: (() => void))
/* Signals of Object */
connect(sigName: "notify", callback: ((pspec: GObject.ParamSpec) => void))
>>>>>>>
/* Signals of Gio.Application */
connect(sigName: "activate", callback: ((obj: Application) => void))
connect(sigName: "command-line", callback: ((obj: Application, command_line: ApplicationCommandLine) => number))
connect(sigName: "handle-local-options", callback: ((obj: Application, options: GLib.VariantDict) => number))
connect(sigName: "open", callback: ((obj: Application, files: File[], hint: string) => void))
connect(sigName: "shutdown", callback: ((obj: Application) => void))
connect(sigName: "startup", callback: ((obj: Application) => void))
/* Signals of GObject.Object */
connect(sigName: "notify", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::action-group", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::application-id", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::flags", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::inactivity-timeout", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::is-busy", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::is-registered", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::is-remote", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::resource-base-path", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
<<<<<<<
vfunc_write_fn(buffer: number[], count: number, cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */
=======
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of Object */
>>>>>>>
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */
<<<<<<<
vfunc_write_fn(buffer: number[], count: number, cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */
=======
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of Object */
>>>>>>>
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */
<<<<<<<
vfunc_write_fn(buffer: number[], count: number, cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */
=======
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of Object */
>>>>>>>
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */
<<<<<<<
vfunc_write_fn(buffer: number[], count: number, cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */
=======
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of Object */
>>>>>>>
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */
<<<<<<<
vfunc_write_fn(buffer: number[], count: number, cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */
=======
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of Object */
>>>>>>>
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */
<<<<<<<
splice(position: number, n_removals: number, additions: GObject.Object[], n_additions: number): void
/* Methods of GObject.Object */
=======
splice(position: number, n_removals: number, additions: GObject.Object[]): void
/* Methods of Object */
>>>>>>>
splice(position: number, n_removals: number, additions: GObject.Object[]): void
/* Methods of GObject.Object */
<<<<<<<
add_data(data: number[], len: number, destroy: GLib.DestroyNotify | null): void
/* Methods of Gio.InputStream */
=======
add_data(data: number[], destroy: GLib.DestroyNotify | null): void
/* Methods of InputStream */
>>>>>>>
add_data(data: number[], destroy: GLib.DestroyNotify | null): void
/* Methods of Gio.InputStream */
<<<<<<<
vfunc_write_fn(buffer: number[], count: number, cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */
=======
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of Object */
>>>>>>>
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */
<<<<<<<
vfunc_write_fn(buffer: number[], count: number, cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */
=======
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of Object */
>>>>>>>
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */
<<<<<<<
/* Signals of Gio.Settings */
connect(sigName: "change-event", callback: ((obj: Settings, keys: GLib.Quark[] | null, n_keys: number) => boolean))
connect(sigName: "changed", callback: ((obj: Settings, key: string) => void))
connect(sigName: "writable-change-event", callback: ((obj: Settings, key: number) => boolean))
connect(sigName: "writable-changed", callback: ((obj: Settings, key: string) => void))
/* Signals of GObject.Object */
connect(sigName: "notify", callback: ((obj: Settings, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::delay-apply", callback: ((obj: Settings, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::has-unapplied", callback: ((obj: Settings, pspec: GObject.ParamSpec) => void))
=======
/* Signals of Settings */
connect(sigName: "change-event", callback: ((keys: GLib.Quark[] | null) => boolean))
connect(sigName: "changed", callback: ((key: string) => void))
connect(sigName: "writable-change-event", callback: ((key: number) => boolean))
connect(sigName: "writable-changed", callback: ((key: string) => void))
/* Signals of Object */
connect(sigName: "notify", callback: ((pspec: GObject.ParamSpec) => void))
>>>>>>>
/* Signals of Gio.Settings */
connect(sigName: "change-event", callback: ((obj: Settings, keys: GLib.Quark[] | null) => boolean))
connect(sigName: "changed", callback: ((obj: Settings, key: string) => void))
connect(sigName: "writable-change-event", callback: ((obj: Settings, key: number) => boolean))
connect(sigName: "writable-changed", callback: ((obj: Settings, key: string) => void))
/* Signals of GObject.Object */
connect(sigName: "notify", callback: ((obj: Settings, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::delay-apply", callback: ((obj: Settings, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::has-unapplied", callback: ((obj: Settings, pspec: GObject.ParamSpec) => void))
<<<<<<<
/* Fields of Gio.SimpleActionGroup */
parent_instance:GObject.Object
priv:SimpleActionGroupPrivate
/* Fields of GObject.Object */
g_type_instance:GObject.TypeInstance
ref_count:number
qdata:GLib.Data
/* Methods of Gio.SimpleActionGroup */
add_entries(entries: ActionEntry[], n_entries: number, user_data: object): void
=======
/* Methods of SimpleActionGroup */
add_entries(entries: ActionEntry[], user_data: object): void
>>>>>>>
/* Fields of Gio.SimpleActionGroup */
parent_instance:GObject.Object
priv:SimpleActionGroupPrivate
/* Fields of GObject.Object */
g_type_instance:GObject.TypeInstance
ref_count:number
qdata:GLib.Data
/* Methods of Gio.SimpleActionGroup */
add_entries(entries: ActionEntry[], user_data: object): void
<<<<<<<
vfunc_write_fn(buffer: number[], count: number, cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */
=======
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of Object */
>>>>>>>
vfunc_write_fn(buffer: number[], cancellable: Cancellable | null): number
/* Virtual methods of GObject.Object */ |
<<<<<<<
/* Signals of Gtk.Application */
connect(sigName: "window-added", callback: ((obj: Application, window: Window) => void))
connect(sigName: "window-removed", callback: ((obj: Application, window: Window) => void))
/* Signals of Gio.Application */
connect(sigName: "activate", callback: ((obj: Application) => void))
connect(sigName: "command-line", callback: ((obj: Application, command_line: Gio.ApplicationCommandLine) => number))
connect(sigName: "handle-local-options", callback: ((obj: Application, options: GLib.VariantDict) => number))
connect(sigName: "open", callback: ((obj: Application, files: Gio.File[], n_files: number, hint: string) => void))
connect(sigName: "shutdown", callback: ((obj: Application) => void))
connect(sigName: "startup", callback: ((obj: Application) => void))
/* Signals of GObject.Object */
connect(sigName: "notify", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::active-window", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::app-menu", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::menubar", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::register-session", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::action-group", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::application-id", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::flags", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::inactivity-timeout", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::is-busy", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::is-registered", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::is-remote", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::resource-base-path", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
=======
/* Signals of Application */
connect(sigName: "window-added", callback: ((window: Window) => void))
connect(sigName: "window-removed", callback: ((window: Window) => void))
/* Signals of Application */
connect(sigName: "activate", callback: (() => void))
connect(sigName: "command-line", callback: ((command_line: Gio.ApplicationCommandLine) => number))
connect(sigName: "handle-local-options", callback: ((options: GLib.VariantDict) => number))
connect(sigName: "open", callback: ((files: Gio.File[], hint: string) => void))
connect(sigName: "shutdown", callback: (() => void))
connect(sigName: "startup", callback: (() => void))
/* Signals of Object */
connect(sigName: "notify", callback: ((pspec: GObject.ParamSpec) => void))
>>>>>>>
/* Signals of Gtk.Application */
connect(sigName: "window-added", callback: ((obj: Application, window: Window) => void))
connect(sigName: "window-removed", callback: ((obj: Application, window: Window) => void))
/* Signals of Gio.Application */
connect(sigName: "activate", callback: ((obj: Application) => void))
connect(sigName: "command-line", callback: ((obj: Application, command_line: Gio.ApplicationCommandLine) => number))
connect(sigName: "handle-local-options", callback: ((obj: Application, options: GLib.VariantDict) => number))
connect(sigName: "open", callback: ((obj: Application, files: Gio.File[], hint: string) => void))
connect(sigName: "shutdown", callback: ((obj: Application) => void))
connect(sigName: "startup", callback: ((obj: Application) => void))
/* Signals of GObject.Object */
connect(sigName: "notify", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::active-window", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::app-menu", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::menubar", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::register-session", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::action-group", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::application-id", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::flags", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::inactivity-timeout", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::is-busy", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::is-registered", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::is-remote", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
connect(sigName: "notify::resource-base-path", callback: ((obj: Application, pspec: GObject.ParamSpec) => void))
<<<<<<<
/* Fields of Gtk.CssProvider */
parent_instance:GObject.Object
priv:CssProviderPrivate
/* Fields of GObject.Object */
g_type_instance:GObject.TypeInstance
ref_count:number
qdata:GLib.Data
/* Methods of Gtk.CssProvider */
load_from_data(data: number[], length: number): boolean
=======
/* Methods of CssProvider */
load_from_data(data: number[]): boolean
>>>>>>>
/* Fields of Gtk.CssProvider */
parent_instance:GObject.Object
priv:CssProviderPrivate
/* Fields of GObject.Object */
g_type_instance:GObject.TypeInstance
ref_count:number
qdata:GLib.Data
/* Methods of Gtk.CssProvider */
load_from_data(data: number[]): boolean
<<<<<<<
/* Fields of GObject.Object */
g_type_instance:GObject.TypeInstance
ref_count:number
qdata:GLib.Data
/* Methods of Gtk.IconInfo */
get_attach_points(): [ /* returnType */ boolean, /* points */ Gdk.Point[] | null, /* n_points */ number | null ]
=======
/* Methods of IconInfo */
get_attach_points(): [ /* returnType */ boolean, /* points */ Gdk.Point[] | null ]
>>>>>>>
/* Fields of GObject.Object */
g_type_instance:GObject.TypeInstance
ref_count:number
qdata:GLib.Data
/* Methods of Gtk.IconInfo */
get_attach_points(): [ /* returnType */ boolean, /* points */ Gdk.Point[] | null ]
<<<<<<<
set_search_path(path: string, n_elements: number): void
/* Methods of GObject.Object */
=======
set_search_path(path: string): void
/* Methods of Object */
>>>>>>>
set_search_path(path: string): void
/* Methods of GObject.Object */
<<<<<<<
insert_with_valuesv(position: number, columns: number[], values: any, n_values: number): /* iter */ TreeIter | null
=======
insert_with_valuesv(position: number, columns: number[], values: GObject.Value[]): /* iter */ TreeIter | null
>>>>>>>
insert_with_valuesv(position: number, columns: number[], values: any): /* iter */ TreeIter | null
<<<<<<<
set_column_types(n_columns: number, types: number): void
set_value(iter: TreeIter, column: number, value: any): void
set_valuesv(iter: TreeIter, columns: number[], values: any, n_values: number): void
=======
set_column_types(types: number): void
set_value(iter: TreeIter, column: number, value: GObject.Value): void
set_valuesv(iter: TreeIter, columns: number[], values: GObject.Value[]): void
>>>>>>>
set_column_types(types: number): void
set_value(iter: TreeIter, column: number, value: any): void
set_valuesv(iter: TreeIter, columns: number[], values: any): void
<<<<<<<
insert_with_valuesv(parent: TreeIter | null, position: number, columns: number[], values: any, n_values: number): /* iter */ TreeIter | null
=======
insert_with_valuesv(parent: TreeIter | null, position: number, columns: number[], values: GObject.Value[]): /* iter */ TreeIter | null
>>>>>>>
insert_with_valuesv(parent: TreeIter | null, position: number, columns: number[], values: any): /* iter */ TreeIter | null
<<<<<<<
set_column_types(n_columns: number, types: number): void
set_value(iter: TreeIter, column: number, value: any): void
set_valuesv(iter: TreeIter, columns: number[], values: any, n_values: number): void
=======
set_column_types(types: number): void
set_value(iter: TreeIter, column: number, value: GObject.Value): void
set_valuesv(iter: TreeIter, columns: number[], values: GObject.Value[]): void
>>>>>>>
set_column_types(types: number): void
set_value(iter: TreeIter, column: number, value: any): void
set_valuesv(iter: TreeIter, columns: number[], values: any): void |
<<<<<<<
import memoizeOne from 'memoize-one';
import { settings } from 'app/settings/settings';
=======
import { buildStats } from './stats';
>>>>>>>
import memoizeOne from 'memoize-one';
import { settings } from 'app/settings/settings';
import { buildStats } from './stats';
<<<<<<<
function buildHiddenStats(
itemDef: DestinyInventoryItemDefinition,
statDefs: LazyDefinition<DestinyStatDefinition>
): DimStat[] {
const itemStats = itemDef.stats.stats;
if (!itemStats) {
return [];
}
return _.compact(
Object.values(itemStats).map((stat: DestinyInventoryItemStatDefinition):
| DimStat
| undefined => {
const def = statDefs.get(stat.statHash);
// only aim assist and zoom for now
if (!stat.value || ![1345609583, 3555269338, 2715839340].includes(stat.statHash)) {
return undefined;
}
return {
base: stat.value,
bonus: 0,
statHash: stat.statHash,
name: def.displayProperties.name,
id: stat.statHash,
sort: statWhiteList.indexOf(stat.statHash),
value: stat.value,
maximumValue: 100,
bar: true
};
})
);
}
function buildDefaultStats(
itemDef: DestinyInventoryItemDefinition,
statDefs: LazyDefinition<DestinyStatDefinition>
): DimStat[] {
const itemStats = itemDef.stats.stats;
if (!itemStats) {
return [];
}
return _.compact(
_.map(itemStats, (stat: DestinyInventoryItemStatDefinition): DimStat | undefined => {
const def = statDefs.get(stat.statHash);
if (!statWhiteList.includes(stat.statHash) || !stat.value) {
return undefined;
}
return {
base: stat.value,
bonus: 0,
statHash: stat.statHash,
name: def.displayProperties.name,
id: stat.statHash,
sort: statWhiteList.indexOf(stat.statHash),
value: stat.value,
// Armor stats max out at 5, all others are... probably 100? See https://github.com/Bungie-net/api/issues/448
maximumValue: [1943323491, 392767087, 2996146975].includes(stat.statHash) ? 5 : 100,
bar: !statsNoBar.includes(stat.statHash)
};
})
);
}
function buildStats(
item: DestinyItemComponent,
sockets: DimSockets | null,
stats: { [key: string]: DestinyItemStatsComponent },
statDefs: LazyDefinition<DestinyStatDefinition>
): DimStat[] {
if (!item.itemInstanceId || !stats[item.itemInstanceId]) {
return [];
}
const itemStats = stats[item.itemInstanceId].stats;
// determine bonuses for armor
const statBonuses = {};
if (sockets) {
const bonusPerk = sockets.sockets.find((socket) =>
Boolean(
// Mobility, Restorative, and Resilience perk
idx(socket.plug, (p) => p.plugItem.plug.plugCategoryHash) === 3313201758
)
);
// If we didn't find one, then it's not armor.
if (bonusPerk) {
statBonuses[bonusPerk.plug!.plugItem.investmentStats[0].statTypeHash] = {
plugs: bonusPerk.plug!.plugItem.investmentStats[0].value,
perks: 0,
mods: 0
};
// Custom applied mods
sockets.sockets
.filter((socket) =>
Boolean(
idx(socket.plug, (p) => p.plugItem.plug.plugCategoryHash) === 3347429529 &&
idx(socket.plug, (p) => p.plugItem.inventory.tierType) !== 2
)
)
.forEach((socket) => {
const bonusPerkStat = socket.plug!.plugItem.investmentStats[0];
if (bonusPerkStat) {
if (!statBonuses[bonusPerkStat.statTypeHash]) {
statBonuses[bonusPerkStat.statTypeHash] = { mods: 0 };
}
statBonuses[bonusPerkStat.statTypeHash].mods += bonusPerkStat.value;
}
});
// Look for perks that modify stats (ie. Traction 1818103563)
sockets.sockets
.filter((socket) =>
Boolean(
filterPlugs(socket) &&
idx(socket.plug, (p) => p.plugItem.plug.plugCategoryHash) !== 3347429529 &&
idx(socket.plug, (p) => p.plugItem.investmentStats.length)
)
)
.forEach((socket) => {
const bonusPerkStat = socket.plug!.plugItem.investmentStats[0];
if (bonusPerkStat) {
if (!statBonuses[bonusPerkStat.statTypeHash]) {
statBonuses[bonusPerkStat.statTypeHash] = { perks: 0 };
}
statBonuses[bonusPerkStat.statTypeHash].perks += bonusPerkStat.value;
}
});
}
}
return _.compact(
Object.values(itemStats).map((stat: DestinyStat): DimStat | undefined => {
const def = statDefs.get(stat.statHash);
const itemStat = itemStats[stat.statHash];
if (!def || !itemStat) {
return undefined;
}
const value = itemStat ? itemStat.value : stat.value;
let base = value;
let bonus = 0;
let plugBonus = 0;
let modsBonus = 0;
let perkBonus = 0;
if (statBonuses[stat.statHash]) {
plugBonus = statBonuses[stat.statHash].plugs || 0;
modsBonus = statBonuses[stat.statHash].mods || 0;
perkBonus = statBonuses[stat.statHash].perks || 0;
bonus = plugBonus + perkBonus + modsBonus;
base -= bonus;
}
return {
base,
bonus,
plugBonus,
modsBonus,
perkBonus,
statHash: stat.statHash,
name: def.displayProperties.name,
id: stat.statHash,
sort: statWhiteList.indexOf(stat.statHash),
value,
maximumValue: itemStat.maximumValue,
bar: !statsNoBar.includes(stat.statHash)
};
})
);
}
function buildInvestmentStats(
itemStats: DestinyItemInvestmentStatDefinition[],
statDefs: LazyDefinition<DestinyStatDefinition>
): DimStat[] {
return _.compact(
_.map(itemStats, (itemStat): DimStat | undefined => {
const def = statDefs.get(itemStat.statTypeHash);
/* 1935470627 = Power */
if (!def || !itemStat || itemStat.statTypeHash === 1935470627) {
return undefined;
}
return {
base: itemStat.value,
bonus: 0,
statHash: itemStat.statTypeHash,
name: def.displayProperties.name,
id: itemStat.statTypeHash,
sort: statWhiteList.indexOf(itemStat.statTypeHash),
value: itemStat.value,
maximumValue: 0,
bar: !statsNoBar.includes(itemStat.statTypeHash)
};
})
);
}
const formatterSelector = memoizeOne((language) => new Intl.NumberFormat(language));
=======
>>>>>>>
const formatterSelector = memoizeOne((language) => new Intl.NumberFormat(language)); |
<<<<<<<
import { filterPlugs } from '../../d2-loadout-builder/generated-sets/utils';
=======
// tslint:disable-next-line:no-implicit-dependencies
import D2Seasons from 'app/data/d2-seasons.json';
// tslint:disable-next-line:no-implicit-dependencies
import D2Events from 'app/data/d2-events.json';
>>>>>>>
import { filterPlugs } from '../../d2-loadout-builder/generated-sets/utils';
// tslint:disable-next-line:no-implicit-dependencies
import D2Seasons from 'app/data/d2-seasons.json';
// tslint:disable-next-line:no-implicit-dependencies
import D2Events from 'app/data/d2-events.json'; |
<<<<<<<
import * as _ from 'lodash';
=======
import * as _ from 'underscore';
import copy from 'fast-copy';
>>>>>>>
import * as _ from 'lodash';
import copy from 'fast-copy';
<<<<<<<
import { Loadout, dimLoadoutService } from '../loadout/loadout.service';
=======
import { Loadout, dimLoadoutService, LoadoutClass } from '../loadout/loadout.service';
import { sum } from '../util';
>>>>>>>
import { Loadout, dimLoadoutService, LoadoutClass } from '../loadout/loadout.service'; |
<<<<<<<
import { getActivePlatform } from '../accounts/get-active-platform';
=======
>>>>>>>
<<<<<<<
import {
authenticatedHttpClient,
handleUniquenessViolation,
unauthenticatedHttpClient,
} from './bungie-service-helper';
=======
import { handleUniquenessViolation, httpAdapter } from './bungie-service-helper';
>>>>>>>
import {
authenticatedHttpClient,
handleUniquenessViolation,
unauthenticatedHttpClient,
} from './bungie-service-helper';
<<<<<<<
const platform = getActivePlatform();
const response = await equipItemsApi(authenticatedHttpClient, {
=======
const response = await equipItemsApi(httpAdapter, {
>>>>>>>
const response = await equipItemsApi(authenticatedHttpClient, {
<<<<<<<
const account = getActivePlatform();
return setItemLockState(authenticatedHttpClient, {
characterId: store.isVault ? item.owner : store.id,
membershipType: account!.originalPlatformType,
=======
return setItemLockState(httpAdapter, {
characterId: storeId,
membershipType: account.originalPlatformType,
>>>>>>>
return setItemLockState(authenticatedHttpClient, {
characterId: storeId,
membershipType: account.originalPlatformType,
<<<<<<<
return setQuestTrackedState(authenticatedHttpClient, {
characterId: store.isVault ? item.owner : store.id,
membershipType: account!.originalPlatformType,
=======
return setQuestTrackedState(httpAdapter, {
characterId: storeId,
membershipType: account.originalPlatformType,
>>>>>>>
return setQuestTrackedState(authenticatedHttpClient, {
characterId: storeId,
membershipType: account.originalPlatformType, |
<<<<<<<
if (!mods?.length || mods.every((mod) => doEnergiesMatch(mod, item))) {
assignments[item.id] = [...assignments[item.id], ...mods.map((mod) => mod.modDef.hash)];
=======
if (mods?.length && mods.every((mod) => doEnergiesMatch(mod, item))) {
assignments[item.id] = [...assignments[item.id], ...mods.map((mod) => mod.mod.hash)];
>>>>>>>
if (mods?.length && mods.every((mod) => doEnergiesMatch(mod, item))) {
assignments[item.id] = [...assignments[item.id], ...mods.map((mod) => mod.modDef.hash)];
<<<<<<<
const modsByHash = _.keyBy(Object.values(lockedArmor2Mods).flat(), (mod) => mod.modDef.hash);
=======
assignAllSeasonalMods(processItems, lockedArmor2Mods.seasonal, assignments);
const modsByHash = _.groupBy(Object.values(lockedArmor2Mods).flat(), (mod) => mod.mod.hash);
>>>>>>>
assignAllSeasonalMods(processItems, lockedArmor2Mods.seasonal, assignments);
const modsByHash = _.groupBy(Object.values(lockedArmor2Mods).flat(), (mod) => mod.modDef.hash); |
<<<<<<<
selectedStoreId: string,
assumeMasterwork: boolean
=======
lockedItems: LockedMap,
selectedStoreId: string
>>>>>>>
lockedItems: LockedMap,
selectedStoreId: string,
assumeMasterwork: boolean
<<<<<<<
(item) => byStatMix(item, assumeMasterwork)
=======
byStatMix(lockedItems[LockableBuckets.helmet])
>>>>>>>
byStatMix(lockedItems[LockableBuckets.helmet], assumeMasterwork)
<<<<<<<
(item) => byStatMix(item, assumeMasterwork)
=======
byStatMix(lockedItems[LockableBuckets.gauntlets])
>>>>>>>
byStatMix(lockedItems[LockableBuckets.gauntlets], assumeMasterwork)
<<<<<<<
(item) => byStatMix(item, assumeMasterwork)
=======
byStatMix(lockedItems[LockableBuckets.chest])
>>>>>>>
byStatMix(lockedItems[LockableBuckets.chest], assumeMasterwork)
<<<<<<<
(item) => byStatMix(item, assumeMasterwork)
=======
byStatMix(lockedItems[LockableBuckets.leg])
>>>>>>>
byStatMix(lockedItems[LockableBuckets.leg], assumeMasterwork)
<<<<<<<
(item) => byStatMix(item, assumeMasterwork)
=======
byStatMix(lockedItems[LockableBuckets.classitem])
>>>>>>>
byStatMix(lockedItems[LockableBuckets.classitem], assumeMasterwork)
<<<<<<<
(item) => byStatMix(item, assumeMasterwork)
=======
byStatMix(lockedItems[LockableBuckets.ghost])
>>>>>>>
byStatMix(lockedItems[LockableBuckets.ghost], assumeMasterwork)
<<<<<<<
onMix: (mix: number[], plug: DimPlug[] | null) => boolean
) {
return generateMixesFromPerksOrStats(item, null, onMix);
}
/**
* This is an awkward helper used by both byStatMix (to generate the list of
* stat mixes) and GeneratedSetItem#identifyAltPerkChoicesForChosenStats. It figures out
* which perks need to be selected to get that stat mix or in the case of Armour 2.0, it
* calculates them directly from the stats.
*
* It has two modes depending on whether an "onMix" callback is provided - if it is, it
* assumes we're looking for perks, not mixes, and keeps track of what perks are necessary
* to fulfill a stat-mix, and lets the callback stop the function early. If not, it just
* returns all the mixes. This is like this so we can share this complicated bit of logic
* and not get it out of sync.
*/
function generateMixesFromPerksOrStats(
item: DimItem,
assumeArmor2IsMasterwork: boolean | null,
=======
lockedModStats: { [statHash: number]: number },
>>>>>>>
lockedModStats: { [statHash: number]: number },
onMix: (mix: number[], plug: DimPlug[] | null) => boolean
) {
return generateMixesFromPerksOrStats(item, null, lockedModStats, onMix);
}
/**
* This is an awkward helper used by both byStatMix (to generate the list of
* stat mixes) and GeneratedSetItem#identifyAltPerkChoicesForChosenStats. It figures out
* which perks need to be selected to get that stat mix or in the case of Armour 2.0, it
* calculates them directly from the stats.
*
* It has two modes depending on whether an "onMix" callback is provided - if it is, it
* assumes we're looking for perks, not mixes, and keeps track of what perks are necessary
* to fulfill a stat-mix, and lets the callback stop the function early. If not, it just
* returns all the mixes. This is like this so we can share this complicated bit of logic
* and not get it out of sync.
*/
function generateMixesFromPerksOrStats(
item: DimItem,
assumeArmor2IsMasterwork: boolean | null,
lockedModStats: { [statHash: number]: number },
<<<<<<<
function getBaseStatValues(
stats: Dictionary<DimStat>,
item: DimItem,
assumeMasterwork: boolean | null
) {
=======
function getBaseStatValues(
stats: Dictionary<DimStat>,
item: DimItem,
lockedModStats: { [statHash: number]: number }
) {
>>>>>>>
function getBaseStatValues(
stats: Dictionary<DimStat>,
item: DimItem,
assumeMasterwork: boolean | null,
lockedModStats: { [statHash: number]: number }
) {
<<<<<<<
const plugHash = idx(socket, (socket) => socket.plug.plugItem.hash) || NaN;
=======
const plugHash = socket?.plug?.plugItem?.hash || null;
>>>>>>>
const plugHash = socket?.plug?.plugItem?.hash || NaN;
<<<<<<<
if (assumeMasterwork) {
for (const statHash of statValues) {
baseStats[statHash] += 2;
}
}
=======
// For Armor 2.0 mods, include the stat values of any locked mods in the item's stats
_.forIn(lockedModStats, (value, statHash) => {
baseStats[statHash] += value;
});
>>>>>>>
if (assumeMasterwork) {
for (const statHash of statValues) {
baseStats[statHash] += 2;
}
}
// For Armor 2.0 mods, include the stat values of any locked mods in the item's stats
_.forIn(lockedModStats, (value, statHash) => {
baseStats[statHash] += value;
}); |
<<<<<<<
import {HomeMediaModule} from '../home-media/home-media.module';
=======
import {HomeFavoriteModule} from '../home-favorite/home-favorite.module';
>>>>>>>
import {HomeMediaModule} from '../home-media/home-media.module';
import {HomeFavoriteModule} from '../home-favorite/home-favorite.module';
<<<<<<<
imports: [HttpModule, DatabaseModule, UserModule, HomeMediaModule],
=======
imports: [HttpModule, DatabaseModule, UserModule, HomeFavoriteModule],
>>>>>>>
imports: [HttpModule, DatabaseModule, UserModule, HomeFavoriteModule, HomeMediaModule], |
<<<<<<<
import {HomeMediaService} from '../home-media/home-media.service';
import {HomeMediaEntity} from '../home-media/entity';
=======
import {HomeFavoriteService} from '../home-favorite/home-favorite.service';
>>>>>>>
import {HomeMediaService} from '../home-media/home-media.service';
import {HomeMediaEntity} from '../home-media/entity';
import {HomeFavoriteService} from '../home-favorite/home-favorite.service';
<<<<<<<
private readonly userService: UserService,
private readonly homeMediaService: HomeMediaService
) {
=======
private readonly userService: UserService,
private readonly homeFavoriteService: HomeFavoriteService) {
>>>>>>>
private readonly userService: UserService,
private readonly homeMediaService: HomeMediaService,
private readonly homeFavoriteService: HomeFavoriteService) { |
<<<<<<<
import useDebounce from './useDebounce';
import useDebounceFn from './useDebounceFn';
=======
import usePrevious from './usePrevious';
import useMouse from './useMouse';
>>>>>>>
import useDebounce from './useDebounce';
import useDebounceFn from './useDebounceFn';
import usePrevious from './usePrevious';
import useMouse from './useMouse';
<<<<<<<
useDebounce,
useDebounceFn,
=======
usePrevious,
useMouse,
>>>>>>>
useDebounce,
useDebounceFn,
usePrevious,
useMouse, |
<<<<<<<
export const Armor2ModPlugCategories = {
general: 2487827355,
helmet: 2912171003,
gauntlets: 3422420680,
chest: 1526202480,
leg: 2111701510,
classitem: 912441879
};
export const getItemDamageShortName: (item: DimItem) => string | undefined = (item) =>
=======
export const getItemDamageShortName = (item: DimItem): string | undefined =>
>>>>>>>
export const Armor2ModPlugCategories = {
general: 2487827355,
helmet: 2912171003,
gauntlets: 3422420680,
chest: 1526202480,
leg: 2111701510,
classitem: 912441879
};
export const getItemDamageShortName = (item: DimItem): string | undefined =>
<<<<<<<
export const getItemSpecialtyModSlotDisplayName: (item: DimItem) => string = (item) =>
getSpecialtySocket(item)?.plug!.plugItem.itemTypeDisplayName || '';
export const isArmor2Mod = (item: DestinyInventoryItemDefinition): boolean =>
Object.values(Armor2ModPlugCategories).includes(item.plug.plugCategoryHash) ||
specialtyModSocketHashes.includes(item.plug.plugCategoryHash);
=======
export const getItemSpecialtyModSlotDisplayName = (item: DimItem) =>
getSpecialtySocket(item)?.plug?.plugItem.itemTypeDisplayName || '';
>>>>>>>
export const getItemSpecialtyModSlotDisplayName = (item: DimItem) =>
getSpecialtySocket(item)?.plug?.plugItem.itemTypeDisplayName || '';
export const isArmor2Mod = (item: DestinyInventoryItemDefinition): boolean =>
Object.values(Armor2ModPlugCategories).includes(item.plug.plugCategoryHash) ||
specialtyModSocketHashes.includes(item.plug.plugCategoryHash); |
<<<<<<<
import { D2Categories } from '../destiny2/d2-buckets.service';
import { D1Categories } from '../destiny1/d1-buckets.service';
import { getItemInfoSource, itemTags } from '../inventory/dim-item-info';
=======
import { itemTags } from '../settings/settings';
import { getItemInfoSource } from '../inventory/dim-item-info';
>>>>>>>
import { getItemInfoSource, itemTags } from '../inventory/dim-item-info';
<<<<<<<
searchConfig = buildSearchConfig(
vm.account.destinyVersion,
vm.account.destinyVersion === 1 ? D1Categories : D2Categories
);
=======
searchConfig = buildSearchConfig(vm.account.destinyVersion);
>>>>>>>
searchConfig = buildSearchConfig(vm.account.destinyVersion); |
<<<<<<<
/** New Tile Style */
tallTiles: boolean;
/** Community-curated rolls */
curatedRolls: boolean;
=======
>>>>>>>
/** Community-curated rolls */
curatedRolls: boolean; |
<<<<<<<
import { D1Progression, D1Store, D1Vault, DimStore, DimVault } from '../store-types';
=======
import { D1Store, DimStore } from '../store-types';
>>>>>>>
import { D1Progression, D1Store, DimStore } from '../store-types'; |
<<<<<<<
import usePersistFn from './usePersistFn';
=======
import useMap from './useMap';
>>>>>>>
import usePersistFn from './usePersistFn';
import useMap from './useMap';
<<<<<<<
usePersistFn,
=======
useMap,
>>>>>>>
usePersistFn,
useMap, |
<<<<<<<
import { copy } from 'angular';
import * as _ from 'lodash';
=======
import copy from 'fast-copy';
import * as _ from 'underscore';
>>>>>>>
import copy from 'fast-copy';
import * as _ from 'lodash'; |
<<<<<<<
import { Armor2ModPlugCategories } from 'app/utils/item-utils';
import {
sortProcessModsOrProcessItems,
canTakeAllSeasonalMods,
canTakeAllGeneralMods,
} from './processWorker/processUtils';
import { mapArmor2ModToProcessMod, mapDimItemToProcessItem } from './processWorker/mappers';
=======
import { getSpecialtySocketMetadata } from 'app/utils/item-utils';
import { armor2PlugCategoryHashesByName } from 'app/search/d2-known-values';
const energyOrder = [
DestinyEnergyType.Void,
DestinyEnergyType.Thermal,
DestinyEnergyType.Arc,
DestinyEnergyType.Any,
];
>>>>>>>
import {
sortProcessModsOrProcessItems,
canTakeAllSeasonalMods,
canTakeAllGeneralMods,
} from './processWorker/processUtils';
import { mapArmor2ModToProcessMod, mapDimItemToProcessItem } from './processWorker/mappers';
import { armor2PlugCategoryHashesByName } from 'app/search/d2-known-values';
<<<<<<<
const modsByHash = _.keyBy(Object.values(lockedArmor2Mods).flat(), (mod) => mod.mod.hash);
return _.mapValues(assignments, (modHashes) => modHashes.map((modHash) => modsByHash[modHash]));
=======
return assignments;
}
// Should be in the same order as first valid set
export function canSetTakeGeneralAndSeasonalMods(
set: readonly DimItem[],
lockedArmor2Mods: LockedArmor2ModMap
) {
const assignments: Record<number, LockedArmor2Mod[]> = {};
for (const item of set) {
assignments[item.hash] = [];
}
// we ignore slot specific mods as they are prefiltered so should match up
assignGeneralMods(set, lockedArmor2Mods[armor2PlugCategoryHashesByName.general], assignments);
assignAllSeasonalMods(set, lockedArmor2Mods.seasonal, assignments);
let assignmentCount = 0;
for (const slotAssignments of Object.values(assignments)) {
assignmentCount += slotAssignments.length;
}
return (
assignmentCount ===
lockedArmor2Mods[armor2PlugCategoryHashesByName.general].length +
lockedArmor2Mods.seasonal.length
);
>>>>>>>
const modsByHash = _.keyBy(Object.values(lockedArmor2Mods).flat(), (mod) => mod.mod.hash);
return _.mapValues(assignments, (modHashes) => modHashes.map((modHash) => modsByHash[modHash])); |
<<<<<<<
import { D1ItemUserReview, DtrReviewer } from '../item-review/destiny-tracker.service';
import { $q, $http } from 'ngimport';
=======
import { D1MembershipInfo, D1ItemUserReview } from '../item-review/destiny-tracker.service';
>>>>>>>
import { D1ItemUserReview, DtrReviewer } from '../item-review/destiny-tracker.service'; |
<<<<<<<
case "SA_72":
=======
case SpecialAbilityId.TraditionGuildMages:
case SpecialAbilityId.TraditionWitches:
case SpecialAbilityId.TraditionElves:
case SpecialAbilityId.TraditionDruids:
case SpecialAbilityId.TraditionScharlatane:
case SpecialAbilityId.TraditionZauberbarden:
case SpecialAbilityId.TraditionZaubertaenzer:
case SpecialAbilityId.TraditionIntuitiveZauberer:
case SpecialAbilityId.TraditionMeistertalentierte:
case SpecialAbilityId.TraditionQabalyamagier:
case SpecialAbilityId.TraditionGeoden:
case SpecialAbilityId.TraditionZauberalchimisten:
case SpecialAbilityId.TraditionSchelme:
case SpecialAbilityId.TraditionAnimisten:
case SpecialAbilityId.TraditionBrobimGeoden: {
// All active tradition entries
const traditions =
getMagicalTraditionsHeroEntries (HeroModel.AL.specialAbilities (hero))
const multiple_traditions = flength (traditions) > 1
// multiple traditions are currently not supported and there must be no
// active spell or cantrip
return multiple_traditions
|| countActiveSkillEntries ("spells") (hero) > 0
|| size (HA.cantrips (hero)) > 0
}
case SpecialAbilityId.PropertyKnowledge:
>>>>>>>
case SpecialAbilityId.PropertyKnowledge:
<<<<<<<
case "SA_87": {
=======
case SpecialAbilityId.TraditionChurchOfPraios:
case SpecialAbilityId.TraditionChurchOfRondra:
case SpecialAbilityId.TraditionChurchOfBoron:
case SpecialAbilityId.TraditionChurchOfHesinde:
case SpecialAbilityId.TraditionChurchOfPhex:
case SpecialAbilityId.TraditionChurchOfPeraine:
case SpecialAbilityId.TraditionChurchOfEfferd:
case SpecialAbilityId.TraditionChurchOfTravia:
case SpecialAbilityId.TraditionChurchOfFirun:
case SpecialAbilityId.TraditionChurchOfTsa:
case SpecialAbilityId.TraditionChurchOfIngerimm:
case SpecialAbilityId.TraditionChurchOfRahja:
case SpecialAbilityId.TraditionCultOfTheNamelessOne:
case SpecialAbilityId.TraditionChurchOfAves:
case SpecialAbilityId.TraditionChurchOfIfirn:
case SpecialAbilityId.TraditionChurchOfKor:
case SpecialAbilityId.TraditionChurchOfNandus:
case SpecialAbilityId.TraditionChurchOfSwafnir:
case SpecialAbilityId.TraditionCultOfNuminoru: {
// there must be no active liturgical chant or blessing
return countActiveSkillEntries ("liturgicalChants") (hero) > 0
|| size (HA.blessings (hero)) > 0
}
case SpecialAbilityId.AspectKnowledge: {
>>>>>>>
case SpecialAbilityId.AspectKnowledge: { |
<<<<<<<
modes = [
ModeName.Insert,
ModeName.Visual,
ModeName.VisualLine,
ModeName.VisualBlockInsertMode,
ModeName.VisualBlock
];
keys = ["<esc>"];
=======
modes = [ModeName.Insert, ModeName.Visual, ModeName.VisualLine, ModeName.SearchInProgressMode, ModeName.Replace];
keys = ["<escape>"];
>>>>>>>
modes = [
ModeName.Insert,
ModeName.Visual,
ModeName.VisualLine,
ModeName.VisualBlockInsertMode,
ModeName.VisualBlock,
ModeName.SearchInProgressMode,
ModeName.Replace
];
keys = ["<escape>"];
<<<<<<<
public async exec(position: Position, vimState: VimState, after: boolean = false, adjustIndent: boolean = false): Promise<VimState> {
const register = Register.get(vimState);
const dest = after ? position : position.getRight();
=======
public async exec(position: Position, vimState: VimState, before: boolean = false, adjustIndent: boolean = false): Promise<VimState> {
const register = await Register.get(vimState);
const dest = before ? position : position.getRight();
>>>>>>>
public async exec(position: Position, vimState: VimState, after: boolean = false, adjustIndent: boolean = false): Promise<VimState> {
const register = await Register.get(vimState);
const dest = after ? position : position.getRight(); |
<<<<<<<
import {setupWorkspace, cleanUpWorkspace, assertEqualLines} from './../testUtils';
import ModeNormal from '../../src/mode/modeNormal';
=======
import {setupWorkspace, cleanUpWorkspace} from './../testUtils';
import {NormalMode} from '../../src/mode/modeNormal';
>>>>>>>
import {setupWorkspace, cleanUpWorkspace, assertEqualLines} from './../testUtils';
import {NormalMode} from '../../src/mode/modeNormal';
<<<<<<<
=======
let motion = new Motion(null);
let modeHandler = new NormalMode(motion);
>>>>>>>
<<<<<<<
assert.equal(modeNormal.ShouldBeActivated(key, ModeName.Insert), true, key);
=======
assert.equal(modeHandler.shouldBeActivated(key, ModeName.Insert), true, key);
>>>>>>>
assert.equal(modeNormal.shouldBeActivated(key, ModeName.Insert), true, key); |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.