Skip to content

Commit 2bc2bbe

Browse files
aratamaaratama
committed
refactor
1 parent b8ac290 commit 2bc2bbe

23 files changed

+602
-566
lines changed

‎assets/level.ldtk

+59-16
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"iid": "d6c10700-c210-11ef-bd33-1de7d482da37",
1212
"jsonVersion": "1.5.3",
1313
"appBuildId": 473703,
14-
"nextUid": 54,
14+
"nextUid": 55,
1515
"identifierStyle": "Capitalize",
1616
"toc": [],
1717
"worldLayout": "GridVania",
@@ -693,6 +693,43 @@
693693
"allowedRefsEntityUid": null,
694694
"allowedRefTags": [],
695695
"tilesetUid": null
696+
},
697+
{
698+
"identifier": "on_despawn",
699+
"doc": null,
700+
"__type": "String",
701+
"uid": 54,
702+
"type": "F_String",
703+
"isArray": false,
704+
"canBeNull": false,
705+
"arrayMinLength": null,
706+
"arrayMaxLength": null,
707+
"editorDisplayMode": "Hidden",
708+
"editorDisplayScale": 1,
709+
"editorDisplayPos": "Above",
710+
"editorLinkStyle": "StraightArrow",
711+
"editorDisplayColor": null,
712+
"editorAlwaysShow": false,
713+
"editorShowInWorld": true,
714+
"editorCutLongValues": true,
715+
"editorTextSuffix": null,
716+
"editorTextPrefix": null,
717+
"useForSmartColor": false,
718+
"exportToToc": false,
719+
"searchable": false,
720+
"min": null,
721+
"max": null,
722+
"regex": null,
723+
"acceptFileTypes": null,
724+
"defaultOverride": null,
725+
"textLanguageMode": null,
726+
"symmetricalRef": false,
727+
"autoChainRef": true,
728+
"allowOutOfLevelRef": true,
729+
"allowedRefs": "OnlySame",
730+
"allowedRefsEntityUid": null,
731+
"allowedRefTags": [],
732+
"tilesetUid": null
696733
}
697734
]
698735
},
@@ -6668,8 +6705,8 @@
66686705
"identifier": "Cave",
66696706
"iid": "2eccafd0-c210-11ef-9daa-e9b0966b9ad8",
66706707
"uid": 20,
6671-
"worldX": 4352,
6672-
"worldY": 768,
6708+
"worldX": 4608,
6709+
"worldY": 1024,
66736710
"worldDepth": 0,
66746711
"pxWid": 768,
66756712
"pxHei": 768,
@@ -6770,8 +6807,8 @@
67706807
"defUid": 2,
67716808
"px": [368,544],
67726809
"fieldInstances": [],
6773-
"__worldX": 4720,
6774-
"__worldY": 1312
6810+
"__worldX": 4976,
6811+
"__worldY": 1568
67756812
},
67766813
{
67776814
"__identifier": "MagicCircle",
@@ -6794,8 +6831,8 @@
67946831
"id": "V_String",
67956832
"params": ["73094a00-c210-11ef-9f2d-7faa688afc7c"]
67966833
}] }],
6797-
"__worldX": 4704,
6798-
"__worldY": 912
6834+
"__worldX": 4960,
6835+
"__worldY": 1168
67996836
},
68006837
{
68016838
"__identifier": "Boss",
@@ -6809,12 +6846,18 @@
68096846
"height": 16,
68106847
"defUid": 21,
68116848
"px": [352,336],
6812-
"fieldInstances": [{ "__identifier": "actor", "__type": "String", "__value": "HugeSlime", "__tile": null, "defUid": 22, "realEditorValues": [{
6813-
"id": "V_String",
6814-
"params": ["HugeSlime"]
6815-
}] }],
6816-
"__worldX": 4704,
6817-
"__worldY": 1104
6849+
"fieldInstances": [
6850+
{ "__identifier": "actor", "__type": "String", "__value": "HugeSlime", "__tile": null, "defUid": 22, "realEditorValues": [{
6851+
"id": "V_String",
6852+
"params": ["HugeSlime"]
6853+
}] },
6854+
{ "__identifier": "on_despawn", "__type": "String", "__value": "HugeSlimeDespawn()", "__tile": null, "defUid": 54, "realEditorValues": [{
6855+
"id": "V_String",
6856+
"params": ["HugeSlimeDespawn()"]
6857+
}] }
6858+
],
6859+
"__worldX": 4960,
6860+
"__worldY": 1360
68186861
}
68196862
]
68206863
},
@@ -6911,7 +6954,7 @@
69116954
"entityInstances": []
69126955
}
69136956
],
6914-
"__neighbours": [ { "levelIid": "393536b0-c210-11ef-b61b-33aff04b32b9", "dir": "w" }, { "levelIid": "c89436e0-c210-11ef-b61b-e51f6e2f91f0", "dir": "n" } ]
6957+
"__neighbours": []
69156958
},
69166959
{
69176960
"identifier": "Waterside",
@@ -8066,7 +8109,7 @@
80668109
"entityInstances": []
80678110
}
80688111
],
8069-
"__neighbours": [ { "levelIid": "2eccafd0-c210-11ef-9daa-e9b0966b9ad8", "dir": "e" }, { "levelIid": "23719770-c210-11ef-8f07-133e750c4b47", "dir": "w" }, { "levelIid": "5b00bfd0-c210-11ef-b61b-87919e30aded", "dir": "s" }, { "levelIid": "c89436e0-c210-11ef-b61b-e51f6e2f91f0", "dir": "n" } ]
8112+
"__neighbours": [ { "levelIid": "23719770-c210-11ef-8f07-133e750c4b47", "dir": "w" }, { "levelIid": "5b00bfd0-c210-11ef-b61b-87919e30aded", "dir": "s" }, { "levelIid": "c89436e0-c210-11ef-b61b-e51f6e2f91f0", "dir": "n" } ]
80708113
},
80718114
{
80728115
"identifier": "Lava",
@@ -10383,7 +10426,7 @@
1038310426
"entityInstances": []
1038410427
}
1038510428
],
10386-
"__neighbours": [ { "levelIid": "2eccafd0-c210-11ef-9daa-e9b0966b9ad8", "dir": "s" }, { "levelIid": "393536b0-c210-11ef-b61b-33aff04b32b9", "dir": "s" }, { "levelIid": "a4b520f0-c210-11ef-b61b-49c336abb4cf", "dir": "w" } ]
10429+
"__neighbours": [ { "levelIid": "393536b0-c210-11ef-b61b-33aff04b32b9", "dir": "s" }, { "levelIid": "a4b520f0-c210-11ef-b61b-49c336abb4cf", "dir": "w" } ]
1038710430
},
1038810431
{
1038910432
"identifier": "Forest",

‎assets/registry.actor.ron

+15
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ActorRegistry(
1111
acceleration_on_firing: 0.5,
1212
actors: {
1313
"Witch": (
14+
name_ja: "魔法使い",
1415
collider: Ball(5.0),
1516
move_force: 40000.0,
1617
jump: 0.0,
@@ -48,6 +49,7 @@ ActorRegistry(
4849
strategies: {}
4950
),
5051
"Rabbit": (
52+
name_ja: "ウサギ",
5153
collider: Ball(5.0),
5254
move_force: 40000.0,
5355
jump: 1.5,
@@ -85,6 +87,7 @@ ActorRegistry(
8587
strategies: {}
8688
),
8789
"Chicken": (
90+
name_ja: "ニワトリ",
8891
collider: Ball(5.0),
8992
move_force: 60000.0,
9093
jump: 1.5,
@@ -122,6 +125,7 @@ ActorRegistry(
122125
strategies: {}
123126
),
124127
"Sandbag": (
128+
name_ja: "サンドバッグ",
125129
collider: Ball(5.0),
126130
move_force: 100000.0,
127131
jump: 0.0,
@@ -166,6 +170,7 @@ ActorRegistry(
166170
}
167171
),
168172
"Slime": (
173+
name_ja: "スライム",
169174
collider: Ball(5.0),
170175
move_force: 50000.0,
171176
jump: 0.0,
@@ -212,6 +217,7 @@ ActorRegistry(
212217
}
213218
),
214219
"EyeBall": (
220+
name_ja: "アイボール",
215221
collider: Ball(5.0),
216222
move_force: 100000.0,
217223
jump: 0.0,
@@ -258,6 +264,7 @@ ActorRegistry(
258264
}
259265
),
260266
"Spider": (
267+
name_ja: "スパイダー",
261268
collider: Ball(8.0),
262269
move_force: 150000.0,
263270
jump: 0.0,
@@ -304,6 +311,7 @@ ActorRegistry(
304311
}
305312
),
306313
"Salamander": (
314+
name_ja: "サラマンダー",
307315
collider: Ball(5.0),
308316
move_force: 100000.0,
309317
jump: 0.0,
@@ -350,6 +358,7 @@ ActorRegistry(
350358
}
351359
),
352360
"Shadow": (
361+
name_ja: "シャドウ",
353362
collider: Ball(5.0),
354363
move_force: 50000.0,
355364
jump: 0.0,
@@ -387,6 +396,7 @@ ActorRegistry(
387396
strategies: {}
388397
),
389398
"HugeSlime": (
399+
name_ja: "スライムの王　エミルス",
390400
collider: Ball(30.0),
391401
// huge slime のみ move_force を jump_actor の impulse に設定していることに注意
392402
move_force: 500000.0,
@@ -426,6 +436,7 @@ ActorRegistry(
426436
strategies: {}
427437
),
428438
"Lantern": (
439+
name_ja: "ランタン",
429440
collider: Ball(5.0),
430441
move_force: 0.0,
431442
jump: 0.0,
@@ -460,6 +471,7 @@ ActorRegistry(
460471
point_light_falloff: 20.0
461472
),
462473
"Chest": (
474+
name_ja: "チェスト",
463475
collider: Cuboid(8.0, 8.0),
464476
move_force: 0.0,
465477
jump: 0.0,
@@ -497,6 +509,7 @@ ActorRegistry(
497509
strategies: {}
498510
),
499511
"Bookshelf": (
512+
name_ja: "本棚",
500513
collider: Cuboid(16.0, 8.0),
501514
move_force: 0.0,
502515
jump: 0.0,
@@ -534,6 +547,7 @@ ActorRegistry(
534547
strategies: {}
535548
),
536549
"Rock": (
550+
name_ja: "岩",
537551
collider: Ball(16.0),
538552
move_force: 0.0,
539553
jump: 0.0,
@@ -572,6 +586,7 @@ ActorRegistry(
572586
impact_radius: 24.0,
573587
),
574588
"Bomb": (
589+
name_ja: "爆弾",
575590
collider: Ball(5.0),
576591
move_force: 0.0,
577592
jump: 0.0,

‎assets/registry.game.ron

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#![enable(implicit_some)]
44
GameRegistry(
55
debug_wands: [
6-
["Fireball"],
76
["QuickCast", "QuickCast", "QuickCast", "QuickCast", "QuickCast", "QuickCast", "QuickCast", "MagicBolt"],
7+
["Slash"],
88
["DualCast", "Levitation", "MagicBolt"],
99
["DualCast", "Dash", "Jump", "Lantern"]
1010
],

‎assets/registry.spell.ron

+1-1
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ SpellRegistry(
10651065
cast_delay: 30,
10661066
icon: "slash_icon",
10671067
price: 2400,
1068-
cast: Slash (damage: 1120),
1068+
cast: Slash (damage: 11120),
10691069
),
10701070
"Heal": (
10711071
rank: 5,

‎assets/script.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ function* ShopRabbit() {
367367
}
368368

369369

370-
function HugeSlimeDefeat() {
370+
function* HugeSlimeDespawn() {
371371
// "HugeSlime": [
372372
// Sprite (
373373
// name: "huge slime body",

‎src/actor.rs

+5-14
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ use crate::level::world::GameWorld;
4848
use crate::level::world::LevelScoped;
4949
use crate::registry::ActorCollider;
5050
use crate::registry::Registry;
51-
use crate::script::event::CmdEvent;
51+
use crate::script::cmd::CmdEvent;
52+
use crate::script::context::JavaScriptContext;
5253
use crate::se::SEEvent;
5354
use crate::se::BASHA2;
5455
use crate::se::CRY;
@@ -1137,6 +1138,7 @@ fn despawn(
11371138
Option<&Boss>,
11381139
Option<&Burnable>,
11391140
)>,
1141+
mut script: NonSendMut<JavaScriptContext>,
11401142
) {
11411143
for (entity, actor, transform, player, boss, burnable) in query.iter() {
11421144
let position = transform.translation.truncate();
@@ -1192,19 +1194,8 @@ fn despawn(
11921194
}
11931195

11941196
// ボス用の消滅シナリオ実行
1195-
if let Some(_boss) = boss {
1196-
// let mut cmds = registry.get_senario(&boss.on_despawn).clone();
1197-
// cmds.insert(
1198-
// 0,
1199-
// Cmd::Set {
1200-
// name: "position".to_string(),
1201-
// value: Value::Vec2 {
1202-
// x: position.x,
1203-
// y: position.y,
1204-
// },
1205-
// },
1206-
// );
1207-
// interpreter.send(InterpreterEvent::Play { commands: cmds });
1197+
if let Some(boss) = boss {
1198+
script.generate(boss.on_despawn.clone());
12081199
}
12091200
}
12101201
}

‎src/asset.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::registry::ActorRegistry;
33
use crate::registry::GameRegistry;
44
use crate::registry::SpellRegistry;
55
use crate::registry::TileRegistry;
6-
use crate::script::javascript_loader::JavaScriptSource;
6+
use crate::script::loader::JavaScriptSource;
77
use bevy::asset::*;
88
use bevy::prelude::*;
99
use bevy_aseprite_ultra::prelude::Aseprite;

‎src/controller/message_rabbit.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ use crate::physics::identify_item;
99
use crate::physics::IdentifiedCollisionEvent;
1010
use crate::physics::IdentifiedCollisionItem;
1111
use crate::script::cmd::Cmd;
12-
use crate::script::event::CmdEvent;
13-
use crate::script::javascript_loader::JavaScriptContext;
12+
use crate::script::cmd::CmdEvent;
13+
use crate::script::context::JavaScriptContext;
1414
use crate::set::FixedUpdateInGameSet;
1515
use crate::ui::speech_bubble::SpeechBubble;
1616
use crate::ui::spell_list::SpellList;

‎src/controller/player.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use crate::level::world::GameWorld;
1818
use crate::player_state::PlayerState;
1919
use crate::registry::Registry;
2020
use crate::script::cmd::Cmd;
21-
use crate::script::event::CmdEvent;
21+
use crate::script::cmd::CmdEvent;
2222
use crate::se::SEEvent;
2323
use crate::se::PICK_UP;
2424
use crate::se::SEN;

‎src/enemy/huge_slime.rs

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use crate::audio::NextBGM;
66
use crate::component::counter::Counter;
77
use crate::controller::player::Player;
88
use crate::entity::impact::SpawnImpact;
9-
use crate::language::Dict;
109
use crate::level::entities::Spawn;
1110
use crate::level::entities::SpawnEvent;
1211
use crate::registry::Registry;
@@ -23,7 +22,6 @@ const IMPACT_MARGIN: f32 = 16.0;
2322

2423
#[derive(Component)]
2524
pub struct Boss {
26-
pub name: Dict<String>,
2725
pub on_despawn: String,
2826
}
2927

‎src/entity/magic_circle.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::level::world::LevelScoped;
1010
use crate::player_state::PlayerState;
1111
use crate::registry::Registry;
1212
use crate::script::cmd::Cmd;
13-
use crate::script::event::CmdEvent;
13+
use crate::script::cmd::CmdEvent;
1414
use crate::se::SEEvent;
1515
use crate::se::TURN_ON;
1616
use crate::se::WARP;

‎src/game.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ use crate::registry::SpellRegistry;
6969
use crate::registry::TileRegistry;
7070
#[cfg(feature = "save")]
7171
use crate::save::SavePlugin;
72-
use crate::script::event::InterpreterPlugin;
73-
use crate::script::javascript_loader::JavaScriptLoaderPlugin;
72+
use crate::script::context::JavaScriptContextPlugin;
73+
use crate::script::loader::JavaScriptLoaderPlugin;
7474
use crate::se::SECommandPlugin;
7575
use crate::set::GameSetPlugin;
7676
use crate::states::*;
@@ -269,7 +269,7 @@ pub fn run_game() {
269269
.add_plugins(SlashPlugin)
270270
.add_plugins(ServantSeedPlugin)
271271
.add_plugins(SpeechBubblePlugin)
272-
.add_plugins(InterpreterPlugin)
272+
.add_plugins(JavaScriptContextPlugin)
273273
.add_plugins(SpellEntityPlugin)
274274
.add_plugins(SpellInWandPlugin)
275275
.add_plugins(SpellListPlugin)

0 commit comments

Comments
 (0)