summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-04-22Changed 'are' to 'is'Patrick O'Neal1-1/+1
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.
2013-03-24Easter: add standard waiting time on first interaction with the eggsVincent Petithory1-0/+7
* This fixes the problem that players could log off to circumvent the waiting time
2013-03-24Candor Fix: More severe with poison durationVincent Petithory1-1/+1
2013-03-24Candor fix: Clean dead players' variables with OnPCDieEventVincent Petithory1-2/+5
2013-03-24Candor Fix:Vincent Petithory1-7/+22
* Clean player variables when the player dies / at end of round * Do no punish players before round 600 * Hurt players based on a % of their Max HP, not a fixed value * Make the poison duration depend on the severity of the punishment (8s per increment)
2013-03-24WIP: Punish players who don't move from their position during Candor.Jessica Tölke1-0/+19
When a new round starts, the position of the player is compared with the position from the last round. If it's the same, the player is poisoned and damage is dealt based on how often the player didn't change their position.
2013-03-22Add boss point reward to boss fights.Jessica Tölke6-1/+36
Auldsbel's snakes: 5 per snake Giant Cave Maggot: 10 Bandit Lord: 20 Rossy and Julia battle caves: each 10, final boss 50 Cindy: 70 Illia: depending on the current difficulty between 120 and 200
2013-03-22Annual Easter: fix a bug in the start and end time logic.v2013.03.22Jessica Tölke1-1/+1
The checks for the date didn't include the start and end day.
2013-03-21Run 'make maps' for client-data changes regarding 055-1 and 056-1.Jessica Tölke3-0/+0
2013-03-21Remove quote from Crush from the news.php.Jessica Tölke1-3/+0
If the text is too long, people won't bother to scroll down and read the actual news.
2013-03-20News entry about the release.v2013.03.21Jessica Tölke3-0/+80
2013-03-20News entries about the server moves.Jessica Tölke4-0/+70
2013-03-20Merge branch 'easter'Jessica Tölke5-0/+213
Conflicts: world/map/db/item_db.txt
2013-03-20Introduce a non-permanent counter of tries.Jessica Tölke1-2/+7
The counter gets reset on log out. The probability to get the final reward depending on the counter.
2013-03-20Disable debug helper for the beanie copter quest in non-debug configuration.Jessica Tölke1-0/+4
2013-03-20Merge remote-tracking branch 'Jenalya/beaniecopter'Jessica Tölke4-6/+442
Quest idea and dialog: veryape Scripting: Jenalya Spelling and Grammar check: Qwerty Dragon Testing: Nard, 0x0BAL
2013-03-19Brodomir PvP cave:Vincent Petithory1-16/+8
* Make the announcement from map to global. * Extend the time before start from 300 seconds to 600 seconds * Remove the 3 players requirement to start a PvP tournament (but still require 3 to be present when the fight starts)
2013-03-15Illia: fix "Something isn't alright" to "Something isn't right". Reported by ↵Vincent Petithory2-3/+3
Villain.
2013-03-15Revert save time to the recommended default (300 seconds, which is 5 minutes).Jessica Tölke1-1/+1
2013-03-15Fix typo in Kfahr's script reported by masoudd.Jessica Tölke1-1/+1
2013-03-13Rename Beanie Copter Cap to Beanie Copter.Jessica Tölke2-5/+5
2013-03-13Beanie Copter quest: add possibility to apologize and get the cap in case ↵Jessica Tölke1-1/+19
you declined it before.
2013-03-13Changes on the dialog made by Qwerty Dragon.Jessica Tölke1-35/+36
2013-03-11Add debug helper for the Beanie Copter quest.Jessica Tölke1-0/+72
2013-03-10Run 'make maps' to update the spawn time of the Jack-O on 018-1.Jessica Tölke2-1/+1
2013-03-09Cindy: Spawning one more Yeti at each waveStefan Dombrowski1-3/+2
With the last bug fix the quest got a bit easier. This commit makes it a bit more difficult again. If the players manage to kill all Yetis before the round timer triggers the next wave, then the maximum number of Yetis alive is the same as in the past. For the benefit of the hero's companions Cindy now announces the 0th wave publically.