10375 Commits

Author SHA1 Message Date
tr0n93
2083c0552c - Fixed 'instance_check_party' (bugreport:5948)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16260 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-10 13:59:48 +00:00
brianluau
b22632ed62 - Fixed unescaped double quotes (follow up to r16251, bugreport:5895).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16259 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-10 06:52:00 +00:00
brianluau
ccdc1a396c - Added svn:eol-style=native property on some recently added text files.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16258 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-10 06:34:50 +00:00
blacksirius
7876a5a38e VC10/VC9: followup for commit r16256
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16257 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-10 02:30:56 +00:00
blacksirius
12b9fdab9c added mutex && cond var abstraction ( for pthread / winapi )
added type 'sysint' to cbasetypes, which's the width of the platform the release gets compiled for.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16256 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-10 02:27:07 +00:00
blacksirius
f4b8626e7c added Makefile && obj dir to svn:ignore @ src/test
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16255 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-10 02:25:32 +00:00
euphyy
3b8d196c31 * Massive compression of "Card Trader" script, from 123kb to 7kb! (other\card_trader.txt)
* Some optimization of Ash-Vacuum quests (quests\quests_13_1.txt)
* "Sphinx Mask Quest" script optimized (custom\quests\sphinx_mask.txt)
* Moved "Caral" NPC from non-existent moc_fild04 to cmd_fild08, as per bugreport:5959 (custom\quests\thq\THQS_Quests.txt)
* Fixed Job_Archbishop/Job_Archbishop_T typos in job change script, but other issues in bugreport:5938 not addressed (jobs\3-1\archbishop.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16254 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-10 01:37:17 +00:00
kenpachi2k11
8b9dbe71f7 Follow up r16252 - replaced zeros with NULL and corrected syntax of commented out entries in SQL mob databases.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16253 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-10 01:22:09 +00:00
kenpachi2k11
ccc5dc5504 Created renewal mob SQL database file and synchronizes both SQL mob databases with their corresponding TXT databases. (bugreport:5281)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16252 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-10 00:16:38 +00:00
kenpachi2k11
914fa51e06 Fixed Black Wing, Peuz's and Ur's sets, Scarlet Rose' (#5548) location and Ebon Armors (#15014) job code. (bugreport:5895)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16251 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-09 23:12:19 +00:00
kenpachi2k11
5cb37c2157 Fixed some Genetic items related to Pharmacy skill. (bugreport:5790)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16250 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-09 21:03:30 +00:00
kenpachi2k11
7862bffff8 Follow up r16248 - changed table name for Canon Balls (#18000-#18004) to item_db_re.
Added some books to the renewal database because of their MATK changes. (bugreport:5921)
Changed bonus bDoubleRate to skill "TF_DOUBLE" because bonus bDoubleRate isn't enough and the official script explicitly states that the skill should be given. (bugreport:5935)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16249 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-09 20:17:21 +00:00
kenpachi2k11
c2cf919d35 Follow up r16245 and r16247 - changed table name for Megingjard (#2629) and Tao Gunka Card (#4302) to item_db_re.
Fixed job code for Bone Plate (#15000). (bugreport:5816)
Added Wizardry Staff (#1473) to renewal SQL database. (bugreport:5904)
Moved Cannon Balls (#18000-#18004) from pre-renewal to renewal database and changed their weigth to 1. (SQL DB only) (bugreport:5907)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16248 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-09 19:36:57 +00:00
kenpachi2k11
8ac22b2526 Moved a few merchants and mob spawns to separate files to prevent error message when running server in pre-RE mode and with TXT databases. (bugreport:5846)
Fixed Tao Gunka Cards (#4302) renewal effect. (bugreport:5866)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16247 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-09 18:48:50 +00:00
kenpachi2k11
2acc5c10bb Fixed Shining Electric Bulb Hairbands (#5310) script. (bugreport:5805)
Fixed Imperial Guards (#2153) ViewID. (bugreport:5785)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16246 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-09 18:13:45 +00:00
kenpachi2k11
3e0d0ab73b Updated MATK of several Staff weapons in renewal databases. (bugreport:5646)
Updated Megingjards (#2629) renewal bonus script. (bugreport:5694)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16245 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-09 17:18:50 +00:00
kenpachi2k11
37b918d25b Fixed Barricades (#1905) HP in pre-renewal database. (bugreport:5423)
Changed Poison Bottles (#678) script to use SC_ASPDPOTION3 instead of SC_ASPDPOTION2. (bugreport:1996)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16244 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-09 15:49:29 +00:00
rud0lp20
9c2c02007f Follow up on r16240 update RK_CRUSHTRIKE formula and weapon break percentage.
Fixed bugreport:5953 GC_CROSSRIPPERSLASHER range is now (8 + 1 * skill level) cells.
Fixed bugreport:5943 SC_GROOMY is now really remove selected mounts.
Updated Guillotine cross skills formula base on re-balancing formulas...

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16243 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-08 12:28:14 +00:00
xantara
10057be973 ` Updating script_commands.txt
-- bugreport:5412 Added documentation for freeloop, getargcount, is_function, and get_revision
-- bugreport:5723 Updated produce command to include success rate information
-- bugreport:5449 Updated getiteminfo to include type 15 for matk when RENEWAL is defined

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16242 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-08 07:28:56 +00:00
xantara
4f5549d696 ` Fixed bugreport:5717 if character's last map is invalid, move to a major city
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16241 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-08 07:27:13 +00:00
xantara
10fdb0c1f4 ` Added bugreport:5906 Trap Research's INT bonus
` Fixed bugreport:5950 RK's Crush Strike to include weapon weight in attack formula

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16240 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-08 07:26:33 +00:00
euphyy
3473296229 * Added "eA Job System" documentation for third classes (doc\ea_job_system.txt)
* Fixed Eden: Romeo#02 not setting para_suv01 upon quest completion (bugreport:5949)
* Cleaned and edited "Item Signer" script for general use (custom\item_signer.txt)
* Merged and cleaned "Poring Track" custom script, then moved and renamed (custom\events\p_track.txt)
* Optimized "Valhallen Quests" script (custom\quests\valhallen.txt)
* Optimized "Event King Items" script (custom\events\kings_items.txt)
* Deleted "Market Place" script, not sure why this existed... (custom\etc\market.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16239 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-08 00:35:56 +00:00
shennetsind
cd7a64622a Fixed bug to lion howling/sc_fear status, super mega ultra ubber plus thanks to the awesome malufett
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16238 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-07 17:02:05 +00:00
epoque11
2c8e9238ac - Follow-up to r16236, additional array increase to accommodate sprintf messages
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16237 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-06 18:23:17 +00:00
epoque11
f48046eca1 - Fixed a crash issue where sprintf was attempting to write outside of the bounds of an array
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16236 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-06 18:14:05 +00:00
euphyy
71cb492631 Follow-up to r16234: New city files
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16235 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-06 00:35:28 +00:00
euphyy
c0fb1a9630 * Added Dewata and El Dicastes town (\cities\) and quest (\quests\) NPCs.
* db\quest_db.txt updated with Dewata and El Dicastes quests.
* Fixed minor bug with Arch Bishop check in Thanatos Tower (bugreport:5942)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16234 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-06 00:34:10 +00:00
rud0lp20
1227572f0e Fixed bugreport:5919 RK_ENCHANTBLADE bonus damage at any level should now work properly.
Fixed bugreport:5914 SC_MANHOLE duration at level 2 is now 10 seconds.
Fixed bugreport:5928 SR_CURSEDCIRCLE should now work properly(castable with other skills & should end after the execution of a skill)  

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16233 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-04 17:11:22 +00:00
shennetsind
59d9e55fbc Follow up r16231 now I *think* I fixed the indentation problem with my IDE
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16232 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-04 16:24:37 +00:00
shennetsind
2ee49a207a Follow up r16228 fixed logical problem with previous implementation (the see vals would break).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16231 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-04 16:17:38 +00:00
shennetsind
241886f562 Follow up r16227 & bugreport:5932 fixed issues with my new-IDE tabbing, & default configuration setting.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16230 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-04 16:11:03 +00:00
shennetsind
2d949e2a6d Follow up r16227 & bugreport:5929 fixed typo. super mega hug to malufett <3
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16229 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-04 16:07:19 +00:00
shennetsind
6e48e4e5d9 Fixed bugreport:5913 recently-added state system no longer breaks on stacking status changes.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16228 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-04 16:05:28 +00:00
shennetsind
049b2552cd Adding new config min_npc_vending_distance which simulates the official 'no vending near npcs' feature. super mega credits to masao
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16227 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-03 22:41:52 +00:00
blacksirius
b3481a4aaf thread api: added support for platforms without TLS (Thread Local Storage) support (usually older OSX llvm versions ..)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16226 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-03 20:09:39 +00:00
blacksirius
332c603e47 cmake: followup for commit r16221 (fixed cmake build / added missing files)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16224 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-03 19:33:00 +00:00
flaviojs
14d87ed947 CMake: Add threads library.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16223 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-03 19:31:32 +00:00
blacksirius
28ee0af0b4 VC9/VC10: followup for commit r16221 (threading / spinlock / atomic operations ..)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16222 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-03 19:02:35 +00:00
blacksirius
04165cfcff feature merge bs-coreoptimize->trunk: Atomic Operations, Threading, Spinlock implemnetation. [commit 1/2, windows will followup]
- Added Abstractions for Atomic Operations (lock instructions.. windows guy's may now this as Interlocked* stuff ..)
- Added Threading api abstraction for Pthread based OS's and Windows
- Added Spinlock Implementation (uses CAS / if you need more informations - just read the source - its simple.)

- Due to Interlocked(Compare)Exchange64 .. we now require at least i686 (Pentium Pro) for 32Bit Builds :)
	youll also may feel some performance improvements when using 32bit builsd due to "newer" minimal arch
	the compiler is now able to use CMOV's ....


================================================================
= Important Warning: 
================================================================
Dont use threading at the moment athena is not threadsafe!
you'll mess up everthing when accessing data from other threads .., no synchronization is provided.

A way to process tasks asynchronously will come up after / with the new socket system.




git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16221 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-03 18:53:02 +00:00
blacksirius
024deea2ac vc9/vc10: added reference to winapi.h in projects.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16220 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-03 18:05:35 +00:00
blacksirius
bde86942c0 cleaned up windows header usage (added one central file to use windows / winapi specific stuff, to be able to set the appropriate flags before including it correctly)
Note: this may screw up mingw or cygwin building,  ill fix it later... 



git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16219 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-03 17:55:38 +00:00
blacksirius
1b2e097aca fixed portability issue. (As long as we support other compilers than MSC/ICC we have to check explicitly for compiler and not only on Platform ... )
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16218 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-03 16:07:26 +00:00
rud0lp20
80d35e7ab0 Fixed bugreport:5911 Reflect Damage should now cancel when shield/guard is unequipped.
Fixed bugreport:4828 LG_PINPOINTATTACK should now only work with spears.
Fixed bugreport:5905 All heal support skill now can't work with Mado Gear.
Fixed other non Mado related skill that it should not work when Mado is equipped.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16217 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-03 14:54:06 +00:00
euphyy
df30c977cd * Platinum Skills NPC now works for all Upper types (bugreport:5903) (custom\platinum_skills.txt)
* Revamped the official clothes dyer (merchants\clothes_dyer.txt)
* Optimized custom Berzebub Card quest (custom\quests\berzebub.txt)
* Warper bug on ma_fild02 fixed (bugreport:5908) (custom\warper.txt)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16216 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-03 03:36:02 +00:00
blacksirius
f223818f59 feature merge bs-coreoptimize->trunk: added some compiler abstractions
- forceinline  -> will force the compiler to always inline the given method
 - ra_algin(n)  -> align to (n) .. (see: http://msdn.microsoft.com/en-us/library/83ythb65(v=vs.80).aspx for more informations).



git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16215 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-02 17:24:47 +00:00
brianluau
a79dcd2000 - Added svn:eol-style=native property (follow up to r16213).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16214 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-02 17:05:41 +00:00
masao87
7cee7996e8 - Added Instructor Ur to Eden Quest Quests. bugreport:5742
- Added Mission Boards 86-90 and 91-99 to Eden Group. bugreport:5742
- Updated quest_db.txt to match the new Quests in the new Eden Group Quests.
* Special thanks to Chilly for providing the base of the scripts! <3
- Updated Rune Knight Job change Quest for the last time to finally work as official as possible.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16213 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-02 01:55:34 +00:00
blacksirius
a057154d7c VC9: removed old plugin-system references.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16212 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-02 01:05:31 +00:00
shennetsind
38955f287c Fixed bugreport:5891 pk_mode config may now be used at lv 2 once again.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16211 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-01 23:02:56 +00:00
shennetsind
6659d515a7 Follow up r16209 moving on; yet another performance improvement. added 3 other states for the system to speed up. modified the scs_flag to be accurate (with one conditional flag they could stack and give undesired results e.g. with cloacking)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16210 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-06-01 23:01:40 +00:00