Skip to content

Commit 40443cf

Browse files
committed
Final candidate
1 parent 30f843c commit 40443cf

11 files changed

+112
-107
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY: love clean run
22

3-
TITLE=Untitled
3+
TITLE=SuperJumpAndDashMan
44
TILED=/Applications/Tiled.app/Contents/MacOS/Tiled
55

66
clean:

checkpoint.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function checkpoint:render()
3333
x, y = self.body:getPosition()
3434
r = self.shape:getRadius()
3535
love.graphics.circle("line", x, y, r)
36-
love.graphics.print("checkpoint", x - r, y + r, 0, 4, -4, 0, 0)
36+
love.graphics.print("checkpoint", x - r, y + r + 80, 0, 4, -4, 0, 0)
3737
end
3838

3939
return checkpoint

conf.lua

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
function love.conf(t)
2+
t.version = "11.2"
3+
t.window.title = "Super Jump And Dash Man"
4+
end

friction.wav

7.98 KB
Binary file not shown.

input.lua

+8-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,14 @@ function input:getAxis()
5656
if #joysticks > 0 then
5757
local joystick = joysticks[1]
5858
-- axes
59-
dir1, dir2 = joystick:getAxes()
60-
x = x + math.min(math.max(dir1 * 1.2, -1), 1)
59+
local dir1, dir2 = joystick:getAxes()
60+
local low = 0.1
61+
local hi = 0.8
62+
if dir1 < -low then
63+
x = x + math.max((dir1 + low) / (hi - low), -1)
64+
elseif dir1 > low then
65+
x = x + math.min((dir1 - low) / (hi - low), 1)
66+
end
6167
-- hat
6268
local h1 = joystick:getHat(1)
6369
if string.find(h1, "l") then

map.tmx

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<map version="1.2" tiledversion="1.2.2" orientation="orthogonal" renderorder="right-up" width="100" height="100" tilewidth="250" tileheight="250" infinite="1" nextlayerid="4" nextobjectid="281">
2+
<map version="1.2" tiledversion="1.2.2" orientation="orthogonal" renderorder="right-up" width="100" height="100" tilewidth="250" tileheight="250" infinite="1" nextlayerid="4" nextobjectid="282">
33
<objectgroup id="3" name="platform">
44
<object id="36" type="entry" x="0" y="-2250">
55
<point/>
@@ -19,8 +19,8 @@
1919
</object>
2020
<object id="42" x="500" y="1500" width="250" height="250"/>
2121
<object id="43" x="750" y="1625" width="250" height="250"/>
22-
<object id="44" x="1000" y="1500" width="250" height="250"/>
23-
<object id="45" type="itemJump" x="875" y="1375">
22+
<object id="44" x="1000" y="1687.5" width="250" height="250"/>
23+
<object id="45" type="itemJump" x="1125" y="1562.5">
2424
<point/>
2525
</object>
2626
<object id="46" x="875" y="1375" width="89.5469" height="18.8438">
@@ -132,8 +132,8 @@
132132
<object id="148" type="kill" x="10750" y="-4749" width="250" height="250"/>
133133
<object id="149" x="10250" y="-4750" width="250" height="250"/>
134134
<object id="150" x="1937.5" y="3000" width="375" height="62.5"/>
135-
<object id="153" x="-1250" y="-1437.5" width="89.5469" height="18.8438">
136-
<text wrap="1">What?</text>
135+
<object id="153" x="-750" y="-1250" width="89.5469" height="18.8438">
136+
<text wrap="1">Sorry...</text>
137137
</object>
138138
<object id="155" x="9500" y="-4750" width="250" height="250"/>
139139
<object id="156" x="11000" y="-1000" width="89.5469" height="18.8438">
@@ -203,20 +203,21 @@
203203
<object id="268" type="kill" x="1500" y="-7000" width="750" height="250"/>
204204
<object id="269" type="kill" x="1500" y="-6000" width="625" height="250"/>
205205
<object id="270" x="2062.5" y="2937.5" width="89.5469" height="18.8438">
206-
<text wrap="1">!LOVE2019!</text>
206+
<text wrap="1">konnnichiwa...</text>
207207
</object>
208208
<object id="272" x="62.5" y="-2062.5" width="89.5469" height="18.8438">
209209
<text wrap="1">by neguse in #lovejam2019</text>
210210
</object>
211211
<object id="273" x="875" y="-8500" width="250" height="3250" rotation="20"/>
212212
<object id="274" x="-1125" y="-6000" width="187.5" height="1687.5" rotation="-20"/>
213-
<object id="276" x="-62.5" y="-4187.5" width="89.5469" height="18.8438">
213+
<object id="276" x="625" y="-8562.5" width="89.5469" height="18.8438">
214214
<text wrap="1">It's the end.</text>
215215
</object>
216-
<object id="277" x="-62.5" y="-3687.5" width="89.5469" height="18.8438">
216+
<object id="277" x="-562.5" y="-5312.5" width="89.5469" height="18.8438">
217217
<text wrap="1">Thanks for playing!</text>
218218
</object>
219219
<object id="278" type="goal" x="-500" y="-3000" width="1000" height="500"/>
220-
<object id="280" type="start" x="-500" y="-2250" width="1000" height="500"/>
220+
<object id="280" type="start" x="-2062.5" y="-2250" width="2812.5" height="1750"/>
221+
<object id="281" type="kill" x="-2062.5" y="-750" width="1812.5" height="250"/>
221222
</objectgroup>
222223
</map>

map_old.tmx

-53
This file was deleted.

mapdata.lua

+28-15
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ return {
99
tilewidth = 250,
1010
tileheight = 250,
1111
nextlayerid = 4,
12-
nextobjectid = 281,
12+
nextobjectid = 282,
1313
properties = {},
1414
tilesets = {},
1515
layers = {
@@ -143,7 +143,7 @@ return {
143143
type = "",
144144
shape = "rectangle",
145145
x = 1000,
146-
y = 1500,
146+
y = 1687.5,
147147
width = 250,
148148
height = 250,
149149
rotation = 0,
@@ -155,8 +155,8 @@ return {
155155
name = "",
156156
type = "itemJump",
157157
shape = "point",
158-
x = 875,
159-
y = 1375,
158+
x = 1125,
159+
y = 1562.5,
160160
width = 0,
161161
height = 0,
162162
rotation = 0,
@@ -1119,13 +1119,13 @@ return {
11191119
name = "",
11201120
type = "",
11211121
shape = "text",
1122-
x = -1250,
1123-
y = -1437.5,
1122+
x = -750,
1123+
y = -1250,
11241124
width = 89.5469,
11251125
height = 18.8438,
11261126
rotation = 0,
11271127
visible = true,
1128-
text = "What?",
1128+
text = "Sorry...",
11291129
wrap = true,
11301130
properties = {}
11311131
},
@@ -1885,7 +1885,7 @@ return {
18851885
height = 18.8438,
18861886
rotation = 0,
18871887
visible = true,
1888-
text = "!LOVE2019!",
1888+
text = "konnnichiwa...",
18891889
wrap = true,
18901890
properties = {}
18911891
},
@@ -1935,8 +1935,8 @@ return {
19351935
name = "",
19361936
type = "",
19371937
shape = "text",
1938-
x = -62.5,
1939-
y = -4187.5,
1938+
x = 625,
1939+
y = -8562.5,
19401940
width = 89.5469,
19411941
height = 18.8438,
19421942
rotation = 0,
@@ -1950,8 +1950,8 @@ return {
19501950
name = "",
19511951
type = "",
19521952
shape = "text",
1953-
x = -62.5,
1954-
y = -3687.5,
1953+
x = -562.5,
1954+
y = -5312.5,
19551955
width = 89.5469,
19561956
height = 18.8438,
19571957
rotation = 0,
@@ -1978,10 +1978,23 @@ return {
19781978
name = "",
19791979
type = "start",
19801980
shape = "rectangle",
1981-
x = -500,
1981+
x = -2062.5,
19821982
y = -2250,
1983-
width = 1000,
1984-
height = 500,
1983+
width = 2812.5,
1984+
height = 1750,
1985+
rotation = 0,
1986+
visible = true,
1987+
properties = {}
1988+
},
1989+
{
1990+
id = 281,
1991+
name = "",
1992+
type = "kill",
1993+
shape = "rectangle",
1994+
x = -2062.5,
1995+
y = -750,
1996+
width = 1812.5,
1997+
height = 250,
19851998
rotation = 0,
19861999
visible = true,
19872000
properties = {}

memo.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
あとはレベルひたすら作るだけでいいかな
4444

4545
TODO
46-
おと、こすれ音とBGM
47-
死亡演出
48-
なんか勝手に右に進んでる
46+
こすれ音、おりるときだけ
47+
チェックポイントもじ上に
48+
49+

0 commit comments

Comments
 (0)