Merge branch 'Spike29/silentsiege' into 'master'

[xonotic/xonotic-maps.pk3dir.git] / maps / oilrig.map

diff --git a/maps/oilrig.map b/maps/oilrig.map
index 64ffd2624c68bc073ffef50d9c56ab28b747aaa2..5cc16a9b04aefca966d92a47f0928b347a1d8e6c 100644 (file)
--- a/maps/oilrig.map
+++ b/maps/oilrig.map
@@ -19850,7 +19850,7 @@ terrain01x/blends-mars-rock02-ground01
 "light" "10"
 }
 {
-"classname" "weapon_nex"
+"classname" "weapon_vortex"
 "origin" "736.000000 -616.000000 944.000000"
 }
 {
@@ -23539,9 +23539,10 @@ exx/wall-bigrib02
 "origin" "-320.000000 864.000000 -600.000000"
 }
 {
-"classname" "misc_model"
+"classname" "misc_gamemodel"
 "origin" "-256.000000 576.000000 -640.000000"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
+"lodmodel1" "models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3"
 }
 {
 "classname" "target_position"
@@ -23577,13 +23578,14 @@ exx/wall-bigrib02
 "light" "10"
 }
 {
-"classname" "weapon_uzi"
+"classname" "weapon_machinegun"
 "origin" "1776.000000 944.000000 144.000000"
 }
 {
-"classname" "misc_model"
+"classname" "misc_gamemodel"
 "origin" "1776.000000 -128.000000 128.000000"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
+"lodmodel1" "models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3"
 }
 {
 "classname" "item_armor_small"
@@ -23598,9 +23600,10 @@ exx/wall-bigrib02
 "origin" "1440.000000 -440.000000 320.000000"
 }
 {
-"classname" "misc_model"
+"classname" "misc_gamemodel"
 "origin" "1776.000000 400.000000 528.000000"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
+"lodmodel1" "models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3"
 }
 {
 "classname" "light"
@@ -23644,10 +23647,11 @@ exx/wall-bigrib02
 "targetname" "target_position3"
 }
 {
-"classname" "misc_model"
+"classname" "misc_gamemodel"
 "origin" "1248.000000 119.999962 -352.000000"
 "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3"
 "angle" "165.309097"
+"lodmodel1" "models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3"
 }
 {
 "classname" "item_armor_small"
@@ -23687,7 +23691,7 @@ exx/wall-bigrib02
 "targetname" "target_position4"
 }
 {
-"classname" "weapon_grenadelauncher"
+"classname" "weapon_mortar"
 "origin" "960.000000 960.000000 -352.000000"
 }
 {
@@ -23838,12 +23842,13 @@ exx/wall-bigrib02
 "angle" "0.000003"
 }
 {
-"classname" "misc_model"
+"classname" "misc_gamemodel"
 "origin" "224.000000 -96.000000 -640.000000"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
+"lodmodel1" "models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3"
 }
 {
-"classname" "item_invincible"
+"classname" "item_shield"
 "origin" "856.000000 -432.000000 400.000000"
 }
 {
@@ -23861,7 +23866,7 @@ exx/wall-bigrib02
 "light" "5"
 }
 {
-"classname" "weapon_rocketlauncher"
+"classname" "weapon_devastator"
 "origin" "1776.000000 392.000000 -656.000000"
 }
 {
@@ -23921,15 +23926,17 @@ exx/wall-bigrib02
 "light" "21"
 }
 {
-"classname" "misc_model"
+"classname" "misc_gamemodel"
 "origin" "2432.000000 384.000000 -871.999939"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
 "angles" "-30.000000 0.000000 0.000000"
+"lodmodel1" "models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3"
 }
 {
-"classname" "misc_model"
+"classname" "misc_gamemodel"
 "origin" "920.000000 704.000000 -672.000000"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
+"lodmodel1" "models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3"
 }
 {
 "classname" "light"
@@ -24044,9 +24051,10 @@ exx/wall-bigrib02
 "origin" "840.000000 -208.000000 344.000000"
 }
 {
-"classname" "misc_model"
+"classname" "misc_gamemodel"
 "origin" "728.000000 -248.000000 -912.000000"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
+"lodmodel1" "models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3"
 }
 {
 "classname" "light"
@@ -24070,10 +24078,11 @@ exx/wall-bigrib02
 "modelscale" "0.700000"
 }
 {
-"classname" "misc_model"
+"classname" "misc_gamemodel"
 "origin" "639.999878 -447.999939 -319.999969"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
 "angles" "-0.000000 0.000000 -26.500002"
+"lodmodel1" "models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3"
 }
 {
 "classname" "light"
@@ -24110,19 +24119,22 @@ exx/wall-bigrib02
 "spawnflags" "2"
 }
 {
-"classname" "misc_model"
+"classname" "misc_gamemodel"
 "origin" "728.000000 1208.000000 -909.000000"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
+"lodmodel1" "models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3"
 }
 {
-"classname" "misc_model"
+"classname" "misc_gamemodel"
 "origin" "1784.000000 -848.000000 -909.000000"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
+"lodmodel1" "models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3"
 }
 {
-"classname" "misc_model"
+"classname" "misc_gamemodel"
 "origin" "-264.000000 -552.000000 -912.000000"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
+"lodmodel1" "models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3"
 }
 {
 "classname" "light"