summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
m---------client-data0
m---------tools0
-rw-r--r--world/map/db/chest_item_db.txt3
-rw-r--r--world/map/db/generic_item_db.txt1
-rw-r--r--world/map/db/head_item_db.txt1
-rw-r--r--world/map/db/leg_item_db.txt2
-rw-r--r--world/map/db/trinket_item_db.txt3
-rw-r--r--world/map/npc/007-1/witch.txt43
-rw-r--r--world/map/npc/052-1/channelling.txt6
-rw-r--r--world/map/npc/052-2/lobby.txt3
-rw-r--r--world/map/npc/052-2/partyroom.txt6
11 files changed, 27 insertions, 41 deletions
diff --git a/client-data b/client-data
-Subproject f80943a652886c211d1e24312fb9b09a73b2b7b
+Subproject 1c2bad3fb90cf5a5192a69fd04750fa8377df7b
diff --git a/tools b/tools
-Subproject 5949e1c21c1db7f514f27c142c19383d3f86654
+Subproject d8f85017074530278ea87fe76dce02340614753
diff --git a/world/map/db/chest_item_db.txt b/world/map/db/chest_item_db.txt
index fc403a84..06d25276 100644
--- a/world/map/db/chest_item_db.txt
+++ b/world/map/db/chest_item_db.txt
@@ -3,7 +3,6 @@
523, LeatherShirt, Leather Shirt, 5, 2000, 1000, 20, 0, 4, 0, -12, 0, 2, 512, 0, 0, 0, {}, {}
546, DesertShirt, Desert Shirt, 5, 2000, 1000, 20, 0, 6, 0, -18, 0, 2, 512, 0, 0, 0, {}, {}
564, TurtleneckSweater, Turtleneck Sweater, 5, 2000, 1000, 30, 0, 6, 0, -18, 0, 2, 512, 0, 0, 0, {}, {}
-622, Bandana, Bandana, 5, 1000, 500, 20, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
624, VNeckSweater, V-Neck Sweater, 5, 6000, 3000, 35, 0, 8, 0, -24, 0, 2, 512, 0, 0, 0, {}, {}
625, ChainmailShirt, Chainmail Shirt, 5, 15000, 1500, 800, 0, 20, 0, -120, 0, 2, 512, 0, 0, 0, {}, {}
626, LightPlatemail, Light Platemail, 5, 50000, 2500, 1200, 0, 25, 0, -150, 0, 2, 512, 0, 0, 0, {}, {}
@@ -95,8 +94,6 @@
2097, OrangeTankTop, Orange Tank Top, 5, 800, 400, 12, 0, 2, 0, -4, 0, 2, 512, 0, 0, 0, {}, {}
2098, PurpleTankTop, Purple Tank Top, 5, 800, 400, 12, 0, 2, 0, -4, 0, 2, 512, 0, 0, 0, {}, {}
2099, DarkGreenTankTop, Dark Green Tank Top, 5, 800, 400, 12, 0, 2, 0, -4, 0, 2, 512, 0, 0, 0, {}, {}
-2100, RedCottonSkirt, Red Cotton Skirt, 5, 1000, 500, 20, 0, 4, 0, -8, 0, 2, 1, 0, 1, 0, {}, {}
-2101, GreenCottonSkirt, Green Cotton Skirt, 5, 1000, 500, 20, 0, 4, 0, -8, 0, 2, 1, 0, 1, 0, {}, {}
//ID, Name___________________, Label__________________, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript}
2120, RedShortTankTop, Red Short Tank Top, 5, 600, 300, 8, 0, 2, 0, -4, 0, 2, 512, 0, 0, 0, {}, {}
2121, GreenShortTankTop, Green Short Tank Top, 5, 600, 300, 8, 0, 2, 0, -4, 0, 2, 512, 0, 0, 0, {}, {}
diff --git a/world/map/db/generic_item_db.txt b/world/map/db/generic_item_db.txt
index 74650721..5b17fa3e 100644
--- a/world/map/db/generic_item_db.txt
+++ b/world/map/db/generic_item_db.txt
@@ -25,6 +25,7 @@
//ID, Name___________________, Label__________________, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript}
560, GrayHint, Gray Hint, 3, 20, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
569, RawLog, Raw Log, 3, 20, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+589, Toothbrush, Toothbrush, 3, 20, 10, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
611, WhiteFur, White Fur, 3, 8, 4, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
612, CaveSnakeLamp, Cave Snake Lamp, 3, 80, 40, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
613, HardSpike, Hard Spike, 3, 40, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
diff --git a/world/map/db/head_item_db.txt b/world/map/db/head_item_db.txt
index d7fc43f7..922ea4b3 100644
--- a/world/map/db/head_item_db.txt
+++ b/world/map/db/head_item_db.txt
@@ -38,7 +38,6 @@
723, DesertHat, Desert Hat, 5, 2400, 600, 20, 0, 3, 0, -1, 0, 2, 256, 0, 0, 0, {}, {}
724, CottonHeadband, Cotton Headband, 5, 3000, 500, 5, 0, 2, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
725, GMCap, GM Cap, 5, 2000, 500, 20, 0, 5, 0, 5, 0, 2, 256, 0, 0, 0, {}, {callfunc "RestrictedItem";}
-726, GMRobe, GM Robe, 5, 8000, 4000, 40, 0, 5, 0, 0, 0, 2, 512, 0, 0, 0, {}, {callfunc "RestrictedItem";}
751, PinkieHat, Pinkie Hat, 5, 5000, 1000, 5, 0, 1, 0, 1, 0, 2, 256, 0, 0, 0, {}, {}
752, FluffyHat, Fluffy Hat, 5, 7000, 2000, 10, 0, 2, 0, -5, 0, 2, 256, 0, 0, 0, {}, {}
759, PaladinsHelmet, Paladin's Helmet, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
diff --git a/world/map/db/leg_item_db.txt b/world/map/db/leg_item_db.txt
index 85fb929d..caa37385 100644
--- a/world/map/db/leg_item_db.txt
+++ b/world/map/db/leg_item_db.txt
@@ -12,8 +12,6 @@
857, LeatherTrousers, Leather Trousers, 5, 1000, 500, 25, 0, 5, 0, -4, 0, 2, 1, 0, 0, 0, {}, {bonus bHit, 2;}
881, RaggedShorts, Ragged Shorts, 5, 60, 1, 7, 0, 0, 0, -2, 0, 2, 1, 0, 1, 0, {}, {}
1172, SilkPants, Silk Pants, 5, 1500, 750, 10, 0, 2, 0, 0, 0, 2, 1, 0, 1, 0, {}, {}
-1188, RedStockings, Red Stockings, 5, 7000, 2000, 10, 0, 1, 0, 2, 0, 2, 64, 0, 0, 0, {}, {}
-1207, RedChristmasStocking, Red Christmas Stocking, 3, 80, 40, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
//ID, Name___________________, Label__________________, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript}
2100, RedCottonSkirt, Red Cotton Skirt, 5, 1000, 500, 20, 0, 4, 0, -8, 0, 2, 1, 0, 1, 0, {}, {}
2101, GreenCottonSkirt, Green Cotton Skirt, 5, 1000, 500, 20, 0, 4, 0, -8, 0, 2, 1, 0, 1, 0, {}, {}
diff --git a/world/map/db/trinket_item_db.txt b/world/map/db/trinket_item_db.txt
index 7eff3dcd..81c2863d 100644
--- a/world/map/db/trinket_item_db.txt
+++ b/world/map/db/trinket_item_db.txt
@@ -11,8 +11,7 @@
865, Grimoire, Grimoire, 5, 5000, 2500, 100, 0, 0, 0, 5, 0, 2, 8, 0, 0, 0, {}, {bonus bMaxSP, 30;}
879, HeartOfIsis, Heart of Isis, 5, 70000, 35000, 40, 0, 0, 0, 0, 0, 2, 8, 0, 85, 0, {}, {bonus bMaxHPrate, 15; bonus bHPrecovRate, 65;}
1197, SkeletonCharm, Skeleton Charm, 5, 0, 0, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, { callfunc "CheckMunro"; }
-1221, SkullMask, Skull Mask, 5, 10000, 5000, 150, 0, 3, 0, 5, 0, 2, 256, 0, 0, 0, {}, {}
-1244, DarkTalisman, Dark Talisman, 5, 0, 0, 0, 0, 30, 0, 100, 0, 2, 512, 0, 0, 0, {}, {set@minLvl, 1;callfunc "RestrictedItem"; set @val, getopt2; if(!(@val&1024))setopt2 getopt2 | 1024; bonus bMaxHp, 30000; bonus bFlee, -150;}
+1244, DarkTalisman, Dark Talisman, 5, 0, 0, 0, 0, 30, 0, 100, 0, 2, 8, 0, 0, 0, {}, {set@minLvl, 1;callfunc "RestrictedItem"; set @val, getopt2; if(!(@val&1024))setopt2 getopt2 | 1024; bonus bMaxHp, 30000; bonus bFlee, -150;}
4008, DiamondRing, Diamond Ring, 5, 5000, 2500, 1, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, {bonus bVit, 1;}
4009, RubyRing, Ruby Ring, 5, 5000, 2500, 1, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, {bonus bStr, 1;}
4010, EmeraldRing, Emerald Ring, 5, 5000, 2500, 1, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, {bonus bLuk, 1;}
diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index cc009018..0d16c0cc 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -26,7 +26,7 @@
if (getgmlevel() >= 40 && getequipid(equip_head) == 647)
goto L_DeveloperBoard;
- if (BaseLevel < @illia_min_level) goto L_Unexperienced;
+ if (BaseLevel < $@illia_min_level) goto L_Unexperienced;
if ($@ILLIA_STATUS == 0) goto L_Introduce;
if ($@ILLIA_STATUS == 1) goto L_PreparingSpell;
if ($@ILLIA_STATUS == 2) goto L_ReadyToTeleport;
@@ -248,21 +248,20 @@ L_ChooseHelper1:
goto L_WrongHelper1;
if (isloggedin(getcharid(3, $@ILLIA_HELPER1$)) == 0)
goto L_HelperDoesNotExist1;
- attachrid(getcharid(3, $@ILLIA_HELPER1$));
+ if (!(attachrid(getcharid(3, $@ILLIA_HELPER1$))))
+ goto L_Exit;
if (BaseLevel < $@illia_min_level)
goto L_HelperTooWeak1;
set $@ILLIA_HELPER1$, strcharinfo(0);
detachrid;
- if (isloggedin($@ILLIA_HERO_ID) == 0)
- goto L_Exit;
- attachrid($@ILLIA_HERO_ID);
- goto L_ChooseHelper2;
+ if (attachrid($@ILLIA_HERO_ID))
+ goto L_ChooseHelper2;
+ goto L_Exit;
L_HelperTooWeak1:
detachrid;
- if (isloggedin($@ILLIA_HERO_ID) == 0)
+ if (!(attachrid($@ILLIA_HERO_ID)))
goto L_Exit;
- attachrid($@ILLIA_HERO_ID);
mes "[Team Selector]";
mes "The player " + $@ILLIA_HELPER1$ + " is too weak to help you.";
next;
@@ -298,21 +297,20 @@ L_ChooseHelper2:
goto L_WrongHelper2;
if (isloggedin(getcharid(3, $@ILLIA_HELPER2$)) == 0)
goto L_HelperDoesNotExist2;
- attachrid(getcharid(3, $@ILLIA_HELPER2$));
+ if (!(attachrid(getcharid(3, $@ILLIA_HELPER2$))))
+ goto L_Exit;
if (BaseLevel < $@illia_min_level)
goto L_HelperTooWeak2;
set $@ILLIA_HELPER2$, strcharinfo(0);
detachrid;
- if (isloggedin($@ILLIA_HERO_ID) == 0)
- goto L_Exit;
- attachrid($@ILLIA_HERO_ID);
- goto L_ChooseHelper3;
+ if (attachrid($@ILLIA_HERO_ID))
+ goto L_ChooseHelper3;
+ goto L_Exit;
L_HelperTooWeak2:
detachrid;
- if (isloggedin($@ILLIA_HERO_ID) == 0)
- goto L_Exit;
- attachrid($@ILLIA_HERO_ID);
+ if (!(attachrid($@ILLIA_HERO_ID)))
+ goto_Exit;
mes "[Team Selector]";
mes "The player " + $@ILLIA_HELPER2$ + " is too weak to help you.";
next;
@@ -349,22 +347,21 @@ L_ChooseHelper3:
goto L_WrongHelper3;
if (isloggedin(getcharid(3, $@ILLIA_HELPER3$)) == 0)
goto L_HelperDoesNotExist3;
- attachrid(getcharid(3, $@ILLIA_HELPER3$));
+ if (!(attachrid(getcharid(3, $@ILLIA_HELPER3$))))
+ goto L_Exit;
if (BaseLevel < $@illia_min_level)
goto L_HelperTooWeak3;
set $@ILLIA_HELPER3$, strcharinfo(0);
detachrid;
- if (isloggedin($@ILLIA_HERO_ID) == 0)
- goto L_Exit;
- attachrid($@ILLIA_HERO_ID);
+ if (!(attachrid($@ILLIA_HERO_ID)))
+ goto_Exit;
mes $@ILLIA_HELPER1$ + ", " + $@ILLIA_HELPER2$ + " and " + $@ILLIA_HELPER3$ + " will be your three comrades.";
close;
L_HelperTooWeak3:
detachrid;
- if (isloggedin($@ILLIA_HERO_ID) == 0)
- goto L_Exit;
- attachrid($@ILLIA_HERO_ID);
+ if (!(attachrid($@ILLIA_HERO_ID)))
+ goto_Exit;
mes "[Team Selector]";
mes "The player " + $@ILLIA_HELPER3$ + " is too weak to help you.";
next;
diff --git a/world/map/npc/052-1/channelling.txt b/world/map/npc/052-1/channelling.txt
index 6348840a..34633ac5 100644
--- a/world/map/npc/052-1/channelling.txt
+++ b/world/map/npc/052-1/channelling.txt
@@ -178,9 +178,8 @@ OnTimer11000:
end;
S_ItemSpawn:
- if (isloggedin(getcharid(3, $@illia_char_channelling$)) == 0)
+ if (!(attachrid(getcharid(3, $@illia_char_channelling$))))
goto L_Return;
- attachrid(getcharid(3, $@illia_char_channelling$));
// spawn items at random
set $@illia_item_spawn_i, rand(getarraysize($@illia_small_lazurites)/2);
set $@illia_item_spawn_x, $@illia_small_lazurites[$@illia_item_spawn_i*2];
@@ -228,9 +227,8 @@ S_CheckChannelling:
set $@illia_magic_power_status, 2;
// Player loses a part of his health while channelling
- if (isloggedin(getcharid(3, $@illia_char_channelling$)) == 0)
+ if (!(attachrid(getcharid(3, $@illia_char_channelling$))))
goto L_ChannellingFail;
- attachrid(getcharid(3, $@illia_char_channelling$));
// Display an effect showing the drain
misceffect FX_CHANNELLING_RAISE;
percentheal -4, 0;
diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index a32ab830..c707c76f 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -341,9 +341,8 @@ L_ChaseLuvia:
end;
S_GetHeroRect:
- if (isloggedin($@ILLIA_HERO_ID) == 0)
+ if (!(attachrid($@ILLIA_HERO_ID)))
goto L_Clear;
- attachrid($@ILLIA_HERO_ID);
set $@illia_lobby_x, getx();
set $@illia_lobby_y, gety();
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index 663c2dec..ef04a667 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -123,9 +123,8 @@ OnTimer5000:
if ($@illia_level_7_progress != 1)
end;
// Warp to the place to spawn luvia once the teleport sequence is finished
- if (isloggedin($@ILLIA_HERO_ID) == 0)
+ if (!(attachrid($@ILLIA_HERO_ID)))
end;
- attachrid($@ILLIA_HERO_ID);
set $@illia_luvia_x, getx();
set $@illia_luvia_y, gety();
npcwarp $@illia_luvia_x, $@illia_luvia_y, "#LuviaDaemon";
@@ -176,9 +175,8 @@ OnTimer26000:
end;
S_SpawnWitchGuard:
- if (isloggedin($@ILLIA_HERO_ID) == 0)
+ if (!(attachrid($@ILLIA_HERO_ID)))
end;
- attachrid($@ILLIA_HERO_ID);
npcwarp getx(), gety(), "#LuviaDaemon";
misceffect FX_EVIL_SUMMON;
misceffect FX_GROUND_SPAWN;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-07 19:28:50 +0000