make the calculator work with minus number
disable pet-num when no pet
fix bug that cause choosing star or pet will change field
merge point fix with a line added
Merge branch 'calculator'