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.

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

Update of Sandstone Windows, Introducing Sandstone Windowsills, and Arches #157

Closed

Conversation

sidraba
Copy link
Contributor

@sidraba sidraba commented May 11, 2024

This pull request brings several additions to our walls: sandstone window rework, sandstone windowsills for both ancient and regular walls, and sandstone arches, including normal and left and right sideway arches.

Summary of Changes

New Window Sprites: I've replaced the old sandstone window sprites with updated versions that are nicer and will probably be used more in builds.
Windowsills: Added sandstone windowsills for both ancient and regular walls, as sandstone windows did not look good with standard windowsills, I used new art from anafae to blend in sandstone wall better. Sandstone windowsills are made of sandstone and only has one slot due to size. And yes, both ancient and normal sandstone windowsills can hold calico cat.
Arches: Introduced sandstone arches, including normal and left and right sideway variants.

all art by amazing anafae

screen00052

Copy link
Contributor

Objects:

+ 24158 Sandstone Wall with Windowsill# +noBackAccess +useOnContained
+ 24159 Sandstone Wall with Window and Cut Sandstone
+ 24160 Sandstone Arch
+ 24161 Sandstone Arch #leftSide
+ 24162 Sandstone Arch #rightSide
+ 24166 Sandstone Wall with Windowsill #catLayingBall +noBackAccess
+ 24167 Sandstone Wall with Windowsill #catSittingBall +noBackAccess
+ 24168 @ Potential wall with Windowsill and Cat
+ 24169 Sandstone Wall with Windowsill #catLaying +noBackAccess
+ 24170 Sandstone Wall with Windowsill #catSitting +noBackAccess
+ 24171 Ancient Sandstone Wall with Windowsill# +noBackAccess +useOnContained
+ 24172 Ancient Sandstone Wall with Window and Cut Sandstone
+ 24173 Ancient Sandstone Wall with Windowsill #catSitting +noBackAccess
+ 24174 Ancient Sandstone Wall with Windowsill #catSittingBall +noBackAccess
+ 24175 Ancient Sandstone Wall with Windowsill #catLaying +noBackAccess
+ 24176 Ancient Sandstone Wall with Windowsill #catLayingBall +noBackAccess
. 7696 Ancient Sandstone Wall with Window
. 8024 Sandstone Wall with Window

Categories:

. 11107 @ +contTable

Details
+ 24158 Sandstone Wall with Windowsill# +noBackAccess +useOnContained

. 14121 @ +contTableExceptionsPot

Details
+ 24158 Sandstone Wall with Windowsill# +noBackAccess +useOnContained

. 14947 @ Cat on Windowsill - laying

Details
+ 24169 Sandstone Wall with Windowsill #catLaying +noBackAccess
+ 24175 Ancient Sandstone Wall with Windowsill #catLaying +noBackAccess

. 14948 @ Cat on Windowsill - sitting

Details
+ 24170 Sandstone Wall with Windowsill #catSitting +noBackAccess
+ 24173 Ancient Sandstone Wall with Windowsill #catSitting +noBackAccess

. 14971 @ Cat on Windowsill with Ball - sitting

Details
+ 24167 Sandstone Wall with Windowsill #catSittingBall +noBackAccess
+ 24174 Ancient Sandstone Wall with Windowsill #catSittingBall +noBackAccess

. 14972 @ Cat on Windowsill with Ball - laying

Details
+ 24166 Sandstone Wall with Windowsill #catLayingBall +noBackAccess
+ 24176 Ancient Sandstone Wall with Windowsill #catLayingBall +noBackAccess

+ 24168 @ Potential wall with Windowsill and Cat

Details
+ 14819 Brick Wall with Windowsill# +noBackAccess +useOnContained
+ 14828 Ancient Brick Wall with Windowsill# +noBackAccess +useOnContained
+ 14829 Wooden Wall with Windowsill# +noBackAccess +useOnContained
+ 14834 Dark Wooden Wall with Windowsill# +noBackAccess +useOnContained
+ 14837 Light Wooden Wall with Windowsill +noBackAccess +useOnContained
+ 24158 Sandstone Wall with Windowsill# +noBackAccess +useOnContained
+ 24171 Ancient Sandstone Wall with Windowsill# +noBackAccess +useOnContained

Transitions:

. 0 + 14947 = 10664 + 24168

0 + @ Cat on Windowsill - laying = Calico Cat #held + @ Potential wall with Windowsill and Cat
a: 0
b: 14947
c: 10664
d: 24168
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

- 0 + 14948 = 10664 + 14823

0 + @ Cat on Windowsill - sitting = Calico Cat #held + @ Wall with Windowsill
a: 0
b: 14948
c: 10664
d: 14823
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 0 + 24159 = 10131 + 8024

0 + Sandstone Wall with Window and Cut Sandstone = Small Cut Sandstone + Sandstone Wall with Window
a: 0
b: 24159
c: 10131
d: 8024
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 1
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 0 + 24172 = 10131 + 7696

0 + Ancient Sandstone Wall with Window and Cut Sandstone = Small Cut Sandstone + Ancient Sandstone Wall with Window
a: 0
b: 24172
c: 10131
d: 7696
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 1
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 10131 + 13196 = 107 + 24161

Small Cut Sandstone + North-South Arch Stakes = Stakes + Sandstone Arch #leftSide
a: 10131
b: 13196
c: 107
d: 24161
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 10131 + 13197 = 107 + 24160

Small Cut Sandstone + East-West Arch Stakes = Stakes + Sandstone Arch
a: 10131
b: 13197
c: 107
d: 24160
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 10131 + 7696 = 0 + 24171

Small Cut Sandstone + Ancient Sandstone Wall with Window = 0 + Ancient Sandstone Wall with Windowsill# +noBackAccess +useOnContained
a: 10131
b: 7696
c: 0
d: 24171
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 10131 + 8024 = 0 + 24158

Small Cut Sandstone + Sandstone Wall with Window = 0 + Sandstone Wall with Windowsill# +noBackAccess +useOnContained
a: 10131
b: 8024
c: 0
d: 24158
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 10132 + 13196 = 6861 + 24161

Basket of Small Cut Sandstone + North-South Arch Stakes = Basket with Stakes + Sandstone Arch #leftSide
a: 10132
b: 13196
c: 6861
d: 24161
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 10132 + 13197 = 6861 + 24160

Basket of Small Cut Sandstone + East-West Arch Stakes = Basket with Stakes + Sandstone Arch
a: 10132
b: 13197
c: 6861
d: 24160
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 1
move: 0
desiredMoveDist: 1
noUseActorFlag: 1
noUseTargetFlag: 0

+ 10132 + 8024 = 292 + 24158

Basket of Small Cut Sandstone + Sandstone Wall with Window = Basket + Sandstone Wall with Windowsill# +noBackAccess +useOnContained
a: 10132
b: 8024
c: 292
d: 24158
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

- 10664 + 14823 = 0 + 14948

Calico Cat #held + @ Wall with Windowsill = 0 + @ Cat on Windowsill - sitting
a: 10664
b: 14823
c: 0
d: 14948
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 10664 + 24168 = 0 + 14948

Calico Cat #held + @ Potential wall with Windowsill and Cat = 0 + @ Cat on Windowsill - sitting
a: 10664
b: 24168
c: 0
d: 14948
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 467 + 24161 = 467 + 24162

Mallet + Sandstone Arch #leftSide = Mallet + Sandstone Arch #rightSide
a: 467
b: 24161
c: 467
d: 24162
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 467 + 24162 = 467 + 24161

Mallet + Sandstone Arch #rightSide = Mallet + Sandstone Arch #leftSide
a: 467
b: 24162
c: 467
d: 24161
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 684 + 24158 = 684 + 24159

Steel Mining Pick + Sandstone Wall with Windowsill# +noBackAccess +useOnContained = Steel Mining Pick + Sandstone Wall with Window and Cut Sandstone
a: 684
b: 24158
c: 684
d: 24159
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 684 + 24160 = 684 + 10133

Steel Mining Pick + Sandstone Arch = Steel Mining Pick + Small Cut Sandstone #just dumped
a: 684
b: 24160
c: 684
d: 10133
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 684 + 24161 = 684 + 10133

Steel Mining Pick + Sandstone Arch #leftSide = Steel Mining Pick + Small Cut Sandstone #just dumped
a: 684
b: 24161
c: 684
d: 10133
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 684 + 24162 = 684 + 10133

Steel Mining Pick + Sandstone Arch #rightSide = Steel Mining Pick + Small Cut Sandstone #just dumped
a: 684
b: 24162
c: 684
d: 10133
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

+ 684 + 24171 = 684 + 24172

Steel Mining Pick + Ancient Sandstone Wall with Windowsill# +noBackAccess +useOnContained = Steel Mining Pick + Ancient Sandstone Wall with Window and Cut Sandstone
a: 684
b: 24171
c: 684
d: 24172
flag: 
autoDecaySeconds: 0
actorMinUseFraction: 0.000000
targetMinUseFraction: 0.000000
reverseUseActorFlag: 0
reverseUseTargetFlag: 0
move: 0
desiredMoveDist: 1
noUseActorFlag: 0
noUseTargetFlag: 0

Others:

+ link animations/24166_0.txt
+ link animations/24166_1.txt
+ link animations/24166_2.txt
+ link animations/24166_4.txt
+ link animations/24166_5.txt
+ link animations/24166_6.txt
+ link animations/24166_7.txt
+ link animations/24167_0.txt
+ link animations/24167_1.txt
+ link animations/24167_2.txt
+ link animations/24167_4.txt
+ link animations/24167_5.txt
+ link animations/24167_6.txt
+ link animations/24167_7.txt
+ link animations/24169_0.txt
+ link animations/24169_1.txt
+ link animations/24169_2.txt
+ link animations/24169_4.txt
+ link animations/24169_5.txt
+ link animations/24169_6.txt
+ link animations/24169_7.txt
+ link animations/24170_0.txt
+ link animations/24170_1.txt
+ link animations/24170_2.txt
+ link animations/24170_4.txt
+ link animations/24170_5.txt
+ link animations/24170_6.txt
+ link animations/24170_7.txt
+ link animations/24173_0.txt
+ link animations/24173_1.txt
+ link animations/24173_2.txt
+ link animations/24173_4.txt
+ link animations/24173_5.txt
+ link animations/24173_6.txt
+ link animations/24173_7.txt
+ link animations/24174_0.txt
+ link animations/24174_1.txt
+ link animations/24174_2.txt
+ link animations/24174_4.txt
+ link animations/24174_5.txt
+ link animations/24174_6.txt
+ link animations/24174_7.txt
+ link animations/24175_0.txt
+ link animations/24175_1.txt
+ link animations/24175_2.txt
+ link animations/24175_4.txt
+ link animations/24175_5.txt
+ link animations/24175_6.txt
+ link animations/24175_7.txt
+ link animations/24176_0.txt
+ link animations/24176_1.txt
+ link animations/24176_2.txt
+ link animations/24176_4.txt
+ link animations/24176_5.txt
+ link animations/24176_6.txt
+ link animations/24176_7.txt
+ link sprites/121472.tga
+ link sprites/121472.txt
+ link sprites/121482.tga
+ link sprites/121482.txt
+ link sprites/121486.tga
+ link sprites/121486.txt
+ link sprites/121487.tga
+ link sprites/121487.txt
+ link sprites/121488.tga
+ link sprites/121488.txt

Copy link
Member

@connorhsm connorhsm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please squash your commits now that dev work is complete. I would suggest commits:

  • Update Sandstone windows
  • Add Sandstone windowsills and arches

@connorhsm connorhsm requested a review from risvh May 14, 2024 13:47
Add Sandstone windowsills and arches
@zabala6
Copy link
Contributor

zabala6 commented May 18, 2024

Tested locally and i didn't find any inconsistency. Good job!

@risvh
Copy link
Contributor

risvh commented Jul 20, 2024

Thank you! I have cherry-picked and made some changes. Asked anafae's help to polish the texture of the arches. And chose the normal wooden windowsill over a new sandstone one. I think the difference in the looks is not big enough to warrant having the sandstone wall windowsill different than other windowsills.

@risvh risvh closed this Jul 20, 2024
@sidraba sidraba deleted the upgradeSandstoneWindows branch August 15, 2024 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants