diff --git a/kod/object/active/holder/room/kocarm/kocapoth.kod b/kod/object/active/holder/room/kocarm/kocapoth.kod index 0262cde734..2e823a0f42 100644 --- a/kod/object/active/holder/room/kocarm/kocapoth.kod +++ b/kod/object/active/holder/room/kocarm/kocapoth.kod @@ -14,9 +14,8 @@ constants: include blakston.khd - resources: - + room_name_kocapoth = "Two Lizards Magic Shop" room_kocapoth = kocapoth.roo kocapoth_music = song12.mp3 @@ -78,20 +77,21 @@ messages: ]; Send(self,@CreateOrnObjFromList,#lObjlist=lObjCoords1); - - send(self,@NewHold,#what=Create(&KocatanApothecary), + + Send(self,@NewHold,#what=Create(&KocatanApothecary), #new_row=4,#new_col=2,#fine_row=32,#fine_col=24, #new_angle=ANGLE_EAST); % Lighting - send(self,@NewHold,#what=Create(&DynamicLight,#iColor=LIGHT_FIRE,#iIntensity=25), - #new_row=2,#new_col=5,#fine_row=16,#fine_col=32); - send(self,@NewHold,#what=Create(&DynamicLight,#iColor=LIGHT_FIRE,#iIntensity=25), - #new_row=4,#new_col=8,#fine_row=48,#fine_col=8); + Send(self,@NewHold,#what=Create(&DynamicLight, + #iColor=LIGHT_FIRE,#iIntensity=25), + #new_row=2,#new_col=5,#fine_row=16,#fine_col=32); + Send(self,@NewHold,#what=Create(&DynamicLight, + #iColor=LIGHT_FIRE,#iIntensity=25), + #new_row=4,#new_col=8,#fine_row=48,#fine_col=8); propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/kocarm/kocatan.kod b/kod/object/active/holder/room/kocarm/kocatan.kod index 65eda335dd..b568345779 100644 --- a/kod/object/active/holder/room/kocarm/kocatan.kod +++ b/kod/object/active/holder/room/kocarm/kocatan.kod @@ -20,7 +20,8 @@ resources: room_kocatan = settle1.roo kocatan_music = song08.mp3 - kocatan_military = "No non-military personnel are allowed in the guard barracks." + kocatan_military = \ + "No non-military personnel are allowed in the guard barracks." kocatan_locked = "This door is firmly bolted shut." classvars: @@ -31,8 +32,8 @@ classvars: viTeleport_row = 40 viTeleport_col = 30 - % This room technically isn't a beach area, but it should get the sounds from the ocean - % directly to the south. + % This room technically isn't a beach area, but it should get the + %sounds from the ocean directly to the south. viTerrain_type = TERRAIN_CITY | TERRAIN_ROAD | TERRAIN_LAKE | TERRAIN_BEACH properties: @@ -52,7 +53,7 @@ messages: { plExits = $; - %% locked doors first, since they will be the least active + % Locked doors first, since they will be the least active. plExits = Cons([ 1, 17, ROOM_LOCKED_DOOR, kocatan_military ],plExits); plExits = Cons([ 1, 18, ROOM_LOCKED_DOOR, kocatan_military ],plExits); plExits = Cons([ 1, 21, ROOM_LOCKED_DOOR, kocatan_military ],plExits); @@ -68,13 +69,13 @@ messages: plExits = Cons([ 1, 41, ROOM_LOCKED_DOOR, kocatan_military ],plExits); plExits = Cons([ 1, 42, ROOM_LOCKED_DOOR, kocatan_military ],plExits); - %% eastern guard tower -- teleport in at (4,45) + % Eastern guard tower -- teleport in at (4,45). plExits = Cons([ 3, 46, RID_KOC_GUARDTOWER_EAST, 36, 5, ROTATE_NONE ],plExits); plExits = Cons([ 3, 47, RID_KOC_GUARDTOWER_EAST, 36, 5, ROTATE_NONE ],plExits); plExits = Cons([ 4, 46, RID_KOC_GUARDTOWER_EAST, 36, 5, ROTATE_NONE ],plExits); plExits = Cons([ 4, 47, RID_KOC_GUARDTOWER_EAST, 36, 5, ROTATE_NONE ],plExits); - %% apothecary + % Apothecary. plExits = Cons([ 14, 12, RID_KOC_APOTH, 3, 7, ROTATE_NONE ],plExits); plExits = Cons([ 15, 12, RID_KOC_APOTH, 3, 7, ROTATE_NONE ],plExits); plExits = Cons([ 14, 13, RID_KOC_APOTH, 3, 7, ROTATE_NONE ],plExits); @@ -83,25 +84,25 @@ messages: plExits = Cons([ 20, 7, RID_KOC_APOTH, 7, 3, ROTATE_NONE ],plExits); plExits = Cons([ 20, 8, RID_KOC_APOTH, 7, 3, ROTATE_NONE ],plExits); - %% hall of heroes -- teleport in at (23,30) + % Hall of Heroes -- teleport in at (23,30). plExits = Cons([ 21, 29, RID_KOC_HALL_OF_HEROES, 13, 7, ROTATE_NONE ],plExits); plExits = Cons([ 22, 29, RID_KOC_HALL_OF_HEROES, 13, 7, ROTATE_NONE ],plExits); plExits = Cons([ 21, 30, RID_KOC_HALL_OF_HEROES, 13, 7, ROTATE_NONE ],plExits); plExits = Cons([ 22, 30, RID_KOC_HALL_OF_HEROES, 13, 7, ROTATE_NONE ],plExits); - %% bank -- teleport in at (24,44) + % Bank -- teleport in at (24,44). plExits = Cons([ 23, 45, RID_KOC_BANK, 20, 7, ROTATE_NONE ],plExits); plExits = Cons([ 24, 45, RID_KOC_BANK, 20, 7, ROTATE_NONE ],plExits); plExits = Cons([ 23, 46, RID_KOC_BANK, 20, 7, ROTATE_NONE ],plExits); plExits = Cons([ 24, 46, RID_KOC_BANK, 20, 7, ROTATE_NONE ],plExits); - %% guild hall 12 (merchant hall) -- teleport in at (4,14) + % Guild hall 12 (merchant hall) -- teleport in at (4,14). plExits = Cons([ 3, 12, RID_GUILDH12, 44, 23, ROTATE_NONE ],plExits); plExits = Cons([ 3, 13, RID_GUILDH12, 44, 23, ROTATE_NONE ],plExits); plExits = Cons([ 4, 12, RID_GUILDH12, 44, 23, ROTATE_NONE ],plExits); plExits = Cons([ 4, 13, RID_GUILDH12, 44, 23, ROTATE_NONE ],plExits); - - %% orc caves -- teleport in at (41,52) + + % Orc Caves -- teleport in at (41,52). plExits = Cons([ 40, 53, RID_ORC_CAVE6, 6, 59, ROTATE_NONE ],plExits); plExits = Cons([ 40, 54, RID_ORC_CAVE6, 6, 59, ROTATE_NONE ],plExits); plExits = Cons([ 41, 53, RID_ORC_CAVE6, 6, 59, ROTATE_NONE ],plExits); @@ -109,30 +110,30 @@ messages: plExits = Cons([ 42, 53, RID_ORC_CAVE6, 6, 59, ROTATE_NONE ],plExits); plExits = Cons([ 42, 54, RID_ORC_CAVE6, 6, 59, ROTATE_NONE ],plExits); - %% store - teleport in at (32,48) + % Store - teleport in at (32,48). plExits = Cons([ 30, 47, RID_KOC_STORE, 15, 12, ROTATE_NONE ],plExits); plExits = Cons([ 31, 47, RID_KOC_STORE, 15, 12, ROTATE_NONE ],plExits); plExits = Cons([ 30, 48, RID_KOC_STORE, 15, 12, ROTATE_NONE ],plExits); plExits = Cons([ 31, 48, RID_KOC_STORE, 15, 12, ROTATE_NONE ],plExits); - - %% inn + + % Inn. plExits = Cons([ 29, 6, RID_KOC_INN, 3, 5, ROTATE_NONE ],plExits); plExits = Cons([ 29, 7, RID_KOC_INN, 3, 5, ROTATE_NONE ],plExits); - plExits = Cons([ 29, 8, RID_KOC_INN, 3, 5, ROTATE_NONE ],plExits); + plExits = Cons([ 29, 8, RID_KOC_INN, 3, 5, ROTATE_NONE ],plExits); - %% tavern + % Tavern. plExits = Cons([ 36, 12, RID_KOC_TAVERN, 12, 29, ROTATE_NONE ],plExits); plExits = Cons([ 37, 12, RID_KOC_TAVERN, 12, 29, ROTATE_NONE ],plExits); plExits = Cons([ 37, 13, RID_KOC_TAVERN, 12, 29, ROTATE_NONE ],plExits); plExits = Cons([ 36, 13, RID_KOC_TAVERN, 12, 29, ROTATE_NONE ],plExits); - %% northern guard tower -- teleport in at (4,45) + % Northern guard tower -- teleport in at (4,45). %plExits = Cons([ 3, 46, RID_KOC_GUARDTOWER_NORTH, 20, 20, ROTATE_NONE ],plExits); %plExits = Cons([ 3, 47, RID_KOC_GUARDTOWER_NORTH, 20, 20, ROTATE_NONE ],plExits); %plExits = Cons([ 4, 46, RID_KOC_GUARDTOWER_NORTH, 20, 20, ROTATE_NONE ],plExits); %plExits = Cons([ 4, 47, RID_KOC_GUARDTOWER_NORTH, 20, 20, ROTATE_NONE ],plExits); - %% southern half of city - land them at (50,30) + % Southern half of city - land them at (50,30). plExits = Cons([ 51, 29, RID_KOC_SOUTH, 4, 26, ROTATE_NONE ],plExits); plExits = Cons([ 51, 30, RID_KOC_SOUTH, 4, 26, ROTATE_NONE ],plExits); plExits = Cons([ 52, 29, RID_KOC_SOUTH, 4, 26, ROTATE_NONE ],plExits); @@ -141,6 +142,5 @@ messages: propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/kocarm/kocbank.kod b/kod/object/active/holder/room/kocarm/kocbank.kod index d7c0b06bdf..cc26f0da39 100644 --- a/kod/object/active/holder/room/kocarm/kocbank.kod +++ b/kod/object/active/holder/room/kocarm/kocbank.kod @@ -82,33 +82,36 @@ messages: [21,11,16,40,OO_BLUE_BOTTLE],[18,10,48,48,OO_POT], [24,10,40,32,OO_bigurn] ]; + Send(self,@CreateOrnObjFromList,#lObjlist=lObjCoords1); Send(self,@NewHold,#what=Create(&KocatanVaultman), - #new_row=21,#new_col=10,#fine_row=0,#fine_col=56); + #new_row=21,#new_col=10,#fine_row=0,#fine_col=56); Send(self,@NewHold,#what=Create(&KocatanBanker), - #new_row=19,#new_col=10,#fine_row=24,#fine_col=40); + #new_row=19,#new_col=10,#fine_row=24,#fine_col=40); Send(self,@NewHold,#what=Create(&KocatanSentry), - #new_row=8,#new_col=11,#fine_row=56,#fine_col=08); + #new_row=8,#new_col=11,#fine_row=56,#fine_col=08); % Lighting oLight = Create(&DynamicLight,#iColor=LIGHT_FIRE,#iIntensity=25); Send(self,@NewHold,#what=oLight,#new_row=9,#new_col=4, - #fine_row=40,#fine_col=8); + #fine_row=40,#fine_col=8); + oLight = Create(&DynamicLight,#iColor=LIGHT_FIRE,#iIntensity=25); Send(self,@NewHold,#what=oLight,#new_row=9,#new_col=13, - #fine_row=40,#fine_col=32); + #fine_row=40,#fine_col=32); + oLight = Create(&DynamicLight,#iColor=LIGHT_FIRE,#iIntensity=25); Send(self,@NewHold,#what=oLight,#new_row=13,#new_col=7, - #fine_row=24,#fine_col=48); + #fine_row=24,#fine_col=48); + oLight = Create(&DynamicLight,#iColor=LIGHT_FIRE,#iIntensity=25); Send(self,@NewHold,#what=oLight,#new_row=13,#new_col=9, - #fine_row=24,#fine_col=48); + #fine_row=24,#fine_col=48); propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/kocarm/kocblack.kod b/kod/object/active/holder/room/kocarm/kocblack.kod index 0b69a41c1b..1dec6afb7c 100644 --- a/kod/object/active/holder/room/kocarm/kocblack.kod +++ b/kod/object/active/holder/room/kocarm/kocblack.kod @@ -59,7 +59,7 @@ messages: { plExits = $; - %% to town -- teleport in to (6,9) + % To town -- teleport in to (6,9) plExits = Cons([ 5, 10, RID_KOC_SOUTH, 31, 20, ROTATE_NONE ],plExits); plExits = Cons([ 6, 10, RID_KOC_SOUTH, 31, 20, ROTATE_NONE ],plExits); @@ -76,23 +76,24 @@ messages: { local lObjCoords1; - lObjCoords1 = [ [09,09,48,32,OO_JUG], [03,03,24,56,OO_JUG], [04,05,56,32,OO_anvil], + lObjCoords1 = [ [09,09,48,32,OO_JUG], [03,03,24,56,OO_JUG], + [04,05,56,32,OO_anvil], [06,03,56,32,OO_bluejug], [12,07,16,24,OO_barrel2] ]; Send(self,@CreateOrnObjFromList,#lObjlist=lObjCoords1); - - send(self,@NewHold,#what=Create(&KocatanBlacksmith), + + Send(self,@NewHold,#what=Create(&KocatanBlacksmith), #new_row=4,#new_col=4,#fine_row=56,#fine_col=48, #new_angle=ANGLE_EAST); % Lighting - send(self,@NewHold,#what=Create(&DynamicLight,#iColor=LIGHT_ORANGE,#iIntensity=50), - #new_row=6,#new_col=6,#fine_row=0,#fine_col=0); + Send(self,@NewHold,#what=Create(&DynamicLight, + #iColor=LIGHT_ORANGE,#iIntensity=50), + #new_row=6,#new_col=6,#fine_row=0,#fine_col=0); propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/kocarm/kochoh.kod b/kod/object/active/holder/room/kocarm/kochoh.kod index 38e356d2f8..b834f37b7a 100644 --- a/kod/object/active/holder/room/kocarm/kochoh.kod +++ b/kod/object/active/holder/room/kocarm/kochoh.kod @@ -79,8 +79,8 @@ messages: return Send(SYS,@GetFailureRsc); } - post(self,@CreateStatues); - post(oLore,@ChooseCurrentBests); + Post(self,@CreateStatues); + Post(oLore,@ChooseCurrentBests); return Send(SYS,@GetPleaseWaitRsc); } @@ -107,7 +107,7 @@ messages: { local oNews, oStatue; - oNews = Create(&Newslink,#nid=NID_TOS_HALL,#name=news_Kocatan_hall, + oNews = Create(&NewsLink,#nid=NID_TOS_HALL,#name=news_Kocatan_hall, #desc=news_Kocatan_hall_desc); Send(self,@NewHold,#what=oNews,#new_row=7,#new_col=7, #fine_row=16,#fine_col=32); @@ -127,100 +127,100 @@ messages: } % The order of the statues is important. The most important - % statues are at the end, with the best player being last. - % The first statues go down the side halls. + % statues are at the end, with the best player being last. + % The first statues go down the side halls. plStatues = $; % Qor/Kraanan/Faren oStatue = Create(&Statue,#default=TRUE); - plStatues = cons(oStatue,plStatues); + plStatues = Cons(oStatue,plStatues); Send(self,@NewHold,#what=oStatue,#new_angle=ANGLE_EAST, - #new_row=5,#new_col=1,#fine_row=16,#fine_col=24); + #new_row=5,#new_col=1,#fine_row=16,#fine_col=24); % Shalille/Kraanan/Faren oStatue = Create(&Statue,#default=TRUE); - plStatues = cons(oStatue,plStatues); + plStatues = Cons(oStatue,plStatues); Send(self,@NewHold,#what=oStatue,#new_angle=ANGLE_WEST, - #new_row=5,#new_col=13,#fine_row=16,#fine_col=40); + #new_row=5,#new_col=13,#fine_row=16,#fine_col=40); % Qor/Kraanan oStatue = Create(&Statue,#default=TRUE); - plStatues = cons(oStatue,plStatues); + plStatues = Cons(oStatue,plStatues); Send(self,@NewHold,#what=oStatue,#new_angle=ANGLE_EAST, - #new_row=7,#new_col=1,#fine_row=48,#fine_col=24); + #new_row=7,#new_col=1,#fine_row=48,#fine_col=24); % Shalille/Kraanan oStatue = Create(&Statue,#default=TRUE); - plStatues = cons(oStatue,plStatues); + plStatues = Cons(oStatue,plStatues); Send(self,@NewHold,#what=oStatue,#new_angle=ANGLE_WEST, - #new_row=7,#new_col=13,#fine_row=48,#fine_col=40); + #new_row=7,#new_col=13,#fine_row=48,#fine_col=40); % Qor/Faren oStatue = Create(&Statue,#default=TRUE); - plStatues = cons(oStatue,plStatues); + plStatues = Cons(oStatue,plStatues); Send(self,@NewHold,#what=oStatue,#new_angle=ANGLE_EAST, - #new_row=10,#new_col=1,#fine_row=16,#fine_col=24); + #new_row=10,#new_col=1,#fine_row=16,#fine_col=24); % Shalille/Faren oStatue = Create(&Statue,#default=TRUE); - plStatues = cons(oStatue,plStatues); + plStatues = Cons(oStatue,plStatues); Send(self,@NewHold,#what=oStatue,#new_angle=ANGLE_WEST, - #new_row=10,#new_col=13,#fine_row=16,#fine_col=40); + #new_row=10,#new_col=13,#fine_row=16,#fine_col=40); % Jala oStatue = Create(&Statue,#default=TRUE,#desc=hoh_best_jala); - plStatues = cons(oStatue,plStatues); + plStatues = Cons(oStatue,plStatues); Send(self,@NewHold,#what=oStatue,#new_angle=ANGLE_WEST, - #new_row=9,#new_col=11,#fine_row=40,#fine_col=0); + #new_row=9,#new_col=11,#fine_row=40,#fine_col=0); % Qor oStatue = Create(&Statue,#default=TRUE,#desc=hoh_best_qor); - plStatues = cons(oStatue,plStatues); + plStatues = Cons(oStatue,plStatues); Send(self,@NewHold,#what=oStatue,#new_angle=ANGLE_EAST, - #new_row=9,#new_col=4,#fine_row=40,#fine_col=0); + #new_row=9,#new_col=4,#fine_row=40,#fine_col=0); % Shal'ille oStatue = Create(&Statue,#default=TRUE,#desc=hoh_best_shalille); - plStatues = cons(oStatue,plStatues); + plStatues = Cons(oStatue,plStatues); Send(self,@NewHold,#what=oStatue,#new_angle=ANGLE_WEST, - #new_row=7,#new_col=11,#fine_row=24,#fine_col=0); + #new_row=7,#new_col=11,#fine_row=24,#fine_col=0); % Kraanan oStatue = Create(&Statue,#default=TRUE,#desc=hoh_best_kraanan); - plStatues = cons(oStatue,plStatues); + plStatues = Cons(oStatue,plStatues); Send(self,@NewHold,#what=oStatue,#new_angle=ANGLE_EAST, - #new_row=7,#new_col=4,#fine_row=24,#fine_col=0); + #new_row=7,#new_col=4,#fine_row=24,#fine_col=0); % Faren oStatue = Create(&Statue,#default=TRUE,#desc=hoh_best_faren); - plStatues = cons(oStatue,plStatues); + plStatues = Cons(oStatue,plStatues); Send(self,@NewHold,#what=oStatue,#new_angle=ANGLE_WEST, - #new_row=5,#new_col=11,#fine_row=8,#fine_col=0); + #new_row=5,#new_col=11,#fine_row=8,#fine_col=0); % Riija - oStatue = Create(&Statue,#default=TRUE,#desc=hoh_best_riija); - plStatues = cons(oStatue,plStatues); + oStatue = Create(&Statue,#default=TRUE,#desc=hoh_best_riija); + plStatues = Cons(oStatue,plStatues); Send(self,@NewHold,#what=oStatue,#new_angle=ANGLE_EAST, - #new_row=5,#new_col=4,#fine_row=8,#fine_col=0); + #new_row=5,#new_col=4,#fine_row=8,#fine_col=0); % Wizard oStatue = Create(&Statue,#default=TRUE,#desc=hoh_best_wizard); - plStatues = cons(oStatue,plStatues); + plStatues = Cons(oStatue,plStatues); Send(self,@NewHold,#what=oStatue,#new_angle=ANGLE_SOUTH_EAST, - #new_row=2,#new_col=4,#fine_row=24,#fine_col=56); + #new_row=2,#new_col=4,#fine_row=24,#fine_col=56); % Warrior (skills) oStatue = Create(&Statue,#default=TRUE,#desc=hoh_best_warrior); - plStatues = cons(oStatue,plStatues); + plStatues = Cons(oStatue,plStatues); Send(self,@NewHold,#what=oStatue,#new_angle=ANGLE_SOUTH_WEST, - #new_row=2,#new_col=10,#fine_row=24,#fine_col=8); - + #new_row=2,#new_col=10,#fine_row=24,#fine_col=8); + % Adventurer (overall) oStatue = Create(&Statue,#default=TRUE,#desc=hoh_best_adventurer); - plStatues = cons(oStatue,plStatues); + plStatues = Cons(oStatue,plStatues); Send(self,@NewHold,#what=oStatue,#new_angle=ANGLE_SOUTH, - #new_row=1,#new_col=7,#fine_row=32,#fine_col=32); + #new_row=1,#new_col=7,#fine_row=32,#fine_col=32); return Send(SYS,@GetSuccessRsc); } @@ -229,13 +229,14 @@ messages: "Admin supported. Resets all of the Hall of Heroes statues." { local i, oLore; + oLore = Send(SYS,@GetLore); if oLore = $ { return Send(SYS,@GetFailureRsc); } - % Delete statues, clear out "best" lists in lore, then recreate statues + % Delete statues, clear out "best" lists in lore, then recreate statues. for i in plStatues { Send(i, @Delete); @@ -258,16 +259,16 @@ messages: return; } - + if plStatues = $ { % Statues haven't been created yet. No one has entered yet. return; - } + } index = 0; for i in plStatues - { + { index = index + 1; if Nth(lData,index) <> $ AND Send(i,@GetOriginal) <> Nth(lData,index) @@ -286,6 +287,5 @@ messages: propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/kocarm/kochoha.kod b/kod/object/active/holder/room/kocarm/kochoha.kod index c2c74378ab..a6531d41a3 100644 --- a/kod/object/active/holder/room/kocarm/kochoha.kod +++ b/kod/object/active/holder/room/kocarm/kochoha.kod @@ -54,13 +54,14 @@ messages: %% to Main hall plExits = Cons([ 3, 3, RID_KOC_HALL_OF_HEROES, 3, 2, ROTATE_NONE ],plExits); plExits = Cons([ 2, 3, RID_KOC_HALL_OF_HEROES, 3, 2, ROTATE_NONE ],plExits); - + propagate; } CreateStandardObjects() { - Send(self,@NewHold,#what=Create(&KocatanWeaponsMaster),#new_row=5,#new_col=5,#fine_row=32,#fine_col=32); + Send(self,@NewHold,#what=Create(&KocatanWeaponsMaster), + #new_row=5,#new_col=5,#fine_row=32,#fine_col=32); propagate; } diff --git a/kod/object/active/holder/room/kocarm/kochohb.kod b/kod/object/active/holder/room/kocarm/kochohb.kod index 1f400d49d8..de877890bb 100644 --- a/kod/object/active/holder/room/kocarm/kochohb.kod +++ b/kod/object/active/holder/room/kocarm/kochohb.kod @@ -22,56 +22,56 @@ resources: kochistory_book_name = "History of the Settlement" kochistory_book_text = \ - "By Coitla cha'Oztya, 224th year of the settlement.\n" - "\n" - " Several centuries ago, our forefathers established the great settlement " - "of Ko'catan. It was not built on learning or trade, but on sweat and blood.\n" - "\n" - " In the Time Before, our hero and savior Konima lead less than one hundred " - "warriors into the caves of the Utom. Konima, a great military strategist and " - "swordsman unparalleled bravely brought the war to the heart of the enemy. " - "There is no written record of the civilization from which they came. The " - "oral stories of our predecessors tell of a decedent land run amok with " - "bizarre politics and meaningless wars, though some say the people were " - "essentially good and deserving of the sacrifice made by our ancestors. Most " - "believe that this land no longer exists and the people are dead. The truth, " - "we may never know.\n" - "\n" - " Having taken the horrible battle to the heart of the Utom, Konima knew " - "that there would be no returning to his homeland. The battle was not going " - "well. The utom had ambushed the warriors. His numbers were low. There was " - "no food left. And those left in his command were unaware of how badly injured " - "Konima was.\n" - "\n" - "¶" - " It was at the last days of Konima's life that a scout party made their way " - "through a series of caverns and emerged on the sandy shores of the Island. " - "Fresh air and food abound, it promised salvation for the war-ravaged group. " - "Sadly, the scouts were not quick enough; hours before returning with their " - "good news, the great Konima passed on from deep internal wounds. His last " - "words were, \"You have all bravely followed me to what is to be our tomb. " - "You have all saved the lives of thousands at the cost of your own. Should " - "any of you survive these final hours by some folly of the old gods, know well " - "that I will see you again. For one day you and all of your descendants will " - "stand beside me in the glorious ever-after.\"\n" - "\n" - " The warrior men and women carried his body to the oceanfront and erected " - "a memorial tomb that one day would become the Hall of Heroes. This was to be " - "the beginning of the Settlement. At first, they prepared for the utom to " - "follow them to the surface to slaughter them all. But the utom never came. " - "In fact, to this day the utom shun the open air of the island at all costs. " - "No one knows what they fear on the island.\n" - "¶" - " It was not long before our predecessors encountered the first Avar tribe. " - "After a series of bloody battles, the great barrier wall was built. For six " - "generations of Warlords, we have stood strong against the various tribes on " - "the island. Although at one point our established territory went all the way " - "to the old temple ruins, we have never lost Ko'catan to invaders. Not even " - "during the slaughter of the fifth warlord, when Avars attacked from the " - "undefended beachfront.\n" - "\n" - " Ko'catan is strong and with the spirit of Konima at its heart, we shall never fall." - + "By Coitla cha'Oztya, 224th year of the settlement.\n" + "\n" + " Several centuries ago, our forefathers established the great settlement " + "of Ko'catan. It was not built on learning or trade, but on sweat and blood.\n" + "\n" + " In the Time Before, our hero and savior Konima lead less than one hundred " + "warriors into the caves of the Utom. Konima, a great military strategist and " + "swordsman unparalleled bravely brought the war to the heart of the enemy. " + "There is no written record of the civilization from which they came. The " + "oral stories of our predecessors tell of a decadent land run amok with " + "bizarre politics and meaningless wars, though some say the people were " + "essentially good and deserving of the sacrifice made by our ancestors. Most " + "believe that this land no longer exists and the people are dead. The truth, " + "we may never know.\n" + "\n" + " Having taken the horrible battle to the heart of the Utom, Konima knew " + "that there would be no returning to his homeland. The battle was not going " + "well. The utom had ambushed the warriors. His numbers were low. There was " + "no food left. And those left in his command were unaware of how badly injured " + "Konima was.\n" + "\n" + "¶" + " It was at the last days of Konima's life that a scout party made their way " + "through a series of caverns and emerged on the sandy shores of the Island. " + "Fresh air and food abound, it promised salvation for the war-ravaged group. " + "Sadly, the scouts were not quick enough; hours before returning with their " + "good news, the great Konima passed on from deep internal wounds. His last " + "words were, \"You have all bravely followed me to what is to be our tomb. " + "You have all saved the lives of thousands at the cost of your own. Should " + "any of you survive these final hours by some folly of the old gods, know well " + "that I will see you again. For one day you and all of your descendants will " + "stand beside me in the glorious ever-after.\"\n" + "\n" + " The warrior men and women carried his body to the oceanfront and erected " + "a memorial tomb that one day would become the Hall of Heroes. This was to be " + "the beginning of the Settlement. At first, they prepared for the utom to " + "follow them to the surface to slaughter them all. But the utom never came. " + "In fact, to this day the utom shun the open air of the island at all costs. " + "No one knows what they fear on the island.\n" + "¶" + " It was not long before our predecessors encountered the first Avar tribe. " + "After a series of bloody battles, the great barrier wall was built. For six " + "generations of Warlords, we have stood strong against the various tribes on " + "the island. Although at one point our established territory went all the way " + "to the old temple ruins, we have never lost Ko'catan to invaders. Not even " + "during the slaughter of the fifth warlord, when Avars attacked from the " + "undefended beachfront.\n" + "\n" + " Ko'catan is strong and with the spirit of Konima at its heart, " + "we shall never fall." KocatanHallB_music = extra01.mp3 @@ -106,10 +106,10 @@ messages: plExits = Cons([ 9, 5, ROOM_LOCKED_DOOR ],plExits); - %% to main hall + % To main hall plExits = Cons([ 2, 5, RID_KOC_HALL_OF_HEROES, 3, 12, ROTATE_NONE ],plExits); plExits = Cons([ 3, 5, RID_KOC_HALL_OF_HEROES, 3, 12, ROTATE_NONE ],plExits); - + propagate; } @@ -117,13 +117,17 @@ messages: { local oBook; - oBook = Create(&BookPedestal,#Name=kochistory_book_name,#Text=kochistory_book_text); + oBook = Create(&BookPedestal,#Name=kochistory_book_name, + #Text=kochistory_book_text); Send(self,@NewHold,#what=oBook, - #new_row=7,#new_col=3,#fine_row=32,#fine_col=0,#new_angle=ANGLE_NORTH_EAST); + #new_row=7,#new_col=3,#fine_row=32,#fine_col=0, + #new_angle=ANGLE_NORTH_EAST); - Send(self,@NewHold,#what=Create(&KocatanLanguageMaster),#new_row=7,#new_col=5,#fine_row=16,#fine_col=48); - Send(self,@NewHold,#what=Create(&Quillpen),#new_row=6,#new_col=6,#fine_row=16,#fine_col=16); + Send(self,@NewHold,#what=Create(&KocatanLanguageMaster),#new_row=7, + #new_col=5,#fine_row=16,#fine_col=48); + Send(self,@NewHold,#what=Create(&Quillpen),#new_row=6,#new_col=6, + #fine_row=16,#fine_col=16); propagate; } diff --git a/kod/object/active/holder/room/kocarm/kocinn.kod b/kod/object/active/holder/room/kocarm/kocinn.kod index 9fc05b733a..6fb5ddc9e8 100644 --- a/kod/object/active/holder/room/kocarm/kocinn.kod +++ b/kod/object/active/holder/room/kocarm/kocinn.kod @@ -27,7 +27,8 @@ resources: kocinn_katalinwaz_locked = "Room katalinwaz is locked." kocnews_god_name = "Designers' News" - kocnews_god_desc = "Check here for information from the game administrators." + kocnews_god_desc = \ + "Check here for information from the game administrators." kocinn_music = song12.mp3 @@ -57,10 +58,10 @@ messages: { plExits = $; - %% to kocatan + % To Kocatan. plExits = Cons([ 2, 5, RID_KOCATAN, 28, 7, ROTATE_NONE ],plExits); - - %% to kocatan tavern + + % To Kocatan tavern. plExits = Cons([ 12, 8, RID_KOC_TAVERN, 16, 17, ROTATE_NONE ],plExits); plExits = Cons([ 5, 2, ROOM_LOCKED_DOOR, kocinn_waz_locked],plExits); @@ -70,7 +71,7 @@ messages: plExits = Cons([ 10, 3, ROOM_LOCKED_DOOR, kocinn_wazwaz_locked],plExits); plExits = Cons([ 10, 4, ROOM_LOCKED_DOOR, kocinn_wazwaz_locked],plExits); - + plExits = Cons([ 10, 6, ROOM_LOCKED_DOOR, kocinn_zik_locked],plExits); %% 10,7 finecol is less than 32 has to be hardcoded @@ -86,32 +87,36 @@ messages: propagate; } - SomethingTryGo(what=$, row=0, col=0, fine_row=0, fine_col=0) + SomethingTryGo(what=$,row=0,col=0,fine_row=0,fine_col=0) { - if (row=10) and (col=7) and (fine_col < 32) + if (row=10) AND (col=7) AND (fine_col < 32) { - send(what,@msgsenduser,#message_rsc=kocinn_zik_locked); + Send(what,@MsgSendUser,#message_rsc=kocinn_zik_locked); + return TRUE; } - - if (row=11) and (col=8) and (fine_row < 32) + + if (row=11) AND (col=8) AND (fine_row < 32) { - send(what,@msgsenduser,#message_rsc=kocinn_katalinwaz_locked); + Send(what,@MsgSendUser,#message_rsc=kocinn_katalinwaz_locked); + return TRUE; } - - if (row=7) and (col=5) and (fine_col > 32) + + if (row=7) AND (col=5) AND (fine_col > 32) { - send(what,@msgsenduser,#message_rsc=kocinn_zikzik_locked); + Send(what,@MsgSendUser,#message_rsc=kocinn_zikzik_locked); + return TRUE; } - - if (row=9) and (col=6) and (fine_row < 32) + + if (row=9) AND (col=6) AND (fine_row < 32) { - send(what,@msgsenduser,#message_rsc=kocinn_katalin_locked); + Send(what,@MsgSendUser,#message_rsc=kocinn_katalin_locked); + return TRUE; } - + propagate; } @@ -120,16 +125,18 @@ messages: local lObjCoords1, oNews; oNews = Create(&NewsLink,#nid=NID_ANNOUNCEMENTS, - #name=kocnews_god_name,#desc=kocnews_god_desc); - Send(self,@NewHold,#what=oNews,#new_row=4,#new_col=6,#fine_row=8,#fine_col=56); + #name=kocnews_god_name,#desc=kocnews_god_desc); + Send(self,@NewHold,#what=oNews,#new_row=4,#new_col=6, + #fine_row=8,#fine_col=56); - lObjCoords1 = [ [02,09,08,16,OO_JUG],[12,04,48,08,OO_JUG],[11,09,40,16,OO_GREY_JUG] ]; + lObjCoords1 = [ [02,09,08,16,OO_JUG],[12,04,48,08,OO_JUG], + [11,09,40,16,OO_GREY_JUG] ]; Send(self,@CreateOrnObjFromList,#lObjlist=lObjCoords1); - - send(self,@NewHold,#what=Create(&KocatanInnkeeper), - #new_row=5,#new_col=6,#fine_row=48,#fine_col=56, - #new_angle=ANGLE_EAST); + + Send(self,@NewHold,#what=Create(&KocatanInnkeeper), + #new_row=5,#new_col=6,#fine_row=48,#fine_col=56, + #new_angle=ANGLE_EAST); propagate; } diff --git a/kod/object/active/holder/room/kocarm/kocsouth.kod b/kod/object/active/holder/room/kocarm/kocsouth.kod index 280fa797a5..a316625a24 100644 --- a/kod/object/active/holder/room/kocarm/kocsouth.kod +++ b/kod/object/active/holder/room/kocarm/kocsouth.kod @@ -20,19 +20,22 @@ resources: room_kocatansouth = settle2.roo kocatansouth_music = song08.mp3 - kocatansouth_northdoors = "This door to the inner wall is firmly bolted shut." - kocatansouth_private = "You are not permitted inside the private residence." + kocatansouth_northdoors = \ + "This door to the inner wall is firmly bolted shut." + kocatansouth_private = \ + "You are not permitted inside the private residence." kocatansouth_whooping = \ - "You hear loud whooping noises eminating from inside, and decide it's best " - "not to enter." + "You hear loud whooping noises emanating from inside, and decide it's " + "best not to enter." kocatansouth_drown = \ - "You decide that drowning is probably not in your personal best interests." + "You decide that drowning is probably not in your personal " + "best interests." kocatansouth_guild_locked = \ - "As you touch the door, you hear the bolt mechanism slide home, locking itself. " - "Apparently, this door is magically safeguarded against guild non-members such as " - "yourself." + "As you touch the door, you hear the bolt mechanism slide home, " + "locking itself. Apparently, this door is magically safeguarded " + "against guild non-members such as yourself." kocatansouth_guild_sound_locked = doorlck.wav classvars: @@ -82,7 +85,7 @@ messages: plExits = Cons([ 6, 14, ROOM_LOCKED_DOOR, kocatansouth_whooping],plExits); plExits = Cons([ 6, 15, ROOM_LOCKED_DOOR, kocatansouth_whooping],plExits); - % locked doors to north town + % Locked doors to north town. plExits = Cons([ 2, 13, ROOM_LOCKED_DOOR, kocatansouth_northdoors],plExits); plExits = Cons([ 2, 14, ROOM_LOCKED_DOOR, kocatansouth_northdoors],plExits); plExits = Cons([ 3, 13, ROOM_LOCKED_DOOR, kocatansouth_northdoors],plExits); @@ -92,57 +95,58 @@ messages: plExits = Cons([ 2, 39, ROOM_LOCKED_DOOR, kocatansouth_northdoors],plExits); plExits = Cons([ 3, 39, ROOM_LOCKED_DOOR, kocatansouth_northdoors],plExits); - %% to north town -- teleport in to (4,14) + % To north town -- teleport in to (4,14) %plExits = Cons([ 2, 13, RID_KOC_NORTH, 32, 48, ROTATE_NONE ],plExits); %plExits = Cons([ 2, 14, RID_KOC_NORTH, 32, 48, ROTATE_NONE ],plExits); %plExits = Cons([ 3, 13, RID_KOC_NORTH, 32, 48, ROTATE_NONE ],plExits); %plExits = Cons([ 3, 14, RID_KOC_NORTH, 32, 48, ROTATE_NONE ],plExits); - %% to north town -- teleport in to (4,26) + % To north town -- teleport in to (4,26) plExits = Cons([ 3, 25, RID_KOC_NORTH, 50, 30, ROTATE_NONE ],plExits); plExits = Cons([ 3, 26, RID_KOC_NORTH, 50, 30, ROTATE_NONE ],plExits); plExits = Cons([ 3, 27, RID_KOC_NORTH, 50, 30, ROTATE_NONE ],plExits); - %% to north town -- teleport in to (4,38) + % To north town -- teleport in to (4,38) %plExits = Cons([ 2, 38, RID_KOC_NORTH, 32, 48, ROTATE_NONE ],plExits); %plExits = Cons([ 3, 38, RID_KOC_NORTH, 32, 48, ROTATE_NONE ],plExits); %plExits = Cons([ 2, 39, RID_KOC_NORTH, 32, 48, ROTATE_NONE ],plExits); %plExits = Cons([ 3, 39, RID_KOC_NORTH, 32, 48, ROTATE_NONE ],plExits); - %% to kocatan smithy -- teleport in to (31,20) + % To kocatan smithy -- teleport in to (31,20) plExits = Cons([ 30, 18, RID_KOC_SMITHY, 6, 9, ROTATE_NONE ],plExits); plExits = Cons([ 30, 19, RID_KOC_SMITHY, 6, 9, ROTATE_NONE ],plExits); plExits = Cons([ 31, 18, RID_KOC_SMITHY, 6, 9, ROTATE_NONE ],plExits); plExits = Cons([ 31, 19, RID_KOC_SMITHY, 6, 9, ROTATE_NONE ],plExits); - %% to kocatan tailor -- teleport in at (30,35) + % To kocatan tailor -- teleport in at (30,35) plExits = Cons([ 30, 36, RID_KOC_TAILOR, 18, 4, ROTATE_NONE ],plExits); plExits = Cons([ 30, 37, RID_KOC_TAILOR, 18, 4, ROTATE_NONE ],plExits); plExits = Cons([ 31, 36, RID_KOC_TAILOR, 18, 4, ROTATE_NONE ],plExits); plExits = Cons([ 31, 37, RID_KOC_TAILOR, 18, 4, ROTATE_NONE ],plExits); - %% to guild hall 13 (merchant hall) - teleport in (43,37) -- main entrance + % To guild hall 13 (merchant hall) - teleport in (43,37) -- main entrance plExits = Cons([ 42, 38, RID_GUILDH13, 9, 2, ROTATE_NONE ],plExits); plExits = Cons([ 43, 38, RID_GUILDH13, 9, 2, ROTATE_NONE ],plExits); plExits = Cons([ 42, 39, RID_GUILDH13, 9, 2, ROTATE_NONE ],plExits); plExits = Cons([ 43, 39, RID_GUILDH13, 9, 2, ROTATE_NONE ],plExits); - %% to guild hall 13 (merchant hall) - teleport in (47,43) -- from secure porch - % note that these doors can only be passed through by guild members - % (code below in SomethingTryGo will preempt these doors for non-members) + % To guild hall 13 (merchant hall) - teleport in (47,43) -- from secure + % porch. Note that these doors can only be passed through by guild members + % (code below in SomethingTryGo will preempt these doors for non-members) plExits = Cons([ 46, 43, RID_GUILDH13, 12, 7, ROTATE_NONE ],plExits); plExits = Cons([ 46, 44, RID_GUILDH13, 12, 7, ROTATE_NONE ],plExits); propagate; } - SomethingTryGo(what=$, row=$, col=$) + SomethingTryGo(what=$,row=$,col=$) "Porch doors only passable to guild members" { if (row = 46) AND (col = 43 OR col = 44) - AND NOT send(send(SYS,@FindRoomByNum,#num=RID_GUILDH13),@CanEnter,#who=what) + AND NOT Send(Send(SYS,@FindRoomByNum,#num=RID_GUILDH13), + @CanEnter,#who=what) { - send(what,@MsgSendUser,#message_rsc=kocatansouth_guild_locked); + Send(what,@MsgSendUser,#message_rsc=kocatansouth_guild_locked); Send(what,@WaveSendUser,#wave_rsc=kocatansouth_guild_sound_locked); return TRUE; @@ -155,14 +159,13 @@ messages: { if (dir = LEAVE_SOUTH) and (IsClass(what,&Player)) { - send(what,@MsgSendUser,#message_rsc=kocatansouth_drown); + Send(what,@MsgSendUser,#message_rsc=kocatansouth_drown); return; - } + } propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/kocarm/kocstore.kod b/kod/object/active/holder/room/kocarm/kocstore.kod index f448b330f3..41aeccc5ec 100644 --- a/kod/object/active/holder/room/kocarm/kocstore.kod +++ b/kod/object/active/holder/room/kocarm/kocstore.kod @@ -46,7 +46,7 @@ messages: { plExits = $; - %% to town -- teleport in to (15,12) + %% To town -- teleport in to (15,12). plExits = Cons([ 16, 12, RID_KOCATAN, 32, 48, ROTATE_NONE ],plExits); plExits = Cons([ 6, 25, ROOM_LOCKED_DOOR],plExits); @@ -56,7 +56,7 @@ messages: plExits = Cons([ 2, 13, RID_KOC_SEWER1, 40, 20, ROTATE_NONE ],plExits); plExits = Cons([ 3, 13, RID_KOC_SEWER1, 40, 20, ROTATE_NONE ],plExits); - + propagate; } @@ -90,19 +90,20 @@ messages: Send(self,@CreateOrnObjFromList,#lObjlist=lObjCoords1); Send(self,@CreateOrnObjFromList,#lObjlist=lObjCoords2); - send(self,@NewHold,#what=Create(&kocatanShopkeeper), - #new_row=6,#new_col=21,#fine_row=16,#fine_col=48, - #new_angle=ANGLE_EAST); + Send(self,@NewHold,#what=Create(&kocatanShopkeeper), + #new_row=6,#new_col=21,#fine_row=16,#fine_col=48, + #new_angle=ANGLE_EAST); % Lighting - send(self,@NewHold,#what=Create(&DynamicLight,#iColor=LIGHT_FIRE,#iIntensity=30), - #new_row=11,#new_col=5,#fine_row=10,#fine_col=45); - send(self,@NewHold,#what=Create(&DynamicLight,#iColor=LIGHT_FIRE,#iIntensity=25), - #new_row=8,#new_col=24,#fine_row=24,#fine_col=32); + Send(self,@NewHold,#what=Create(&DynamicLight, + #iColor=LIGHT_FIRE,#iIntensity=30), + #new_row=11,#new_col=5,#fine_row=10,#fine_col=45); + Send(self,@NewHold,#what=Create(&DynamicLight, + #iColor=LIGHT_FIRE,#iIntensity=25), + #new_row=8,#new_col=24,#fine_row=24,#fine_col=32); propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/kocarm/koctail.kod b/kod/object/active/holder/room/kocarm/koctail.kod index 7b05dddff0..f6c49e7b7a 100644 --- a/kod/object/active/holder/room/kocarm/koctail.kod +++ b/kod/object/active/holder/room/kocarm/koctail.kod @@ -26,6 +26,7 @@ resources: koctail_locked_3 = "A dank stench wafts from beneath this locked iron door." koctail_key_disappears = "The heavy iron key disappears!" + classvars: vrName = room_name_koctail @@ -52,17 +53,16 @@ messages: { plExits = $; - %% to town -- teleport in to (18,4) + % To town -- teleport in to (18,4). plExits = Cons([ 17, 3, RID_KOC_SOUTH, 30, 35, ROTATE_NONE ],plExits); plExits = Cons([ 18, 3, RID_KOC_SOUTH, 30, 35, ROTATE_NONE ],plExits); - % this is the key door - % leave this here. It will give the locked message if they - % don't have a key. + % This is the key door - leave this here. It will give the locked + % message if they don't have a key. plExits = Cons([ 15, 9, ROOM_LOCKED_DOOR, koctail_locked_2],plExits); - % don't need key going the other way + % Don't need key going the other way. plExits = Cons([ 14, 9, RID_KOC_TAILOR, 16, 9, ROTATE_NONE ],plExits); - + plExits = Cons([ 18, 10, ROOM_LOCKED_DOOR, koctail_locked_1],plExits); plExits = Cons([ 9, 1, ROOM_LOCKED_DOOR, koctail_locked_2],plExits); plExits = Cons([ 9, 2, ROOM_LOCKED_DOOR, koctail_locked_2],plExits); @@ -71,7 +71,7 @@ messages: plExits = Cons([ 3, 1, RID_KOC_SEWER2, 43, 47, ROTATE_NONE ],plExits); plExits = Cons([ 3, 2, RID_KOC_SEWER2, 43, 47, ROTATE_NONE ],plExits); - + propagate; } @@ -79,9 +79,11 @@ messages: { local lObjCoords1, lObjCoords2; lObjCoords1 = [ - [16,03,24,24,OO_DRESS1],[17,03,08,24,OO_DRESS3],[16,07,16,32,OO_DRESS3], - [16,05,08,48,OO_JUG],[19,04,08,48,OO_CLOTH_BOLT1],[19,03,48,08,OO_CLOTH_BOLT2], - [19,07,48,48,OO_CLOTH_BOLT3],[19,10,32,32,OO_CLOTH_BOLT4],[18,08,40,40,OO_CLOTH_BOLT5], + [16,03,24,24,OO_DRESS1],[17,03,08,24,OO_DRESS3], + [16,07,16,32,OO_DRESS3],[16,05,08,48,OO_JUG], + [19,04,08,48,OO_CLOTH_BOLT1],[19,03,48,08,OO_CLOTH_BOLT2], + [19,07,48,48,OO_CLOTH_BOLT3],[19,10,32,32,OO_CLOTH_BOLT4], + [18,08,40,40,OO_CLOTH_BOLT5], [18,10,56,32,OO_CLOTH_BOLT6],[11,10,48,08,OO_GREY_JUG], [10,10,56,08,OO_POT],[10,10,32,08,OO_GOLD_BOTTLE] ]; @@ -92,9 +94,9 @@ messages: Send(self,@CreateOrnObjFromList,#lObjlist=lObjCoords1); Send(self,@CreateOrnObjFromList,#lObjlist=lObjCoords2); - send(self,@NewHold,#what=Create(&KocatanTailor), - #new_row=18,#new_col=7,#fine_row=40,#fine_col=0, - #new_angle=ANGLE_EAST); + Send(self,@NewHold,#what=Create(&KocatanTailor), + #new_row=18,#new_col=7,#fine_row=40,#fine_col=0, + #new_angle=ANGLE_EAST); propagate; } @@ -102,25 +104,28 @@ messages: SomethingTryGo(what=$,row=$,col=$) { local i, lPassive, each_obj; - - if isClass(what,&user) + + if IsClass(what,&user) { if (row=15) and (col=9) - { - lPassive=send(what,@getholderpassive); - for i in lPassive - { - each_obj = send(what,@holderextractobject,#data=i); - if isClass(each_obj, &SanctuaryKey) - { - send(each_obj,@delete); - send(what,@msgsenduser,#message_rsc=koctail_key_disappears); - send(SYS,@UtilGoToSquare,#what=what,#where=self,#what=what,#new_row=13,#new_col=9); - return TRUE; - } - } - } + { + lPassive=Send(what,@GetHolderPassive); + for i in lPassive + { + each_obj = Send(what,@HolderExtractObject,#data=i); + if IsClass(each_obj,&SanctuaryKey) + { + Send(each_obj,@Delete); + Send(what,@MsgSendUser,#message_rsc=koctail_key_disappears); + Send(SYS,@UtilGoToSquare,#what=what,#where=self, + #what=what,#new_row=13,#new_col=9); + + return TRUE; + } + } + } } + propagate; } diff --git a/kod/object/active/holder/room/kocarm/koctav.kod b/kod/object/active/holder/room/kocarm/koctav.kod index 709cdc29d3..a3f2e33e60 100644 --- a/kod/object/active/holder/room/kocarm/koctav.kod +++ b/kod/object/active/holder/room/kocarm/koctav.kod @@ -59,7 +59,6 @@ messages: plExits = Cons([ 14, 16, RID_KOC_INN, 12, 7, ROTATE_NONE ],plExits); plExits = Cons([ 14, 17, RID_KOC_INN, 12, 7, ROTATE_NONE ],plExits); - propagate; } @@ -83,31 +82,30 @@ messages: Send(self,@CreateOrnObjFromList,#lObjlist=lObjCoords1); - send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=10,#new_col=14, - #fine_row=32,#fine_col=32); - send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=13,#new_col=14, - #fine_row=40,#fine_col=32); - send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=10,#new_col=18, - #fine_row=48,#fine_col=32); - send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=13,#new_col=18, - #fine_row=16,#fine_col=32); - send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=19,#new_col=26, - #fine_row=08,#fine_col=56); - send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=05,#new_col=26, - #fine_row=08,#fine_col=56); - send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=04,#new_col=15, - #fine_row=56,#fine_col=16); - - send(self,@NewHold,#what=Create(&Candle),#new_row=02,#new_col=11, - #fine_row=48,#fine_col=16); - - send(self,@NewHold,#what=Create(&KocatanBartender), - #new_row=19,#new_col=19,#fine_row=0,#fine_col=0, - #new_angle=ANGLE_EAST); + Send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=10,#new_col=14, + #fine_row=32,#fine_col=32); + Send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=13,#new_col=14, + #fine_row=40,#fine_col=32); + Send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=10,#new_col=18, + #fine_row=48,#fine_col=32); + Send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=13,#new_col=18, + #fine_row=16,#fine_col=32); + Send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=19,#new_col=26, + #fine_row=08,#fine_col=56); + Send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=05,#new_col=26, + #fine_row=08,#fine_col=56); + Send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=04,#new_col=15, + #fine_row=56,#fine_col=16); + + Send(self,@NewHold,#what=Create(&Candle),#new_row=02,#new_col=11, + #fine_row=48,#fine_col=16); + + Send(self,@NewHold,#what=Create(&KocatanBartender), + #new_row=19,#new_col=19,#fine_row=0,#fine_col=0, + #new_angle=ANGLE_EAST); propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/kocarm/koctower.kod b/kod/object/active/holder/room/kocarm/koctower.kod index 28748fe412..15b895ec35 100644 --- a/kod/object/active/holder/room/kocarm/koctower.kod +++ b/kod/object/active/holder/room/kocarm/koctower.kod @@ -20,15 +20,20 @@ resources: room_name_koctower = "The East Tower" koctower_music = song12.mp3 - koctowereast_guarddoor1 = "~kThe soldier says, \"You there, get away from that door.\"" - koctowereast_barracks = "The barracks are off limits to non-military personnel." - koctowereast_citadelgate = "A locked gate prevents you from entering The Citadel." - koctowereast_dungeons = "The door to the central dungeons is locked. You may not enter." - koctowereast_wall = "You are not authorized to go into the wall." - koctowereast_guarddoor2 = "~kThe soldier says, \"Hey, stay out of there.\"" + koctowereast_guarddoor1 = \ + "~kThe soldier says, \"You there, get away from that door.\"" + koctowereast_barracks = \ + "The barracks are off limits to non-military personnel." + koctowereast_citadelgate = \ + "A locked gate prevents you from entering The Citadel." + koctowereast_dungeons = \ + "The door to the central dungeons is locked. You may not enter." + koctowereast_wall = \ + "You are not authorized to go into the wall." + koctowereast_guarddoor2 = \ + "~kThe soldier says, \"Hey, stay out of there.\"" koctowereast_lockedgate = "The gate is securely locked." - classvars: vrName = room_name_koctower @@ -57,16 +62,21 @@ messages: { poGoodGuard = Create(&KocatanCaptainGood); poEvilGuard = Create(&KocatanCaptainEvil); + propagate; } Delete() { if poGoodGuard<>$ - { send(poGoodGuard,@delete); } - + { + Send(poGoodGuard,@Delete); + } + if poEvilGuard <> $ - { send(poEvilGuard,@delete); } + { + Send(poEvilGuard,@Delete); + } propagate; } @@ -77,35 +87,42 @@ messages: iHour = Send(SYS,@GetHour); - if iHour = 8 or iHour = 20 - { send(Self,@changeguards); } + if iHour = 8 OR iHour = 20 + { + Send(Self,@ChangeGuards); + } + propagate; } - + ChangeGuards() { - local i, each_obj; - for i in plActive + local i, each_obj; + + for i in plActive { - each_obj = Send(self,@HolderExtractObject,#data=i); - if isclass(each_obj,&KocatanCaptainEvil) - { - send(poEvilGuard,@newowner,#what=$); - Send(self,@NewHold,#what=poGoodGuard, - #new_row=12,#new_col=36,#fine_row=16,#fine_col=40); - return; - } - if isclass(each_obj,&KocatanCaptainGood) - { - send(poGoodGuard,@newowner,#what=$); - Send(self,@NewHold,#what=poEvilGuard, - #new_row=10,#new_col=36,#fine_row=24,#fine_col=40); - } + each_obj = Send(self,@HolderExtractObject,#data=i); + + if IsClass(each_obj,&KocatanCaptainEvil) + { + Send(poEvilGuard,@NewOwner,#what=$); + Send(self,@NewHold,#what=poGoodGuard, + #new_row=12,#new_col=36,#fine_row=16,#fine_col=40); + + return; + } + + if IsClass(each_obj,&KocatanCaptainGood) + { + Send(poGoodGuard,@NewOwner,#what=$); + Send(self,@NewHold,#what=poEvilGuard, + #new_row=10,#new_col=36,#fine_row=24,#fine_col=40); + } } + return; } - CreateStandardExits() { plExits = $; @@ -126,8 +143,7 @@ messages: plExits = Cons([ 16, 33, ROOM_LOCKED_DOOR, koctowereast_lockedgate],plExits); plExits = Cons([ 17, 33, ROOM_LOCKED_DOOR, koctowereast_lockedgate],plExits); - - %% to north town and KA5 + %% To north town and KA5 plExits = Cons([ 2, 41, RID_KA5, 44, 24, ROTATE_NONE ],plExits); plExits = Cons([ 2, 40, RID_KA5, 44, 24, ROTATE_NONE ],plExits); plExits = Cons([ 3, 41, RID_KA5, 44, 24, ROTATE_NONE ],plExits); @@ -137,69 +153,83 @@ messages: plExits = Cons([ 37, 4, RID_KOC_NORTH, 4, 45, ROTATE_NONE ],plExits); plExits = Cons([ 36, 3, RID_KOC_NORTH, 4, 45, ROTATE_NONE ],plExits); plExits = Cons([ 38, 5, RID_KOC_NORTH, 4, 45, ROTATE_NONE ],plExits); + propagate; } SomethingTryGo(what=$,row=$,col=$) { local i; - if ((row = 2) and ((col = 41) or (col = 40))) - or ((row = 3) and (col = 41)) + + if ((row = 2) + AND ((col = 41) OR (col = 40))) + OR ((row = 3) AND (col = 41)) { - for i in plActive - { - - if (isClass(first(i),&KocatanCaptainGood) - or isClass(first(i),&KocatanCaptainEvil)) - { - if send(first(i),@CanPass,#what=what) - { propagate; } %% someone bribed the evil guard. - return true; - } - } + for i in plActive + { + if (IsClass(First(i),&KocatanCaptainGood) + OR IsClass(First(i),&KocatanCaptainEvil)) + { + if Send(First(i),@CanPass,#what=what) + { + % Someone bribed the evil guard. + propagate; + } + + return true; + } + } } + propagate; } - + CreateStandardObjects() { local iHour,lObjCoords1; + lObjCoords1 = [ - [29,29,56,40,OO_BAG_OF_BEANS],[28,28,56,56,OO_BAG_OF_BEANS],[30,29,24,40,OO_BIG_BAG], - [36,26,48,08,OO_JUG],[18,16,16,32,OO_GREY_JUG],[10,26,48,08,OO_GREY_JUG], - [31,29,00,24,OO_barrel],[29,29,56,16,OO_barrel2],[27,28,48,24,OO_rice], + [29,29,56,40,OO_BAG_OF_BEANS],[28,28,56,56,OO_BAG_OF_BEANS], + [30,29,24,40,OO_BIG_BAG],[36,26,48,08,OO_JUG], + [18,16,16,32,OO_GREY_JUG],[10,26,48,08,OO_GREY_JUG], + [31,29,00,24,OO_barrel],[29,29,56,16,OO_barrel2], + [27,28,48,24,OO_rice], %[21,23,24,08,OO_lamp1],[21,26,24,00,OO_lamp1], [20,28,24,32,OO_tallurn],[06,32,24,40,OO_tallurn], [15,33,16,32,OO_bigurn],[16,35,24,16,OO_bigiron] ]; + Send(self,@CreateOrnObjFromList,#lObjlist=lObjCoords1); - send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=21,#new_col=23,#fine_row=24,#fine_col=08); - send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=21,#new_col=26,#fine_row=24,#fine_col=00); + Send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=21,#new_col=23, + #fine_row=24,#fine_col=08); + Send(self,@NewHold,#what=Create(&KocatanLamp),#new_row=21,#new_col=26, + #fine_row=24,#fine_col=00); - iHour = Send(SYS,@GetHour); + iHour = Send(SYS,@GetHour); - if iHour > 7 and iHour < 20 - { - Send(self,@NewHold,#what=poGoodGuard, - #new_row=12,#new_col=36,#fine_row=16,#fine_col=40); + if iHour > 7 and iHour < 20 + { + Send(self,@NewHold,#what=poGoodGuard, + #new_row=12,#new_col=36,#fine_row=16,#fine_col=40); } - else + else { Send(self,@NewHold,#what=poEvilGuard, - #new_row=10,#new_col=36,#fine_row=24,#fine_col=40); + #new_row=10,#new_col=36,#fine_row=24,#fine_col=40); } - Send(self,@NewHold,#what=Create(&KocatanSentry), - #new_row=21,#new_col=19,#fine_row=8,#fine_col=8); - Send(self,@NewHold,#what=Create(&KocatanSentry), - #new_row=14,#new_col=34,#fine_row=24,#fine_col=32); - Send(self,@NewHold,#what=Create(&KocatanSentry), - #new_row=10,#new_col=37,#fine_row=24,#fine_col=40); - Send(self,@NewHold,#what=Create(&KocatanSentry), - #new_row=20,#new_col=35,#fine_row=24,#fine_col=16); - - propagate; + + Send(self,@NewHold,#what=Create(&KocatanSentry), + #new_row=21,#new_col=19,#fine_row=8,#fine_col=8); + Send(self,@NewHold,#what=Create(&KocatanSentry), + #new_row=14,#new_col=34,#fine_row=24,#fine_col=32); + Send(self,@NewHold,#what=Create(&KocatanSentry), + #new_row=10,#new_col=37,#fine_row=24,#fine_col=40); + Send(self,@NewHold,#what=Create(&KocatanSentry), + #new_row=20,#new_col=35,#fine_row=24,#fine_col=16); + + propagate; } - + end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest.kod b/kod/object/active/holder/room/monsroom/kcforest.kod index a56f5c70b8..1b63c316f3 100644 --- a/kod/object/active/holder/room/monsroom/kcforest.kod +++ b/kod/object/active/holder/room/monsroom/kcforest.kod @@ -19,7 +19,7 @@ constants: classvars: viAvar_clan = AVARCLAN_PROMAGIC %% which avar clan controls this part of the jungle. - + properties: plItem_coords = $ @@ -29,14 +29,14 @@ messages: Constructor() { - send(self,@CreateJungleItemCoords); + Send(self,@CreateJungleItemCoords); propagate; } CreateJungleItemCoords() { - %% overwrite this. Do not propagate + % Overwrite this. Do not propagate. plItem_coords = $; return; @@ -50,14 +50,14 @@ messages: { propagate; } - + piItem_gen_counter = piItem_gen_counter - 1; if piItem_gen_counter <= 0 { bFound = FALSE; % Create an item - lChoose = nth(plItem_coords,random(1,length(plItem_coords))); - + lChoose = Nth(plItem_coords,Random(1,Length(plItem_coords))); + % Don't generate any of this item type if any exist already. for i in plPassive { @@ -72,11 +72,12 @@ messages: if NOT bFound { oItem = Create(first(lChoose)); - send(self,@newhold,#what=oItem,#new_row=nth(lChoose,2),#new_col=nth(lChoose,3)); + Send(self,@NewHold,#what=oItem,#new_row=Nth(lChoose,2), + #new_col=Nth(lChoose,3)); } - piItem_gen_counter = random(MIN_HOUR_COUNTER,MAX_HOUR_COUNTER); - } + piItem_gen_counter = Random(MIN_HOUR_COUNTER,MAX_HOUR_COUNTER); + } propagate; } @@ -86,7 +87,6 @@ messages: return viAvar_clan; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/ka0.kod b/kod/object/active/holder/room/monsroom/kcforest/ka0.kod index d99aa452d4..584c4ef4e2 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/ka0.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/ka0.kod @@ -24,7 +24,7 @@ constants: resources: - room_name_OutdoorsKA0 ="A dark, humid cavern" + room_name_OutdoorsKA0 = "A dark, humid cavern" room_OutdoorsKA0 = KA0.roo OutdoorsKA0_music = drgnfly.mp3 @@ -68,11 +68,11 @@ properties: poShrine = $ % Time the user has to get each item in one hour units. Admin adjustable. - piResetHours = 24 + piResetHours = 24 % Number of items users must bring. the last is the hard item. % piSteps + 1 is the shrine. - piSteps = 5 + piSteps = 5 ptInitPuzzleTimer = $ ptSetNextItemTimer = $ @@ -163,23 +163,23 @@ messages: CreateStandardObjects() { Send(self,@NewHold,#what=Create(&Firepit,#iSoundRadius=12), - #new_row=7,#new_col=6,#fine_row=16,#fine_col=32, - #new_angle=ANGLE_EAST); + #new_row=7,#new_col=6,#fine_row=16,#fine_col=32, + #new_angle=ANGLE_EAST); Send(self,@NewHold,#what=Create(&Firepit,#iSoundRadius=0), - #new_row=2,#new_col=11,#fine_row=0,#fine_col=48, - #new_angle=ANGLE_EAST); + #new_row=2,#new_col=11,#fine_row=0,#fine_col=48, + #new_angle=ANGLE_EAST); Send(self,@NewHold,#what=Create(&Firepit,#iSoundRadius=12), - #new_row=3,#new_col=14,#fine_row=16,#fine_col=16, - #new_angle=ANGLE_EAST); + #new_row=3,#new_col=14,#fine_row=16,#fine_col=16, + #new_angle=ANGLE_EAST); Send(self,@NewHold,#what=Create(&Firepit,#iSoundRadius=0), - #new_row=8,#new_col=10,#fine_row=32,#fine_col=0, - #new_angle=ANGLE_EAST); + #new_row=8,#new_col=10,#fine_row=32,#fine_col=0, + #new_angle=ANGLE_EAST); Send(self,@NewHold,#what=Create(&Firepit,#iSoundRadius=0), - #new_row=8,#new_col=13,#fine_row=16,#fine_col=48, - #new_angle=ANGLE_EAST); + #new_row=8,#new_col=13,#fine_row=16,#fine_col=48, + #new_angle=ANGLE_EAST); Send(self,@NewHold,#what=Create(&Firepit,#iSoundRadius=0), - #new_row=2,#new_col=7,#fine_row=48,#fine_col=0, - #new_angle=ANGLE_EAST); + #new_row=2,#new_col=7,#fine_row=48,#fine_col=0, + #new_angle=ANGLE_EAST); propagate; } @@ -206,15 +206,15 @@ messages: { local cItemNeeded, iItem, iRand; - iRand = random(1,2); + iRand = Random(1,2); if iRand = 1 { - cItemNeeded = Nth(plVentItems1,random(1,length(plVentItems1))); + cItemNeeded = Nth(plVentItems1,Random(1,length(plVentItems1))); } else { - cItemNeeded = Nth(plVentItems2,random(1,length(plVentItems2))); + cItemNeeded = Nth(plVentItems2,Random(1,length(plVentItems2))); } return cItemNeeded; @@ -225,7 +225,7 @@ messages: % List of really pain in the ass items. local cItemNeeded; - cItemNeeded = Nth(plHardVentItems,random(1,length(plHardVentItems))); + cItemNeeded = Nth(plHardVentItems,Random(1,length(plHardVentItems))); return cItemNeeded; } @@ -262,23 +262,22 @@ messages: } else { - if ((iRow > 3) AND (iRow < 6)) AND ((iCol > 1) AND (iCol < 4)) { if IsClass(what,GetClass(poItemNeeded)) { - Send(self,@Gotitem); + Send(self,@GotItem); Send(what,@Delete); Send(self,@SomeoneSaid,#type=SAY_MESSAGE,#what=self, - #string=Drop_correct_item_rsc,#parm1=send(what,@GetName)); + #string=Drop_correct_item_rsc,#parm1=Send(what,@GetName)); } else { Send(what,@Delete); Send(self,@SomeoneSaid,#type=SAY_MESSAGE,#what=self, #string=Drop_incorrect_item_rsc, - #parm1=send(what,@GetName)); + #parm1=Send(what,@GetName)); } } } @@ -288,15 +287,14 @@ messages: GotItem() { - piItemNumber = piItemNumber + 1; if poGhostItem <> $ { - post(poGhostitem,@Delete); + Post(poGhostitem,@Delete); } if ptInitPuzzleTimer = $ - { + { ptInitPuzzleTimer = CreateTimer(self,@InitPuzzleTimer, (piResetHours*HOUR*1000)); } @@ -324,7 +322,7 @@ messages: SetNextItemTimer() { Send(self,@SomeoneSaid,#type=SAY_MESSAGE,#what=self, - #string=new_item_appears_rsc); + #string=new_item_appears_rsc); ptSetNextItemTimer = $; Send(self,@SetNextItem); @@ -373,7 +371,7 @@ messages: PlaceShrine() { Send(self,@NewHold,#what=poShrine,#new_row=4, - #new_col=2,#fine_row=60,#fine_col=63); + #new_col=2,#fine_row=60,#fine_col=63); if ptInitPuzzleTimer = $ { @@ -388,7 +386,7 @@ messages: } Send(self,@SomeoneSaid,#type=SAY_MESSAGE,#what=self, - #string=Shrine_appears); + #string=Shrine_appears); return; } diff --git a/kod/object/active/holder/room/monsroom/kcforest/ka1.kod b/kod/object/active/holder/room/monsroom/kcforest/ka1.kod index 768fac3446..c86ff3bdca 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/ka1.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/ka1.kod @@ -67,7 +67,7 @@ messages: { plEdge_Exits = $; plExits = $; - plEdge_Exits = Cons([LEAVE_SOUTH, RID_KA2, 1, 33, ROTATE_NONE], plEdge_exits); + plEdge_Exits = Cons([LEAVE_SOUTH, RID_KA2, 1, 33, ROTATE_NONE], plEdge_exits); plEdge_Exits = Cons([LEAVE_EAST, RID_KB1, 16, 2, ROTATE_NONE], plEdge_exits); propagate; @@ -79,9 +79,10 @@ messages: if row = 13 AND col = 23 { - oRoom = send(SYS,@FindRoomByNum,#num=RID_KA0); - send(oRoom,@Newhold,#what=what,#new_row=5,#new_col=14,#new_angle=ANGLE_WEST); - send(what,@MsgSendUser,#message_rsc=KA1_GO_KA0); + oRoom = Send(SYS,@FindRoomByNum,#num=RID_KA0); + Send(oRoom,@NewHold,#what=what,#new_row=5,#new_col=14, + #new_angle=ANGLE_WEST); + Send(what,@MsgSendUser,#message_rsc=KA1_GO_KA0); return TRUE; } @@ -89,6 +90,5 @@ messages: propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/ka2.kod b/kod/object/active/holder/room/monsroom/kcforest/ka2.kod index 69fe9b7ffb..d2e1cfe376 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/ka2.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/ka2.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKA2 ="The Jungle Cliffs" + room_name_OutdoorsKA2 = "The Jungle Cliffs" room_OutdoorsKA2 = KA2.roo OutdoorsKA2_music = avarwar.mp3 @@ -63,23 +63,23 @@ messages: } CreateJungleItemCoords() - { - plItem_coords = [ [&RainbowFern,45,51], [&RainbowFern,17,5], [&RainbowFern,30,32] ]; + { + plItem_coords = [ [&RainbowFern,45,51], [&RainbowFern,17,5], + [&RainbowFern,30,32] ]; % Do not propagate. return; } CreateStandardExits() - { + { plEdge_Exits = $; plEdge_Exits = Cons([LEAVE_NORTH, RID_KA1, 79, 19, ROTATE_NONE], plEdge_exits); - plEdge_Exits = Cons([LEAVE_SOUTH, RID_KA3, 1, 50, ROTATE_NONE], plEdge_exits); + plEdge_Exits = Cons([LEAVE_SOUTH, RID_KA3, 1, 50, ROTATE_NONE], plEdge_exits); plEdge_Exits = Cons([LEAVE_EAST, RID_KB1, 36, 1, ROTATE_NONE], plEdge_exits); propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/ka3.kod b/kod/object/active/holder/room/monsroom/kcforest/ka3.kod index bde163ba3c..89b7b0de56 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/ka3.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/ka3.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKA3 ="A notch in the jungle" + room_name_OutdoorsKA3 = "A notch in the jungle" room_OutdoorsKA3 = KA3.roo OutdoorsKA3_music = avarwar.mp3 @@ -60,7 +60,7 @@ messages: } CreateJungleItemCoords() - { + { plItem_coords = [ [&FireSand,24,8], [&FireSand,21,11] ]; % Do not propagate @@ -69,16 +69,16 @@ messages: CreateStandardExits() { - % teleport to Bowmaker: + % Teleport to Bowmaker: plExits = Cons([ 28, 12, RID_JUNGLE_BOWMAKER_HUT, 6, 5, ROTATE_NONE ],plExits); plExits = Cons([ 27, 12, RID_JUNGLE_BOWMAKER_HUT, 6, 5, ROTATE_NONE ],plExits); - + plEdge_Exits = $; - % teleport in to 6,39 + % Teleport in to 6,39 plEdge_Exits = Cons([LEAVE_NORTH, RID_KA2, 56, 30, ROTATE_NONE], plEdge_exits); - % teleport in to 71,48 - plEdge_Exits = Cons([LEAVE_SOUTH, RID_KA4, 1, 26, ROTATE_NONE], plEdge_exits); + % Teleport in to 71,48 + plEdge_Exits = Cons([LEAVE_SOUTH, RID_KA4, 1, 26, ROTATE_NONE], plEdge_exits); propagate; } @@ -86,11 +86,11 @@ messages: CreateStandardObjects() { Send(self,@NewHold,#what=Create(&SmokeColumn), - #new_row=23,#new_col=15,#fine_row=56,#fine_col=32,#new_angle=ANGLE_EAST); + #new_row=23,#new_col=15,#fine_row=56,#fine_col=32, + #new_angle=ANGLE_EAST); propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/ka4.kod b/kod/object/active/holder/room/monsroom/kcforest/ka4.kod index c761af0355..6c413ebf87 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/ka4.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/ka4.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKA4 ="Into the Jungle" + room_name_OutdoorsKA4 = "Into the Jungle" room_OutdoorsKA4 = KA4.roo OutdoorsKA4_music = avarwar.mp3 @@ -60,8 +60,9 @@ messages: } CreateJungleItemCoords() - { - plItem_coords = [ [&RainbowFern,23,5], [&RainbowFern,11,3], [&RainbowFern,7,47] ]; + { + plItem_coords = [ [&RainbowFern,23,5], [&RainbowFern,11,3], + [&RainbowFern,7,47] ]; % Do not propagate return; @@ -71,12 +72,13 @@ messages: CreateStandardExits() { plEdge_Exits = $; - plEdge_Exits = Cons([LEAVE_NORTH, RID_KA3, 73, 49, ROTATE_NONE, NO_OTHER_CONDITIONS], plEdge_exits); - plEdge_Exits = Cons([LEAVE_SOUTH, RID_KA5, 1, 24, ROTATE_NONE, NO_OTHER_CONDITIONS], plEdge_exits); + plEdge_Exits = Cons([LEAVE_NORTH, RID_KA3, 73, 49, ROTATE_NONE, + NO_OTHER_CONDITIONS], plEdge_exits); + plEdge_Exits = Cons([LEAVE_SOUTH, RID_KA5, 1, 24, ROTATE_NONE, + NO_OTHER_CONDITIONS], plEdge_exits); propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/ka5.kod b/kod/object/active/holder/room/monsroom/kcforest/ka5.kod index abf075059d..1be1945fad 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/ka5.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/ka5.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKA5 ="Outside the Guard Tower" + room_name_OutdoorsKA5 = "Outside the Guard Tower" room_OutdoorsKA5 = KA5.roo OutdoorsKA5_music = avarwar.mp3 @@ -60,7 +60,7 @@ messages: } CreateJungleItemCoords() - { + { %% do not propagate plItem_coords = [ [&RainbowFern,13,51], [&RainbowFern,12,5], [&RainbowFern,25,42], [&FireSand,46,31], [&FireSand,49,28] @@ -73,9 +73,12 @@ messages: CreateStandardExits() { plEdge_Exits = $; - plEdge_Exits = Cons([LEAVE_NORTH, RID_KA4, 49, 15, ROTATE_NONE], plEdge_exits); - plEdge_Exits = Cons([LEAVE_EAST, RID_KB4, 39, 1, ROTATE_NONE, ROW_IS_LESS_THAN,20], plEdge_exits); - plEdge_Exits = Cons([LEAVE_EAST, RID_KB5, 16, 1, ROTATE_NONE, ROW_IS_GREATER_THAN,20], plEdge_exits); + plEdge_Exits = Cons([LEAVE_NORTH, RID_KA4, 49, 15, ROTATE_NONE], + plEdge_exits); + plEdge_Exits = Cons([LEAVE_EAST, RID_KB4, 39, 1, ROTATE_NONE, + ROW_IS_LESS_THAN,20], plEdge_exits); + plEdge_Exits = Cons([LEAVE_EAST, RID_KB5, 16, 1, ROTATE_NONE, + ROW_IS_GREATER_THAN,20], plEdge_exits); plExits = Cons([ 45, 23, RID_KOC_GUARDTOWER_EAST, 3, 40, ROTATE_NONE ],plExits); plExits = Cons([ 45, 24, RID_KOC_GUARDTOWER_EAST, 3, 40, ROTATE_NONE ],plExits); @@ -87,14 +90,14 @@ messages: GetClan() { - if random(1,2) = 1 + if Random(1,2) = 1 { return AVARCLAN_PROMAGIC; } - + return AVARCLAN_ANTIMAGIC; } - + CreateStandardObjects() { Send(self,@NewHold,#what=Create(&OrnamentalObject,#type=OO_TREE3), @@ -115,6 +118,5 @@ messages: propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/kb1.kod b/kod/object/active/holder/room/monsroom/kcforest/kb1.kod index cc3ac46b21..8e7935868f 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kb1.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kb1.kod @@ -16,7 +16,7 @@ constants: resources: room_OutdoorsKB1 = KB1.roo - room_name_OutdoorsKB1 ="The Cliffs" + room_name_OutdoorsKB1 = "The Cliffs" OutdoorsKB1_music = drgnfly.mp3 classvars: @@ -59,8 +59,9 @@ messages: } CreateJungleItemCoords() - { - plItem_coords = [ [&RainbowFern,22,47], [&RainbowFern,19,10], [&RainbowFern,41,21], + { + plItem_coords = [ [&RainbowFern,22,47], [&RainbowFern,19,10], + [&RainbowFern,41,21], [&FireSand,6,17], [&FireSand,6,39] ]; @@ -71,10 +72,14 @@ messages: CreateStandardExits() { plEdge_Exits = $; - plEdge_Exits = Cons([LEAVE_WEST, RID_KA1, 50, 62, ROTATE_NONE, ROW_IS_LESS_THAN,20], plEdge_exits); - plEdge_Exits = Cons([LEAVE_WEST, RID_KA2, 15, 58, ROTATE_NONE, ROW_IS_GREATER_THAN,20], plEdge_exits); - plEdge_Exits = Cons([LEAVE_EAST, RID_KC1, 28, 1, ROTATE_NONE], plEdge_exits); - plEdge_Exits = Cons([LEAVE_SOUTH, RID_KB2, 1, 25, ROTATE_NONE], plEdge_exits); + plEdge_Exits = Cons([LEAVE_WEST, RID_KA1, 50, 62, ROTATE_NONE, + ROW_IS_LESS_THAN,20], plEdge_exits); + plEdge_Exits = Cons([LEAVE_WEST, RID_KA2, 15, 58, ROTATE_NONE, + ROW_IS_GREATER_THAN,20], plEdge_exits); + plEdge_Exits = Cons([LEAVE_EAST, RID_KC1, 28, 1, ROTATE_NONE], + plEdge_exits); + plEdge_Exits = Cons([LEAVE_SOUTH, RID_KB2, 1, 25, ROTATE_NONE], + plEdge_exits); propagate; } @@ -89,6 +94,5 @@ messages: propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/kb2.kod b/kod/object/active/holder/room/monsroom/kcforest/kb2.kod index 8f9f5d4ed8..723cce0d2b 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kb2.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kb2.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKB2 ="Headquarters for the Avar Warriors" + room_name_OutdoorsKB2 = "Headquarters for the Avar Warriors" room_OutdoorsKB2 = KB2.roo OutdoorsKB2_music = avarwar.mp3 @@ -53,15 +53,17 @@ messages: Constructed() { - plMonsters = [ [&Avar, 60], [&AvarShaman, 18], [&AvarChieftain, 7],[&Kriipa,15] ]; + plMonsters = [ [&Avar, 60], [&AvarShaman, 18], + [&AvarChieftain, 7],[&Kriipa,15] ]; plGenerators = [ [43,22], [39,25], [49,40], [59,24], [20,25], [38,48] ]; propagate; } CreateJungleItemCoords() - { - plItem_coords = [ [&RainbowFern,49,28], [&RainbowFern,42,18], [&RainbowFern,36,26] ]; + { + plItem_coords = [ [&RainbowFern,49,28], [&RainbowFern,42,18], + [&RainbowFern,36,26] ]; % Do not propagate return; @@ -94,11 +96,10 @@ messages: plEdge_Exits = $; plEdge_Exits = Cons([LEAVE_NORTH, RID_KB1, 49, 24, ROTATE_NONE], plEdge_exits); plEdge_Exits = Cons([LEAVE_EAST, RID_KC2, 20, 1, ROTATE_NONE], plEdge_exits); - plEdge_Exits = Cons([LEAVE_SOUTH, RID_KB3, 1, 21, ROTATE_NONE], plEdge_exits); + plEdge_Exits = Cons([LEAVE_SOUTH, RID_KB3, 1, 21, ROTATE_NONE], plEdge_exits); propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/kb3.kod b/kod/object/active/holder/room/monsroom/kcforest/kb3.kod index 2445c14f32..41dff8ce7b 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kb3.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kb3.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKB3 ="Camp of the Warrior Avars" + room_name_OutdoorsKB3 = "Camp of the Warrior Avars" room_OutdoorsKB3 = KB3.roo OutdoorsKB3_music = avarwar.mp3 @@ -52,8 +52,10 @@ messages: Constructed() { - plMonsters = [ [&Avar, 50], [&AvarShaman, 18], [&AvarChieftain, 5],[&Kriipa,27] ]; - plGenerators = [ [14,8], [15,23], [17,44], [29,47], [36,24], + plMonsters = [ [&Avar, 50], [&AvarShaman, 18], + [&AvarChieftain, 5],[&Kriipa,27] ]; + + plGenerators = [ [14,8], [15,23], [17,44], [29,47], [36,24], [36,16], [27,24] ]; @@ -61,8 +63,9 @@ messages: } CreateJungleItemCoords() - { - plItem_coords = [ [&RainbowFern,15,6], [&RainbowFern,39,15], [&RainbowFern,34,34] ]; + { + plItem_coords = [ [&RainbowFern,15,6], [&RainbowFern,39,15], + [&RainbowFern,34,34] ]; % Do not propagate return; @@ -103,14 +106,17 @@ messages: CreateStandardExits() { plEdge_Exits = $; - plEdge_Exits = Cons([LEAVE_NORTH, RID_KB2, 74, 20, ROTATE_NONE], plEdge_exits); - plEdge_Exits = Cons([LEAVE_EAST, RID_KC2, 44, 1, ROTATE_NONE, ROW_IS_LESS_THAN, 20], plEdge_exits); - plEdge_Exits = Cons([LEAVE_EAST, RID_KC3, 20, 1, ROTATE_NONE, ROW_IS_GREATER_THAN,20], plEdge_exits); - plEdge_Exits = Cons([LEAVE_SOUTH, RID_KB4, 1, 24, ROTATE_NONE], plEdge_exits); + plEdge_Exits = Cons([LEAVE_NORTH, RID_KB2, 74, 20, ROTATE_NONE], + plEdge_exits); + plEdge_Exits = Cons([LEAVE_EAST, RID_KC2, 44, 1, ROTATE_NONE, + ROW_IS_LESS_THAN, 20], plEdge_exits); + plEdge_Exits = Cons([LEAVE_EAST, RID_KC3, 20, 1, ROTATE_NONE, + ROW_IS_GREATER_THAN,20], plEdge_exits); + plEdge_Exits = Cons([LEAVE_SOUTH, RID_KB4, 1, 24, ROTATE_NONE], + plEdge_exits); propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/kb4.kod b/kod/object/active/holder/room/monsroom/kcforest/kb4.kod index f6c7185f07..3d21f1def5 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kb4.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kb4.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKB4 ="Path to the Ruins" + room_name_OutdoorsKB4 = "Path to the Ruins" room_OutdoorsKB4 = KB4.roo OutdoorsKB4_music = orcbeg.mp3 @@ -60,8 +60,9 @@ messages: } CreateJungleItemCoords() - { - plItem_coords = [ [&RainbowFern,42,39], [&RainbowFern,16,4], [&RainbowFern,7,13] ]; + { + plItem_coords = [ [&RainbowFern,42,39], [&RainbowFern,16,4], + [&RainbowFern,7,13] ]; % Do not propagate return; @@ -114,19 +115,20 @@ messages: plEdge_Exits = $; plEdge_Exits = Cons([LEAVE_NORTH, RID_KB3, 49, 27, ROTATE_NONE], plEdge_exits); plEdge_Exits = Cons([LEAVE_EAST, RID_KC3, 55,1 , ROTATE_NONE], plEdge_exits); - plEdge_Exits = Cons([LEAVE_WEST, RID_KA5, 4, 63, ROTATE_NONE], plEdge_exits); + plEdge_Exits = Cons([LEAVE_WEST, RID_KA5, 4, 63, ROTATE_NONE], plEdge_exits); propagate; } GetClan() { - if random(1,2) = 1 - { return AVARCLAN_PROMAGIC; } - + if Random(1,2) = 1 + { + return AVARCLAN_PROMAGIC; + } + return AVARCLAN_ANTIMAGIC; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/kb5.kod b/kod/object/active/holder/room/monsroom/kcforest/kb5.kod index 856faf42b9..9fc7776f06 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kb5.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kb5.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKB5 ="Into the Jungle" + room_name_OutdoorsKB5 = "Into the Jungle" room_OutdoorsKB5 = KB5.roo OutdoorsKB5_music = orcbeg.mp3 @@ -51,8 +51,9 @@ messages: CreateJungleItemCoords() - { - plItem_coords = [ [&RainbowFern,45,6], [&RainbowFern,37,44], [&RainbowFern,11,14] ]; + { + plItem_coords = [ [&RainbowFern,45,6], [&RainbowFern,37,44], + [&RainbowFern,11,14] ]; % Do not propagate return; @@ -69,7 +70,7 @@ messages: CreateStandardExits() { plEdge_Exits = $; - plEdge_Exits = Cons([LEAVE_WEST, RID_KA5, 26, 63, ROTATE_NONE], plEdge_exits); + plEdge_Exits = Cons([LEAVE_WEST, RID_KA5, 26, 63, ROTATE_NONE], plEdge_exits); plEdge_Exits = Cons([LEAVE_EAST, RID_KC5, 14, 1, ROTATE_NONE], plEdge_exits); propagate; @@ -105,6 +106,5 @@ messages: propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/kc1.kod b/kod/object/active/holder/room/monsroom/kcforest/kc1.kod index 2f5e70353f..2ae05747fd 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kc1.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kc1.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKC1 ="The Chasm" + room_name_OutdoorsKC1 = "The Chasm" room_OutdoorsKC1 = KC1.roo OutdoorsKC1_music = avarwar.mp3 @@ -60,7 +60,7 @@ messages: } CreateJungleItemCoords() - { + { plItem_coords = [ [&FireSand,19,45], [&FireSand,24,14] ]; % Do not propagate @@ -70,7 +70,7 @@ messages: CreateStandardExits() { plEdge_Exits = $; - plEdge_Exits = Cons([LEAVE_WEST, RID_KB1, 22, 49, ROTATE_NONE], plEdge_exits); + plEdge_Exits = Cons([LEAVE_WEST, RID_KB1, 22, 49, ROTATE_NONE], plEdge_exits); plEdge_Exits = Cons([LEAVE_EAST, RID_KD1, 26, 1, ROTATE_NONE], plEdge_exits); propagate; @@ -88,6 +88,5 @@ messages: propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/kc2.kod b/kod/object/active/holder/room/monsroom/kcforest/kc2.kod index 3fb0804457..215e53568b 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kc2.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kc2.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKC2 ="Turf of the Warrior Avars" + room_name_OutdoorsKC2 = "Turf of the Warrior Avars" room_OutdoorsKC2 = KC2.roo OutdoorsKC2_music = avarwar.mp3 @@ -63,7 +63,8 @@ messages: CreateJungleItemCoords() { - plItem_coords = [ [&RainbowFern,25,20], [&RainbowFern,37,20], [&RainbowFern,10,48] ]; + plItem_coords = [ [&RainbowFern,25,20], [&RainbowFern,37,20], + [&RainbowFern,10,48] ]; % Do not propagate return; @@ -102,7 +103,7 @@ messages: Send(self,@NewHold,#what=Create(&OrnamentalObject,#type=OO_TREE2), #new_row=33,#new_col=15,#fine_row=32,#fine_col=32,#angle=ANGLE_EAST); Send(self,@NewHold,#what=Create(&OrnamentalObject,#type=OO_TREE2), - #new_row=36,#new_col=18,#fine_row=32,#fine_col=32,#angle=ANGLE_EAST); + #new_row=36,#new_col=18,#fine_row=32,#fine_col=32,#angle=ANGLE_EAST); propagate; } @@ -110,13 +111,15 @@ messages: CreateStandardExits() { plEdge_Exits = $; - plEdge_Exits = Cons([LEAVE_WEST, RID_KB2, 37, 56, ROTATE_NONE, ROW_IS_LESS_THAN, 35], plEdge_exits); - plEdge_Exits = Cons([LEAVE_WEST, RID_KB3, 8, 49, ROTATE_NONE, ROW_IS_GREATER_THAN, 35], plEdge_exits); - plEdge_Exits = Cons([LEAVE_SOUTH, RID_KC3, 1, 36, ROTATE_NONE, NO_OTHER_CONDITIONS], plEdge_exits); + plEdge_Exits = Cons([LEAVE_WEST, RID_KB2, 37, 56, ROTATE_NONE, + ROW_IS_LESS_THAN, 35], plEdge_exits); + plEdge_Exits = Cons([LEAVE_WEST, RID_KB3, 8, 49, ROTATE_NONE, + ROW_IS_GREATER_THAN, 35], plEdge_exits); + plEdge_Exits = Cons([LEAVE_SOUTH, RID_KC3, 1, 36, ROTATE_NONE, + NO_OTHER_CONDITIONS], plEdge_exits); propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/kc3.kod b/kod/object/active/holder/room/monsroom/kcforest/kc3.kod index 700585702a..6344757781 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kc3.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kc3.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKC3 ="Ruins of the Riija Temple" + room_name_OutdoorsKC3 = "Ruins of the Riija Temple" room_OutdoorsKC3 = KC3.roo OutdoorsKC3_music = orcbeg.mp3 @@ -62,12 +62,18 @@ messages: CreateStandardExits() { plEdge_Exits = $; - plEdge_Exits = Cons([LEAVE_NORTH, RID_KC2, 49, 18, ROTATE_NONE], plEdge_exits); - plEdge_Exits = Cons([LEAVE_WEST, RID_KB3, 25, 49, ROTATE_NONE, ROW_IS_LESS_THAN, 35], plEdge_exits); - plEdge_Exits = Cons([LEAVE_WEST, RID_KB4, 11, 49, ROTATE_NONE, ROW_IS_GREATER_THAN, 35], plEdge_exits); - plEdge_Exits = Cons([LEAVE_SOUTH, RID_KC4, 1, 39, ROTATE_NONE], plEdge_exits); - plEdge_Exits = Cons([LEAVE_EAST, RID_KD2, 30, 1, ROTATE_NONE, ROW_IS_LESS_THAN, 20], plEdge_exits); - plEdge_Exits = Cons([LEAVE_EAST, RID_KD3, 33, 1, ROTATE_NONE, ROW_IS_GREATER_THAN, 20], plEdge_exits); + plEdge_Exits = Cons([LEAVE_NORTH, RID_KC2, 49, 18, ROTATE_NONE], + plEdge_exits); + plEdge_Exits = Cons([LEAVE_WEST, RID_KB3, 25, 49, ROTATE_NONE, + ROW_IS_LESS_THAN, 35], plEdge_exits); + plEdge_Exits = Cons([LEAVE_WEST, RID_KB4, 11, 49, ROTATE_NONE, + ROW_IS_GREATER_THAN, 35], plEdge_exits); + plEdge_Exits = Cons([LEAVE_SOUTH, RID_KC4, 1, 39, ROTATE_NONE], + plEdge_exits); + plEdge_Exits = Cons([LEAVE_EAST, RID_KD2, 30, 1, ROTATE_NONE, + ROW_IS_LESS_THAN, 20], plEdge_exits); + plEdge_Exits = Cons([LEAVE_EAST, RID_KD3, 33, 1, ROTATE_NONE, + ROW_IS_GREATER_THAN, 20], plEdge_exits); propagate; } @@ -114,16 +120,17 @@ messages: #new_row=12,#new_col=25,#fine_row=32,#fine_col=32,#angle=ANGLE_EAST); propagate; - } - + } + GetClan() { - if random(1,2) = 1 - { return AVARCLAN_PROMAGIC; } - + if Random(1,2) = 1 + { + return AVARCLAN_PROMAGIC; + } + return AVARCLAN_ANTIMAGIC; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/kc4.kod b/kod/object/active/holder/room/monsroom/kcforest/kc4.kod index b7717b3183..0f321275af 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kc4.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kc4.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKC4 ="Origin of the Kriipa" + room_name_OutdoorsKC4 = "Origin of the Kriipa" room_OutdoorsKC4 = KC4.roo OutdoorsKC4_music = orcbeg.mp3 @@ -58,8 +58,9 @@ messages: } CreateJungleItemCoords() - { - plItem_coords = [ [&RainbowFern,50,4], [&RainbowFern,24,6], [&RainbowFern,35,38] ]; + { + plItem_coords = [ [&RainbowFern,50,4], [&RainbowFern,24,6], + [&RainbowFern,35,38] ]; % Do not propagate return; @@ -68,8 +69,10 @@ messages: CreateStandardExits() { plEdge_Exits = $; - plEdge_Exits = Cons([LEAVE_NORTH, RID_KC3, 69, 38, ROTATE_NONE], plEdge_exits); - plEdge_Exits = Cons([LEAVE_SOUTH, RID_KC5, 1, 23, ROTATE_NONE], plEdge_exits); + plEdge_Exits = Cons([LEAVE_NORTH, RID_KC3, 69, 38, ROTATE_NONE], + plEdge_exits); + plEdge_Exits = Cons([LEAVE_SOUTH, RID_KC5, 1, 23, ROTATE_NONE], + plEdge_exits); propagate; } @@ -107,19 +110,20 @@ messages: propagate; } - + GetClan() { - if random(1,2) = 1 + if Random(1,2) = 1 { return AVARCLAN_PROMAGIC; } - + return AVARCLAN_ANTIMAGIC; } ModifyChanceToImprove(who=$,oSpellSkill=$,chance=0) - "This takes a spell/skill that who is trying to advance and modifies the improve_chance." + "This takes a spell/skill that who is trying to advance and " + "modifies the improve_chance." { % Penalize skills because there's an obvious chokepoint here. if oSpellSkill <> $ @@ -127,10 +131,9 @@ messages: { return (chance / 10); } - + return chance; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/kc5.kod b/kod/object/active/holder/room/monsroom/kcforest/kc5.kod index b2ee1fbd6e..d4ca410c36 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kc5.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kc5.kod @@ -18,7 +18,7 @@ constants: resources: - room_name_OutdoorsKC5 ="Outside the Mad Scientist's Hut" + room_name_OutdoorsKC5 = "Outside the Mad Scientist's Hut" room_OutdoorsKC5 = KC5.roo OutdoorsKC5_music = madsci.mp3 @@ -68,7 +68,7 @@ messages: CreateJungleItemCoords() { - plItem_coords = [ [&FireSand,24,45], + plItem_coords = [ [&FireSand,24,45], [&FireSand,17,36] ]; @@ -79,25 +79,30 @@ messages: CreateStandardExits() { plEdge_Exits = $; - plEdge_Exits = Cons([LEAVE_NORTH, RID_KC4, 75, 26, ROTATE_NONE], plEdge_exits); - plEdge_Exits = Cons([LEAVE_WEST, RID_KB5, 6, 49, ROTATE_NONE], plEdge_exits); + plEdge_Exits = Cons([LEAVE_NORTH, RID_KC4, 75, 26, ROTATE_NONE], + plEdge_exits); + plEdge_Exits = Cons([LEAVE_WEST, RID_KB5, 6, 49, ROTATE_NONE], + plEdge_exits); plExits = $; - plExits = Cons([ 31, 23, RID_MAD_SCIENTIST_HUT, 4, 3, ROTATE_NONE],plExits); - plExits = Cons([ 32, 23, RID_MAD_SCIENTIST_HUT, 4, 3, ROTATE_NONE ],plExits); - plExits = Cons([ 35, 30, RID_MAD_SCIENTIST_HUT, 6, 7, ROTATE_NONE ],plExits); + plExits = Cons([ 31, 23, RID_MAD_SCIENTIST_HUT, 4, 3, ROTATE_NONE], + plExits); + plExits = Cons([ 32, 23, RID_MAD_SCIENTIST_HUT, 4, 3, ROTATE_NONE ], + plExits); + plExits = Cons([ 35, 30, RID_MAD_SCIENTIST_HUT, 6, 7, ROTATE_NONE ], + plExits); propagate; } - - NewHold(what = $, new_row = $, new_col = $) + + NewHold(what = $,new_row = $,new_col = $) { local oMadScientist; if what <> $ AND new_row <> $ AND new_col <> $ - AND isClass(what,&DragonFlyQueen) + AND IsClass(what,&DragonFlyQueen) { if Send(self,@InPen,#iRow=new_row,#iCol=new_col) AND Send(what,@GetMaster) = $ @@ -107,21 +112,21 @@ messages: Send(what,@SetMaster,#oMaster=oMadScientist); } - + Post(self,@CapQueens); } - + propagate; } AddNewQueenToPen(oQueen = $) "Called by quest nodes to add queens to the pen." { - return Send(self,@NewHold,#what=oQueen,#new_row=random(32,38), - #new_col=random(32,35)); + return Send(self,@NewHold,#what=oQueen,#new_row=Random(32,38), + #new_col=Random(32,35)); } - InPen(iRow = $, iCol = $) + InPen(iRow = $,iCol = $) { if iRow = $ OR iCol = $ { @@ -132,7 +137,7 @@ messages: { return TRUE; } - + return FALSE; } @@ -140,9 +145,10 @@ messages: { local iNumDel, i, oObject; - iNumDel = Send(self,@CountHoldingHowMany,#class=&DragonFlyQueen) - MAX_QUEENS; + iNumDel = Send(self,@CountHoldingHowMany,#class=&DragonFlyQueen) + - MAX_QUEENS; - % delete ones inside the pen first + % Delete ones inside the pen first. for i in plActive { if iNumDel <= 0 @@ -152,34 +158,34 @@ messages: oObject = Send(self,@HolderExtractObject,#data=i); - if isClass(oObject,&DragonFlyQueen) - AND Send(self,@InPen,#iRow=Send(oObject,@GetRow),#iCol=Send(oObject,@GetCol)) + if IsClass(oObject,&DragonFlyQueen) + AND Send(self,@InPen,#iRow=Send(oObject,@GetRow), + #iCol=Send(oObject,@GetCol)) { iNumDel = iNumDel - 1; Send(oObject,@Delete); } } - % then delete ones outside the pen + % Then delete ones outside the pen. for i in plActive { if iNumDel <= 0 { break; } - + oObject = Send(self,@HolderExtractObject,#data=i); - if isClass(oObject,&DragonFlyQueen) + if IsClass(oObject,&DragonFlyQueen) { iNumDel = iNumDel - 1; Send(oObject,@Delete); } } - + return; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/kd1.kod b/kod/object/active/holder/room/monsroom/kcforest/kd1.kod index dca96d5bb7..0aacf1c614 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kd1.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kd1.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKD1 ="Lair of the Bone Priestess" + room_name_OutdoorsKD1 = "Lair of the Bone Priestess" room_OutdoorsKD1 = KD1.roo OutdoorsKD1_music = boneprst.mp3 @@ -27,8 +27,8 @@ classvars: viTeleport_row = 32 viTeleport_col = 50 viTerrain_type = TERRAIN_JUNGLE | TERRAIN_BEACH | TERRAIN_MOUNTAIN - - viAvar_clan = AVARCLAN_BONE_FACTION + + viAvar_clan = AVARCLAN_BONE_FACTION properties: @@ -61,9 +61,10 @@ messages: CreateJungleItemCoords() { - plItem_coords = [ [&RainbowFern,30,54], [&rainbowfern,43,31], [&rainbowfern,12,47], - [&FireSand,12,21], [&FireSand,10,46] - ]; + plItem_coords = [ [&RainbowFern,30,54], [&RainbowFern,43,31], + [&RainbowFern,12,47], + [&FireSand,12,21], [&FireSand,10,46] + ]; % Do not propagate return; @@ -72,7 +73,8 @@ messages: CreateStandardExits() { plEdge_Exits = $; - plEdge_Exits = Cons([LEAVE_WeST, RID_KC1, 27, 71, ROTATE_NONE], plEdge_exits); + plEdge_Exits = Cons([LEAVE_WeST, RID_KC1, 27, 71, ROTATE_NONE], + plEdge_exits); propagate; } @@ -96,6 +98,5 @@ messages: propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/kd2.kod b/kod/object/active/holder/room/monsroom/kcforest/kd2.kod index 2014a191d6..d0ee445511 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kd2.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kd2.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKD2 ="Territory of the Noble Avars" + room_name_OutdoorsKD2 = "Territory of the Noble Avars" room_OutdoorsKD2 = KD2.roo OutdoorsKD2_music = boneprst.mp3 @@ -94,15 +94,18 @@ messages: CreateStandardExits() { plEdge_Exits = $; - plEdge_Exits = Cons([LEAVE_EAST, RID_KE1, 65, 1, ROTATE_NONE, ROW_IS_LESS_THAN,17 ], plEdge_exits); - plEdge_Exits = Cons([LEAVE_EAST, RID_KE2, 33, 1, ROTATE_NONE, ROW_IS_GREATER_THAN,17 ], plEdge_exits); - - plEdge_Exits = Cons([LEAVE_WEST, RID_KC3, 9, 69, ROTATE_NONE ], plEdge_exits); - plEdge_Exits = Cons([LEAVE_SOUTH, RID_KD3 , 1, 37, ROTATE_NONE ], plEdge_exits); + plEdge_Exits = Cons([LEAVE_EAST, RID_KE1, 65, 1, ROTATE_NONE, + ROW_IS_LESS_THAN,17 ], plEdge_exits); + plEdge_Exits = Cons([LEAVE_EAST, RID_KE2, 33, 1, ROTATE_NONE, + ROW_IS_GREATER_THAN,17 ], plEdge_exits); + + plEdge_Exits = Cons([LEAVE_WEST, RID_KC3, 9, 69, ROTATE_NONE ], + plEdge_exits); + plEdge_Exits = Cons([LEAVE_SOUTH, RID_KD3 , 1, 37, ROTATE_NONE ], + plEdge_exits); propagate; } - - + end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/kd3.kod b/kod/object/active/holder/room/monsroom/kcforest/kd3.kod index 5262151be9..4973f8dfce 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kd3.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kd3.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKD3 ="Deep in the Jungle" + room_name_OutdoorsKD3 = "Deep in the Jungle" room_OutdoorsKD3 = KD3.roo OutdoorsKD3_music = boneprst.mp3 @@ -123,6 +123,5 @@ messages: propagate; } - end -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/kd4.kod b/kod/object/active/holder/room/monsroom/kcforest/kd4.kod index 6e40bf52ea..2c10ffe545 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kd4.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kd4.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKD4 ="The Clearing of the Trading Post" + room_name_OutdoorsKD4 = "The Clearing of the Trading Post" room_OutdoorsKD4 = KD4.roo OutdoorsKD4_music = boneprst.mp3 @@ -55,7 +55,7 @@ messages: Constructed() { - plMonsters = [[ &Avar, 80], [&AvarShaman, 10], [&AvarChieftain,10]]; + plMonsters = [[ &Avar, 80], [&AvarShaman, 10], [&AvarChieftain,10]]; plGenerators = [ [16,21], [14,36], [13,58], [50,45], [43,17] ]; propagate; @@ -63,7 +63,8 @@ messages: CreateJungleItemCoords() { - plItem_coords = [ [&RainbowFern,20,4], [&RainbowFern,54,44], [&RainbowFern,10,62] ]; + plItem_coords = [ [&RainbowFern,20,4], [&RainbowFern,54,44], + [&RainbowFern,10,62] ]; % Do not propagate return; @@ -72,7 +73,7 @@ messages: CreateStandardExits() { plExits = $; - + plExits = Cons([ 24, 38, ROOM_LOCKED_DOOR, OutdoorsKD4_outbuilding_locked ],plExits); plExits = Cons([ 25, 38, ROOM_LOCKED_DOOR, OutdoorsKD4_outbuilding_locked ],plExits); plExits = Cons([ 39, 41, ROOM_LOCKED_DOOR, OutdoorsKD4_smokehouse_locked ],plExits); @@ -80,18 +81,18 @@ messages: plExits = Cons([ 32, 33, ROOM_LOCKED_DOOR, OutdoorsKD4_guardshack_locked ],plExits); plExits = Cons([ 33, 33, ROOM_LOCKED_DOOR, OutdoorsKD4_guardshack_locked ],plExits); - % teleport to tpost2: + % Teleport to tpost2: plExits = Cons([ 33, 42, RID_JUNGLE_TRADING_POST_CELLAR, 06, 03, ROTATE_NONE ],plExits); plExits = Cons([ 34, 42, RID_JUNGLE_TRADING_POST_CELLAR, 06, 03, ROTATE_NONE ],plExits); - % teleport to tpost1 (front door): + % Teleport to tpost1 (front door): plExits = Cons([ 30, 39, RID_JUNGLE_TRADING_POST, 05, 03, ROTATE_NONE ],plExits); plExits = Cons([ 31, 39, RID_JUNGLE_TRADING_POST, 05, 03, ROTATE_NONE ],plExits); plExits = Cons([ 30, 40, RID_JUNGLE_TRADING_POST, 05, 03, ROTATE_NONE ],plExits); plExits = Cons([ 31, 40, RID_JUNGLE_TRADING_POST, 05, 03, ROTATE_NONE ],plExits); - % teleport to tpost1 (lower right door): + % Teleport to tpost1 (lower right door): plExits = Cons([ 37, 49, RID_JUNGLE_TRADING_POST, 12, 13, ROTATE_NONE ],plExits); plExits = Cons([ 38, 49, RID_JUNGLE_TRADING_POST, 12, 13, ROTATE_NONE ],plExits); - % teleport to tpost1 (upper right door): + % Teleport to tpost1 (upper right door): plExits = Cons([ 28, 49, RID_JUNGLE_TRADING_POST, 03, 13, ROTATE_NONE ],plExits); plExits = Cons([ 27, 49, RID_JUNGLE_TRADING_POST, 03, 13, ROTATE_NONE ],plExits); @@ -101,7 +102,6 @@ messages: propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/ke2.kod b/kod/object/active/holder/room/monsroom/kcforest/ke2.kod index 735b4fcca8..5de790a590 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/ke2.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/ke2.kod @@ -16,7 +16,7 @@ constants: resources: - room_name_OutdoorsKE2 ="Headquarters of the Noble Avars" + room_name_OutdoorsKE2 = "Headquarters of the Noble Avars" room_OutdoorsKE2 = KE2.roo OutdoorsKE2_music = avarwar.mp3 @@ -60,8 +60,9 @@ messages: } CreateJungleItemCoords() - { - plItem_coords = [ [&RainbowFern,44,35], [&rainbowfern,23,57], [&rainbowfern,52,13]]; + { + plItem_coords = [ [&RainbowFern,44,35], [&RainbowFern,23,57], + [&RainbowFern,52,13]]; % Do not propagate return; @@ -70,12 +71,13 @@ messages: CreateStandardExits() { plEdge_Exits = $; - plEdge_Exits = Cons([LEAVE_NORTH, RID_KE1, 68, 47, ROTATE_NONE], plEdge_exits); - plEdge_Exits = Cons([LEAVE_WEST, RID_KD2, 20, 69, ROTATE_NONE], plEdge_exits); + plEdge_Exits = Cons([LEAVE_NORTH, RID_KE1, 68, 47, ROTATE_NONE], + plEdge_exits); + plEdge_Exits = Cons([LEAVE_WEST, RID_KD2, 20, 69, ROTATE_NONE], + plEdge_exits); propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/ke4.kod b/kod/object/active/holder/room/monsroom/kcforest/ke4.kod index b22223e20f..72654487b2 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/ke4.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/ke4.kod @@ -21,7 +21,7 @@ constants: % This is the absolute value needed before we give the node. NODE_VALUE_NEEDED = 2000 - % The appropriate values for slaughting Avars. + % The appropriate values for slaughtering Avars. AVAR_VALUE = -150 AVAR_CHIEFTAIN_VALUE = -200 AVAR_SHAMAN_VALUE = -250 @@ -115,7 +115,7 @@ messages: Constructed() { - plMonsters = [ [&Avar, 40], [&AvarChieftain, 35], [&Avarshaman,25] ]; + plMonsters = [ [&Avar, 40], [&AvarChieftain, 35], [&Avarshaman,25] ]; plGenerators = [ [13,54], [20,39], [34,39], [44,37], [53,46], [53,56], [46,66], [33,71], [22,67] ]; @@ -138,7 +138,7 @@ messages: DeleteTimer(ptNodeDisappear); ptNodeDisappear = $; - } + } propagate; } @@ -146,18 +146,19 @@ messages: CreateStandardExits() { plEdge_Exits = $; - plEdge_Exits = Cons([LEAVE_WEST, RID_KD4, 33, 65, ROTATE_NONE], plEdge_exits); + plEdge_Exits = Cons([LEAVE_WEST,RID_KD4,33,65,ROTATE_NONE], + plEdge_exits); propagate; } - + StandardLeaveDir(what = $,dir = $,pos = $,new_room_num = $) - { + { if dir = LEAVE_NORTH OR dir = LEAVE_SOUTH OR dir = LEAVE_EAST { - if isClass(what,&user) + if IsClass(what,&user) { if piCount > 20 { @@ -171,7 +172,7 @@ messages: } } } - + propagate; } @@ -190,7 +191,7 @@ messages: { Post(self,@OfferingCheck,#what=what); } - + propagate; } @@ -251,17 +252,17 @@ messages: { return; } - + piNodeValue = piNodeValue + amount; % Did we swing it far enough to be valuable? if piNodeValue >= NODE_VALUE_NEEDED { Post(self,@SomeoneSaid,#type=SAY_MESSAGE,#what=self, - #string=KE4_good_final); + #string=KE4_good_final); Send(poNode,@NodeAppear,#karma=AVARNODE_GOOD,#where=self, - #row=NODE_ROW,#col=NODE_COL,#fine_row=NODE_FINE_ROW, - #fine_col=NODE_FINE_COL); + #row=NODE_ROW,#col=NODE_COL,#fine_row=NODE_FINE_ROW, + #fine_col=NODE_FINE_COL); ptNodeDisappear = CreateTimer(self,@NodeDisappear,NODE_APPEAR_TIME); piNodeValue = NODE_ALREADY_APPEARED; @@ -272,10 +273,10 @@ messages: if piNodeValue <= -NODE_VALUE_NEEDED { Post(self,@SomeoneSaid,#type=SAY_MESSAGE,#what=self, - #string=KE4_evil_final); + #string=KE4_evil_final); Send(poNode,@NodeAppear,#karma=AVARNODE_EVIL,#where=self, - #row=NODE_ROW,#col=NODE_COL,#fine_row=NODE_FINE_ROW, - #fine_col=NODE_FINE_COL); + #row=NODE_ROW,#col=NODE_COL,#fine_row=NODE_FINE_ROW, + #fine_col=NODE_FINE_COL); ptNodeDisappear = CreateTimer(self,@NodeDisappear, NODE_APPEAR_TIME); piNodeValue = NODE_ALREADY_APPEARED; @@ -293,14 +294,14 @@ messages: else { % Only post the evil message if they're onto something. - % Disrupting good or killed enough to be blatantly evil. + % Disrupting good or killed enough to be blatantly evil. if amount < 0 AND (piNodeValue > 0 - OR piNodeValue < -(NODE_VALUE_NEEDED/4)) + OR piNodeValue < -(NODE_VALUE_NEEDED/4)) { Send(self,@Rumble); Post(self,@SomeoneSaid,#type=SAY_MESSAGE,#what=self, - #string=KE4_evil); + #string=KE4_evil); } } @@ -315,6 +316,5 @@ messages: return; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kcforest/kmadscih.kod b/kod/object/active/holder/room/monsroom/kcforest/kmadscih.kod index 9ffbea03d6..d0de28b71e 100644 --- a/kod/object/active/holder/room/monsroom/kcforest/kmadscih.kod +++ b/kod/object/active/holder/room/monsroom/kcforest/kmadscih.kod @@ -15,7 +15,7 @@ constants: include blakston.khd resources: - room_name_MadScientistHut ="Hut of the Mad Scientist" + room_name_MadScientistHut = "Hut of the Mad Scientist" room_MadScientistHut = KC5a.roo MadScientistHut_music = madsci.mp3 @@ -44,7 +44,7 @@ messages: Constructed() { - % each sound is [wave_file, row, col, cutoff radius, maximum volume] + % Each sound is [wave_file, row, col, cutoff radius, maximum volume] plLooping_sounds = [[ fire_sound_madscientist, 3, 7, 10, 100 ]]; propagate; @@ -59,18 +59,18 @@ messages: plExits = Cons([ 7, 7, RID_KC5, 35, 31, ROTATE_NONE ],plExits); plExits = Cons([ 7, 8, RID_KC5, 35, 31, ROTATE_NONE ],plExits); plExits = Cons([ 6, 8, RID_KC5, 35, 31, ROTATE_NONE ],plExits); - + propagate; } CreateStandardObjects() { Send(self,@NewHold,#what=Create(&KocatanMadScientist), - #new_row=4,#new_col=7,#fine_row=32,#fine_col=32); + #new_row=4,#new_col=7,#fine_row=32,#fine_col=32); % Lighting - send(self,@NewHold,#what=Create(&DynamicLight,#iColor=LIGHT_FIRE,#iIntensity=30), - #new_row=3,#new_col=7,#fine_row=24,#fine_col=48); + Send(self,@NewHold,#what=Create(&DynamicLight,#iColor=LIGHT_FIRE, + #iIntensity=30),#new_row=3,#new_col=7,#fine_row=24,#fine_col=48); propagate; } @@ -83,21 +83,20 @@ messages: for i in plActive { - oObj = send(self,@HolderExtractObject,#Data=i); - if isClass(oObj,&DragonFlyQueen) + oObj = Send(self,@HolderExtractObject,#Data=i); + if IsClass(oObj,&DragonFlyQueen) { iFlys = iFlys + 1; } if iFlys > 4 { - send(oObj,@Delete); + Send(oObj,@Delete); } } propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kocsew1.kod b/kod/object/active/holder/room/monsroom/kocsew1.kod index 70b06112e1..fd6b704e39 100644 --- a/kod/object/active/holder/room/monsroom/kocsew1.kod +++ b/kod/object/active/holder/room/monsroom/kocsew1.kod @@ -54,7 +54,8 @@ properties: piMonster_count_max = 5 - % A list of people that came in from the other side. Only allow them to go back. + % A list of people that came in from the other side. + % Only allow them to go back. plFromOtherSewer = $ messages: @@ -107,21 +108,25 @@ messages: if IsClass(what,&Player) AND plFromOtherSewer <> $ { - plFromOtherSewer = DelListElem(plFromOtherSewer,what); + if FindListElem(plFromOtherSewer,what) + { + plFromOtherSewer = DelListElem(plFromOtherSewer,what); + } } propagate; } - SomethingTryGo(what = $, row = $, col = $) + SomethingTryGo(what = $,row = $,col = $) { if row = 42 AND col = 8 AND (plFromOtherSewer = $ - OR FindListElem(plFromOtherSewer,what) = 0) + OR FindListElem(plFromOtherSewer,what) = 0) AND NOT IsClass(what,&DM) { - send(what,@MsgSendUser,#message_rsc=kocsewer1_no_cheat); - debug("ALERT! ",send(self,@GetTrueName),self," tried to illegally enter the door in RID_KOC_SEWER1!"); + Send(what,@MsgSendUser,#message_rsc=kocsewer1_no_cheat); + Debug("ALERT! ",Send(self,@GetTrueName),what, + " tried to illegally enter the door in RID_KOC_SEWER1!"); % Stop here. return TRUE; @@ -130,6 +135,5 @@ messages: propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/active/holder/room/monsroom/kocsew2.kod b/kod/object/active/holder/room/monsroom/kocsew2.kod index 95bd0508fe..8900c5620e 100644 --- a/kod/object/active/holder/room/monsroom/kocsew2.kod +++ b/kod/object/active/holder/room/monsroom/kocsew2.kod @@ -10,7 +10,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% KocatanSewer2 is MonsterRoom -% Todo?: Add in items that appear in the water. +% Todo?: Add in items that appear in the water. % Good coordinates: [78. 33], [37, 24], [7, 37], [19, 3] constants: @@ -25,7 +25,7 @@ resources: kocsew2_music = cave.mp3 kocsew2_locked_1 = \ - "Alternately wading and swimming in digusting filth, you rattle " + "Alternately wading and swimming in disgusting filth, you rattle " "the locked gate without any effect." classvars: @@ -81,10 +81,9 @@ messages: plExits = Cons([ 43, 48, RID_KOC_TAILOR, 4, 2, ROTATE_NONE ],plExits); plExits = Cons([ 4, 13, RID_KOC_SEWER1, 42, 7, ROTATE_NONE ],plExits); - + propagate; } - end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/kod/object/item/passitem/hstone.kod b/kod/object/item/passitem/hstone.kod index aef1beabaa..7725a8d729 100644 --- a/kod/object/item/passitem/hstone.kod +++ b/kod/object/item/passitem/hstone.kod @@ -22,11 +22,11 @@ resources: HeartStone_icon_rsc = xeogem.bgf HeartStone_name_rsc = "heartstone" HeartStone_desc_rsc = \ - "This is called a 'heartstone'. It is a huge gem taken from the body of a " - "fallen Xeochicotl." - + "This is called a 'heartstone'. It is a huge gem taken from the " + "body of a fallen Xeochicatl." + classvars: - + vrName = HeartStone_name_rsc vrDesc = HeartStone_desc_rsc vrIcon = HeartStone_icon_rsc @@ -45,19 +45,20 @@ messages: Constructor() { - piItem_flags = send(SYS,@EncodeTwoColorXLAT,#color1=viColor); - + piItem_flags = Send(SYS,@EncodeTwoColorXLAT,#color1=viColor); + propagate; } NewOwner(what = $) { if (IsClass(what,&Room)) - AND (not send(what,@CheckRoomFlag,#flag=ROOM_NO_COMBAT)) + AND (NOT Send(what,@CheckRoomFlag,#flag=ROOM_NO_COMBAT)) { if Send(Send(SYS,@GetNodeAttack),@GetRespawn) { - ptRespawn = CreateTimer(self,@RespawnXeoTimer,random(RESPAWN_MIN,RESPAWN_MAX)); + ptRespawn = CreateTimer(self,@RespawnXeoTimer, + Random(RESPAWN_MIN,RESPAWN_MAX)); } } else @@ -66,10 +67,10 @@ messages: { DeleteTimer(ptRespawn); } - + ptRespawn = $; } - + propagate; } @@ -77,7 +78,7 @@ messages: { ptRespawn = $; Send(self,@RespawnXeo); - + return; } @@ -88,37 +89,39 @@ messages: if ptRespawn <> $ { DeleteTimer(ptRespawn); - + ptRespawn = $; } oXeochicatl = Send(self,@CreateXeo); iRow = Send(self,@GetRow); iCol = Send(self,@GetCol); - + if NOT IsClass(poOwner,&Room) { Debug("HStone::RespawnXeo called while not in a room!"); - + return; } if Send(poOwner,@ReqNewHold,#what=oXeochicatl,#new_row=iRow,#new_col=iCol) { Send(poOwner,@NewHold,#what=oXeochicatl,#new_row=iRow,#new_col=iCol); - post(self,@Delete); + Post(self,@Delete); } else { - ptRespawn = CreateTimer(self,@RespawnXeoTimer,random(RESPAWN_MIN,RESPAWN_MAX)); + ptRespawn = CreateTimer(self,@RespawnXeoTimer, + Random(RESPAWN_MIN,RESPAWN_MAX)); } - + return; } IsInAttack() { - return (Send(poOwner,@FindHolding,#class=&ManaNode) = Send(Send(SYS,@GetNodeAttack),@GetAttackedNode)); + return (Send(poOwner,@FindHolding,#class=&ManaNode) + = Send(Send(SYS,@GetNodeAttack),@GetAttackedNode)); } Delete() @@ -127,18 +130,21 @@ messages: { DeleteTimer(ptRespawn); } - + ptRespawn = $; - + propagate; } - - CanBeStoredInVault() + + CanBeStoredInVault() { return FALSE; } + DestroyDisposable() + { + return FALSE; + } end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - diff --git a/kod/object/item/passitem/hstone/hstonblu.kod b/kod/object/item/passitem/hstone/hstonblu.kod index 4fae636817..607255c438 100644 --- a/kod/object/item/passitem/hstone/hstonblu.kod +++ b/kod/object/item/passitem/hstone/hstonblu.kod @@ -18,12 +18,12 @@ resources: BlueHeartStone_name_rsc = "blue heartstone" BlueHeartStone_desc_rsc = \ - "This is called a 'heartstone'. It is a huge blue gem taken from the body of a " - "fallen Ma'Xeochicatl. It wiggles slightly and is cool to the touch. The uses for " - "this gem are not widely known." - + "This is called a 'heartstone'. It is a huge blue gem taken from " + "the body of a fallen Ma'Xeochicatl. It wiggles slightly and is cool " + "to the touch. The uses for this gem are not widely known." + classvars: - + vrName = BlueHeartStone_name_rsc vrDesc = BlueHeartStone_desc_rsc @@ -44,4 +44,3 @@ messages: end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - diff --git a/kod/object/item/passitem/hstone/hstonbrn.kod b/kod/object/item/passitem/hstone/hstonbrn.kod index 8fd4311e20..feb96322a6 100644 --- a/kod/object/item/passitem/hstone/hstonbrn.kod +++ b/kod/object/item/passitem/hstone/hstonbrn.kod @@ -18,12 +18,12 @@ resources: BrownHeartStone_name_rsc = "brown heartstone" BrownHeartStone_desc_rsc = \ - "This is called a 'heartstone'. It is a huge brown gem taken from the body of a " - "fallen Te'Xeochicatl. It feels much like a normal stone. The uses for " - "this gem are not widely known." - + "This is called a 'heartstone'. It is a huge brown gem taken from " + "the body of a fallen Te'Xeochicatl. It feels much like a normal " + "stone. The uses for this gem are not widely known." + classvars: - + vrName = BrownHeartStone_name_rsc vrDesc = BrownHeartStone_desc_rsc @@ -44,4 +44,3 @@ messages: end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - diff --git a/kod/object/item/passitem/hstone/hstonred.kod b/kod/object/item/passitem/hstone/hstonred.kod index 35bd2ff8e8..54ae978dd4 100644 --- a/kod/object/item/passitem/hstone/hstonred.kod +++ b/kod/object/item/passitem/hstone/hstonred.kod @@ -18,12 +18,12 @@ resources: RedHeartStone_name_rsc = "red heartstone" RedHeartStone_desc_rsc = \ - "This is called a 'heartstone'. It is a huge red gem taken from the body of a " - "fallen Ro'Xeochicatl. It glows softly and is warm to the touch. The uses for " - "this gem are not widely known." - + "This is called a 'heartstone'. It is a huge red gem taken from the " + "body of a fallen Ro'Xeochicatl. It glows softly and is warm to the " + "touch. The uses for this gem are not widely known." + classvars: - + vrName = RedHeartStone_name_rsc vrDesc = RedHeartStone_desc_rsc @@ -44,4 +44,3 @@ messages: end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - diff --git a/kod/object/item/passitem/hstone/hstonsky.kod b/kod/object/item/passitem/hstone/hstonsky.kod index 91178ae4ed..e86616de7a 100644 --- a/kod/object/item/passitem/hstone/hstonsky.kod +++ b/kod/object/item/passitem/hstone/hstonsky.kod @@ -18,12 +18,12 @@ resources: SkyHeartStone_name_rsc = "sky heartstone" SkyHeartStone_desc_rsc = \ - "This is called a 'heartstone'. It is a huge sky blue gem taken from the body of a " - "fallen Ve'Xeochicatl. The heartstone feels very light in your hands. The uses for " - "this gem are not widely known." - + "This is called a 'heartstone'. It is a huge sky blue gem taken from " + "the body of a fallen Ve'Xeochicatl. The heartstone feels very light " + "in your hands. The uses for this gem are not widely known." + classvars: - + vrName = SkyHeartStone_name_rsc vrDesc = SkyHeartStone_desc_rsc @@ -44,4 +44,3 @@ messages: end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -