summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xchar-serverbin2044416 -> 2044416 bytes
-rw-r--r--db/constants.conf4
-rw-r--r--db/sc_config.conf8
-rw-r--r--db/si_config.conf1
-rwxr-xr-xlogin-serverbin1104736 -> 1104736 bytes
-rwxr-xr-xmap-serverbin12529488 -> 12529384 bytes
-rw-r--r--npc/magic/level1-lesser-heal.txt10
-rw-r--r--npc/magic/level2-lay-on-hands.txt12
-rw-r--r--plugins/HPMHooking_char.sobin849992 -> 849992 bytes
-rw-r--r--plugins/HPMHooking_login.sobin436584 -> 436584 bytes
-rw-r--r--plugins/HPMHooking_map.sobin3765360 -> 3765360 bytes
-rwxr-xr-xplugins/constdb2doc.sobin245032 -> 245032 bytes
-rw-r--r--plugins/db2sql.sobin326008 -> 326008 bytes
-rwxr-xr-xplugins/generate-translations.sobin248968 -> 248968 bytes
-rw-r--r--plugins/libevol_char.sobin174592 -> 174592 bytes
-rw-r--r--plugins/libevol_login.sobin231560 -> 231560 bytes
-rw-r--r--plugins/libevol_map.sobin5128528 -> 5128688 bytes
-rwxr-xr-xplugins/mapcache.sobin78688 -> 78688 bytes
-rw-r--r--plugins/sample.sobin302272 -> 302272 bytes
-rwxr-xr-xplugins/script_mapquit.sobin73568 -> 73568 bytes
20 files changed, 24 insertions, 11 deletions
diff --git a/char-server b/char-server
index 810ee4fa..19501d73 100755
--- a/char-server
+++ b/char-server
Binary files differ
diff --git a/db/constants.conf b/db/constants.conf
index 01b013ef..e3661a82 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -1216,6 +1216,10 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
SC_SKF_CAST: 675
SC_ALMIGHTY: 676
+ // Evol2 Custom Status Conditions
+ SC_PHYSICAL_SHIELD: 1000
+ SC_HALT_REGENERATION: 1001
+
comment__: "Emotes"
e_gasp: 0
e_what: 1
diff --git a/db/sc_config.conf b/db/sc_config.conf
index 145e991a..9fa7b758 100644
--- a/db/sc_config.conf
+++ b/db/sc_config.conf
@@ -3795,4 +3795,12 @@ SC_MDEFSET: {
}
Icon: "SI_MDEFSET"
}
+SC_HALT_REGENERATION: {
+ Visible: true
+ Flags: {
+ NoDeathReset: true
+ Debuff: true
+ }
+ Icon: "SI_HALT_REGENERATION"
+}
diff --git a/db/si_config.conf b/db/si_config.conf
index dc772eae..bfbf92b3 100644
--- a/db/si_config.conf
+++ b/db/si_config.conf
@@ -694,4 +694,5 @@
SI_INCMSPRATE: 1510
SI_CONFUSION: 1511
SI_MDEFSET: 1512
+ SI_HALT_REGENERATION: 1513
diff --git a/login-server b/login-server
index 3ee3aeda..7640603c 100755
--- a/login-server
+++ b/login-server
Binary files differ
diff --git a/map-server b/map-server
index 53bafb9b..5a886ede 100755
--- a/map-server
+++ b/map-server
Binary files differ
diff --git a/npc/magic/level1-lesser-heal.txt b/npc/magic/level1-lesser-heal.txt
index 88cef70f..b65f9625 100644
--- a/npc/magic/level1-lesser-heal.txt
+++ b/npc/magic/level1-lesser-heal.txt
@@ -14,9 +14,9 @@ function script SK_Lum {
if (isequipped(MagicGMTopHat))
.@ok=false;
// Ailments cannot be bypassed nor healed until Lv 3 Life Magic
- if (getstatus(SC_BLOODING))
- .@ok=false;
- if (getstatus(SC_CURSE))
+ if (getstatus(SC_BLOODING) ||
+ getstatus(SC_HALT_REGENERATION) ||
+ getstatus(SC_CURSE))
.@ok=false;
if (getstatus(SC_POISON) && !getstatus(SC_SLOWPOISON))
.@ok=false;
@@ -41,7 +41,7 @@ function script SK_Lum {
delitem Lifestone, 1;
// Real healing happens here
- .@PW=90+(10*@skillLv);
+ .@PW=60+(10*@skillLv);
.@dmg=AdjustSpellpower(.@PW);
sc_start(SC_M_LIFEPOTION, 5000, 1+max(0, .@dmg/5), 10000,
SCFLAG_NOAVOID|SCFLAG_FIXEDTICK|SCFLAG_FIXEDRATE, @skillTarget);
@@ -51,7 +51,7 @@ function script SK_Lum {
// Specifics
if (getskilllv(SKILL_MAGIC_DARK) >= 1)
- SC_Bonus(2, SC_BLOODING, 1); // FIXME SC_REBOUND? SC_MAGICMUSHROOM?
+ SC_Bonus(2, SC_HALT_REGENERATION, 1);
// Gives EXP according to how much you healed
if (@skillTarget != getcharid(3))
diff --git a/npc/magic/level2-lay-on-hands.txt b/npc/magic/level2-lay-on-hands.txt
index 65c68523..1d515324 100644
--- a/npc/magic/level2-lay-on-hands.txt
+++ b/npc/magic/level2-lay-on-hands.txt
@@ -17,9 +17,9 @@ function script SK_Inma {
if (isequipped(MagicGMTopHat))
.@ok=false;
// Ailments which prevent inma from working
- if (getstatus(SC_BLOODING))
- .@ok=false;
- if (getstatus(SC_CURSE))
+ if (getstatus(SC_BLOODING) ||
+ getstatus(SC_HALT_REGENERATION) ||
+ getstatus(SC_CURSE))
.@ok=false;
if (getstatus(SC_POISON) && !getstatus(SC_SLOWPOISON))
.@ok=false;
@@ -42,7 +42,7 @@ function script SK_Inma {
if (isequipped(MagicGMTopHat)) return; // Kill the GM event
if (.@limit <= 0) return; // No need for healing
// Apply effects
- .@PW=130+(20*@skillLv);
+ .@PW=60+(20*@skillLv);
.@dmg=AdjustSpellpower(.@PW);
// Capped to what you need or your own health - the smallest of them
@@ -58,9 +58,9 @@ function script SK_Inma {
// Specifics
if (getskilllv(SKILL_MAGIC_DARK) >= 2)
- SC_Bonus(10, SC_BLOODING, 1); // FIXME SC_REBOUND? SC_MAGICMUSHROOM?
+ SC_Bonus(10, SC_HALT_REGENERATION, 1);
else
- SC_Bonus(5, SC_BLOODING, 1); // FIXME SC_REBOUND? SC_MAGICMUSHROOM?
+ SC_Bonus(5, SC_HALT_REGENERATION, 1);
// Gives EXP according to how much you healed
setq2(MagicQuest_Healing, getq2(MagicQuest_Healing)+1);
diff --git a/plugins/HPMHooking_char.so b/plugins/HPMHooking_char.so
index 63c8a50c..04253ee9 100644
--- a/plugins/HPMHooking_char.so
+++ b/plugins/HPMHooking_char.so
Binary files differ
diff --git a/plugins/HPMHooking_login.so b/plugins/HPMHooking_login.so
index 15403374..5559aa73 100644
--- a/plugins/HPMHooking_login.so
+++ b/plugins/HPMHooking_login.so
Binary files differ
diff --git a/plugins/HPMHooking_map.so b/plugins/HPMHooking_map.so
index cb778320..2f7dfe4d 100644
--- a/plugins/HPMHooking_map.so
+++ b/plugins/HPMHooking_map.so
Binary files differ
diff --git a/plugins/constdb2doc.so b/plugins/constdb2doc.so
index f49659ec..b8734422 100755
--- a/plugins/constdb2doc.so
+++ b/plugins/constdb2doc.so
Binary files differ
diff --git a/plugins/db2sql.so b/plugins/db2sql.so
index 3d5c616a..b67cde2d 100644
--- a/plugins/db2sql.so
+++ b/plugins/db2sql.so
Binary files differ
diff --git a/plugins/generate-translations.so b/plugins/generate-translations.so
index e8269b63..ccfcc7f8 100755
--- a/plugins/generate-translations.so
+++ b/plugins/generate-translations.so
Binary files differ
diff --git a/plugins/libevol_char.so b/plugins/libevol_char.so
index 2049f40e..1e0af34b 100644
--- a/plugins/libevol_char.so
+++ b/plugins/libevol_char.so
Binary files differ
diff --git a/plugins/libevol_login.so b/plugins/libevol_login.so
index d318800e..a87231a2 100644
--- a/plugins/libevol_login.so
+++ b/plugins/libevol_login.so
Binary files differ
diff --git a/plugins/libevol_map.so b/plugins/libevol_map.so
index e3b3afa4..bbfc29e1 100644
--- a/plugins/libevol_map.so
+++ b/plugins/libevol_map.so
Binary files differ
diff --git a/plugins/mapcache.so b/plugins/mapcache.so
index 567039c3..445a431b 100755
--- a/plugins/mapcache.so
+++ b/plugins/mapcache.so
Binary files differ
diff --git a/plugins/sample.so b/plugins/sample.so
index 057f58d1..0f9f5cfd 100644
--- a/plugins/sample.so
+++ b/plugins/sample.so
Binary files differ
diff --git a/plugins/script_mapquit.so b/plugins/script_mapquit.so
index 874007c7..3c786944 100755
--- a/plugins/script_mapquit.so
+++ b/plugins/script_mapquit.so
Binary files differ