From 12a129c15d1263e925cfe3832b1a758fc0382a37 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Tue, 23 Apr 2024 17:26:54 +0200 Subject: [PATCH 01/29] Swamp saplings sprite import --- sprites/119967.tga | Bin 0 -> 8210 bytes sprites/119967.txt | 1 + sprites/119968.tga | Bin 0 -> 8210 bytes sprites/119968.txt | 1 + sprites/119969.tga | Bin 0 -> 32786 bytes sprites/119969.txt | 1 + sprites/119970.tga | Bin 0 -> 8210 bytes sprites/119970.txt | 1 + sprites/119971.tga | Bin 0 -> 8210 bytes sprites/119971.txt | 1 + sprites/119972.tga | Bin 0 -> 32786 bytes sprites/119972.txt | 1 + 12 files changed, 6 insertions(+) create mode 100644 sprites/119967.tga create mode 100644 sprites/119967.txt create mode 100644 sprites/119968.tga create mode 100644 sprites/119968.txt create mode 100644 sprites/119969.tga create mode 100644 sprites/119969.txt create mode 100644 sprites/119970.tga create mode 100644 sprites/119970.txt create mode 100644 sprites/119971.tga create mode 100644 sprites/119971.txt create mode 100644 sprites/119972.tga create mode 100644 sprites/119972.txt diff --git a/sprites/119967.tga b/sprites/119967.tga new file mode 100644 index 0000000000000000000000000000000000000000..d4920e20e924548f0fce46ac4a5cb0c1da21dabf GIT binary patch literal 8210 zcmeH~O^8-i7{~97ujA`SS>xwe>MM7pNfStISyUzdd9^t1b4&x@Dn6B3roN?*Ms@7M(VWx##tNcE&|WE99F<8 zI1TDvD4zD;1^qJ)^T8a{X~xU*hOTxz>q;1gH3gGA)tiDn@O3f%o~M2q2XmyYs?D?O zuQ@h;+VH&U-U_$DMtBF*mQ64M$BOY8p6<~HV`dFhZRWfU#!YSGyc&Ll(EFv-KTdxF z?t;C={9imf;9l#~dr-A`zdXD3b0esI4${c@SQ;7{3LoNmFYmU(C_LmkxC9+g-@KW} zs?A#U-dH~!I07kKy*y=yA5M$btV->6JG8&z-9gv}V{icCo!Vj!>gbz$YhAxR`{$6d z-J>ac?^tThpO;##RvKKkG;}`T{SMdyhx4^vA41=6gWrm(E%e>z|7YJoXyw}d{r%l> zdsfW9${K6nnbO+OH;2Zv52`fvt$X*~0)Ig0oGDsekFaWt8e~|zj?bE z{si@3DW3NI)||}8>xUi7J7b2UKfHnGzTxhMF_3e=>MLNADoD}QO2%|@#FN3q4(eVtE%t1 z*e zml#`fDSKj9%-zm-XFk{UVGn&{I0%0K>gZd8kppx18Kms(=R#{g<4^Lr`^RE#9pgvx zxvu_`^sQsh;rG0%K1=hz7xdX27{d=CWiLM#S{oR@kN0SZw$0GmF?Ra zXWPbj1*Dlv2Aw+t{?0A{e>c^2f8d>}qwiY31KRQKc$a_eyK`OWZ)fcH;T$;kDHtm; zZ|b^V)He2Y_1&i(?TIz`Gh71wv9`Vd_07A!ig!m{HG?|ZY|EQ_wWAN(d={p_T(1Xx zItl8VcXKS|^Qzm6Hrw)j;e&pt;WtNpeUeAvONev&>{XAgm$mRep6Y)GWxWx`@jjlH r8Jebv)7W`xnr!uAX0n$}&7LL#O$3?DX1ypHln=f5 zWTa6q5d}T;5CqYKS_JtJA@x#`VkvYnv7!r-r{C|Kv+N)`bH>Zt+3;iUz4ku)zxG<| zoNp#c+LLIlq&I0@6SKOnBTz@6jzArOIs$bB&KQ99ZDdS7vVsMW>{Qu_$le27bZ?(Oj=c_##E-#o; z%=Jef^v@U>uc0>e$~g{Q&-IQIp%WIs+i(a{I0%!#J>$XrSR+Ger^eYc)SUp{aVlI1 z-LN0j{j2C5zYh9m9L9k;sM^YL4qeaju3azYQNeHhZ&eZ6UCXJ_~j{q3wRh8}ppeQ+FFpuTzY zysFLEdw1)n1?wSArcX_ibt}>dGrH4evl-g^SbGANKrcK3v8J||gQ4hKE7pvDd-sna zO_uef$y-~}#<($QqtQq^rc4f&-s7RR}fm6c6)n! zK5vc;`&RZ?18YlrL*E?w9cqIrP5sFIwT%CU(D}JEF8lQz_B-II(s~zTIamGAez|n^ z3C6p!`OImtZVf!2*>ZndjK%lRdh)%l(yTw<`^f)?jMey{=pDZS`TMwVR_HInR@QfJ z4$R|F^nL%#m-XKbH^4^l&Y`u9@ju!8{{FD}9&XNT`M$>)$2Um*VNj*HZ!}l~K5q@G zmyWovFSK4{eoR~P@SS1nW4Y0pD4_zg@5g(&W_*q4g;9U778k-mu-m{OQb= z>p#ml;_vswJ2jw64BQtvuzucyG}*X1wB|D3nc4d1gzaYL&tMtYnb~rE?T5klDD<0*jjiVoiVxxj3}$W_~rK!zXoU`@P@?`ggR$w?%JG%)jyUOzUtkeSLGEznj*fzi&s|=3W>2 zOPL#6W2|j|(XXZVd#CNAqPKSEgYoq4#(yw&3|G1FT4bDYn&ID7)jN_*n@=vg|ewztAlTiIj1 n?W?f<%~d;5irS@cP_30(AuH2-Fd%BTz@6jzArObC1A(;LQ@e literal 0 HcmV?d00001 diff --git a/sprites/119968.txt b/sprites/119968.txt new file mode 100644 index 0000000000..6aa2e8d258 --- /dev/null +++ b/sprites/119968.txt @@ -0,0 +1 @@ +WillowCuttingRooted 0 2 -4 \ No newline at end of file diff --git a/sprites/119969.tga b/sprites/119969.tga new file mode 100644 index 0000000000000000000000000000000000000000..775ccbb208a8fde0faae7d1d3397ddce3386c3aa GIT binary patch literal 32786 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 Date: Wed, 24 Apr 2024 11:15:20 +0200 Subject: [PATCH 02/29] Bald cypress object creation --- objects/22337.txt | 49 +++++++++++++++++++++++++++++++++++++++ objects/22338.txt | 58 +++++++++++++++++++++++++++++++++++++++++++++++ objects/22339.txt | 58 +++++++++++++++++++++++++++++++++++++++++++++++ objects/22340.txt | 58 +++++++++++++++++++++++++++++++++++++++++++++++ objects/22341.txt | 58 +++++++++++++++++++++++++++++++++++++++++++++++ objects/22342.txt | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 339 insertions(+) create mode 100644 objects/22337.txt create mode 100644 objects/22338.txt create mode 100644 objects/22339.txt create mode 100644 objects/22340.txt create mode 100644 objects/22341.txt create mode 100644 objects/22342.txt diff --git a/objects/22337.txt b/objects/22337.txt new file mode 100644 index 0000000000..46d90f0dea --- /dev/null +++ b/objects/22337.txt @@ -0,0 +1,49 @@ +id=22337 +Bald Cypress Tree Cutting +containable=1 +containSize=1.000000,vertSlotRot=-0.500000 +permanent=0,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=1 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=4.000000,-4.000000 +clothing=n +clothingOffset=0.000000,0.000000 +deadlyDistance=0 +useDistance=1 +sounds=297:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=1 +spriteID=119970 +pos=5.000000,-34.000000 +rot=0.255000 +hFlip=0 +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 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=0 \ No newline at end of file diff --git a/objects/22338.txt b/objects/22338.txt new file mode 100644 index 0000000000..97fd0866af --- /dev/null +++ b/objects/22338.txt @@ -0,0 +1,58 @@ +id=22338 +Rooting Bald Cypress Tree Cutting +containable=1 +containSize=1.000000,vertSlotRot=-0.500000 +permanent=0,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=1 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=4.000000,-4.000000 +clothing=n +clothingOffset=0.000000,0.000000 +deadlyDistance=0 +useDistance=1 +sounds=297:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=2 +spriteID=101807 +pos=-11.000000,-33.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=119970 +pos=5.000000,-34.000000 +rot=0.255000 +hFlip=0 +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 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=0 \ No newline at end of file diff --git a/objects/22339.txt b/objects/22339.txt new file mode 100644 index 0000000000..bd8ba4e6e4 --- /dev/null +++ b/objects/22339.txt @@ -0,0 +1,58 @@ +id=22339 +Bald Cypress Sapling Cutting +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=0 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.000000 +clothing=n +clothingOffset=-27.000000,72.000000 +deadlyDistance=0 +useDistance=1 +sounds=297:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=2 +spriteID=119970 +pos=0.000000,-23.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=493 +pos=1.000000,-35.000000 +rot=0.000000 +hFlip=0 +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 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=0 \ No newline at end of file diff --git a/objects/22340.txt b/objects/22340.txt new file mode 100644 index 0000000000..23a7ac2ad6 --- /dev/null +++ b/objects/22340.txt @@ -0,0 +1,58 @@ +id=22340 +Wet Bald Cypress Sapling Cutting +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=0 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.000000 +clothing=n +clothingOffset=-27.000000,72.000000 +deadlyDistance=0 +useDistance=1 +sounds=321:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=2 +spriteID=493 +pos=1.000000,-35.000000 +rot=0.000000 +hFlip=0 +color=0.690141,0.690141,0.690141 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=119970 +pos=0.000000,-23.000000 +rot=0.000000 +hFlip=0 +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 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=0 \ No newline at end of file diff --git a/objects/22341.txt b/objects/22341.txt new file mode 100644 index 0000000000..dce65f25fc --- /dev/null +++ b/objects/22341.txt @@ -0,0 +1,58 @@ +id=22341 +Dry Bald Cypress Sapling +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=0 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.000000 +clothing=n +clothingOffset=-27.000000,72.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 +numSprites=2 +spriteID=119972 +pos=-1.000000,-4.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=493 +pos=1.000000,-35.000000 +rot=0.000000 +hFlip=0 +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 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=29 \ No newline at end of file diff --git a/objects/22342.txt b/objects/22342.txt new file mode 100644 index 0000000000..57e1357d99 --- /dev/null +++ b/objects/22342.txt @@ -0,0 +1,58 @@ +id=22342 +Wet Bald Cypress Sapling +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=0 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.000000 +clothing=n +clothingOffset=-27.000000,72.000000 +deadlyDistance=0 +useDistance=1 +sounds=321:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=2 +spriteID=119972 +pos=-1.000000,-4.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=493 +pos=1.000000,-35.000000 +rot=0.000000 +hFlip=0 +color=0.690141,0.690141,0.690141 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +headIndex=-1 +bodyIndex=-1 +backFootIndex=-1 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=29 \ No newline at end of file From c7d8f9b15d0563fed30abc84e9fa769de1a33a22 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Wed, 24 Apr 2024 11:37:50 +0200 Subject: [PATCH 03/29] Willow object creation --- objects/22339.txt | 2 +- objects/22343.txt | 50 +++++++++++++++++++++++++++++++++++++++ objects/22344.txt | 59 +++++++++++++++++++++++++++++++++++++++++++++++ objects/22345.txt | 58 ++++++++++++++++++++++++++++++++++++++++++++++ objects/22346.txt | 58 ++++++++++++++++++++++++++++++++++++++++++++++ objects/22347.txt | 58 ++++++++++++++++++++++++++++++++++++++++++++++ objects/22348.txt | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 342 insertions(+), 1 deletion(-) create mode 100644 objects/22343.txt create mode 100644 objects/22344.txt create mode 100644 objects/22345.txt create mode 100644 objects/22346.txt create mode 100644 objects/22347.txt create mode 100644 objects/22348.txt diff --git a/objects/22339.txt b/objects/22339.txt index bd8ba4e6e4..c70e530f35 100644 --- a/objects/22339.txt +++ b/objects/22339.txt @@ -1,5 +1,5 @@ id=22339 -Bald Cypress Sapling Cutting +Dry Bald Cypress Sapling Cutting containable=0 containSize=1.000000,vertSlotRot=0.000000 permanent=1,minPickupAge=3 diff --git a/objects/22343.txt b/objects/22343.txt new file mode 100644 index 0000000000..36ba3a9b47 --- /dev/null +++ b/objects/22343.txt @@ -0,0 +1,50 @@ +id=22343 +Willow Tree Cutting +containable=1 +containSize=1.000000,vertSlotRot=-0.500000 +permanent=0,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=1 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +containOffset=0,-3 +heldOffset=0.000000,-4.000000 +clothing=n +clothingOffset=0.000000,0.000000 +deadlyDistance=0 +useDistance=1 +sounds=297:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=1 +spriteID=119967 +pos=2.000000,-35.000004 +rot=0.250000 +hFlip=1 +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 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=0 \ No newline at end of file diff --git a/objects/22344.txt b/objects/22344.txt new file mode 100644 index 0000000000..dfc59298f3 --- /dev/null +++ b/objects/22344.txt @@ -0,0 +1,59 @@ +id=22344 +Rooting Willow Tree Cutting +containable=1 +containSize=1.000000,vertSlotRot=-0.500000 +permanent=0,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=1 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +containOffset=0,-3 +heldOffset=4.000000,-4.000000 +clothing=n +clothingOffset=0.000000,0.000000 +deadlyDistance=0 +useDistance=1 +sounds=297:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=2 +spriteID=101807 +pos=-11.000000,-33.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=119967 +pos=2.000000,-35.000000 +rot=0.250000 +hFlip=1 +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 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=0 \ No newline at end of file diff --git a/objects/22345.txt b/objects/22345.txt new file mode 100644 index 0000000000..e2e61a111f --- /dev/null +++ b/objects/22345.txt @@ -0,0 +1,58 @@ +id=22345 +Dry Willow Sapling Cutting +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=0 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.000000 +clothing=n +clothingOffset=-27.000000,72.000000 +deadlyDistance=0 +useDistance=1 +sounds=297:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=2 +spriteID=493 +pos=1.000000,-35.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=119967 +pos=-2.000000,-23.000000 +rot=0.000000 +hFlip=0 +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 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=0 \ No newline at end of file diff --git a/objects/22346.txt b/objects/22346.txt new file mode 100644 index 0000000000..da44742128 --- /dev/null +++ b/objects/22346.txt @@ -0,0 +1,58 @@ +id=22346 +Wet Willow Sapling Cutting +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=0 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.000000 +clothing=n +clothingOffset=-27.000000,72.000000 +deadlyDistance=0 +useDistance=1 +sounds=321:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=2 +spriteID=493 +pos=1.000000,-35.000000 +rot=0.000000 +hFlip=0 +color=0.690141,0.690141,0.690141 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=119967 +pos=-2.000000,-23.000000 +rot=0.000000 +hFlip=0 +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 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=0 \ No newline at end of file diff --git a/objects/22347.txt b/objects/22347.txt new file mode 100644 index 0000000000..5d7b652cfe --- /dev/null +++ b/objects/22347.txt @@ -0,0 +1,58 @@ +id=22347 +Dry Willow Sapling +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=0 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.000000 +clothing=n +clothingOffset=-27.000000,72.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 +numSprites=2 +spriteID=119969 +pos=-1.000000,-3.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=493 +pos=1.000000,-35.000000 +rot=0.000000 +hFlip=0 +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 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=28 \ No newline at end of file diff --git a/objects/22348.txt b/objects/22348.txt new file mode 100644 index 0000000000..ec69a5bbeb --- /dev/null +++ b/objects/22348.txt @@ -0,0 +1,58 @@ +id=22348 +Wet Willow Sapling +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=0 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.000000 +clothing=n +clothingOffset=-27.000000,72.000000 +deadlyDistance=0 +useDistance=1 +sounds=321:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=2 +spriteID=119969 +pos=-1.000000,-3.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=493 +pos=1.000000,-35.000000 +rot=0.000000 +hFlip=0 +color=0.690141,0.690141,0.690141 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +headIndex=-1 +bodyIndex=-1 +backFootIndex=-1 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=28 \ No newline at end of file From 3cf000fcabc15c42d287cd633650fe780d19d0aa Mon Sep 17 00:00:00 2001 From: SenMooo Date: Wed, 24 Apr 2024 11:40:36 +0200 Subject: [PATCH 04/29] Shears with cutting object creation --- objects/22349.txt | 67 +++++++++++++++++++++++++++++++++++++++++++++++ objects/22350.txt | 67 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+) create mode 100644 objects/22349.txt create mode 100644 objects/22350.txt diff --git a/objects/22349.txt b/objects/22349.txt new file mode 100644 index 0000000000..ce05515806 --- /dev/null +++ b/objects/22349.txt @@ -0,0 +1,67 @@ +id=22349 +Shears with Bald Cypress Cutting +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=1 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=10.000000,0.000000 +clothing=n +clothingOffset=-27.000000,72.000000 +deadlyDistance=0 +useDistance=1 +sounds=159:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=3 +spriteID=919 +pos=9.000000,-27.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=1156 +pos=12.000000,-26.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=119970 +pos=18.000000,-21.000000 +rot=0.000000 +hFlip=0 +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 +frontFootIndex=-1 +numUses=5,0.040000 +useVanishIndex=-1 +useAppearIndex=1 +pixHeight=0 \ No newline at end of file diff --git a/objects/22350.txt b/objects/22350.txt new file mode 100644 index 0000000000..3ba06cc10c --- /dev/null +++ b/objects/22350.txt @@ -0,0 +1,67 @@ +id=22350 +Shears with Willow Cutting +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=1 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=10.000000,0.000000 +clothing=n +clothingOffset=-27.000000,72.000000 +deadlyDistance=0 +useDistance=1 +sounds=159:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=3 +spriteID=919 +pos=9.000000,-27.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=1156 +pos=12.000000,-26.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=119967 +pos=20.000000,-22.000000 +rot=0.000000 +hFlip=1 +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 +frontFootIndex=-1 +numUses=5,0.040000 +useVanishIndex=-1 +useAppearIndex=1 +pixHeight=0 \ No newline at end of file From 20209dc23be41cc7ff7f7d115462687162950868 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Wed, 24 Apr 2024 12:12:08 +0200 Subject: [PATCH 05/29] Cutting and shears with cutting categories --- categories/14034.txt | 6 ++++-- categories/14035.txt | 6 ++++-- categories/14038.txt | 6 ++++-- categories/1794.txt | 6 ++++-- categories/9041.txt | 6 ++++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/categories/14034.txt b/categories/14034.txt index 947b278021..1fc4a3aa5d 100644 --- a/categories/14034.txt +++ b/categories/14034.txt @@ -1,6 +1,6 @@ parentID=14034 pattern -numObjects=37 +numObjects=39 8979 8099 7370 @@ -37,4 +37,6 @@ numObjects=37 10375 10383 10517 -13210 \ No newline at end of file +13210 +22350 +22349 \ No newline at end of file diff --git a/categories/14035.txt b/categories/14035.txt index 84dffcbce9..f6b5e61ea3 100644 --- a/categories/14035.txt +++ b/categories/14035.txt @@ -1,6 +1,6 @@ parentID=14035 pattern -numObjects=96 +numObjects=98 7312 7702 7340 @@ -96,4 +96,6 @@ numObjects=96 9158 7049 7040 -14029 \ No newline at end of file +14029 +527 +530 \ No newline at end of file diff --git a/categories/14038.txt b/categories/14038.txt index 43b7599dd2..b9c14cdbf8 100644 --- a/categories/14038.txt +++ b/categories/14038.txt @@ -1,6 +1,6 @@ parentID=14038 pattern -numObjects=96 +numObjects=98 7360 7360 7360 @@ -96,4 +96,6 @@ numObjects=96 10074 7047 7047 -14773 \ No newline at end of file +14773 +22350 +22349 \ No newline at end of file diff --git a/categories/1794.txt b/categories/1794.txt index d5a001335d..23f60cc873 100755 --- a/categories/1794.txt +++ b/categories/1794.txt @@ -1,6 +1,6 @@ parentID=1794 pattern -numObjects=14 +numObjects=16 1795 1796 1797 @@ -14,4 +14,6 @@ numObjects=14 8107 8108 8109 -8110 \ No newline at end of file +8110 +22343 +22337 \ No newline at end of file diff --git a/categories/9041.txt b/categories/9041.txt index 712b589cb9..a9f0be54fb 100644 --- a/categories/9041.txt +++ b/categories/9041.txt @@ -1,6 +1,6 @@ parentID=9041 pattern -numObjects=37 +numObjects=39 8980 8107 7372 @@ -37,4 +37,6 @@ numObjects=37 10376 10384 10518 -13211 \ No newline at end of file +13211 +22343 +22337 \ No newline at end of file From d8455b3fe85df7249dd4c33109d5306a3623b32e Mon Sep 17 00:00:00 2001 From: SenMooo Date: Wed, 24 Apr 2024 13:39:05 +0200 Subject: [PATCH 06/29] Rooting and dry planting and decay --- categories/1790.txt | 6 ++++-- categories/9042.txt | 6 ++++-- categories/9043.txt | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/categories/1790.txt b/categories/1790.txt index 32acc5ea0c..7b7e32d28a 100755 --- a/categories/1790.txt +++ b/categories/1790.txt @@ -1,6 +1,6 @@ parentID=1790 pattern -numObjects=22 +numObjects=24 1791 1799 1798 @@ -22,4 +22,6 @@ numObjects=22 7366 10073 10078 -10519 \ No newline at end of file +10519 +22345 +22339 \ No newline at end of file diff --git a/categories/9042.txt b/categories/9042.txt index 259faaaf89..c2c476e283 100644 --- a/categories/9042.txt +++ b/categories/9042.txt @@ -1,6 +1,6 @@ parentID=9042 pattern -numObjects=37 +numObjects=39 9040 9018 9019 @@ -37,4 +37,6 @@ numObjects=37 10377 10385 10524 -13212 \ No newline at end of file +13212 +22344 +22338 \ No newline at end of file diff --git a/categories/9043.txt b/categories/9043.txt index a62b2f0162..e7b12ff150 100644 --- a/categories/9043.txt +++ b/categories/9043.txt @@ -1,6 +1,6 @@ parentID=9043 pattern -numObjects=37 +numObjects=39 8974 8079 7362 @@ -37,4 +37,6 @@ numObjects=37 10378 10386 10519 -8880 \ No newline at end of file +8880 +22345 +22339 \ No newline at end of file From ec8aeef22c1d8cc844c3f9fccd91af8e5714d13d Mon Sep 17 00:00:00 2001 From: SenMooo Date: Wed, 24 Apr 2024 13:52:52 +0200 Subject: [PATCH 07/29] Add to wet sapling cutting category --- categories/1792.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/categories/1792.txt b/categories/1792.txt index 154489c5ef..d79af25bfb 100755 --- a/categories/1792.txt +++ b/categories/1792.txt @@ -1,6 +1,6 @@ parentID=1792 pattern -numObjects=22 +numObjects=24 1793 1801 1800 @@ -22,4 +22,6 @@ numObjects=22 7367 10072 10077 -10520 \ No newline at end of file +10520 +22346 +22340 \ No newline at end of file From 75c7619eccf6efc12ce52b11d21bc78ddeda3c44 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Wed, 24 Apr 2024 13:54:53 +0200 Subject: [PATCH 08/29] Create perhaps sprayed category objects --- objects/22351.txt | 131 ++++++++++++++++++++++++++++++++++++++++++++++ objects/22352.txt | 131 ++++++++++++++++++++++++++++++++++++++++++++++ objects/22353.txt | 131 ++++++++++++++++++++++++++++++++++++++++++++++ objects/22354.txt | 131 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 524 insertions(+) create mode 100644 objects/22351.txt create mode 100644 objects/22352.txt create mode 100644 objects/22353.txt create mode 100644 objects/22354.txt diff --git a/objects/22351.txt b/objects/22351.txt new file mode 100644 index 0000000000..1bb3a6ce8f --- /dev/null +++ b/objects/22351.txt @@ -0,0 +1,131 @@ +id=22351 +Perhaps sprayed Willow Sapling +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=1 +sideAccess=0 +heldInHand=0 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.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 +numSprites=10 +spriteID=100595 +pos=-3.000000,-1.000000 +rot=-0.250000 +hFlip=0 +color=0.000000,0.000000,0.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=2224 +pos=0.000000,0.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=2224 +pos=33.000000,0.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=2224 +pos=-33.000000,0.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3283 +pos=-34.000000,69.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3282 +pos=32.000000,72.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3281 +pos=-33.000000,70.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3280 +pos=33.000000,69.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=711 +pos=-2.000000,66.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=1222 +pos=-45.000000,101.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spritesDrawnBehind=0,1,2,3 +headIndex=-1 +bodyIndex=-1 +backFootIndex=-1 +frontFootIndex=-1 +numUses=0,0.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=117 \ No newline at end of file diff --git a/objects/22352.txt b/objects/22352.txt new file mode 100644 index 0000000000..9f470a9f25 --- /dev/null +++ b/objects/22352.txt @@ -0,0 +1,131 @@ +id=22352 +Perhaps sprayed Willow Sapling Cutting +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=1 +sideAccess=0 +heldInHand=0 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.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 +numSprites=10 +spriteID=100595 +pos=-3.000000,-1.000000 +rot=-0.250000 +hFlip=0 +color=0.000000,0.000000,0.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=2224 +pos=0.000000,0.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=2224 +pos=33.000000,0.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=2224 +pos=-33.000000,0.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3283 +pos=-34.000000,69.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3282 +pos=32.000000,72.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3281 +pos=-33.000000,70.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3280 +pos=33.000000,69.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=711 +pos=-2.000000,66.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=1222 +pos=-45.000000,101.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spritesDrawnBehind=0,1,2,3 +headIndex=-1 +bodyIndex=-1 +backFootIndex=-1 +frontFootIndex=-1 +numUses=0,0.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=117 \ No newline at end of file diff --git a/objects/22353.txt b/objects/22353.txt new file mode 100644 index 0000000000..8dae174475 --- /dev/null +++ b/objects/22353.txt @@ -0,0 +1,131 @@ +id=22353 +Perhaps sprayed Bald Cypress Sapling +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=1 +sideAccess=0 +heldInHand=0 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.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 +numSprites=10 +spriteID=100595 +pos=-3.000000,-1.000000 +rot=-0.250000 +hFlip=0 +color=0.000000,0.000000,0.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=2224 +pos=0.000000,0.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=2224 +pos=33.000000,0.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=2224 +pos=-33.000000,0.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3283 +pos=-34.000000,69.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3282 +pos=32.000000,72.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3281 +pos=-33.000000,70.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3280 +pos=33.000000,69.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=711 +pos=-2.000000,66.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=1222 +pos=-45.000000,101.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spritesDrawnBehind=0,1,2,3 +headIndex=-1 +bodyIndex=-1 +backFootIndex=-1 +frontFootIndex=-1 +numUses=0,0.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=117 \ No newline at end of file diff --git a/objects/22354.txt b/objects/22354.txt new file mode 100644 index 0000000000..5f6e6cd662 --- /dev/null +++ b/objects/22354.txt @@ -0,0 +1,131 @@ +id=22354 +Perhaps sprayed Bald Cypress Sapling Cutting +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=1 +sideAccess=0 +heldInHand=0 +blocksWalking=0,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_0 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.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 +numSprites=10 +spriteID=100595 +pos=-3.000000,-1.000000 +rot=-0.250000 +hFlip=0 +color=0.000000,0.000000,0.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=2224 +pos=0.000000,0.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=2224 +pos=33.000000,0.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=2224 +pos=-33.000000,0.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3283 +pos=-34.000000,69.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3282 +pos=32.000000,72.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3281 +pos=-33.000000,70.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=3280 +pos=33.000000,69.000000 +rot=0.500000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=711 +pos=-2.000000,66.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=1222 +pos=-45.000000,101.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spritesDrawnBehind=0,1,2,3 +headIndex=-1 +bodyIndex=-1 +backFootIndex=-1 +frontFootIndex=-1 +numUses=0,0.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=117 \ No newline at end of file From 7bfdf0bfc3c649284b1263556120f91af9b7cccb Mon Sep 17 00:00:00 2001 From: SenMooo Date: Wed, 24 Apr 2024 13:56:43 +0200 Subject: [PATCH 09/29] Add to perhaps sprayed categories --- categories/22351.txt | 4 ++++ categories/22352.txt | 4 ++++ categories/22353.txt | 4 ++++ categories/22354.txt | 4 ++++ 4 files changed, 16 insertions(+) create mode 100644 categories/22351.txt create mode 100644 categories/22352.txt create mode 100644 categories/22353.txt create mode 100644 categories/22354.txt diff --git a/categories/22351.txt b/categories/22351.txt new file mode 100644 index 0000000000..e996c3f4ba --- /dev/null +++ b/categories/22351.txt @@ -0,0 +1,4 @@ +parentID=22351 +numObjects=2 +22347 +22348 \ No newline at end of file diff --git a/categories/22352.txt b/categories/22352.txt new file mode 100644 index 0000000000..83f7f61473 --- /dev/null +++ b/categories/22352.txt @@ -0,0 +1,4 @@ +parentID=22352 +numObjects=2 +22345 +22346 \ No newline at end of file diff --git a/categories/22353.txt b/categories/22353.txt new file mode 100644 index 0000000000..1c9401d83d --- /dev/null +++ b/categories/22353.txt @@ -0,0 +1,4 @@ +parentID=22353 +numObjects=2 +22341 +22342 \ No newline at end of file diff --git a/categories/22354.txt b/categories/22354.txt new file mode 100644 index 0000000000..cf3fb32698 --- /dev/null +++ b/categories/22354.txt @@ -0,0 +1,4 @@ +parentID=22354 +numObjects=2 +22339 +22340 \ No newline at end of file From 24a268e7fc8cac0db829639573603c6c0a7f3bd8 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Wed, 24 Apr 2024 14:00:20 +0200 Subject: [PATCH 10/29] Perhaps sprayed transitions --- transitions/12626_22339.txt | 1 + transitions/12626_22345.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 transitions/12626_22339.txt create mode 100644 transitions/12626_22345.txt diff --git a/transitions/12626_22339.txt b/transitions/12626_22339.txt new file mode 100644 index 0000000000..fa0eda4df5 --- /dev/null +++ b/transitions/12626_22339.txt @@ -0,0 +1 @@ +0 22354 0 0.000000 0.000000 0 0 0 1 0 0 \ No newline at end of file diff --git a/transitions/12626_22345.txt b/transitions/12626_22345.txt new file mode 100644 index 0000000000..b8f515b0f3 --- /dev/null +++ b/transitions/12626_22345.txt @@ -0,0 +1 @@ +0 22352 0 0.000000 0.000000 0 0 0 1 0 0 \ No newline at end of file From ce32ac9b7e8ca5fd11ea7cbd457322e63906bee3 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Wed, 24 Apr 2024 14:10:29 +0200 Subject: [PATCH 11/29] Add to dry maple sapling category for growth transition --- categories/1802.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/categories/1802.txt b/categories/1802.txt index 3c32b503df..ad6d441f55 100755 --- a/categories/1802.txt +++ b/categories/1802.txt @@ -1,6 +1,6 @@ parentID=1802 pattern -numObjects=22 +numObjects=24 1803 1804 1805 @@ -22,4 +22,6 @@ numObjects=22 7368 10070 10076 -10522 \ No newline at end of file +10522 +22347 +22341 \ No newline at end of file From 754af473b31a14587bec8d3a6611fdf06ebff39b Mon Sep 17 00:00:00 2001 From: SenMooo Date: Wed, 24 Apr 2024 15:08:47 +0200 Subject: [PATCH 12/29] Add probability set to perhaps sprayed categories --- categories/22351.txt | 5 +++-- categories/22352.txt | 5 +++-- categories/22353.txt | 5 +++-- categories/22354.txt | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/categories/22351.txt b/categories/22351.txt index e996c3f4ba..2dd335d855 100644 --- a/categories/22351.txt +++ b/categories/22351.txt @@ -1,4 +1,5 @@ parentID=22351 +probSet numObjects=2 -22347 -22348 \ No newline at end of file +22347 0.500000 +22348 0.500000 \ No newline at end of file diff --git a/categories/22352.txt b/categories/22352.txt index 83f7f61473..0d51d7f616 100644 --- a/categories/22352.txt +++ b/categories/22352.txt @@ -1,4 +1,5 @@ parentID=22352 +probSet numObjects=2 -22345 -22346 \ No newline at end of file +22345 0.500000 +22346 0.500000 \ No newline at end of file diff --git a/categories/22353.txt b/categories/22353.txt index 1c9401d83d..544f178fb4 100644 --- a/categories/22353.txt +++ b/categories/22353.txt @@ -1,4 +1,5 @@ parentID=22353 +probSet numObjects=2 -22341 -22342 \ No newline at end of file +22341 0.500000 +22342 0.500000 \ No newline at end of file diff --git a/categories/22354.txt b/categories/22354.txt index cf3fb32698..ddbbc80c08 100644 --- a/categories/22354.txt +++ b/categories/22354.txt @@ -1,4 +1,5 @@ parentID=22354 +probSet numObjects=2 -22339 -22340 \ No newline at end of file +22339 0.500000 +22340 0.500000 \ No newline at end of file From fcb96f667259e6ed78404286a997cbefd148af42 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Wed, 24 Apr 2024 16:23:44 +0200 Subject: [PATCH 13/29] Add perhaps sprayed sapling transitions --- transitions/12626_22341.txt | 1 + transitions/12626_22347.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 transitions/12626_22341.txt create mode 100644 transitions/12626_22347.txt diff --git a/transitions/12626_22341.txt b/transitions/12626_22341.txt new file mode 100644 index 0000000000..507b4e5190 --- /dev/null +++ b/transitions/12626_22341.txt @@ -0,0 +1 @@ +0 22353 0 0.000000 0.000000 0 0 0 1 0 0 \ No newline at end of file diff --git a/transitions/12626_22347.txt b/transitions/12626_22347.txt new file mode 100644 index 0000000000..c543d4e6b0 --- /dev/null +++ b/transitions/12626_22347.txt @@ -0,0 +1 @@ +0 22351 0 0.000000 0.000000 0 0 0 1 0 0 \ No newline at end of file From 191a05d8bfeaf69692dd4c477fb90296a0105e6b Mon Sep 17 00:00:00 2001 From: SenMooo Date: Wed, 24 Apr 2024 16:23:59 +0200 Subject: [PATCH 14/29] Add to wet maple category --- categories/1806.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/categories/1806.txt b/categories/1806.txt index 6f98d7f491..348304e357 100755 --- a/categories/1806.txt +++ b/categories/1806.txt @@ -1,6 +1,6 @@ parentID=1806 pattern -numObjects=22 +numObjects=24 1809 1808 1807 @@ -22,4 +22,6 @@ numObjects=22 7369 10071 10075 -10523 \ No newline at end of file +10523 +22348 +22342 \ No newline at end of file From 74a6fe723bc52566ac165d47542a74ec079ba3c7 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Wed, 24 Apr 2024 16:34:48 +0200 Subject: [PATCH 15/29] Full growth transitions --- transitions/-1_22342.txt | 1 + transitions/-1_22348.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 transitions/-1_22342.txt create mode 100644 transitions/-1_22348.txt diff --git a/transitions/-1_22342.txt b/transitions/-1_22342.txt new file mode 100644 index 0000000000..6c491dc644 --- /dev/null +++ b/transitions/-1_22342.txt @@ -0,0 +1 @@ +0 530 -1 0.000000 0.000000 0 0 0 1 0 0 \ No newline at end of file diff --git a/transitions/-1_22348.txt b/transitions/-1_22348.txt new file mode 100644 index 0000000000..6bea8032e3 --- /dev/null +++ b/transitions/-1_22348.txt @@ -0,0 +1 @@ +0 527 -1 0.000000 0.000000 0 0 0 1 0 0 \ No newline at end of file From be1b3b8d9bbd7d4616b46d485af74cf98c6411d7 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Wed, 24 Apr 2024 17:35:22 +0200 Subject: [PATCH 16/29] Add willow tree in tree pit objects --- objects/22355.txt | 104 ++++++++++++++++++++++++++++++++++++++++++++++ objects/22356.txt | 86 ++++++++++++++++++++++++++++++++++++++ objects/22357.txt | 95 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 285 insertions(+) create mode 100644 objects/22355.txt create mode 100644 objects/22356.txt create mode 100644 objects/22357.txt diff --git a/objects/22355.txt b/objects/22355.txt new file mode 100644 index 0000000000..3e741b269f --- /dev/null +++ b/objects/22355.txt @@ -0,0 +1,104 @@ +id=22355 +Willow Tree in Tree Pit +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=0 +blocksWalking=1,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_2 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.000000 +clothing=n +clothingOffset=0.000000,0.000000 +deadlyDistance=0 +useDistance=1 +sounds=78:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=7 +spriteID=100408 +pos=0.000000,15.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=110373 +pos=5.000000,225.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=873 +pos=-60.000000,293.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=874 +pos=-35.000000,188.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=2 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=876 +pos=-44.000000,19.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=6 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=111300 +pos=2.000000,16.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=875 +pos=-22.000000,73.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=3 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spritesDrawnBehind=0,5 +headIndex=-1 +bodyIndex=-1 +backFootIndex=-1 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=303 \ No newline at end of file diff --git a/objects/22356.txt b/objects/22356.txt new file mode 100644 index 0000000000..1a3401006f --- /dev/null +++ b/objects/22356.txt @@ -0,0 +1,86 @@ +id=22356 +Staked Willow Tree +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=0 +blocksWalking=1,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_2 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.000000 +clothing=n +clothingOffset=0.000000,0.000000 +deadlyDistance=0 +useDistance=1 +sounds=69:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=5 +spriteID=111308 +pos=0.000000,0.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=873 +pos=-60.000000,293.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=874 +pos=-35.000000,188.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=875 +pos=-22.000000,73.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=2 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=876 +pos=-44.000000,19.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=3 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spritesDrawnBehind=0 +headIndex=-1 +bodyIndex=-1 +backFootIndex=-1 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=303 \ No newline at end of file diff --git a/objects/22357.txt b/objects/22357.txt new file mode 100644 index 0000000000..4854421686 --- /dev/null +++ b/objects/22357.txt @@ -0,0 +1,95 @@ +id=22357 +Willow Tree with Small Cut Stones +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=0 +blocksWalking=1,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_2 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.000000 +clothing=n +clothingOffset=0.000000,0.000000 +deadlyDistance=0 +useDistance=1 +sounds=45:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=6 +spriteID=101435 +pos=0.000000,20.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=873 +pos=-60.000000,293.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=874 +pos=-35.000000,188.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=875 +pos=-22.000000,73.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=2 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=876 +pos=-44.000000,19.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=3 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=100520 +pos=30.000000,-10.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spritesDrawnBehind=0 +headIndex=-1 +bodyIndex=-1 +backFootIndex=-1 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=303 \ No newline at end of file From b0e5080a54dd5e5b7a37db7c9f737527f4e5fcb2 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Wed, 24 Apr 2024 17:35:37 +0200 Subject: [PATCH 17/29] Add willow tree to tree pit categories --- categories/13146.txt | 5 +++-- categories/13147.txt | 5 +++-- categories/13148.txt | 5 +++-- categories/13185.txt | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/categories/13146.txt b/categories/13146.txt index 81357c28f7..96d5244f55 100644 --- a/categories/13146.txt +++ b/categories/13146.txt @@ -1,6 +1,6 @@ parentID=13146 pattern -numObjects=36 +numObjects=37 13110 13111 13112 @@ -36,4 +36,5 @@ numObjects=36 13142 13143 13144 -13145 \ No newline at end of file +13145 +22356 \ No newline at end of file diff --git a/categories/13147.txt b/categories/13147.txt index 7ffc63df1a..d7b57b4014 100644 --- a/categories/13147.txt +++ b/categories/13147.txt @@ -1,6 +1,6 @@ parentID=13147 pattern -numObjects=36 +numObjects=37 48 45 99 @@ -36,4 +36,5 @@ numObjects=36 9157 9156 9158 -10480 \ No newline at end of file +10480 +527 \ No newline at end of file diff --git a/categories/13148.txt b/categories/13148.txt index 84d1d73e3d..a299837528 100644 --- a/categories/13148.txt +++ b/categories/13148.txt @@ -1,6 +1,6 @@ parentID=13148 pattern -numObjects=36 +numObjects=37 13074 13075 13076 @@ -36,4 +36,5 @@ numObjects=36 13106 13107 13108 -13109 \ No newline at end of file +13109 +22355 \ No newline at end of file diff --git a/categories/13185.txt b/categories/13185.txt index 0abcaf91bc..0bf0f915c7 100644 --- a/categories/13185.txt +++ b/categories/13185.txt @@ -1,6 +1,6 @@ parentID=13185 pattern -numObjects=36 +numObjects=37 13149 13150 13151 @@ -36,4 +36,5 @@ numObjects=36 13181 13182 13183 -13184 \ No newline at end of file +13184 +22357 \ No newline at end of file From 8726a3a5dc6cda9f1731cae48d0da2c91908b162 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Thu, 25 Apr 2024 08:12:05 +0200 Subject: [PATCH 18/29] Fix sprite import by lowering the shadow value --- sprites/119968.txt | 1 - sprites/119971.tga | Bin 8210 -> 0 bytes sprites/119971.txt | 1 - sprites/{119968.tga => 119978.tga} | Bin 8210 -> 8210 bytes sprites/119978.txt | 1 + sprites/119979.tga | Bin 0 -> 32786 bytes sprites/119979.txt | 1 + sprites/119980.tga | Bin 0 -> 8210 bytes sprites/119980.txt | 1 + sprites/119981.tga | Bin 0 -> 32786 bytes sprites/119981.txt | 1 + 11 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 sprites/119968.txt delete mode 100644 sprites/119971.tga delete mode 100644 sprites/119971.txt rename sprites/{119968.tga => 119978.tga} (53%) create mode 100644 sprites/119978.txt create mode 100644 sprites/119979.tga create mode 100644 sprites/119979.txt create mode 100644 sprites/119980.tga create mode 100644 sprites/119980.txt create mode 100644 sprites/119981.tga create mode 100644 sprites/119981.txt diff --git a/sprites/119968.txt b/sprites/119968.txt deleted file mode 100644 index 6aa2e8d258..0000000000 --- a/sprites/119968.txt +++ /dev/null @@ -1 +0,0 @@ -WillowCuttingRooted 0 2 -4 \ No newline at end of file diff --git a/sprites/119971.tga b/sprites/119971.tga deleted file mode 100644 index 21fdc7aece2971138a8c0525d779a884bfba2e62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8210 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 diff --git a/sprites/119978.txt b/sprites/119978.txt new file mode 100644 index 0000000000..21363277b7 --- /dev/null +++ b/sprites/119978.txt @@ -0,0 +1 @@ +WillowCutting 0 5 2 \ No newline at end of file diff --git a/sprites/119979.tga b/sprites/119979.tga new file mode 100644 index 0000000000000000000000000000000000000000..e642c3b24ea1b147ffc9cec91ed85bae335150bd GIT binary patch literal 32786 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 ZMggOMQNSo*6fg=H1&jhlf&Z%l{{hHt5mo>I literal 0 HcmV?d00001 diff --git a/sprites/119979.txt b/sprites/119979.txt new file mode 100644 index 0000000000..471ec47db0 --- /dev/null +++ b/sprites/119979.txt @@ -0,0 +1 @@ +WillowCuttingSapling 0 0 0 \ No newline at end of file diff --git a/sprites/119980.tga b/sprites/119980.tga new file mode 100644 index 0000000000000000000000000000000000000000..c7f5e70cb92bb110dd0817cfa2e557d4bceda4f5 GIT binary patch literal 8210 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 Plmp5E<$!XammK&nGfXWN literal 0 HcmV?d00001 diff --git a/sprites/119981.txt b/sprites/119981.txt new file mode 100644 index 0000000000..081aa78b6b --- /dev/null +++ b/sprites/119981.txt @@ -0,0 +1 @@ +BaldCypressCuttingSapling 0 0 13 \ No newline at end of file From 1fee3cc27a5fdf10d5fd6a0651130564ac3a7205 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Thu, 25 Apr 2024 08:17:19 +0200 Subject: [PATCH 19/29] Replace willow objects with the new sprites --- objects/22343.txt | 4 ++-- objects/22344.txt | 4 ++-- objects/22345.txt | 4 ++-- objects/22346.txt | 4 ++-- objects/22347.txt | 4 ++-- objects/22348.txt | 4 ++-- objects/22350.txt | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/objects/22343.txt b/objects/22343.txt index 36ba3a9b47..d19fcb333f 100644 --- a/objects/22343.txt +++ b/objects/22343.txt @@ -31,8 +31,8 @@ numSlots=0#timeStretch=1.000000 slotSize=1.000000 slotsLocked=0 numSprites=1 -spriteID=119967 -pos=2.000000,-35.000004 +spriteID=119978 +pos=-1.000000,-33.000000 rot=0.250000 hFlip=1 color=1.000000,1.000000,1.000000 diff --git a/objects/22344.txt b/objects/22344.txt index dfc59298f3..b332088d3d 100644 --- a/objects/22344.txt +++ b/objects/22344.txt @@ -40,8 +40,8 @@ ageRange=-1.000000,-1.000000 parent=-1 invisHolding=0,invisWorn=0,behindSlots=0 invisCont=0 -spriteID=119967 -pos=2.000000,-35.000000 +spriteID=119978 +pos=-1.000000,-33.000000 rot=0.250000 hFlip=1 color=1.000000,1.000000,1.000000 diff --git a/objects/22345.txt b/objects/22345.txt index e2e61a111f..e2c1ddd9c8 100644 --- a/objects/22345.txt +++ b/objects/22345.txt @@ -39,8 +39,8 @@ ageRange=-1.000000,-1.000000 parent=-1 invisHolding=0,invisWorn=0,behindSlots=0 invisCont=0 -spriteID=119967 -pos=-2.000000,-23.000000 +spriteID=119978 +pos=0.000000,-26.000000 rot=0.000000 hFlip=0 color=1.000000,1.000000,1.000000 diff --git a/objects/22346.txt b/objects/22346.txt index da44742128..9716b2067c 100644 --- a/objects/22346.txt +++ b/objects/22346.txt @@ -39,8 +39,8 @@ ageRange=-1.000000,-1.000000 parent=-1 invisHolding=0,invisWorn=0,behindSlots=0 invisCont=0 -spriteID=119967 -pos=-2.000000,-23.000000 +spriteID=119978 +pos=0.000000,-26.000000 rot=0.000000 hFlip=0 color=1.000000,1.000000,1.000000 diff --git a/objects/22347.txt b/objects/22347.txt index 5d7b652cfe..3700554bff 100644 --- a/objects/22347.txt +++ b/objects/22347.txt @@ -30,8 +30,8 @@ numSlots=0#timeStretch=1.000000 slotSize=1.000000 slotsLocked=0 numSprites=2 -spriteID=119969 -pos=-1.000000,-3.000000 +spriteID=119979 +pos=-1.000000,-4.000000 rot=0.000000 hFlip=0 color=1.000000,1.000000,1.000000 diff --git a/objects/22348.txt b/objects/22348.txt index ec69a5bbeb..fba40efade 100644 --- a/objects/22348.txt +++ b/objects/22348.txt @@ -30,8 +30,8 @@ numSlots=0#timeStretch=1.000000 slotSize=1.000000 slotsLocked=0 numSprites=2 -spriteID=119969 -pos=-1.000000,-3.000000 +spriteID=119979 +pos=-1.000000,-4.000000 rot=0.000000 hFlip=0 color=1.000000,1.000000,1.000000 diff --git a/objects/22350.txt b/objects/22350.txt index 3ba06cc10c..1ef796821d 100644 --- a/objects/22350.txt +++ b/objects/22350.txt @@ -48,8 +48,8 @@ ageRange=-1.000000,-1.000000 parent=-1 invisHolding=0,invisWorn=0,behindSlots=0 invisCont=0 -spriteID=119967 -pos=20.000000,-22.000000 +spriteID=119978 +pos=18.000000,-24.999994 rot=0.000000 hFlip=1 color=1.000000,1.000000,1.000000 From 69eb591af58498dbf2af745e801de24b4afa0871 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Thu, 25 Apr 2024 08:21:57 +0200 Subject: [PATCH 20/29] Replace bald cypress objects with the new sprites --- objects/22337.txt | 4 ++-- objects/22338.txt | 6 +++--- objects/22339.txt | 8 ++++---- objects/22340.txt | 4 ++-- objects/22341.txt | 8 ++++---- objects/22342.txt | 12 ++++++------ objects/22349.txt | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/objects/22337.txt b/objects/22337.txt index 46d90f0dea..ec3ef76a38 100644 --- a/objects/22337.txt +++ b/objects/22337.txt @@ -30,8 +30,8 @@ numSlots=0#timeStretch=1.000000 slotSize=1.000000 slotsLocked=0 numSprites=1 -spriteID=119970 -pos=5.000000,-34.000000 +spriteID=119980 +pos=-1.000000,-33.000000 rot=0.255000 hFlip=0 color=1.000000,1.000000,1.000000 diff --git a/objects/22338.txt b/objects/22338.txt index 97fd0866af..d25f665689 100644 --- a/objects/22338.txt +++ b/objects/22338.txt @@ -39,9 +39,9 @@ ageRange=-1.000000,-1.000000 parent=-1 invisHolding=0,invisWorn=0,behindSlots=0 invisCont=0 -spriteID=119970 -pos=5.000000,-34.000000 -rot=0.255000 +spriteID=119980 +pos=-1.000000,-33.000000 +rot=0.250000 hFlip=0 color=1.000000,1.000000,1.000000 ageRange=-1.000000,-1.000000 diff --git a/objects/22339.txt b/objects/22339.txt index c70e530f35..8e82af1b5e 100644 --- a/objects/22339.txt +++ b/objects/22339.txt @@ -30,8 +30,8 @@ numSlots=0#timeStretch=1.000000 slotSize=1.000000 slotsLocked=0 numSprites=2 -spriteID=119970 -pos=0.000000,-23.000000 +spriteID=493 +pos=1.000000,-35.000000 rot=0.000000 hFlip=0 color=1.000000,1.000000,1.000000 @@ -39,8 +39,8 @@ ageRange=-1.000000,-1.000000 parent=-1 invisHolding=0,invisWorn=0,behindSlots=0 invisCont=0 -spriteID=493 -pos=1.000000,-35.000000 +spriteID=119980 +pos=-1.000000,-29.000000 rot=0.000000 hFlip=0 color=1.000000,1.000000,1.000000 diff --git a/objects/22340.txt b/objects/22340.txt index 23a7ac2ad6..42a38fa3f9 100644 --- a/objects/22340.txt +++ b/objects/22340.txt @@ -39,8 +39,8 @@ ageRange=-1.000000,-1.000000 parent=-1 invisHolding=0,invisWorn=0,behindSlots=0 invisCont=0 -spriteID=119970 -pos=0.000000,-23.000000 +spriteID=119980 +pos=-1.000000,-29.000000 rot=0.000000 hFlip=0 color=1.000000,1.000000,1.000000 diff --git a/objects/22341.txt b/objects/22341.txt index dce65f25fc..99b9152f56 100644 --- a/objects/22341.txt +++ b/objects/22341.txt @@ -30,8 +30,8 @@ numSlots=0#timeStretch=1.000000 slotSize=1.000000 slotsLocked=0 numSprites=2 -spriteID=119972 -pos=-1.000000,-4.000000 +spriteID=493 +pos=1.000000,-35.000000 rot=0.000000 hFlip=0 color=1.000000,1.000000,1.000000 @@ -39,8 +39,8 @@ ageRange=-1.000000,-1.000000 parent=-1 invisHolding=0,invisWorn=0,behindSlots=0 invisCont=0 -spriteID=493 -pos=1.000000,-35.000000 +spriteID=119981 +pos=0.000000,-17.000000 rot=0.000000 hFlip=0 color=1.000000,1.000000,1.000000 diff --git a/objects/22342.txt b/objects/22342.txt index 57e1357d99..9c8a882a63 100644 --- a/objects/22342.txt +++ b/objects/22342.txt @@ -30,20 +30,20 @@ numSlots=0#timeStretch=1.000000 slotSize=1.000000 slotsLocked=0 numSprites=2 -spriteID=119972 -pos=-1.000000,-4.000000 +spriteID=493 +pos=1.000000,-35.000000 rot=0.000000 hFlip=0 -color=1.000000,1.000000,1.000000 +color=0.690141,0.690141,0.690141 ageRange=-1.000000,-1.000000 parent=-1 invisHolding=0,invisWorn=0,behindSlots=0 invisCont=0 -spriteID=493 -pos=1.000000,-35.000000 +spriteID=119981 +pos=0.000000,-17.000000 rot=0.000000 hFlip=0 -color=0.690141,0.690141,0.690141 +color=1.000000,1.000000,1.000000 ageRange=-1.000000,-1.000000 parent=-1 invisHolding=0,invisWorn=0,behindSlots=0 diff --git a/objects/22349.txt b/objects/22349.txt index ce05515806..da2fef4789 100644 --- a/objects/22349.txt +++ b/objects/22349.txt @@ -48,8 +48,8 @@ ageRange=-1.000000,-1.000000 parent=-1 invisHolding=0,invisWorn=0,behindSlots=0 invisCont=0 -spriteID=119970 -pos=18.000000,-21.000000 +spriteID=119980 +pos=17.000000,-27.000000 rot=0.000000 hFlip=0 color=1.000000,1.000000,1.000000 From 670631ccfb7b4d552302d3c65408bbcc4da3c94e Mon Sep 17 00:00:00 2001 From: SenMooo Date: Thu, 25 Apr 2024 08:26:15 +0200 Subject: [PATCH 21/29] Fix held position for rooting and willow cutting --- objects/22343.txt | 2 +- objects/22344.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/objects/22343.txt b/objects/22343.txt index d19fcb333f..0c81b0a32f 100644 --- a/objects/22343.txt +++ b/objects/22343.txt @@ -19,7 +19,7 @@ floorHugging=0 foodValue=0 speedMult=1.000000 containOffset=0,-3 -heldOffset=0.000000,-4.000000 +heldOffset=-4.000000,-4.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/22344.txt b/objects/22344.txt index b332088d3d..58c35262b0 100644 --- a/objects/22344.txt +++ b/objects/22344.txt @@ -19,7 +19,7 @@ floorHugging=0 foodValue=0 speedMult=1.000000 containOffset=0,-3 -heldOffset=4.000000,-4.000000 +heldOffset=-4.000000,-4.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 From c82e8846723e6984ddd6bd84367d6db5835d6861 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Thu, 25 Apr 2024 08:41:14 +0200 Subject: [PATCH 22/29] Add last use shears transition --- transitions/22349_-1_LA.txt | 1 + transitions/22350_-1_LA.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 transitions/22349_-1_LA.txt create mode 100644 transitions/22350_-1_LA.txt diff --git a/transitions/22349_-1_LA.txt b/transitions/22349_-1_LA.txt new file mode 100644 index 0000000000..677303f10b --- /dev/null +++ b/transitions/22349_-1_LA.txt @@ -0,0 +1 @@ +862 22337 0 0.000000 0.000000 0 0 0 1 0 0 \ No newline at end of file diff --git a/transitions/22350_-1_LA.txt b/transitions/22350_-1_LA.txt new file mode 100644 index 0000000000..a5a1af6b03 --- /dev/null +++ b/transitions/22350_-1_LA.txt @@ -0,0 +1 @@ +862 22343 0 0.000000 0.000000 0 0 0 1 0 0 \ No newline at end of file From 4e21d8ba93e854ac4e253c8aa8a18abd98d2f23f Mon Sep 17 00:00:00 2001 From: SenMooo Date: Thu, 25 Apr 2024 08:43:03 +0200 Subject: [PATCH 23/29] Removed leftover bay tree sprite from "Willow Tree in Tree Pit" object --- objects/22355.txt | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/objects/22355.txt b/objects/22355.txt index 3e741b269f..38c4841833 100644 --- a/objects/22355.txt +++ b/objects/22355.txt @@ -29,7 +29,7 @@ creationSoundForce=0 numSlots=0#timeStretch=1.000000 slotSize=1.000000 slotsLocked=0 -numSprites=7 +numSprites=6 spriteID=100408 pos=0.000000,15.000000 rot=0.000000 @@ -39,15 +39,6 @@ ageRange=-1.000000,-1.000000 parent=-1 invisHolding=0,invisWorn=0,behindSlots=0 invisCont=0 -spriteID=110373 -pos=5.000000,225.000000 -rot=0.000000 -hFlip=0 -color=1.000000,1.000000,1.000000 -ageRange=-1.000000,-1.000000 -parent=-1 -invisHolding=0,invisWorn=0,behindSlots=0 -invisCont=0 spriteID=873 pos=-60.000000,293.000000 rot=0.000000 @@ -63,7 +54,7 @@ rot=0.000000 hFlip=0 color=1.000000,1.000000,1.000000 ageRange=-1.000000,-1.000000 -parent=2 +parent=1 invisHolding=0,invisWorn=0,behindSlots=0 invisCont=0 spriteID=876 @@ -72,7 +63,7 @@ rot=0.000000 hFlip=0 color=1.000000,1.000000,1.000000 ageRange=-1.000000,-1.000000 -parent=6 +parent=5 invisHolding=0,invisWorn=0,behindSlots=0 invisCont=0 spriteID=111300 @@ -90,10 +81,10 @@ rot=0.000000 hFlip=0 color=1.000000,1.000000,1.000000 ageRange=-1.000000,-1.000000 -parent=3 +parent=2 invisHolding=0,invisWorn=0,behindSlots=0 invisCont=0 -spritesDrawnBehind=0,5 +spritesDrawnBehind=0,4 headIndex=-1 bodyIndex=-1 backFootIndex=-1 From a5b976ef8c7269fe3f9187af6d84f792335a416e Mon Sep 17 00:00:00 2001 From: SenMooo Date: Thu, 25 Apr 2024 09:06:34 +0200 Subject: [PATCH 24/29] Fix willow and rooting willow held positioning --- objects/22343.txt | 2 +- objects/22344.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/objects/22343.txt b/objects/22343.txt index 0c81b0a32f..b4401bbd30 100644 --- a/objects/22343.txt +++ b/objects/22343.txt @@ -19,7 +19,7 @@ floorHugging=0 foodValue=0 speedMult=1.000000 containOffset=0,-3 -heldOffset=-4.000000,-4.000000 +heldOffset=-4.000000,-3.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 diff --git a/objects/22344.txt b/objects/22344.txt index 58c35262b0..9cb099f7aa 100644 --- a/objects/22344.txt +++ b/objects/22344.txt @@ -19,7 +19,7 @@ floorHugging=0 foodValue=0 speedMult=1.000000 containOffset=0,-3 -heldOffset=-4.000000,-4.000000 +heldOffset=-4.000000,-3.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 From ce6bf84cc84ca462adb01a60c162f54d7787cbc1 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Thu, 25 Apr 2024 13:26:51 +0200 Subject: [PATCH 25/29] Remove individual last use transitions (category works) --- transitions/22349_-1_LA.txt | 1 - transitions/22350_-1_LA.txt | 1 - 2 files changed, 2 deletions(-) delete mode 100644 transitions/22349_-1_LA.txt delete mode 100644 transitions/22350_-1_LA.txt diff --git a/transitions/22349_-1_LA.txt b/transitions/22349_-1_LA.txt deleted file mode 100644 index 677303f10b..0000000000 --- a/transitions/22349_-1_LA.txt +++ /dev/null @@ -1 +0,0 @@ -862 22337 0 0.000000 0.000000 0 0 0 1 0 0 \ No newline at end of file diff --git a/transitions/22350_-1_LA.txt b/transitions/22350_-1_LA.txt deleted file mode 100644 index a5a1af6b03..0000000000 --- a/transitions/22350_-1_LA.txt +++ /dev/null @@ -1 +0,0 @@ -862 22343 0 0.000000 0.000000 0 0 0 1 0 0 \ No newline at end of file From bddfff261d8de6d27e249831aaffd5dc411cfbf6 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Thu, 25 Apr 2024 13:27:38 +0200 Subject: [PATCH 26/29] Fix held position of bald cypress cuttings --- objects/22337.txt | 4 ++-- objects/22338.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/objects/22337.txt b/objects/22337.txt index ec3ef76a38..2f91526d6f 100644 --- a/objects/22337.txt +++ b/objects/22337.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=4.000000,-4.000000 +heldOffset=0.000000,-4.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 @@ -32,7 +32,7 @@ slotsLocked=0 numSprites=1 spriteID=119980 pos=-1.000000,-33.000000 -rot=0.255000 +rot=0.250000 hFlip=0 color=1.000000,1.000000,1.000000 ageRange=-1.000000,-1.000000 diff --git a/objects/22338.txt b/objects/22338.txt index d25f665689..c2c972c521 100644 --- a/objects/22338.txt +++ b/objects/22338.txt @@ -18,7 +18,7 @@ floor=0 floorHugging=0 foodValue=0 speedMult=1.000000 -heldOffset=4.000000,-4.000000 +heldOffset=0.000000,-4.000000 clothing=n clothingOffset=0.000000,0.000000 deadlyDistance=0 From 42961fbf07aebe4ed3bdddbe66fa40c071a39139 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Thu, 25 Apr 2024 17:55:31 +0200 Subject: [PATCH 27/29] Add bald cypress tree in pit and related objects --- objects/22364.txt | 122 ++++++++++++++++++++++++++++++++++++++++++++++ objects/22365.txt | 113 ++++++++++++++++++++++++++++++++++++++++++ objects/22366.txt | 104 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 339 insertions(+) create mode 100644 objects/22364.txt create mode 100644 objects/22365.txt create mode 100644 objects/22366.txt diff --git a/objects/22364.txt b/objects/22364.txt new file mode 100644 index 0000000000..9cca106ae7 --- /dev/null +++ b/objects/22364.txt @@ -0,0 +1,122 @@ +id=22364 +Bald Cypress in Tree Pit +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=0 +blocksWalking=1,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_6 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.000000 +clothing=n +clothingOffset=0.000000,0.000000 +deadlyDistance=0 +useDistance=1 +sounds=78:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=9 +spriteID=100408 +pos=0.000000,15.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=111300 +pos=2.000000,16.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=903 +pos=-2.000000,23.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=8 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=111306 +pos=0.000000,12.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=898 +pos=10.000000,435.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=899 +pos=-2.000000,399.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=4 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=900 +pos=-8.000000,345.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=5 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=901 +pos=-12.000000,259.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=6 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=902 +pos=-12.000000,141.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=7 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spritesDrawnBehind=0,1,3 +headIndex=-1 +bodyIndex=-1 +backFootIndex=-1 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=452 \ No newline at end of file diff --git a/objects/22365.txt b/objects/22365.txt new file mode 100644 index 0000000000..6f8ead7066 --- /dev/null +++ b/objects/22365.txt @@ -0,0 +1,113 @@ +id=22365 +Bald Cypress Tree with Small Cut Stones +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=0 +blocksWalking=1,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_6 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.000000 +clothing=n +clothingOffset=0.000000,0.000000 +deadlyDistance=0 +useDistance=1 +sounds=45:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=8 +spriteID=101435 +pos=0.000000,20.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=898 +pos=10.000000,435.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=899 +pos=-2.000000,399.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=900 +pos=-8.000000,345.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=2 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=901 +pos=-12.000000,259.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=3 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=902 +pos=-12.000000,141.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=4 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=903 +pos=-2.000000,23.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=5 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=100520 +pos=30.000000,-10.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spritesDrawnBehind=0 +headIndex=-1 +bodyIndex=-1 +backFootIndex=-1 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=452 \ No newline at end of file diff --git a/objects/22366.txt b/objects/22366.txt new file mode 100644 index 0000000000..3149f6251a --- /dev/null +++ b/objects/22366.txt @@ -0,0 +1,104 @@ +id=22366 +Staked Bald Cypress Tree +containable=0 +containSize=1.000000,vertSlotRot=0.000000 +permanent=1,minPickupAge=3 +noFlip=0 +sideAccess=0 +heldInHand=0 +blocksWalking=1,leftBlockingRadius=0,rightBlockingRadius=0,drawBehindPlayer=0 +mapChance=0.000000#biomes_6 +heatValue=0 +rValue=0.000000 +person=0,noSpawn=0 +male=0 +deathMarker=0 +homeMarker=0 +floor=0 +floorHugging=0 +foodValue=0 +speedMult=1.000000 +heldOffset=0.000000,0.000000 +clothing=n +clothingOffset=0.000000,0.000000 +deadlyDistance=0 +useDistance=1 +sounds=69:0.250000,-1:0.0,-1:0.0,-1:0.0 +creationSoundInitialOnly=0 +creationSoundForce=0 +numSlots=0#timeStretch=1.000000 +slotSize=1.000000 +slotsLocked=0 +numSprites=7 +spriteID=111308 +pos=0.000000,0.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=898 +pos=10.000000,435.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=-1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=899 +pos=-2.000000,399.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=1 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=900 +pos=-8.000000,345.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=2 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=901 +pos=-12.000000,259.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=3 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=902 +pos=-12.000000,141.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=4 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spriteID=903 +pos=-2.000000,23.000000 +rot=0.000000 +hFlip=0 +color=1.000000,1.000000,1.000000 +ageRange=-1.000000,-1.000000 +parent=5 +invisHolding=0,invisWorn=0,behindSlots=0 +invisCont=0 +spritesDrawnBehind=0 +headIndex=-1 +bodyIndex=-1 +backFootIndex=-1 +frontFootIndex=-1 +numUses=1,1.000000 +useVanishIndex=-1 +useAppearIndex=-1 +pixHeight=452 \ No newline at end of file From db19b7ae78848f77cf6a1ebeb1602bc95237ce74 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Thu, 25 Apr 2024 18:03:21 +0200 Subject: [PATCH 28/29] Add bald cypress to pit categories --- categories/13146.txt | 5 +++-- categories/13147.txt | 5 +++-- categories/13148.txt | 5 +++-- categories/13185.txt | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/categories/13146.txt b/categories/13146.txt index 96d5244f55..ebd56307e5 100644 --- a/categories/13146.txt +++ b/categories/13146.txt @@ -1,6 +1,6 @@ parentID=13146 pattern -numObjects=37 +numObjects=38 13110 13111 13112 @@ -37,4 +37,5 @@ numObjects=37 13143 13144 13145 -22356 \ No newline at end of file +22356 +22366 \ No newline at end of file diff --git a/categories/13147.txt b/categories/13147.txt index d7b57b4014..10a2f66900 100644 --- a/categories/13147.txt +++ b/categories/13147.txt @@ -1,6 +1,6 @@ parentID=13147 pattern -numObjects=37 +numObjects=38 48 45 99 @@ -37,4 +37,5 @@ numObjects=37 9156 9158 10480 -527 \ No newline at end of file +527 +530 \ No newline at end of file diff --git a/categories/13148.txt b/categories/13148.txt index a299837528..3dde440285 100644 --- a/categories/13148.txt +++ b/categories/13148.txt @@ -1,6 +1,6 @@ parentID=13148 pattern -numObjects=37 +numObjects=38 13074 13075 13076 @@ -37,4 +37,5 @@ numObjects=37 13107 13108 13109 -22355 \ No newline at end of file +22355 +22364 \ No newline at end of file diff --git a/categories/13185.txt b/categories/13185.txt index 0bf0f915c7..da71529dfd 100644 --- a/categories/13185.txt +++ b/categories/13185.txt @@ -1,6 +1,6 @@ parentID=13185 pattern -numObjects=37 +numObjects=38 13149 13150 13151 @@ -37,4 +37,5 @@ numObjects=37 13182 13183 13184 -22357 \ No newline at end of file +22357 +22365 \ No newline at end of file From 1a02b716e9839d4e72b600771b93e57f2b8f63a9 Mon Sep 17 00:00:00 2001 From: SenMooo Date: Fri, 26 Apr 2024 08:28:28 +0200 Subject: [PATCH 29/29] Delete old wrong sprites --- sprites/119967.tga | Bin 8210 -> 0 bytes sprites/119967.txt | 1 - sprites/119969.tga | Bin 32786 -> 0 bytes sprites/119969.txt | 1 - sprites/119970.tga | Bin 8210 -> 0 bytes sprites/119970.txt | 1 - sprites/119972.tga | Bin 32786 -> 0 bytes sprites/119972.txt | 1 - 8 files changed, 4 deletions(-) delete mode 100644 sprites/119967.tga delete mode 100644 sprites/119967.txt delete mode 100644 sprites/119969.tga delete mode 100644 sprites/119969.txt delete mode 100644 sprites/119970.tga delete mode 100644 sprites/119970.txt delete mode 100644 sprites/119972.tga delete mode 100644 sprites/119972.txt diff --git a/sprites/119967.tga b/sprites/119967.tga deleted file mode 100644 index d4920e20e924548f0fce46ac4a5cb0c1da21dabf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8210 zcmeH~O^8-i7{~97ujA`SS>xwe>MM7pNfStISyUzdd9^t1b4&x@Dn6B3roN?*Ms@7M(VWx##tNcE&|WE99F<8 zI1TDvD4zD;1^qJ)^T8a{X~xU*hOTxz>q;1gH3gGA)tiDn@O3f%o~M2q2XmyYs?D?O zuQ@h;+VH&U-U_$DMtBF*mQ64M$BOY8p6<~HV`dFhZRWfU#!YSGyc&Ll(EFv-KTdxF z?t;C={9imf;9l#~dr-A`zdXD3b0esI4${c@SQ;7{3LoNmFYmU(C_LmkxC9+g-@KW} zs?A#U-dH~!I07kKy*y=yA5M$btV->6JG8&z-9gv}V{icCo!Vj!>gbz$YhAxR`{$6d z-J>ac?^tThpO;##RvKKkG;}`T{SMdyhx4^vA41=6gWrm(E%e>z|7YJoXyw}d{r%l> zdsfW9${K6nnbO+OH;2Zv52`fvt$X*~0)Ig0oGDsekFaWt8e~|zj?bE z{si@3DW3NI)||}8>xUi7J7b2UKfHnGzTxhMF_3e=>MLNADoD}QO2%|@#FN3q4(eVtE%t1 z*e zml#`fDSKj9%-zm-XFk{UVGn&{I0%0K>gZd8kppx18Kms(=R#{g<4^Lr`^RE#9pgvx zxvu_`^sQsh;rG0%K1=hz7xdX27{d=CWiLM#S{oR@kN0SZw$0GmF?Ra zXWPbj1*Dlv2Aw+t{?0A{e>c^2f8d>}qwiY31KRQKc$a_eyK`OWZ)fcH;T$;kDHtm; zZ|b^V)He2Y_1&i(?TIz`Gh71wv9`Vd_07A!ig!m{HG?|ZY|EQ_wWAN(d={p_T(1Xx zItl8VcXKS|^Qzm6Hrw)j;e&pt;WtNpeUeAvONev&>{XAgm$mRep6Y)GWxWx`@jjlH r8Jebv)7W`xnr!uAX0n$}&7LL#O$3?K# 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