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

20318 (2) #181

Merged
merged 18 commits into from
Nov 2, 2024
Merged

20318 (2) #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e7918e1
Uses of kiln with fired mugs should play creation sound
risvh Oct 29, 2024
ffdf03a
Remove shipwreck
risvh Oct 29, 2024
ca3954d
Remove the extra mammoths
risvh Oct 29, 2024
50891c9
Recipe of wet mortar was overwritten with flower pot merge
risvh Oct 30, 2024
d3ffde2
Lion
risvh Oct 30, 2024
a4ab475
Redo power transmission
risvh Oct 30, 2024
a80ec43
High components transmit OFF signal without count limit
risvh Oct 31, 2024
b8d6d33
Clean up the mess that's the cat implementation
risvh Nov 1, 2024
fdf7c6a
Sack cont pos is affected by the wide shadow
risvh Nov 1, 2024
2c1f02b
Polish foal sprites
risvh Nov 1, 2024
56c99af
Get rid of that ancient silk sprite
risvh Nov 1, 2024
fdb1787
Polish linen scarf and tunic
risvh Nov 1, 2024
e90641d
Manhole's creation sound should play only when just made
risvh Nov 1, 2024
bb253e7
Up the tree sapling decay time to 10 hours. Make flower sprouts decay…
risvh Nov 2, 2024
f366f03
Turn crock back into clay with a loss
risvh Nov 2, 2024
dfede3d
More disposable objects
risvh Nov 2, 2024
a516694
More firebrand and spill sources
risvh Nov 2, 2024
a0d4e47
Attacking lion
risvh Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 5 additions & 2 deletions animations/10713_0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ id=10713
type=0,randStartPhase=0
forceZeroStart=0
numSounds=0
numSprites=7
numSprites=8
numSlots=0
offset=(0.000000,0.000000)
startPause=0.000000
Expand All @@ -12,12 +12,15 @@ startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (10.999998,-8.000001) 0.000000 0.947917 1.333333 0.020833 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (2.000000,-8.000000) 0.000000 0.947917 1.333333 0.020833 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
Expand Down
5 changes: 4 additions & 1 deletion animations/10713_1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ id=10713
type=1,randStartPhase=0
forceZeroStart=0
numSounds=0
numSprites=7
numSprites=8
numSlots=0
offset=(0.000000,0.000000)
startPause=0.000000
Expand All @@ -24,4 +24,7 @@ startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
15 changes: 9 additions & 6 deletions animations/10713_2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,29 @@ id=10713
type=2,randStartPhase=0
forceZeroStart=0
numSounds=0
numSprites=7
numSprites=8
numSlots=0
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (-1.000002,4.000000) 0.000000 0.000000 5.500000 0.020833 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (9.999998,-8.000001) 0.000000 0.927083 5.500000 0.020833 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (-1.000002,4.000000) 0.000000 0.000000 5.500000 0.020833 0.354167 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (-1.000002,4.000000) 0.000000 0.000000 5.500000 0.020833 0.354167 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (-1.000002,4.000000) 0.000000 0.000000 5.500000 0.020833 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (2.000000,-8.000000) 0.000000 0.927083 5.500000 0.020833 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 5.500000 1.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (-1.000002,4.000000) 0.000000 0.000000 5.500000 0.020833 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (-1.000002,4.000000) 0.000000 0.000000 5.500000 0.020833 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (-1.000002,4.000000) 0.000000 0.000000 5.500000 0.020833 0.479167 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
5 changes: 4 additions & 1 deletion animations/10713_4.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ id=10713
type=4,randStartPhase=0
forceZeroStart=0
numSounds=0
numSprites=7
numSprites=8
numSlots=0
offset=(0.000000,0.000000)
startPause=0.000000
Expand All @@ -24,4 +24,7 @@ startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
5 changes: 4 additions & 1 deletion animations/10713_5.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ id=10713
type=5,randStartPhase=0
forceZeroStart=0
numSounds=0
numSprites=7
numSprites=8
numSlots=0
offset=(0.000000,0.000000)
startPause=0.000000
Expand All @@ -24,4 +24,7 @@ startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
12 changes: 3 additions & 9 deletions animations/10682_4.txt → animations/10713_6.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
id=10682
type=4,randStartPhase=0
id=10713
type=6,randStartPhase=0
forceZeroStart=0
numSounds=0
numSprites=10
numSprites=8
numSlots=0
offset=(0.000000,0.000000)
startPause=0.000000
Expand All @@ -27,10 +27,4 @@ startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
30 changes: 30 additions & 0 deletions animations/10713_7.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
id=10713
type=7,randStartPhase=0
forceZeroStart=0
numSounds=0
numSprites=8
numSlots=0
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
offset=(0.000000,0.000000)
startPause=0.000000
animParam=0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 (0.000000,0.000000) 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 1.000000 0.000000
36 changes: 0 additions & 36 deletions animations/10730_2.txt
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions animations/10732_0.txt
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions animations/10732_2.txt
View file
Open in desktop

This file was deleted.

Loading
Loading