diff --git a/Mission Files/hardcore.namalsk/cfgrandompresets.xml b/Mission Files/hardcore.namalsk/cfgrandompresets.xml index e7bc92f..3d5d8cb 100644 --- a/Mission Files/hardcore.namalsk/cfgrandompresets.xml +++ b/Mission Files/hardcore.namalsk/cfgrandompresets.xml @@ -129,7 +129,7 @@ <item name="Mag_STANAG_30Rnd" chance="0.05" /> <item name="Mag_CMAG_40Rnd" chance="0.025" /> <item name="Mag_SVD_10Rnd" chance="0.025" /> - <item name="Mag_STANAGCoupled_30Rnd" chance="0.025" /> + <item name="Mag_STANAG_60Rnd" chance="0.025" /> <item name="Mag_AKM_Drum75Rnd" chance="0.025" /> </cargo> diff --git a/Mission Files/hardcore.namalsk/db/types.xml b/Mission Files/hardcore.namalsk/db/types.xml index 34f1b49..85c8619 100644 --- a/Mission Files/hardcore.namalsk/db/types.xml +++ b/Mission Files/hardcore.namalsk/db/types.xml @@ -793,10 +793,10 @@ <tag name="hunting" /> </type> <type name="Machete"> - <nominal>6</nominal> + <nominal>10</nominal> <lifetime>5400</lifetime> <restock>0</restock> - <min>10</min> + <min>6</min> <quantmin>-1</quantmin> <quantmax>-1</quantmax> <cost>100</cost> @@ -10788,15 +10788,15 @@ <flags count_in_cargo="0" count_in_hoarder="0" count_in_map="1" count_in_player="0" crafted="1" deloot="0" /> </type> <type name="RabbitSnareTrap"> - <lifetime>7200</lifetime> + <lifetime>28800</lifetime> <flags count_in_cargo="0" count_in_hoarder="0" count_in_map="1" count_in_player="0" crafted="1" deloot="0" /> </type> <type name="FishNetTrap"> - <lifetime>7200</lifetime> + <lifetime>28800</lifetime> <flags count_in_cargo="0" count_in_hoarder="0" count_in_map="1" count_in_player="0" crafted="1" deloot="0" /> </type> <type name="SmallFishTrap"> - <lifetime>7200</lifetime> + <lifetime>28800</lifetime> <flags count_in_cargo="0" count_in_hoarder="0" count_in_map="1" count_in_player="0" crafted="1" deloot="0" /> </type> <type name="Rag"> diff --git a/Mission Files/hardcore.namalsk/init.c b/Mission Files/hardcore.namalsk/init.c index fbd0da2..dcea8ba 100644 --- a/Mission Files/hardcore.namalsk/init.c +++ b/Mission Files/hardcore.namalsk/init.c @@ -96,12 +96,11 @@ class CustomMission: MissionServer itemEnt = itemClothing.GetInventory().CreateInInventory( "Rag" ); if ( Class.CastTo( itemBs, itemEnt ) ) { + SetRandomHealth( itemEnt ); itemBs.SetQuantity( 4 ); itemBs.SetCleanness( 1 ); } player.SetQuickBarEntityShortcut( itemEnt, 0 ); - - SetRandomHealth( itemEnt ); itemEnt = itemClothing.GetInventory().CreateInInventory( "RoadFlare" ); SetRandomHealth( itemEnt ); diff --git a/Mission Files/regular.namalsk/cfgrandompresets.xml b/Mission Files/regular.namalsk/cfgrandompresets.xml index 829c292..4109313 100644 --- a/Mission Files/regular.namalsk/cfgrandompresets.xml +++ b/Mission Files/regular.namalsk/cfgrandompresets.xml @@ -130,7 +130,7 @@ <item name="Mag_STANAG_30Rnd" chance="0.05" /> <item name="Mag_CMAG_40Rnd" chance="0.025" /> <item name="Mag_SVD_10Rnd" chance="0.025" /> - <item name="Mag_STANAGCoupled_30Rnd" chance="0.025" /> + <item name="Mag_STANAG_60Rnd" chance="0.025" /> <item name="Mag_AKM_Drum75Rnd" chance="0.025" /> </cargo> diff --git a/Mission Files/regular.namalsk/db/types.xml b/Mission Files/regular.namalsk/db/types.xml index 841d312..8ff860c 100644 --- a/Mission Files/regular.namalsk/db/types.xml +++ b/Mission Files/regular.namalsk/db/types.xml @@ -793,10 +793,10 @@ <tag name="hunting" /> </type> <type name="Machete"> - <nominal>6</nominal> + <nominal>10</nominal> <lifetime>2700</lifetime> <restock>0</restock> - <min>10</min> + <min>6</min> <quantmin>-1</quantmin> <quantmax>-1</quantmax> <cost>100</cost> @@ -11271,15 +11271,15 @@ <flags count_in_cargo="0" count_in_hoarder="0" count_in_map="1" count_in_player="0" crafted="1" deloot="0" /> </type> <type name="RabbitSnareTrap"> - <lifetime>7200</lifetime> + <lifetime>28800</lifetime> <flags count_in_cargo="0" count_in_hoarder="0" count_in_map="1" count_in_player="0" crafted="1" deloot="0" /> </type> <type name="FishNetTrap"> - <lifetime>7200</lifetime> + <lifetime>28800</lifetime> <flags count_in_cargo="0" count_in_hoarder="0" count_in_map="1" count_in_player="0" crafted="1" deloot="0" /> </type> <type name="SmallFishTrap"> - <lifetime>7200</lifetime> + <lifetime>28800</lifetime> <flags count_in_cargo="0" count_in_hoarder="0" count_in_map="1" count_in_player="0" crafted="1" deloot="0" /> </type> <type name="Rag"> diff --git a/Mission Files/regular.namalsk/init.c b/Mission Files/regular.namalsk/init.c index 02fc2d2..06b2111 100644 --- a/Mission Files/regular.namalsk/init.c +++ b/Mission Files/regular.namalsk/init.c @@ -96,12 +96,11 @@ class CustomMission: MissionServer itemEnt = itemClothing.GetInventory().CreateInInventory( "Rag" ); if ( Class.CastTo( itemBs, itemEnt ) ) { + SetRandomHealth( itemEnt ); itemBs.SetQuantity( 4 ); itemBs.SetCleanness( 1 ); } player.SetQuickBarEntityShortcut( itemEnt, 0 ); - - SetRandomHealth( itemEnt ); itemEnt = itemClothing.GetInventory().CreateInInventory( "RoadFlare" ); SetRandomHealth( itemEnt );