tmw:tmwa-server-test.git
6 years agoMerge remote-tracking branch 'testing/master' v2011.09.08
Jessica Tölke [Thu, 8 Sep 2011 18:36:29 +0000 (20:36 +0200)]
Merge remote-tracking branch 'testing/master'

6 years agoRevert "temporary fix for the tutorial until hasan can be enabled again"
Jessica Tölke [Thu, 8 Sep 2011 18:34:48 +0000 (20:34 +0200)]
Revert "temporary fix for the tutorial until hasan can be enabled again"

This reverts commit b6cb68c9ad611354a97d3c397846c82e6bc7b4ff.

6 years agoTutorial: small fixes and adjustments
Jessica Tölke [Thu, 8 Sep 2011 17:33:15 +0000 (19:33 +0200)]
Tutorial: small fixes and adjustments

Tanisha: goto L_CleanUp whenever no players are in the area anymore
 and have one maggot in the area permanently
Hasan: small typing error fixed

6 years agoremoved tabs from 026-1 down to 024-2
Frost [Wed, 7 Sep 2011 17:54:24 +0000 (10:54 -0700)]
removed tabs from 026-1 down to 024-2

6 years agoFix new argument warnings.
Ben Longbons [Wed, 7 Sep 2011 19:59:44 +0000 (12:59 -0700)]
Fix new argument warnings.

Requires the server patch to allow argumentless script functions

6 years agoImprove logic and fix bugs in Tanisha script.
Ben Longbons [Wed, 7 Sep 2011 19:41:43 +0000 (12:41 -0700)]
Improve logic and fix bugs in Tanisha script.

Requires the server patch to allow argumentless script functions

6 years agoTab conversion and formatting. Maps 011-1 to 013-3 done.
The Kandiman [Wed, 7 Sep 2011 04:44:50 +0000 (00:44 -0400)]
Tab conversion and formatting. Maps 011-1 to 013-3 done.

6 years agoIn Rossy quest, sets values when you enter the caves and clean them when you get...
coffee [Wed, 7 Sep 2011 12:06:04 +0000 (09:06 -0300)]
In Rossy quest, sets values when you enter the caves and clean them when you get out. Changes some temporary variable names.

6 years agoAdd EMOTE_ constants
Ben Longbons [Wed, 7 Sep 2011 05:31:42 +0000 (22:31 -0700)]
Add EMOTE_ constants

Also fix an off-by-one error in the entertainer

6 years agoImprove logic a bit
Ben Longbons [Tue, 6 Sep 2011 19:37:45 +0000 (12:37 -0700)]
Improve logic a bit

6 years agoRemoved tabs from scripts in 027-2
Frost [Tue, 6 Sep 2011 19:08:04 +0000 (12:08 -0700)]
Removed tabs from scripts in 027-2

6 years agoIn barber script, show your initial color/style.
Ben Longbons [Tue, 6 Sep 2011 18:40:44 +0000 (11:40 -0700)]
In barber script, show your initial color/style.

6 years agoTab conversion project. Maps 007-1 to 010-2 complete.
The Kandiman [Mon, 5 Sep 2011 04:59:06 +0000 (00:59 -0400)]
Tab conversion project. Maps 007-1 to 010-2 complete.

6 years agoReplacing tabs with spaces in 031-1 down to 027-3
Frost [Sun, 4 Sep 2011 18:50:44 +0000 (11:50 -0700)]
Replacing tabs with spaces in 031-1 down to 027-3

6 years agoClear temporary variables after you close npc window. Npcs from maps 005-1 and 006-1.
coffee [Mon, 5 Sep 2011 12:13:26 +0000 (09:13 -0300)]
Clear temporary variables after you close npc window. Npcs from maps 005-1 and 006-1.

6 years agoFixes a typo in a variable name.
coffee [Mon, 5 Sep 2011 01:28:10 +0000 (22:28 -0300)]
Fixes a typo in a variable name.

6 years agoClear Temporary variables after you close npc window. Npcs from maps 001-2, 002-1...
coffee [Mon, 5 Sep 2011 01:17:43 +0000 (22:17 -0300)]
Clear Temporary variables after you close npc window. Npcs from maps 001-2, 002-1 and 003-1.

6 years agoClear temporary variables after you close npc window. Npcs from 001-1.
coffee [Sun, 4 Sep 2011 23:00:45 +0000 (20:00 -0300)]
Clear temporary variables after you close npc window. Npcs from 001-1.

6 years agoClient-data: maps names changed and some minor fixes.
Jessica Tölke [Sun, 4 Sep 2011 22:27:04 +0000 (00:27 +0200)]
Client-data: maps names changed and some minor fixes.

Converter ran.
Submodule pointer updated.

6 years agoReplacing spawns from monsters.txt with spawn objects in maps.
Jessica Tölke [Sun, 4 Sep 2011 19:46:40 +0000 (21:46 +0200)]
Replacing spawns from monsters.txt with spawn objects in maps.

Converter ran.
Submodule pointer updated.

6 years agoRemoved tabs from cindyHouse.txt and labyrinth.txt NPCs
Frost [Sun, 4 Sep 2011 17:33:02 +0000 (10:33 -0700)]
Removed tabs from cindyHouse.txt and labyrinth.txt NPCs

6 years agoReplaced tab formatting in cindyCave.txt
Frost [Sat, 3 Sep 2011 19:53:16 +0000 (12:53 -0700)]
Replaced tab formatting in cindyCave.txt

6 years agoReplaced tabs with spaces in miriam.txt
Frost [Thu, 1 Sep 2011 16:18:48 +0000 (09:18 -0700)]
Replaced tabs with spaces in miriam.txt

6 years agoBarbarians: adjusting formula for monster spawning
Jessica Tölke [Sun, 4 Sep 2011 17:21:44 +0000 (19:21 +0200)]
Barbarians: adjusting formula for monster spawning

The chance for harder monsters depends now also on the amount of living and newly spawned fluffies.

6 years agoClient-data: some warps and collisions fixed, updated submodule pointer
Jessica Tölke [Sun, 4 Sep 2011 09:50:48 +0000 (11:50 +0200)]
Client-data: some warps and collisions fixed, updated submodule pointer

6 years agoReenable disabled NPCs.
Jessica Tölke [Sun, 4 Sep 2011 09:36:10 +0000 (11:36 +0200)]
Reenable disabled NPCs.

6 years agoTutorial: Hasan, fix behaviour during scorpion fight
Jessica Tölke [Sun, 4 Sep 2011 09:34:31 +0000 (11:34 +0200)]
Tutorial: Hasan, fix behaviour during scorpion fight

Player talking to him while doing the scorpion fight got wrong dialogue part.
Player who doesn't do the scorpion fight get usual behaviour now.

6 years agomove the warp NPC a bit to avoid buggy warp into the cave
Jessica Tölke [Sun, 4 Sep 2011 09:11:00 +0000 (11:11 +0200)]
move the warp NPC a bit to avoid buggy warp into the cave

6 years agoChanging the logic of the checks on the scorpion fight.
coffee [Sat, 3 Sep 2011 16:52:35 +0000 (13:52 -0300)]
Changing the logic of the checks on the scorpion fight.

6 years agowarps between 033-1 and 034-1 added, updated submodule pointer
Jessica Tölke [Sat, 3 Sep 2011 16:00:19 +0000 (18:00 +0200)]
warps between 033-1 and 034-1 added, updated submodule pointer

6 years agoSmall fix in hasan and spawn the caretaker's wife in oninit label.
coffee [Sat, 3 Sep 2011 14:21:01 +0000 (11:21 -0300)]
Small fix in hasan and spawn the caretaker's wife in oninit label.

6 years agoSmall fix in tanisha scrip and change the way the timer is used in caretaker's script...
coffee [Sat, 3 Sep 2011 13:45:16 +0000 (10:45 -0300)]
Small fix in tanisha scrip and change the way the timer is used in caretaker's script, so it won't run forever.

6 years agoDeletes unused label.
coffee [Sat, 3 Sep 2011 13:11:59 +0000 (10:11 -0300)]
Deletes unused label.

6 years agoReviews the way the script checks for a rid attached.
coffee [Sat, 3 Sep 2011 13:03:13 +0000 (10:03 -0300)]
Reviews the way the script checks for a rid attached.

6 years agoTab converting and reformating scripts related to the battlecaves in rossy quest.
coffee [Sat, 3 Sep 2011 11:59:32 +0000 (08:59 -0300)]
Tab converting and reformating scripts related to the battlecaves in rossy quest.

6 years agoadd check of return value from attachrid in several scripts
Jessica Tölke [Sat, 3 Sep 2011 09:36:19 +0000 (11:36 +0200)]
add check of return value from attachrid in several scripts

6 years agotemporary fix for the tutorial until hasan can be enabled again v2011.09.03.1
Jessica Tölke [Sat, 3 Sep 2011 08:35:21 +0000 (10:35 +0200)]
temporary fix for the tutorial until hasan can be enabled again

6 years agoMerge remote-tracking branch 'mainline/master'
Jessica Tölke [Sat, 3 Sep 2011 08:12:46 +0000 (10:12 +0200)]
Merge remote-tracking branch 'mainline/master'

6 years agoDisable or fix NPCs with attachrid problems v2011.09.03
Ben Longbons [Sat, 3 Sep 2011 04:01:50 +0000 (21:01 -0700)]
Disable or fix NPCs with attachrid problems

6 years agoClient-data changes: Converter updated some wlk files, submodule pointer updated
Jessica Tölke [Fri, 2 Sep 2011 19:36:21 +0000 (21:36 +0200)]
Client-data changes: Converter updated some wlk files, submodule pointer updated

6 years agobarbarians: fix some error in debug npc and minor spelling error in kimarr
Jessica Tölke [Fri, 2 Sep 2011 19:05:00 +0000 (21:05 +0200)]
barbarians: fix some error in debug npc and minor spelling error in kimarr

6 years agobarbarians: some dialogue cleanup in kimarr and fixed something in the debug npc
Jessica Tölke [Fri, 2 Sep 2011 18:35:08 +0000 (20:35 +0200)]
barbarians: some dialogue cleanup in kimarr and fixed something in the debug npc

6 years agobarbarians: adding more ambushs to 034-1
Jessica Tölke [Fri, 2 Sep 2011 17:47:40 +0000 (19:47 +0200)]
barbarians: adding more ambushs to 034-1

6 years agobarbarians: some work on the wolvern quest
Jessica Tölke [Fri, 2 Sep 2011 11:07:33 +0000 (13:07 +0200)]
barbarians: some work on the wolvern quest

removed the sweets part from birrod and added dialogue for the wolvern quest
added start of wolvern ambushs on 034-1

6 years agoSubmodule pointer: Change of some snow tilesets and apdating some maps to it.
Jessica Tölke [Fri, 2 Sep 2011 11:35:18 +0000 (13:35 +0200)]
Submodule pointer: Change of some snow tilesets and apdating some maps to it.

6 years agoAdding 024-3 and 024-4.
Jessica Tölke [Fri, 2 Sep 2011 11:34:03 +0000 (13:34 +0200)]
Adding 024-3 and 024-4.

Ran Converter and updated submodule pointer.

6 years ago011-3: Some fringe items removed
Jessica Tölke [Fri, 2 Sep 2011 11:13:39 +0000 (13:13 +0200)]
011-3: Some fringe items removed

new wlk and updated submodule pointer

6 years agoTab conversion project. Maps 003-1 through 006-1 complete.
The Kandiman [Wed, 31 Aug 2011 16:16:25 +0000 (12:16 -0400)]
Tab conversion project. Maps 003-1 through 006-1 complete.

6 years agoSecond batch of tab conversion. Maps 001-2 through 002-4 complete.
The Kandiman [Sun, 28 Aug 2011 16:32:15 +0000 (12:32 -0400)]
Second batch of tab conversion. Maps 001-2 through 002-4 complete.

6 years agoadding .gitattributes
Jessica Tölke [Thu, 1 Sep 2011 13:20:22 +0000 (15:20 +0200)]
adding .gitattributes

this is to tell git that *.wlk files are binaries
and avoid git recognizing them as text files accidentally

6 years agoYeti stats changed to bring it back to previous difficulty. v2011.08.31
Jessica Tölke [Wed, 31 Aug 2011 19:29:18 +0000 (21:29 +0200)]
Yeti stats changed to bring it back to previous difficulty.
adelay: 1200, dmotion: 900

6 years agoTutorial: get the starting money with some storywise explanation
Jessica Tölke [Wed, 31 Aug 2011 08:43:00 +0000 (10:43 +0200)]
Tutorial: get the starting money with some storywise explanation

6 years agogive starting gold via script instead of start_zeny
Ben Longbons [Wed, 31 Aug 2011 05:39:35 +0000 (22:39 -0700)]
give starting gold via script instead of start_zeny

6 years agoConvert tabs in tutorial
Ben Longbons [Wed, 31 Aug 2011 01:18:10 +0000 (18:18 -0700)]
Convert tabs in tutorial

6 years agoMap fixes: 033-1.wlk changed and submodule pointer updated
Jessica Tölke [Tue, 30 Aug 2011 19:34:12 +0000 (21:34 +0200)]
Map fixes: 033-1.wlk changed and submodule pointer updated

6 years agoDiryn: Cost for teleport halved for players below level 45,
Jessica Tölke [Tue, 30 Aug 2011 19:26:17 +0000 (21:26 +0200)]
Diryn: Cost for teleport halved for players below level 45,
use of variables instead of hard coded numbers,
adapted to new scripting guidelines

6 years agoadd pink hair color and rewrite the script
Ben Longbons [Tue, 30 Aug 2011 03:46:50 +0000 (20:46 -0700)]
add pink hair color and rewrite the script

6 years agoAdding NPC function: Debug
Jessica Tölke [Mon, 29 Aug 2011 11:13:50 +0000 (13:13 +0200)]
Adding NPC function: Debug
This function gives the possibility to adjust level, skills and magic for debugging purposes.

6 years agoChanges mob id from fluffy to Hungry fluffy
coffee [Mon, 29 Aug 2011 01:01:26 +0000 (22:01 -0300)]
Changes mob id from fluffy to Hungry fluffy

6 years agoAdding Hungry Fluffy to mob_db.
Jessica Tölke [Sun, 28 Aug 2011 21:18:57 +0000 (23:18 +0200)]
Adding Hungry Fluffy to mob_db.
Very similar to Fluffy, but aggressive and drops no apples.
Submodule pointer updated, XML for Hungry Fluffy.

6 years agoUpdated submodule pointer: snail slime particle effect fixed.
Jessica Tölke [Sun, 28 Aug 2011 14:59:34 +0000 (16:59 +0200)]
Updated submodule pointer: snail slime particle effect fixed.

6 years agoBarbarians: Birrod and Yerrnk changed to new scripting guidelines
Jessica Tölke [Sun, 28 Aug 2011 14:58:30 +0000 (16:58 +0200)]
Barbarians: Birrod and Yerrnk changed to new scripting guidelines
and some dialogue about the Raging Skill added.

6 years agoPunish the players that interfere in the fight from outside.
coffee [Sun, 28 Aug 2011 13:30:16 +0000 (10:30 -0300)]
Punish the players that interfere in the fight from outside.

6 years agoFix talk of interfering fluffy hunters
Ben Longbons [Sun, 28 Aug 2011 01:05:51 +0000 (18:05 -0700)]
Fix talk of interfering fluffy hunters

6 years agoImplement countdown timer for fluffy hunters
Ben Longbons [Sun, 28 Aug 2011 00:36:35 +0000 (17:36 -0700)]
Implement countdown timer for fluffy hunters

6 years agoChecks for more than 1 player at the area of the fight and warps everyone, except...
coffee [Sun, 28 Aug 2011 00:14:07 +0000 (21:14 -0300)]
Checks for more than 1 player at the area of the fight and warps everyone, except the fighter, outside.

6 years agoFix multiple entries in highscore list, spelling of throw, reduce time to 3 minutes
Ben Longbons [Sat, 27 Aug 2011 21:50:47 +0000 (14:50 -0700)]
Fix multiple entries in highscore list, spelling of throw, reduce time to 3 minutes

6 years agoignore backup files when generating imports
Ben Longbons [Sat, 27 Aug 2011 16:45:23 +0000 (09:45 -0700)]
ignore backup files when generating imports

6 years agoFirst set of conversions to using 4 spaces in place of tabs. Also replaced tabs with...
The Kandiman [Sat, 27 Aug 2011 04:54:21 +0000 (00:54 -0400)]
First set of conversions to using 4 spaces in place of tabs. Also replaced tabs with pipes in headers. Map 001-1 complete.

6 years agoRestoring the use of $@Fluffy_Min variable, which was removed by mistake.
coffee [Sat, 27 Aug 2011 12:45:27 +0000 (09:45 -0300)]
Restoring the use of $@Fluffy_Min variable, which was removed by mistake.

6 years agoSome small changes + Makes it possible to drop food any time during the fight + Now...
coffee [Sat, 27 Aug 2011 12:37:52 +0000 (09:37 -0300)]
Some small changes + Makes it possible to drop food any time during the fight + Now the script won't eat your food if you drop more than the limit.

6 years agoMaking the map-server possible start again with removing an import of an non-existing...
Jessica Tölke [Sat, 27 Aug 2011 07:46:02 +0000 (09:46 +0200)]
Making the map-server possible start again with removing an import of an non-existing file.

6 years agoForce the converter to run for all files to update generated files
Ben Longbons [Sat, 27 Aug 2011 04:36:12 +0000 (21:36 -0700)]
Force the converter to run for all files to update generated files

* replace indentation tabs with 4 spaces
* replace separator tabs with pipes
* replace break; with end;
* handle unnamed maps

6 years agoFix and comment fluffy hunting quest
Ben Longbons [Sat, 27 Aug 2011 04:06:53 +0000 (21:06 -0700)]
Fix and comment fluffy hunting quest

6 years agoMakes the reference to variables the same through the file.
coffee [Sat, 27 Aug 2011 00:27:34 +0000 (21:27 -0300)]
Makes the reference to variables the same through the file.

6 years agoFixes some small syntax errors and change the way the script checks if you are logged...
coffee [Fri, 26 Aug 2011 12:17:53 +0000 (09:17 -0300)]
Fixes some small syntax errors and change the way the script checks if you are loggedin or inside the right area.

6 years agoChanging Yeti speed back to 220.
Jessica Tölke [Fri, 26 Aug 2011 11:23:18 +0000 (13:23 +0200)]
Changing Yeti speed back to 220.
Adapting adelay, amotion and xml to fit, thanks to pateame for this.
Updated submodule pointer for xml.

6 years agoAdded "Scorpion" after "Crotcher". It was forgotten in mob_db.txt but not in monsters...
Ali-G [Fri, 26 Aug 2011 06:23:59 +0000 (08:23 +0200)]
Added "Scorpion" after "Crotcher". It was forgotten in mob_db.txt but not in monsters.xml.

6 years agoRefactor and format the fluffy hunt code
Ben Longbons [Fri, 26 Aug 2011 07:21:12 +0000 (00:21 -0700)]
Refactor and format the fluffy hunt code

6 years agoAdd script function time_stamp, a replacement for gettimestr
Ben Longbons [Thu, 25 Aug 2011 23:14:49 +0000 (16:14 -0700)]
Add script function time_stamp, a replacement for gettimestr

6 years agoConverter: new scripting guideline applied, tabs in headlines replaced by pipes
Jessica Tölke [Thu, 25 Aug 2011 18:10:49 +0000 (20:10 +0200)]
Converter: new scripting guideline applied, tabs in headlines replaced by pipes

6 years agoSome modifications on 034-1 by Ali-G, updating wlk and submodule pointer
Jessica Tölke [Thu, 25 Aug 2011 18:06:51 +0000 (20:06 +0200)]
Some modifications on 034-1 by Ali-G, updating wlk and submodule pointer

6 years agoConverter: 030-1.wlk, 030-1.wlk and 033-1.wlk changed
Jessica Tölke [Thu, 25 Aug 2011 17:40:40 +0000 (19:40 +0200)]
Converter: 030-1.wlk, 030-1.wlk and 033-1.wlk changed
Updated submodule pointer

6 years agoCause the switch to only change the color of the person who touches it
Charles Miller [Wed, 24 Aug 2011 23:22:15 +0000 (19:22 -0400)]
Cause the switch to only change the color of the person who touches it

Also some spelling mistakes fixed

6 years agoUpdate for the spark boss fight on map 005-4
Charles Miller [Wed, 24 Aug 2011 22:22:32 +0000 (18:22 -0400)]
Update for the spark boss fight on map 005-4

Better warning messages, less spam, ability to change everyone's
color by pressing the switch during the fight.  and more!

6 years agosome minor fixes on barbarians and some things to ease testing
Jessica Tölke [Wed, 24 Aug 2011 16:05:40 +0000 (18:05 +0200)]
some minor fixes on barbarians and some things to ease testing

6 years agoUpdating submodule pointer: fix on 011-6 v2011.08.24
Jessica Tölke [Wed, 24 Aug 2011 13:58:31 +0000 (15:58 +0200)]
Updating submodule pointer: fix on 011-6

6 years agoUpdating submodule pointer: fixes of walls of 012-3
Jessica Tölke [Tue, 23 Aug 2011 18:55:12 +0000 (20:55 +0200)]
Updating submodule pointer: fixes of walls of 012-3

6 years agoremoving some commented out debug npcs
Jessica Tölke [Fri, 19 Aug 2011 15:04:17 +0000 (17:04 +0200)]
removing some commented out debug npcs

6 years agoPrevents parua from charging more than 1 player for the fight.
coffee [Sun, 21 Aug 2011 20:00:22 +0000 (17:00 -0300)]
Prevents parua from charging more than 1 player for the fight.

6 years agoCompromise on the range of #inma v2011.08.18
Ben Longbons [Wed, 17 Aug 2011 21:39:44 +0000 (14:39 -0700)]
Compromise on the range of #inma

6 years agofix warps from 003-1 to 003-2
Jessica Tölke [Tue, 16 Aug 2011 11:23:34 +0000 (13:23 +0200)]
fix warps from 003-1 to 003-2

6 years agochanging buy price of Cotton Shirt to prevent an exploit some corrections regarding...
Jessica Tölke [Thu, 4 Aug 2011 11:23:26 +0000 (13:23 +0200)]
changing buy price of Cotton Shirt to prevent an exploit some corrections regarding whitespaces

6 years agoUpdate java converter per new standards
Ben Longbons [Sun, 7 Aug 2011 20:59:36 +0000 (13:59 -0700)]
Update java converter per new standards

* Use end; instead of break;
* Indent with 4 spaces instead of tab
* Use pipe instead of tab as a separator

To avoid merge conflicts, I did not commit the changes from running the converter

6 years agoupdated submodule pointer
Stefan Beller [Fri, 5 Aug 2011 19:16:48 +0000 (21:16 +0200)]
updated submodule pointer

starting automapping rules of thermin caves

6 years agoFixes the logic in reset.txt and battlecaves.txt according to o11c's suggestion....
Coffee [Fri, 5 Aug 2011 15:51:52 +0000 (12:51 -0300)]
Fixes the logic in reset.txt and battlecaves.txt according to o11c's suggestion. Makes it possible to enter the cave after completing the quest.

6 years agoMerge remote-tracking branch 'stable/master'
Ben Longbons [Wed, 3 Aug 2011 23:37:50 +0000 (16:37 -0700)]
Merge remote-tracking branch 'stable/master'

6 years agoCompletely comment out disabled scripts instead of just the first line v2011.08.03
Ben Longbons [Wed, 3 Aug 2011 23:26:16 +0000 (16:26 -0700)]
Completely comment out disabled scripts instead of just the first line

This meant that every line would be parsed as a toplevel script,
and could crash the server under some conditions.

6 years agoRossy quest: replacing hard coded numbers with variables and some fixes in dialogue
Jessica Tölke [Wed, 3 Aug 2011 15:09:45 +0000 (17:09 +0200)]
Rossy quest: replacing hard coded numbers with variables and some fixes in dialogue

6 years agoFix an error in Caul's dementia potion minigame
Jessica Tölke [Tue, 2 Aug 2011 11:22:40 +0000 (13:22 +0200)]
Fix an error in Caul's dementia potion minigame
skulls are recognized correctly now