summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--npc/Changelog.txt4
-rw-r--r--npc/other/CashShop_Functions.txt14
-rw-r--r--npc/other/monster_race.txt15
-rw-r--r--npc/quests/quests_13_2.txt21
-rw-r--r--src/map/script.c5
6 files changed, 41 insertions, 19 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index adb1c7e4e..9bac27295 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2010/05/29
+ * Rev. 14313 Added a pc_isdead check to warpparty. Only warp and mapwarp (moveto, warpallpcinthemap, and warpwaitingpc aegis script equivilents) should revive players when placing them on new maps. [L0ne_W0lf]
* Rewrote/optimized script command warpparty. [Paradox924X]
- Added support for an optional extra parameter "from_mapname" to restrict effect of warpparty to only those on a specific map.
2010/05/28
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index ff90e3393..84e5f01cf 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
Date Added
======
+2010/05/29
+ * Rev. 14313 Updated F_CashPartyCall to use warpparty. Renamed original function to F_CashPartyCall2 and commented out. [L0ne_W0lf]
+ * Fixed an error in the monster race npcs calling a nonexistant OnEnable.
+ * Renamed 'Tabb' in the 13.1 Draco egg daily quest to 'Taab'.
2010/05/26
* Rev. 14308 Added 13.2 daily quest 'Dragon Egg collection.' [L0ne_W0lf]
2010/05/25
diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt
index 5489581ee..f90572e0f 100644
--- a/npc/other/CashShop_Functions.txt
+++ b/npc/other/CashShop_Functions.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -20,6 +20,7 @@
//= Added Seige Teleport Scroll Function
//= 1.2 Updated the dungeon teleport scroll menu. [L0ne_w0lf]
//= 1.3 Implemented Aozi Giant Flywing Fix. (bugreport:4242) [L0ne_w0lf]
+//= 1.4 Simplified Giant Flywing function using warpparty. [L0ne_w0lf]
//============================================================
// Kafra Card
@@ -47,6 +48,16 @@ function script F_CashPartyCall {
warp "Random",0,0;
if(getpartyleader(getcharid(1),2) == getcharid(0)) {
getmapxy .@mapl$, .@xl, .@yl, 0;
+ warpparty .@mapl$, .@xl, .@yl, getcharid(1), .@mapl$;
+ }
+ return;
+}
+
+/*
+function script F_CashPartyCall2 {
+ warp "Random",0,0;
+ if(getpartyleader(getcharid(1),2) == getcharid(0)) {
+ getmapxy .@mapl$, .@xl, .@yl, 0;
getpartymember getcharid(1),2;
set .@partymembercount, $@partymembercount;
copyarray .@partymemberaid[0], $@partymemberaid[0], .@partymembercount;
@@ -60,6 +71,7 @@ function script F_CashPartyCall {
}
return;
}
+*/
// Neuralizer
//============================================================
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index 0b430853a..9d5d08be7 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= eAthena SVN (Trunk, r12752+)
//===== Description: =========================================
@@ -17,6 +17,7 @@
//= 1.1 Corrected a minor typo. [L0ne_W0lf]
//= 1.2 Replaced effect numerics with constants. [L0ne_W0lf]
//= 1.3 Ei'felle now gives Exercise. (Bugreport:4092) [L0ne_W0lf]
+//= 1.4 Fixed call to a non-existant event. [L0ne_W0lf]
//============================================================
//============================================================
@@ -7752,12 +7753,12 @@ OnInit:
OnEnable:
enablenpc "TrapGlobal#race02";
- donpcevent "starting#race02_1::OnEnable";
- donpcevent "starting#race02_2::OnEnable";
- donpcevent "starting#race02_3::OnEnable";
- donpcevent "starting#race02_4::OnEnable";
- donpcevent "starting#race02_5::OnEnable";
- donpcevent "starting#race02_6::OnEnable";
+ enablenpc "starting#race02_1";
+ enablenpc "starting#race02_2";
+ enablenpc "starting#race02_3";
+ enablenpc "starting#race02_4";
+ enablenpc "starting#race02_5";
+ enablenpc "starting#race02_6";
//-------------------------------------------------------------
// Monster No. 1, Poring
//-------------------------------------------------------------
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index c06bfd4df..314fb7f5d 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.7
+//= 1.7a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -27,6 +27,7 @@
//= 1.5 Added daily quests: Midgard Ore, and Alfheim Perfume.
//= 1.6 Added the Yggdrasil Dungeon floor 2 puzzle.
//= 1.7 Added daily quest 'Dragon Egg collection.'
+//= 1.7a Fixed a translation typo. Tabb -> Taab.
//============================================================
// Cat Hand Addition.
@@ -4914,17 +4915,17 @@ mid_camp,146,306,3 script Pet Breeder#ep13_eden01 982,{
}
if (ep13_mdrama < 6) {
mes "[Pinedel]";
- mes "Why isn't it working, Tabb?";
+ mes "Why isn't it working, Taab?";
mes "That should be working.";
next;
- mes "[Tabb]";
+ mes "[Taab]";
mes "That's very dangerous. Do you want to die..?!";
next;
mes "[Pinedel]";
mes "Are you ignoring cute pets??";
mes "We've been able to get Pickys and even Zealotus!";
next;
- mes "[Tabb]";
+ mes "[Taab]";
mes "No way, even if you ask me...";
mes "Hillslion is very adorable...";
mes "But you can't.";
@@ -4932,16 +4933,16 @@ mid_camp,146,306,3 script Pet Breeder#ep13_eden01 982,{
mes "[Pinedel]";
mes "Then let me know why you object to this.";
next;
- mes "[Tabb]";
+ mes "[Taab]";
mes "It's too dangerous. I've trained monsters before.";
mes "Hillslions look cute and adorable, but it's not very realistic.";
next;
- mes "[Tabb]";
+ mes "[Taab]";
mes "Can't you see that?";
mes "I've tried to train them... but I couldn't.";
mes "How can we can train them as a cute pet...?";
next;
- mes "[Tabb]";
+ mes "[Taab]";
mes "It would definitely try to escape from us...";
mes "Then he would become very awful.";
mes "I don't agree with this.";
@@ -4956,7 +4957,7 @@ mid_camp,146,306,3 script Pet Breeder#ep13_eden01 982,{
}
else {
mes "[Pinedel]";
- mes "Ah, Tabb isn't flexible at all.";
+ mes "Ah, Taab isn't flexible at all.";
mes "Hey there! What's up??";
next;
switch(select("Notice for criminal report:Cute pet investigation.")) {
@@ -5104,11 +5105,11 @@ mid_camp,146,306,3 script Pet Breeder#ep13_eden01 982,{
mes "But I refuse to give up.";
mes "I will make it into a cute pet someday.";
next;
- mes "[Tabb]";
+ mes "[Taab]";
mes "Would you just give up making exogamous beings into cute pets...";
mes " ";
mes "[Pinedel]";
- mes "Tabb doesn't have any guts!";
+ mes "Taab doesn't have any guts!";
close;
}
}
diff --git a/src/map/script.c b/src/map/script.c
index fdd7c9f74..f542ff04a 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -4261,6 +4261,9 @@ BUILDIN_FUNC(warpparty)
if( str2 && strcmp(str2, map[pl_sd->bl.m].name) != 0 )
continue;
+ if( pc_isdead(pl_sd) )
+ continue;
+
switch( type )
{
case 0: // Random
@@ -4293,7 +4296,7 @@ BUILDIN_FUNC(warpparty)
}
break;
case 4: // m,x,y
- if(!map[pl_sd->bl.m].flag.noreturn && !map[pl_sd->bl.m].flag.nowarp)
+ if(!map[pl_sd->bl.m].flag.noreturn && !map[pl_sd->bl.m].flag.nowarp)
pc_setpos(pl_sd,mapindex_name2id(str),x,y,3);
break;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-18 21:24:54 +0000