summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/spell-language4
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/magic-expr.c4
-rw-r--r--src/map/skill.h1
4 files changed, 10 insertions, 1 deletions
diff --git a/doc/spell-language b/doc/spell-language
index d5f99d8..0d00e9f 100644
--- a/doc/spell-language
+++ b/doc/spell-language
@@ -411,6 +411,8 @@ The following functions are available:
+ luk : entity -> int
+ hp : entity -> int
+ sp : entity -> int
+ + def : entity -> int
+ + mdef : entity -> int
+ max_hp : entity -> int
+ max_sp : entity -> int
+ level : entity -> int
@@ -776,7 +778,7 @@ SPELLCONF ::= (GLOBAL | ANCHOR | SPELL | PROCEDURE | ';')* (* The ';' are only
For example,
- TELEPORT-ANCHOR t = "tulimshar" @("map_3-1.gat", 44, 70)
+ TELEPORT-ANCHOR t : "tulimshar" = @("map_3-1.gat", 44, 70)
creates a teleport anchor with name `t' and invocation `tulimshar' at the speicfied location.
diff --git a/src/map/clif.c b/src/map/clif.c
index 9b45dfa..fb74cb5 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1373,6 +1373,7 @@ clif_spawn_fake_npc_for_player(struct map_session_data *sd, int fake_npc_id)
WFIFOW(fd, 0) = 0x7c;
WFIFOL(fd, 2) = fake_npc_id;
WFIFOW(fd, 6) = 0;
+ WFIFOW(fd, 8) = 0;
WFIFOW(fd, 20) = 127;
WFIFOPOS(fd, 36, sd->bl.x, sd->bl.y);
WFIFOSET(fd, packet_len_table[0x7c]);
@@ -1380,6 +1381,7 @@ clif_spawn_fake_npc_for_player(struct map_session_data *sd, int fake_npc_id)
WFIFOW(fd, 0)=0x78;
WFIFOL(fd, 2) = fake_npc_id;
WFIFOW(fd, 6) = 0;
+ WFIFOW(fd, 8) = 0;
WFIFOW(fd, 14) = 127; // identifies as NPC
WFIFOW(fd, 20) = 127;
WFIFOPOS(fd, 46, sd->bl.x, sd->bl.y);
diff --git a/src/map/magic-expr.c b/src/map/magic-expr.c
index 7840941..4f7e823 100644
--- a/src/map/magic-expr.c
+++ b/src/map/magic-expr.c
@@ -569,6 +569,8 @@ BATTLE_GETTER(luk);
BATTLE_GETTER(int);
BATTLE_GETTER(lv);
BATTLE_GETTER(hp);
+BATTLE_GETTER(mdef);
+BATTLE_GETTER(def);
BATTLE_GETTER(max_hp);
BATTLE_GETTER(dir);
@@ -1133,6 +1135,8 @@ static fun_t functions[] = {
BATTLE_RECORD(luk),
BATTLE_RECORD(int),
BATTLE_RECORD2("level", lv),
+ BATTLE_RECORD(mdef),
+ BATTLE_RECORD(def),
BATTLE_RECORD(hp),
BATTLE_RECORD(max_hp),
BATTLE_RECORD(sp),
diff --git a/src/map/skill.h b/src/map/skill.h
index 234966e..5a2e311 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -303,6 +303,7 @@ enum { // struct map_session_data の status_changeの番号テーブル
SC_SPELLBREAKER =192,
// Added for Fate's spells
+ SC_HIDE = 194, // Hide from `detect' magic
SC_HALT_REGENERATE = 195, // Suspend regeneration
SC_FLYING_BACKPACK = 196, // Flying backpack
SC_MBARRIER = 197, // Magical barrier, magic resistance (val1 : power (%))