Skip to content

Commit

Permalink
Merge pull request #167 from sidraba/hayArch
Browse files Browse the repository at this point in the history
Dead Flower Arch
  • Loading branch information
risvh authored Oct 11, 2024
2 parents 1a3d3e6 + 98ef3d2 commit ae7d6fa
Show file tree
Hide file tree
Showing 119 changed files with 1,749 additions and 20 deletions.
2 changes: 1 addition & 1 deletion objects/10174.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ clothing=n
clothingOffset=0.000000,0.000000
deadlyDistance=0
useDistance=1
sounds=301:0.250000,-1:0.0,-1:0.0,-1:0.0
sounds=601:0.225000,-1:0.0,-1:0.0,-1:0.0
creationSoundInitialOnly=0
creationSoundForce=0
numSlots=0#timeStretch=1.000000
Expand Down
2 changes: 1 addition & 1 deletion objects/10175.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ clothing=n
clothingOffset=0.000000,0.000000
deadlyDistance=0
useDistance=1
sounds=301:0.250000,-1:0.0,-1:0.0,-1:0.0
sounds=601:0.225000,-1:0.0,-1:0.0,-1:0.0
creationSoundInitialOnly=0
creationSoundForce=0
numSlots=0#timeStretch=1.000000
Expand Down
2 changes: 1 addition & 1 deletion objects/10176.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ clothing=n
clothingOffset=0.000000,0.000000
deadlyDistance=0
useDistance=1
sounds=301:0.250000,-1:0.0,-1:0.0,-1:0.0
sounds=601:0.225000,-1:0.0,-1:0.0,-1:0.0
creationSoundInitialOnly=0
creationSoundForce=0
numSlots=0#timeStretch=1.000000
Expand Down
2 changes: 1 addition & 1 deletion objects/10177.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ clothing=n
clothingOffset=0.000000,0.000000
deadlyDistance=0
useDistance=1
sounds=301:0.250000,-1:0.0,-1:0.0,-1:0.0
sounds=601:0.225000,-1:0.0,-1:0.0,-1:0.0
creationSoundInitialOnly=0
creationSoundForce=0
numSlots=0#timeStretch=1.000000
Expand Down
2 changes: 1 addition & 1 deletion objects/10178.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ clothing=n
clothingOffset=0.000000,0.000000
deadlyDistance=0
useDistance=1
sounds=301:0.250000,-1:0.0,-1:0.0,-1:0.0
sounds=601:0.225000,-1:0.0,-1:0.0,-1:0.0
creationSoundInitialOnly=0
creationSoundForce=0
numSlots=0#timeStretch=1.000000
Expand Down
2 changes: 1 addition & 1 deletion objects/10179.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ clothing=n
clothingOffset=0.000000,0.000000
deadlyDistance=0
useDistance=1
sounds=301:0.250000,-1:0.0,-1:0.0,-1:0.0
sounds=601:0.225000,-1:0.0,-1:0.0,-1:0.0
creationSoundInitialOnly=0
creationSoundForce=0
numSlots=0#timeStretch=1.000000
Expand Down
2 changes: 1 addition & 1 deletion objects/10180.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ clothing=n
clothingOffset=0.000000,0.000000
deadlyDistance=0
useDistance=1
sounds=301:0.250000,-1:0.0,-1:0.0,-1:0.0
sounds=601:0.225000,-1:0.0,-1:0.0,-1:0.0
creationSoundInitialOnly=0
creationSoundForce=0
numSlots=0#timeStretch=1.000000
Expand Down
2 changes: 1 addition & 1 deletion objects/10181.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ clothing=n
clothingOffset=0.000000,0.000000
deadlyDistance=0
useDistance=1
sounds=301:0.250000,-1:0.0,-1:0.0,-1:0.0
sounds=601:0.225000,-1:0.0,-1:0.0,-1:0.0
creationSoundInitialOnly=0
creationSoundForce=0
numSlots=0#timeStretch=1.000000
Expand Down
2 changes: 1 addition & 1 deletion objects/10182.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ clothing=n
clothingOffset=0.000000,0.000000
deadlyDistance=0
useDistance=1
sounds=301:0.250000,-1:0.0,-1:0.0,-1:0.0
sounds=601:0.225000,-1:0.0,-1:0.0,-1:0.0
creationSoundInitialOnly=0
creationSoundForce=0
numSlots=0#timeStretch=1.000000
Expand Down
2 changes: 1 addition & 1 deletion objects/10183.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ clothing=n
clothingOffset=0.000000,0.000000
deadlyDistance=0
useDistance=1
sounds=301:0.250000,-1:0.0,-1:0.0,-1:0.0
sounds=601:0.225000,-1:0.0,-1:0.0,-1:0.0
creationSoundInitialOnly=0
creationSoundForce=0
numSlots=0#timeStretch=1.000000
Expand Down
2 changes: 1 addition & 1 deletion objects/10187.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ clothing=n
clothingOffset=0.000000,0.000000
deadlyDistance=0
useDistance=1
sounds=301:0.250000,-1:0.0,-1:0.0,-1:0.0
sounds=601:0.225000,-1:0.0,-1:0.0,-1:0.0
creationSoundInitialOnly=0
creationSoundForce=0
numSlots=0#timeStretch=1.000000
Expand Down
2 changes: 1 addition & 1 deletion objects/10189.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ clothing=n
clothingOffset=0.000000,0.000000
deadlyDistance=0
useDistance=1
sounds=301:0.250000,-1:0.0,-1:0.0,-1:0.0
sounds=601:0.225000,-1:0.0,-1:0.0,-1:0.0
creationSoundInitialOnly=0
creationSoundForce=0
numSlots=0#timeStretch=1.000000
Expand Down
4 changes: 2 additions & 2 deletions objects/10192.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ clothing=n
clothingOffset=0.000000,0.000000
deadlyDistance=0
useDistance=1
sounds=301:0.250000,-1:0.0,-1:0.0,-1:0.0
sounds=601:0.225000,-1:0.0,-1:0.0,-1:0.0
creationSoundInitialOnly=0
creationSoundForce=0
numSlots=0#timeStretch=1.000000
Expand Down Expand Up @@ -55,4 +55,4 @@ frontFootIndex=-1
numUses=1,1.000000
useVanishIndex=-1
useAppearIndex=-1
pixHeight=40
pixHeight=41
3 changes: 1 addition & 2 deletions objects/13230.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
id=13230
Wooden Wall Arch Structure with Boards
(outdated) Wooden Wall Arch Structure with Boards
containable=0
containSize=1.000000,vertSlotRot=0.000000
permanent=1,minPickupAge=3
Expand Down Expand Up @@ -29,7 +29,6 @@ creationSoundInitialOnly=1
creationSoundForce=0
numSlots=0#timeStretch=1.000000
slotSize=1.000000
slotStyle=0
slotsLocked=0
numSprites=12
spriteID=939
Expand Down
6 changes: 5 additions & 1 deletion objects/2215.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ clothingOffset=0.000000,0.000000
deadlyDistance=0
useDistance=1
sounds=34:0.250000,-1:0.0,-1:0.0,-1:0.0
creationSoundInitialOnly=0
creationSoundInitialOnly=1
creationSoundForce=0
numSlots=0#timeStretch=1.000000
slotSize=1.000000
Expand All @@ -38,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
spriteID=319
pos=-30.000000,-28.000000
rot=0.000000
Expand All @@ -46,6 +47,7 @@ color=1.000000,1.000000,1.000000
ageRange=-1.000000,-1.000000
parent=-1
invisHolding=0,invisWorn=0,behindSlots=0
invisCont=0
spriteID=259
pos=-18.000000,-23.000000
rot=0.000000
Expand All @@ -54,6 +56,7 @@ color=1.000000,1.000000,1.000000
ageRange=-1.000000,-1.000000
parent=-1
invisHolding=0,invisWorn=0,behindSlots=0
invisCont=0
spriteID=259
pos=-9.000000,-28.000000
rot=0.000000
Expand All @@ -62,6 +65,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
50 changes: 50 additions & 0 deletions objects/24827.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
id=24827
Branch Arch
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.900000
person=0,noSpawn=0
male=0
deathMarker=0
homeMarker=0
floor=0
floorHugging=1
wallLayer=1
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=1
creationSoundForce=0
numSlots=0#timeStretch=1.000000
slotSize=1.000000
slotsLocked=0
numSprites=1
spriteID=124454
pos=44.000000,67.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=123
60 changes: 60 additions & 0 deletions objects/24828.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
id=24828
Branch Arch #vertical
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.900000
person=0,noSpawn=0
male=0
deathMarker=0
homeMarker=0
floor=0
floorHugging=1
wallLayer=1
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=1
creationSoundForce=0
numSlots=0#timeStretch=1.000000
slotSize=1.000000
slotsLocked=0
numSprites=2
spriteID=124456
pos=-64.000000,121.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=124455
pos=-1.000000,19.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=147
Loading

0 comments on commit ae7d6fa

Please sign in to comment.