summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-05-17Run make maps to add 034-2. Submodule pointer updated.Jessica Tölke8-0/+23
2013-05-10Merge remote-tracking branch 'origin/master' into waricJessica Tölke101-2101/+987
2013-05-10Orum and Waric follow-up: Dialogue and logic for fifth flowerJessica Tölke1-1/+205
2013-05-10Orum and Waric follow-up: dialogue and logic for fourth flower.Jessica Tölke1-0/+189
2013-05-10Orum and Waric follow-up: dialogue and logic for third flower.Jessica Tölke1-0/+150
That involves a minigame to prepare the third flower.
2013-05-10Orum and Waric follow-up: dialogue and logic in Orum for second magical flower.Jessica Tölke1-2/+91
2013-05-10Orum and Waric follow-up: Add NPCs Orum and Waric.Jessica Tölke3-0/+189
Initial talk in Waric's script. Logic for the first flower in Orum's script.
2013-05-10Orum and Waric follow-up: Add Guarding SpiritJessica Tölke2-0/+90
The Guarding Spirit prevents people who didn't do the first part of the quest from entering. Players that helped to free Waric can persuade the spirit to let them in. Once the player entered, the spirit warps into the cave on touch.
2013-05-04Brodomir cave: on reward, skip calling getitem if there is no item to give.v2013.05.12Vincent Petithory1-1/+4
2013-04-29Be coherent about what's armor and what's a weaponBen Longbons1-5/+5
Newly added assertions in the server caught this.
2013-04-29Run 'make maps' for client-data changes.tux9th2-0/+0
Updated submodule pointer.
2013-04-28Update German translation of the rules:Jessica Tölke1-6/+5
- add information about no-following to the botting rule - replace ae,oe,ue,ss with ä,ö,ü,ß
2013-04-28Add news entry about new release, update submodule pointer.v2013.04.28Jessica Tölke4-0/+50
2013-04-28Remove news entries from before summer 2012.Jessica Tölke3-1034/+0
This is to keep the client from hanging while loading the huge news file at login.
2013-04-28Split up 00-old-news.txt.Jessica Tölke2-49/+48
Moved the entries from the second half of 2012 to a separate news entry file.
2013-04-24Remove the old stuff about the directory movesBen Longbons3-65/+1
2013-04-24Change wolf to wolvern in dialogbh281-1/+1
2013-04-22Merge pull request #16 from bigcrunch/masterjtoelke1-8/+8
minor fixes to grammar and spelling on auldsbel.txt
2013-04-22Run 'make maps' to update the monster spawn names.Jessica Tölke68-473/+473
They now match the names from mob_db.
2013-04-22Merge pull request #15 from DinoPaskvan/masterjtoelke7-64/+64
Small changes and fixes for NPC dialogues
2013-04-22Added a missing period.Dino Paskvan1-1/+1
2013-04-22Minor spelling and grammatical fixesPatrick O'Neal1-7/+7
2013-04-22FixDino Paskvan1-1/+1
2013-04-22Changed 'are' to 'is'Patrick O'Neal1-1/+1
2013-04-22Small fixDino Paskvan1-1/+1
2013-04-22Small changes and fixes to NPC dialogues (barman, caretaker, Cerhan, crying ↵Dino Paskvan7-64/+64
child, diary, evil guard and GY INN shops)
2013-04-21Merge pull request #14 from stefanbeller/masterjtoelke1-2/+30
update .mailmap file
2013-04-21update .mailmap fileStefan Beller1-2/+30
2013-04-19Merge pull request #13 from DinoPaskvan/masterjtoelke1-96/+96
Fixes for Golbenez NPC
2013-04-19Small fixesDino Paskvan1-2/+2
2013-04-19Apart from fixing typos and grammatical errors (most notably the lack of ↵Dino Paskvan1-96/+96
apostrophes in possessive forms), I have made a couple of point of view corrections. An example would be the statement that Golbenez decides to ignore you. From a player's point of view, you would lack the necessary insight into what Golbenez is actually thinking to know that he decided on something. Instead, you just see him ignoring you. Also, I changed the tone of Golbenez's dialogue, making it more formal, as that seems more appropriate for a demonic being, and also increases the contrast in unexpected situations, making for a more humorous setting when he i.e. asks for a cake. Finally, I tried to make the language flow more naturally overall.
2013-04-17Handle wrong mob names in map spawnsBen Longbons1-0/+24
2013-04-17shop Inar: CottonBoots were misspelled WhiteCottonBootsbh281-1/+1
2013-04-14Fix exploit in Brodomir script due to unexpected behavior of delitem/getitem.Jessica Tölke1-5/+28
- delitem: only deletes one item if applied to not-stackable item (equipment) - getitem: gives item stacked, even if it's equipment - fix: use a loop and only delete/give one item at a time
2013-04-13Refactor torches to avoid a bug and make more consistent and obviousBen Longbons5-289/+148
Also avoid some silliness with rand()
2013-04-13Fix submoduleBen Longbons1-0/+0
Did someone rebase or something?
2013-04-11run 'make maps' for client-data changes on 021-1 and 045-1.tux9th3-0/+0
2013-04-01Running 'make maps' to update monster spawns on 017-1.Jessica Tölke3-3/+2
This also changed the _import.txt of 008-1 to order the entries alphabetically. Update submodule pointer.
2013-03-29Typo fixbh281-1/+1
2013-03-25Switch all npcs back to 127 that the player can't 'talk' to.Jessica Tölke10-16/+16
2013-03-25Change invisible npc id from 127 to 400.Andrei Karas45-93/+93
127 - invisible unselectable npc (fake npc used by server) 400 - invisible selectable npc
2013-03-24Easter event: remove outdated comment.Jessica Tölke1-1/+0
2013-03-24Merge remote-tracking branch 'v0id/candor-wip'v2013.03.24Jessica Tölke1-3/+39
Conflicts: world/map/npc/029-3/parua.txt
2013-03-24Annual Easter: increase minimum level and add age requirement.Jessica Tölke2-1/+1
Update submodule pointer.
2013-03-24Merge remote-tracking branch 'v0id/easter-fix' into testJessica Tölke2-0/+13
2013-03-24Boss points: fixup on punctuationJessica Tölke1-1/+1
2013-03-24Easter fix: play the FX_GETITEM particle effect whenever the player receives ↵Vincent Petithory1-0/+4
an object
2013-03-24Easter fix: give a Green Apple for the first interaction with the eggsVincent Petithory1-0/+1
2013-03-24Add FX_GETITEM particle effectVincent Petithory1-0/+1
2013-03-24Boss points:Jessica Tölke8-17/+18
Add boss points to Yeti that you have to defeat during Yerrnk's quest. Add missing punctuation to all boss point messages.