Re-unite main and yl_stable of bones #5628

New Issue

AliasAlreadyTaken · 2023-12-09T02:18:23Z

AliasAlreadyTaken commented

2023-12-09 02:18:23 +00:00

Following QA of #1747:

Apparently our bones mod branches main and yl_stable somehow diverged. Last common commit was 4cfd82936a

There's a PR to see what's different, it appears there is a lot and we can't simply merge.

Is there anything in our yl_stable branch that we should keep?

If not, we could drop (read: rename) the current yl_stable branch and use upstream again

Following QA of #1747: Apparently our bones mod branches main and yl_stable somehow diverged. Last common commit was 4cfd82936a There's a PR to see what's different, it appears there is a lot and we can't simply merge. Is there anything in our yl_stable branch that we should keep? If not, we could drop (read: rename) the current yl_stable branch and use upstream again

AliasAlreadyTaken added the

1. kind/protocol

2. prio/elevated

labels 2023-12-09 02:18:38 +00:00

AliasAlreadyTaken added this to the 1.1.122 milestone 2023-12-09 02:18:41 +00:00

AliasAlreadyTaken removed this from the 1.1.122 milestone 2023-12-09 03:41:47 +00:00

flux commented

2023-12-09 22:57:22 +00:00

i think we should throw out our old yl_stable branch and just pull fresh from upstream (my redo).

👍 1

AliasAlreadyTaken commented

2023-12-09 23:08:14 +00:00

I checked out master on the testserver, to see whether it would break things. I couldn't find anything wrong (yet).

AliasAlreadyTaken added the

4. step/ready to QA test

label 2023-12-11 02:07:21 +00:00

AliasAlreadyTaken added this to the 1.1.122 milestone 2023-12-11 02:07:24 +00:00

AliasAlreadyTaken commented

2023-12-11 02:08:09 +00:00

I renamed the current yl_stable branch to yl_stable_old and forked a new yl_stable from main.

AliasAlreadyTaken referenced this issue

2023-12-11 21:54:47 +00:00

testserver minetest-bones_redo/api.lua:264: error serializing stacks? #5653

AliasAlreadyTaken commented

2023-12-12 09:29:44 +00:00

QA is successful if

death creates fresh bones block
fresh boneblocks changes to old after duration defined in settings
banshee spawns on old bones
noone can take from fresh bones, only from old
bones include inventory, crafting grid and armour, not trashcan or bags
player is told where his bones are to be found
when taking from bones, player gets a chat message
everything is logged

Did I forget something?

QA is successful if - death creates fresh bones block - fresh boneblocks changes to old after duration defined in settings - banshee spawns on old bones - noone can take from fresh bones, only from old - bones include inventory, crafting grid and armour, not trashcan or bags - player is told where his bones are to be found - when taking from bones, player gets a chat message - everything is logged Did I forget something?

flux commented

2023-12-12 21:31:04 +00:00

bones include inventory, crafting grid and armour, not trashcan or bags

right, you may need to tweak a setting to keep armour from going into bones:

bones.disable_inventory_handlers = armor,unified_inventory_bags

> - bones include inventory, crafting grid and armour, not trashcan or bags right, you may need to tweak a setting to keep armour from going into bones: `bones.disable_inventory_handlers = armor,unified_inventory_bags`

AliasAlreadyTaken commented

2023-12-12 21:55:11 +00:00

bones include inventory, crafting grid and armour, not trashcan or bags

right, you may need to tweak a setting to keep armour from going into bones:

bones.disable_inventory_handlers = armor,unified_inventory_bags

No, it's good that armour goes to the bones. That's how it was and that's how we want it. I just want to make sure I didn't forget any functionality to be tested

> > > - bones include inventory, crafting grid and armour, not trashcan or bags > > right, you may need to tweak a setting to keep armour from going into bones: > > `bones.disable_inventory_handlers = armor,unified_inventory_bags` No, it's good that armour goes to the bones. That's how it was and that's how we want it. I just want to make sure I didn't forget any functionality to be tested

flux commented

2023-12-12 22:56:22 +00:00

No, it's good that armour goes to the bones. That's how it was and that's how we want it. I just want to make sure I didn't forget any functionality to be tested

oh, of course, that's how it is now. my brain is melting...

> No, it's good that armour goes to the bones. That's how it was and that's how we want it. I just want to make sure I didn't forget any functionality to be tested oh, of course, that's how it is now. my brain is melting...

😆 1

AliasAlreadyTaken commented

2023-12-14 07:26:41 +00:00

QA

Looks good :)

QA Looks good :)

AliasAlreadyTaken added the

ugh/QA main

label 2023-12-14 07:26:47 +00:00

flux added

5. result/fixed

and removed