From 884924f9104d9c4c505fac4162b099838b4db5f5 Mon Sep 17 00:00:00 2001 From: zabala6 Date: Wed, 16 Oct 2024 00:07:12 +0200 Subject: [PATCH 1/3] Fix food held offset cooking --- objects/10023.txt | 2 +- objects/277.txt | 2 +- objects/278.txt | 2 +- objects/3361.txt | 2 +- objects/6943.txt | 2 +- objects/6945.txt | 2 +- objects/6948.txt | 2 +- objects/6950.txt | 2 +- objects/6952.txt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/objects/10023.txt b/objects/10023.txt index ac17e24733..f6aa299c13 100644 --- a/objects/10023.txt +++ b/objects/10023.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=6,1 speedMult=1.000000 -heldOffset=8.999998,26.000000 +heldOffset=11.999998,32.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/277.txt b/objects/277.txt index cfe2bd0aef..94ddfbc08f 100755 --- a/objects/277.txt +++ b/objects/277.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=7,2 speedMult=1.000000 -heldOffset=14.000000,15.000000 +heldOffset=15.000000,10.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/278.txt b/objects/278.txt index a4e3fdd914..9d504f72e0 100755 --- a/objects/278.txt +++ b/objects/278.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=7,2 speedMult=1.000000 -heldOffset=15.000000,22.000000 +heldOffset=15.000000,21.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/3361.txt b/objects/3361.txt index 13f18b1429..df09681ade 100644 --- a/objects/3361.txt +++ b/objects/3361.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=15.000000,21.000000 +heldOffset=15.000000,19.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/6943.txt b/objects/6943.txt index 143c8715e1..49665d9fe3 100644 --- a/objects/6943.txt +++ b/objects/6943.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=14.000000,25.999998 +heldOffset=15.000000,30.999998 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/6945.txt b/objects/6945.txt index 3c0b703c34..7605b9dce3 100644 --- a/objects/6945.txt +++ b/objects/6945.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=15.000000,21.000000 +heldOffset=16.000000,34.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/6948.txt b/objects/6948.txt index 6039ed428f..a25036b445 100644 --- a/objects/6948.txt +++ b/objects/6948.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=2,13 speedMult=1.000000 -heldOffset=14.000000,15.000000 +heldOffset=16.000000,12.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/6950.txt b/objects/6950.txt index b22a6b3441..97d62590c4 100644 --- a/objects/6950.txt +++ b/objects/6950.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=6,6 speedMult=1.000000 -heldOffset=14.000000,15.000000 +heldOffset=14.000000,11.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/6952.txt b/objects/6952.txt index 61950d09ec..406292a7f9 100644 --- a/objects/6952.txt +++ b/objects/6952.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=2,15 speedMult=1.000000 -heldOffset=14.000000,15.000000 +heldOffset=16.000000,11.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 From a812c9191abfbfe3c1db0f397558e81f74092198 Mon Sep 17 00:00:00 2001 From: zabala6 Date: Mon, 28 Oct 2024 22:57:25 +0100 Subject: [PATCH 2/3] Fix food held offset based by plate --- objects/10023.txt | 2 +- objects/1202.txt | 6 +++++- objects/265.txt | 2 +- objects/266.txt | 2 +- objects/267.txt | 2 +- objects/269.txt | 2 +- objects/270.txt | 2 +- objects/271.txt | 2 +- objects/272.txt | 2 +- objects/275.txt | 2 +- objects/276.txt | 2 +- objects/277.txt | 2 +- objects/278.txt | 2 +- objects/3370.txt | 2 +- objects/4790.txt | 2 +- objects/4791.txt | 2 +- objects/6949.txt | 3 +-- objects/6950.txt | 2 +- objects/802.txt | 3 +-- objects/803.txt | 3 +-- 20 files changed, 24 insertions(+), 23 deletions(-) diff --git a/objects/10023.txt b/objects/10023.txt index f6aa299c13..1f6128c26d 100644 --- a/objects/10023.txt +++ b/objects/10023.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=6,1 speedMult=1.000000 -heldOffset=11.999998,32.000000 +heldOffset=13.999998,32.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/1202.txt b/objects/1202.txt index bb7163c9bd..cc3dd6d0a7 100755 --- a/objects/1202.txt +++ b/objects/1202.txt @@ -3,6 +3,8 @@ Plate of Squash Chunks containable=0 containSize=1.000000,vertSlotRot=0.000000 permanent=0,minPickupAge=3 +noFlip=0 +sideAccess=0 heldInHand=0 blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 mapChance=0.000000#biomes_0 @@ -16,13 +18,14 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=12.000000,50.000000 +heldOffset=14.000000,50.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 useDistance=1 sounds=-1:0.0,-1:0.0,-1:0.0,-1:0.0 creationSoundInitialOnly=0 +creationSoundForce=0 numSlots=0#timeStretch=1.000000 slotSize=1.000000 slotsLocked=0 @@ -35,6 +38,7 @@ color=1.000000,1.000000,1.000000 ageRange=-1.000000,-1.000000 parent=-1 invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 headIndex=-1 bodyIndex=-1 backFootIndex=-1 diff --git a/objects/265.txt b/objects/265.txt index bd91d68580..9cc540e72e 100755 --- a/objects/265.txt +++ b/objects/265.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=13.999998,9.000000 +heldOffset=13.999998,15.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/266.txt b/objects/266.txt index c65f7690d5..33199c212d 100755 --- a/objects/266.txt +++ b/objects/266.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=13.999998,7.000000 +heldOffset=13.999998,15.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/267.txt b/objects/267.txt index a09b80b045..8eb5fc6f77 100755 --- a/objects/267.txt +++ b/objects/267.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=15.000000,21.000000 +heldOffset=14.000000,26.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/269.txt b/objects/269.txt index 7724a8aa61..34ffc09d65 100755 --- a/objects/269.txt +++ b/objects/269.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=12.000000,21.000000 +heldOffset=11.000000,26.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/270.txt b/objects/270.txt index f9b7fd509a..5f6c272a96 100755 --- a/objects/270.txt +++ b/objects/270.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=15.000000,21.000000 +heldOffset=15.000000,26.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/271.txt b/objects/271.txt index f6d6702139..700ae51aa9 100755 --- a/objects/271.txt +++ b/objects/271.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=15.000000,21.000000 +heldOffset=14.000000,23.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/272.txt b/objects/272.txt index 63df4d0333..c9ef1093a0 100755 --- a/objects/272.txt +++ b/objects/272.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=6,2 speedMult=1.000000 -heldOffset=13.000000,9.000000 +heldOffset=14.000000,15.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/275.txt b/objects/275.txt index 14fefcba9e..f9d47ee980 100755 --- a/objects/275.txt +++ b/objects/275.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=7,2 speedMult=1.000000 -heldOffset=15.000000,10.000000 +heldOffset=14.000000,15.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/276.txt b/objects/276.txt index 16d6aa4575..0208af6877 100755 --- a/objects/276.txt +++ b/objects/276.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=7,2 speedMult=1.000000 -heldOffset=16.000001,20.000000 +heldOffset=14.000001,23.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/277.txt b/objects/277.txt index 94ddfbc08f..cfe2bd0aef 100755 --- a/objects/277.txt +++ b/objects/277.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=7,2 speedMult=1.000000 -heldOffset=15.000000,10.000000 +heldOffset=14.000000,15.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/278.txt b/objects/278.txt index 9d504f72e0..4eb08352d9 100755 --- a/objects/278.txt +++ b/objects/278.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=7,2 speedMult=1.000000 -heldOffset=15.000000,21.000000 +heldOffset=14.000000,26.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/3370.txt b/objects/3370.txt index ee689e44e1..b3503953d9 100644 --- a/objects/3370.txt +++ b/objects/3370.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=7 speedMult=1.000000 -heldOffset=15.000000,20.000000 +heldOffset=14.000000,15.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/4790.txt b/objects/4790.txt index a715f3d8c6..d0d5f8c869 100644 --- a/objects/4790.txt +++ b/objects/4790.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=15.000000,21.000000 +heldOffset=14.000000,24.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/4791.txt b/objects/4791.txt index b5fadd4f94..794aa49bed 100644 --- a/objects/4791.txt +++ b/objects/4791.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=6,2 speedMult=1.000000 -heldOffset=15.000000,22.000000 +heldOffset=14.000000,24.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/6949.txt b/objects/6949.txt index edcfeadce9..f486e0e080 100644 --- a/objects/6949.txt +++ b/objects/6949.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=11.000001,21.000000 +heldOffset=11.000001,25.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 @@ -29,7 +29,6 @@ creationSoundForce=0 numSlots=0#timeStretch=1.000000 slotSize=1.000000 slotsLocked=0 -slotsNoSwap=0 numSprites=2 spriteID=514 pos=0.000000,-34.000000 diff --git a/objects/6950.txt b/objects/6950.txt index 97d62590c4..b22a6b3441 100644 --- a/objects/6950.txt +++ b/objects/6950.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=6,6 speedMult=1.000000 -heldOffset=14.000000,11.000000 +heldOffset=14.000000,15.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/802.txt b/objects/802.txt index 8cf5485c98..3989241cb8 100755 --- a/objects/802.txt +++ b/objects/802.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=15.000000,21.000000 +heldOffset=14.000000,24.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 @@ -29,7 +29,6 @@ creationSoundForce=0 numSlots=0#timeStretch=1.000000 slotSize=1.000000 slotsLocked=0 -slotsNoSwap=0 numSprites=2 spriteID=514 pos=0.000000,-34.000000 diff --git a/objects/803.txt b/objects/803.txt index 348684a7da..eb11fc525a 100755 --- a/objects/803.txt +++ b/objects/803.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=2,13 speedMult=1.000000 -heldOffset=15.000000,20.000000 +heldOffset=14.000000,24.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 @@ -29,7 +29,6 @@ creationSoundForce=0 numSlots=0#timeStretch=1.000000 slotSize=1.000000 slotsLocked=0 -slotsNoSwap=0 numSprites=5 spriteID=514 pos=0.000000,-34.000000 From 732ab43c1f39073792ed0803a8f391c2bc832b5b Mon Sep 17 00:00:00 2001 From: risvh <67486979+risvh@users.noreply.github.com> Date: Tue, 29 Oct 2024 20:50:58 +0800 Subject: [PATCH 3/3] Minor correction for pies with plate sprite completely covered There is still a plate under pork pie and pork apple pie. --- objects/6947.txt | 2 +- objects/6948.txt | 2 +- objects/6951.txt | 2 +- objects/6952.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/objects/6947.txt b/objects/6947.txt index 554184ef19..6c532f092a 100644 --- a/objects/6947.txt +++ b/objects/6947.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=15.000000,21.000000 +heldOffset=13.000000,24.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/6948.txt b/objects/6948.txt index a25036b445..6039ed428f 100644 --- a/objects/6948.txt +++ b/objects/6948.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=2,13 speedMult=1.000000 -heldOffset=16.000000,12.000000 +heldOffset=14.000000,15.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/6951.txt b/objects/6951.txt index 7227cb9704..3ad002cb79 100644 --- a/objects/6951.txt +++ b/objects/6951.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=15.000000,21.000000 +heldOffset=13.000000,25.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/6952.txt b/objects/6952.txt index 406292a7f9..61950d09ec 100644 --- a/objects/6952.txt +++ b/objects/6952.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=2,15 speedMult=1.000000 -heldOffset=16.000000,11.000000 +heldOffset=14.000000,15.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0