summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2022-04-18 15:40:00 -0300
committerGitHub <noreply@github.com>2022-04-18 18:40:00 +0000
commitdbd6750203eadadd4f7c89da0e1305b61eaa7031 (patch)
treefb0453d15c6a3f3ac449fe1d41542954c43472bd /world/map
parent18fb4177bb7e9ebbba2d73ab0a5a24b7d0c180b1 (diff)
downloadserverdata-dbd6750203eadadd4f7c89da0e1305b61eaa7031.tar.gz
serverdata-dbd6750203eadadd4f7c89da0e1305b61eaa7031.tar.bz2
serverdata-dbd6750203eadadd4f7c89da0e1305b61eaa7031.tar.xz
serverdata-dbd6750203eadadd4f7c89da0e1305b61eaa7031.zip
Developer's Cleanup (#611)
* Remove several unreleased quest items. Developers will re-add them as their quests are completed. REMOVED: - White Wizard Robe - Black Wizard Robe - Light Crystal - Crypt Key - Ectoplasm - Urn - Wraith Horn - Astral Cube - Runestone A, L, N, T and W - Quill of Binding - Blood Ink - Scented Candle Helmet - Assassin Ring - Assassin Amulet Also cleans up some stuff for the event.
Diffstat (limited to 'world/map')
-rw-r--r--world/map/db/item_db_chest.txt2
-rw-r--r--world/map/db/item_db_generic.txt28
-rw-r--r--world/map/db/item_db_head.txt2
-rw-r--r--world/map/db/item_db_trinket.txt4
-rw-r--r--world/map/npc/027-3/general_krukan_door.txt3
-rw-r--r--world/map/npc/027-4/general_razha_door.txt3
-rw-r--r--world/map/npc/027-5/general_terogan_door.txt3
-rw-r--r--world/map/npc/annuals/2022.txt22
8 files changed, 33 insertions, 34 deletions
diff --git a/world/map/db/item_db_chest.txt b/world/map/db/item_db_chest.txt
index e4e73a3b..90367271 100644
--- a/world/map/db/item_db_chest.txt
+++ b/world/map/db/item_db_chest.txt
@@ -9,8 +9,6 @@
645, GoldenPlatemail, 5, 9999000, 3000, 4500, 0, 25, 0, -100, 0, 2, 512, 0, 0, 0, {}, {}
649, WhiteEvokersRobeBlue, 5, 8000, 4000, 5, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1; bonus bCriticalDef, 10;}
650, BlackEvokersRobeBlue, 5, 8000, 4000, 5, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1; bonus bCriticalDef, 10;}
-651, WhiteWizardRobe, 5, 8000, 4000, 5, 0, 5, 0, 0, 0, 2, 512, 0, 0, 0, {}, {}
-652, BlackWizardRobe, 5, 8000, 4000, 5, 0, 5, 0, 0, 0, 2, 512, 0, 0, 0, {}, {}
653, ApprenticeRobe, 5, 8000, 4000, 5, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1; bonus bCriticalDef, 10;}
658, WarlordPlate, 5, 100000, 3000, 2600, 0, 27, 0, -170, 0, 2, 512, 0, 0, 0, {}, {}
659, GoldenWarlordPlate, 5, 500000, 4000, 7600, 0, 27, 0, -110, 0, 2, 512, 0, 0, 0, {}, {}
diff --git a/world/map/db/item_db_generic.txt b/world/map/db/item_db_generic.txt
index dedc7cc2..7475591e 100644
--- a/world/map/db/item_db_generic.txt
+++ b/world/map/db/item_db_generic.txt
@@ -159,7 +159,6 @@
1211, YellowEasterEgg, 3, 80, 40, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
1212, PinkEasterEgg, 3, 80, 40, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
1213, TealEasterEgg, 3, 80, 40, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-1228, LightCrystal, 3, 1000, 250, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
1233, FakeFangs, 3, 20000, 10000, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {}, {}
1234, RedOrnament, 3, 5000, 1, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {}, {}
1235, YellowOrnament, 3, 5000, 1, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {}, {}
@@ -218,19 +217,7 @@
4041, FlightTalisman, 3, 5000, 1200, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
5110, Bloodstone, 3, 2000, 250, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
5111, BrainStem, 3, 180, 90, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-5112, CryptKey, 3, 300, 150, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-5113, Ectoplasm, 3, 80, 20, 4, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {}, {}
-5114, Urn, 3, 40, 20, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
5115, VampireBatWing, 3, 700, 20, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-5116, WraithHorn, 3, 700, 20, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-5117, AstralCube, 3, 10000, 10, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-5118, RunestoneA, 3, 1000, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-5119, RunestoneL, 3, 1000, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-5120, RunestoneN, 3, 1000, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-5121, RunestoneT, 3, 1000, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-5122, RunestoneW, 3, 1000, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-5123, QuillOfBinding, 3, 10, 10, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-5124, BloodInk, 3, 10, 10, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
5125, UnderworldKey, 3, 10, 10, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
5127, JarofOwnBlood, 3, 200, 100, 375, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
1197, SkeletonCharm, 3, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
@@ -251,3 +238,18 @@
5256, PVPCoin, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
5265, LoveLetter, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
5279, Carrot, 3, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+// Unreleased items
+//1228, LightCrystal, 3, 1000, 250, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+//5112, CryptKey, 3, 300, 150, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+//5113, Ectoplasm, 3, 80, 20, 4, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {}, {}
+//5114, Urn, 3, 40, 20, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+//5116, WraithHorn, 3, 700, 20, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+//5117, AstralCube, 3, 10000, 10, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+//5118, RunestoneA, 3, 1000, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+//5119, RunestoneL, 3, 1000, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+//5120, RunestoneN, 3, 1000, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+//5121, RunestoneT, 3, 1000, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+//5122, RunestoneW, 3, 1000, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+//5123, QuillOfBinding, 3, 10, 10, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+//5124, BloodInk, 3, 10, 10, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+
diff --git a/world/map/db/item_db_head.txt b/world/map/db/item_db_head.txt
index 1a2b4678..82559504 100644
--- a/world/map/db/item_db_head.txt
+++ b/world/map/db/item_db_head.txt
@@ -199,7 +199,7 @@
5227, JazzyHat, 5, 3000, 1500, 20, 0, 13, 0, 2, 0, 2, 256, 0, 0, 0, {}, {}
5228, ChicSantaHat, 5, 400, 200, 20, 0, 2, 0, -2, 0, 2, 256, 0, 0, 0, {}, {}
//ID, Name___________________, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript}
-5229, ScentedCandleHelmet, 5, 20000, 1, 450, 0, 10, 0, 0, 0, 2, 256, 0, 0, 0, {}, {bonus bInt, 2; addtimer 1, "ScentedCandle::OnEquip";}
+//5229, ScentedCandleHelmet, 5, 20000, 1, 450, 0, 10, 0, 0, 0, 2, 256, 0, 0, 0, {}, {bonus bInt, 2; addtimer 1, "ScentedCandle::OnEquip";}
5230, AnniversaryHat, 5, 100000, 1, 100, 0, 12, 0, 0, 0, 2, 256, 0, 0, 0, {}, {bonus bInt, 2;}
5231, RedPresentHat, 5, 1000, 1, 60, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
5232, GreenPresentHat, 5, 1000, 1, 60, 0, 1, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
diff --git a/world/map/db/item_db_trinket.txt b/world/map/db/item_db_trinket.txt
index f230466d..aa2ab1aa 100644
--- a/world/map/db/item_db_trinket.txt
+++ b/world/map/db/item_db_trinket.txt
@@ -21,6 +21,6 @@
677, HeartNecklace, 5, 2500, 0, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {}
5252, GuardianWings, 5, 0, 0, 1, 0, 0, 0, 0, 0, 2, 16, 0, 0, 0, {}, {}
5253, MageRing, 5, 0, 0, 1, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, {bonus bInt, 1;}
-5268, AssassinRing, 5, 0, 0, 1, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, {callfunc "BrawlingItem"; bonus bAgi, 1; bonus bCritical, 5; bonus bAspdRate, 5;}
-5269, AssassinAmulet, 5, 0, 0, 1, 0, 0, 0, 0, 0, 2, 16, 0, 0, 0, {}, {callfunc "BrawlingItem"; bonus bAgi, 1; bonus bDoubleAddRate, 5; bonus bHit, 25;}
+//5268, AssassinRing, 5, 0, 0, 1, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, {callfunc "BrawlingItem"; bonus bAgi, 1; bonus bCritical, 5; bonus bAspdRate, 5;}
+//5269, AssassinAmulet, 5, 0, 0, 1, 0, 0, 0, 0, 0, 2, 16, 0, 0, 0, {}, {callfunc "BrawlingItem"; bonus bAgi, 1; bonus bDoubleAddRate, 5; bonus bHit, 25;}
5270, ManaPearl, 5, 0, 0, 0, 0, 0, 0, 11, 0, 2, 16, 0, 0, 0, {}, {callfunc "ManaPearlItem"; bonus bInt, 1; bonus bMdef, 11; bonus bMaxSP, 55;}
diff --git a/world/map/npc/027-3/general_krukan_door.txt b/world/map/npc/027-3/general_krukan_door.txt
index 9ac26203..22134a4b 100644
--- a/world/map/npc/027-3/general_krukan_door.txt
+++ b/world/map/npc/027-3/general_krukan_door.txt
@@ -3,10 +3,9 @@
027-3,82,88,0|script|#GeneralDoor1|45,1,0
{
- if ( (countitem("CryptKey") < 10) && ($@CRYPT_FIGHT1 != 0) )
+ if ( ($@CRYPT_FIGHT1 != 0) )
goto L_NoKeys;
- delitem "CryptKey", 10;
warp "027-6",39,60;
goto L_Close;
diff --git a/world/map/npc/027-4/general_razha_door.txt b/world/map/npc/027-4/general_razha_door.txt
index c7adf137..7d947368 100644
--- a/world/map/npc/027-4/general_razha_door.txt
+++ b/world/map/npc/027-4/general_razha_door.txt
@@ -3,10 +3,9 @@
027-4,73,76,0|script|#GeneralDoor2|45,1,0
{
- if ( (countitem("CryptKey") < 10) && ($@CRYPT_FIGHT2 != 0) )
+ if ( ($@CRYPT_FIGHT2 != 0) )
goto L_NoKeys;
- delitem "CryptKey", 10;
warp "027-7",39,60;
goto L_Close;
diff --git a/world/map/npc/027-5/general_terogan_door.txt b/world/map/npc/027-5/general_terogan_door.txt
index 93f4d8c1..9f43b5c9 100644
--- a/world/map/npc/027-5/general_terogan_door.txt
+++ b/world/map/npc/027-5/general_terogan_door.txt
@@ -3,10 +3,9 @@
027-5,70,25,0|script|#GeneralDoor3|45,1,0
{
- if ( (countitem("CryptKey") < 10) && ($@CRYPT_FIGHT3 != 0) )
+ if ( ($@CRYPT_FIGHT3 != 0) )
goto L_NoKeys;
- delitem "CryptKey", 10;
warp "027-8",39,60;
goto L_Close;
diff --git a/world/map/npc/annuals/2022.txt b/world/map/npc/annuals/2022.txt
index e215d7c2..3c2d4dbb 100644
--- a/world/map/npc/annuals/2022.txt
+++ b/world/map/npc/annuals/2022.txt
@@ -12,7 +12,7 @@ OnFirst:
if (strcharinfo(0) != "Blanc" && GM < G_SYSOP) end;
wgm "==> CRC Day Phase 1 Started by "+strcharinfo(0);
set $@CRC22, 1;
- enablenpc "Unknown Ship";
+ enablenpc "Red Bearer";
initnpctimer;
goto OnTimer30000;
@@ -20,8 +20,9 @@ OnSecond:
if (strcharinfo(0) != "Cerise" && GM < G_SYSOP) end;
wgm "==> CRC Day Phase 2 Started by "+strcharinfo(0);
set $@CRC22, 2;
- disablenpc "Unknown Ship";
- enablenpc "Zax De'Kagen#CRC";
+ disablenpc "Red Bearer";
+ //enablenpc "Zax De'Kagen#CRC";
+ // set the sprite (implies enablenpc)
fakenpcname "Zax De'Kagen#CRC", "Zax De'Kagen#CRC", 1142;
initnpctimer;
goto L_Extra;
@@ -30,7 +31,7 @@ OnThird:
if (strcharinfo(0) != "Cerise" && GM < G_SYSOP) end;
wgm "==> CRC Day Phase 3 Started by "+strcharinfo(0);
set $@CRC22, 3;
- disablenpc "Enemy Ship";
+ disablenpc "Halifax";
stopnpctimer;
end;
@@ -247,7 +248,7 @@ OnInit:
}
// Puppets
-008-1,140,72,0|script|Enemy Ship|395
+008-1,140,74,0|script|Halifax|395
{
end;
OnInit:
@@ -256,7 +257,7 @@ OnInit:
}
// Puppets
-018-1,142,74,0|script|Unknown Ship|395
+018-1,142,75,0|script|Red Bearer|395
{
end;
OnInit:
@@ -274,11 +275,12 @@ OnInit:
}
// Puppets
-020-1,76,85,0|script|Zax De'Kagen#CRC|425
+020-1,76,85,0|script|Zax De'Kagen#CRC|400
{
- mes "[Zax De'Kagen]";
- mes "\"I will not tolerate people trying to defile my world. I'm sealing the lake, and that's final.\"";
- close;
+ //mes "[Zax De'Kagen]";
+ //mes "\"I will not tolerate people trying to defile my world. I'm sealing the lake, and that's final.\"";
+ //close;
+ end;
OnInit:
disablenpc strnpcinfo(0);
end;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 21:39:40 +0000