Fixed merge conflicts with dev

This commit is contained in:
danielyxie
2019-04-03 17:12:11 -07:00
29 changed files with 613 additions and 436 deletions
+6
View File
@@ -435,6 +435,12 @@ export class Sleeve extends Person {
* Called on every sleeve for a Source File prestige
*/
prestige(p: IPlayer) {
this.hacking_exp = 0;
this.strength_exp = 0;
this.defense_exp = 0;
this.dexterity_exp = 0;
this.agility_exp = 0;
this.charisma_exp = 0;
this.resetTaskStatus();
this.earningsForSleeves = createTaskTracker();
this.earningsForPlayer = createTaskTracker();