been removed, and the MF_GOD_GIFT flag is set directly instead.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5503 c06c8d41-db1a-0410-9941-cceddc491573
3XL4DKV7PSWAU3ZBJSKZFJ2VUYABC47I7KKWGIRCJYXULQD453MQC 2PEJPMEOH6N4U5TLKLGIN4MWLEVTSJDSMA4MOOKKN2QVJBGNGIVQC U63Y7KF5BVZFSYK2SCNJSVBSUHSRSDNBDNPAAKTL7NWKT47Q4QIAC BC6CG2UUZWUUMWTHYYDMOSRRZ5DVQ367ZSNRGMEOB6GPCZN4NPDQC 4HHCHQD26LSGYC5TSQV25D2KIWLRJDB4BJQHJPSIB3MWNSSE4TGAC J4F3IKATRP5DPK25BEXCPKC4JME3DJHEIGYHJOYXGHYXUEY633AAC PLSXOISO66Y4475D2LMC7KMHZUWXNUBNFYMYFIVLOZKAOKUJYXMQC 3HGELZU7NELOQ635HZO6IJIYLBSNCJ5VPH46IE22KA3OSLEFK7AQC GPEJOT73KMACP33IPAKFR5ROGHCOIP22VXZMQNYTGLEA2OSZUM2AC KFULGQQOHWUTXOM3BXCCYPGGVGGY4Z6265XUFRCBPNLTZAEHJZSQC MKI4RE5PG2PMI5XJ4QQNCKMX67E3XL3LTNPRMSCBP4RZFJTBO74QC NIJDQAJEWQIYKPDWIXYCCT4JIWVE6CWJ3J3K4N5PPGHWENGNZZXQC OTNE6MGPNEJRKXEC36SEFYFZOHD3GPOQZGZC7DBYFG6W5JQ345KQC 73URNFZM2NNHOTIYX6RAUXJ27LYPA6K3XA3OOSHGNGAR4KPQJSTAC 4LNIHTHZTCOEZEHZ4GW6WCZH4UCDWKK5UVUKEDODEBBS4YH2KONQC UKBVBVJK23OUOOKQJRGLZWEZYED5KZ4NLODW6U67UEBYCFWGGQOAC K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC DH3YTI6VVI727SQXO4CXSDCSBG2UN3UAWLFULBGRLBVH22ACRXIAC 226KYCTMLIXUKD734QATY3JKWUUKC5Q3O75JT5EWIX6BKR7ANZSAC CA6ZG6P2CE5EPAOQSB3P7NBDKTNFFHQP4CPOUFZL32ON6N32GSSQC KZIBMMGUSWOMS5NQ2KTWGY3SRYUYGZGD2YRZPQ2ISN5Z3JRSMEWQC W6DKUJ4NYAURDPGBAY7WX36BFUAD5LFE2JKFSFAYTHLSDO33WDNAC JD3FMKAAAUQZSNPGFLVX7F5H5SWGUSYOFZU4X5W4XYNV6HUKDBKAC SJXOZ6J66G3S5VYGIZ3YHEUCKUF5554YEFUYLVBH7X4ALYSXKTGQC OGQWGPC24OQCKTCZAXGLRF4TLX3AV63Z4QODPPY5MHKX3ICMUHLQC 6LKNWXCSGPIV3MFG6REQGQWXMMR64LBHDRXMPBX6LJXBY3D7RV7AC UU5EKED2RA2U3CFZ3UEJQEWSWHQPEU7ZD4KH3I22IIVZFHD4Y67QC 45CWQUPQHKUFUJ4MVL5K3KCVCCKLY2Z7RZWZ53UT723RV5STPSRAC UHOAWBSBZBPHWMNXZCVB4SBJM4DTZAG3YRNNJNIKJN4CE2DP27JQC 5XSXMOBGXFLTIQE6WDXWWFVDOTUPZSIQ2FWT3YI5QMVU6D76IUYQC 5MGUZD2UACJCSG74TEZHI3Z4YL5KL6ZVUCQ3XVZKDOLKM7EMGWJAC 4SUG4IBPRQSAGEWNR4BVHMJV5MJRQUYXI4OZ5YXAZUSLF4CVKX2AC U3KGUJJQWQORJIIFH3ADVNIEEX5HOX6KEOXO7DJSL7L3Z6GG3PAQC C7EEMEI6FU6L2VWZBTDCZO5ZTB2N5TCNGSMIBZTN6NZRE7BUBFPQC IE3INS4WUXZOBVXB5VWRBYPVPXADD2U2W5H3TBTOYNWJ3EGRSGQQC TS7X6ZTTQRB2I53VV4LXZPXZWM3DIKYI3T5PPHZANSEW4Q7QZBOAC 7BQVRR4GR2WNIGOE7D6WGVSFLMW5B6HPMJIZPZBPTSM6H57XXH4AC YCL3W2PFE6ILTGBFODCSXNPDIA46KVSZP2TI7HDMYAOEJT65RIEAC PA2AUORPJHOD7XBRM34UMBZRJVTKUFD3PINRMSEE4GKM7AH2KDVAC N6AB4D7CBK3YG43GL5MZIHKGYXSQWQ3MRKXGEX3QAADLGNDIKL7AC CRU7JBTVJWTTVQ5JTRA2B3X2FPKPJ2RRR33IK2OG536VMOEZJYJAC RPOZZWKG5GLPHVZZ7ZKMKS64ZMV2LDCQSARBJFJ6FZOTOKCQO7FAC RMCZDJKEYYT6TTZNJGBVZTG74CVLF72NWKON6IJ2HNTCA23INPJQC P2OYYNPHIBGOLT4CRLNTTIXDN34EU2QCMFQJNLAMUAHQXZTEDPXQC 3MAPXTL5GAQ6373CUUVPBARIRHBRSISAF3BO2WBEROT2KUAXWLGAC G2EYUPAIPISVAEG26BS3SQANL37EEZJ3TZBJKKWHGKQ66LB3RFQAC SWOYPTHJAWFEDBMB3ROT33VQZIXGZD5UOXEV456DDUENW2HGA66QC L4PKJZERR7WADKWHY3MR6J6OZFREVPL3CB43I6MLJ2BVKWCUTE7AC SM5TRAZJD7BTJUVJ4HUNKROCH7DLD24SU5II6FQSJYIPQ2XA4RUAC LEGFIEUGVU2LZELGQH4TZTIJGKEVUHFTRGQ4Y2KGLSK7KNDI7BFQC CGYTZT5QWIEGYKUOLOK7MFXSLJKLYRZONER5ZCDZO5XYWSLG475QC JOE4G4IU6O64WRW4CYDALGFCN6XHDI57MGLBBDHS4KHFLAH473PAC KQNMFSLV62B4ANDKTUZ7LQH2MD2NDGNCP55MKM5YAATQ4T52H2PQC KYVZGUJXV23ELA4CKPVQZO3NTJCODXMCWYAZJYWVWJVLPETNHLGQC 2DORUQ4B574MDOOMRYWGU5I72AKHMCSTZ6B3VSHQBUQOZYHRC7FAC UFKLHUYL7WAQ3CI3D42T4C6KBGAUR63DSQAUQTTZG7GJMXSCVJWAC GUUCEQSUVRDD6GIOYCMFPHMS7YORWLZQBVM4CSOXD6GD5F4OMTIAC 74LQ7JXVLAFSHLI7LCBKFX47CNTYSKGUQSXNX5FCIUIGCC2JTR3QC LTX72QGIPNUGWQN5ULPOMFCOPZTK7472DQY4AYX5WM3WHSUVXI5QC X5WLJCJVW55SXZVP7IKP7ADCJIGNKN4PKAXFECVR6TNK7XSMZR7QC ARNDCQD3NXQRD5CZFTBQOMID5RPPRRIK647T36FLGHMUN62MF7WAC X4OCLD5YEXCYVQNMOQORLIO72AKUEMT3BT6FB3TW2HARKN5X7MEQC UZ6N6HOUPGVSPC5NQROEEDWMEGJA5XUWUY2AKH5QG65AZ25PVXDAC FPKIWVHZ3HCA6BLIACTI25WSWIFD6XJPIIM3VYKT5OX3TTMALQOAC QL5YCGGNXVNGD5WACTFKXQOUCCXOKMUQGRHDJAUEIW25LQUSTD2QC if (one_chance_in(3))summon_ice_beast_etc(powc, MONS_WHITE_IMP);else if (one_chance_in(7))summon_ice_beast_etc(powc, MONS_SHADOW_IMP);elsesummon_ice_beast_etc(powc, MONS_IMP);
{monster_type mon = (one_chance_in(3)) ? MONS_WHITE_IMP :(one_chance_in(7)) ? MONS_SHADOW_IMP: MONS_IMP;summon_ice_beast_etc(powc, mon, BEH_FRIENDLY, false);
mgen_data( type_summoned,friendly ? BEH_FRIENDLY : BEH_HOSTILE,numsc,coord_def(targ_x, targ_y),friendly ? you.pet_target : MHITYOU )) != -1)
mgen_data(mon,friendly ? BEH_FRIENDLY : BEH_HOSTILE,numsc, coord_def(targ_x, targ_y),friendly ? you.pet_target : MHITYOU )) != -1)
// pick a random monster and subtract its costif ( varied || num_so_far == 0 )mon_chosen = RANDOM_ELEMENT(animals);
// Pick a random monster and subtract its cost.if (varied || num_so_far == 0)mon = RANDOM_ELEMENT(animals);
mgen_data( mon_chosen,friendly ? BEH_FRIENDLY : BEH_HOSTILE, 4,you.pos(),friendly ? you.pet_target : MHITYOU ));
mgen_data(mon,friendly ? BEH_FRIENDLY : BEH_HOSTILE,4, you.pos(),friendly ? you.pet_target : MHITYOU));
// Trog sends some fighting buddies for his followers (or enemies if// god_gift is false).bool summon_berserker(int pow, bool god_gift)
// Trog sends some fighting buddies (or enemies) for his followers.bool summon_berserker(int pow, beh_type beha, bool god_gift)
// Note: friendly, non-god_gift means spell.if (god_gift)behaviour = BEH_GOD_GIFT;else if (!unfriendly && random2(pow) > 7)behaviour = BEH_FRIENDLY;
// If it's not a god gift, it's from a spell.if (!god_gift && random2(pow) > 7){beha = BEH_FRIENDLY;hitting = you.pet_target;}
thing_called = ((temp_rand > 8) ? MONS_WRAITH : // 64%(temp_rand > 3) ? MONS_FREEZING_WRAITH // 20%: MONS_SPECTRAL_WARRIOR); // 16%
mon = ((temp_rand > 8) ? MONS_WRAITH : // 64%(temp_rand > 3) ? MONS_FREEZING_WRAITH // 20%: MONS_SPECTRAL_WARRIOR); // 16%
simple_god_message( success ?" sends the divine host to punish you ""for your evil ways!" :"'s divine host fails to appear.",god );
simple_god_message(success ?" sends the divine host to punish you ""for your evil ways!" :"'s divine host fails to appear.",god );
simple_god_message( success ?" sends the divine host to punish you ""for your evil ways!" :"'s divine host fails to appear.",god);
simple_god_message(success ?" sends the divine host to punish you ""for your evil ways!" :"'s divine host fails to appear.",god);
BEH_HOSTILE, 0,you.pos(), MHITYOU)) != -1;simple_god_message(success ?" sends a greater servant after you!" :"'s greater servant is unavoidably detained.",god);
you.pos(), MF_GOD_GIFT)) != -1){success = true;simple_god_message(success ?" sends a greater servant after you!" :"'s greater servant is unavoidably detained.",god);}
simple_god_message(count > 1? " sends servants to punish you." :count > 0? " sends a servant to punish you." :"'s servants fail to arrive.", god);
simple_god_message(count > 1 ? " sends servants to punish you." :count > 0 ? " sends a servant to punish you." :"'s servants fail to arrive.", god);
summon_ice_beast_etc( 20 + you.skills[SK_INVOCATIONS] * 3,static_cast<monster_type>(MONS_NEQOXEC + random2(5)),true );
summon_ice_beast_etc(20 + you.skills[SK_INVOCATIONS] * 3,static_cast<monster_type>(MONS_NEQOXEC + random2(5)),BEH_FRIENDLY, true);
summon_ice_beast_etc( 20 + you.skills[SK_INVOCATIONS] * 3,static_cast<monster_type>(MONS_EXECUTIONER + random2(5)),true );
summon_ice_beast_etc(20 + you.skills[SK_INVOCATIONS] * 3,static_cast<monster_type>(MONS_EXECUTIONER + random2(5)),BEH_FRIENDLY, true);