diff options
| -rw-r--r-- | db/constants.conf | 26 | ||||
| -rw-r--r-- | doc/constants.md | 6 | ||||
| -rw-r--r-- | src/map/map.c | 3 | ||||
| -rw-r--r-- | src/map/map.h | 5 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
5 files changed, 32 insertions, 11 deletions
diff --git a/db/constants.conf b/db/constants.conf index 598bc89c4..1914c1f15 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -426,17 +426,20 @@ constants_db: { mf_pairship_endable: 58 comment__: "Cell Properties" - cell_walkable: 0 - cell_shootable: 1 - cell_water: 2 - cell_npc: 3 - cell_basilica: 4 - cell_landprotector: 5 - cell_novending: 6 - cell_nochat: 7 + cell_walkable: 0 + cell_shootable: 1 + cell_water: 2 + cell_npc: 3 + cell_basilica: 4 + cell_landprotector: 5 + cell_novending: 6 + cell_nochat: 7 + cell_icewall: 8 + cell_noicewall: 9 + cell_noskill: 10 comment__: "Cell checks" - //cell_gettype: 0 + cell_gettype: 0 cell_chkwall: 1 cell_chkwater: 2 cell_chkcliff: 3 @@ -444,12 +447,15 @@ constants_db: { cell_chkreach: 5 cell_chknopass: 6 cell_chknoreach: 7 - //cell_chkstack: 8 + cell_chkstack: 8 cell_chknpc: 9 cell_chkbasilica: 10 cell_chklandprotector: 11 cell_chknovending: 12 cell_chknochat: 13 + cell_chkicewall: 14 + cell_chknoicewall: 15 + cell_chknoskill: 16 comment__: "Bonuses / Parameter IDs" bMaxHP: 6 diff --git a/doc/constants.md b/doc/constants.md index 8b3acbfdf..fb868e847 100644 --- a/doc/constants.md +++ b/doc/constants.md @@ -373,6 +373,9 @@ - `cell_landprotector`: 5 - `cell_novending`: 6 - `cell_nochat`: 7 +- `cell_icewall`: 8 +- `cell_noicewall`: 9 +- `cell_noskill`: 10 ### Cell checks @@ -388,6 +391,9 @@ - `cell_chklandprotector`: 11 - `cell_chknovending`: 12 - `cell_chknochat`: 13 +- `cell_chkicewall`: 14 +- `cell_chknoicewall`: 15 +- `cell_chknoskill`: 16 ### Bonuses / Parameter IDs diff --git a/src/map/map.c b/src/map/map.c index 6212493c8..440634467 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3058,6 +3058,8 @@ static int map_getcellp(struct map_data *m, const struct block_list *bl, int16 x return (cell.icewall); case CELL_CHKNOICEWALL: return (cell.noicewall); + case CELL_CHKNOSKILL: + return (cell.noskill); // special checks case CELL_CHKPASS: @@ -3122,6 +3124,7 @@ static void map_setcell(int16 m, int16 x, int16 y, cell_t cell, bool flag) case CELL_NOCHAT: map->list[m].cell[j].nochat = flag; break; case CELL_ICEWALL: map->list[m].cell[j].icewall = flag; break; case CELL_NOICEWALL: map->list[m].cell[j].noicewall = flag; break; + case CELL_NOSKILL: map->list[m].cell[j].noskill = flag; break; default: ShowWarning("map_setcell: invalid cell type '%d'\n", (int)cell); diff --git a/src/map/map.h b/src/map/map.h index ace2a35a1..6c09746a6 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -656,6 +656,7 @@ typedef enum { CELL_NOCHAT, CELL_ICEWALL, CELL_NOICEWALL, + CELL_NOSKILL, } cell_t; @@ -680,6 +681,7 @@ typedef enum { CELL_CHKNOCHAT, CELL_CHKICEWALL, CELL_CHKNOICEWALL, + CELL_CHKNOSKILL, } cell_chk; @@ -698,7 +700,8 @@ struct mapcell { novending : 1, nochat : 1, icewall : 1, - noicewall : 1; + noicewall : 1, + noskill : 1; #ifdef CELL_NOSTACK int cell_bl; //Holds amount of bls in this cell. diff --git a/src/map/skill.c b/src/map/skill.c index 069db55df..875c06a5b 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1009,6 +1009,9 @@ static int skillnotok(uint16 skill_id, struct map_session_data *sd) if (pc_has_permission(sd, PC_PERM_SKILL_UNCONDITIONAL)) return 0; // can do any damn thing they want + if (map->getcell(sd->bl.m, &sd->bl, sd->bl.x, sd->bl.y, CELL_CHKNOSKILL)) + return 1; // block usage on 'noskill' cells [Wolfie] + if( skill_id == AL_TELEPORT && sd->skillitem == skill_id && sd->skillitemlv > 2 ) return 0; // Teleport lv 3 bypasses this check.[Inkfish] |