tmw-eathena-data:mainline.git
7 years agomaking the quiz available during the whole event time master
Jessica Tölke [Wed, 18 May 2011 17:50:59 +0000 (19:50 +0200)]
making the quiz available during the whole event time

7 years agotypo fixed: "black jack" => "blackjack"
Ali-G [Mon, 9 May 2011 07:48:48 +0000 (09:48 +0200)]
typo fixed: "black jack" => "blackjack"

7 years agoFixed the issue of the soul menhir in nivalis that spawned us somewhere else than...
Ali-G [Sun, 8 May 2011 10:04:52 +0000 (12:04 +0200)]
Fixed the issue of the soul menhir in nivalis that spawned us somewhere else than near it

7 years agoRemove bad map from npc root import
Jared Adams [Mon, 2 May 2011 19:57:33 +0000 (13:57 -0600)]
Remove bad map from npc root import

7 years agoFix warp from Caretaker's house
Jared Adams [Mon, 2 May 2011 19:55:30 +0000 (13:55 -0600)]
Fix warp from Caretaker's house

7 years agoRerun converter again...
Jared Adams [Mon, 2 May 2011 19:44:42 +0000 (13:44 -0600)]
Rerun converter again...

7 years agoRun the tmx converter again
Jared Adams [Mon, 2 May 2011 19:37:27 +0000 (13:37 -0600)]
Run the tmx converter again

7 years agochanging the towelquiz spellinvocations in magic.conf.template to fit the needed...
Jessica Tölke [Mon, 2 May 2011 16:50:44 +0000 (18:50 +0200)]
changing the towelquiz spellinvocations in magic.conf.template to fit the needed format for build-magic.sh

7 years agodata created by java converter for 011-6 map changes
Wombat [Mon, 2 May 2011 16:01:40 +0000 (12:01 -0400)]
data created by java converter for 011-6 map changes

7 years agogy inn: lover. changing the mode how he takes dark crystals
Jessica Tölke [Mon, 2 May 2011 09:10:09 +0000 (11:10 +0200)]
gy inn: lover. changing the mode how he takes dark crystals
he takes at least 500 and the player can optionally give more to get extra exp.

7 years agoMerge remote-tracking branch 'mainline/master'
Jessica Tölke [Mon, 2 May 2011 07:39:37 +0000 (09:39 +0200)]
Merge remote-tracking branch 'mainline/master'

7 years agojava converter data for 027-1, -2, 028-1 wlk files and 027-2 warps
Wombat [Mon, 2 May 2011 06:26:04 +0000 (02:26 -0400)]
java converter data for 027-1, -2, 028-1 wlk files and 027-2 warps

files altered by java converter

7 years agoFixed bug in lover's script.
Enchilado [Mon, 2 May 2011 03:57:03 +0000 (13:57 +1000)]
Fixed bug in lover's script.

Before, all of a player's Dark Crystals were removed,
not just the required amount.

7 years agoSync remote state. Update latest version.
E Athena Server [Sun, 1 May 2011 12:23:46 +0000 (14:23 +0200)]
Sync remote state. Update latest version.

7 years agoUpdate to news
The Kandiman [Sat, 30 Apr 2011 21:47:05 +0000 (17:47 -0400)]
Update to news

7 years agoMinor correction/addition to bakery daily quest
The Kandiman [Sat, 30 Apr 2011 20:28:04 +0000 (16:28 -0400)]
Minor correction/addition to bakery daily quest

7 years agoAdded daily quest about acorns to baker.txt
Dark_Mage [Sat, 30 Apr 2011 19:29:36 +0000 (23:29 +0400)]
Added daily quest about acorns to baker.txt

7 years agoReset the stranger quiz to spell invocations again
Stefan Beller [Sat, 30 Apr 2011 11:18:03 +0000 (13:18 +0200)]
Reset the stranger quiz to spell invocations again

Advantage:
magic.conf is not part of the git repository,
so there won't come up conflicts with checked in files.
(i.e. no patch needs to be applied onto the server repository to
make it work, but only magic conf needs to be setup right)

7 years agoMinor spelling/grammar changes to towel day NPC
The Kandiman [Sat, 30 Apr 2011 02:46:32 +0000 (22:46 -0400)]
Minor spelling/grammar changes to towel day NPC

7 years agoRemove Easter 2011
Jessica Tölke [Fri, 29 Apr 2011 16:34:00 +0000 (18:34 +0200)]
Remove Easter 2011

7 years agofix for a conflict of the speed skill quest with the easter quest
Jessica Tölke [Sat, 16 Apr 2011 06:19:50 +0000 (08:19 +0200)]
fix for a conflict of the speed skill quest with the easter quest

7 years agoEaster 2011
crunchy [Tue, 12 Apr 2011 13:21:49 +0000 (23:21 +1000)]
Easter 2011

7 years agosmall fix of a missleading phrase in banker function
Jessica Tölke [Fri, 29 Apr 2011 16:01:06 +0000 (18:01 +0200)]
small fix of a missleading phrase in banker function

7 years agotowel event npc:
Jessica Tölke [Fri, 29 Apr 2011 15:50:35 +0000 (17:50 +0200)]
towel event npc:
give small experience reward for bringing the items
some fixes
uncommented

7 years agoremoving debug lines from crying child quest and uncomment golbenez to open way into...
Jessica Tölke [Fri, 29 Apr 2011 14:27:04 +0000 (16:27 +0200)]
removing debug lines from crying child quest and uncomment golbenez to open way into gy inn

7 years agotowel npc: adding a reference to the book in the npc dialogue
Jessica Tölke [Tue, 26 Apr 2011 17:54:26 +0000 (19:54 +0200)]
towel npc: adding a reference to the book in the npc dialogue

7 years agochanging name of warp towels
Jessica Tölke [Mon, 25 Apr 2011 15:28:16 +0000 (17:28 +0200)]
changing name of warp towels
minor fix in stranger

7 years agoadded 18th haircut to scissors
Ali-G [Mon, 25 Apr 2011 09:59:52 +0000 (11:59 +0200)]
added 18th haircut to scissors

7 years agofix a missing return in strangerquiz function
Jessica Tölke [Mon, 25 Apr 2011 10:13:04 +0000 (12:13 +0200)]
fix a missing return in strangerquiz function

7 years agoMerge remote-tracking branch 'mainline/master'
Jessica Tölke [Mon, 25 Apr 2011 09:42:03 +0000 (11:42 +0200)]
Merge remote-tracking branch 'mainline/master'

7 years agoStrangers quiz: answers now as a function
Stefan Beller [Mon, 25 Apr 2011 09:37:14 +0000 (11:37 +0200)]
Strangers quiz: answers now as a function

not as spellinvocation

7 years agominer north of hurnscald offers gem powders for gems now.
Jessica Tölke [Sun, 24 Apr 2011 19:46:00 +0000 (21:46 +0200)]
miner north of hurnscald offers gem powders for gems now.
gem powder is used in the towel npc for dying towels.

7 years agoAdd Bank options. Thanks to o11c and pjotr
toni [Sat, 23 Apr 2011 18:00:39 +0000 (15:00 -0300)]
Add Bank options. Thanks to o11c and pjotr

7 years agosome changes in towel event npc: using gem powders for towel dying
Jessica Tölke [Fri, 22 Apr 2011 19:30:25 +0000 (21:30 +0200)]
some changes in towel event npc: using gem powders for towel dying
adding generic answers as spellinvocations

7 years agochanging towels, adding gem powders
Jessica Tölke [Fri, 22 Apr 2011 19:29:56 +0000 (21:29 +0200)]
changing towels, adding gem powders

7 years agoChanged the barber's script to add the new 18th haircut. Done by Ali-G.
Ali-G [Tue, 12 Apr 2011 12:51:09 +0000 (14:51 +0200)]
Changed the barber's script to add the new 18th haircut. Done by Ali-G.

7 years agoadding towel day event npc, needs to be uncommented
Jessica Tölke [Mon, 18 Apr 2011 09:36:00 +0000 (11:36 +0200)]
adding towel day event npc, needs to be uncommented

7 years agoadding warp towels
Jessica Tölke [Mon, 18 Apr 2011 08:22:24 +0000 (10:22 +0200)]
adding warp towels

7 years agoRemove deprecated setarray-with-index syntax
Ben Longbons [Sun, 17 Apr 2011 21:35:46 +0000 (14:35 -0700)]
Remove deprecated setarray-with-index syntax

7 years agoFix possible memory leak
Ben Longbons [Mon, 18 Apr 2011 00:39:41 +0000 (17:39 -0700)]
Fix possible memory leak

7 years agoChanging bracelet to ring
toni [Sun, 17 Apr 2011 17:28:21 +0000 (14:28 -0300)]
Changing bracelet to ring

7 years agoFixing erroneous execution of "Give all" from Ishi
Stefan Dombrowski [Sun, 17 Apr 2011 11:51:06 +0000 (13:51 +0200)]
Fixing erroneous execution of "Give all" from Ishi

If a character has monster points for less than 10 rewards
and asks for the maximum number of items, then he got at the
end the false message: "It looks like your Monster Points
were over estimated."

Also fixed initialization of array.

Reviewed-by: Stefan Beller
7 years agoWIP maps added to resnametable to fix GM warping issue
Wombat [Thu, 7 Apr 2011 15:59:47 +0000 (11:59 -0400)]
WIP maps added to resnametable to fix GM warping issue

7 years agogy inn npc names
Wombat [Mon, 4 Apr 2011 05:01:20 +0000 (01:01 -0400)]
gy inn npc names

7 years agoFixing strange bug when using "npcName" as a name for a temporary variable
toni [Sun, 3 Apr 2011 17:51:56 +0000 (14:51 -0300)]
Fixing strange bug when using "npcName" as a name for a temporary variable

7 years agograveyard npc names added and map 34 data/related files
Wombat [Sun, 3 Apr 2011 16:01:43 +0000 (12:01 -0400)]
graveyard npc names added and map 34 data/related files

7 years agoconverter added warning to all autogenerated files
Jessica Tölke [Sat, 2 Apr 2011 11:27:37 +0000 (13:27 +0200)]
converter added warning to all autogenerated files

7 years agomonsters and not conditional warps for orum and waric generated with converter, condi...
Jessica Tölke [Sat, 2 Apr 2011 11:14:06 +0000 (13:14 +0200)]
monsters and not conditional warps for orum and waric generated with converter, conditional warps in an extra file

7 years agoConverter adds a warning in all autogenerated files
Jessica Tölke [Fri, 1 Apr 2011 22:03:52 +0000 (00:03 +0200)]
Converter adds a warning in all autogenerated files

7 years agosome changes made by the converter tool
Jessica Tölke [Thu, 31 Mar 2011 17:34:54 +0000 (19:34 +0200)]
some changes made by the converter tool

7 years agofixing an error in item_db: ReedBundle instead of ReedBundles
Jessica Tölke [Mon, 28 Mar 2011 10:19:36 +0000 (12:19 +0200)]
fixing an error in item_db: ReedBundle instead of ReedBundles

7 years agoremoving debug possibility from parua script after testing
Jessica Tölke [Sun, 27 Mar 2011 21:12:30 +0000 (23:12 +0200)]
removing debug possibility from parua script after testing

7 years agoadding items for easter 2011
Jessica Tölke [Sun, 27 Mar 2011 21:08:36 +0000 (23:08 +0200)]
adding items for easter 2011

7 years agoMore spelling and grammar corrections.
The Kandiman [Sun, 27 Mar 2011 01:30:33 +0000 (21:30 -0400)]
More spelling and grammar corrections.

7 years agoMinor spelling/grammar corrections.
The Kandiman [Sat, 26 Mar 2011 22:04:44 +0000 (18:04 -0400)]
Minor spelling/grammar corrections.

7 years agogy inn: small changes in needed items, level requirement to acces the inn and undead...
Jessica Tölke [Sat, 26 Mar 2011 20:10:37 +0000 (21:10 +0100)]
gy inn: small changes in needed items, level requirement to acces the inn and undead shop

7 years agoShow the remaining time for the fight in minutes.
toni [Sat, 26 Mar 2011 18:55:57 +0000 (15:55 -0300)]
Show the remaining time for the fight in minutes.

7 years agogy inn:
Jessica Tölke [Sat, 26 Mar 2011 16:43:09 +0000 (17:43 +0100)]
gy inn:
some dialogue and reward fixes
changing stats of pinkie helmet
changing stats of food sold in the inn
setting items sold in undead shop

7 years agoadding pinkie helmet
Jessica Tölke [Sat, 26 Mar 2011 11:11:37 +0000 (12:11 +0100)]
adding pinkie helmet

7 years agoAdd global announcement to parua.
toni [Fri, 25 Mar 2011 01:42:36 +0000 (22:42 -0300)]
Add global announcement to parua.

7 years agolena/bandit quest: adding a hint to the tulimshar quests, if the player didn't do...
Jessica Tölke [Thu, 24 Mar 2011 10:28:18 +0000 (11:28 +0100)]
lena/bandit quest: adding a hint to the tulimshar quests, if the player didn't do them already

7 years agoadding debug possibility for crying child quest
Jessica Tölke [Thu, 10 Mar 2011 21:10:26 +0000 (22:10 +0100)]
adding debug possibility for crying child quest

7 years agoremoving zombies and fallens from autogenerated _mobs.txt to avoid conflicts with...
Jessica Tölke [Thu, 10 Mar 2011 21:03:03 +0000 (22:03 +0100)]
removing zombies and fallens from autogenerated _mobs.txt to avoid conflicts with converter tool

7 years agoputting zombies and fallens into special file for crying child quest
Jessica Tölke [Tue, 8 Mar 2011 23:55:28 +0000 (00:55 +0100)]
putting zombies and fallens into special file for crying child quest
this is to avoid collisions with the converter tool

7 years agoUse mapannounce instead of ncptalk, and include the player count, like the players...
Ben Longbons [Sat, 5 Mar 2011 03:16:31 +0000 (19:16 -0800)]
Use mapannounce instead of ncptalk, and include the player count, like the players outside get.

7 years agoPutting the yeti fight cave into a different map and setting nosaveflag.
Jessica Tölke [Wed, 2 Mar 2011 20:35:54 +0000 (21:35 +0100)]
Putting the yeti fight cave into a different map and setting nosaveflag.

7 years agoLuca: adding the possibility to ask on which skills the player is focused on.
Jessica Tölke [Wed, 2 Mar 2011 19:20:33 +0000 (20:20 +0100)]
Luca: adding the possibility to ask on which skills the player is focused on.

7 years agogy inn: minor changes in item references, headless man quest
TheKandiman [Tue, 15 Feb 2011 05:59:19 +0000 (00:59 -0500)]
gy inn: minor changes in item references, headless man quest

7 years agoSimplify build-magic.sh code * Use /bin/sed directly instead of a /bin/bash script...
Ben Longbons [Mon, 14 Mar 2011 00:17:41 +0000 (17:17 -0700)]
Simplify build-magic.sh code * Use /bin/sed directly instead of a /bin/bash script which only called sed * This change produces an incompatible spells-build file, and automatically deletes it.

7 years agoupdate .gitignore to include conf/spells-build and eathena.sh (which might reside...
Ben Longbons [Mon, 14 Mar 2011 00:13:48 +0000 (17:13 -0700)]
update .gitignore to include conf/spells-build and eathena.sh (which might reside elsewhere)

7 years agoAdd tmwcon symlinks, jar, and output file to .gitignore
Ben Longbons [Sat, 12 Mar 2011 18:09:07 +0000 (10:09 -0800)]
Add tmwcon symlinks, jar, and output file to .gitignore

7 years agoSetting mobs which affect Sagatha's mood:
Jessica Tölke [Tue, 1 Mar 2011 15:50:08 +0000 (16:50 +0100)]
Setting mobs which affect Sagatha's mood:
good: scorpion, red scorpion, black scorpion, angry scorpion
bad: fluffy, easter fluffy, mouboo, squirrel

7 years agoTrader in Tulim now offers item conversion for non-magic players
TheKandiman [Sun, 27 Feb 2011 20:02:02 +0000 (15:02 -0500)]
Trader in Tulim now offers item conversion for non-magic players

7 years agodata changes to 028-1.wlk related to a collision tile addition
Wombat [Sun, 27 Feb 2011 10:25:20 +0000 (05:25 -0500)]
data changes to 028-1.wlk related to a collision tile addition

7 years agoalchemist iron/concentration potion crafting reduced to two from 20
Wombat [Fri, 25 Feb 2011 11:39:55 +0000 (06:39 -0500)]
alchemist iron/concentration potion crafting reduced to two from 20

7 years agoalchemist green dye quest now requires level 30 to start
Wombat [Fri, 25 Feb 2011 11:14:18 +0000 (06:14 -0500)]
alchemist green dye quest now requires level 30 to start

7 years agoAdded new haircut to scissors
Ali-G [Fri, 25 Feb 2011 10:55:44 +0000 (11:55 +0100)]
Added new haircut to scissors

7 years agoAdd 17th haircut to the barber. Name : Shoulder Length Flick
Ali-G [Fri, 25 Feb 2011 10:09:38 +0000 (11:09 +0100)]
Add 17th haircut to the barber. Name : Shoulder Length Flick

7 years agoFixed a little problem with some ")"
Ali-G [Fri, 25 Feb 2011 09:44:41 +0000 (10:44 +0100)]
Fixed a little problem with some ")"

7 years agoAdded "good" and "bad" mobs for Sagatha's quest. List is much more revelant now.
Ali-G [Fri, 25 Feb 2011 08:27:52 +0000 (09:27 +0100)]
Added "good" and "bad" mobs for Sagatha's quest. List is much more revelant now.

7 years agoAdded all new mobs, rebalanced everything according to mob_db.txt. Set to 0 monsters...
Ali-G [Fri, 25 Feb 2011 07:50:16 +0000 (08:50 +0100)]
Added all new mobs, rebalanced everything according to mob_db.txt. Set to 0 monsters that don't have specific stats. Tested already.

7 years agogy inn: basic dialog for barman, minor spelling/grammar updates
TheKandiman [Fri, 25 Feb 2011 03:06:26 +0000 (22:06 -0500)]
gy inn: basic dialog for barman, minor spelling/grammar updates

7 years agoFixing name in Shannon npc
Jessica Tölke [Thu, 24 Feb 2011 16:48:10 +0000 (17:48 +0100)]
Fixing name in Shannon npc
 (not using Shanon in the script)

7 years agodata for 012-4 collision tile fix added
Wombat [Wed, 23 Feb 2011 17:59:50 +0000 (12:59 -0500)]
data for 012-4 collision tile fix added

7 years agofix to 012-4 removing "terranite island" and map changes from converter
Wombat [Tue, 22 Feb 2011 16:30:42 +0000 (11:30 -0500)]
fix to 012-4 removing "terranite island" and map changes from converter

012-4.tmx removed terranite island where monsters were spawning and couldn't
be killed.  Ran the java converter afterwards and recieved a number of changes
Those changes added to this patch for review.
Amendment: marked out ("//") golbenez and alacrius inside their scripts.
This is to be done instead of marking out inside _import.txt.

7 years agogy inn: minor backstory update to headless man, slight variable adjustment
TheKandiman [Thu, 17 Feb 2011 03:08:53 +0000 (22:08 -0500)]
gy inn: minor backstory update to headless man, slight variable adjustment

7 years agobowlerhat (brown) added to db, bleacher and dyer
Wombat [Tue, 15 Feb 2011 18:08:46 +0000 (13:08 -0500)]
bowlerhat (brown) added to db, bleacher and dyer

7 years agogyinn:
Jessica Tölke [Tue, 15 Feb 2011 15:59:03 +0000 (16:59 +0100)]
gyinn:
changing golbanez to golbenez in the outside file too
headless man: small changes, proposal for needed amount of items

7 years agogy inn: minor changes in item references, headless man quest
TheKandiman [Tue, 15 Feb 2011 05:59:19 +0000 (00:59 -0500)]
gy inn: minor changes in item references, headless man quest

7 years agogy inn: small change in lover.txt
Jessica Tölke [Mon, 14 Feb 2011 14:33:24 +0000 (15:33 +0100)]
gy inn: small change in lover.txt

7 years agobugfix for ian the trainer
Stefan Beller [Mon, 14 Feb 2011 12:08:58 +0000 (13:08 +0100)]
bugfix for ian the trainer

Ok, you get the graduation cap now again.

7 years agogy inn: adding the golbanez script in 027-1 I forgot in the last commit
Jessica Tölke [Sun, 13 Feb 2011 16:22:20 +0000 (17:22 +0100)]
gy inn: adding the golbanez script in 027-1 I forgot in the last commit

7 years agogy inn: adding warp to outside and golbanez to come in.
Jessica Tölke [Sun, 13 Feb 2011 13:09:50 +0000 (14:09 +0100)]
gy inn: adding warp to outside and golbanez to come in.
golbanez needs to be uncommented to work

7 years agosetting some magic bonus and agi bonus for sorcerer robes
Jessica Tölke [Sat, 12 Feb 2011 22:56:05 +0000 (23:56 +0100)]
setting some magic bonus and agi bonus for sorcerer robes

7 years agosmall fix
toni [Sat, 12 Feb 2011 23:19:21 +0000 (21:19 -0200)]
small fix

7 years agoChanges to the crying child dialogues. Trying to make it more consistent with the...
toni [Sat, 12 Feb 2011 19:26:42 +0000 (17:26 -0200)]
Changes to the crying child dialogues. Trying to make it more consistent with the backstory.

7 years agogy inn: adding black jack to the werewolf (game mechanics is copied from the casino...
Jessica Tölke [Sat, 12 Feb 2011 17:33:15 +0000 (18:33 +0100)]
gy inn: adding black jack to the werewolf (game mechanics is copied from the casino.txt)

7 years agoMerge git://gitorious.org/~wombat/tmw-eathena-data/cache-serverdata
TheKandiman [Sat, 12 Feb 2011 16:25:06 +0000 (11:25 -0500)]
Merge git://gitorious.org/~wombat/tmw-eathena-data/cache-serverdata

7 years agoSpelling, grammar, formatting corrections for love triangle quest.
TheKandiman [Sat, 12 Feb 2011 16:23:23 +0000 (11:23 -0500)]
Spelling, grammar, formatting corrections for love triangle quest.

7 years agoremove spaces
Stefan Beller [Fri, 11 Feb 2011 18:40:15 +0000 (19:40 +0100)]
remove spaces