summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/Changelog.txt2
-rw-r--r--db/item_db.txt2
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/other/hugel_bingo.txt10
4 files changed, 10 insertions, 7 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index b61a3444f..070f21079 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -43,6 +43,8 @@
2385 Recuvative_Armor Should trigger HP/SP return with magical kills as well.
=======================
+2008/04/24
+ * Rev. 12646 Partially fixed bugreport:1285 (item 13697) [Toms]
2008/04/21
* Rev. 12625 Further fixed bugreport:1371. [L0ne_W0lf]
2008/04/14
diff --git a/db/item_db.txt b/db/item_db.txt
index 2fd65f1c9..8b99d1e83 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -3906,7 +3906,7 @@
//13694,Freya_Crown_Box,Freya's Crown Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5306,1; },{},{}
13695,Field_Manual25_Box,Field Manual 25% Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14532,25; },{},{}
13696,Field_Manual100_Box,Field Manual 100% Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14533,100; },{},{}
-13697,J_Blessing10_Box,Blessing Scroll 10ea Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,30; },{},{}
+13697,J_Blessing10_Box,Blessing Scroll 10ea Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12215,10; },{},{}
13698,J_Inc_Agi10_Box,Increase Agility Scroll 10ea Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12216,10; },{},{}
13699,J_Wind_Walk10_Box,Wind Walk Scroll 10ea Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12219,10; },{},{}
13700,J_Adrenaline10_Box,Adrenaline Rush Scroll 10ea Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12220,10; },{},{}
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index da2c53091..1bb543f50 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
======
-2008/04/22
+2008/04/24
+ * Rev. 12646 Fixed hugel_bingo making an unneeded infinite loop bugreport:1349 [Toms]
* Rev. 12645 Corrected a typo error ";;" bugreport:919 [Toms]
2008/04/21
* Rev. 12629 Fixed yet another WoE SE Bug (Juno castle 3) [L0ne_W0lf]
diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt
index 569b66afb..10ad4e1ee 100644
--- a/npc/other/hugel_bingo.txt
+++ b/npc/other/hugel_bingo.txt
@@ -192,13 +192,13 @@ OnTimer2000:
OnTimer5000:
mapannounce "que_bingo","Eukran: Now, let the game begin!",1,0xFFAB54;
setarray $@bingoarray[0],1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25;
+ set .@max_index, 24;
for(set .@i,0; .@i < 25; set .@i,.@i +1)
{
-L_Roll:
- set $@bingo0,rand(0,24);
- setarray $bingo[.@i],$@bingoarray[$@bingo0];
- if(!$bingo[.@i]) goto L_Roll;
- cleararray $@bingoarray[$@bingo0],0,1;
+ set $@bingo0,rand(0,.@max_index);
+ set $bingo[.@i],$@bingoarray[$@bingo0];
+ set $@bingoarray[$@bingo0], $@bingoarray[.@max_index];
+ set .@max_index, .@max_index - 1;
}
end;