From 722cbc14729de9257dae730975d2065a913f7ca6 Mon Sep 17 00:00:00 2001 From: Alar of Daggerspine Date: Wed, 24 Jun 2015 20:35:00 +0200 Subject: [PATCH] Protecting against null Signed-off-by: Alar of Daggerspine --- CHANGELOG.txt | 18 +++++++++++++----- MatchMaker.lua | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0dfcc9c..54f2f39 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,10 +1,18 @@ -==GarrisonCommander helps you when choosing the right follower for the right mission== -*2.5.0 +*GarrisonCommander helps you when choosing the right follower for the right mission* +* *2.6.0* + +Feature: priorities and allowed items are now the in the same list. Drag items around to change priorities +Feature: Should now try more aggressively to maximise outcome of gold,oil and resources missions +Feature: In follower page, a list of trait is shown in the bottom. It works like the one for abilities +Feature: Tooltip enhancement can be disabled +Fix: In "Other Useful followers" list in tooltip, inactive followers are no longer shown + +* *2.5.0* Greatly improved matchmaking -Missino control: unified priorities and allowed itmes. Now you can just drag items around to change priority -* 2.4.7 +Mission control: unified priorities and allowed itmes. Now you can just drag items around to change priority +* *2.4.7* Fix: Sometimes daily reset was not fired at dure time Feature: Redone all buttomns to be more consistent. Old behaviour configurable via options Feature: Update frequency is now configurable. Feature: Right clicking on any button open menu -Feature: To manually register ah harvest as done or undone you need now to keep shift pressed +Feature: To manually register an harvest as done or undone you need now to keep shift pressed diff --git a/MatchMaker.lua b/MatchMaker.lua index 34482c8..69b41a1 100644 --- a/MatchMaker.lua +++ b/MatchMaker.lua @@ -27,6 +27,7 @@ local dbg local useCap=false local currentCap=100 local function formatScore(c,r,x,t,maxres,cap) + cap=tonumber(cap) or 100 if (not maxres) then cap=100 end return format("%03d %03d %03d %03d %01d",min(c,cap),r,c,x,t),c end -- 1.7.9.5