Skip to content
This repository has been archived by the owner on Sep 26, 2024. It is now read-only.

Commit

Permalink
Chapter 143
Browse files Browse the repository at this point in the history
  • Loading branch information
@laqieer
laqieer committed Jul 20, 2020
1 parent b008e13 commit 4663cb2
Show file tree
Hide file tree
Showing 8 changed files with 2,163 additions and 0 deletions.
514 changes: 514 additions & 0 deletions res/map/new_map/S3024.json
View file

Large diffs are not rendered by default.

308 changes: 308 additions & 0 deletions res/map/new_map/event_chap_143.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,308 @@
{ "compressionlevel":-1,
"height":20,
"infinite":false,
"layers":[
{
"compression":"zstd",
"data":"KLUv\/WCwA\/0PAApL6AcJEPhoAQAAin0fcQBxAHEAT3IkP3IjL3IiH3IhD3Ig\/3Ef73Ee33Edz3Ecv3Ebr3Ean3EZj3EYf3EXb3EWX3EVT3EUP3ETL3ESH3ERD3EQ\/3AP73AO33ANz3AMv3ALr3AKn3AJj3AIf3AHb3AGX3AFT3AEP3ADL3ACH3ABD3AA\/wun9EmX9EiH9Ed39EZn9EVX9ERH9EM39EIn9EEX9EAH9D\/38z7n8z3X8zzH8zu38zqn8zmX8ziH8zd38zZn8zVX8zRH8zM38zIn8zEX8zAH8y\/38i7n8i3X8izH8iu38iqn8imX8iiH8id38iZn8iVXEv92b+92bt92bc92bL92a692ap92aY92aH92Z292Zl92ZU92ZD92Yy92Yh92YQ92YP91X+91Xt91Xc91XL91W691Wp91WY91WH91V291Vl91VU91VD91Uy91Uh91UQ91UP90T+90Tt90Tc90TL90S68U\/6n4L8V\/KP478Z+J\/0r8R+K\/Ef+J+C\/EfyD++\/Cfh\/86\/Mfhvw3\/afgvw38Y\/rvwn4X\/KvxH4b8J\/0n4L8J\/EP578J+D\/xr8x+C\/Bf8p+C\/Bfwj+O\/Cfgf8K\/EfgvwH\/CfgvwH8A\/vv77\/ud3\/dd3\/Md3+\/d3uud3udd3uMd3t\/d3dud3ddd3dMd3c\/d3Mud3Mdd3MMdXAA=",
"encoding":"base64",
"height":20,
"id":1,
"name":"Tile Layer 1",
"opacity":1,
"type":"tilelayer",
"visible":true,
"width":15,
"x":0,
"y":0
},
{
"draworder":"topdown",
"id":2,
"name":"Enemy",
"objects":[
{
"gid":384,
"height":16,
"id":1,
"name":"\u30ec\u30c3\u30c9\u30de\u30fc\u30b8",
"properties":[
{
"name":"AI1",
"type":"string",
"value":"AttackInRange"
},
{
"name":"AI2",
"type":"string",
"value":"Pursue"
},
{
"name":"AI3",
"type":"string",
"value":"Cautious"
},
{
"name":"AI4",
"type":"string",
"value":"DefaultAI4"
},
{
"name":"AutoLevel",
"type":"int",
"value":1
},
{
"name":"Character",
"type":"string",
"value":"GenericHelWeak"
},
{
"name":"Equip",
"type":"string",
"value":"Fire"
},
{
"name":"Item",
"type":"string",
"value":"None"
},
{
"name":"Level",
"type":"int",
"value":9
}],
"rotation":0,
"type":"EnemyUnit",
"visible":true,
"width":13,
"x":209.190479993611,
"y":80.5820621356122
},
{
"gid":380,
"height":15,
"id":2,
"name":"\u30a2\u30af\u30b9\u30d5\u30a1\u30a4\u30bf\u30fc",
"properties":[
{
"name":"AI1",
"type":"string",
"value":"AttackInRange"
},
{
"name":"AI2",
"type":"string",
"value":"Pursue"
},
{
"name":"AI3",
"type":"string",
"value":"Cautious"
},
{
"name":"AI4",
"type":"string",
"value":"DefaultAI4"
},
{
"name":"AutoLevel",
"type":"int",
"value":1
},
{
"name":"Character",
"type":"string",
"value":"GenericHelWeak"
},
{
"name":"Equip",
"type":"string",
"value":"IronAxe"
},
{
"name":"Item",
"type":"string",
"value":"None"
},
{
"name":"Level",
"type":"int",
"value":9
}],
"rotation":0,
"type":"EnemyUnit",
"visible":true,
"width":15,
"x":129.19,
"y":32.58
},
{
"gid":306,
"height":15,
"id":3,
"name":"\u30d6\u30eb\u30fc\u30b7\u30fc\u30d5",
"properties":[
{
"name":"AI1",
"type":"string",
"value":"AttackInRange"
},
{
"name":"AI2",
"type":"string",
"value":"Pursue"
},
{
"name":"AI3",
"type":"string",
"value":"Cautious"
},
{
"name":"AI4",
"type":"string",
"value":"DefaultAI4"
},
{
"name":"AutoLevel",
"type":"int",
"value":1
},
{
"name":"Character",
"type":"string",
"value":"GenericHelWeak"
},
{
"name":"Equip",
"type":"string",
"value":"IronDagger"
},
{
"name":"Item",
"type":"string",
"value":"None"
},
{
"name":"Level",
"type":"int",
"value":9
}],
"rotation":0,
"type":"EnemyUnit",
"visible":true,
"width":16,
"x":176.19,
"y":273
},
{
"gid":384,
"height":16,
"id":4,
"name":"\u30b7\u30b9\u30bf\u30fc",
"properties":[
{
"name":"AI1",
"type":"string",
"value":"HealAllies"
},
{
"name":"AI2",
"type":"string",
"value":"Pursue"
},
{
"name":"AI3",
"type":"string",
"value":"Cautious"
},
{
"name":"AI4",
"type":"string",
"value":"DefaultAI4"
},
{
"name":"AutoLevel",
"type":"int",
"value":1
},
{
"name":"Character",
"type":"string",
"value":"GenericHelWeak"
},
{
"name":"Equip",
"type":"string",
"value":"Heal"
},
{
"name":"Item",
"type":"string",
"value":"None"
},
{
"name":"Level",
"type":"int",
"value":9
}],
"rotation":0,
"type":"EnemyUnit",
"visible":true,
"width":13,
"x":128.19,
"y":320
}],
"opacity":1,
"type":"objectgroup",
"visible":true,
"x":0,
"y":0
},
{
"draworder":"topdown",
"id":3,
"name":"Player",
"objects":[
{
"gid":399,
"height":23,
"id":5,
"name":"Eir",
"rotation":0,
"type":"",
"visible":true,
"width":16,
"x":1.20054308761281,
"y":195.48
}],
"opacity":1,
"type":"objectgroup",
"visible":true,
"x":0,
"y":0
}],
"nextlayerid":4,
"nextobjectid":6,
"orientation":"orthogonal",
"renderorder":"right-down",
"tiledversion":"1.4.1",
"tileheight":16,
"tilesets":[
{
"firstgid":1,
"source":"S3024.json"
},
{
"firstgid":301,
"source":"..\/event\/unit\/enemy_unit_set.json"
},
{
"firstgid":385,
"source":"..\/event\/unit\/player_unit_set.json"
}],
"tilewidth":16,
"type":"map",
"version":1.4,
"width":15
}
4 changes: 4 additions & 0 deletions src/chapter_event.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ extern const u8 * const event_chap_139[];
extern const u8 * const event_chap_140[];
extern const u8 * const event_chap_141[];
extern const u8 * const event_chap_142[];
extern const u8 * const event_chap_143[];

const u8 ** const events[0xff] = {
NULL,
Expand Down Expand Up @@ -296,8 +297,10 @@ const u8 ** const events[0xff] = {
event_chap_140,
event_chap_141,
event_chap_142,
event_chap_143,
};

extern const u8 * const event_chap_143_EN[];
extern const u8 * const event_chap_140_EN[];
extern const u8 * const event_chap_139_EN[];
extern const u8 * const event_chap_138_EN[];
Expand Down Expand Up @@ -548,6 +551,7 @@ const u8 ** const events_EN[0xff] = {
event_chap_140_EN,
event_chap_141,
event_chap_142,
event_chap_143_EN,
};

const u8 *** const pEvents = events;
Expand Down
6 changes: 6 additions & 0 deletions src/chapter_map.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,9 @@ extern const u8 S3022Pal[];
extern const u8 S3023Tiles[];
extern const u8 S3023_cfg[];
extern const u8 S3023Pal[];
extern const u8 S3024Tiles[];
extern const u8 S3024_cfg[];
extern const u8 S3024Pal[];

const u8 * const maps[0xff] = {
map_chap_pre,
Expand Down Expand Up @@ -742,6 +745,7 @@ const u8 * const tilesetImgs[] = {
S3021Tiles,
S3022Tiles,
S3023Tiles,
S3024Tiles,
};

const u8 ** const pTilesetImgs = tilesetImgs;
Expand Down Expand Up @@ -891,6 +895,7 @@ const u8 * const tilesetCfgs[] = {
S3021_cfg,
S3022_cfg,
S3023_cfg,
S3024_cfg,
};

const u8 ** const pTilesetCfgs = tilesetCfgs;
Expand Down Expand Up @@ -1040,6 +1045,7 @@ const u8 * const tilesetPals[] = {
S3021Pal,
S3022Pal,
S3023Pal,
S3024Pal,
};

const u8 ** const pTilesetPals = tilesetPals;
Expand Down
1 change: 1 addition & 0 deletions src/chapter_setting.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,7 @@ const struct Chapter chapters[0xff] = {
DEFINE_SIMPLE_CHAPTER_NEW(140, "3.2.1)140", MUSIC_FE_H_MAP_BOOK_2)
DEFINE_SIMPLE_CHAPTER_NEW(141, "3.2.2)141", MUSIC_FE_H_MAP_BOOK_2)
DEFINE_SIMPLE_CHAPTER_NEW(142, "3.2.3)142", MUSIC_FE_H_MAP_BOOK_2)
DEFINE_SIMPLE_CHAPTER_NEW(143, "3.2.4)143", MUSIC_FE_H_MAP_BOOK_2)
};

const struct Chapter * const pChapters2 = chapters;
Expand Down
Loading

0 comments on commit 4663cb2

Please sign in to comment.