summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
m---------client-data0
-rw-r--r--world/map/db/const.txt1
-rw-r--r--world/map/npc/002-4/miners.txt2
-rw-r--r--world/map/npc/008-1/annualeaster.txt14
-rw-r--r--world/map/npc/011-1/auldsbel.txt2
-rw-r--r--world/map/npc/011-6/bryant.txt2
-rw-r--r--world/map/npc/025-4/battlecaves.txt20
-rw-r--r--world/map/npc/029-3/parua.txt3
-rw-r--r--world/map/npc/031-4/cindyCave.txt2
-rw-r--r--world/map/npc/034-1/yetiSpawn.txt3
-rw-r--r--world/map/npc/052-2/partyroom.txt2
11 files changed, 32 insertions, 19 deletions
diff --git a/client-data b/client-data
-Subproject 13b35644011e285b30a47da75b52da47e50b506
+Subproject 0f0a2c0962f02ebe7fa273284aa17ef9bc83550
diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index 6bed62d2..f6c3ccde 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -390,6 +390,7 @@ FX_BLUE_MAGIC_CAST 40
FX_MAGIC_BLUE_TELEPORT 41
FX_MAGIC_DARK_EXPLOSION 42
FX_PUMPKIN_EXPLOSION 43
+FX_GETITEM 44
FX_MAGIC_SHIELD_ENDS 111
FX_ELECTRICITY_RED 114
FX_ELECTRICITY_BLUE 115
diff --git a/world/map/npc/002-4/miners.txt b/world/map/npc/002-4/miners.txt
index 6bf9884a..3fa17e35 100644
--- a/world/map/npc/002-4/miners.txt
+++ b/world/map/npc/002-4/miners.txt
@@ -46,7 +46,7 @@ L_Sema_Happy:
set @state, 28;
callsub S_Update_Var;
set BOSS_POINTS, BOSS_POINTS + 10;
- message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS + ".";
mes "[Sema the Miner]";
mes "\"You killed it! What a relief! I wish I had more to give, but please accept this Desert Shirt as reward.\"";
goto L_Close;
diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt
index 3a97a9ea..17bd4b67 100644
--- a/world/map/npc/008-1/annualeaster.txt
+++ b/world/map/npc/008-1/annualeaster.txt
@@ -12,9 +12,11 @@
function|script|AnnualEasterEvent|{
// prevent players having level 19 or less to get anything:
- if (BaseLevel < 20)
+ if ((gettimetick(2)-TUT_var < 5*7*86400) || (BaseLevel < 40)) //player must be created at least 5 weeks ago
goto L_EndTooYoung;
+ if (@eastertimepenalty == 0)
+ goto L_WarmUp;
// prevent clicking multiple times:
if (gettimetick(2) < @eastertimepenalty + $@EASTER_FOUND_WAIT_TIME)
goto L_End2;
@@ -32,6 +34,7 @@ function|script|AnnualEasterEvent|{
if (@random < @tmp) getitem $@SmallAnnualEasterItems$[@random], rand(1, 2);
if (@random == @tmp) getexp rand(200), 0;
if (@random == @tmp + 1) set Zeny, Zeny + rand(50);
+ misceffect FX_GETITEM, strcharinfo(0);
// give out a better reward occasionally:
// standard case is branch taken, so only if rand yields 0, medium rewarding.
@@ -40,6 +43,7 @@ function|script|AnnualEasterEvent|{
set @random, rand(getarraysize($@MediumAnnualEasterRewards$));
getitem $@MediumAnnualEasterRewards$[@random], 1;
+ misceffect FX_GETITEM, strcharinfo(0);
NoEasterEgg:
@@ -70,6 +74,7 @@ NoEasterEgg:
// now hand out the specific item:
set @rewardindex, @rewardindex % getarraysize($@FinalAnnualEasterReward$);
getitem $@FinalAnnualEasterReward$[@rewardindex], 1;
+ misceffect FX_GETITEM, strcharinfo(0);
message strcharinfo(0), "This is really special. You won't find anything like this again.";
goto L_End1;
@@ -85,6 +90,13 @@ L_EndTooYoung:
message strcharinfo(0), "The nest is empty.";
goto L_End1;
+L_WarmUp:
+ set @eastertimepenalty, gettimetick(2);
+ getitem "GreenApple", 1;
+ misceffect FX_GETITEM, strcharinfo(0);
+ message strcharinfo(0), "Hmmm eggs! Maybe you can find something nice there!";
+ goto L_End1;
+
L_End2:
message strcharinfo(0), "Don't be greedy! You just found something a moment ago.";
set @eastertimepenalty, @eastertimepenalty + 5;
diff --git a/world/map/npc/011-1/auldsbel.txt b/world/map/npc/011-1/auldsbel.txt
index 25e265f1..66b909f9 100644
--- a/world/map/npc/011-1/auldsbel.txt
+++ b/world/map/npc/011-1/auldsbel.txt
@@ -949,7 +949,7 @@ L_component_quest_5:
onSnakeDeath:
set BOSS_POINTS, BOSS_POINTS + 5;
- message strcharinfo(0), "You gain 5 Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain 5 Boss Points giving you a total of " + BOSS_POINTS + ".";
end;
L_component_quest_missing:
diff --git a/world/map/npc/011-6/bryant.txt b/world/map/npc/011-6/bryant.txt
index fac55569..f06b2a80 100644
--- a/world/map/npc/011-6/bryant.txt
+++ b/world/map/npc/011-6/bryant.txt
@@ -36,7 +36,7 @@ onBanditLordDead:
set @state, 5;
callsub S_Update_Var;
set BOSS_POINTS, BOSS_POINTS + 20;
- message strcharinfo(0), "You gain 20 Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain 20 Boss Points giving you a total of " + BOSS_POINTS + ".";
L_End:
set @state, 0;
end;
diff --git a/world/map/npc/025-4/battlecaves.txt b/world/map/npc/025-4/battlecaves.txt
index 17f801a1..a0349847 100644
--- a/world/map/npc/025-4/battlecaves.txt
+++ b/world/map/npc/025-4/battlecaves.txt
@@ -54,7 +54,7 @@ L_Done:
goto L_Summon;
set cavefights, (cavefights | BATTLE_CAVE1);
set BOSS_POINTS, BOSS_POINTS + 10;
- message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS + ".";
end;
OnMonsterDeath:
@@ -141,7 +141,7 @@ L_Done:
goto L_Summon;
set cavefights, (cavefights | BATTLE_CAVE2);
set BOSS_POINTS, BOSS_POINTS + 10;
- message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS + ".";
end;
OnMonsterDeath:
@@ -225,7 +225,7 @@ L_Done:
goto L_Summon;
set cavefights, (cavefights | BATTLE_CAVE3);
set BOSS_POINTS, BOSS_POINTS + 10;
- message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS + ".";
end;
OnMonsterDeath:
@@ -312,7 +312,7 @@ L_Done:
goto L_Summon;
set cavefights, (cavefights | BATTLE_CAVE4);
set BOSS_POINTS, BOSS_POINTS + 10;
- message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS + ".";
end;
OnMonsterDeath:
@@ -400,7 +400,7 @@ L_Done:
goto L_Summon;
set cavefights, (cavefights | BATTLE_CAVE5);
set BOSS_POINTS, BOSS_POINTS + 10;
- message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS + ".";
end;
OnMonsterDeath:
@@ -488,7 +488,7 @@ L_Done:
goto L_Summon;
set cavefights, (cavefights | BATTLE_CAVE6);
set BOSS_POINTS, BOSS_POINTS + 10;
- message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS + ".";
end;
OnMonsterDeath:
@@ -578,7 +578,7 @@ L_Done:
goto L_Summon;
set cavefights, (cavefights | BATTLE_CAVE7);
set BOSS_POINTS, BOSS_POINTS + 10;
- message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS + ".";
end;
OnMonsterDeath:
@@ -668,7 +668,7 @@ L_Done:
goto L_Summon;
set cavefights, (cavefights | BATTLE_CAVE8);
set BOSS_POINTS, BOSS_POINTS + 10;
- message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS + ".";
end;
OnMonsterDeath:
@@ -758,7 +758,7 @@ L_Done:
goto L_Summon;
set cavefights, (cavefights | BATTLE_CAVE9);
set BOSS_POINTS, BOSS_POINTS + 10;
- message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain 10 Boss Points giving you a total of " + BOSS_POINTS + ".";
end;
OnMonsterDeath:
@@ -877,7 +877,7 @@ OnBossDeath:
set Rossy_Quest, 16;
getexp 100000, 0;
set BOSS_POINTS, BOSS_POINTS + 50;
- message strcharinfo(0), "You gain 50 Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain 50 Boss Points giving you a total of " + BOSS_POINTS + ".";
end;
L_Close:
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index 129a17eb..837e913a 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -338,7 +338,6 @@ onReward:
if (isdead())
end;
set BOSS_POINTS, BOSS_POINTS + 100;
- message strcharinfo(0), "You gain 100 Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain 100 Boss Points giving you a total of " + BOSS_POINTS + ".";
goto L_CleanUp_Player;
-
}
diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt
index d4fb2061..ef84a33f 100644
--- a/world/map/npc/031-4/cindyCave.txt
+++ b/world/map/npc/031-4/cindyCave.txt
@@ -257,7 +257,7 @@ onReward:
callsub S_Update_Mask;
message strcharinfo(0), "Cindy looks relieved and as if she wants to talk with you.";
set BOSS_POINTS, BOSS_POINTS + 70;
- message strcharinfo(0), "You gain 70 Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain 70 Boss Points giving you a total of " + BOSS_POINTS + ".";
L_End:
set @bonus, 0;
set @Q_Nivalis_state_MASK, 0;
diff --git a/world/map/npc/034-1/yetiSpawn.txt b/world/map/npc/034-1/yetiSpawn.txt
index 13c0069b..9c1b537a 100644
--- a/world/map/npc/034-1/yetiSpawn.txt
+++ b/world/map/npc/034-1/yetiSpawn.txt
@@ -38,7 +38,8 @@ OnYetiDeath:
goto L_NonQuestKill;
set @state, 8;
callsub S_Update_Mask;
- message strcharinfo(0), "You defeated the Yeti.";
+ set BOSS_POINTS, BOSS_POINTS + 40;
+ message strcharinfo(0), "You defeated the Yeti and gain 40 Boss Points giving you a total of " + BOSS_POINTS + ".";
L_End:
set $@Yerrnk_Yeti_Active, 0;
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index 86b74fa7..acba1fdc 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -215,7 +215,7 @@ onDeath:
mapannounce "052-2.gat", "Luvia: How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@ILLIA_HERO$ + "!!", 0;
set @illia_bp, $Illia_Luvia_Harvest * 16 / 10 + 120;
set BOSS_POINTS, BOSS_POINTS + @illia_bp;
- message strcharinfo(0), "You gain " + @illia_bp + " Boss Points giving you a total of " + BOSS_POINTS;
+ message strcharinfo(0), "You gain " + @illia_bp + " Boss Points giving you a total of " + BOSS_POINTS + ".";
set @illia_bp, 0;
areatimer "052-2.gat", 73, 11, 115, 49, 2000, "#LuviaDaemon::onW00t";
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-26 15:46:24 +0000