summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-04-28 22:20:14 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-04-28 22:20:14 +0000
commit637e2647a36698969098698c338926459c6d77f8 (patch)
treee0de0df046ebd5f0f87d468f0d8c4679fec2ab90 /world
parentd2cfd0c45cfe29a9cc8df0e65523105756ec53b2 (diff)
parentcedc47c232d0c862d6183c7614f75259f2a0e746 (diff)
downloadserverdata-637e2647a36698969098698c338926459c6d77f8.tar.gz
serverdata-637e2647a36698969098698c338926459c6d77f8.tar.bz2
serverdata-637e2647a36698969098698c338926459c6d77f8.tar.xz
serverdata-637e2647a36698969098698c338926459c6d77f8.zip
Merge branch 'jesusalva/trob2' into 'master'
Shipwreck + Rum See merge request legacy/serverdata!654
Diffstat (limited to 'world')
-rw-r--r--world/map/db/const-aegis.txt1
-rw-r--r--world/map/db/item_db.conf22
-rw-r--r--world/map/db/item_db_use.txt1
-rw-r--r--world/map/npc/annuals/2022.txt11
4 files changed, 33 insertions, 2 deletions
diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt
index f8b85919..0cee5b7e 100644
--- a/world/map/db/const-aegis.txt
+++ b/world/map/db/const-aegis.txt
@@ -913,6 +913,7 @@ MauveScroll 5144
JoyplimScroll 5145
XmasSeeds 5277
Tomato 5251
+CrazyRum 5294
CottonShorts 586
JeansShorts 610
CottonSkirt 632
diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf
index 3bc6812d..1f8c975f 100644
--- a/world/map/db/item_db.conf
+++ b/world/map/db/item_db.conf
@@ -15215,6 +15215,28 @@ item_db: (
callfunc "itheal", 200, 5;
">
},
+{
+ Id: 5294
+ AegisName: "CrazyRum"
+ Name: "Crazy Rum"
+ Type: "IT_USABLE"
+ Buy: 40
+ Sell: 10
+ Weight: 2
+ Def: 0
+ Slots: 0
+ Refine: false
+ ViewSprite: 5294
+ Script: <"
+ callfunc("SC_Bonus", 60, SC_POISON, 1); //@EVOL2
+ //callfunc("SC_Bonus", 60000, SC_POISON, 1); //@TMWA
+ 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
+ //misceffect FX_MAGIC_SHIELD, strcharinfo(0); //@TMWA
+ ">
+},
/* Legs Armor */
{
diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt
index 4952e7f9..d63d75df 100644
--- a/world/map/db/item_db_use.txt
+++ b/world/map/db/item_db_use.txt
@@ -112,3 +112,4 @@
5251, Tomato, 0, 40, 10, 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_raiseattackstrength, 60, 50; sc_start sc_raiseattackspeed0, 60, 45; sc_start SC_PHYS_SHIELD, 60000, 40; misceffect FX_MAGIC_SHIELD, strcharinfo(0);},{}
diff --git a/world/map/npc/annuals/2022.txt b/world/map/npc/annuals/2022.txt
index 3b6df57a..4752b137 100644
--- a/world/map/npc/annuals/2022.txt
+++ b/world/map/npc/annuals/2022.txt
@@ -4,7 +4,7 @@
////////////////////////////////////////////////
// Red Corsair Day
-002-1,0,0,0|script|#CRC2023|32767
+002-1,29,61,0|script|#CRC2023|400
{
end;
@@ -69,8 +69,14 @@ OnExplodeT:
OnExplode:
wgm "==> Flagship sank by "+strcharinfo(0);
stopnpctimer;
- mapannounce "002-1", "Mont Blanc : Captain! Fall back!! They have damaged the outer hull!", 0;
+ mapannounce "002-1", "Mont Blanc : Captain! Fall back!! They have damaged the hull! WE ARE SINKING!! %%P", 0;
areatimer 0, "002-1", 20, 20, 100, 120, 10, "#CRC2023::OnDeMusic";
+ fakenpcname "#CRC2023", "#CRC2023", 203;
+ end;
+
+OnEndEv:
+ if (strcharinfo(0) != "Blanc" && GM < G_ADMIN) end;
+ fakenpcname "#CRC2023", "#CRC2023", 400;
end;
OnInit:
@@ -79,6 +85,7 @@ OnInit:
registercmd "#crcflagship", strnpcinfo(0)+"::OnFirst";
registercmd "#crcmobs", strnpcinfo(0)+"::OnThird";
registercmd "#crcdie", strnpcinfo(0)+"::OnExplodeT";
+ registercmd "#crcend", strnpcinfo(0)+"::OnEndEv";
end;
}