Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,894 Commits 66 Branches 0 Tags 560 MiB
Commit Graph

11894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lemongrass3110
b3d622f823 Death penalty 
Fixed death penalty overflow.
Fixes: http://rathena.org/board/tracker/issue-8522-experience-loss/
 2014-01-22 22:42:47 +01:00
Euphy
364c7edb90 Added official names as comments in many newer scripts. 
Signed-off-by: Euphy <euphy@rathena.org>
 2014-01-22 15:59:21 -05:00
Lemongrass3110
3f1242edfd Status Saving 
Fixed status saving in general, now cart will always be loaded.
 2014-01-22 21:32:00 +01:00
Lemongrass3110
e3372f2d5d NPC ID update 
Added some missing NPC IDs and adjusted the NPC range for the newest IDs
 2014-01-22 18:51:52 +01:00
Euphy
e6bd3625c6 Implemented Kagerou/Oboro Equipment Quests. 
Signed-off-by: Euphy <euphy.raliel@rathena.org>
 2014-01-22 12:25:07 -05:00
Cydh Ramdh
03be2a5f42 Merge pull request #42 from Rekiem/patch-7 
Update cash_trader-idRO.txt, fixed map typo
 2014-01-22 03:37:30 -08:00
Rekiem
5899bef2ce Update cash_trader-idRO.txt 
change einbeich to einbech.
 2014-01-21 21:13:14 -05:00
Euphy
5d08795837 Implemented 2012 Headgear Quests. 
Credits to @cydh for helping out with the quest bonus.
Follow-up 1a9b54: added missing SQL item_db entries.

Clarified description of "delayed consumption" item type (11) in item_db documentation. (tid:91187, thanks Annie!)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
 2014-01-21 16:01:57 -05:00
aleos89
b818c78f1d Added Oktoberfest costume. 
- Requires client version 20131218 or newer.
 2014-01-21 11:26:59 -05:00
Cydh Ramdh
1ba024069a Fixed bugreport:8468, http://rathena.org/board/tracker/issue-8468-item-not-exist-using-dummy-data/ 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2014-01-21 19:18:19 +07:00
Cydh Ramdh
e2e0a1818e Follow up a32d3a6, revert this litte thing. Thank Lemongrass 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2014-01-20 22:53:55 +07:00
Cydh Ramdh
a32d3a6e76 * Fixed bugreport:8471, http://rathena.org/board/tracker/issue-8471-star-gladiators-feeling-randomising-map/ 
* Follow up f4eb33e, 5a2849d

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2014-01-20 22:38:10 +07:00
Euphy
1a9b546540 Added database entries (item_db, item_combo_db, quest_db) entries for 2012 Headgear Quests. 
Signed-off-by: Euphy <euphy.raliel@rathena.org>
 2014-01-19 16:43:48 -05:00
Cydh Ramdh
f4eb33e176 * Fixed some typos on skill_copyable_db.txt that causing Shadow Slash (and other skill?) cannot be copied, bugreport:8500 http://rathena.org/board/tracker/issue-8500-plagi-buggi/ 
* Follow up f3bb209 also remove unused check of INF3_DIS_PLAGIA since using skill_copyable_db.txt now
* Follow up 96443cd

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2014-01-20 03:43:05 +07:00
Cydh Ramdh
5a2849d9ff Fixed bugreport:8514, http://rathena.org/board/tracker/issue-8514-map-server-crash/ 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2014-01-19 21:00:54 +07:00
Euphy
8c24dc899b Follow-up 4226a23: added a missing trader. 
Signed-off-by: Euphy <euphy.raliel@rathena.org>
 2014-01-18 12:32:41 -05:00
Euphy
4226a23683 Updated Renewal Ninja shops. (incl. bugreport:8507) 
http://rathena.org/board/tracker/issue-8507-ninja-merchant/

Fixed an NPC name length. (bugreport:8512)
http://rathena.org/board/tracker/issue-8512-riding-creature-master-shows-warning-in-console/

Signed-off-by: Euphy <euphy.raliel@rathena.org>
 2014-01-18 11:48:43 -05:00
Cydh Ramdh
5a7d4a58e6 Follow up d35ac5a, 18b3e15 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2014-01-18 11:58:00 +07:00
Lemongrass3110
ef0515873e Channels & Typo 
Autotraders dont join any channels nomore
Fixed a small typo for vending entry loading
 2014-01-17 20:47:54 +01:00
Cydh Ramdh
4ebf2aacec Follow up 24f7ccc 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2014-01-17 10:52:22 +07:00
Cydh Ramdh
c703636adb Fixed bugreport:8439 (http://rathena.org/board/tracker/issue-8439-bonus3-baddmonsterdropitem-not-specified-on-one-item%EF%BC%81/) as follow up 32713b9 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2014-01-16 13:04:44 +07:00
Euphy
2ec01da4d6 Added Mail Annex Station scripts to iRO Eden. 
Corrected a few lines in KG/OB Gear Enchants. (follow-up 9b5798d)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
 2014-01-15 17:26:58 -05:00
Euphy
9b5798dc39 Implemented Kagerou/Oboro Gear Enchants. 
Signed-off-by: Euphy <euphy.raliel@rathena.org>
 2014-01-15 16:25:58 -05:00
Lemongrass3110
8183c380f7 Shop order 
Order will now be the same everytime
 2014-01-15 21:21:57 +01:00
Lemongrass3110
b6f60d5434 Added a comment for @euphyy 
Vendings are now deleted after you relogin with that account
Should fix player freezing?
 2014-01-15 09:05:15 +01:00
Lemongrass3110
b7fd4dd274 Unneeded semicolons removed 
Removed duplicate slashes
 2014-01-14 23:38:12 +01:00
Lemongrass3110
9240320501 Possible leak fix 2014-01-14 22:44:43 +01:00
Lemongrass3110
21eac1da68 Forgot the SQL changes 2014-01-14 22:28:52 +01:00
Lemongrass3110
07b9fe761f Autotrade persistency 2014-01-14 22:24:00 +01:00
Euphy
d569d288bd Added 'strcmp' script command. 
Signed-off-by: Euphy <euphy.raliel@rathena.org>
 2014-01-13 19:07:01 -05:00
Euphy
b92b6be5b5 Merge pull request #39 from Rekiem/patch-6 
Added Rebellion Machine shops to npc/re/merchants/shops.txt.
 2014-01-13 16:02:25 -08:00
Euphy
18b3e15ed6 Merge pull request #38 from Rekiem/patch-5 
Update npc/re/renters.txt with Riding Creature duplicates.
 2014-01-13 16:01:18 -08:00
Cydh Ramdh
d35ac5a601 * Initial release idRO Cash trader NPC. npc: npc/re/merchants/cash_trader-idRO.txt (disabled by default) 
* Added some items following idRO Cash trader NPC (added on db/re/item_db.txt)
* Updated documentation on doc/script_command.txt and npc.c
* Follow up d4128ce

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2014-01-14 01:54:38 +07:00
Rekiem
389ac2ac15 Update shops.txt 
They can add machines that sell weapons of rebellion?
i check one by one the slots for cards and price
the actual name is too long when it becomes in english

prontera,96,209,4	shop	리벨리온 소품 자판기
                               Rebellion Accesory Vending Machine

prontera,92,209,4	shop	리벨리온 무기 자판기
                            Rebellion WWeapons Vending Machine
 2014-01-13 13:24:11 -05:00
Rekiem
5040b2ac6b Update renters.txt 
I've seen this npc in aldebaran, geffen and payon
not found in alberta and morroc

only need to look at rachel, veins, lightalzen, einbroch, yuno, hugel and comodo

I put 2,3 and 6 concerning @go number

can put in the emulator?
 2014-01-13 13:08:35 -05:00
Euphy
d4128ce12c A few item and mob database updates. 
Includes a follow-up to c611840.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
 2014-01-13 11:53:48 -05:00
Akkarinage
c611840fab - http://forums.irowiki.org/showpost.php?p=1372693&postcount=743 
- Added monster spawns for halloween_2013.txt
 2014-01-13 09:53:42 +00:00
Cydh Ramdh
f3bb209e92 Follow up 6e9796b also as bugreport:8473 http://rathena.org/board/tracker/issue-8473-plagi-bug/ 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2014-01-13 12:40:06 +07:00
Euphy
2f45d8c7ea Some minor edits. 
Follow-up c0e87af: changed file encoding.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
 2014-01-12 17:39:43 -05:00
Euphy
c0e87af175 Added AUTHORS file containing names of major contributors to Athena. (credits: @kisuka / Hercules) 
Signed-off-by: Euphy <euphy.raliel@rathena.org>
 2014-01-12 16:58:26 -05:00
Euphy
90b187ff3e Changed all "Compatible With" fields to "rAthena Project". 
Edited a handful separately, as appropriate.

Signed-off-by: Euphy <euphy.raliel@rathena.org>
 2014-01-12 16:24:38 -05:00
Euphy
645e110a77 A few follow-ups. 
- Follow-up to pull request #36: some cleanup of the file.
- Follow-up to 3f8dd48: updated Pre-Renewal file.

Added Rebellion class to custom Job Master script. (credits: Elias)

Signed-off-by: Euphy <euphy.raliel@rathena.org>
 2014-01-12 15:24:22 -05:00
Euphy
93c6386319 Merge pull request #36 from Akkarinage/master 
Added iRO's Halloween Event 2013.
Removed unused flag in castle_db.txt.
 2014-01-12 11:34:21 -08:00
Akkarinage
1e95432a95 No idea if this is going to work.. 2014-01-12 19:27:35 +00:00
Akkarinage
3bd3b81749 Merge remote-tracking branch 'remotes/rAthena/master' 
Conflicts:
	src/map/guild.c
 2014-01-12 19:19:05 +00:00
Akkarinage
7093d92d88 fml fat-fingers. 2014-01-12 18:26:43 +00:00
Akkarinage
264c27ba54 Added iRO's Halloween Event 2013 2014-01-12 18:17:22 +00:00
Cydh Ramdh
3f8dd4819e * Follow up 0f7ecd0, wrong skill state requirement. Thank Elias 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
 2014-01-13 01:17:20 +07:00
Akkarinage
045ba31029 Update quest_db.txt 2014-01-12 18:15:39 +00:00
Akkarinage
7b66a53b4a Adding npc: for halloween_2013.txt 2014-01-12 16:59:46 +00:00