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

Commit

Permalink
Bugfix: Claws negates defense; Claws' poison effect; Chapter 170.
Browse files Browse the repository at this point in the history
  • Loading branch information
@laqieer
laqieer committed Jul 26, 2020
1 parent bf7a241 commit 388e215
Show file tree
Hide file tree
Showing 10 changed files with 2,171 additions and 5 deletions.
474 changes: 474 additions & 0 deletions res/map/new_map/S3081.json
View file

Large diffs are not rendered by default.

Binary file modified res/map/new_map/S3081.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.
320 changes: 320 additions & 0 deletions res/map/new_map/event_chap_170.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,320 @@
{ "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":"",
"properties":[
{
"name":"AI1",
"type":"string",
"value":"AttackInRange"
},
{
"name":"AI2",
"type":"string",
"value":"Pursue"
},
{
"name":"AI3",
"type":"string",
"value":"NoRecovery"
},
{
"name":"AI4",
"type":"string",
"value":"DefaultAI4"
},
{
"name":"AutoLevel",
"type":"int",
"value":1
},
{
"name":"Character",
"type":"string",
"value":"Srasir"
},
{
"name":"Equip",
"type":"string",
"value":"Elfire"
},
{
"name":"Item",
"type":"string",
"value":"None"
},
{
"name":"Level",
"type":"int",
"value":30
}],
"rotation":0,
"type":"EnemyUnit",
"visible":true,
"width":13,
"x":160.86,
"y":17.2145256758919
},
{
"gid":381,
"height":16,
"id":2,
"name":"",
"properties":[
{
"name":"AI1",
"type":"string",
"value":"AttackInRange"
},
{
"name":"AI2",
"type":"string",
"value":"Pursue"
},
{
"name":"AI3",
"type":"string",
"value":"NoRecovery"
},
{
"name":"AI4",
"type":"string",
"value":"DefaultAI4"
},
{
"name":"AutoLevel",
"type":"int",
"value":1
},
{
"name":"Character",
"type":"string",
"value":"GenericHel"
},
{
"name":"Equip",
"type":"string",
"value":"LethalClaw"
},
{
"name":"Item",
"type":"string",
"value":"None"
},
{
"name":"Level",
"type":"int",
"value":30
}],
"rotation":0,
"type":"EnemyUnit",
"visible":true,
"width":15,
"x":224.898896176612,
"y":128.812669972804
},
{
"gid":328,
"height":23,
"id":3,
"name":"",
"properties":[
{
"name":"AI1",
"type":"string",
"value":"AttackInRange"
},
{
"name":"AI2",
"type":"string",
"value":"Pursue"
},
{
"name":"AI3",
"type":"string",
"value":"NoRecovery"
},
{
"name":"AI4",
"type":"string",
"value":"DefaultAI4"
},
{
"name":"AutoLevel",
"type":"int",
"value":1
},
{
"name":"Character",
"type":"string",
"value":"GenericSummoned"
},
{
"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":48,
"y":80
},
{
"gid":383,
"height":18,
"id":4,
"name":"",
"properties":[
{
"name":"AI1",
"type":"string",
"value":"AttackInRange"
},
{
"name":"AI2",
"type":"string",
"value":"Pursue"
},
{
"name":"AI3",
"type":"string",
"value":"NoRecovery"
},
{
"name":"AI4",
"type":"string",
"value":"DefaultAI4"
},
{
"name":"AutoLevel",
"type":"int",
"value":1
},
{
"name":"Character",
"type":"string",
"value":"GenericHel"
},
{
"name":"Equip",
"type":"string",
"value":"Luna"
},
{
"name":"Item",
"type":"string",
"value":"None"
},
{
"name":"Level",
"type":"int",
"value":30
}],
"rotation":0,
"type":"EnemyUnit",
"visible":true,
"width":8,
"x":0,
"y":96
}],
"opacity":1,
"type":"objectgroup",
"visible":true,
"x":0,
"y":0
},
{
"draworder":"topdown",
"id":3,
"name":"Player",
"objects":[
{
"gid":392,
"height":15,
"id":5,
"name":"Yurg",
"rotation":0,
"type":"",
"visible":true,
"width":15,
"x":-0.345064789633657,
"y":177.444888817789
},
{
"gid":398,
"height":22,
"id":6,
"name":"Surtr",
"rotation":0,
"type":"",
"visible":true,
"width":16,
"x":225.434650455927,
"y":291.51
}],
"opacity":1,
"type":"objectgroup",
"visible":true,
"x":0,
"y":0
}],
"nextlayerid":4,
"nextobjectid":7,
"orientation":"orthogonal",
"renderorder":"right-down",
"tiledversion":"1.4.1",
"tileheight":16,
"tilesets":[
{
"firstgid":1,
"source":"S3081.json"
},
{
"firstgid":301,
"source":"..\/event\/unit\/enemy_unit_set.json"
},
{
"firstgid":386,
"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 @@ -177,6 +177,7 @@ extern const u8 * const event_chap_166[];
extern const u8 * const event_chap_167[];
extern const u8 * const event_chap_168[];
extern const u8 * const event_chap_169[];
extern const u8 * const event_chap_170[];

const u8 ** const events[0xff] = {
NULL,
Expand Down Expand Up @@ -350,8 +351,10 @@ const u8 ** const events[0xff] = {
event_chap_167,
event_chap_168,
event_chap_169,
event_chap_170,
};

extern const u8 * const event_chap_170_EN[];
extern const u8 * const event_chap_169_EN[];
extern const u8 * const event_chap_168_EN[];
extern const u8 * const event_chap_167_EN[];
Expand Down Expand Up @@ -656,6 +659,7 @@ const u8 ** const events_EN[0xff] = {
event_chap_167_EN,
event_chap_168_EN,
event_chap_169_EN,
event_chap_170_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 @@ -600,6 +600,9 @@ extern const u8 S3074Pal[];
extern const u8 S3075Tiles[];
extern const u8 S3075_cfg[];
extern const u8 S3075Pal[];
extern const u8 S3081Tiles[];
extern const u8 S3081_cfg[];
extern const u8 S3081Pal[];

const u8 * const maps[0xff] = {
map_chap_pre,
Expand Down Expand Up @@ -868,6 +871,7 @@ const u8 * const tilesetImgs[] = {
S3073Tiles,
S3074Tiles,
S3075Tiles,
S3081Tiles,
};

const u8 ** const pTilesetImgs = tilesetImgs;
Expand Down Expand Up @@ -1044,6 +1048,7 @@ const u8 * const tilesetCfgs[] = {
S3073_cfg,
S3074_cfg,
S3075_cfg,
S3081_cfg,
};

const u8 ** const pTilesetCfgs = tilesetCfgs;
Expand Down Expand Up @@ -1220,6 +1225,7 @@ const u8 * const tilesetPals[] = {
S3073Pal,
S3074Pal,
S3075Pal,
S3081Pal,
};

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 @@ -683,6 +683,7 @@ const struct Chapter chapters[0xff] = {
DEFINE_SIMPLE_CHAPTER_WITH_MAP_CHANGE(167, "3.7.3)167", MUSIC_FE_776_SORROW, 33)
DEFINE_SIMPLE_CHAPTER_WITH_MAP_CHANGE(168, "3.7.4)168", MUSIC_FE_GAIDEN_FINAL_MAP, 34)
DEFINE_SIMPLE_CHAPTER_WITH_MAP_CHANGE(169, "3.7.5)169", MUSIC_FE_776_DESTINY, 35)
DEFINE_SIMPLE_CHAPTER_NEW(170, "3.8.1)170", MUSIC_FE_AWAKENING_MAIN_THEME_TITLE)
};

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

0 comments on commit 388e215

Please sign in to comment.