VERSION 2.0.4 - Ammo Names on Icons + Some Ammo Adjustments

- Ammo icons now have their names/effects on the icons for better readability
- .50 BMG "Volcano" now has the "fire_melt" effect, granting even more Burn stacks on direct-hit
- Fixed a possible crash that can come from Explosive Rounds
- Slightly bumped up .45 AP and .45 Ripper (AP+)'s AP power to make them ore worthwhile

gamedata/configs/ammo/ammo_other.ltx

@@ -21,6 +21,7 @@ name		= ammo_new_50_ap
 k_hit		= 1.4
 k_ap		= 2.2		;0.399
 special 	= napalm
+special_2	= fire_melt
 cost        = 32200
 
 dg_ammo		= ammo_50_bmg

gamedata/configs/mod_system_zzz_new_ammo_and_variants.ltx

@@ -173,7 +173,7 @@ icons_texture			= ui\ui_icon_45behemoth
 k_disp					= 0.66
 k_hit					= 2.00
 k_impulse				= 0.70
-k_ap					= 0.028
+k_ap					= 0.030
 wm_size					= 0.1143
 k_air_resistance		= 0.7
 k_bullet_speed			= 1.875
@@ -209,7 +209,7 @@ icons_texture			= ui\ui_icon_45behemoth_old
 k_disp					= 0.66
 k_hit					= 1.25
 k_impulse				= 0.70
-k_ap					= 0.035
+k_ap					= 0.038
 wm_size					= 0.1143
 k_air_resistance		= 0.7
 k_bullet_speed			= 1.875

gamedata/configs/mod_system_zzzzzzzz_artigrok_ammo_icons.ltx

@@ -381,7 +381,7 @@ icons_texture = ui\ui_athi_ammo
 inv_grid_width = 1
 inv_grid_height = 1
 inv_grid_x = 1
-inv_grid_y = 7
+inv_grid_y = 6
 
 ![ammo_5.7x28_ss195_bad]
 icons_texture = ui\ui_athi_ammo
@@ -405,7 +405,7 @@ icons_texture = ui\ui_athi_ammo
 inv_grid_width = 1
 inv_grid_height = 1
 inv_grid_x = 1
-inv_grid_y = 6
+inv_grid_y = 7
 
 ![ammo_5.7x28_ss190_bad]
 icons_texture = ui\ui_athi_ammo
@@ -426,9 +426,10 @@ inv_grid_y = 6
 ![ammo_50_bmg]
 icons_texture = ui\ui_athi_ammo
 
+;swapped around by ilrathCXV
 inv_grid_width = 1
 inv_grid_height = 1
-inv_grid_x = 12
+inv_grid_x = 15
 inv_grid_y = 7
 
 ![ammo_50_bmg_bad]
@@ -1073,7 +1074,7 @@ inv_grid_y = 15
 icons_texture = ui\ui_athi_ammo
 inv_grid_width = 1
 inv_grid_height = 1
-inv_grid_x = 7
+inv_grid_x = 8
 inv_grid_y = 15
 
 ![ammo_20x70_devastator_bad]
@@ -1087,7 +1088,7 @@ inv_grid_y = 15
 icons_texture = ui\ui_athi_ammo
 inv_grid_width = 1
 inv_grid_height = 1
-inv_grid_x = 8
+inv_grid_x = 7
 inv_grid_y = 15
 
 ![ammo_20x70_star_bad]
@@ -1161,7 +1162,7 @@ icons_texture = ui\ui_athi_ammo
 
 inv_grid_width = 1
 inv_grid_height = 1
-inv_grid_x = 15
+inv_grid_x = 12
 inv_grid_y = 7
 
 ![ammo_23_eco]

gamedata/configs/text/eng/st_items_ammo_bas_eng.xml

@@ -41,7 +41,7 @@
 		<text>Ecolog-23 cartridge</text>
 	</string>
 	<string id="ammo_23_eco_descr">
-		<text>A special cartridge designed for the needs of the scientific staff located in the Zone. Depending on the task, it is filled with different types of solutions. Requires very careful handling. How to use: very slowly put into the weapon.\n \n%c[d_purple] • %c[ui_gray_2] Highest pierced armour class: %c[ui_gray_1]none\n%c[d_purple] • %c[ui_gray_2] Tissue damage rating: %c[ui_gray_1]none\n \n%c[ui_gray_1]SPECIAL:\n \n%c[d_purple] • %c[ui_gray_2] Using a thin wolfram needle, it pierces the skin of the mutants to inject the solution.</text>
+		<text>A special cartridge designed for the needs of the scientific staff located in the Zone. Depending on the task, it is filled with different types of solutions. Requires very careful handling.\n\n Using a thin wolfram needle, it pierces the skin of the mutants to inject the solution, killing most upon impact. Larger or tougher mutants may require one or two additional injections.</text>
 	</string>
 	<string id="ammo_23_eco_s">
 		<text>23x75 Ecolog</text>

gamedata/configs/text/eng/st_items_ammo_new.xml

@@ -289,10 +289,10 @@
 
 	<!-- HP+ -->
 	<string id="ammo_new_11.43x23_hydro">
-		<text>.45 ACP 'RIP' rounds (HP+)</text>
+		<text>.45 ACP 'Reaper' rounds (HP+)</text>
 	</string>
 	<string id="ammo_new_11.43x23_hydro_descr">
-		<text>This experimental .45 ACP round is constructed with Artefact Fragments molded into a bullet shape, then electroplated with nickel. The bullet is produced through classified experiments developed by the Ministry of Science in conjunction with Freedom-supplied research. Despite the hard metal coating the bullet readily fragments into several 'talons' which grants the round phenomeal stopping power at the cost of reduced penetration. Curiously, the bullets seem to create a localized anomaly around the point of shooting, affecting living things in the immediate vicnity. Speculators believe that unknown means draw the life energy from the victim to the shooter.</text>
+		<text>This experimental .45 ACP round is constructed with Artefact Fragments molded into a bullet shape, then electroplated with nickel. The bullet is produced through classified experiments developed by the Ministry of Science in conjunction with Freedom-supplied research. Despite the hard metal coating the bullet readily fragments into several 'talons' which grants the round phenomeal stopping power at the cost of reduced penetration. Curiously, the bullets seem to create a localized anomaly around the point of shooting, affecting living things in the immediate vicnity. Speculators believe that unknown means draw the life energy from the victim to the shooter upon their death.</text>
 	</string>
 	<string id="ammo_new_11.43x23_hydro_s">
 		<text>.45 HP+</text>
@@ -603,7 +603,7 @@
 		<text>.338 'Soulripper' Sabot rounds (AP+)</text>
 	</string>
 	<string id="ammo_new_338_ap_descr">
-		<text>.338 round consisting of a depleted uranium penetrator wrapped in a sabot and propelled with an anomalously powerful charge. Exhibits signs of anomalous tampering, as it is not physically possible for a projectile of this mass to fly with such velocity and deal as much damage as it does. Extremely rare, powerful, and dangerous to handle.</text>
+		<text>.338 round consisting of a depleted uranium penetrator wrapped in a sabot and propelled with an anomalously powerful charge. Exhibits signs of anomalous tampering, as it is not physically possible for a projectile of this mass to fly with such velocity and deal as much damage as it does. Extremely rare, powerful, and dangerous to handle. Users of the round claim to be invigorated with each successful hit on a living target.</text>
 	</string>
 	<string id="ammo_new_338_ap_s">
 		<text>.338 Lapua+</text>

gamedata/scripts/arti_handlers.script

@@ -614,10 +614,13 @@ function nullify_bullet_blow_sd(shit, bone_id)
 	if not shit.weapon_id then return end
 
 	wpn = level.object_by_id(shit.weapon_id)
-	wpn_sec = wpn:section()
 
-	if wpn_sec == "bullet_blow" then
-		-- printf("[ArtiGrok Handlers] - Player was damaged by bullet_blow. Nullifying damage...")
-		shit.power = 0
+	if wpn then
+		wpn_sec = wpn:section()
+
+		if wpn_sec == "bullet_blow" then
+			-- printf("[ArtiGrok Handlers] - Player was damaged by bullet_blow. Nullifying damage...")
+			shit.power = 0
+		end
 	end
 end