summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
m---------client-data0
-rw-r--r--login/save/.gitignore4
-rw-r--r--world/conf/char_athena.conf2
-rw-r--r--world/map/conf/magic.conf.template2
-rw-r--r--world/map/news.php7
-rw-r--r--world/map/npc/007-1/witch.txt4
-rw-r--r--world/map/npc/009-2/kfahr.txt2
-rw-r--r--world/map/npc/009-6/brodomir.txt24
-rw-r--r--world/map/npc/018-1/_mobs.txt2
-rw-r--r--world/map/npc/029-3/parua.txt12
-rw-r--r--world/map/npc/031-4/cindyCave.txt11
-rw-r--r--world/map/npc/052-2/chest.txt4
-rw-r--r--world/map/npc/052-2/partyroom.txt6
-rw-r--r--world/map/save/.gitignore2
-rw-r--r--world/save/.gitignore14
15 files changed, 41 insertions, 55 deletions
diff --git a/client-data b/client-data
-Subproject 9d2bbe52cdd52d67748e416c311c1ddf6c01e76
+Subproject e655116a364f646e849322c4fbc61fc77f30e4a
diff --git a/login/save/.gitignore b/login/save/.gitignore
index 253bca5b..82cfa276 100644
--- a/login/save/.gitignore
+++ b/login/save/.gitignore
@@ -1,2 +1,2 @@
-/account.txt
-/gm_account.txt
+/account.txt*
+/gm_account.txt*
diff --git a/world/conf/char_athena.conf b/world/conf/char_athena.conf
index 8ea1f99f..38b494e6 100644
--- a/world/conf/char_athena.conf
+++ b/world/conf/char_athena.conf
@@ -31,7 +31,7 @@ max_connect_user: 0
check_ip_flag: yes
// How often should the server save all files? (In seconds)
-autosave_time: 15
+autosave_time: 300
// Character server flatfile database
char_txt: save/athena.txt
diff --git a/world/map/conf/magic.conf.template b/world/map/conf/magic.conf.template
index 3835dbe5..eb4f590d 100644
--- a/world/map/conf/magic.conf.template
+++ b/world/map/conf/magic.conf.template
@@ -816,7 +816,7 @@ SPELL shear : "#N14" =
place = random_location(rbox(location(target), 1));
IF running_status_update(target, SC_SHEARED)
THEN ABORT;
- status_change(target, SC_SHEARED, 1, 1, 1, 1, 600000); # 10 minutes
+ status_change(target, SC_SHEARED, 0, 0, 0, 0, 600000); # 10 minutes
CALL shear-drop("Fluffy", "Fluffy", "WhiteFur", 300);
CALL shear-drop("EasterFluffy", "Easter Fluffy", "WhiteFur", 300);
CALL shear-drop("SpikyMushroom", "Spiky Mushroom", "HardSpike", 250);
diff --git a/world/map/news.php b/world/map/news.php
index 23786bb4..3338e9f4 100644
--- a/world/map/news.php
+++ b/world/map/news.php
@@ -32,7 +32,12 @@ if (substr($agent, 0, 5) == "Mana/"
"##1 TMW Staff\n \n";
}
-echo "##9 Latest client version: ##6$cur_version\n##0\n";
+echo "##9 Latest client version: ##6$cur_version\n \n";
+echo "##7 TMW Staff will never ask you for your password.\n";
+echo "##7 Anyone doing so is trying to scam you.\n \n";
+
+echo "##1 Sharing an account to a computer system is like sharing\n";
+echo "##1 your underwear.##0\n \n##0\n";
print file_get_contents("news.txt");
?>
diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index fa81c8d8..354df9a0 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -788,7 +788,7 @@ L_WarpHelper:
L_DoWarpHelper:
// At this point, the player has been attached
if ($@illia_progress >= 5)
- message strcharinfo(0), "You feel dizzy, and that your memory is being rewritten... Who is Luvia? Something isn't alright.";
+ message strcharinfo(0), "You feel dizzy, and that your memory is being rewritten... Who is Luvia? Something isn't right.";
warp "007-1.gat",85 + rand(0,2),75 + rand(0,2);
detachrid;
goto L_NextHelperToWarp;
@@ -843,7 +843,7 @@ L_HeroEscape:
L_WarpHero:
// At this point, the player has been attached
if ($@illia_progress >= 5)
- message strcharinfo(0), "You feel dizzy, and that your memory is being rewritten... Who is Luvia? Something isn't alright.";
+ message strcharinfo(0), "You feel dizzy, and that your memory is being rewritten... Who is Luvia? Something isn't right.";
warp "007-1.gat",85 + rand(0,2),75 + rand(0,2);
detachrid;
end;
diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt
index 5be800b8..0df90c34 100644
--- a/world/map/npc/009-2/kfahr.txt
+++ b/world/map/npc/009-2/kfahr.txt
@@ -369,7 +369,7 @@ L_tale_desert_temple:
mes "\"Inside it felt moist, as if it was a real ear-- not that I've climbed inside a real ear, mind you! But that feeling of cool and dampness and water was like a magical healing potion; we suddenly felt strength in our legs again.\"";
next;
mes "[Kfahr the Warrior]";
- mes "\"When we looked aorund, we noticed that there was a passage leading further underground, and long-spent torches on the wall. Fortunately I still had my tinderbox, so I wrapped my shirt around a torch and lighted it.\"";
+ mes "\"When we looked around, we noticed that there was a passage leading further underground, and long-spent torches on the wall. Fortunately I still had my tinderbox, so I wrapped my shirt around a torch and lighted it.\"";
next;
mes "[Kfahr the Warrior]";
mes "\"We climbed down, and soon we heard the dripping of water-- we had found an underground water-hole! More than that, we had found a gigantic underground cave, and, at the end of it, a huge portal.\"";
diff --git a/world/map/npc/009-6/brodomir.txt b/world/map/npc/009-6/brodomir.txt
index eab5d790..f001efa4 100644
--- a/world/map/npc/009-6/brodomir.txt
+++ b/world/map/npc/009-6/brodomir.txt
@@ -85,8 +85,6 @@ L_Item:
"I changed my mind, forget it.", L_Close;
if ($@BRODOMIR_PVP_STATUS == 1)
goto L_Wait;
- if (getareausers("009-6.gat", 20, 20, 80, 80, 1) < 3)
- goto L_NotEnoughPlayers;
if (countitem(@brodomir_item$) < @brodomir_item_amount)
goto L_NoItem;
delitem @brodomir_item$, @brodomir_item_amount;
@@ -111,8 +109,6 @@ L_Pay:
goto L_TooCheap;
if ($@BRODOMIR_PVP_STATUS == 1)
goto L_Wait;
- if (getareausers("009-6.gat", 20, 20, 80, 80, 1) < 3)
- goto L_NotEnoughPlayers;
if (Zeny < @brodomir_money)
goto L_NotEnoughMoney;
set Zeny, Zeny - @brodomir_money;
@@ -122,15 +118,17 @@ L_Go:
set $@BRODOMIR_ITEM$, @brodomir_item$;
set $@BRODOMIR_ITEM_AMOUNT, @brodomir_item_amount;
set $@BRODOMIR_MONEY, @brodomir_money;
+ set $@brodomir_delay_seconds, 600;
set $@BRODOMIR_PVP_STATUS, 1;
- mapannounce "009-6.gat", "In 5 minutes I will bring you all to the PvP cave. If there are less than 3 players here the event will not start.", 0;
+ announce "Brodomir: In "+$@brodomir_delay_seconds/60+" minutes, I will start a PvP tournament, if at least 3 fighters are present. Make your way in Hurnscald Underground Caves!", 0;
if ($@BRODOMIR_ITEM_AMOUNT > 0)
- mapannounce "009-6.gat", "The winner will receive 150GP per player and " + $@BRODOMIR_ITEM_AMOUNT + $@BRODOMIR_ITEM$ + ".", 0;
+ announce "Brodomir: The winner will receive 150GP per fighter and " + $@BRODOMIR_ITEM_AMOUNT + " " + $@BRODOMIR_ITEM$ + ".", 0;
if ($@BRODOMIR_MONEY > 0)
- mapannounce "009-6.gat", "The winner will receive " + $@BRODOMIR_MONEY + "GP and additionally 150GP per player.", 0;
+ announce "Brodomir: The winner will receive " + $@BRODOMIR_MONEY + "GP and additionally 150GP per fighter.", 0;
mes "[Brodomir]";
- mes "\"In 5 minutes I will bring you all to the PvP cave. If there are less than 3 players here the event will not start and your money will be lost.\"";
- set $@BRODOMIR_START_TIME, gettimetick(2) + 300;
+ mes "\"In "+$@brodomir_delay_seconds/60+" minutes I will bring you all to the PvP cave. If there are less than 3 players here the event will not start and your money will be lost.\"";
+ set $@BRODOMIR_START_TIME, gettimetick(2) + $@brodomir_delay_seconds;
+ set $@brodomir_delay_seconds, 0;
initnpctimer;
goto L_Close;
@@ -141,6 +139,7 @@ L_Wait:
mes "\"Just a little longer. I will bring you there in " + $@brodomir_seconds + " seconds.\"";
if ($@brodomir_seconds/60 > 0)
mes "\"Just a little longer. I will bring you there in " + $@brodomir_seconds/60 + " minute(s).\"";
+ set $@brodomir_seconds, 0;
goto L_Close;
OnTimer5000:
@@ -157,8 +156,6 @@ L_Warp:
set $@BRODOMIR_PVP_STATUS, $@BRODOMIR_PVP_STATUS + 1;
set $@BRODOMIR_PLAYERS, getareausers("009-6.gat", 20, 20, 80, 80, 1);
mapwarp "009-6.gat", "009-5.gat", 0, 0;
- if ($@BRODOMIR_ITEM_AMOUNT > 0)
- mapannounce "009-6.gat", "The last one standing will receive 150GP per player and " + $@BRODOMIR_ITEM_AMOUNT + $@BRODOMIR_ITEM$ + ".", 0;
mapannounce "009-5.gat", "PvP On!", 0;
pvpon "009-5.gat";
end;
@@ -201,11 +198,6 @@ L_End:
mapwarp "009-5.gat", "009-6.gat", 36, 42;
goto L_Cleanup;
-L_NotEnoughPlayers:
- mes "[Brodomir]";
- mes "\"There aren't enough players here to start.\"";
- goto L_Close;
-
L_Alreadystarted:
mes "[Brodomir]";
mes "\"Please wait until the cave is clear again.\"";
diff --git a/world/map/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt
index 336e823b..334b02bb 100644
--- a/world/map/npc/018-1/_mobs.txt
+++ b/world/map/npc/018-1/_mobs.txt
@@ -5,7 +5,7 @@
018-1.gat,108,87,53,25|monster|Log Head|1025,10,100000,30000,Mob018-1::On1025
018-1.gat,116,44,6,7|monster|Sea Slime|1033,3,100000,30000,Mob018-1::On1033
018-1.gat,119,56,13,6|monster|Pink Flower|1014,2,100000,30000,Mob018-1::On1014
-018-1.gat,175,28,17,19|monster|Jack O|1022,1,300000,240000,Mob018-1::On1022
+018-1.gat,175,28,17,19|monster|Jack O|1022,1,180000,120000,Mob018-1::On1022
018-1.gat,78,59,3,1|monster|Yellow Slime|1007,1,100000,30000,Mob018-1::On1007
018-1.gat,57,63,14,7|monster|Silkworm|1035,2,100000,30000,Mob018-1::On1035
018-1.gat,43,63,31,28|monster|Bat|1017,10,100000,30000,Mob018-1::On1017
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index 69507ebd..78014e98 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -166,11 +166,8 @@ L_NextRound:
goto L_CleanUp;
set $@FIGHT_CAVE_POINTS, $@FIGHT_CAVE_LEVEL;
- if ($@FIGHT_CAVE_LAST + 30 < $@FIGHT_CAVE_LEVEL)
- goto L_Announce;
-
-L_Return_2:
- mapannounce "029-3.gat", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
+ mapannounce "029-1.gat", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
+ mapannounce "029-3.gat", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
set $@MOB_1_SUMMON, 0;
set $@MOB_2_SUMMON, 0;
@@ -200,11 +197,6 @@ L_Summon:
goto L_MOB6;
goto L_Return_1;
-L_Announce:
- mapannounce "029-1.gat", "Parua: The next round (level " + $@FIGHT_CAVE_LEVEL + ") is starting with " + $@FIGHT_CAVE_PLAYER_COUNT + " player(s) left alive." , 0;
- set $@FIGHT_CAVE_LAST, $@FIGHT_CAVE_LAST + 30;
- goto L_Return_2;
-
L_GlobalAnnounce:
if ($@FIGHT_CAVE_STATUS == 3)
goto L_Five_Minutes;
diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt
index 6e6e143b..c724733a 100644
--- a/world/map/npc/031-4/cindyCave.txt
+++ b/world/map/npc/031-4/cindyCave.txt
@@ -54,18 +54,15 @@ L_Try_Cage:
mes "As you try to open the door of the cage, there is a loud squeaking noise.";
next;
mes "You get an uncomfortable feeling and Cindy starts to shiver.";
- next;
- mes "\"Oh no, the Yetis...\"";
if ($@FIGHT_YETI_STATUS != 0)
goto L_Yeti;
+ npctalk "Oh no, the Yetis...";
// initialize fight
set $@FIGHT_YETI_STATUS, 1;
set $@FIGHT_YETI_WAVE, 0;
set $@YETI_COUNT, 1;
set $@FIGHT_YETI_PLAYER_COUNT, getmapusers("031-4.gat");
- // this yeti is spawned because of some timing problems
- // without it, the first and second wave start nearly the same time
areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, 1, "Cindy::onPetDeath";
initnpctimer;
@@ -154,7 +151,7 @@ L_CaveLogic:
if ($@FIGHT_YETI_PLAYER_COUNT <= 0)
goto L_CleanUp;
set $@FIGHT_YETI_ROUND_TIMER, $@FIGHT_YETI_ROUND_TIMER + 5; // Advance 5 seconds
- if (mobcount("031-4.gat", "Cindy::onPetDeath") <= 0)
+ if (mobcount("031-4.gat", "Cindy::onPetDeath") < 0)
goto L_NextWave;
if ($@FIGHT_YETI_ROUND_TIMER + $@FIGHT_YETI_ROUND_PEN >= 120)
goto L_NextWave;
@@ -173,7 +170,7 @@ L_NextWave:
areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_WAVE*2 + $@FIGHT_YETI_PLAYER_COUNT*5, "Cindy::onPetDeath";
if ($@FIGHT_YETI_WAVE > 22)
set $@YETI_COUNT, $@YETI_COUNT + $@FIGHT_YETI_WAVE*2 + $@FIGHT_YETI_PLAYER_COUNT*5;
- set $@FIGHT_YETI_NUMBER, (1 + (1 * $@FIGHT_YETI_WAVE) + (2 * $@FIGHT_YETI_PLAYER_COUNT))/4;
+ set $@FIGHT_YETI_NUMBER, (5 + (1 * $@FIGHT_YETI_WAVE) + (2 * $@FIGHT_YETI_PLAYER_COUNT))/4;
set $@YETI_COUNT, $@YETI_COUNT + $@FIGHT_YETI_NUMBER;
areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_NUMBER, "Cindy::onPetDeath";
@@ -236,7 +233,7 @@ L_CleanUp:
areatimer "031-4.gat", 0, 0, 95, 91, 10, "Cindy::onReward";
set $@FIGHT_YETI_STATUS, 0;
set $@FIGHT_YETI_PLAYER_COUNT, 0;
- set $@FIGHT_YETI_WAVE, 1;
+ set $@FIGHT_YETI_WAVE, 0;
set $@FIGHT_YETI_ROUND_TIMER, 0;
set $@YETI_COUNT, 0;
set $@FIGHT_YETI_ROUND_PEN, 0;
diff --git a/world/map/npc/052-2/chest.txt b/world/map/npc/052-2/chest.txt
index 41366e4d..d42cea48 100644
--- a/world/map/npc/052-2/chest.txt
+++ b/world/map/npc/052-2/chest.txt
@@ -92,7 +92,7 @@ L_GetUniqueReward2:
next;
mes "You find a bunch of gold pieces!";
next;
- set Zeny, Zeny + 150000*($@illia_num_unique_reward_items - @illia_current_num_rewards);
+ set Zeny, Zeny + 100000*($@illia_num_unique_reward_items - @illia_current_num_rewards);
getexp 200000*($@illia_num_unique_reward_items - @illia_current_num_rewards), 0;
set @illia_current_num_rewards, $@illia_num_unique_reward_items;
goto L_GetUniqueReward;
@@ -151,7 +151,7 @@ onMsg1:
end;
onMsg2:
- message strcharinfo(0), "Who is Luvia? Something isn't alright... It looks like your memory is rewritten.";
+ message strcharinfo(0), "Who is Luvia? Something isn't right... It looks like your memory is rewritten.";
end;
onMsg3:
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index e0a3aab7..6e16eb88 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -219,11 +219,11 @@ onDeath:
callfunc "UpdateIlliaProgress";
// Set the number of common rewards rewards
if ($Illia_Luvia_Harvest < 15)
- set $@illia_num_common_reward_items, 3;
+ set $@illia_num_common_reward_items, 0;
if ($Illia_Luvia_Harvest >= 15 && $Illia_Luvia_Harvest < 35)
- set $@illia_num_common_reward_items, 5;
+ set $@illia_num_common_reward_items, 1;
if ($Illia_Luvia_Harvest >= 35)
- set $@illia_num_common_reward_items, 8;
+ set $@illia_num_common_reward_items, 2;
// Set the number of unique rewards
if ($Illia_Luvia_Harvest < 40)
diff --git a/world/map/save/.gitignore b/world/map/save/.gitignore
index 11d10d30..cab39708 100644
--- a/world/map/save/.gitignore
+++ b/world/map/save/.gitignore
@@ -1 +1 @@
-/mapreg.txt
+/mapreg.txt*
diff --git a/world/save/.gitignore b/world/save/.gitignore
index bc445803..c18b27af 100644
--- a/world/save/.gitignore
+++ b/world/save/.gitignore
@@ -1,7 +1,7 @@
-/athena.txt
-/accreg.txt
-/party.txt
-/storage.txt
-/guild.txt
-/castle.txt
-/g_storage.txt
+/athena.txt*
+/accreg.txt*
+/party.txt*
+/storage.txt*
+/guild.txt*
+/castle.txt*
+/g_storage.txt*
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-23 05:45:36 +0000