Skip to content

Commit

Permalink
Merge pull request #175 from zabala6/posCookedFood
Browse files Browse the repository at this point in the history
Fix food held offset change during cooking
  • Loading branch information
risvh authored Oct 29, 2024
2 parents 8441037 + 732ab43 commit af04c81
Show file tree
Hide file tree
Showing 23 changed files with 27 additions and 26 deletions.
2 changes: 1 addition & 1 deletion objects/10023.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ floor=0
floorHugging=0
foodValue=6,1
speedMult=1.000000
heldOffset=8.999998,26.000000
heldOffset=13.999998,32.000000
clothing=n
clothingOffset=0.000000,0.000000
deadlyDistance=0
Expand Down
6 changes: 5 additions & 1 deletion objects/1202.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/265.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/266.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/267.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/269.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/270.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/271.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/272.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/275.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/276.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/278.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ floor=0
floorHugging=0
foodValue=7,2
speedMult=1.000000
heldOffset=15.000000,22.000000
heldOffset=14.000000,26.000000
clothing=n
clothingOffset=0.000000,0.000000
deadlyDistance=0
Expand Down
2 changes: 1 addition & 1 deletion objects/3361.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/3370.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/4790.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/4791.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/6943.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/6945.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/6947.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions objects/6949.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion objects/6951.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions objects/802.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions objects/803.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit af04c81

Please sign in to comment.