Skip to content

Commit

Permalink
Chapter X0004 with map changes. #21.
Browse files Browse the repository at this point in the history
  • Loading branch information
@laqieer
laqieer committed Aug 18, 2022
1 parent 6c2861c commit caefeb6
Show file tree
Hide file tree
Showing 18 changed files with 895 additions and 6 deletions.
Binary file modified chapter/X0004.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
419 changes: 419 additions & 0 deletions chapter/X0004.tmj
View file

Large diffs are not rendered by default.

219 changes: 219 additions & 0 deletions chapter/X0004.tsj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,219 @@
{ "columns":15,
"image":"X0004.png",
"imageheight":272,
"imagewidth":240,
"margin":0,
"name":"X0004",
"spacing":0,
"tilecount":255,
"tiledversion":"1.9.0",
"tileheight":16,
"tilewidth":16,
"type":"tileset",
"version":"1.8",
"wangsets":[
{
"colors":[
{
"color":"#ff0000",
"name":"",
"probability":1,
"tile":-1
}],
"name":"\u5e73\u5730",
"tile":-1,
"type":"corner",
"wangtiles":[]
},
{
"colors":[
{
"color":"#ff0000",
"name":"",
"probability":1,
"tile":-1
}],
"name":"\u56f4\u5899",
"tile":-1,
"type":"corner",
"wangtiles":[
{
"tileid":36,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":37,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":39,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":40,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":41,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":42,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":43,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":44,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":51,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":66,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":81,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":96,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":111,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":141,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":156,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":157,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":158,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":159,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":160,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":161,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":225,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":226,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":227,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":229,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":230,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":231,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":232,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":233,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":234,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":238,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":239,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
}]
},
{
"colors":[
{
"color":"#ff0000",
"name":"",
"probability":1,
"tile":-1
}],
"name":"\u7834\u5899",
"tile":-1,
"type":"corner",
"wangtiles":[
{
"tileid":38,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":126,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":228,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
}]
},
{
"colors":[
{
"color":"#ff0000",
"name":"",
"probability":1,
"tile":-1
}],
"name":"\u68ee\u6797",
"tile":-1,
"type":"corner",
"wangtiles":[
{
"tileid":135,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":150,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":179,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
},
{
"tileid":194,
"wangid":[0, 1, 0, 1, 0, 1, 0, 1]
}]
}]
}
47 changes: 42 additions & 5 deletions chapter/chapters.tiled-session
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
"height": 4300,
"width": 2
},
"activeFile": "X0003.tmj",
"activeFile": "X0004.tmj",
"expandedProjectPaths": [
"unit",
"."
],
"fileStates": {
Expand All @@ -27,16 +28,40 @@
"scaleInEditor": 2
},
"X0003.tmj": {
"expandedObjectLayers": [
2,
3
],
"scale": 2.173125,
"selectedLayer": 1,
"selectedLayer": 2,
"viewCenter": {
"x": 65.11360368133447,
"y": 90.882945067587
"x": 120.33362093758986,
"y": 137.35979292493528
}
},
"X0003.tsj": {
"scaleInDock": 1
},
"X0004.tmj": {
"expandedGroupLayers": [
2
],
"expandedObjectLayers": [
8,
9,
7
],
"scale": 2.17,
"selectedLayer": 2,
"viewCenter": {
"x": 64.74654377880184,
"y": 91.01382488479263
}
},
"X0004.tsj": {
"scaleInDock": 1,
"scaleInEditor": 2
},
"XX001.tmj": {
"expandedObjectLayers": [
2,
Expand All @@ -57,6 +82,14 @@
},
"unit/enemy.tsx": {
"scaleInDock": 1
},
"unit/npc.tsj": {
"scaleInDock": 1,
"scaleInEditor": 1
},
"unit/npc.tsx": {
"scaleInDock": 1,
"scaleInEditor": 2
}
},
"last.imagePath": "/Users/laqieer/Projects/FEHRG/chapter",
Expand All @@ -66,12 +99,16 @@
"map.tileWidth": 16,
"map.width": 15,
"openFiles": [
"X0003.tmj"
"X0004.tmj"
],
"project": "chapters.tiled-project",
"property.type": "Unit",
"recentFiles": [
"X0004.tmj",
"X0004.tsj",
"unit/npc.tsx",
"X0003.tmj",
"unit/npc.tsj",
"X0001.tmj",
"XX001.tmj",
"X0002.tsj"
Expand Down
62 changes: 62 additions & 0 deletions content/chapter_event/X0004Event.S
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
#include "event.h"
#include "chapter_id.h"
#include "character_id.h"
#include "class_id.h"
#include "item_id.h"
#include "AI.h"
#include "background_id.h"
#include "music_id.h"

#include "event_text_id.h"
.section .rodata
.align 2
.global X0004Event
X0004Event:
DefineEvents
TurnBasedEvents:
LoadBeginningScene
END_MAIN
CharacterBasedEvents:
END_MAIN
LocationBasedEvents:
END_MAIN
MiscBasedEvents:
CauseGameOverIfLordDies
DefeatAll(EndingScene)
END_MAIN
BeginningScene:
ShowBG(BG001_Brave)
LOU1 EnemyUnits
ENUN
LOU1 AllyUnits
ENUN
LOU1 NPCUnits
ENUN
MUSC BGM_MAP_FES_01
TEX1 EvTx_X0004_MID_SCENARIO_MAP_BEGIN
REMA
ENDA
EndingScene:
TEX1 EvTx_X0004_MID_SCENARIO_MAP_END
REMA
MNCH X0004Next
ENDA
AllyUnits:
ALLY_UNIT_JOINED(アンナ, 1, 1)
ALLY_UNIT_JOINED(アルフォンス, 0, 1)
ALLY_UNIT_JOINED(シャロン, 2, 2)
END_UNIT
EnemyUnits:
ENEMY_UNIT(クレイン, 24, 2, AUTO_LEVEL, 10, 11, 铁弓, 0, 0, 0, 0, DoNotMove, 0, 0)
ENEMY_UNIT(サナキ, 33, 2, AUTO_LEVEL, 14, 4, 火炎, 0, 0, 0, 0, DoNotMove, 0, 0)
ENEMY_UNIT(杂兵, 24, 2, AUTO_LEVEL, 3, 16, 铁弓, 0, 0, 0, 0, DoNotMove, 0, 0)
ENEMY_UNIT(杂兵, 32, 2, AUTO_LEVEL, 8, 4, 火炎, 0, 0, 0, 0, DoNotMove, 0, 0)
END_UNIT
NPCUnits:
NPC_UNIT(エフラム, 104, 2, AUTO_LEVEL, 0, 0, 钢枪, 0, 0, 0, 0, DoNotMove, 0, GuardTile)
NPC_UNIT(エイリーク, 105, 2, AUTO_LEVEL, 1, 0, 细身剑, 0, 0, 0, 0, DoNotMove, 0, GuardTile)
NPC_UNIT(セリス, 1, 2, AUTO_LEVEL, 2, 0, 钢剑, 0, 0, 0, 0, DoNotMove, 0, GuardTile)
NPC_UNIT(ユリア, 33, 2, AUTO_LEVEL, 3, 0, 闪光, 0, 0, 0, 0, DoNotMove, 0, GuardTile)
END_UNIT
Traps:
END_TRAP
1 change: 1 addition & 0 deletions content/chapter_events.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ cu8 * const ChapterEvents[] = {
X0001Event,
X0002Event,
X0003Event,
X0004Event,
};
Loading

0 comments on commit caefeb6

Please sign in to comment.