notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tick chop.

Browse Source
This commit is contained in:
Remington Covert
2015-04-27 08:30:03 -07:00
parent 9a6dafef41
commit b96bcc2558
26 changed files with 91 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/ego/axe-wood.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
desktop/resources/ego/axe.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
desktop/resources/outside-jail/Untitled.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
desktop/resources/outside-jail/axe-wood.pxa/0.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/outside-jail/axe-wood.pxa/1.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/outside-jail/axe-wood.pxa/10.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/outside-jail/axe-wood.pxa/2.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/outside-jail/axe-wood.pxa/3.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/outside-jail/axe-wood.pxa/4.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/outside-jail/axe-wood.pxa/5.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/outside-jail/axe-wood.pxa/6.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/outside-jail/axe-wood.pxa/7.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/outside-jail/axe-wood.pxa/8.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/outside-jail/axe-wood.pxa/9.pxi Normal file
View File

Binary file not shown.

50
desktop/resources/outside-jail/axe-wood.pxa/CelData.plist Normal file
View File

@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
</array>
</plist>

BIN
desktop/resources/outside-jail/axe.pxa/0.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/outside-jail/axe.pxa/1.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/outside-jail/axe.pxa/2.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/outside-jail/axe.pxa/3.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/outside-jail/axe.pxa/4.pxi Normal file
View File

Binary file not shown.

26
desktop/resources/outside-jail/axe.pxa/CelData.plist Normal file
View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
</array>
</plist>

BIN
desktop/resources/outside-jail/axe2.pxi Normal file
View File

Binary file not shown.

BIN
desktop/resources/outside-jail/background.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 49 KiB

2
desktop/src-common/advent/screens/rooms/outside_house.clj
View File

@@ -468,7 +468,7 @@
:wizard (rooms/make-entity :wizard (common/make-wizard screen {:x 190 :y 78 :baseline 162 :scale-x 1.2 :scale-y 1.2 :wizard (rooms/make-entity :wizard (common/make-wizard screen {:x 190 :y 78 :baseline 162 :scale-x 1.2 :scale-y 1.2
:script (actions/get-script entities (talk-to-gandarf-outside entities))})) :script (actions/get-script entities (talk-to-gandarf-outside entities))}))
:note (rooms/make-entity :note (assoc (texture "outsidehouse/note.png") :note (rooms/make-entity :note (assoc (texture "outsidehouse/note.png")
:x 286 :y 80 :baseline 160 :x 277 :y 74 :baseline 160
:script (actions/get-script entities :script (actions/get-script entities
(actions/walk-to entities :ego [280 80] :face :right) (actions/walk-to entities :ego [280 80] :face :right)
(actions/play-animation entities :ego :squat) (actions/play-animation entities :ego :squat)

6
desktop/src-common/advent/screens/rooms/outside_jail.clj
View File

@@ -131,7 +131,11 @@
))} ))}
:stump {:box [205 68 251 89] :stump {:box [205 68 251 89]
:script (actions/get-script entities :script (actions/get-script entities
(actions/do-dialogue entities :ego "It's a stump.")) (actions/walk-to entities :ego [170 71] :face :right)
(actions/walk-straight-to entities :ego [188 71] :face :right)
(actions/play-animation entities :ego :reach)
(actions/play-animation entities :ego :axe-wood)
(actions/walk-straight-to entities :ego [170 71]))
:scripts {:alarm-clock (actions/get-script entities :scripts {:alarm-clock (actions/get-script entities
(actions/walk-to entities :ego [189 65] :face :right) (actions/walk-to entities :ego [189 65] :face :right)
(actions/play-animation entities :ego :reach) (actions/play-animation entities :ego :reach)

10
desktop/src-common/advent/screens/scene.clj
View File

@@ -207,6 +207,8 @@
throw (utils/make-anim "ego/throw.png" [18 36] 0.04 (flatten [[(repeat 5 0) (repeat 10 1)] (repeat 3 [2 2 2 3 3 3 4 4 4 5 5 5]) (repeat 5 [2 2 3 3 4 4 5 5]) (repeat 10 [2 3 4 5]) [2 3 3] (repeat 15 6)])) throw (utils/make-anim "ego/throw.png" [18 36] 0.04 (flatten [[(repeat 5 0) (repeat 10 1)] (repeat 3 [2 2 2 3 3 3 4 4 4 5 5 5]) (repeat 5 [2 2 3 3 4 4 5 5]) (repeat 10 [2 3 4 5]) [2 3 3] (repeat 15 6)]))
swing-shovel (utils/make-anim "ego/swing-shovel.png" [70 70] 0.1 (range 9)) swing-shovel (utils/make-anim "ego/swing-shovel.png" [70 70] 0.1 (range 9))
love (utils/make-anim "ego/love.png" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 10 7) (repeat 5 8) (repeat 5 7) (repeat 5 8) (repeat 5 7) (repeat 10 [23 24 25 24]) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22 21 21 21 21 21 6 6 5 5 4 4 3 3 2 2 1 1 0])) love (utils/make-anim "ego/love.png" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 10 7) (repeat 5 8) (repeat 5 7) (repeat 5 8) (repeat 5 7) (repeat 10 [23 24 25 24]) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22 21 21 21 21 21 6 6 5 5 4 4 3 3 2 2 1 1 0]))
axe (utils/make-anim "ego/axe.png" [60 70] 0.15 (range 5))
axe-wood (utils/make-anim "ego/axe-wood.png" [60 70] 0.15 (range 11))
ego {:right {:walk walk-right ego {:right {:walk walk-right
:stand stand-anim :stand stand-anim
@@ -248,6 +250,8 @@
:swing-shovel swing-shovel :swing-shovel swing-shovel
:love love :love love
:idea idea :idea idea
:axe axe
:axe-wood axe-wood
} }
:left {:walk (utils/flip walk-right) :left {:walk (utils/flip walk-right)
:stand (utils/flip stand-anim) :stand (utils/flip stand-anim)
@@ -279,7 +283,9 @@
:throw (utils/flip throw) :throw (utils/flip throw)
:swing-shovel (utils/flip swing-shovel) :swing-shovel (utils/flip swing-shovel)
:love (utils/flip love) :love (utils/flip love)
:idea (utils/flip idea)} :idea (utils/flip idea)
:axe (utils/flip axe)
:axe-wood (utils/flip axe-wood)}
:baseline (- 240 (last start-pos)) :baseline (- 240 (last start-pos))
:facing :right :facing :right
:origin-x 9 :origin-x 9
@@ -367,6 +373,8 @@
:anim-merges {(get-in ego [:right :shock]) {:origin-x 15} :anim-merges {(get-in ego [:right :shock]) {:origin-x 15}
(get-in ego [:left :swing-shovel]) {:origin-x 26} (get-in ego [:left :swing-shovel]) {:origin-x 26}
(get-in ego [:right :swing-shovel]) {:origin-x 26} (get-in ego [:right :swing-shovel]) {:origin-x 26}
(get-in ego [:right :axe]) {:origin-x 17}
(get-in ego [:right :axe-wood]) {:origin-x 17}
(get-in ego [:left :love]) {:origin-x 36} (get-in ego [:left :love]) {:origin-x 36}
:default {:origin-x 9}})] :default {:origin-x 9}})]
(actions/start-animation screen (actions/start-animation screen