I have a package stay (free dining) upcoming in December with 6 day park hoppers. We will probably want to upgrade to annual passes, as we're planning to return a couple of times in 2020. How can I calculate the amount we'll need to pay for the upgrade to APs? I'd like to make sure to have at least enough for the passes, tips, and souvenirs on some Disney gift cards for the trip. Would I simply subtract the cost of a 6 day park hopper from the cost of an annual pass? I don't know if ticket prices have risen since I booked, but I don't believe that they have.