tmw:tmwa-server-test.git
6 years agoSeveral map fixes. Converter ran, submodule pointer updated. v2011.09.29
Jessica Tölke [Wed, 28 Sep 2011 18:02:38 +0000 (20:02 +0200)]
Several map fixes. Converter ran, submodule pointer updated.

6 years agoAdding new maps 044-1 and 044-3.
Jessica Tölke [Sun, 25 Sep 2011 09:44:48 +0000 (11:44 +0200)]
Adding new maps 044-1 and 044-3.

Some changes on other maps related to the new maps.
Warp to new maps disabled until release.
Converter ran.
Submodule pointer updated.

6 years agoWarp between 006-1 and 032-3 fixed, missing collision tile was added.
Jessica Tölke [Sun, 25 Sep 2011 09:23:20 +0000 (11:23 +0200)]
Warp between 006-1 and 032-3 fixed, missing collision tile was added.

Converter ran.
Submodule pointer updated.

6 years agoClient-data: Added some collision on closed area on 034-1.
Jessica Tölke [Sun, 25 Sep 2011 09:16:25 +0000 (11:16 +0200)]
Client-data: Added some collision on closed area on 034-1.

Converter ran.
Submodule pointer updated.

6 years agoClient-data: some warp fixes on several maps.
Jessica Tölke [Fri, 23 Sep 2011 12:47:49 +0000 (14:47 +0200)]
Client-data: some warp fixes on several maps.

Converter ran.
Submodule pointer updated.

6 years agoClient-data update:
Jessica Tölke [Fri, 23 Sep 2011 12:43:37 +0000 (14:43 +0200)]
Client-data update:

Some typing error in items.xml
Borders of 007-1 and 008-1 changed to fit together.
Converter ran, collision of 008-1 changed.
Submodule pointer updated.

6 years agoClient-data: Some work on 033-1 and 034-1.
Jessica Tölke [Tue, 20 Sep 2011 18:44:49 +0000 (20:44 +0200)]
Client-data: Some work on 033-1 and 034-1.

Converter ran.
Submodule pointer updated.

6 years agoSome client-data changes:
Jessica Tölke [Tue, 20 Sep 2011 18:40:25 +0000 (20:40 +0200)]
Some client-data changes:

Layer fixes.
Collision fixes on 003-1 and 020-1.
Converter ran.
Submodule pointer updated.

6 years agoClient-data update: some warps and some minor fixes.
Jessica Tölke [Tue, 20 Sep 2011 14:40:45 +0000 (16:40 +0200)]
Client-data update: some warps and some minor fixes.

Converter ran to fix some warps.
Submodule pointer updated.

6 years agouse zeny instead of Zeny in tutorial npcs v2011.09.19
Jessica Tölke [Mon, 19 Sep 2011 07:23:56 +0000 (09:23 +0200)]
use zeny instead of Zeny in tutorial npcs

6 years agoAdd constants for special effects on client-data/effects.xml
coffee [Sun, 18 Sep 2011 12:57:43 +0000 (09:57 -0300)]
Add constants for special effects on client-data/effects.xml

6 years agoFixed some typos and gave capital letters to the equipment lists.
Ali-G [Sat, 17 Sep 2011 07:33:24 +0000 (09:33 +0200)]
Fixed some typos and gave capital letters to the equipment lists.

6 years agoRun the new tools/aligncsv on item_db and mob_db
Ben Longbons [Fri, 16 Sep 2011 21:52:12 +0000 (14:52 -0700)]
Run the new tools/aligncsv on item_db and mob_db

Also ran make mobxp because somebody seems to have forgotten it.

If anybody gets conflicts for this:
1. Resolve it by keeping your version.
2. make mobxp indent

6 years agoReimplement aligncsv in C++ instead of python.
Ben Longbons [Fri, 16 Sep 2011 21:36:23 +0000 (14:36 -0700)]
Reimplement aligncsv in C++ instead of python.

The main advantage of the new one is that it properly handles
{script arg1, arg2;}

6 years agoCotton Pants/Cotton Trousers
Jessica Tölke [Fri, 16 Sep 2011 18:58:55 +0000 (20:58 +0200)]
Cotton Pants/Cotton Trousers

Rename Cotton Pants to Cotton Trousers.
Some minor fixes in Lora Tay.
Added it in Bleacher/Dyer.
Submodule pointer updated.

6 years agoAdd Cotton Pants
enchilado [Fri, 16 Sep 2011 14:23:16 +0000 (00:23 +1000)]
Add Cotton Pants

Lora Tay will now lengthen Cotton Shorts into Cotton Pants (which can
also be trimmed back into Shorts)

6 years agoRemoved trailing whitespace in 009-2
Frost [Thu, 15 Sep 2011 17:51:04 +0000 (10:51 -0700)]
Removed trailing whitespace in 009-2

6 years agoRemoved tabs from 005-4/bossfight
Frost [Thu, 15 Sep 2011 17:48:13 +0000 (10:48 -0700)]
Removed tabs from 005-4/bossfight

6 years agoRemoved tabs from 020-2 NPCs
Frost [Thu, 15 Sep 2011 17:44:23 +0000 (10:44 -0700)]
Removed tabs from 020-2 NPCs

6 years agoSmall dialog fixes and cleaning temporary variables when closing NPC window in voltai...
coffee [Thu, 15 Sep 2011 12:19:40 +0000 (09:19 -0300)]
Small dialog fixes and cleaning temporary variables when closing NPC window in voltain.txt. Changes tested.

6 years agoAdding maggots to 042-1.
Jessica Tölke [Wed, 14 Sep 2011 19:18:58 +0000 (21:18 +0200)]
Adding maggots to 042-1.

This is to make it possible to train in case the status points were distributed badly.
Converter ran.
Submodule pointer updated.

6 years agoClient-data: some fixes and changes on several snow maps.
Jessica Tölke [Wed, 14 Sep 2011 13:28:44 +0000 (15:28 +0200)]
Client-data: some fixes and changes on several snow maps.

Converter ran.
Submodule pointer updated.

6 years agoAdding banker to Nivalis.
Jessica Tölke [Mon, 12 Sep 2011 20:13:15 +0000 (22:13 +0200)]
Adding banker to Nivalis.

Banker and woman who explains about the increased trade added.
Submodule pointer updated due to some layer fix in that building.

6 years agoAdding new maps/map parts in snow area.
Jessica Tölke [Mon, 12 Sep 2011 18:38:36 +0000 (20:38 +0200)]
Adding new maps/map parts in snow area.

In 020 new building with indoor.
In 031 indoor of seamans house added.
Also collision removed for small chairs.
Submodule pointer updated.

6 years agoClient-data: Review of all maps by Ali-G, Converter ran.
Jessica Tölke [Mon, 12 Sep 2011 18:31:41 +0000 (20:31 +0200)]
Client-data: Review of all maps by Ali-G, Converter ran.

Submodule pointer updated.
Also replacing 017-1/monsters.txt with spawn objects in the map.

6 years agoBump version in news.php and remove point version from tutorial.
Ben Longbons [Mon, 12 Sep 2011 18:39:27 +0000 (11:39 -0700)]
Bump version in news.php and remove point version from tutorial.

6 years agoTab conversion and script formatting project.
The Kandiman [Mon, 12 Sep 2011 00:33:46 +0000 (20:33 -0400)]
Tab conversion and script formatting project.
Final commit, maps 024-1 through 042-2 complete.

6 years agoTab conversion and formatting project.
The Kandiman [Sun, 11 Sep 2011 00:15:17 +0000 (20:15 -0400)]
Tab conversion and formatting project.
npc/functions and npc/items complete.

6 years agoFix another goto non existent label bug. This time on ishi.
coffee [Sun, 11 Sep 2011 06:41:52 +0000 (03:41 -0300)]
Fix another goto non existent label bug. This time on ishi.

6 years agoTab replacement and formatting project: Maps 014-1 to 021-2 complete.
The Kandiman [Sat, 10 Sep 2011 18:10:36 +0000 (14:10 -0400)]
Tab replacement and formatting project: Maps 014-1 to 021-2 complete.

6 years agoFixes a bug in npc omar (goto non existent label) and set the values to zero.
coffee [Sat, 10 Sep 2011 14:26:14 +0000 (11:26 -0300)]
Fixes a bug in npc omar (goto non existent label) and set the values to zero.

6 years agoRemoved tabs from 025-4 downto 022-1
Frost [Sat, 10 Sep 2011 01:11:15 +0000 (18:11 -0700)]
Removed tabs from 025-4 downto 022-1

Minor spelling corrections in tinris.txt.

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