From bf3c1c0e4add6a5d8a52b043a30775eada1cef2f Mon Sep 17 00:00:00 2001 From: mekolat Date: Thu, 16 Apr 2015 21:11:51 -0400 Subject: remove deprecated readparam & statusup2 --- world/map/db/const.txt | 16 +++++----- world/map/db/item_db_head.txt | 6 ++-- world/map/npc/001-2/heathin.txt | 2 +- world/map/npc/006-1/miriam.txt | 2 +- world/map/npc/009-2/kfahr.txt | 6 ++-- world/map/npc/016-1/gwendolyn.txt | 2 +- world/map/npc/018-2/caul.txt | 12 ++++---- world/map/npc/029-2/morgan.txt | 2 +- world/map/npc/052-1/channelling.txt | 8 ++--- world/map/npc/annuals/xmas/core.txt | 2 +- world/map/npc/functions/debug.txt | 60 ++++++++++++++++++------------------ world/map/npc/items/require_stat.txt | 4 +-- 12 files changed, 61 insertions(+), 61 deletions(-) diff --git a/world/map/db/const.txt b/world/map/db/const.txt index c00773e2..37788571 100644 --- a/world/map/db/const.txt +++ b/world/map/db/const.txt @@ -28,14 +28,14 @@ MaxWeight 25 1 //Upper 56 1 // BEFORE UNCOMMENTING ANYTHING, TALK TO o11c! -bMaxHP 6 -bMaxSP 8 -bStr 13 -bAgi 14 -bVit 15 -bInt 16 -bDex 17 -bLuk 18 +bMaxHP 6 1 +bMaxSP 8 1 +bStr 13 1 +bAgi 14 1 +bVit 15 1 +bInt 16 1 +bDex 17 1 +bLuk 18 1 //bAtk 41 //bAtk2 42 //bMatk1 43 diff --git a/world/map/db/item_db_head.txt b/world/map/db/item_db_head.txt index b838fc07..91dcfb2c 100644 --- a/world/map/db/item_db_head.txt +++ b/world/map/db/item_db_head.txt @@ -178,6 +178,6 @@ 4032, PanHat, Pan Hat, 5, 1000, 500, 400, 0, 13, 0, -20, 0, 2, 256, 0, 0, 0, {}, {} 4033, ChefHat, Chef Hat, 5, 1000, 500, 30, 0, 2, 0, 2, 0, 2, 256, 0, 0, 0, {}, {} 4042, RedNose, Red Nose, 5, 4000, 1000, 4, 0, 2, 0, 7, 0, 2, 256, 0, 0, 0, {}, {} -5128, DarkHelm, DarkHelm, 5, 50000, 10000, 800, 0, 19, 0, -80, 0, 2, 256, 0, 0, 0, {}, {callfunc "UnreleasedItem"; bonus bMaxHPrate, 10; bonus bAtkRange, -((readparam(bAtkRange)/2)); bonus bInt, -(readparam(bInt));} -5129, UnderworldMask, UnderworldMask, 5, 50000, 10000, 100, 0, 9, 0, -40, 0, 2, 256, 0, 0, 0, {}, {callfunc "UnreleasedItem"; bonus bAtkRange, 1; bonus bInt, -(readparam(bInt));} -5130, Phylactery, Phylactery, 5, 50000, 10000, 20, 0, 1, 0, 5, 0, 2, 256, 0, 0, 0, {}, {callfunc "UnreleasedItem"; bonus bAspdRate, 10; bonus bDex, -(readparam(bDex)/2);} +5128, DarkHelm, DarkHelm, 5, 50000, 10000, 800, 0, 19, 0, -80, 0, 2, 256, 0, 0, 0, {}, {callfunc "UnreleasedItem"; bonus bMaxHPrate, 10; bonus bAtkRange, -((bAtkRange/2)); bonus bInt, -(bInt);} +5129, UnderworldMask, UnderworldMask, 5, 50000, 10000, 100, 0, 9, 0, -40, 0, 2, 256, 0, 0, 0, {}, {callfunc "UnreleasedItem"; bonus bAtkRange, 1; bonus bInt, -(bInt);} +5130, Phylactery, Phylactery, 5, 50000, 10000, 20, 0, 1, 0, 5, 0, 2, 256, 0, 0, 0, {}, {callfunc "UnreleasedItem"; bonus bAspdRate, 10; bonus bDex, -(bDex/2);} diff --git a/world/map/npc/001-2/heathin.txt b/world/map/npc/001-2/heathin.txt index 2aa5f26c..05044812 100644 --- a/world/map/npc/001-2/heathin.txt +++ b/world/map/npc/001-2/heathin.txt @@ -312,7 +312,7 @@ L_Arrows_Trade_Yes: delitem "Coal", @TARROW_REQ_COAL; delitem "TerraniteOre", @TARROW_REQ_TERRA_ORE; set Zeny, Zeny - @TARROW_REQ_GP; - set @lucky, 5 * rand(readparam(bLuk)); + set @lucky, 5 * rand(Luk); set @lucky$, ""; getitem "TerraniteArrow", 1000 + @lucky; mes "[Heathin]"; diff --git a/world/map/npc/006-1/miriam.txt b/world/map/npc/006-1/miriam.txt index f513955b..a0f95288 100644 --- a/world/map/npc/006-1/miriam.txt +++ b/world/map/npc/006-1/miriam.txt @@ -161,7 +161,7 @@ L_teach: "I am already fast.", L_notfast; L_Prepared: - set @agi, readparam(bAgi); + set @agi, bAgi; set @torso$, getitemlink(getequipid(equip_torso)); set @weight, MaxWeight/Weight; if (@weight < 3) diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt index d5da641a..7274a708 100644 --- a/world/map/npc/009-2/kfahr.txt +++ b/world/map/npc/009-2/kfahr.txt @@ -920,9 +920,9 @@ L_gs_wrestle: set @KFAHR_AGI, 60 - @beer_count * 5; set @kfahr_stamina, 120; - set @PC_STR, readparam(bStr); - set @PC_AGI, readparam(bAgi); - set @PC_MAX_STAMINA, readparam(bVit) + 20; + set @PC_STR, bStr; + set @PC_AGI, bAgi; + set @PC_MAX_STAMINA, bVit + 20; set @pc_stamina, @PC_MAX_STAMINA; setarray @positions$, diff --git a/world/map/npc/016-1/gwendolyn.txt b/world/map/npc/016-1/gwendolyn.txt index f95336e9..f8831d82 100644 --- a/world/map/npc/016-1/gwendolyn.txt +++ b/world/map/npc/016-1/gwendolyn.txt @@ -442,7 +442,7 @@ L_target_hit: next; mes "\"Let me inspect it...\" She walks to the target."; next; - if( rand(500) > (2*readparam(bDex) + readparam(bAgi))) + if( rand(500) > (2*bDex + bAgi)) goto L_target_nohit; set @Q_hawkseye, 6; callsub S_Update_Var; diff --git a/world/map/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt index 2a1a2769..2c0da73b 100644 --- a/world/map/npc/018-2/caul.txt +++ b/world/map/npc/018-2/caul.txt @@ -138,7 +138,7 @@ L_brew: goto L_CraftLoop; L_CraftLoop: - set @throw, rand(readparam(bInt)); + set @throw, rand(bInt); set @result, 1; if (@throw >= 5) set @result, 2; if (@throw >= 15) set @result, 3; @@ -426,7 +426,7 @@ L_mo_random_1: // mode 1: remove colour return; L_mo_pc_bad: - if (rand(readparam(bInt) + 100) > 60) + if (rand(bInt + 100) > 60) goto L_mo_pc_bad_ok; if (@bubble_mode) mes "As your leaf dissolves, the intensity of the bubbling increases."; @@ -446,7 +446,7 @@ L_mo_pc_bad_ok: L_mo_auto_bad: if (rand(3) == 0) goto L_Return; - if (rand(readparam(bInt) + 100) > 70) + if (rand(bInt + 100) > 70) goto L_Return; mes "The brew begins to bubble more violently."; set @bubble_mode, @bubble_mode + 1; @@ -459,11 +459,11 @@ L_mo_auto_bad: L_mo_explode: mes "[Exploding monster oil]"; mes "Your brew explodes!"; - if (rand(readparam(bAgi)) > 40) + if (rand(bAgi) > 40) goto L_mo_explode_dodge; mes "The burst of boiling monster brew hits you."; next; - heal (15 * rand(readparam(bVit))) - 1500, 0, 1; + heal (15 * rand(bVit)) - 1500, 0, 1; close; L_mo_explode_dodge: @@ -713,7 +713,7 @@ L_mopox_failed_hard: mes "Suddenly, the thick mass bends outwards, a huge bubble bursting open right in your face!"; next; - if (rand(readparam(bVit)) < 40) + if (rand(bVit) < 40) sc_start sc_poison, 1, 20; mes "[Brewing Mopox Cure]"; diff --git a/world/map/npc/029-2/morgan.txt b/world/map/npc/029-2/morgan.txt index 605169ab..9f5d2668 100644 --- a/world/map/npc/029-2/morgan.txt +++ b/world/map/npc/029-2/morgan.txt @@ -31,7 +31,7 @@ OnInit: if (@npc_check) goto L_Close; callfunc "MorganState"; - if (readparam(bInt) >= 5) + if (bInt >= 5) goto L_Learn; goto L_NotMagic; diff --git a/world/map/npc/052-1/channelling.txt b/world/map/npc/052-1/channelling.txt index e65d47a8..414e1bf3 100644 --- a/world/map/npc/052-1/channelling.txt +++ b/world/map/npc/052-1/channelling.txt @@ -101,7 +101,7 @@ function|script|StartChannelling set $@illia_level_4_progress, 1; set $@illia_char_channelling$, strcharinfo(0); - set @bonus, (readparam(bInt)+1) / 25; + set @bonus, (bInt+1) / 25; // Lazurite Stones power, will also depend on the Int of the channelling character setarray $@illia_lazurites_power, 12 + @bonus, // small @@ -114,11 +114,11 @@ function|script|StartChannelling setarray $@illia_large_lazurites, 21,40, 34,25; // amount of initial magic power - set $@illia_magic_power, 1811 + readparam(bInt)*2; + set $@illia_magic_power, 1811 + bInt*2; // Channelling required power depends on the base Int of the character - set $@illia_magic_power_required, 5707 - 2*readparam(bInt); + set $@illia_magic_power_required, 5707 - 2*bInt; // magic power loss depends also on Int - set $@illia_magic_power_loss, 53 - ((readparam(bInt)+1)*2)/10; + set $@illia_magic_power_loss, 53 - ((bInt+1)*2)/10; // register the power status to display hints to the players // Statuses: 0=critical(below 300), 1=neutral, 2=almost there (max-300) diff --git a/world/map/npc/annuals/xmas/core.txt b/world/map/npc/annuals/xmas/core.txt index f154794d..45b4b71f 100644 --- a/world/map/npc/annuals/xmas/core.txt +++ b/world/map/npc/annuals/xmas/core.txt @@ -130,7 +130,7 @@ L_SetRewardBonus: set @xmas_reward_lower_bound, 2 * @xmas_reward_tally - rand(5); if (@xmas_reward_tally <= 5) set @xmas_reward_lower_bound, @xmas_reward_tally; - set @xmas_reward_upper_bound, @xmas_reward_lower_bound + ((readparam(bLuk)) / 5); + set @xmas_reward_upper_bound, @xmas_reward_lower_bound + ((bLuk) / 5); set @xmas_reward, (rand(@xmas_reward_lower_bound, @xmas_reward_upper_bound)); set @xmas_reward_lower_bound, 0; set @xmas_reward_upper_bound, 0; diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt index be8d4fb4..4c118dbd 100755 --- a/world/map/npc/functions/debug.txt +++ b/world/map/npc/functions/debug.txt @@ -59,12 +59,12 @@ L_Status: "Close.", L_Close; L_ChangeAllStats: - statusup2 bStr, 99 - readparam(bStr); - statusup2 bAgi, 99 - readparam(bAgi); - statusup2 bVit, 99 - readparam(bVit); - statusup2 bInt, 99 - readparam(bInt); - statusup2 bDex, 99 - readparam(bDex); - statusup2 bLuk, 99 - readparam(bLuk); + set bStr, 99; + set bAgi, 99; + set bVit, 99; + set bInt, 99; + set bDex, 99; + set bLuk, 99; mes "You now have 99 in all stats."; next; goto L_Begin; @@ -76,7 +76,7 @@ L_ChangeStrength: goto L_StatTooLow; if (@str > 99) goto L_StatTooHigh; - statusup2 bStr, @str - readparam(bStr); + set bStr, @str; goto L_ChangeAgility; L_ChangeAgility: @@ -86,7 +86,7 @@ L_ChangeAgility: goto L_StatTooLow; if (@agi > 99) goto L_StatTooHigh; - statusup2 bAgi, @agi - readparam(bAgi); + set bAgi, @agi; goto L_ChangeVitality; L_ChangeVitality: @@ -96,7 +96,7 @@ L_ChangeVitality: goto L_StatTooLow; if (@vit > 99) goto L_StatTooHigh; - statusup2 bVit, @vit - readparam(bVit); + set bVit, @vit; goto L_ChangeIntelligence; L_ChangeIntelligence: @@ -106,7 +106,7 @@ L_ChangeIntelligence: goto L_StatTooLow; if (@int > 99) goto L_StatTooHigh; - statusup2 bInt, @int - readparam(bInt); + set bInt, @int; goto L_ChangeDexterity; L_ChangeDexterity: @@ -116,7 +116,7 @@ L_ChangeDexterity: goto L_StatTooLow; if (@dex > 99) goto L_StatTooHigh; - statusup2 bDex, @dex - readparam(bDex); + set bDex, @dex; goto L_ChangeLuck; L_ChangeLuck: @@ -126,13 +126,13 @@ L_ChangeLuck: goto L_StatTooLow; if (@luk > 99) goto L_StatTooHigh; - statusup2 bLuk, @luk - readparam(bLuk); - mes "You now have " + readparam(bStr) + " in strength."; - mes "You now have " + readparam(bAgi) + " in agility."; - mes "You now have " + readparam(bVit) + " in vitality."; - mes "You now have " + readparam(bInt) + " in intelligence."; - mes "You now have " + readparam(bDex) + " in dexterity."; - mes "You now have " + readparam(bLuk) + " in luck."; + set bLuk, @luk; + mes "You now have " + bStr + " in strength."; + mes "You now have " + bAgi + " in agility."; + mes "You now have " + bVit + " in vitality."; + mes "You now have " + bInt + " in intelligence."; + mes "You now have " + bDex + " in dexterity."; + mes "You now have " + bLuk + " in luck."; next; goto L_Begin; @@ -165,8 +165,8 @@ L_ChangeStrengthSingle: goto L_StatTooLow; if (@str > 99) goto L_StatTooHigh; - statusup2 bStr, @str - readparam(bStr); - mes "You now have " + readparam(bStr) + " in strength."; + set bStr, @str; + mes "You now have " + bStr + " in strength."; next; goto L_Begin; @@ -177,8 +177,8 @@ L_ChangeAgilitySingle: goto L_StatTooLow; if (@agi > 99) goto L_StatTooHigh; - statusup2 bAgi, @agi - readparam(bAgi); - mes "You now have " + readparam(bAgi) + " in agility."; + set bAgi, @agi; + mes "You now have " + bAgi + " in agility."; next; goto L_Begin; @@ -189,8 +189,8 @@ L_ChangeVitalitySingle: goto L_StatTooLow; if (@vit > 99) goto L_StatTooHigh; - statusup2 bVit, @vit - readparam(bVit); - mes "You now have " + readparam(bVit) + " in vitality."; + set bVit, @vit; + mes "You now have " + bVit + " in vitality."; next; goto L_Begin; @@ -201,8 +201,8 @@ L_ChangeIntelligenceSingle: goto L_StatTooLow; if (@int > 99) goto L_StatTooHigh; - statusup2 bInt, @int - readparam(bInt); - mes "You now have " + readparam(bInt) + " in intelligence."; + set bInt, @int; + mes "You now have " + bInt + " in intelligence."; next; goto L_Begin; @@ -213,8 +213,8 @@ L_ChangeDexteritySingle: goto L_StatTooLow; if (@dex > 99) goto L_StatTooHigh; - statusup2 bDex, @dex - readparam(bDex); - mes "You now have " + readparam(bDex) + " in dexterity."; + set bDex, @dex; + mes "You now have " + bDex + " in dexterity."; next; goto L_Begin; @@ -225,8 +225,8 @@ L_ChangeLuckSingle: goto L_StatTooLow; if (@luk > 99) goto L_StatTooHigh; - statusup2 bLuk, @luk - readparam(bLuk); - mes "You now have " + readparam(bLuk) + " in luck."; + set bLuk, @luk; + mes "You now have " + bLuk + " in luck."; next; goto L_Begin; diff --git a/world/map/npc/items/require_stat.txt b/world/map/npc/items/require_stat.txt index 40200ea9..27d215f9 100644 --- a/world/map/npc/items/require_stat.txt +++ b/world/map/npc/items/require_stat.txt @@ -4,13 +4,13 @@ // This is passed automagically when called in an equip script. // @bStat The stat to check against. // Usually one of: bStr, bAgi, bVit, bInt, bDex, bLuk; -// but can be anything that works with readparam(). +// but can be anything that works with . // @minbStatVal The minimum stat value to accept this item. // ------------------------------------------------------------ function|script|RequireStat { - set @bStatVal, readparam(@bStat); + set @bStatVal, @bStat; // If the requirement isn't met, we set an unequip trigger. // The item is now removed. if (@bStatVal < @minbStatVal) -- cgit v1.2.3-60-g2f50