Merge remote branch 'origin/divVerent/map-weapon-rebalance'

diff --git a/maps/dance.map b/maps/dance.map
index 6d8fcaf12f407bab6fd73579ceed5033a7a88f8f..b31cfc65673cc8e4d2f97548d8a9cb4e59ea3ef7 100644 (file)
--- a/maps/dance.map
+++ b/maps/dance.map
@@ -20772,10 +20772,6 @@ effects_jumppad/jumppadfx1_a
 "angle" "180.000000"
 }
 {
-"classname" "weapon_nex"
-"origin" "0.000000 0.000000 -176.000000"
-}
-{
 "classname" "item_flag_team1"
 "origin" "1440.000000 -2080.000000 -288.000000"
 }
@@ -23872,3 +23868,7 @@ effects_jumppad/jumppadfx1_a
 "_castshadows" "1"
 "angles" "18.369183 11.335669 90.000000"
 }
+{
+"classname" "weapon_campingrifle"
+"origin" "0.000000 0.000000 -176.000000"
+}

diff --git a/maps/g-23.map b/maps/g-23.map
index d7c96510690b8db11652b8efdea265ca439c643b..522232a36807bc5c3ef44b78350f4909897cc815 100644 (file)
--- a/maps/g-23.map
+++ b/maps/g-23.map
@@ -12510,10 +12510,6 @@ exx/wall-metalrib01
 "origin" "256.000000 0.000000 0.000000"
 }
 {
-"classname" "item_cells"
-"origin" "192.000000 0.000000 0.000000"
-}
-{
 "classname" "weapon_grenadelauncher"
 "origin" "-256.000000 -1024.000000 -448.000000"
 }
@@ -13091,18 +13087,6 @@ exx/wall-metalrib01
 "angle" "-90.000000"
 }
 {
-"classname" "weapon_uzi"
-"origin" "-864.000000 -768.000000 -256.000000"
-}
-{
-"classname" "item_bullets"
-"origin" "-864.000000 -704.000000 -256.000000"
-}
-{
-"classname" "item_bullets"
-"origin" "-864.000000 -640.000000 -256.000000"
-}
-{
 "classname" "info_player_deathmatch"
 "origin" "-1344.000000 512.000000 -424.000000"
 "angle" "-90.000000"
@@ -14859,3 +14843,11 @@ exx/wall-metalrib01
 "light" "32"
 "_color" "1 0.151965 0"
 }
+{
+"classname" "weapon_hlac"
+"origin" "-864.000000 -704.000000 -256.000000"
+}
+{
+"classname" "item_cells"
+"origin" "-864.000000 -640.000000 -256.000000"
+}

diff --git a/maps/red-planet.map b/maps/red-planet.map
index 2036871195bd9663e33ed1fb04ad4c3d517f8e4d..a129d4b4688b9d8175873a7ff26c8a536595530e 100644 (file)
--- a/maps/red-planet.map
+++ b/maps/red-planet.map
@@ -46600,10 +46600,6 @@ exx/trim-vert01
 "angle" "7.999371"
 }
 {
-"classname" "item_bullets"
-"origin" "-2408.000000 -360.000000 472.000000"
-}
-{
 "classname" "item_shells"
 "origin" "-2456.000000 -360.000000 472.000000"
 "angle" "90.000000"
@@ -46652,14 +46648,6 @@ exx/trim-vert01
 "_color" "1 0.75 0.75"
 }
 {
-"classname" "weapon_nex"
-"origin" "-2800.000000 448.000000 416.000000"
-}
-{
-"classname" "item_cells"
-"origin" "-2800.000000 -448.000000 416.000000"
-}
-{
 "classname" "item_health_small"
 "origin" "-1808.000000 0.000000 480.000000"
 }
@@ -46676,10 +46664,6 @@ exx/trim-vert01
 "origin" "640.000000 -224.000000 48.000000"
 }
 {
-"classname" "weapon_hagar"
-"origin" "-2660.000000 1176.000000 120.000000"
-}
-{
 "classname" "misc_gamemodel"
 "origin" "-2888.000000 -1040.000000 396.000000"
 "model" "models/fans/bigfan01.md3"
@@ -47107,3 +47091,19 @@ exx/trim-vert01
 "classname" "weapon_grenadelauncher"
 "origin" "-3584.000000 0.000000 80.000000"
 }
+{
+"classname" "weapon_seeker"
+"origin" "-2660.000000 1176.000000 120.000000"
+}
+{
+"classname" "weapon_campingrifle"
+"origin" "-2800.000000 448.000000 416.000000"
+}
+{
+"classname" "item_bullets"
+"origin" "-2800.000000 -448.000000 416.000000"
+}
+{
+"classname" "item_cells"
+"origin" "-2408.000000 -360.000000 472.000000"
+}