Daivuk / apdoom

Archipelago Doom is a fork of Crispy Doom to allow multi-world features from Archipelago
GNU General Public License v2.0
9 stars 11 forks source link

Backpack stacks when collected multiple times #4

Closed coavins closed 3 months ago

coavins commented 1 year ago

The backpack can be collected multiple times. Each backpack increases max ammo by the specified amount. Each ammo type has its own backpack.

Backpack is configurable:

TODO:

I think I covered everything on doom's end, but I need help with the stuff on the AP side.

Daivuk commented 11 months ago

Sorry totally missed the notification on this. Will take a look once I have time.

Daivuk commented 11 months ago

This seems like a nice addition. How did you test that without AP? Code changing in doom itself are always risky. I see you're hardcoding callbacks to 0,1,2,3. It should be more than that, up to the max AP_NUM_AMMO can be. Heretic has more ammo types. Cc me to the PR you'll do in AP for this. Otherwise this can go in once you make the change for ammo type count :)

Daivuk commented 11 months ago

ooohhh wait yea. bad news, code is very different now. You used master right? I was doing latest stuff into branch heretic. I will merge it into master. You'll have various changes to do. Sorry. Should have merged back more frequently into main.

Daivuk commented 11 months ago

Here, merge conflict. So basically I started with Master being main branch. Then I shifted to Doom2 and created a new branch doom2, then heretic, called heretic. So you coded this against very old code :(

Daivuk commented 11 months ago

and thanks for the contribution, I hope you can rebase and resolve this

coavins commented 11 months ago

Whoops, I guess I could have double checked where I was working. I don't think it'll be too bad to catch up, or just redo it, it's really not a big change. I'll take another look when I can.

So master is a good target to work from now?

Daivuk commented 11 months ago

Whoops, I guess I could have double checked where I was working. I don't think it'll be too bad to catch up, or just redo it, it's really not a big change. I'll take another look when I can.

So master is a good target to work from now?

Yup, master has now latest. Sorry again about that!

Daivuk commented 7 months ago

Hi, looking at this again. If you're still up to it, can you clean up by rebasing master? What options need to be added on the apworld?

KScl commented 3 months ago

Closing in favor of #18 since this hasn't been updated in nearly a year.