Verhandlungassistent #183

Update Erntehelfer (Forum) BugFix LiveChat #198
mainIine · Dec 4, 2019 · 027c187 · 027c187
1 parent 146150f
commit 027c187
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 12 deletions.
diff --git a/changelog-1.md b/changelog-1.md
@@ -1,5 +1,21 @@
 ##Changelog - Chrome Extension
 
+#####v2.3.13
+**Neu**
+- Verhandlungsassistent:
+    - schlägt durch berechnete Algorithmen passende Güter für jede Runde vor [#183](https://github.com/dsiekiera/foe-helfer-extension/issues/183)
+    - erkennt den 4 Zug der Taverne und kalkuliert entsprechend die Möglichkeiten der Kombinationen
+
+**Update**
+- Erntehelfer:
+    - CityMap und Gebäudeliste schliessen beim verlassen des Nachbarn [Forum](https://forum.foe-rechner.de/d/11-wunsche-zur-plunderanzeige)
+
+**BugFix**
+- Gilden-LiveChat:
+    - Token ergänzt [#198](https://github.com/dsiekiera/foe-helfer-extension/issues/198)
+
+---
+
 #####v2.3.12.5
 **BugFix**
 - Armee Übersicht:

diff --git a/changelog-2.md b/changelog-2.md
@@ -1,12 +1,28 @@
 ##Changelog - Chrome Extension
 
-##### v2.3.12.5
-** ** BugFix
+#####v2.3.13
+**New**
+- Negotiation Assistant:
+    - proposes matching goods through calculated algorithms for each round [#183](https://github.com/dsiekiera/foe-helfer-extension/issues/183)
+    - recognizes the tavern's 4 moves and calculates the possibilities of the combinations accordingly
+
+**Update**
+- Harvest-Helper:
+    - CityMap and building list close when leaving the neighbor [forum](https://forum.foe-rechner.de/d/11-wunsche-zur-plunderanzeige)
+
+**BugFix**
+- Guild LiveChat:
+    - Token added [#198](https://github.com/dsiekiera/foe-helfer-extension/issues/198)
+
+---
+
+#####v2.3.12.5
+**BugFix**
 - Army overview:
     - If a Boost LG was missing, the box was not loaded [#185](https://github.com/dsiekiera/foe-helfer-extension/issues/185)
     - Fixes turned "if", Thanks to [Th3C0D3R](https://github.com/Th3C0D3R)
 
-** Update **
+**Update**
 - Extension:
     - Harvester closes when returning to his own city [#178](https://github.com/dsiekiera/foe-helfer-extension/issues/178)
     - Fixed "Transparent" box [#188](https://github.com/dsiekiera/foe-helfer-extension/issues/188)

diff --git a/js/web/i18n/de.js b/js/web/i18n/de.js
@@ -208,7 +208,8 @@ let i18n = {
         },
         "Negotiation": {
             "Title": "Verhandlungassistent",
-			"Desc": "Macht dir präzise Vorschläge für Verhandlungen"
+			"Desc": "Macht dir präzise Vorschläge für Verhandlungen",
+			"Warning": "Deaktiviert: Starte zuerst eine neue Verhandlung!"
         },
 		"Settings" : {
 			"Title" : "Einstellungen",

diff --git a/js/web/i18n/en.js b/js/web/i18n/en.js
@@ -209,7 +209,8 @@ let i18n = {
         },
         "Negotiation": {
             "Title": "Negotiation helper",
-			"Desc": "Make precise proposals for negotiations"
+			"Desc": "Make precise proposals for negotiations",
+			"Warning": "Disabled: Start a negotiation first!"
         },
 		"Settings" : {
 			"Title" : "Settings",

diff --git a/js/web/i18n/fr.js b/js/web/i18n/fr.js
@@ -208,7 +208,8 @@ let i18n = {
         },
         "Negotiation": {
             "Title": "Assistant de négociation",
-			"Desc": "Faire des propositions de négociations précises"
+			"Desc": "Faire des propositions de négociations précises",
+			"Warning": "Désactivé: commencez une négociation en premier!"
         },
 		"Settings" : {
 			"Title" : "Paramètres",

diff --git a/js/web/menu.js b/js/web/menu.js
@@ -469,7 +469,7 @@ let Menu = {
         let btn_NegotiationBG = $('<div />').attr('id', 'negotationBtn').addClass('hud-btn hud-btn-red');
 
         // Tooltip einbinden
-        Menu.toolTippBox(i18n['Menu']['Negotiation']['Title'], i18n['Menu']['Negotiation']['Desc'], 'negotationBtn');
+        Menu.toolTippBox(i18n['Menu']['Negotiation']['Title'], '<em id="negotiation-closed" class="tooltip-error">' + i18n['Menu']['Negotiation']['Warning'] + '<br></em>' + i18n['Menu']['Negotiation']['Desc'], 'negotationBtn');
 
         let btn_Negotiation = $('<span />');
 

diff --git a/js/web/negotiation.js b/js/web/negotiation.js
@@ -15,7 +15,6 @@
 let Negotiation = {
     Tables: {},
     CurrentTry: 0,
-	Resources: null,
     TryCount: undefined,
 	GoodCount: undefined,
     CurrentTable: undefined,
@@ -141,6 +140,7 @@ let Negotiation = {
 
     	if( $('#negotationBtn').hasClass('hud-btn-red') ){
 			$('#negotationBtn').removeClass('hud-btn-red');
+			$('#negotiation-closed').remove();
 		}
 
         Negotiation.CurrentTry = 1;

diff --git a/js/web/unit.js b/js/web/unit.js
@@ -66,7 +66,7 @@ let Unit = {
 			if (diff <= 0) {
 				clearInterval(x);
 
-				$('.alca-countdown').html('<span class="text-danger">Ernte!</span>');
+				$('.alca-info').html('<span class="text-danger">Ernte!</span>');
 			} else
 				$('.alca-countdown').text(moment.utc(diff).format("HH:mm:ss"));
 
@@ -81,7 +81,7 @@ let Unit = {
 						harvest: moment.unix(alca['state']['next_state_transition_at']).format('HH:mm:ss')
 					});
 
-		top.push(timer);
+		top.push('<div class="alca-info text-center">' + timer + '</div>');
 
 		top.push('</div>');
 
@@ -352,7 +352,7 @@ let Unit = {
 		// fertige Tabelle zusammen setzten
 		let h = [];
 
-		h.push(top);
+		h.push(top.join(''));
 
 		h.push('<div class="unit-tabs tabs">');
 		h.push( Unit.GetTabs() );

diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
 	"name": "__MSG_appName__",
 	"description": "__MSG_appDesc__",
 	"default_locale": "en",
-	"version": "2.3.12.5",
+	"version": "2.3.13",
 
 	"manifest_version": 2,
 	"permissions": [