27 Commits

Author SHA1 Message Date
Akinari1087
5bdb25e505 Fixed conversion warning - http://rathena.org/board/tracker/issue-8147-r17689-warning-c4244-conversion-from-time-t-to-uint32-possible-loss-of-data/
Switched variables for addtimercount - http://rathena.org/board/tracker/issue-8148-addtimercount-ticksnpconlabel/
Fixed a minor error with instances where you wouldn't be able to have the max amount of instances - http://rathena.org/board/topic/87790-error-code-in-instancec/
Fixed a bug with recovery where you couldn't run the 'recovery' script command without a RID - http://rathena.org/board/topic/86959-recovery-function/
2013-10-15 17:18:28 -07:00
Akinari1087
6572a9fc72 Fix map crash from reloading after an instance is destroyed - Fixes bugreport:7883
Vending immediately fails when it cannot be used - Fixes bugreport:7894
Added script command 'addrid' - Suggestion tid:84892
2013-07-26 03:55:28 -04:00
akinari1087
81e3b03ace Poison React now activates when character is damaged only - Fixes bugreport:109
Cloaking fixed to official behaviour (Thanks helvetica for the hour of testing) - Concerning bugreport:171
Fixed instancing long map names causing crashes
- Cannot save or memo on instance maps (Lemongrass)
- Map channels are no longer activated on instance maps (Lemongrass)
- Fixed a character save issue with instance maps (Lemongrass)
- Map local channels are disabled by default, this is custom (Lemongrass)
- Just thank Lemongrass overall, I gave him a hard time with this issue

~ Hercules Merge ~
Update Bloody Lust and Maelstrom to official behaviour (Credits: malufett)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17408 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-07-09 06:02:39 +00:00
euphyy
78eb7d3793 * Added documentation for the instance system rewrite and modified some return values. (follow-up r17386)
* Gathered remaining dialogues for Pyramids Nightmare script. (follow-up r17382)
* Added missing items to "Guardian of Power" NPC from Mora Enchants.
* Updated Hunting Missions script to v1.3a, which adds some mission reset options.
* Added newline at end of files.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17387 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-06-26 20:36:30 +00:00
akinari1087
cd95d1cada Instance System Rewrite!
- Removed a bunch of script commands and replaced others
- Rewrote the way instances are created
- Added Instance Database files
- Fixed and rewrote instances scripts (Euphy)
- Added reloading to instancedb
- Instances are now persistent through @reloadscript
- Special thanks to Auriga (emulator) for the base of their system
- Special thanks to Euphy for doing major testing and script rewrites for this
- Special thanks to Lemongrass and Lighta for some help along the way

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17386 54d463be-8e91-2dee-dedb-b68131a5f0ec
2013-06-26 17:33:59 +00:00
glighta
0cdba10793 -Harmonize skillid, skill_num, skillnum, skill, to skill_id and same for skill_lv
-Optimise type from int to int16 in order to reduce ram consumtion.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17065 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-30 16:00:24 +00:00
brianluau
a2bdc47daf - Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924).
[16969:16991/trunk/src/] will be re-committed in the next 24 hours.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16992 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-12-05 02:53:33 +00:00
greenboxal2
a7c32653f7 Applied AStyle code formating as discussed on tid:74602.
Removed /SAFESEH option from MSVC11 projects.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16968 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-25 21:20:43 +00:00
shennetsind
e242d2b5a9 Performance Improvement; Server shut down, instance clear up, and @cleanmap are now all faster. Instead of wasting time doing a dbmap lookup (of a data it already possessed!) on each floor item being deleted, it'll use the data to clean the item.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16901 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-11-10 17:15:37 +00:00
shennetsind
cde1d9c0a4 Fixed bugreport:5804 Instances no longer leave "broken" timers behind. Instances also will destroy themselves upon @reloadscript since they break at that.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16183 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-31 17:46:20 +00:00
shennetsind
c530f9869b Fixed bugreport:5658 Instance NPCs will now be cleared properly. Super-Special Thanks to Pig321
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16153 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-05-26 21:49:36 +00:00
epoque11
ab8f7490a0 - Fixed an issue with the instance variable storage system never being initialised (since unknown revision)
- Combined both string and integer instance variables into a single DBMap* structure
- Fixed a missing new-line at the end of src/common/conf.h causing warnings

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15998 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-28 22:15:18 +00:00
epoque11
02e4daf67d - Updated the script engine to make use of the DBMap* structure for storing variables (for Ind <3)
- Fixed missing new-lines at the end of various files causing warnings

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15997 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-04-28 21:50:55 +00:00
gepard1984
4113c9de4a - Removed outdated version number handling (follow-up to r11503).
- Fixed mapcache compilation issues in Linux.
- Added some missing `svn:ignore` properties.
- Moved `BLOCK_SIZE` definition from header to source file.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15586 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-02-16 17:09:43 +00:00
brianluau
00367cd7b7 - Removed more trailing tabs.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15527 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-30 20:17:55 +00:00
xazax-hun
d4cae50fe1 Minor cleanups, mostly reducing scopes.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15504 54d463be-8e91-2dee-dedb-b68131a5f0ec
2012-01-22 13:49:09 +00:00
ai4rei
2c1290cae2 * More instancing updates.
- Improved instance_id validity checking.
- Fixed instance name being copied with memcpy rather than safestrncpy (since r13901).
- Removed unused instance data field 'progress_timeoutval' (since r13901).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14879 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-02 12:07:32 +00:00
ai4rei
b91aa20b3d * Random updates to instance system.
- Introduced a constant for instance name length.
- Corrected comments related to instance packets 0x2cb (ZC_MEMORIALDUNGEON_SUBSCRIPTION_INFO) and 0x2ce (ZC_MEMORIALDUNGEON_NOTIFY).
- Moved instance finalization out of map.c into instance.c

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14878 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-02 10:33:38 +00:00
ultramage
edcb998d59 Replaced custom type 'intptr' with standard 'intptr_t'.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14873 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-30 09:14:21 +00:00
ai4rei
0c22fcf28e * Updated/revised description of instance-related script commands (bugreport:4880).
- Fixed 'instance_create' would return -4 (party already instancing) when the requested party was not found.
- 'instance_create' return value -2 now means 'party not found' rather than 'missing parameter'.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14809 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-08 05:34:35 +00:00
ai4rei
5d1bbf6c2a * Added clr_type enumeration for vanish effect constants.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14517 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-28 21:41:38 +00:00
brianluau
1552a1841c - Fixed item script of Chicken_Hat (5431). (bugreport:4174)
- Fixed a typo in script_commands.txt (bugreport:4270)
- Fixed some links in the README html files.
- Fixed the range of 'max_guild_alliance' in battle.c (0 to 3).
- Set svn:eol-style=native for some recently added text files.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14328 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-06-02 01:00:52 +00:00
ultramage
ada5a13abe Fixed instances not initializing after reloadscript (bugreport:3522).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14167 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-11-24 17:15:23 +00:00
zephyrus
16642d0c14 - Added missing #includes to fix some linux warnings.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14009 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-08-16 19:08:41 +00:00
zephyrus
d25e4cc14a - Fixed final instancing bug. Tested Endless Tower and working. I will ask if i can publish it :3
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14008 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-08-15 09:47:23 +00:00
zephyrus
515cd8685c - Fixes and optimization to instancing. Thanks to Saithis
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14006 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-08-14 14:03:53 +00:00
zephyrus
6b710571ad - Optimization to instance system.
* Removed the crc feature to generate instance npc names. The instance npc name will be "dup_" + instanceid + "_" + srcnpcid.
* Removed the big array under map structure and coded in a different way. It was only used to generate map names, but i just used the instance_id + "origin map name".
* Moved all instance features to separated files.
* Moved the npc duplication for instances into npc.c as Ultramage says (removed npcname_db from npc.h).
* Added recomendations for scripts commands by Saithis.
- Testing required, i will prepare Endless Tower script soon. I hope this do almost anything in bugreport 3276.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14003 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-08-12 21:44:02 +00:00