summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoraK-FDF <horak-fdf@web.de>2024-08-07 23:25:45 +0200
committerLed Mitz <smoothshifter@tuta.io>2024-08-28 12:34:07 +0000
commitd589ad4eca2c948d1ad2f325d6bb1d52ee17dc2d (patch)
tree3ce93383c107f168275b074205c453a54e021e78
parent37f143a6cdcec9b8f7130b703be676ea40d321bf (diff)
downloadserverdata-d589ad4eca2c948d1ad2f325d6bb1d52ee17dc2d.tar.gz
serverdata-d589ad4eca2c948d1ad2f325d6bb1d52ee17dc2d.tar.bz2
serverdata-d589ad4eca2c948d1ad2f325d6bb1d52ee17dc2d.tar.xz
serverdata-d589ad4eca2c948d1ad2f325d6bb1d52ee17dc2d.zip
sc_phys_shield_item
-rw-r--r--world/map/db/const.txt1
-rw-r--r--world/map/db/item_db.conf4
-rw-r--r--world/map/db/item_db_use.txt2
-rw-r--r--world/map/npc/magic/level2-protect.txt5
4 files changed, 9 insertions, 3 deletions
diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index 24556b39..2e1aef15 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -142,6 +142,7 @@ SC_SLOWMOVE 133
SC_CANTMOVE 134
SC_ATKPOT 185
SC_MATKPOT 186
+SC_PHYS_SHIELD_ITEM 193
SC_SHEARED 194
SC_HIDE 194
SC_HALT_REGENERATE 195
diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf
index 474abb90..56d61dd2 100644
--- a/world/map/db/item_db.conf
+++ b/world/map/db/item_db.conf
@@ -16219,10 +16219,10 @@ item_db: (
callfunc("SC_Bonus", 60, SC_PLUSATTACKPOWER, 50);
callfunc("SC_Bonus", 60, SC_ATTHASTE_POTION1, 45);
//callfunc("SC_Bonus", 60, SC_PHYS_SHIELD, 40); //@EVOL2
- //callfunc("SC_Bonus", 60000, SC_PHYS_SHIELD, 40); //@TMWA
+ //callfunc("SC_Bonus", 60000, SC_PHYS_SHIELD_ITEM, 40); //@TMWA
+ //sc_end SC_PHYS_SHIELD; //@TMWA
//misceffect FX_MAGIC_SHIELD, strcharinfo(0); //@TMWA
">
- // TODO: betsanc of Crazy Rum can be chanceled with detsanc so add SC_PHYS_SHIELD_ITEM to prevent this
},
{
Id: 5309
diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt
index 162d97ae..2a2afa8b 100644
--- a/world/map/db/item_db_use.txt
+++ b/world/map/db/item_db_use.txt
@@ -113,7 +113,7 @@
5251, Tomato, 0, 100, 50, 7, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 200, 5, 1;}, {}
5263, LovePotion, 0, 90000, 550, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {callfunc "LovePotion";}, {}
//5277, XmasSeeds, 0, 9999, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {heal 150, 0, 1;}, {}
-5294, CrazyRum, 0, 40, 10, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start SC_POISON, 60000, 1; sc_start SC_ATKPOT, 60, 50; sc_start SC_SPEEDPOTION0, 60, 45; sc_start SC_PHYS_SHIELD, 60000, 40; misceffect FX_MAGIC_SHIELD, strcharinfo(0);},{}
+5294, CrazyRum, 0, 40, 10, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start SC_POISON, 60000, 1; sc_start SC_ATKPOT, 60, 50; sc_start SC_SPEEDPOTION0, 60, 45; sc_start SC_PHYS_SHIELD_ITEM, 60000, 40; sc_end SC_PHYS_SHIELD; misceffect FX_MAGIC_SHIELD, strcharinfo(0);},{}
5309, ManaDust, 0, 125, 50, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 35, 15, 1;}, {}
5310, EnlighteningElixir, 0, 500, 250, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start SC_MATKPOT, 60, 100;}, {}
5312, Honey, 0, 300, 150, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 200, 50, 1;}, {}
diff --git a/world/map/npc/magic/level2-protect.txt b/world/map/npc/magic/level2-protect.txt
index 7abc9a1a..4a642878 100644
--- a/world/map/npc/magic/level2-protect.txt
+++ b/world/map/npc/magic/level2-protect.txt
@@ -1,5 +1,6 @@
-|script|protect|32767
{
+ if (sc_check(SC_PHYS_SHIELD_ITEM)) goto L_Itsanc; // itsanc has top priority and cant be overwritten by betsanc
if(call("magic_checks")) end;
if (Sp < 14) end;
set .@level, getskilllv(.school);
@@ -44,6 +45,10 @@ OnEnd:
misceffect FX_MAGIC_SHIELD_ENDS, strcharinfo(0);
end;
+L_Itsanc:
+ message strcharinfo(0), "Shield : You are still Itsanced this blocks your spell.";
+ end;
+
L_SpecialRules6:
if ($@KIMARR_EVENT < 1) goto L_Pay;
if (@target_id == BL_ID) goto L_Pay;