Merge pull request #385 from Kyusung4698/develop

(2020-03-19)
Kyusung4698 · Mar 19, 2020 · 30790d3 · 30790d3
2 parents 233c9d3 + 3f3aa9e
commit 30790d3
Show file tree

Hide file tree

Showing 42 changed files with 5,433 additions and 21,290 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 0.6.8 (2020-03-19)
+
+- add bookmark external flag (#373)
+- add evaluate original currency (#308)
+- update exchange rate to not show inverse rate if item has stack size > 1 (#377)
+- update data to 3.10.0d
+- update chinese translations (thanks to Eyster87)
+- remove simplified chinese (maintenance for 3.10)
+- fix missing mod `Trigger a Socketed Spell when you Use a Skill` (#368)
+- fix missing map tier filter (#372)
+- fix temporary damage_resistance mismatched with damage_resistance_is (#359)
+
 ## 0.6.7 (2020-03-18)
 
 - add traditional chinese support (Garena)

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# PoE Overlay 0.6.7
+# PoE Overlay 0.6.8
 
 An Overlay for Path of Exile. The ***core aspect*** is to blend in with the game. Built with Electron and Angular. 
 
@@ -87,11 +87,11 @@ These instructions will set you up to run and enjoy the overlay.
 #### Installing
 
 1. Head over to [Releases](https://github.com/Kyusung4698/PoE-Overlay/releases) and download one of the following files
-    1. `poe-overlay-Setup-0.6.7.exe` to install locally. This supports auto update/ auto launch.
-    2. `poe-overlay-0.6.7.exe` portable version. This does not support auto update/ auto launch.
+    1. `poe-overlay-Setup-0.6.8.exe` to install locally. This supports auto update/ auto launch.
+    2. `poe-overlay-0.6.8.exe` portable version. This does not support auto update/ auto launch.
 2. Run either of your downloaded file
 3. Start Path of Exile
-4. Wait until you can see `PoE Overlay 0.6.7` in the bottom left corner
+4. Wait until you can see `PoE Overlay 0.6.8` in the bottom left corner
 5. Hit `f7` and set `Language` and `League` to meet your game settings
 
 #### Shortcuts

diff --git a/overlay.babel b/overlay.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.6.1">
+<babeledit_project be_version="2.6.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -187,6 +187,59 @@
                             </translation>
                         </translations>
                     </concept_node>
+                    <concept_node>
+                        <name>external</name>
+                        <definition_loaded>false</definition_loaded>
+                        <description></description>
+                        <comment></comment>
+                        <default_text></default_text>
+                        <translations>
+                            <translation>
+                                <language>de-DE</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>en-US</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>es-ES</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>fr-FR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ko-KR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pl-PL</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pt-BR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ru-RU</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>th-TH</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHS</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHT</language>
+                                <approved>false</approved>
+                            </translation>
+                        </translations>
+                    </concept_node>
                     <concept_node>
                         <name>name</name>
                         <definition_loaded>false</definition_loaded>
@@ -785,6 +838,59 @@
                             </translation>
                         </translations>
                     </concept_node>
+                    <concept_node>
+                        <name>currency-original</name>
+                        <definition_loaded>false</definition_loaded>
+                        <description></description>
+                        <comment></comment>
+                        <default_text></default_text>
+                        <translations>
+                            <translation>
+                                <language>de-DE</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>en-US</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>es-ES</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>fr-FR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ko-KR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pl-PL</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pt-BR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ru-RU</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>th-TH</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHS</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHT</language>
+                                <approved>false</approved>
+                            </translation>
+                        </translations>
+                    </concept_node>
                     <concept_node>
                         <name>days</name>
                         <definition_loaded>false</definition_loaded>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "poe-overlay",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "private": true,
   "description": "A Overlay for Path of Exile. Built with Electron and Angular.",
   "main": "main.js",

diff --git a/src/app/data/poe-ninja/schema/item-overview.ts b/src/app/data/poe-ninja/schema/item-overview.ts
@@ -6,6 +6,7 @@ export interface ItemOverviewResponse {
 export interface ItemOverviewLine {
     name: string;
     baseType: string;
+    mapTier: number;
     links: number;
     chaosValue: number;
     sparkline: SparkLine;

diff --git a/src/app/data/poe/service/trade-http.service.ts b/src/app/data/poe/service/trade-http.service.ts
@@ -91,9 +91,9 @@ export class TradeHttpService {
             case Language.Korean:
                 baseUrl = environment.poe.koreanUrl;
                 break;
-            case Language.SimplifiedChinese:
-                baseUrl = environment.poe.simplifiedChineseUrl;
-                break;
+            // case Language.SimplifiedChinese:
+            //     baseUrl = environment.poe.simplifiedChineseUrl;
+            //     break;
             case Language.TraditionalChinese:
                 baseUrl = environment.poe.traditionalChineseUrl;
                 break;

diff --git a/src/app/layout/component/user-settings-form/user-settings-form.component.scss b/src/app/layout/component/user-settings-form/user-settings-form.component.scss
@@ -4,7 +4,7 @@
   align-items: center;
 
   > * {
-    width: 25%;
+    width: 33.333%;
     padding-right: 15px;
   }
 }
diff --git a/src/app/modules/bookmark/bookmark.module.ts b/src/app/modules/bookmark/bookmark.module.ts
@@ -20,11 +20,13 @@ export class BookmarkModule implements FeatureModule {
             bookmarks: [
                 {
                     url: 'https://www.poelab.com/',
-                    shortcut: 'Alt + num1'
+                    shortcut: 'Alt + num1',
+                    external: false
                 },
                 {
                     url: 'https://wraeclast.com/',
-                    shortcut: 'Alt + num2'
+                    shortcut: 'Alt + num2',
+                    external: false
                 }
             ]
         };
@@ -38,16 +40,18 @@ export class BookmarkModule implements FeatureModule {
     public getFeatures(settings: BookmarkUserSettings): Feature[] {
         return settings.bookmarks
             .filter(bookmark => bookmark.url && bookmark.shortcut)
-            .map(bookmark => {
+            .map((bookmark, index) => {
                 const feature: Feature = {
-                    name: bookmark.url,
+                    name: `bookmark-${index}`,
                     accelerator: bookmark.shortcut
                 };
                 return feature;
             });
     }
 
-    public run(feature: string): void {
-        this.bookmarkService.open(feature);
+    public run(feature: string, settings: BookmarkUserSettings): void {
+        const index = +feature.split('-')[1];
+        const bookmark = settings.bookmarks[index];
+        this.bookmarkService.open(bookmark);
     }
 }
diff --git a/src/app/modules/bookmark/component/bookmark-settings/bookmark-settings.component.html b/src/app/modules/bookmark/component/bookmark-settings/bookmark-settings.component.html
@@ -2,10 +2,19 @@
     <button class="remove" mat-icon-button (click)="onRemoveClick(index)">
         <mat-icon>close</mat-icon>
     </button>
-    <mat-form-field>
-        <mat-label>{{'bookmark.url' | translate}}</mat-label>
-        <input matInput [(ngModel)]="bookmark.url">
-    </mat-form-field>
+    <div class="url">
+        <div class="first">
+            <mat-form-field>
+                <mat-label>{{'bookmark.url' | translate}}</mat-label>
+                <input matInput [(ngModel)]="bookmark.url">
+            </mat-form-field>
+        </div>
+        <div class="second">
+            <mat-slide-toggle [checked]="bookmark.external" (change)="bookmark.external = $event.checked">
+                {{'bookmark.external' | translate}}
+            </mat-slide-toggle>
+        </div>
+    </div>
     <app-accelerator [label]="'bookmark.shortcut' | translate" [(value)]="bookmark.shortcut">
     </app-accelerator>
 </mat-card>

diff --git a/src/app/modules/bookmark/component/bookmark-settings/bookmark-settings.component.scss b/src/app/modules/bookmark/component/bookmark-settings/bookmark-settings.component.scss
@@ -8,3 +8,19 @@
     z-index: 1;
   }
 }
+
+.url {
+  display: flex;
+  flex-wrap: nowrap;
+  align-items: center;
+
+  > .first {
+    width: 75%;
+    padding-right: 15px;
+  }
+
+  > .second {
+    width: 25%;
+    text-align: center;
+  }
+}
diff --git a/src/app/modules/bookmark/component/bookmark-settings/bookmark-settings.component.ts b/src/app/modules/bookmark/component/bookmark-settings/bookmark-settings.component.ts
@@ -8,6 +8,7 @@ export interface BookmarkUserSettings extends UserSettings {
 export interface BookmarkUserBookmark {
   url: string;
   shortcut: string;
+  external: boolean;
 }
 
 @Component({
@@ -34,7 +35,8 @@ export class BookmarkSettingsComponent implements UserSettingsComponent {
   private addBookmark(): void {
     this.settings.bookmarks.push({
       url: 'https://github.com/Kyusung4698/PoE-Overlay',
-      shortcut: undefined
+      shortcut: undefined,
+      external: false
     });
   }
 

diff --git a/src/app/modules/bookmark/service/bookmark.service.ts b/src/app/modules/bookmark/service/bookmark.service.ts
@@ -2,27 +2,28 @@ import { Injectable } from '@angular/core';
 import { BrowserService } from '@app/service';
 import { Subject } from 'rxjs';
 import { tap, throttleTime } from 'rxjs/operators';
+import { BookmarkUserBookmark } from '../component/bookmark-settings/bookmark-settings.component';
 
 @Injectable({
     providedIn: 'root'
 })
 export class BookmarkService {
-    private readonly url$ = new Subject<string>();
+    private readonly bookmark$ = new Subject<BookmarkUserBookmark>();
 
     constructor(
         private readonly browser: BrowserService) {
         this.init();
     }
 
-    public open(url: string): void {
-        this.url$.next(url);
+    public open(bookmark: BookmarkUserBookmark): void {
+        this.bookmark$.next(bookmark);
     }
 
     private init(): void {
-        this.url$.pipe(
+        this.bookmark$.pipe(
             throttleTime(350),
-            tap(url => {
-                this.browser.open(url);
+            tap(bookmark => {
+                this.browser.open(bookmark.url, !!bookmark.external);
             })
         ).subscribe();
     }

diff --git a/...app/modules/evaluate/component/evaluate-exchange-rate/evaluate-exchange-rate.component.ts b/...app/modules/evaluate/component/evaluate-exchange-rate/evaluate-exchange-rate.component.ts
@@ -81,7 +81,7 @@ export class EvaluateExchangeRateComponent {
       .subscribe(
         result => {
           if (result) {
-            this.inverse$.next(result.amount < 1 && item.rarity === ItemRarity.Currency);
+            this.inverse$.next(result.amount < 1 && result.factor <= 1 && item.rarity === ItemRarity.Currency);
           }
           this.result$.next({ rate: result });
         },

diff --git a/...app/modules/evaluate/component/evaluate-search-table/evaluate-search-table.component.html b/...app/modules/evaluate/component/evaluate-search-table/evaluate-search-table.component.html
@@ -6,16 +6,22 @@
             <th class="age">Age</th>
         </tr>
     </table>
-    <cdk-virtual-scroll-viewport class="viewport" [style.height.px]="rows.length > 20 ? 20 * 20 : (rows.length + 1) * 20" itemSize="19" minBufferPx="200" maxBufferPx="400">
+    <cdk-virtual-scroll-viewport class="viewport"
+        [style.height.px]="rows.length > 20 ? 20 * 20 : (rows.length + 1) * 20" itemSize="19" minBufferPx="200"
+        maxBufferPx="400">
         <table>
             <tr *cdkVirtualFor="let row of rows;templateCacheSize: 0" class="clickable" [class.fixer]="row.count >= 3"
-                (click)="onRowClick(row.amount)">
-                <td class="amount">
+                (click)="onRowClick(row)">
+                <td class="amount" *ngIf="!original">
                     <span class="value">{{row.amount}}</span>
                     <span *ngIf="row.count > 1">
                         <small>&nbsp;x&nbsp;{{row.count}}</small>
                     </span>
                 </td>
+                <td *ngIf="original">
+                    <app-currency-frame [amount]="row.originalAmount" [currency]="row.originalCurrency">
+                    </app-currency-frame>
+                </td>
                 <td class="seller"> {{row.seller}} </td>
                 <td class="age"> <small>{{row.age}}</small> </td>
             </tr>

diff --git a/...app/modules/evaluate/component/evaluate-search-table/evaluate-search-table.component.scss b/...app/modules/evaluate/component/evaluate-search-table/evaluate-search-table.component.scss
@@ -17,7 +17,7 @@ table {
   }
 
   .amount {
-    min-width: 70px;
+    min-width: 75px;
 
     .value {
       color: $light-grey;