summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/001-2/omar.txt2
-rw-r--r--world/map/npc/021-1/hideandseek.txt12
-rw-r--r--world/map/npc/025-1/rossy.txt2
-rw-r--r--world/map/npc/030-2/roasted_acrons_helper.txt2
-rw-r--r--world/map/npc/030-4/mana_battery.txt15
-rw-r--r--world/map/npc/annuals/xmas/config.txt2
-rw-r--r--world/map/npc/annuals/xmas/core.txt1
-rw-r--r--world/map/npc/annuals/xmas/list.txt8
8 files changed, 22 insertions, 22 deletions
diff --git a/world/map/npc/001-2/omar.txt b/world/map/npc/001-2/omar.txt
index f5159436..105b6f88 100644
--- a/world/map/npc/001-2/omar.txt
+++ b/world/map/npc/001-2/omar.txt
@@ -178,7 +178,7 @@ S_update_var:
001-2.gat,76,59,0|script|Kadiya|174,
{
- set $@child_number, 7;
+ set @child_number, 7;
callfunc "XmasList";
callfunc "ElanoreFix";
diff --git a/world/map/npc/021-1/hideandseek.txt b/world/map/npc/021-1/hideandseek.txt
index 2514dd12..5945c01c 100644
--- a/world/map/npc/021-1/hideandseek.txt
+++ b/world/map/npc/021-1/hideandseek.txt
@@ -24,7 +24,7 @@ OnInit:
021-1.gat,87,66,0|script|Ayasha|258,
{
- set $@child_number, 0;
+ set @child_number, 0;
callfunc "XmasList";
set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT);
@@ -87,7 +87,7 @@ L_Close:
021-1.gat,63,107,0|script|Latif|262,
{
- set $@child_number, 1;
+ set @child_number, 1;
callfunc "XmasList";
set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT);
@@ -144,7 +144,7 @@ L_Close:
021-1.gat,123,116,0|script|Charda|260,
{
- set $@child_number, 2;
+ set @child_number, 2;
callfunc "XmasList";
set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT);
@@ -198,7 +198,7 @@ L_Close:
021-1.gat,78,87,0|script|Faris|259,
{
- set $@child_number, 3;
+ set @child_number, 3;
callfunc "XmasList";
set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT);
@@ -248,7 +248,7 @@ L_Close:
021-1.gat,98,25,0|script|Rasin|263,
{
- set $@child_number, 4;
+ set @child_number, 4;
callfunc "XmasList";
set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT);
@@ -289,7 +289,7 @@ L_Close:
021-1.gat,155,25,0|script|Ghada|265,
{
- set $@child_number, 5;
+ set @child_number, 5;
callfunc "XmasList";
set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT);
diff --git a/world/map/npc/025-1/rossy.txt b/world/map/npc/025-1/rossy.txt
index 234759d3..af57e5b1 100644
--- a/world/map/npc/025-1/rossy.txt
+++ b/world/map/npc/025-1/rossy.txt
@@ -2,7 +2,7 @@
025-1.gat,80,88,0|script|Rossy|114,
{
- set $@child_number, 6;
+ set @child_number, 6;
callfunc "XmasList";
set @Cherry_Amount, 10;
diff --git a/world/map/npc/030-2/roasted_acrons_helper.txt b/world/map/npc/030-2/roasted_acrons_helper.txt
index 61975e2c..900d1bd1 100644
--- a/world/map/npc/030-2/roasted_acrons_helper.txt
+++ b/world/map/npc/030-2/roasted_acrons_helper.txt
@@ -56,7 +56,7 @@ L_Roast:
set XMASTIME, XMASTIME | $@xmas_helper_bit_acorns;
set @karma_bonus, $@xmas_karma_bonus;
callfunc "XmasNice";
- getitem "RoastedAcorn", rand($@xmas_acorn_amount);
+ getitem "RoastedAcorn", rand(($@xmas_acorn_amount / 2), $@xmas_acorn_amount);
menu
"Let's roast some more.", L_Roast,
"Thank you.", L_Close;
diff --git a/world/map/npc/030-4/mana_battery.txt b/world/map/npc/030-4/mana_battery.txt
index cc9576ad..bc7ad575 100644
--- a/world/map/npc/030-4/mana_battery.txt
+++ b/world/map/npc/030-4/mana_battery.txt
@@ -9,6 +9,7 @@
// 2 battle hard good
// 3 battle easy bad
// 4 battle hard bad
+// 5 battle time out
// basically its this:
// Announcements depend on wether starter was naughty/nice path
// mobs are not yet balanced, they also depend on battle mode
@@ -203,7 +204,7 @@ L_NextWave:
areamonster "030-4.gat", 0, 0, 50, 50, "", 1114, $@XmasBossRound*2 + $@XmasBossPlayerCount*3, "AniManOMat::OnGuardDeath";
//Normal Waves 1 to 10
// Guard Amount doubles if on hard mode
- set $@GuardAmount, 1 + (8 + ($@XmasBossRound) + (2 * $@XmasBossPlayerCount)) / 8;
+ set $@GuardAmount, 1 + (6 + ($@XmasBossRound) + (2 * $@XmasBossPlayerCount)) / 7;
set $@SkullAmount, 1 + ($@GuardAmount * $@GuardAmount) / 4;
if ($@GuardAmount > 15)
@@ -237,7 +238,7 @@ L_NextWave:
if ($@XmasBattleStatus == 3 || $@XmasBattleStatus == 4)
areamonster "030-4.gat", 20, 21, 28, 28, "", 1106, $@XmasBossRound + ($@XmasBossRound / 2), "AniManOMat::OnGuardDeath";
if ($@XmasBattleStatus == 3 || $@XmasBattleStatus == 4)
- areamonster "030-4.gat", 41, 21, 49, 28, "", 1106, $@XmasBossRound, "AniManOMat::OnGuardDeath";
+ areamonster "030-4.gat", 41, 21, 49, 28, "", 1106, $@XmasBossRound + ($@XmasBossRound / 2), "AniManOMat::OnGuardDeath";
set $@msgnumber, (2 * $@XmasBossRound) + (($@XmasBattleStatus - 1) >> 1);
set $@msg$, $@XmasBossMes$[ $@msgnumber ];
@@ -285,10 +286,10 @@ OnReward:
end;
if (($@XmasBattleStatusClone % 2) == 0)
set XMASTIME, XMASTIME | $@xmas_boss_hero_bit;
- set @bonus, (BaseLevel/3);
- set DailyQuestBonus, DailyQuestBonus + @bonus;
- message strcharinfo(0), "You feel a temporary rush of power and zest for action. " + @bonus + " daily bonus gained.";
set @xmas_state, (XMASTIME & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT;
+ set @bonus, (55 - (BaseLevel / 2));
+ set DailyQuestBonus, DailyQuestBonus + @bonus;
+ message strcharinfo(0), "You feel a temporary rush of power and zest for action.";
if (@xmas_state != $@xmas_boss_door_open_state )
goto L_End;
set @xmas_state, $@xmas_reward_start;
@@ -319,7 +320,7 @@ OnInit:
"", // unused
"Scrrreeeeeeeeeeeeeeeeeeeeeaaaaaaaaaaaaaaaaaaaaatch",
"Scrrreeeeeeeeeeeeeeeeeeeeeaaaaaaaaaaaaaaaaaaaaatch",
- "Santa : HELP!",
+ "Avalia: Oh ooooh...",
"Orums Homunculus : I think they know what we are up to!",
"Avalia : Oh no! This is going to blow up",
"Orums Homunculus : The Door is locked you idiot, fight for your life.",
@@ -351,9 +352,7 @@ OnInit:
S_Announce:
mapannounce "030-4.gat", $@msg$, 0;
- mapannounce "030-3.gat", $@msg$, 0;
mapannounce "030-2.gat", $@msg$, 0;
- mapannounce "030-1.gat", $@msg$, 0;
set $@msg$, "";
return;
diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt
index d723073f..caf4ad77 100644
--- a/world/map/npc/annuals/xmas/config.txt
+++ b/world/map/npc/annuals/xmas/config.txt
@@ -20,7 +20,7 @@
// 13: 021-1.gat,155,25,0|script|Ghada|265
// 14: 025-1.gat,80,88,0|script|Rossy|114
// 15: 001-2.gat,76,59,0|script|Kadiya|174
-// Helper Bits
+// Helper Bit
// 16: Bedding End
// 17: Bedding Starts
// 18: Glitter End
diff --git a/world/map/npc/annuals/xmas/core.txt b/world/map/npc/annuals/xmas/core.txt
index f8454088..8d1960d1 100644
--- a/world/map/npc/annuals/xmas/core.txt
+++ b/world/map/npc/annuals/xmas/core.txt
@@ -160,6 +160,7 @@ L_LevelingReward:
L_XmasLevel:
gmcommand "@blvl 1";
+ gmcommand "@l I was a good kid this year.";
return;
L_XmasExp:
diff --git a/world/map/npc/annuals/xmas/list.txt b/world/map/npc/annuals/xmas/list.txt
index a03db395..c6adf4b6 100644
--- a/world/map/npc/annuals/xmas/list.txt
+++ b/world/map/npc/annuals/xmas/list.txt
@@ -55,7 +55,7 @@ function|script|XmasList|,
goto L_Return;
L_QuestTime:
- if(XMASTIME & $@xmas_child_list[$@child_number])
+ if(XMASTIME & $@xmas_child_list[@child_number])
goto L_Return;
goto L_GetList;
@@ -65,11 +65,11 @@ L_GetList:
"Oh sorry, what were you going to say?", L_Return;
L_List:
- mes "[" + $@xmas_child_list_name$[$@child_number] + "]";
+ mes "[" + $@xmas_child_list_name$[@child_number] + "]";
mes "Here is my list. Make sure it gets delivered, please!";
next;
- mes "You store " + $@xmas_child_list_name$[$@child_number] + "'s wish list carefully in a hidden pocket of your backpack.";
- set XMASTIME, XMASTIME | $@xmas_child_list[$@child_number];
+ mes "You store " + $@xmas_child_list_name$[@child_number] + "'s wish list carefully in a hidden pocket of your backpack.";
+ set XMASTIME, XMASTIME | $@xmas_child_list[@child_number];
callfunc "XmasXpReward";
menu
"I really should be going.", L_Return;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-15 17:34:22 +0000