Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ability to plant swamp trees. #140

Closed
wants to merge 31 commits into from
Closed

Add ability to plant swamp trees. #140

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
12a129c
Swamp saplings sprite import
SenMooo Apr 23, 2024
d6683cf
Bald cypress object creation
SenMooo Apr 24, 2024
c7d8f9b
Willow object creation
SenMooo Apr 24, 2024
3cf000f
Shears with cutting object creation
SenMooo Apr 24, 2024
20209dc
Cutting and shears with cutting categories
SenMooo Apr 24, 2024
d8455b3
Rooting and dry planting and decay
SenMooo Apr 24, 2024
ec8aeef
Add to wet sapling cutting category
SenMooo Apr 24, 2024
75c7619
Create perhaps sprayed category objects
SenMooo Apr 24, 2024
7bfdf0b
Add to perhaps sprayed categories
SenMooo Apr 24, 2024
24a268e
Perhaps sprayed transitions
SenMooo Apr 24, 2024
ce32ac9
Add to dry maple sapling category for growth transition
SenMooo Apr 24, 2024
754af47
Add probability set to perhaps sprayed categories
SenMooo Apr 24, 2024
fcb96f6
Add perhaps sprayed sapling transitions
SenMooo Apr 24, 2024
191a05d
Add to wet maple category
SenMooo Apr 24, 2024
74a6fe7
Full growth transitions
SenMooo Apr 24, 2024
be1b3b8
Add willow tree in tree pit objects
SenMooo Apr 24, 2024
b0e5080
Add willow tree to tree pit categories
SenMooo Apr 24, 2024
8726a3a
Fix sprite import by lowering the shadow value
SenMooo Apr 25, 2024
1fee3cc
Replace willow objects with the new sprites
SenMooo Apr 25, 2024
69eb591
Replace bald cypress objects with the new sprites
SenMooo Apr 25, 2024
670631c
Fix held position for rooting and willow cutting
SenMooo Apr 25, 2024
c82e884
Add last use shears transition
SenMooo Apr 25, 2024
4e21d8b
Removed leftover bay tree sprite from "Willow Tree in Tree Pit" object
SenMooo Apr 25, 2024
a5b976e
Fix willow and rooting willow held positioning
SenMooo Apr 25, 2024
ce6bf84
Remove individual last use transitions (category works)
SenMooo Apr 25, 2024
bddfff2
Fix held position of bald cypress cuttings
SenMooo Apr 25, 2024
42961fb
Add bald cypress tree in pit and related objects
SenMooo Apr 25, 2024
db19b7a
Add bald cypress to pit categories
SenMooo Apr 25, 2024
7857b87
Merge branch 'twohoursonelife:master' into swampTreesPlantable
SenMooo Apr 26, 2024
1a02b71
Delete old wrong sprites
SenMooo Apr 26, 2024
fcaeb85
Merge branch 'twohoursonelife:master' into swampTreesPlantable
SenMooo May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions categories/13146.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parentID=13146
pattern
numObjects=36
numObjects=37
13110
13111
13112
Expand Down Expand Up @@ -36,4 +36,5 @@ numObjects=36
13142
13143
13144
13145
13145
22356
5 changes: 3 additions & 2 deletions categories/13147.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parentID=13147
pattern
numObjects=36
numObjects=37
48
45
99
Expand Down Expand Up @@ -36,4 +36,5 @@ numObjects=36
9157
9156
9158
10480
10480
527
5 changes: 3 additions & 2 deletions categories/13148.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parentID=13148
pattern
numObjects=36
numObjects=37
13074
13075
13076
Expand Down Expand Up @@ -36,4 +36,5 @@ numObjects=36
13106
13107
13108
13109
13109
22355
5 changes: 3 additions & 2 deletions categories/13185.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parentID=13185
pattern
numObjects=36
numObjects=37
13149
13150
13151
Expand Down Expand Up @@ -36,4 +36,5 @@ numObjects=36
13181
13182
13183
13184
13184
22357
6 changes: 4 additions & 2 deletions categories/14034.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parentID=14034
pattern
numObjects=37
numObjects=39
8979
8099
7370
Expand Down Expand Up @@ -37,4 +37,6 @@ numObjects=37
10375
10383
10517
13210
13210
22350
22349
6 changes: 4 additions & 2 deletions categories/14035.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parentID=14035
pattern
numObjects=96
numObjects=98
7312
7702
7340
Expand Down Expand Up @@ -96,4 +96,6 @@ numObjects=96
9158
7049
7040
14029
14029
527
530
6 changes: 4 additions & 2 deletions categories/14038.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parentID=14038
pattern
numObjects=96
numObjects=98
7360
7360
7360
Expand Down Expand Up @@ -96,4 +96,6 @@ numObjects=96
10074
7047
7047
14773
14773
22350
22349
6 changes: 4 additions & 2 deletions categories/1790.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parentID=1790
pattern
numObjects=22
numObjects=24
1791
1799
1798
Expand All @@ -22,4 +22,6 @@ numObjects=22
7366
10073
10078
10519
10519
22345
22339
6 changes: 4 additions & 2 deletions categories/1792.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parentID=1792
pattern
numObjects=22
numObjects=24
1793
1801
1800
Expand All @@ -22,4 +22,6 @@ numObjects=22
7367
10072
10077
10520
10520
22346
22340
6 changes: 4 additions & 2 deletions categories/1794.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parentID=1794
pattern
numObjects=14
numObjects=16
1795
1796
1797
Expand All @@ -14,4 +14,6 @@ numObjects=14
8107
8108
8109
8110
8110
22343
22337
6 changes: 4 additions & 2 deletions categories/1802.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parentID=1802
pattern
numObjects=22
numObjects=24
1803
1804
1805
Expand All @@ -22,4 +22,6 @@ numObjects=22
7368
10070
10076
10522
10522
22347
22341
6 changes: 4 additions & 2 deletions categories/1806.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parentID=1806
pattern
numObjects=22
numObjects=24
1809
1808
1807
Expand All @@ -22,4 +22,6 @@ numObjects=22
7369
10071
10075
10523
10523
22348
22342
5 changes: 5 additions & 0 deletions categories/22351.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
parentID=22351
probSet
numObjects=2
22347 0.500000
22348 0.500000
5 changes: 5 additions & 0 deletions categories/22352.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
parentID=22352
probSet
numObjects=2
22345 0.500000
22346 0.500000
5 changes: 5 additions & 0 deletions categories/22353.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
parentID=22353
probSet
numObjects=2
22341 0.500000
22342 0.500000
5 changes: 5 additions & 0 deletions categories/22354.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
parentID=22354
probSet
numObjects=2
22339 0.500000
22340 0.500000
6 changes: 4 additions & 2 deletions categories/9041.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parentID=9041
pattern
numObjects=37
numObjects=39
8980
8107
7372
Expand Down Expand Up @@ -37,4 +37,6 @@ numObjects=37
10376
10384
10518
13211
13211
22343
22337
6 changes: 4 additions & 2 deletions categories/9042.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parentID=9042
pattern
numObjects=37
numObjects=39
9040
9018
9019
Expand Down Expand Up @@ -37,4 +37,6 @@ numObjects=37
10377
10385
10524
13212
13212
22344
22338
6 changes: 4 additions & 2 deletions categories/9043.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parentID=9043
pattern
numObjects=37
numObjects=39
8974
8079
7362
Expand Down Expand Up @@ -37,4 +37,6 @@ numObjects=37
10378
10386
10519
8880
8880
22345
22339
49 changes: 49 additions & 0 deletions objects/22337.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading