Skip to content

Commit 5f7b7a1

Browse files
kijimadkijimad
authored
名前と職業設定画面を追加した (#367)
職業選択はダミーでUIだけ
2 parents 5a0b129 + 9d78414 commit 5f7b7a1

31 files changed

+880
-80
lines changed

‎assets/metadata/entities/raw/raw.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@
12421242

12431243
[[Members]]
12441244
AnimKeys = ["player_0", "player_1"]
1245-
Name = "セレスティン"
1245+
Name = "Ash"
12461246
Player = true
12471247
SpriteKey = "player_0"
12481248
SpriteSheetName = "field"

‎internal/activity/activity_manager_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ func TestLastActivity(t *testing.T) {
283283
t.Parallel()
284284
world := testutil.InitTestWorld(t)
285285

286-
player, err := worldhelper.SpawnPlayer(world, 5, 5, "セレスティン")
286+
player, err := worldhelper.SpawnPlayer(world, 5, 5, "Ash")
287287
require.NoError(t, err)
288288

289289
params := ActionParams{
@@ -308,7 +308,7 @@ func TestLastActivity(t *testing.T) {
308308
t.Parallel()
309309
world := testutil.InitTestWorld(t)
310310

311-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
311+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
312312
require.NoError(t, err)
313313

314314
// 待機
@@ -344,7 +344,7 @@ func TestLastActivity(t *testing.T) {
344344
t.Parallel()
345345
world := testutil.InitTestWorld(t)
346346

347-
player, err := worldhelper.SpawnPlayer(world, 5, 5, "セレスティン")
347+
player, err := worldhelper.SpawnPlayer(world, 5, 5, "Ash")
348348
require.NoError(t, err)
349349

350350
// 存在しないターゲットへの攻撃（失敗する）

‎internal/activity/drop_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestDropActivity_Validate(t *testing.T) {
1717
t.Parallel()
1818
world := testutil.InitTestWorld(t)
1919

20-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
20+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
2121
require.NoError(t, err)
2222

2323
item, err := worldhelper.SpawnItem(world, "木刀", 1, gc.ItemLocationInPlayerBackpack)
@@ -37,7 +37,7 @@ func TestDropActivity_Validate(t *testing.T) {
3737
t.Parallel()
3838
world := testutil.InitTestWorld(t)
3939

40-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
40+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
4141
require.NoError(t, err)
4242

4343
comp := &gc.Activity{
@@ -55,7 +55,7 @@ func TestDropActivity_Validate(t *testing.T) {
5555
t.Parallel()
5656
world := testutil.InitTestWorld(t)
5757

58-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
58+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
5959
require.NoError(t, err)
6060

6161
// バックパック外のアイテムを手動で作成
@@ -121,7 +121,7 @@ func TestDropActivity_performDropActivity(t *testing.T) {
121121
t.Parallel()
122122
world := testutil.InitTestWorld(t)
123123

124-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
124+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
125125
require.NoError(t, err)
126126

127127
item, err := worldhelper.SpawnItem(world, "木刀", 1, gc.ItemLocationInPlayerBackpack)
@@ -176,7 +176,7 @@ func TestDropActivity_DoTurn(t *testing.T) {
176176
t.Parallel()
177177
world := testutil.InitTestWorld(t)
178178

179-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
179+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
180180
require.NoError(t, err)
181181

182182
item, err := worldhelper.SpawnItem(world, "木刀", 1, gc.ItemLocationInPlayerBackpack)

‎internal/activity/move_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestMoveActivity_Validate(t *testing.T) {
1717
t.Parallel()
1818
world := testutil.InitTestWorld(t)
1919

20-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
20+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
2121
require.NoError(t, err)
2222

2323
comp := &gc.Activity{
@@ -34,7 +34,7 @@ func TestMoveActivity_Validate(t *testing.T) {
3434
t.Parallel()
3535
world := testutil.InitTestWorld(t)
3636

37-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
37+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
3838
require.NoError(t, err)
3939

4040
comp := &gc.Activity{
@@ -93,7 +93,7 @@ func TestMoveActivity_DoTurn(t *testing.T) {
9393
t.Parallel()
9494
world := testutil.InitTestWorld(t)
9595

96-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
96+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
9797
require.NoError(t, err)
9898

9999
comp := &gc.Activity{
@@ -118,7 +118,7 @@ func TestMoveActivity_DoTurn(t *testing.T) {
118118
t.Parallel()
119119
world := testutil.InitTestWorld(t)
120120

121-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
121+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
122122
require.NoError(t, err)
123123

124124
comp := &gc.Activity{

‎internal/activity/movement_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func TestCanMoveTo(t *testing.T) {
1616
t.Parallel()
1717
world := testutil.InitTestWorld(t)
1818

19-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
19+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
2020
require.NoError(t, err)
2121

2222
// プレイヤーの右側(11, 10)に壁を配置
@@ -40,7 +40,7 @@ func TestCanMoveTo(t *testing.T) {
4040
t.Parallel()
4141
world := testutil.InitTestWorld(t)
4242

43-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
43+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
4444
require.NoError(t, err)
4545

4646
// プレイヤーの右側(11, 10)に壁を配置
@@ -64,7 +64,7 @@ func TestCanMoveTo(t *testing.T) {
6464
t.Parallel()
6565
world := testutil.InitTestWorld(t)
6666

67-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
67+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
6868
require.NoError(t, err)
6969

7070
// 全方向に壁を配置

‎internal/activity/pickup_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestPickupActivity_Validate(t *testing.T) {
1717
t.Parallel()
1818
world := testutil.InitTestWorld(t)
1919

20-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
20+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
2121
require.NoError(t, err)
2222

2323
_, err = worldhelper.SpawnFieldItem(world, "木刀", 10, 10)
@@ -36,7 +36,7 @@ func TestPickupActivity_Validate(t *testing.T) {
3636
t.Parallel()
3737
world := testutil.InitTestWorld(t)
3838

39-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
39+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
4040
require.NoError(t, err)
4141

4242
// アイテムは別のタイルにある
@@ -97,7 +97,7 @@ func TestPickupActivity_DoTurn(t *testing.T) {
9797
t.Parallel()
9898
world := testutil.InitTestWorld(t)
9999

100-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
100+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
101101
require.NoError(t, err)
102102

103103
item, err := worldhelper.SpawnFieldItem(world, "木刀", 10, 10)
@@ -124,7 +124,7 @@ func TestPickupActivity_DoTurn(t *testing.T) {
124124
t.Parallel()
125125
world := testutil.InitTestWorld(t)
126126

127-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
127+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
128128
require.NoError(t, err)
129129

130130
// 別のタイルにアイテムがある

‎internal/activity/player_actions_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func TestExecuteMoveAction(t *testing.T) {
9797
world := testutil.InitTestWorld(t)
9898
world.Config.RNG = rand.New(rand.NewPCG(42, 0))
9999

100-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
100+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
101101
require.NoError(t, err)
102102
enemy, err := worldhelper.SpawnEnemy(world, 10, 9, "火の玉")
103103
require.NoError(t, err)
@@ -391,7 +391,7 @@ func TestDeadEnemyInteraction(t *testing.T) {
391391
world := testutil.InitTestWorld(t)
392392
world.Config.RNG = rand.New(rand.NewPCG(42, 0))
393393

394-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
394+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
395395
require.NoError(t, err)
396396
enemy, err := worldhelper.SpawnEnemy(world, 10, 9, "火の玉")
397397
require.NoError(t, err)
@@ -413,7 +413,7 @@ func TestDeadEnemyInteraction(t *testing.T) {
413413
world := testutil.InitTestWorld(t)
414414
world.Config.RNG = rand.New(rand.NewPCG(42, 0))
415415

416-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
416+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
417417
require.NoError(t, err)
418418
enemy, err := worldhelper.SpawnEnemy(world, 10, 9, "火の玉")
419419
require.NoError(t, err)

‎internal/activity/rest_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestRestActivity_isSafe(t *testing.T) {
1717
t.Parallel()
1818
world := testutil.InitTestWorld(t)
1919

20-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
20+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
2121
require.NoError(t, err)
2222

2323
ra := &RestActivity{}
@@ -28,7 +28,7 @@ func TestRestActivity_isSafe(t *testing.T) {
2828
t.Parallel()
2929
world := testutil.InitTestWorld(t)
3030

31-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
31+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
3232
require.NoError(t, err)
3333

3434
// 敵を手動で作成
@@ -44,7 +44,7 @@ func TestRestActivity_isSafe(t *testing.T) {
4444
t.Parallel()
4545
world := testutil.InitTestWorld(t)
4646

47-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
47+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
4848
require.NoError(t, err)
4949

5050
// 敵を手動で作成
@@ -76,7 +76,7 @@ func TestRestActivity_Validate(t *testing.T) {
7676
t.Parallel()
7777
world := testutil.InitTestWorld(t)
7878

79-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
79+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
8080
require.NoError(t, err)
8181

8282
comp := &gc.Activity{
@@ -93,7 +93,7 @@ func TestRestActivity_Validate(t *testing.T) {
9393
t.Parallel()
9494
world := testutil.InitTestWorld(t)
9595

96-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
96+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
9797
require.NoError(t, err)
9898

9999
// 敵を手動で作成
@@ -116,7 +116,7 @@ func TestRestActivity_Validate(t *testing.T) {
116116
t.Parallel()
117117
world := testutil.InitTestWorld(t)
118118

119-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
119+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
120120
require.NoError(t, err)
121121

122122
comp := &gc.Activity{
@@ -138,7 +138,7 @@ func TestRestActivity_performHealing(t *testing.T) {
138138
t.Parallel()
139139
world := testutil.InitTestWorld(t)
140140

141-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
141+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
142142
require.NoError(t, err)
143143

144144
// HPを減らす
@@ -164,7 +164,7 @@ func TestRestActivity_performHealing(t *testing.T) {
164164
t.Parallel()
165165
world := testutil.InitTestWorld(t)
166166

167-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
167+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
168168
require.NoError(t, err)
169169

170170
// HPを最大値付近に設定
@@ -190,7 +190,7 @@ func TestRestActivity_performHealing(t *testing.T) {
190190
world := testutil.InitTestWorld(t)
191191

192192
// SpawnPlayerは満タンHPで作成される
193-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
193+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
194194
require.NoError(t, err)
195195

196196
comp := &gc.Activity{
@@ -233,7 +233,7 @@ func TestRestActivity_DoTurn(t *testing.T) {
233233
t.Parallel()
234234
world := testutil.InitTestWorld(t)
235235

236-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
236+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
237237
require.NoError(t, err)
238238

239239
// HPを減らす
@@ -258,7 +258,7 @@ func TestRestActivity_DoTurn(t *testing.T) {
258258
t.Parallel()
259259
world := testutil.InitTestWorld(t)
260260

261-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
261+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
262262
require.NoError(t, err)
263263

264264
// 敵を手動で作成
@@ -284,7 +284,7 @@ func TestRestActivity_DoTurn(t *testing.T) {
284284
t.Parallel()
285285
world := testutil.InitTestWorld(t)
286286

287-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
287+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
288288
require.NoError(t, err)
289289

290290
comp := &gc.Activity{
@@ -305,7 +305,7 @@ func TestRestActivity_DoTurn(t *testing.T) {
305305
t.Parallel()
306306
world := testutil.InitTestWorld(t)
307307

308-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
308+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
309309
require.NoError(t, err)
310310

311311
// HPを減らす

‎internal/activity/talk_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestTalkActivity_Validate(t *testing.T) {
1717
t.Parallel()
1818
world := testutil.InitTestWorld(t)
1919

20-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
20+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
2121
require.NoError(t, err)
2222

2323
npc, err := worldhelper.SpawnNeutralNPC(world, 11, 10, "商人")
@@ -37,7 +37,7 @@ func TestTalkActivity_Validate(t *testing.T) {
3737
t.Parallel()
3838
world := testutil.InitTestWorld(t)
3939

40-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
40+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
4141
require.NoError(t, err)
4242

4343
comp := &gc.Activity{
@@ -55,7 +55,7 @@ func TestTalkActivity_Validate(t *testing.T) {
5555
t.Parallel()
5656
world := testutil.InitTestWorld(t)
5757

58-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
58+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
5959
require.NoError(t, err)
6060

6161
// Dialogなしのエンティティを手動で作成
@@ -77,7 +77,7 @@ func TestTalkActivity_Validate(t *testing.T) {
7777
t.Parallel()
7878
world := testutil.InitTestWorld(t)
7979

80-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
80+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
8181
require.NoError(t, err)
8282

8383
// FactionNeutralなしのエンティティを手動で作成
@@ -121,7 +121,7 @@ func TestTalkActivity_DoTurn(t *testing.T) {
121121
t.Parallel()
122122
world := testutil.InitTestWorld(t)
123123

124-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
124+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
125125
require.NoError(t, err)
126126

127127
npc, err := worldhelper.SpawnNeutralNPC(world, 11, 10, "商人")
@@ -144,7 +144,7 @@ func TestTalkActivity_DoTurn(t *testing.T) {
144144
t.Parallel()
145145
world := testutil.InitTestWorld(t)
146146

147-
player, err := worldhelper.SpawnPlayer(world, 10, 10, "セレスティン")
147+
player, err := worldhelper.SpawnPlayer(world, 10, 10, "Ash")
148148
require.NoError(t, err)
149149

150150
// Nameなしのエンティティを手動で作成

‎internal/cmd/screenshot.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ func runScreenshot(_ context.Context, cmd *cli.Command) error {
3030
townStateFactory := gs.NewTownState()
3131

3232
switch mode {
33+
case gs.CharacterNamingState{}.String():
34+
return vrt.RunTestGame(mode, &gs.CharacterNamingState{})
35+
case gs.CharacterJobState{}.String():
36+
return vrt.RunTestGame(mode, gs.NewCharacterJobState("Ash")())
3337
case gs.CraftMenuState{}.String():
3438
return vrt.RunTestGame(mode, townStateFactory(), &gs.CraftMenuState{})
3539
case "DebugMenu":

0 commit comments

Comments
 (0)