* Increased gobal_reg_value to 256 from 96.

* Upped the max quest db entries allowed to 1500.
* Added remaining status icons to status.h (mostly 3rd job icons.)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14301 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf 2010-05-21 02:58:58 +00:00
parent 74550d0792
commit 7084879e8e
4 changed files with 266 additions and 2 deletions

View File

@ -3,6 +3,10 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2010/05/20
* Rev. 14301 Increased gobal_reg_value to 256 from 96. [L0ne_W0lf]
* Upped the max quest db entries allowed to 1500.
* Added remaining status icons to status.h (mostly 3rd job icons.)
2010/04/28
* Fixed OnTouch doesn't trigger on hiding character. (bugreport:4208) [Inkfish]
2010/04/23

View File

@ -80,7 +80,7 @@
#define MAX_FAME 1000000000
#define MAX_CART 100
#define MAX_SKILL 1020
#define GLOBAL_REG_NUM 96
#define GLOBAL_REG_NUM 256
#define ACCOUNT_REG_NUM 64
#define ACCOUNT_REG2_NUM 16
//Should hold the max of GLOBAL/ACCOUNT/ACCOUNT2 (needed for some arrays that hold all three)
@ -99,7 +99,7 @@
#define MAX_GUILDCASTLE 34 // Updated to include new entries for WoE:SE. [L0ne_W0lf]
#define MAX_GUILDLEVEL 50
#define MAX_GUARDIANS 8 //Local max per castle. [Skotlex]
#define MAX_QUEST_DB 1200 //Max quests that the server will load
#define MAX_QUEST_DB 1500 //Max quests that the server will load
#define MAX_QUEST_OBJECTIVES 3 //Max quest objectives for a quest
#define MIN_HAIR_STYLE battle_config.min_hair_style

View File

@ -395,6 +395,8 @@ void initChangeTables(void)
set_sc( CASH_INCAGI , SC_INCREASEAGI , SI_INCREASEAGI , SCB_AGI|SCB_SPEED );
set_sc( CASH_ASSUMPTIO , SC_ASSUMPTIO , SI_ASSUMPTIO , SCB_NONE );
//set_sc( ALL_PARTYFLEE , SC_INCFLEE , SI_PARTYFLEE , SCB_NONE );
set_sc( CR_SHRINK , SC_SHRINK , SI_SHRINK , SCB_NONE );
set_sc( RG_CLOSECONFINE , SC_CLOSECONFINE2 , SI_CLOSECONFINE2 , SCB_NONE );
set_sc( RG_CLOSECONFINE , SC_CLOSECONFINE , SI_CLOSECONFINE , SCB_FLEE );

View File

@ -639,6 +639,264 @@ enum si_type {
SI_CASH_PLUSONLYJOBEXP = 312,
// SI_PARTYFLEE = 313,
// SI_ANGEL_PROTECT = 314,
/*
SI_ENDURE_MDEF = 315,
SI_ENCHANTBLADE = 316,
SI_DEATHBOUND = 317,
SI_REFRESH = 318,
SI_GIANTGROWTH = 319,
SI_STONEHARDSKIN = 320,
SI_VITALITYACTIVATION = 321,
SI_FIGHTINGSPIRIT = 322,
SI_ABUNDANCE = 323,
SI_REUSE_MILLENNIUMSHIELD = 324,
SI_REUSE_CRUSHSTRIKE = 325,
SI_REUSE_REFRESH = 326,
SI_REUSE_STORMBLAST = 327,
SI_VENOMIMPRESS = 328,
SI_EPICLESIS = 329,
SI_ORATIO = 330,
SI_LAUDAAGNUS = 331,
SI_LAUDARAMUS = 332,
SI_CLOAKINGEXCEED = 333,
SI_HALLUCINATIONWALK = 334,
SI_HALLUCINATIONWALK_POSTDELAY = 335,
SI_RENOVATIO = 336,
SI_WEAPONBLOCKING = 337,
SI_WEAPONBLOCKING_POSTDELAY = 338,
SI_ROLLINGCUTTER = 339,
SI_EXPIATIO = 340,
SI_POISONINGWEAPON = 341,
SI_TOXIN = 342,
SI_PARALYSE = 343,
SI_VENOMBLEED = 344,
SI_MAGICMUSHROOM = 345,
SI_DEATHHURT = 346,
SI_PYREXIA = 347,
SI_OBLIVIONCURSE = 348,
SI_LEECHESEND = 349,
SI_DUPLELIGHT = 350,
SI_FROSTMISTY = 351,
SI_FEARBREEZE = 352,
SI_ELECTRICSHOCKER = 353,
SI_MARSHOFABYSS = 354,
SI_RECOGNIZEDSPELL = 355,
SI_STASIS = 356,
SI_WUGRIDER = 357,
SI_WUGDASH = 358,
SI_WUGBITE = 359,
SI_CAMOUFLAGE = 360,
SI_ACCELERATION = 361,
SI_HOVERING = 362,
SI_SUMMON1 = 363,
SI_SUMMON2 = 364,
SI_SUMMON3 = 365,
SI_SUMMON4 = 366,
SI_SUMMON5 = 367,
SI_MVPCARD_TAOGUNKA = 368,
SI_MVPCARD_MISTRESS = 369,
SI_MVPCARD_ORCHERO = 370,
SI_MVPCARD_ORCLORD = 371,
SI_OVERHEAT_LIMITPOINT = 372,
SI_OVERHEAT = 373,
SI_SHAPESHIFT = 374,
SI_INFRAREDSCAN = 375,
SI_MAGNETICFIELD = 376,
SI_NEUTRALBARRIER = 377,
SI_NEUTRALBARRIER_MASTER = 378,
SI_STEALTHFIELD = 379,
SI_STEALTHFIELD_MASTER = 380,
SI_MANU_ATK = 381,
SI_MANU_DEF = 382,
SI_SPL_ATK = 383,
SI_SPL_DEF = 384,
SI_REPRODUCE = 385,
SI_MANU_MATK = 386,
SI_SPL_MATK = 387,
SI_STR_SCROLL = 388,
SI_INT_SCROLL = 389,
SI_LG_REFLECTDAMAGE = 390,
SI_FORCEOFVANGUARD = 391,
SI_BUCHEDENOEL = 392,
SI_AUTOSHADOWSPELL = 393,
SI_SHADOWFORM = 394,
SI_RAID = 395,
SI_SHIELDSPELL_DEF = 396,
SI_SHIELDSPELL_MDEF = 397,
SI_SHIELDSPELL_REF = 398,
SI_BODYPAINT = 399,
SI_EXEEDBREAK = 400,
SI_ADORAMUS = 401,
SI_PRESTIGE = 402,
SI_INVISIBILITY = 403,
SI_DEADLYINFECT = 404,
SI_BANDING = 405,
SI_EARTHDRIVE = 406,
SI_INSPIRATION = 407,
SI_ENERVATION = 408,
SI_GROOMY = 409,
SI_RAISINGDRAGON = 410,
SI_IGNORANCE = 411,
SI_LAZINESS = 412,
SI_LIGHTNINGWALK = 413,
SI_ACARAJE = 414,
SI_UNLUCKY = 415,
SI_CURSEDCIRCLE_ATKER = 416,
SI_CURSEDCIRCLE_TARGET = 417,
SI_WEAKNESS = 418,
SI_CRESCENTELBOW = 419,
SI_NOEQUIPACCESSARY = 420,
SI_STRIPACCESSARY = 421,
SI_MANHOLE = 422,
SI_POPECOOKIE = 423,
SI_FALLENEMPIRE = 424,
SI_GENTLETOUCH_ENERGYGAIN = 425,
SI_GENTLETOUCH_CHANGE = 426,
SI_GENTLETOUCH_REVITALIZE = 427,
SI_BLOODYLUST = 428,
SI_SWING = 429,
SI_SYMPHONY_LOVE = 430,
SI_PROPERTYWALK = 431,
SI_SPELLFIST = 432,
SI_NETHERWORLD = 433,
SI_SIREN = 434,
SI_DEEP_SLEEP = 435,
SI_SIRCLEOFNATURE = 436,
SI_COLD = 437,
SI_GLOOMYDAY = 438,
SI_SONG_OF_MANA = 439,
SI_CLOUD_KILL = 440,
SI_DANCE_WITH_WUG = 441,
SI_RUSH_WINDMILL = 442,
SI_ECHOSONG = 443,
SI_HARMONIZE = 444,
SI_STRIKING = 445,
SI_WARMER = 446,
SI_MOONLIT_SERENADE = 447,
SI_SATURDAY_NIGHT_FEVER = 448,
SI_SITDOWN_FORCE = 449,
SI_ANALYZE = 450,
SI_LERADS_DEW = 451,
SI_MELODYOFSINK = 452,
SI_BEYOND_OF_WARCRY = 453,
SI_UNLIMITED_HUMMING_VOICE = 454,
SI_SPELLBOOK1 = 455,
SI_SPELLBOOK2 = 456,
SI_SPELLBOOK3 = 457,
SI_FREEZE_SP = 458,
SI_GN_TRAINING_SWORD = 459,
SI_GN_REMODELING_CART = 460,
SI_GN_CARTBOOST = 461,
SI_FIXEDCASTINGTM_REDUCE = 462,
SI_THORNS_TRAP = 463,
SI_BLOOD_SUCKER = 464,
SI_SPORE_EXPLOSION = 465,
SI_DEMONIC_FIRE = 466,
SI_FIRE_EXPANSION_SMOKE_POWDER = 467,
SI_FIRE_EXPANSION_TEAR_GAS = 468,
SI_BLOCKING_PLAY = 469,
SI_MANDRAGORA = 470,
SI_ACTIVATE = 471,
SI_AB_SECRAMENT = 472,
SI_ASSUMPTIO2 = 473,
SI_TK_SEVENWIND = 474,
SI_LIMIT_ODINS_RECALL = 475,
SI_STOMACHACHE = 476,
SI_MYSTERIOUS_POWDER = 477,
SI_MELON_BOMB = 478,
SI_BANANA_BOMB_SITDOWN_POSTDELAY = 479,
SI_PROMOTE_HEALTH_RESERCH = 480,
SI_ENERGY_DRINK_RESERCH = 481,
SI_EXTRACT_WHITE_POTION_Z = 482,
SI_VITATA_500 = 483,
SI_EXTRACT_SALAMINE_JUICE = 484,
SI_BOOST500 = 485,
SI_FULL_SWING_K = 486,
SI_MANA_PLUS = 487,
SI_MUSTLE_M = 488,
SI_LIFE_FORCE_F = 489,
SI_VACUUM_EXTREME = 490,
SI_SAVAGE_STEAK = 491,
SI_COCKTAIL_WARG_BLOOD = 492,
SI_MINOR_BBQ = 493,
SI_SIROMA_ICE_TEA = 494,
SI_DROCERA_HERB_STEAMED = 495,
SI_PUTTI_TAILS_NOODLES = 496,
SI_BANANA_BOMB = 497,
SI_SUMMON_AGNI = 498,
SI_SPELLBOOK4 = 499,
SI_SPELLBOOK5 = 500,
SI_SPELLBOOK6 = 501,
SI_SPELLBOOK7 = 502,
SI_ELEMENTAL_AGGRESSIVE = 503,
SI_RETURN_TO_ELDICASTES = 504,
SI_BANDING_DEFENCE = 505,
SI_SKELSCROLL = 506,
SI_DISTRUCTIONSCROLL = 507,
SI_ROYALSCROLL = 508,
SI_IMMUNITYSCROLL = 509,
SI_MYSTICSCROLL = 510,
SI_BATTLESCROLL = 511,
SI_ARMORSCROLL = 512,
SI_FREYJASCROLL = 513,
SI_SOULSCROLL = 514,
SI_CIRCLE_OF_FIRE = 515,
SI_CIRCLE_OF_FIRE_OPTION = 516,
SI_FIRE_CLOAK = 517,
SI_FIRE_CLOAK_OPTION = 518,
SI_WATER_SCREEN = 519,
SI_WATER_SCREEN_OPTION = 520,
SI_WATER_DROP = 521,
SI_WATER_DROP_OPTION = 522,
SI_WIND_STEP = 523,
SI_WIND_STEP_OPTION = 524,
SI_WIND_CURTAIN = 525,
SI_WIND_CURTAIN_OPTION = 526,
SI_WATER_BARRIER = 527,
SI_ZEPHYR = 528,
SI_SOLID_SKIN = 529,
SI_SOLID_SKIN_OPTION = 530,
SI_STONE_SHIELD = 531,
SI_STONE_SHIELD_OPTION = 532,
SI_POWER_OF_GAIA = 533,
SI_EL_WAIT = 534,
SI_EL_PASSIVE = 535,
SI_EL_DEFENSIVE = 536,
SI_EL_OFFENSIVE = 537,
SI_EL_COST = 538,
SI_PYROTECHNIC = 539,
SI_PYROTECHNIC_OPTION = 540,
SI_HEATER = 541,
SI_HEATER_OPTION = 542,
SI_TROPIC = 543,
SI_TROPIC_OPTION = 544,
SI_AQUAPLAY = 545,
SI_AQUAPLAY_OPTION = 546,
SI_COOLER = 547,
SI_COOLER_OPTION = 548,
SI_CHILLY_AIR = 549,
SI_CHILLY_AIR_OPTION = 550,
SI_GUST = 551,
SI_GUST_OPTION = 552,
SI_BLAST = 553,
SI_BLAST_OPTION = 554,
SI_WILD_STORM = 555,
SI_WILD_STORM_OPTION = 556,
SI_PETROLOGY = 557,
SI_PETROLOGY_OPTION = 558,
SI_CURSED_SOIL = 559,
SI_CURSED_SOIL_OPTION = 560,
SI_UPHEAVAL = 561,
SI_UPHEAVAL_OPTION = 562,
SI_TIDAL_WEAPON = 563,
SI_TIDAL_WEAPON_OPTION = 564,
SI_ROCK_CRUSHER = 565,
SI_ROCK_CRUSHER_ATK = 566,
SI_FIRE_INSIGNIA = 567,
SI_WATER_INSIGNIA = 568,
SI_WIND_INSIGNIA = 569,
SI_EARTH_INSIGNIA = 570,
*/
};
// JOINTBEAT stackable ailments