+ fixes to count weapons on selling menu
+ now close menu when purchasing/selling items
+ Vaults can now be placed in buildings, maybe buggy still.
+ updated 10oz gold bar texture with correct new one.
+ Disable simulation for all zombies on server
https://github.com/R4Z0R49/DayZMod/pull/359
+ Possible (semi-)infinite loop in zombie_agent.fsm
https://github.com/R4Z0R49/DayZMod/pull/380
This commit is contained in:
vbawol
2013-02-12 13:12:58 -06:00
parent e0df9dca50
commit e626ece4cf
16 changed files with 203 additions and 81 deletions

View File

@@ -1,4 +1,4 @@
/*%FSM<COMPILE "D:\Bohemia Interactive\Tools\FSM Editor Personal Edition\scriptedFSM.cfg, DayZ Zombie Agent">*/
/*%FSM<COMPILE "C:\Program Files (x86)\Bohemia Interactive\Tools\FSM Editor Personal Edition\scriptedFSM.cfg, DayZ Zombie Agent">*/
/*%FSM<HEAD>*/
/*
item0[] = {"init",0,250,-300.000000,-250.000000,-200.000000,-200.000000,0.000000,"init"};
@@ -14,7 +14,7 @@ item9[] = {"true",8,218,-300.000000,-175.000000,-200.000000,-125.000000,0.000000
item10[] = {"Begin",2,250,-300.000000,-100.000000,-200.000000,-50.000000,0.000000,"Begin"};
item11[] = {"",7,210,-254.000046,-29.000004,-245.999954,-20.999996,0.000000,""};
item12[] = {"",7,210,-204.000046,146.000000,-195.999954,154.000000,0.000000,""};
item13[] = {"Has_Target",4,4314,-150.000000,225.000000,-50.000000,275.000000,1.000000,"Has" \n "Target"};
item13[] = {"Has_Target",4,218,-150.000000,225.000000,-50.000000,275.000000,1.000000,"Has" \n "Target"};
item14[] = {"Chase",2,250,-150.000000,300.000000,-50.000000,350.000000,0.000000,"Chase"};
item15[] = {"",7,210,-29.000006,146.000000,-20.999996,154.000000,0.000000,""};
item16[] = {"",7,210,-29.000006,196.000000,-20.999996,204.000000,0.000000,""};
@@ -35,7 +35,7 @@ item30[] = {"finished",4,218,-425.000000,525.000000,-325.000000,575.000000,1.000
item31[] = {"",7,210,-479.000000,546.000000,-471.000000,554.000000,0.000000,""};
item32[] = {"",7,210,-29.000002,546.000000,-20.999998,554.000000,0.000000,""};
item33[] = {"",7,210,-304.000000,146.000000,-296.000000,154.000000,0.000000,""};
item34[] = {"someone_here",4,218,-75.000000,-50.000000,25.000000,0.000000,0.000000,"someone" \n "here"};
item34[] = {"someone_here",4,218,-200.000000,-50.000000,-100.000000,0.000000,0.000000,"someone" \n "here"};
item35[] = {"too_long",4,218,-425.000000,600.000000,-325.000000,650.000000,0.000000,"too long"};
item36[] = {"",7,210,-229.000000,621.000000,-221.000000,629.000000,0.000000,""};
item37[] = {"",7,210,-479.000000,621.000000,-471.000000,629.000000,0.000000,""};
@@ -44,6 +44,7 @@ item39[] = {"No_target",4,218,-525.000000,250.000000,-425.000000,300.000000,0.00
item40[] = {"",7,210,-104.000000,471.000000,-95.999992,479.000000,0.000000,""};
item41[] = {"player_check",4,218,-425.000000,0.000000,-325.000000,50.000000,0.000000,"player" \n "check"};
item42[] = {"is_Dedicated",4,218,-125.000000,-250.000000,-25.000000,-200.000000,5.000000,"is" \n "Dedicated"};
item43[] = {"Not_Alive",4,4314,-75.000000,-50.000000,25.000000,0.000000,0.000000,"Not" \n "Alive"};
link0[] = {0,9};
link1[] = {0,42};
link2[] = {2,23};
@@ -78,28 +79,30 @@ link30[] = {23,25};
link31[] = {24,23};
link32[] = {25,26};
link33[] = {25,34};
link34[] = {26,1};
link35[] = {27,20};
link36[] = {27,40};
link37[] = {28,29};
link38[] = {29,30};
link39[] = {29,32};
link40[] = {29,36};
link41[] = {30,31};
link42[] = {31,21};
link43[] = {32,8};
link44[] = {33,5};
link45[] = {34,5};
link46[] = {35,37};
link47[] = {36,35};
link48[] = {37,31};
link49[] = {38,39};
link50[] = {39,22};
link51[] = {40,28};
link52[] = {41,5};
link53[] = {42,1};
globals[] = {25.000000,1,0,0,0,640,480,1,101,6316128,1,-671.713867,363.212036,788.169373,-84.187515,713,601,1};
window[] = {2,-1,-1,-1,-1,843,132,1340,132,3,730};
link34[] = {25,43};
link35[] = {26,1};
link36[] = {27,20};
link37[] = {27,40};
link38[] = {28,29};
link39[] = {29,30};
link40[] = {29,32};
link41[] = {29,36};
link42[] = {30,31};
link43[] = {31,21};
link44[] = {32,8};
link45[] = {33,5};
link46[] = {34,5};
link47[] = {35,37};
link48[] = {36,35};
link49[] = {37,31};
link50[] = {38,39};
link51[] = {39,22};
link52[] = {40,28};
link53[] = {41,5};
link54[] = {42,1};
link55[] = {43,25};
globals[] = {25.000000,1,0,0,0,640,480,1,102,6316128,1,-650.021484,334.182983,700.299500,-373.567780,944,1030,1};
window[] = {2,-1,-1,-32000,-32000,841,130,1338,130,3,962};
*//*%FSM</HEAD>*/
class FSM
{
@@ -434,7 +437,17 @@ class FSM
priority = 0.000000;
to="Loiter";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
condition=/*%FSM<CONDITION""">*/"_isSomeone"/*%FSM</CONDITION""">*/;
condition=/*%FSM<CONDITION""">*/"_isSomeone && _isAlive"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
/*%FSM<LINK "Not_Alive">*/
class Not_Alive
{
priority = 0.000000;
to="Cleanup_";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
condition=/*%FSM<CONDITION""">*/"_isSomeone && !_isAlive && (time - _waitStart) > 60"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/