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

Commit

Permalink
Chapter 231
Browse files Browse the repository at this point in the history
  • Loading branch information
@laqieer
laqieer committed Aug 10, 2020
1 parent 36490ad commit dfed055
Show file tree
Hide file tree
Showing 8 changed files with 2,255 additions and 0 deletions.
574 changes: 574 additions & 0 deletions res/map/new_map/S4072.json
View file

Large diffs are not rendered by default.

330 changes: 330 additions & 0 deletions res/map/new_map/event_chap_231.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,330 @@
{ "compressionlevel":-1,
"height":20,
"infinite":false,
"layers":[
{
"data":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300],
"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":323,
"height":15,
"id":1,
"name":"\u50ac\u7720\u30e6\u30ea\u30a2",
"properties":[
{
"name":"AI1",
"type":"string",
"value":"AttackInRange"
},
{
"name":"AI2",
"type":"string",
"value":"DontMove"
},
{
"name":"AI3",
"type":"string",
"value":"NoRecovery"
},
{
"name":"AI4",
"type":"string",
"value":"DefaultAI4"
},
{
"name":"AutoLevel",
"type":"int",
"value":1
},
{
"name":"Character",
"type":"string",
"value":"GenericSummonedStrong"
},
{
"name":"Equip",
"type":"string",
"value":"Gespenst"
},
{
"name":"Item",
"type":"string",
"value":"None"
},
{
"name":"Level",
"type":"int",
"value":30
}],
"rotation":0,
"type":"EnemyUnit",
"visible":true,
"width":16,
"x":176.802431610942,
"y":64.36
},
{
"gid":375,
"height":16,
"id":2,
"name":"",
"properties":[
{
"name":"AI1",
"type":"string",
"value":"AttackInRange"
},
{
"name":"AI2",
"type":"string",
"value":"DontMove"
},
{
"name":"AI3",
"type":"string",
"value":"NoRecovery"
},
{
"name":"AI4",
"type":"string",
"value":"DefaultAI4"
},
{
"name":"AutoLevel",
"type":"int",
"value":1
},
{
"name":"Character",
"type":"string",
"value":"GenericElf"
},
{
"name":"Equip",
"type":"string",
"value":"SilverLance"
},
{
"name":"Item",
"type":"string",
"value":"None"
},
{
"name":"Level",
"type":"int",
"value":30
}],
"rotation":0,
"type":"EnemyUnit",
"visible":true,
"width":16,
"x":176.802431610942,
"y":48
},
{
"gid":328,
"height":23,
"id":3,
"name":"",
"properties":[
{
"name":"AI1",
"type":"string",
"value":"AttackInRange"
},
{
"name":"AI2",
"type":"string",
"value":"DontMove"
},
{
"name":"AI3",
"type":"string",
"value":"NoRecovery"
},
{
"name":"AI4",
"type":"string",
"value":"DefaultAI4"
},
{
"name":"AutoLevel",
"type":"int",
"value":1
},
{
"name":"Character",
"type":"string",
"value":"GenericElf"
},
{
"name":"Equip",
"type":"string",
"value":"Tomahawk"
},
{
"name":"Item",
"type":"string",
"value":"None"
},
{
"name":"Level",
"type":"int",
"value":30
}],
"rotation":0,
"type":"EnemyUnit",
"visible":true,
"width":16,
"x":96,
"y":48
},
{
"gid":371,
"height":21,
"id":4,
"name":"",
"properties":[
{
"name":"AI1",
"type":"string",
"value":"AttackInRange"
},
{
"name":"AI2",
"type":"string",
"value":"DontMove"
},
{
"name":"AI3",
"type":"string",
"value":"NoRecovery"
},
{
"name":"AI4",
"type":"string",
"value":"DefaultAI4"
},
{
"name":"AutoLevel",
"type":"int",
"value":1
},
{
"name":"Character",
"type":"string",
"value":"GenericElf"
},
{
"name":"Equip",
"type":"string",
"value":"SilverSword"
},
{
"name":"Item",
"type":"string",
"value":"None"
},
{
"name":"Level",
"type":"int",
"value":30
}],
"rotation":0,
"type":"EnemyUnit",
"visible":true,
"width":16,
"x":224,
"y":274
}],
"opacity":1,
"type":"objectgroup",
"visible":true,
"x":0,
"y":0
},
{
"draworder":"topdown",
"id":3,
"name":"Player",
"objects":[
{
"gid":403,
"height":16,
"id":6,
"name":"Srasir",
"rotation":0,
"type":"",
"visible":true,
"width":13,
"x":0,
"y":240
},
{
"gid":404,
"height":23,
"id":7,
"name":"Mirabilis",
"rotation":0,
"type":"",
"visible":true,
"width":16,
"x":0.190689489681652,
"y":224.91
},
{
"gid":404,
"height":23,
"id":8,
"name":"Peony",
"rotation":0,
"type":"",
"visible":true,
"width":16,
"x":0.702607582786756,
"y":258.77
}],
"opacity":1,
"type":"objectgroup",
"visible":true,
"x":0,
"y":0
}],
"nextlayerid":4,
"nextobjectid":9,
"orientation":"orthogonal",
"renderorder":"right-down",
"tiledversion":"1.4.2",
"tileheight":16,
"tilesets":[
{
"firstgid":1,
"source":"S4072.json"
},
{
"firstgid":301,
"source":"..\/event\/unit\/enemy_unit_set.json"
},
{
"firstgid":387,
"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 @@ -238,6 +238,7 @@ extern const u8 * const event_chap_227[];
extern const u8 * const event_chap_228[];
extern const u8 * const event_chap_229[];
extern const u8 * const event_chap_230[];
extern const u8 * const event_chap_231[];

const u8 ** const events[0xff] = {
NULL,
Expand Down Expand Up @@ -472,8 +473,10 @@ const u8 ** const events[0xff] = {
event_chap_228,
event_chap_229,
event_chap_230,
event_chap_231,
};

extern const u8 * const event_chap_231_EN[];
extern const u8 * const event_chap_230_EN[];
extern const u8 * const event_chap_229_EN[];
extern const u8 * const event_chap_228_EN[];
Expand Down Expand Up @@ -898,6 +901,7 @@ const u8 ** const events_EN[0xff] = {
event_chap_228_EN,
event_chap_229_EN,
event_chap_230_EN,
event_chap_231_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 @@ -783,6 +783,9 @@ extern const u8 S4065Pal[];
extern const u8 S4071Tiles[];
extern const u8 S4071_cfg[];
extern const u8 S4071Pal[];
extern const u8 S4072Tiles[];
extern const u8 S4072_cfg[];
extern const u8 S4072Pal[];

const u8 * const maps[0xff] = {
map_chap_pre,
Expand Down Expand Up @@ -1112,6 +1115,7 @@ const u8 * const tilesetImgs[] = {
S4064Tiles,
S4065Tiles,
S4071Tiles,
S4072Tiles,
};

const u8 ** const pTilesetImgs = tilesetImgs;
Expand Down Expand Up @@ -1349,6 +1353,7 @@ const u8 * const tilesetCfgs[] = {
S4064_cfg,
S4065_cfg,
S4071_cfg,
S4072_cfg,
};

const u8 ** const pTilesetCfgs = tilesetCfgs;
Expand Down Expand Up @@ -1586,6 +1591,7 @@ const u8 * const tilesetPals[] = {
S4064Pal,
S4065Pal,
S4071Pal,
S4072Pal,
};

const u8 ** const pTilesetPals = tilesetPals;
Expand Down
Loading

0 comments on commit dfed055

Please sign in to comment.