diff --git a/FuturePlans.md b/FuturePlans.md
index eef27f6a3..825ef5db8 100644
--- a/FuturePlans.md
+++ b/FuturePlans.md
@@ -33,14 +33,15 @@ More weapons, because we need 'em. In addition, all the "easy to implement" mini
- Dakka *(Fire the Sheen HMG for one minute straight)*
- [6] Quadravol *(UnSX)*
- Gravely Roast *(Perform 50 bayonet combos with the Quadravol)*
- - [7] Blackfire Igniter *(UnSX 5, Ultra Suite 3)*
- - Ice Ice Baby *(Impale 40 enemies with the Blackfire Igniter secondary)*
- - [8] Rail Carbine *("Tesla Beamer" in Ultra Suite 2 & 3)*
- - John Romero's Curse *(Fry yourself by discharging an electric weapon in water)*
+ - [7] Sparkster x3 *(UnSX 2)*
+ - A Fine Sparking *(Kill 30 enemies at once with a Sparkster Rifle combo shot)*
+ - [8] Mortal Rifle *(UnSX 2)*
+ - Railed Hard *(Shoot through 16 enemies with a single Mortal Rifle overpressure shot)*
- [9] Ray-Khom *(UnSX)*
- The Most Silent Takedown *(Kill 30 enemies with the Ray-Khom primary without alerting them)*
- - [0] Grand Lance *(SWWM Iridium)*
- - Penetrator *(Strike through 20 enemies in a row with a single Grand Lance secondary)*
+ - John Romero's Curse *(Fry yourself by discharging an electric weapon in water)*
+ - [0] Rafan-Kos *(UnSX 4)*
+ - Blasting Ropes *(Melt a grand total of 1000 enemies with the Rafan-Kos)*
* **Minigames:**
- Tetris
- Breakout
@@ -58,27 +59,18 @@ More weapons, because we need 'em. In addition, all the "easy to implement" mini
* **Additional Collectibles:**
- Saya's Mug
-## 1.4 update *(Arsenal Appendix)*:
+## 1.4 update *(Fine Refinements)*:
-A couple extra weapons, not enough for a full batch, but still worthy additions. Plus extra score incentives and achievements.
+Re-animation of old FK models. Plus extra score incentives and achievements.
-* **DLC Weaponset 2:**
- - [1] Hand of Divine *(Total Madness)*
- - Facepunching Extraordinaire *(Kill 300 enemies with the Hand of Divine)*
- - [7] Sparkster x3 *(UnSX 2)*
- - A Fine Sparking *(Kill 30 enemies at once with a Sparkster Rifle combo shot)*
- - [9] Mortal Rifle *(UnSX 2)*
- - Railed Hard *(Shoot through 16 enemies with a single Mortal Rifle overpressure shot)*
- - [0] Rafan-Kos *(UnSX 4)*
- - Blasting Ropes *(Melt a grand total of 1000 enemies with the Rafan-Kos)*
+* **Re-animate all base models with IK *(important for consistency)***
* **Additional Score Bonuses:**
- Double-Cheeked *(Buttslam kill, 1.5x)*
- - Mixup *(Different weapon between kills, +200, add +50 with each switch)*
+ - Mixup *(Different weapon between kills, +200, add +50 with each switch, 10 second cooldown)*
- Unseen *(Kill an enemy without a line of sight to yourself, +300)*
- Aerial *(Kill an enemy while in mid-air, +500)*
- YEET *(Kill a non-flying enemy while it's in the air, AFTER you sent it flying, +1000)*
- OVERWRITE *(Telefrag an enemy, overrides OVERKILL bonus, 4x)*
- - Biteback *(Kill an enemy within 3 seconds of it dealing damage to you, +700)*
- Revenge *(Kill the enemy that killed you within 30 seconds of reviving, 3x)*
- Longshot *(Kill an enemy from over 2000 map units away, +600, add +100 for each extra 1000 map units)*
- Redirect *(Kill an enemy with another enemy's projectile, +900)*
@@ -87,16 +79,13 @@ A couple extra weapons, not enough for a full batch, but still worthy additions.
- Pachinko Code *(Find the Secret Menu)*
- Double Succ *(Merge two Ynykron singularities)*
- The Ultimate Combo *(Hit a Ynykron singularity with a Ynykron beam)*
- - Master Sparked *(Kill a boss brain with the Rafan-kos)*
- Author Appeal *(Smooch a boss brain)*
- Power of Love *(Recover a total of 500 health by kissing the Kirin Plush)*
- - Froggy Gang *(Summon the Froggy Chair)*
- - Ribbit *(Kill 10 enemies with the Froggy Chair)*
- - Arsenal of Olden Times *(Find all classic UnSX weapons)*
+ - Arsenal of Olden Times *(Find all classic UnSX weapons)*
*(Quadravol, Biospark Carbine, Sparkster Rifle, Ray-Khom, Mortal Rifle, Ynykron and Rafan-Kos)*
- Know Thy Armaments *(Find all weapons)*
- Assortment of Thingamajigs *(Find all items)*
- - Words Words Words *(Read all library entries)*
+ - Words Words Words *(Read 100 library entries)*
- Oops I Pressed it *(Turn the engine off)*
## 1.5 update *(The Final Stage)*:
@@ -111,15 +100,6 @@ All the hard stuff *(some of these aren't guaranteed)*.
- Layers of White *(Summon the White Lady)*
- Fluffy Moth *(Pet the White Lady 50 times)*
- Ara Ara *(Have the White Lady kill a total of 100 enemies)*
-* **Re-animate all base models with IK *(important for consistency)***
-* **Additional gestures + gesture menu**
- - Clap
- - The Bird
- - How Very Brutal *(Flip off 20 enemies)*
- - Thumbs Down
- - Giggle
- - Shrug
- - Beckon
* **Photo Mode**
- Dedicated poses
- Stickers
diff --git a/achievements.lst b/achievements.lst
index 5dc0fcec8..687fbaeb9 100644
--- a/achievements.lst
+++ b/achievements.lst
@@ -42,7 +42,6 @@ doodle,20,yes,doom
everything,0,no,any
ezkill,50,yes,doom
ezkill,30,yes,raven
-#fisto,200,yes,any
flight,2000,yes,any
friend,20,yes,any
fuel,400,yes,any
@@ -56,7 +55,6 @@ gravity,10,yes,raven
grenade,20,yes,any
#hnd,6,yes,any
hurry,0,no,any
-#ice,40,yes,any
jump,100,yes,any
kancho,0,no,hexen
keen,0,no,doom
@@ -77,7 +75,6 @@ oopsie,0,no,any
par,15,yes,doom
parry,100,yes,any
peace,0,no,nothexen
-#pene,20,yes,any
#plasma,30,yes,any
plush,10,yes,any
puzzle,0,no,hexen
diff --git a/graphics/HUD/Icons/A_DarkAmmo.png b/graphics/HUD/Icons/A_DarkAmmo.png
deleted file mode 100644
index b516b82d2..000000000
Binary files a/graphics/HUD/Icons/A_DarkAmmo.png and /dev/null differ
diff --git a/graphics/HUD/Icons/A_EMPCore.png b/graphics/HUD/Icons/A_EMPCore.png
deleted file mode 100644
index b516b82d2..000000000
Binary files a/graphics/HUD/Icons/A_EMPCore.png and /dev/null differ
diff --git a/graphics/HUD/Icons/A_GrandAmmo.png b/graphics/HUD/Icons/A_GrandAmmo.png
deleted file mode 100644
index b516b82d2..000000000
Binary files a/graphics/HUD/Icons/A_GrandAmmo.png and /dev/null differ
diff --git a/graphics/HUD/Icons/A_GrandSpear.png b/graphics/HUD/Icons/A_GrandSpear.png
deleted file mode 100644
index b516b82d2..000000000
Binary files a/graphics/HUD/Icons/A_GrandSpear.png and /dev/null differ
diff --git a/graphics/HUD/Icons/W_Blackfire.png b/graphics/HUD/Icons/W_Blackfire.png
deleted file mode 100644
index b516b82d2..000000000
Binary files a/graphics/HUD/Icons/W_Blackfire.png and /dev/null differ
diff --git a/graphics/HUD/Icons/W_EMPCarbine.png b/graphics/HUD/Icons/W_EMPCarbine.png
deleted file mode 100644
index b516b82d2..000000000
Binary files a/graphics/HUD/Icons/W_EMPCarbine.png and /dev/null differ
diff --git a/graphics/HUD/Icons/W_FistGun.png b/graphics/HUD/Icons/W_FistGun.png
deleted file mode 100644
index b516b82d2..000000000
Binary files a/graphics/HUD/Icons/W_FistGun.png and /dev/null differ
diff --git a/graphics/HUD/Icons/W_GrandLance.png b/graphics/HUD/Icons/W_GrandLance.png
deleted file mode 100644
index b516b82d2..000000000
Binary files a/graphics/HUD/Icons/W_GrandLance.png and /dev/null differ
diff --git a/language.def_base b/language.def_base
index 390e0c505..cdc2ae00f 100644
--- a/language.def_base
+++ b/language.def_base
@@ -33,15 +33,10 @@ T_SHEENHMG = "Sheen HMG";
I_SHEENHMG = "\"Sheen\" Heavy Machine Gun";
T_QUADRAVOL = "Quadravol";
I_QUADRAVOL = "\"Quadravol\" Fireball Launcher";
-T_BLACKFIRE = "Blackfire Igniter";
-T_EMPCARBINE = "Rail Carbine";
-I_EMPCARBINE = "EMP Rail Carbine";
-T_RAYKHOM = "Ray-Khom";
-T_GRANDLANCE = "Grand Lance";
-T_FISTGUN = "Hand of Divine";
T_NEWSPARKSTER = "Sparkster Rifle";
I_NEWSPARKSTER = "Series x3 Sparkster Rifle";
T_MORTALRIFLE = "Mortal Rifle";
+T_RAYKHOM = "Ray-Khom";
T_RAFANKOS = "Rafan-Kos";
T_REDSHELL = "Shell";
T_REDSHELLS = "Shells";
@@ -101,20 +96,6 @@ T_SHEENBULLET = "14.5x114mm MT Bullet";
T_SHEENBULLETS = "14.5x114mm MT Bullets";
T_QUADAMMO = "Quadravol Cell";
T_QUADAMMOS = "Quadravol Cells";
-T_DARKAMMO = "Blackfire Canister";
-T_DARKAMMOS = "Blackfire Canisters";
-T_EMPCORE = "Dysedum Rod";
-T_EMPCORES = "Dysedum Rods";
-T_RAYBOLT = "Ray-Khom Bolt";
-T_RAYBOLTS = "Ray-Khom Bolts";
-T_RAYAMMO = "Ray-Khom Magazine";
-T_RAYAMMOS = "Ray-Khom Magazines";
-T_RAYBATTERY = "Ray-Khom Battery";
-T_RAYBATTERYS = "Ray-Khom Batteries";
-T_GRANDSPEAR = "Grand Lance Spear";
-T_GRANDSPEARS = "Grand Lance Spears";
-T_GRANDAMMO = "Grand Lance Magazine";
-T_GRANDAMMOS = "Grand Lance Magazines";
T_SPARKBCELL = "Kinylum Cell";
T_SPARKBCELLS = "Kinylum Cells";
T_SPARKRCELL = "Nokron Cell";
@@ -125,6 +106,12 @@ T_MRAMMO = "Mortal Magazine";
T_MRAMMOS = "Mortal Magazines";
T_MRGRENADE = "Mortal Grenade";
T_MRGRENADES = "Mortal Grenades";
+T_RAYBOLT = "Ray-Khom Bolt";
+T_RAYBOLTS = "Ray-Khom Bolts";
+T_RAYAMMO = "Ray-Khom Magazine";
+T_RAYAMMOS = "Ray-Khom Magazines";
+T_RAYBATTERY = "Ray-Khom Battery";
+T_RAYBATTERYS = "Ray-Khom Batteries";
T_ULTIMATEPOD = "Rafan-Kos Pod";
T_ULTIMATEPODS = "Rafan-Kos Pods";
T_ULTIMATEAMMO = "Rafan-Kos Magazine";
@@ -526,18 +513,11 @@ O_PUNTZERGAMMA = "%k drilled several holes through %o.";
O_SHEENHMG = "%k drowned %o in bullets.";
O_QUADRAVOL = "%k made delicious barbecue out of %o.";
O_QUADRAVOL2 = "%o was gravely roasted by %k.";
-O_BLACKFIRE = "%k turned %o into a popsicle.";
-O_BLACKFIRE2 = "%o was very coldly impaled by %k.";
-O_EMPCARBINE = "%o was quite shocked by %k's lightning powers.";
-O_RAYKHOM = "%o received an express delivery of deadly plasma from %k.";
-O_RAYKHOM2 = "%o witnessed %k's UNLIMITED POWER.";
-O_GRANDLANCE = "%o was torn asunder by %k's Grand Lance.";
-O_GRANDLANCE2 = "%k showed %o how efficient nuclear fusion is.";
-O_FISTGUN = "%o ate %k's divine knuckle sandwich.";
-O_FISTGUN2 = "%k delivered a divine smackdown upon %o.";
O_NEWSPARKSTER = "%o witnessed the might of %k's plasma artillery.";
O_MORTALRIFLE = "%k killed %o very dead.";
O_MORTALRIFLEALT = "%o caught a very deadly grenade from %k.";
+O_RAYKHOM = "%o received an express delivery of deadly plasma from %k.";
+O_RAYKHOM2 = "%o witnessed %k's UNLIMITED POWER.";
O_RAFANKOS = "%o stood no chance against %k's ultimate weapon.";
O_POUND = "%o was very impressed by %k's landing.";
O_DASH = "%o was discombobulated by a very fast moving %k.";
@@ -828,28 +808,6 @@ TT_QUADRAVOL =
"\cfReload:\c- Load cells.\n"
"\cfZoom+Fire:\c- Toggle spread mode.\n"
"\cfZoom+Altfire:\c- Switch firing stance.";
-TT_BLACKFIRE =
-"\cfFire:\c- Freeze thrower.\n"
-"\cfAltfire:\c- Icicle shot.\n"
-"\cfReload:\c- Reload canister(s).";
-TT_EMPCARBINE =
-"\cfFire:\c- Ionize / shoot.\n"
-"\cfAltfire:\c- Multi-target ionization.\n"
-"\cfZoom:\c- Use scope.\n"
-"\cfReload:\c- Load rods.";
-TT_RAYKHOM =
-"\cfFire:\c- Shoot weapon.\n"
-"\cfAltfire:\c- Lightning attack.\n"
-"\cfReload:\c- Reload weapon.\n"
-"\cfZoom:\c- Reload battery.";
-TT_GRANDLANCE =
-"\cfFire:\c- Shoot weapon.\n"
-"\cfAltfire:\c- Charged shot.\n"
-"\cfReload:\c- Reload weapon.\n"
-"\cfZoom:\c- Reload battery.";
-TT_FISTGUN =
-"\cfFire:\c- Throw punch.\n"
-"\cfAltfire:\c- Wide slap.";
TT_NEWSPARKSTER =
"\cfFire:\c- Kinylum shot.\n"
"\cfAltfire:\c- Nokron shot.\n"
@@ -861,6 +819,11 @@ TT_MORTALRIFLE =
"\cfAltfire:\c- Shoot grenade.\n"
"\cfZoom:\c- Cycle fire modes.\n"
"\cfReload:\c- Reload weapon.";
+TT_RAYKHOM =
+"\cfFire:\c- Shoot weapon.\n"
+"\cfAltfire:\c- Lightning attack.\n"
+"\cfReload:\c- Reload weapon.\n"
+"\cfZoom:\c- Reload battery.";
TT_RAFANKOS =
"\cfFire:\c- Single beam.\n"
"\cfAltfire:\c- Multi beam.\n"
@@ -1011,11 +974,11 @@ SWWM_INTERTIP60 = "Despite its seemingly puny size, the Plasma Blaster has a lot
SWWM_INTERTIP61 = "The Puntzer guns can easily pierce through solid objects or even thin walls. No enemy will ever be safe behind cover.";
SWWM_INTERTIP62 = "\"The Sheen HMG is such a delicious festival of dakka that the mere sound of it firing makes me unleash Leviathan in my panties, and you can quote me on that.\" — Saya Miyamoto";
SWWM_INTERTIP63 = "Pressing fire immediately after hitting something with the Quadravol's blades will result in a boosted point-blank explosion that'll send whatever's at the other end of the gun flying.";
-SWWM_INTERTIP64 = "The Blackfire Igniter leaves a lingering trail of coldness long after its flames have died down, dealing even more damage.";
-SWWM_INTERTIP65 = "The Blackfire Igniter can produce blocks of ice that float above liquids, becoming temporary walkable platforms. Do note that this obviously won't work on lava.";
-SWWM_INTERTIP66 = "You can mark multiple targets with the Rail Carbine's ionizer and then hit them all in a single discharge. Do be quick, however, because the charge fades over time.";
+SWWM_INTERTIP64 = "Holding down the triggers with the Sparkster Rifle will gradually increase firing potency upon release. Fortunately, there is no potential here for the weapon to blow up if you keep them held long enough, only badly designed human weaponry could be so haphazard.";
+SWWM_INTERTIP65 = "The Sparkster Rifle can fire both ammo types simultaneously, blending them together into a deadly combo projectile.";
+SWWM_INTERTIP66 = "The Mortal Rifle (\"Mister\" for short) was devised as a potential \"standard\" battle rifle for the X'Animen Coalition that \"even the Xekkians would consider powerful\". It seems to have succeeded in that aspect, considering how truly mortal it is, although it is not widely adopted... Yet.";
SWWM_INTERTIP67 = "Being primarily a coilgun, the Ray-Khom is almost entirely silent and perfect for stealthy kills. Do note though that the impact of the projectile itself will be very loud.";
-SWWM_INTERTIP68 = "The Grand Lance is a much safer alternative to the Ynykron Artifact if you don't want to accidentally kill yourself or your friends.";
+SWWM_INTERTIP68 = "The Rafan-Kos is truly an Ultimate Weapon, as its name implies.";
SWWM_INTERTIP69 = "Nice.";
SWWM_INTERTIP70 = "Did you know that even with seat belts people die all the time in car crashes? I thought that was interesting.";
SWWM_INTERTIP71 = "\"On the internet nobody can hear you being subtle.\" — Linus Torvalds";
@@ -1081,12 +1044,12 @@ SWWM_INTERTIP130 = "The Ragekit's speed boost may make you violently bump agains
SWWM_INTERTIP131 = "In Heretic and Hexen, an item known as the Safety Tether may appear. If by any chance you get stuck in some seemingly inescapable trap, this will be your trump card.";
SWWM_INTERTIP132 = "The Devastation Sigil is rather unstable, but provides a much higher boost of damage than the Ragekit, for ALL damage you may deal, including to yourself. Yeah, quite a dangerous little toy, that one.";
SWWM_INTERTIP133 = "The Divine Sprite can boost your health to absurd levels, but its effects fade quickly after a while. It is the most potent healing item you have in hand, but do keep in mind it has to be activated manually. Unlike most others, it won't come to save your ass by itself.";
-SWWM_INTERTIP134 = "The Hand of Divine is yet another weapon that can benefit from the effects of the Ragekit, turning what's already a lethal punch into something truly god-like.";
-SWWM_INTERTIP135 = "Holding down the triggers with the Sparkster Rifle will gradually increase firing potency upon release. Fortunately, there is no potential here for the weapon to blow up if you keep them held long enough, only badly designed human weaponry could be so haphazard.";
-SWWM_INTERTIP136 = "The Sparkster Rifle can fire both ammo types simultaneously, blending them together into a deadly combo projectile.";
-SWWM_INTERTIP137 = "The Mortal Rifle (\"Mister\" for short) was devised as a potential \"standard\" battle rifle for the X'Animen Coalition that \"even the Xekkians would consider powerful\". It seems to have succeeded in that aspect, considering how truly mortal it is, although it is not widely adopted... Yet.";
-SWWM_INTERTIP138 = "The Rafan-Kos is truly an Ultimate Weapon, as its name implies.";
-SWWM_INTERTIP139 = "It's said that the Hand of Divine bears only a minuscule fraction of its original creator's power. Guy must pack one hell of a wallop, then.";
+SWWM_INTERTIP134 = "The Demolitionist is not alone in their mission. Many more heroes have been known to be fighting out there as well.";
+SWWM_INTERTIP135 = "Demo-chan has a crush on a certain videogame robot who also kills demons in style.";
+SWWM_INTERTIP136 = "Generally, your enemies are stupid enough to run into your line of fire. If they were smarter, they wouldn't even try to fight you.";
+SWWM_INTERTIP137 = "Powerups exist to be used, so don't be afraid of \"wasting\" them. If the chance comes, just hit it. You'll find more eventually.";
+SWWM_INTERTIP138 = "The Demons avoided invading Australia for some reason. Maybe the climate there is worse than in Hell.";
+SWWM_INTERTIP139 = "If you feel the game is throwing way too much stuff at you, you can make some quick cash selling excess items.";
SWWM_INTERTIP140 = "The Demolitionist's chassis carries a faint lime scent.";
SWWM_INTERTIP141 = "\"In the future, everything is Chrome.\"\n\nNever has a line from a children's cartoon rung more true after the inevitable rise of the web-app supremacy.";
SWWM_INTERTIP142 = "This mod is in constant development. Remember to report any bugs you may find.";
@@ -1197,8 +1160,6 @@ SWWM_ACHIEVEMENT_EVERYTHING_TAG = "The Demolitionist";
SWWM_ACHIEVEMENT_EVERYTHING_TXT = "Unlock all achievements";
SWWM_ACHIEVEMENT_EZKILL_TAG = "Misa's Pride";
SWWM_ACHIEVEMENT_EZKILL_TXT = "Kill %d enemies with a single Ynykron Artifact shot (excluding altfire)";
-SWWM_ACHIEVEMENT_FISTO_TAG = "Facepunching Extraordinaire";
-SWWM_ACHIEVEMENT_FISTO_TXT = "Kill %d enemies with the Hand of Divine";
SWWM_ACHIEVEMENT_FLIGHT_TAG = "Blasting Off Again";
SWWM_ACHIEVEMENT_FLIGHT_TXT = "Send an enemy flying over %d map units away";
SWWM_ACHIEVEMENT_FRIEND_TAG = "Do You Like Caco?";
@@ -1229,8 +1190,6 @@ SWWM_ACHIEVEMENT_HND_TAG = "High Noon";
SWWM_ACHIEVEMENT_HND_TXT = "Land %d killing shots in a single Puntzer Beta reload";
SWWM_ACHIEVEMENT_HURRY_TAG = "In a Hurry";
SWWM_ACHIEVEMENT_HURRY_TXT = "Beat a map with 0 kills, items and secrets";
-SWWM_ACHIEVEMENT_ICE_TAG = "Ice Ice Baby";
-SWWM_ACHIEVEMENT_ICE_TXT = "Impale %d enemies with the Blackfire Igniter secondary";
SWWM_ACHIEVEMENT_JUMP_TAG = "Verticality";
SWWM_ACHIEVEMENT_JUMP_TXT = "Walljump %d times";
SWWM_ACHIEVEMENT_KANCHO_TAG = "Extreme Kancho";
@@ -1271,8 +1230,6 @@ SWWM_ACHIEVEMENT_PAR_TAG = "Fast";
SWWM_ACHIEVEMENT_PAR_TXT = "Beat the par time in %d maps";
SWWM_ACHIEVEMENT_PEACE_TAG = "Pacifist";
SWWM_ACHIEVEMENT_PEACE_TXT = "Finish a map without dealing damage";
-SWWM_ACHIEVEMENT_PENE_TAG = "Penetrator";
-SWWM_ACHIEVEMENT_PENE_TXT = "Strike through %d enemies in a row with a single Grand Lance secondary";
SWWM_ACHIEVEMENT_PLASMA_TAG = "Blastin' Plasma";
SWWM_ACHIEVEMENT_PLASMA_TXT = "Kill an enemy at full health with a Plasma Blaster charged shot %d times";
SWWM_ACHIEVEMENT_PLUSH_TAG = "Lovestruck";
diff --git a/language.def_lore b/language.def_lore
index 2b43a7609..abefc1c97 100644
--- a/language.def_lore
+++ b/language.def_lore
@@ -330,34 +330,6 @@ SWWM_LORETXT_BIGSHOT2 =
"\cfYeah, dude's crazy, but see, THAT thing... I really REALLY wanted it. I even met up with the guy to get my hands on it. That shit is like... completely fucking insane, and I bet no living human would be able to fucking use it, BUT... you definitely can. Just so you know, every time you whip out that ballbusting hunk of metal, I'll be watching, so you better give me some fine entertainment to munch popcorn to.\c-\n"
"\n"
"\cfHonestly I'm not surprised the guy survived the whole thing, probably blasted a thousand demons himself with the shit he's got in there, too. Also, no fucking clue what that thing about fights and faces and shit is, must've gone even crazier with all the demon invasion stuff happening.\c-";
-SWWM_LORETAG_BLACKFIREIGNITER = "Blackfire Igniter";
-SWWM_LORETAB_BLACKFIREIGNITER = "Item";
-SWWM_LOREREL_BLACKFIREIGNITER = "Sankaideriha;Unissix;Gods;Saya";
-SWWM_LORETXT_BLACKFIREIGNITER =
-"\cxDesignation:\c-\n"
-"\cf Blackfire Igniter\c-\n"
-"\cxManufacturer:\c-\n"
-"\cf Unissix Crafts\c-\n"
-"\cf Design by LS\c-\n"
-"\cxClassification:\c-\n"
-"\cf Flamethrower\c-\n"
-"\n"
-"Devised by the primordial god of magic themself, the \cfBlackfire Igniter\c- is rather surprisingly a very cold, dark weapon. Blackfire is a type of magical flame that absorbs heat and light, rather than emitting them.\n"
-"\n"
-"During the height of \cfUnissix Crafts\c-'s fame, the god personally approached \cfMisa Unissix\c- herself with a request for a weapon that would allow just about anyone to readily perform \cfBlackfire Manipulation Magic\c-.\n"
-"\n"
-"The Igniter is the perfect blend of magic and technology, weaponized. At your fingertips, you have the power to call forth freezing flames that will turn your enemies into pretty ice statues in mere seconds.\n"
-"\n"
-"\cfPrimary Fire:\c- Releases a continuous stream of Blackfire, with moderate range. The flames not only rapidly freeze whatever they touch, but also reduce the air temperature, leaving a lingering freeze effect.\n"
-"\n"
-"\cfSecondary Fire:\c- Concentrated bursts that form spears of supercooled air which can impale small targets, or tear right through them.\n"
-"\n"
-"\cfReloading:\c- Attach up to two canisters to replenish the weapon's internal dark mana reserves. Each canister will remain locked in until it's been emptied, otherwise residual energy could escape and bring harm to the user. If there is an empty canister attached, the reload action will detach it first. Fresh canisters can still be used even if the tank is full, and they will act as an extra \"buffer\" of mana until depleted.\n"
-"\n"
-"\cxSaya's Notes:\c-\n"
-"\cfSo yeah, Misa-Misa has other toys besides that one bigass gun. Pretty cool that she gets requests and whatnot, lil' cinnamon roll's quite popular there, heheheh...\c-\n"
-"\n"
-"\cfI heard very little of all this Blackfire stuff from LS-sama, but it sounds like fun. Wonder if it can be used in a spellcard...\c-";
SWWM_LORETAG_BLACKMANN = "Blackmann Arms";
SWWM_LORETAB_BLACKMANN = "People";
SWWM_LOREREL_BLACKMANN = "BigShot;Saya";
@@ -1012,37 +984,6 @@ SWWM_LORETXT_ELLEN =
"\cfOh yeah, speaking of Ellen-san. She's a goddamn massive prankster, like, the most awfully skilled troll you could ever imagine, even. See, there was this one time... actually, I think I'll keep quiet about it, because it was embarrassing as all hell. My ass is still sore from back then. I'm NOT going to explain, fuck no. Use your imagination, Demo-chan.\c-\n"
"\n"
"\cfAh, also, one super good thing about having her around. She's got some interesting connections. Yeah, most people don't know, but her gramps is a demon. Like, actual demon, from Hell and all. Some real cutie too. Name's Cytho Valathor, and he says he's a \"reformed incubus\", whatever that means. Whenever I need to know anything about what's going on in the land of fire 'n brimstone, he's the guy I go to.\c-";
-SWWM_LORETAG_EMPCARBINE = "Rail Carbine";
-SWWM_LORETAB_EMPCARBINE = "Item";
-SWWM_LOREREL_EMPCARBINE = "EngineTech;DecadeMech;UAC;Saya";
-SWWM_LORETXT_EMPCARBINE =
-"\cxDesignation:\c-\n"
-"\cf EMP Rail Carbine\c-\n"
-"\cxManufacturer:\c-\n"
-"\cf Tach-Engine Technology Institute\c-\n"
-"\cxClassification:\c-\n"
-"\cf Directed Energy Weapon\c-\n"
-"\n"
-"The \cfEMP Rail Carbine\c- is \cfTach-Engine\c-'s very first attempt at combining existing human technology with the retrieved experiments from their expedition to the ruined headquarters of \cfDecade Mechanics\c-. Akin to typical particle-beam weaponry, but with a boost of thundering, highly destructive exotic matter, it has been deemed far superior even to the mighty \cfThunder Buster\c- so well-prized by UAC troops.\n"
-"\n"
-"Unexpectedly, the Rail Carbine is a tube fed bolt-action rifle, which employs shielded rods of pure \cfDysedum\c-. Each of these allowing the weapon to discharge guided 20kA pulses towards an ionized target, frying it in an instant, and potentially spreading its deadly effects to others nearby.\n"
-"\n"
-"It should be noted that this weapon is unsafe to use in water, as the discharge will spread violently throughout the entire medium.\n"
-"\n"
-"\cfPrimary Fire:\c- Hold to emit a faint ionizing charge towards the aimed spot. The longer this is held, the more accurate the shot will be. Release to discharge the beam. If the rod has been depleted, cycle the bolt to load a new one.\n"
-"\n"
-"\cfSecondary Fire:\c- Also emits an ionizing charge, but does not discharge on release. Useful if you can't guarantee your target will always be in sight, or if you want to quickly mark several targets.\n"
-"\n"
-"\cfZoom:\c- Adjustable sight up to 8x.\n"
-"\n"
-"\cfReloading:\c- More rods can be fed into the weapon as needed, up to a maximum of three.\n"
-"\n"
-"\cfTechniques:\c- By ionizing several targets you can guarantee that the beam will branch out into lesser arcs and strike them all, though the damage potential will be divided among them.\n"
-"\n"
-"\cxSaya's Notes:\c-\n"
-"\cfYou know, anything that dabs on the UAC with its mere existence is good in my book.\c-\n"
-"\n"
-"\cfThis thing, though, also gets bonus points for its sheer pants-shittingly intense potential to deep fry sons of bitches. Seriously, it's like actual fucking lightning shooting out of this.\c-";
SWWM_LORETAG_ENGINETECH = "Tach-Engine";
SWWM_LORETAB_ENGINETECH = "People";
SWWM_LOREREL_ENGINETECH = "UAC;Nukuri;DecadeMech;Saya;Nekuratek;WhiteScar";
@@ -1159,30 +1100,6 @@ SWWM_LORETXT_FABRICATOR =
"\cfOh, you've got to be fucking kidding me. Now nerdboy's just straight up giving us bullshit gacha nonsense, with tiers and all.\c-\n"
"\n"
"\cfI swear, he's doing this shit on purpose to piss me off or something.\c-";
-SWWM_LORETAG_FISTGUN = "Hand of Divine";
-SWWM_LORETAB_FISTGUN = "Item";
-SWWM_LOREREL_FISTGUN = "Unissix;Gods;Zanaveth3;Saya";
-SWWM_LORETXT_FISTGUN =
-"\cxDesignation:\c-\n"
-"\cf Hand of Divine\c-\n"
-"\cxManufacturer:\c-\n"
-"\cf Korovithuhcp (original)\c-\n"
-"\cf Unissix Crafts (replica)\c-\n"
-"\cxDesignation:\c-\n"
-"\cf Magic Gauntlet\c-\n"
-"\n"
-"The \cfHand of Divine\c- was a weapon that the god \cfKorovithuhcp\c- constructed countless millenia ago, and had been passed down among many heroes of legend. Eventually it was lost, and the god had no interest in building a new one. This, obviously, did not stop \cfMisa Unissix\c- from attempting to do exactly just that. Following historical records of its use, she built her own version through a blend of arcane magic and modern technology. She gifted one to her daughter, \cfZanaveth Nekuraku III\c-, and another to the \cfDemolitionist\c-.\n"
-"\n"
-"\cfPrimary Fire:\c- Charges up a punch, and then releases it. The gauntlet will fling itself forward and then return to you.\n"
-"\n"
-"\cfSecondary Fire:\c- Charges up a wide arc slap. On release this will very loudly and violently whack all targets in front of you.\n"
-"\n"
-"\cfTechniques:\c- Due to its nature, the Hand of Divine is susceptible to the effects of a \cfRagekit\c-, increasing its strength and range.\n"
-"\n"
-"\cxSaya's Notes:\c-\n"
-"\cfMan that sure was a special delivery from Zana-chan. And when we showed that it was good, and fun, Misa-Misa got all excited and started mass-producing them. She's just too adorable, I swear.\c-\n"
-"\n"
-"\cfAnyway, those fiends are gonna get knocked the fuck out with this thing. Can't wait to see it in action on real targets. Especially after... that incident with the punching bag.\c-";
SWWM_LORETAG_FORX = "Forx Aeronautics";
SWWM_LORETAB_FORX = "People";
SWWM_LOREREL_FORX = "Propulsor;Saya;UAC";
@@ -1447,39 +1364,6 @@ SWWM_LORETXT_GODS2 =
"\cfYou know, some people ask me how I'm still agnostic. I doubt they really know what agnosticism even is.\c-\n"
"\n"
"\cfUpdate: The stuff about the admins is in another article. That really was fucking wild, I swear. There's no way in hell I'll ever forget about what happened the day after our wedding with Kirin-kun, holy fuck...\c-";
-SWWM_LORETAG_GRANDLANCE = "Grand Lance";
-SWWM_LORETAB_GRANDLANCE = "Item";
-SWWM_LOREREL_GRANDLANCE = "Kmonn;Xekke;Saya;Unissix";
-SWWM_LORETXT_GRANDLANCE =
-"\cxDesignation:\c-\n"
-"\cf Suvan-Kin (\"Grand Lance\")\c-\n"
-"\cxManufacturer:\c-\n"
-"\cf Eushura Kmonn Jr.\c-\n"
-"\cxClassification:\c-\n"
-"\cf Portable Rail Gun\c-\n"
-"\n"
-"Devised as the \"last word\" in weaponry, the \cfSuvan-Kin\c- (\"Grand Lance\" in the \cfXekkas\c- language) is the world's first truly portable rail gun, capable of launching projectiles at speeds of up to 7500km/h (or 14000km/h at full charge). The weapon is powered entirely by a compact quad-cell Korberon-Eneiebium battery pack, easy to replace when needed. The ammunition employed are high-resonant Almasteel spears, capable of piercing cleanly through anything, without even as much as a single dent.\n"
-"\n"
-"If the piercing potential of these spears isn't destructive enough, a miniature pure-fusion bomb embedded at the head will surely add up even more to that. In the words of the \cfXekkian\c- people: \cf\"The blinding flames of a sacrificed newborn star shall tear asunder all life, rend the soul from its body, and leave no trace whatsoever of those unfortunate to have wronged the wielder of the Grand Lance.\"\c-\n"
-"\n"
-"\cfPrimary Fire:\c- Single-target firing. The spear will automatically detonate on contact with anything. The area of effect is rather massive, so keep your distance. Due to the resilience of the material used, the spear will not be destroyed, and may potentially ricochet and hit something else.\n"
-"\n"
-"\cfSecondary Fire:\c- Multi-target firing. The spear is shot at a much higher velocity, and will penetrate multiple targets until finally stopping at something sufficiently solid.\n"
-"\n"
-"\cfPrimary Reload:\c- Reload the weapon.\n"
-"\n"
-"\cfSecondary Reload:\c- Swaps the battery. This action can only be performed once the charge is low enough, as it would be wasteful otherwise.\n"
-"\n"
-"\cfTechniques:\c- The longer you hold secondary fire, the stronger and faster the shot will be. At full charge it may even breach walls.\n"
-"\n"
-"\cfWarning:\c- Before firing, the rails must extend to their full length. If there are any obstacles in the way that can't be cleared, operation of the weapon is cancelled.\n"
-"\n"
-"\cxSaya's Notes:\c-\n"
-"\cfExcuse me, WHAT THE FUCK IS THIS???\c-\n"
-"\n"
-"\cfIs this a motherfucking rail gun? Like, the real deal? And it's actually portable?? AND IT SHOOTS MOTHERFUCKING SPEARS WITH MOTHERFUCKING FUSION BOMBS IN THEM??? OK, forget what I said about that other bigass gun from Kmonn, THIS SHIT is actually even more fucking ridiculous, like, what in the actual name of fuck???\c-\n"
-"\n"
-"\cfYeah, so that's why it's placed on the same slot as the Ynykron. Think of it as a \"safer\" alternative, basically. It's not world-ending, but it's still way too fucking strong.\c-";
SWWM_LORETAG_GRAVITYSUPPRESSOR = "Gravity Suppressor";
SWWM_LORETAB_GRAVITYSUPPRESSOR = "Item";
SWWM_LOREREL_GRAVITYSUPPRESSOR = "Cyrus;Saya";
diff --git a/language.def_voice b/language.def_voice
index 9d3f51812..2ba31b581 100644
--- a/language.def_voice
+++ b/language.def_voice
@@ -290,13 +290,9 @@ SWWM_SUBS_DEFAULT_GETPUNTZERBETA = "Gonna drill some sense into y'all."; // said
SWWM_SUBS_DEFAULT_GETPUNTZERGAMMA = "Full auto and... fuller auto? Oh my...";
SWWM_SUBS_DEFAULT_GETHEAVYMAHSHEENGUN = "Heavy Machine Gun!";
SWWM_SUBS_DEFAULT_GETQUADRAVOL = "For the flames of the Ardent Cross spread throughout the horde...";
-SWWM_SUBS_DEFAULT_GETBLACKFIREIGNITER = "There sure is nothing more metal than black fire.";
-SWWM_SUBS_DEFAULT_GETEMPCARBINE = "The EMP stands for how empowered I feel by this.";
-SWWM_SUBS_DEFAULT_GETRAYKHOM = "The absolute GIRTH of this thing, damn...";
-SWWM_SUBS_DEFAULT_GETGRANDLANCE = "Game over, you're all fucked.";
-SWWM_SUBS_DEFAULT_GETWHITEGLOVE = "Alright, who wants a knuckle sandwich?";
SWWM_SUBS_DEFAULT_GETNEWSPARKSTER = "I like big plasma weapons.";
SWWM_SUBS_DEFAULT_GETMORTALRIFLE = "Welcome aboard, Mister.";
+SWWM_SUBS_DEFAULT_GETRAYKHOM = "The absolute GIRTH of this thing, damn...";
SWWM_SUBS_DEFAULT_GETRAFANKOS = "Ultimate... I like the sound of that.";
// key received
SWWM_SUBS_DEFAULT_NKEYGET = "5";
diff --git a/language.es_base b/language.es_base
index 88a3a6435..50702047d 100644
--- a/language.es_base
+++ b/language.es_base
@@ -25,11 +25,6 @@ I_PUNTZERGAMMA = "Carabina de Asalto Puntzer \"Gamma\"";
T_SHEENHMG = "Ametralladora Sheen";
I_SHEENHMG = "Ametralladora Pesada \"Sheen\"";
I_QUADRAVOL = "Lanzador de Bolas de Fuego \"Quadravol\"";
-T_BLACKFIRE = "Encendedor de Fuego Negro";
-T_EMPCARBINE = "Carabina Raíl";
-I_EMPCARBINE = "Carabina Raíl EMP";
-T_GRANDLANCE = "Gran Lanza";
-T_FISTGUN = "Mano Divina";
T_NEWSPARKSTER = "Rifle Sparkster";
I_NEWSPARKSTER = "Rifle Sparkster Serie x3";
T_MORTALRIFLE = "Rifle Mortal";
@@ -88,20 +83,6 @@ T_SHEENBULLET = "Bala 14.5x114mm MT";
T_SHEENBULLETS = "Balas 14.5x114mm MT";
T_QUADAMMO = "Célula de Quadravol";
T_QUADAMMOS = "Células de Quadravol";
-T_DARKAMMO = "Frasco de Fuego Negro";
-T_DARKAMMOS = "Frascos de Fuego Negro";
-T_EMPCORE = "Barra de Dysedum";
-T_EMPCORES = "Barras de Dysedum";
-T_RAYBOLT = "Proyectil de Ray-Khom";
-T_RAYBOLTS = "Proyectiles de Ray-Khom";
-T_RAYAMMO = "Cargador de Ray-Khom";
-T_RAYAMMOS = "Cargadores de Ray-Khom";
-T_RAYBATTERY = "Batería de Ray-Khom";
-T_RAYBATTERYS = "Baterías de Ray-Khom";
-T_GRANDSPEAR = "Arpón de Gran Lanza";
-T_GRANDSPEARS = "Arpones de Gran Lanza";
-T_GRANDAMMO = "Cargador de Gran Lanza";
-T_GRANDAMMOS = "Cargadores de Gran Lanza";
T_SPARKBAMMO = "Célula de Kinylum";
T_SPARKBAMMOS = "Células de Kinylum";
T_SPARKRAMMO = "Célula de Nokron";
@@ -112,6 +93,12 @@ T_MRAMMO = "Cargador Mortal";
T_MRAMMOS = "Cargadores Mortales";
T_MRGRENADE = "Granada Mortal";
T_MRGRENADES = "Granadas Mortales";
+T_RAYBOLT = "Proyectil de Ray-Khom";
+T_RAYBOLTS = "Proyectiles de Ray-Khom";
+T_RAYAMMO = "Cargador de Ray-Khom";
+T_RAYAMMOS = "Cargadores de Ray-Khom";
+T_RAYBATTERY = "Batería de Ray-Khom";
+T_RAYBATTERYS = "Baterías de Ray-Khom";
T_ULTIMATEPOD = "Cápsula de Rafan-Kos";
T_ULTIMATEPODS = "Cápsulas de Rafan-Kos";
T_ULTIMATEAMMO = "Cargador de Rafan-Kos";
@@ -425,18 +412,11 @@ O_PUNTZERGAMMA = "%k taladró varios agujeros a través de %o.";
O_SHEENHMG = "%k ahogó a %o en balas.";
O_QUADRAVOL = "%k hizo deliciosa barbacoa de %o.";
O_QUADRAVOL2 = "%o fue ensartad@[ao_esp] por %k.";
-O_BLACKFIRE = "%k convirtió a %o en un helado.";
-O_BLACKFIRE2 = "%o fue empalado muy fríamente por %k.";
-O_EMPCARBINE = "%o quedó en shock tras presenciar los poderes de rayo de %k.";
-O_RAYKHOM = "%o recibió un envío exprés de plasma mortal de parte de %k.";
-O_RAYKHOM2 = "%o presenció el PODER ILIMITADO de %k.";
-O_GRANDLANCE = "%o fue despedazad@[ao_esp] por la Gran Lanza de %k.";
-O_GRANDLANCE2 = "%k mostró a %o lo eficiente que es la fusión nuclear.";
-O_FISTGUN = "%o se tragó el sándwich de puño divino de %k.";
-O_FISTGUN2 = "%k le mandó un guantazo divino a %o.";
O_NEWSPARKSTER = "%o fue testigo del poder de la artillería de plasma de %k.";
O_MORTALRIFLE = "%k mató a %o bien muert@[ao_esp].";
O_MORTALRIFLEALT = "%o atrapó una granada muy mortal de %k.";
+O_RAYKHOM = "%o recibió un envío exprés de plasma mortal de parte de %k.";
+O_RAYKHOM2 = "%o presenció el PODER ILIMITADO de %k.";
O_RAFANKOS = "%o no pudo hacer nada contra el arma definitiva de %k.";
O_POUND = "%o se llevó una gran impresión del aterrizaje de %k.";
O_DASH = "%o fue descuajeringad@[ao_esp] a todo gas por %k.";
@@ -714,28 +694,6 @@ TT_QUADRAVOL =
"\cfRecarga:\c- Cargar células.\n"
"\cfZoom+Primario:\c- Alternar modo disperso.\n"
"\cfZoom+Secundario:\c- Cambiar postura de arma.";
-TT_BLACKFIRE =
-"\cfPrimario:\c- Lanzafrío.\n"
-"\cfSecundario:\c- Disparo de carámbano.\n"
-"\cfRecarga:\c- Recargar frasco(s).";
-TT_EMPCARBINE =
-"\cfPrimario:\c- Ionizar / disparar.\n"
-"\cfSecundario:\c- Ionización multi-objetivo.\n"
-"\cfZoom:\c- Usar mira.\n"
-"\cfRecarga:\c- Cargar barras.";
-TT_RAYKHOM =
-"\cfPrimario:\c- Disparar arma.\n"
-"\cfSecundario:\c- Ataque de rayo.\n"
-"\cfRecarga:\c- Recargar arma.\n"
-"\cfZoom:\c- Recargar batería.";
-TT_GRANDLANCE =
-"\cfPrimario:\c- Disparar arma.\n"
-"\cfSecundario:\c- Disparo cargado.\n"
-"\cfRecarga:\c- Recargar arma.\n"
-"\cfZoom:\c- Recargar batería.";
-TT_FISTGUN =
-"\cfPrimario:\c- Lanzar puño.\n"
-"\cfSecundario:\c- Bofetada en arco.";
TT_NEWSPARKSTER =
"\cfPrimario:\c- Disparo de Kinylum.\n"
"\cfSecundario:\c- Disparo de Nokron.\n"
@@ -747,6 +705,11 @@ TT_MORTALRIFLE =
"\cfSecundario:\c- Disparar granada.\n"
"\cfZoom:\c- Cambiar modo de disparo.\n"
"\cfRecarga:\c- Recargar arma.";
+TT_RAYKHOM =
+"\cfPrimario:\c- Disparar arma.\n"
+"\cfSecundario:\c- Ataque de rayo.\n"
+"\cfRecarga:\c- Recargar arma.\n"
+"\cfZoom:\c- Recargar batería.";
TT_RAFANKOS =
"\cfPrimario:\c- Haz singular.\n"
"\cfSecundario:\c- Haz múltiple.\n"
@@ -892,11 +855,11 @@ SWWM_INTERTIP60 = "A pesar de su aparentemente penoso tamaño, el Blaster de Pla
SWWM_INTERTIP61 = "Las armas Puntzer pueden penetrar fácilmente objetos sólidos e incluso paredes de poco grosor. Ningún enemigo estará seguro detrás de su cobertura.";
SWWM_INTERTIP62 = "\"La Ametralladora Sheen es tal festival delicioso de dakka que el mero sonido de dispararla hace que desate a Leviatán en mis bragas, y puedes citarme en eso.\" — Saya Miyamoto";
SWWM_INTERTIP63 = "Pulsando disparo inmediatamente después de golpear algo con las bayonetas del Quadravol resultará en una explosión aumentada a bocajarro que mandará a lo que sea que esté al otro lado volando.";
-SWWM_INTERTIP64 = "El Encendedor de Fuego Negro deja un rastro prolongado de frío mucho después de que sus llamas se hayan apagado, causando mucho más daño.";
-SWWM_INTERTIP65 = "El Encendedor de Fuego Negro puede producir bloques de hielo que flotan sobre líquidos, convirtiéndose en plataformas temporales. Ten en cuenta que esto obviamente no funcionará en lava.";
-SWWM_INTERTIP66 = "Puedes marcar múltiples objetivos con el ionizador de la Carabina de Raíl y luego alcanzarlos a todos en una sola descarga. Pero debes hacerlo rápido, ya que la carga se disipa con el tiempo.";
+SWWM_INTERTIP64 = "Mantener los gatillos del Rifle Sparkster pulsados incrementará gradualmente la potencia de disparo al soltarlos. Afortunadamente, no existe la posibilidad de que el arma explote si los mantienes demasiado tiempo, solo un arma mal diseñada por humanos podría ser tan disfuncional.";
+SWWM_INTERTIP65 = "El Rifle Sparkster puede disparar ambos tipos de munición simultáneamente, mezclando todo en un mortífero proyectil combinado.";
+SWWM_INTERTIP66 = "El Rifle Mortal (\"Míster\" para los amigos) fue ideado como un posible rifle de batalla \"estándar\" para la Coalición X'Animen que \"incluso los Xekkian considerarían poderoso\". Parece que en ese aspecto ha sido un éxito, considerando lo verdaderamente mortal que es, aunque no tiene mucha adopción... Por ahora.";
SWWM_INTERTIP67 = "Siendo principalmente una pistola de bobina, la Ray-Khom es casi completamente silenciosa y perfecta para matar sigilosamente. Ten en cuenta sin embargo que el impacto del proyectil en sí será muy ruidoso.";
-SWWM_INTERTIP68 = "La Gran Lanza es una alternativa más segura al Artefacto Ynykron si no quieres matarte a ti o a tus amigos accidentalmente.";
+SWWM_INTERTIP68 = "La Rafan-Kos es ciertamente un Arma Definitiva, como su nombre implica.";
SWWM_INTERTIP70 = "¿Sabíais que incluso con cinturones de seguridad la gente muere todo el tiempo en accidentes de coche? Pensé que era interesante.";
SWWM_INTERTIP71 = "\"En internet nadie puede escucharte ser sutil.\" — Linus Torvalds";
SWWM_INTERTIP72 = "Hay aproximadamente 9.3 mil millones de demonios criados solo para la guerra en el Infierno. Eso es ochocientas setenta y seis mil veces el conteo de monstruos de nuts.wad, y eso es terrible.";
@@ -959,12 +922,12 @@ SWWM_INTERTIP130 = "El potenciado de velocidad del Ragekit puede hacerte rebotar
SWWM_INTERTIP131 = "En Heretic y Hexen, un ítem conocido como el Enlace de Seguridad puede aparecer. Si por cualquier razón te has atascado en algún tipo de trampa de la que no parece que haya salida, este será tu as en la manga.";
SWWM_INTERTIP132 = "La Marca de Devastación es bastante inestable, pero provee de un mayor potenciado de daño que el Ragekit, para TODO el daño que puedas causar, incluso a ti. Sí, un juguetito bastante peligroso, desde luego.";
SWWM_INTERTIP133 = "El Sprite Divino puede potenciar tu salud hasta niveles absurdos, pero sus efectos se desvanecen rápidamente después de un rato. Es el ítem de salud más potente que tienes al alcance, pero ten en cuenta que debe ser activado manualmente. A diferencia de muchos otros, no te va a salvar el trasero por su cuenta.";
-SWWM_INTERTIP134 = "La Mano Divina es otra arma que se puede beneficiar de los efectos del Ragekit, convirtiendo lo que ya es un puñetazo letal en algo realmente divino.";
-SWWM_INTERTIP135 = "Mantener los gatillos del Rifle Sparkster pulsados incrementará gradualmente la potencia de disparo al soltarlos. Afortunadamente, no existe la posibilidad de que el arma explote si los mantienes demasiado tiempo, solo un arma mal diseñada por humanos podría ser tan disfuncional.";
-SWWM_INTERTIP136 = "El Rifle Sparkster puede disparar ambos tipos de munición simultáneamente, mezclando todo en un mortífero proyectil combinado.";
-SWWM_INTERTIP137 = "El Rifle Mortal (\"Míster\" para los amigos) fue ideado como un posible rifle de batalla \"estándar\" para la Coalición X'Animen que \"incluso los Xekkian considerarían poderoso\". Parece que en ese aspecto ha sido un éxito, considerando lo verdaderamente mortal que es, aunque no tiene mucha adopción... Por ahora.";
-SWWM_INTERTIP138 = "La Rafan-Kos es ciertamente un Arma Definitiva, como su nombre implica.";
-SWWM_INTERTIP139 = "Se dice que la Mano Divina trae consigo solo una minúscula fracción del poder de su creador original. El tipo debe de pegar unas hostias de aúpa, entonces.";
+SWWM_INTERTIP134 = "La Demolicionista no está sola en su misión. Se sabe que hay muchos más héroes luchando ahí afuera también.";
+SWWM_INTERTIP135 = "A Demo-chan le gusta un cierto robot de videojuego que también mata demonios con estilo.";
+SWWM_INTERTIP136 = "Generalmente, tus enemigos son lo suficientemente estúpidos como para plantarse delante de tu línea de fuego. Si fueran más listos, no intentarían enfrentarse a ti.";
+SWWM_INTERTIP137 = "Los potenciadores existen para ser usados, no tengas miedo de \"malgastarlos\". Si la situación lo llama, dale caña. Ya encontrarás más luego.";
+SWWM_INTERTIP138 = "Los demonios evitaron invadir Australia por alguna razón. Tal vez el clima de ahí es peor que en el Infierno.";
+SWWM_INTERTIP139 = "Si parece que el juego te está dando demasiadas cosas, puedes ganarte un dinero extra vendiendo lo que no necesites.";
SWWM_INTERTIP140 = "El chasis de la Demolicionista tiene un ligero aroma a lima.";
SWWM_INTERTIP141 = "\"En el futuro, todo es Cromado.\"\n\nNunca una frase de una serie de dibujos pudo ser más acertada tras el inevitable auge de la supremacía web-app.";
SWWM_INTERTIP142 = "Este mod está en desarrollo constante. Recuerda reportar cualquier bug que encuentres.";
@@ -1043,8 +1006,6 @@ SWWM_ACHIEVEMENT_EVERYTHING_TAG = "La Demolicionista";
SWWM_ACHIEVEMENT_EVERYTHING_TXT = "Desbloquea todos los logros";
SWWM_ACHIEVEMENT_EZKILL_TAG = "El Orgullo de Misa";
SWWM_ACHIEVEMENT_EZKILL_TXT = "Mata %d enemigos con un solo disparo de Artefacto Ynykron (excluyendo modo secundario)";
-SWWM_ACHIEVEMENT_FISTO_TAG = "Rompejetas Excepcional";
-SWWM_ACHIEVEMENT_FISTO_TXT = "Mata %d enemigos con la Mano Divina";
SWWM_ACHIEVEMENT_FLIGHT_TAG = "Despega de Nuevo";
SWWM_ACHIEVEMENT_FLIGHT_TXT = "Lanza a un enemigo en volandas más allá de %d unidades de mapa";
SWWM_ACHIEVEMENT_FRIEND_TAG = "¿Te Gusta Caco?";
@@ -1074,7 +1035,6 @@ SWWM_ACHIEVEMENT_HND_TAG = "Mediodía";
SWWM_ACHIEVEMENT_HND_TXT = "Realiza %d disparos mortales en una única recarga de Puntzer Beta";
SWWM_ACHIEVEMENT_HURRY_TAG = "Con Prisas";
SWWM_ACHIEVEMENT_HURRY_TXT = "Termina un mapa con 0 muertes, ítems y secretos";
-SWWM_ACHIEVEMENT_ICE_TXT = "Empala %d enemigos con el disparo secundario del Encendedor de Fuego Negro";
SWWM_ACHIEVEMENT_JUMP_TAG = "Verticalidad";
SWWM_ACHIEVEMENT_JUMP_TXT = "Salta paredes %d veces";
SWWM_ACHIEVEMENT_KANCHO_TAG = "Kancho Extremo";
@@ -1114,8 +1074,6 @@ SWWM_ACHIEVEMENT_PAR_TAG = "Rápido";
SWWM_ACHIEVEMENT_PAR_TXT = "Supera el tiempo par en %d mapas";
SWWM_ACHIEVEMENT_PEACE_TAG = "Pacifista";
SWWM_ACHIEVEMENT_PEACE_TXT = "Termina un mapa sin causar daño";
-SWWM_ACHIEVEMENT_PENE_TAG = "Penetrador";
-SWWM_ACHIEVEMENT_PENE_TXT = "Atraviesa %d enemigos en fila con un solo secundario de la Gran Lanza";
SWWM_ACHIEVEMENT_PLASMA_TAG = "Echando Plasmas";
SWWM_ACHIEVEMENT_PLASMA_TXT = "Mata un enemigo a 100%% de salud con un disparo cargado del Blaster de Plasma %d veces";
SWWM_ACHIEVEMENT_PLUSH_TAG = "Amorcito";
diff --git a/language.es_lore b/language.es_lore
index 84dbebca2..76e7e260a 100644
--- a/language.es_lore
+++ b/language.es_lore
@@ -312,32 +312,6 @@ SWWM_LORETXT_BIGSHOT2 =
"\cfSí, el tío está loco perdido, pero mira, ESA cosa... muy MUY en serio que la quería. Hasta me reuní con el tío para poder tocarla con mis propias manos. Esa cosa es... jodidamente bestial, y seguro que no hay persona viviente que pueda usarla, PERO... tú seguro que puedes. Te digo una cosa, cada vez que te saques ese monumental pedazo de metal rompecojones, estaré mirando, así que más te vale ofrecerme un buen espectáculo con el que comer palomitas.\c-\n"
"\n"
"\cfSinceramente no me sorprende que el tío sobreviviera toda la mierda, probablemente se cargó mil demonios él mismo con todas las mierdas que tiene por ahí, seguro. Y, ni puta idea lo que sea que signifique todo eso de batallas y caras y tal, se habrá vuelto tolai perdido con la invasión y tal.\c-";
-SWWM_LORETAG_BLACKFIREIGNITER = "Encendedor F.N.";
-SWWM_LORETXT_BLACKFIREIGNITER =
-"\cxDesignación:\c-\n"
-"\cf Encendedor de Fuego Negro\c-\n"
-"\cxFabricante:\c-\n"
-"\cf Artesanía Unissix\c-\n"
-"\cf Diseño de LS\c-\n"
-"\cxClasificación:\c-\n"
-"\cf Lanzallamas\c-\n"
-"\n"
-"Ideado por el propio dios primordial de la magia, el \cfEncendedor de Fuego negro\c- es sorprendentemente un arma muy fría y oscura. El fuego negro es un tipo de llama mágica que absorbe el calor y la luz, en lugar de emitirlos.\n"
-"\n"
-"Durante la cumbre de fama de \cfArtesanía Unissix\c-, el dios se presentó personalmente ante \cfMisa Unissix\c- con una petición de un arma que permitiría a prácticamente cualquiera realizar fácilmente \cfMagia de Manipulación de Fuego Negro\c-.\n"
-"\n"
-"El Encendedor es la mezcla perfecta de magia y tecnología, hecha arma. Tienes a tu alcance el poder de invocar llamas congelantes que transformarán a tus enemigos en estatuas de hielo en pocos segundos.\n"
-"\n"
-"\cfFuego Primario:\c- Libera un chorro continuo de Fuego Negro, con rango moderado. Las llamas no solo congelarán rápidamente lo que toquen, también reducirán la temperatura del aire, dejando un rastro de frío persistente.\n"
-"\n"
-"\cfFuego Secundario:\c- Estallidos concentrados que forman lanzas de aire supercongelado las cuales empalarán objetivos pequeños, o simplemente los atravesarán.\n"
-"\n"
-"\cfRecarga:\c- Acopla hasta dos frascos para rellenar la reserva interna de maná oscuro del arma. Cada frasco permanecerá enganchado hasta que se haya vaciado, ya que de otro modo podría escapar energía residual y causar daño al usuario. Si hay un frasco vacío acoplado, la acción de recarga lo desacoplará primero. Los frascos pueden ser usados aun si el depósito está lleno, y actuarán como un \"búfer\" extra de maná hasta vaciarse.\n"
-"\n"
-"\cxNotas de Saya:\c-\n"
-"\cfO sea, que Misa-Misa tiene otros juguetes aparte del trasto enorme ese. Mola que le hagan encargos y tal, el rollito de canela es muy popular por ahí, jejeje...\c-\n"
-"\n"
-"\cfNo he oído mucho sobre todo el tema del Fuego Negro de LS-sama, pero tiene pinta de ser divertido. Me pregunto si se puede usar en una carta mágica...\c-";
SWWM_LORETXT_BLACKMANN =
"\cxNombre:\c-\n"
"\cf Blackmann Arms S.L.\c-\n"
@@ -944,35 +918,6 @@ SWWM_LORETXT_ELLEN =
"\cfOh ya, hablando de Ellen-san. Es una puta bromista de cuidado, es que vamos, una súper troll de la vida. Mira, una vez... bueno, mejor creo que me lo voy a callar, porque es que me da muchísima vergüenza. Aún me duele el culo desde entonces. Que va, NO pienso explicarlo, coño si no. Usa tu imaginación, Demo-chan.\c-\n"
"\n"
"\cfAh, y también, cosa tope de buena de tenerla por aquí. Tiene unos contactos muy interesantes. Sí, la mayoría de la gente no lo sabe, pero su abuelo es un demonio. Sí, uno de verdad, del Infierno y todo. Y es una monada, también. Se llama Cytho Valathor, y dice que es un \"íncubo reformado\", lo que sea que signifique eso. Siempre que necesite saber algo sobre lo que pasa en la tierra de fuego eterno, es el tío al que acudo.\c-";
-SWWM_LORETAG_EMPCARBINE = "Carabina Raíl";
-SWWM_LORETXT_EMPCARBINE =
-"\cxDesignación:\c-\n"
-"\cf Carabina de Raíl de Impulsos Electromagnéticos\c-\n"
-"\cxFabricante:\c-\n"
-"\cf Instituto Tecnológico Tach-Engine\c-\n"
-"\cxClasificación:\c-\n"
-"\cf Arma de Energía Dirigida\c-\n"
-"\n"
-"La \cfCarabina de Raíl de Impulsos Electromagnéticos\c- es el primerísimo intento de \cfTach-Engine\c- de combinar la tecnología humana actual con la de los experimentos recuperados de su expedición a las oficinas arruinadas de \cfDecade Mechanics\c-. Muy similar a otras armas típicas de rayos de partículas, pero con el impulso atronador de materia exótica altamente destructiva, ha sido considerada muy superior incluso a la potente \cfThunder Buster\c- tan preciada por las tropas de la UAC.\n"
-"\n"
-"Inesperadamente, la Carabina de Raíl es un fusil de cerrojo con depósito tubular, el cual emplea barras de puro \cfDysedum\c-. Cada una de estas permitiendo al arma descargar pulsos dirigidos de 20kA hacia un objetivo ionizado, friéndolo al instante, y potencialmente esparciendo sus efectos mortíferos a otros cercanos.\n"
-"\n"
-"Se ha de tener en cuenta que el uso de este arma en el agua es inseguro, ya que la descarga se dispersará violentamente a través de todo el medio.\n"
-"\n"
-"\cfFuego Primario:\c- Mantén para emitir una leve carga ionizante a la zona apuntada. Cuanto más se mantenga, más preciso será el disparo. Suelta para liberar el rayo. Si la barra está gastada, acciona el perno para cargar una nueva.\n"
-"\n"
-"\cfFuego Secundario:\c- También emite una carga ionizante, pero no libera al soltar. Útil si no puedes garantizar que tu objetivo esté siempre visible, o si quieres marcar rápidamente varios objetivos.\n"
-"\n"
-"\cfRecarga:\c- Se pueden depositar más barras en el arma a necesidad, hasta un máximo de tres.\n"
-"\n"
-"\cfZoom:\c- Mira ajustable de hasta 8 aumentos.\n"
-"\n"
-"\cfTécnicas:\c- Al ionizar varios objetivos puedes garantizar que el rayo se bifurque en arcos menores y los alcance a todos, aunque el potencial de daño será dividido entre ellos.\n"
-"\n"
-"\cxNotas de Saya:\c-\n"
-"\cfSabes, cualquier cosa que se cague en la UAC solo con existir me parece buena.\c-\n"
-"\n"
-"\cfPero esta cosa, además, también se lleva puntos extra por su descojonante potencial para freír hijos de puta. En serio, es que es como un puto relámpago saliendo de esto.\c-";
SWWM_LORETXT_ENGINETECH =
"\cxNombre:\c-\n"
"\cf Instituto Tecnológico Tach-Engine\c-\n"
@@ -1077,28 +1022,6 @@ SWWM_LORETXT_FABRICATOR =
"\cfOh, tienes que estar de puta broma. Ahora el friki este va y nos mete mierda de gacha, con tiers y todo.\c-\n"
"\n"
"\cfEn serio, juro que el tío hace esto a propósito para joderme o algo.\c-";
-SWWM_LORETAG_FISTGUN = "Mano Divina";
-SWWM_LORETXT_FISTGUN =
-"\cxDesignación:\c-\n"
-"\cf Mano Divina\c-\n"
-"\cxFabricante:\c-\n"
-"\cf Korovithuhcp (original)\c-\n"
-"\cf Artesanía Unissix (réplica)\c-\n"
-"\cxDesignación:\c-\n"
-"\cf Guantelete Mágico\c-\n"
-"\n"
-"La \cfMano Divina\c- fue un arma que el dios \cfKorovithuhcp\c- construyó incontables milenios atrás, y fue pasando entre muchos héroes de leyenda. Finalmente se perdió, y el dios no mostró interés en crear una nueva. Esto, obviamente, no detuvo a \cfMisa Unissix\c- en el intento de hacer exactamente eso. Siguiendo documentos históricos de su uso, construyó su propia versión en base a una mezcla de magia arcana y tecnología moderna. Regaló una a su hija, \cfZanaveth Nekuraku III\c-, y otra a la \cfDemolicionista\c-.\n"
-"\n"
-"\cfFuego Primario:\c- Carga un puñetazo, y luego lo suelta. El guantelete se lanzará de frente y luego volverá a ti.\n"
-"\n"
-"\cfFuego Secundario:\c- Carga una bofetada de ancho rango. Al soltarlo abofeteará de forma muy ruidosa y violenta todos los objetivos que tengas delante.\n"
-"\n"
-"\cfTécnicas:\c- Dada su naturaleza, la Mano Divina es susceptible a los efectos de un \cfRagekit\c-, incrementando su fuerza y rango.\n"
-"\n"
-"\cxNotas de Saya:\c-\n"
-"\cfMenudo envío especial que nos mandó Zana-chan. Y cuando enseñamos que iba bien, y molaba, Misa-Misa se puso a tope y empezó a fabricarlas en masa. Si es que es juro que es demasiado adorable.\c-\n"
-"\n"
-"\cfEn fin, esos bichos van a recibir una buena somanta con esta cosa. Que ganas tengo de verla en acción con objetivos de verdad. Especialmente después de... Aquel incidente con el saco de boxeo.\c-";
SWWM_LORETAG_FORX = "Aeronáutica Forx";
SWWM_LORETXT_FORX =
"\cxNombre:\c-\n"
@@ -1343,37 +1266,6 @@ SWWM_LORETXT_GODS2 =
"\cfSabes, hay gente que me pregunta como es que aun soy agnóstica. Dudo que sepan realmente lo que es el agnosticismo.\c-\n"
"\n"
"\cfActualización: El tema ese de los admins está en otro artículo. En serio, fue una puta locura todo eso. Ni de puta coña me voy a olvidar de todo lo que pasó el día después de nuestra boda con Kirin-kun, madre de dios...\c-";
-SWWM_LORETAG_GRANDLANCE = "Gran Lanza";
-SWWM_LORETXT_GRANDLANCE =
-"\cxDesignación:\c-\n"
-"\cf Suvan-Kin (\"Gran Lanza\")\c-\n"
-"\cxFabricante:\c-\n"
-"\cf Eushura Kmonn Jr.\c-\n"
-"\cxClasificación:\c-\n"
-"\cf Cañón de Riel Portátil\c-\n"
-"\n"
-"Ideado como la \"última palabra\" en armamento, la \cfSuvan-Kin\c- (\"Gran Lanza\" en el idioma \cfXekkas\c-) es el primer cañón de riel realmente portátil del mundo, capaz de lanzar proyectiles a velocidades de hasta 7500km/h (o 14000km/h a carga máxima). El arma es potenciada en su totalidad por un compacto paquete de batería de cuatro celdas de Korberon-Eneiebium, fácil de reemplazar cuando se necesite. La munición empleada son arpones de Almacero de alta resonancia, capaces de atravesar limpiamente todo, sin llevar ni un solo rasguño.\n"
-"\n"
-"Si el potencial penetrante de estos arpones no es lo suficientemente destructivo, una bomba de fusión pura en miniatura incrustada a la cabeza ciertamente añadirá aun más a eso. En palabras de la gente \cfXekkian\c-: \cf\"Las llamas cegadoras de un sol sacrificado a su nacer desgarrarán toda vida, arrancarán el alma de su cuerpo, y no dejarán rastro alguno de aquellos desafortunados que hayan agraviado al portador de la Gran Lanza.\"\c-\n"
-"\n"
-"\cfFuego Primario:\c- Disparo de único objetivo. El arpón detonará automáticamente en contacto con cualquier cosa. El área de efecto es bastante enorme, así que mantén la distancia.\n"
-"\n"
-"\cfFuego Secundario:\c- Disparo de múltiple objetivo. El arpón es disparado a mayor velocidad, y penetrará varios objetivos hasta detenerse finalmente contra algo suficientemente sólido.\n"
-"\n"
-"\cfRecarga Primaria:\c- Recarga el arma.\n"
-"\n"
-"\cfRecarga Secundaria:\c- Cambia la batería. Esta acción solo puede hacerse en cuanto la carga sea lo suficientemente baja, ya que sería un derroche de otro modo.\n"
-"\n"
-"\cfTécnicas:\c- Cuanto más mantengas el fuego secundario, con más fuerza y velocidad se disparará. A carga máxima podrá incluso derribar paredes.\n"
-"\n"
-"\cfAdvertencia:\c- Antes de disparar, los rieles deben extenderse hasta su longitud completa. Si hay algún obstáculo en medio que no pueda ser apartado, la operación del arma será cancelada.\n"
-"\n"
-"\cxNotas de Saya:\c-\n"
-"\cfPerdón pero, ¿¿¿QUE COÑO ES ESTO???\c-\n"
-"\n"
-"\cf¿Es esto un puto cañón de riel? Vamos, ¿uno de verdad? ¿¿Y resulta que es portátil?? ¿¿¿Y DISPARA PUTOS ARPONES CON PUTAS BOMBAS DE FUSIÓN EN ELLOS??? Vale, olvida lo que dije sobre la otra arma enorme de Kmonn, ESTA MIERDA es incluso aun más puto ridícula, es que, ¿¿¿que puto cojones es todo esto???\c-\n"
-"\n"
-"\cfPues eso, por eso está colocada en el mismo puesto que el Ynykron. Piensa en ella como una alternativa \"más segura\", básicamente. No es apocalíptica, pero sigue siendo jodidamente fuerte.\c-";
SWWM_LORETAG_GRAVITYSUPPRESSOR = "Supr. de Gravedad";
SWWM_LORETXT_GRAVITYSUPPRESSOR =
"\cxDesignación:\c-\n"
diff --git a/language.es_voice b/language.es_voice
index c62e4c8a0..82588d62e 100644
--- a/language.es_voice
+++ b/language.es_voice
@@ -264,13 +264,9 @@ SWWM_SUBS_DEFAULT_GETPUNTZERBETA = "Os voy a taladrar bien taladrados."; // said
SWWM_SUBS_DEFAULT_GETPUNTZERGAMMA = "¿Automático y... superautomático? Vaya vaya...";
SWWM_SUBS_DEFAULT_GETHEAVYMAHSHEENGUN = "¡Metralleta Pesada!";
SWWM_SUBS_DEFAULT_GETQUADRAVOL = "Así las llamas de la Cruz Ardiente se propagaron a través de la horda...";
-SWWM_SUBS_DEFAULT_GETBLACKFIREIGNITER = "No hay nada más heavy que el fuego negro.";
-SWWM_SUBS_DEFAULT_GETEMPCARBINE = "Lo de los impulsos es por lo mucho que me impulsa a matar.";
-SWWM_SUBS_DEFAULT_GETRAYKHOM = "Pero mira que TOCHO es esto, joder...";
-SWWM_SUBS_DEFAULT_GETGRANDLANCE = "Se acabó el juego, estáis todos jodidos.";
-SWWM_SUBS_DEFAULT_GETWHITEGLOVE = "Muy bien, ¿a quien le apetece un sándwich de nudillos?";
SWWM_SUBS_DEFAULT_GETNEWSPARKSTER = "Me gustan las armas de plasma grandes.";
-SWWM_SUBS_DEFAULT_GETMORTALRIFLE = "Bienvenido abordo, Míster.";
+SWWM_SUBS_DEFAULT_GETMORTALRIFLE = "Bienvenido a bordo, Míster.";
+SWWM_SUBS_DEFAULT_GETRAYKHOM = "Pero mira que TOCHO es esto, joder...";
SWWM_SUBS_DEFAULT_GETRAFANKOS = "Definitiva... Me gusta como suena eso.";
// key received
SWWM_SUBS_DEFAULT_KEYGET1 = "Te tengo.";
diff --git a/language.version b/language.version
index a3776687e..dd497f363 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
[default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r177 \cu(Tue 1 Mar 18:58:34 CET 2022)\c-";
-SWWM_SHORTVER="\cw1.2pre r177 \cu(2022-03-01 18:58:34)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r178 \cu(Sat 5 Mar 18:26:20 CET 2022)\c-";
+SWWM_SHORTVER="\cw1.2pre r178 \cu(2022-03-05 18:26:20)\c-";
diff --git a/lore/default/blackfireigniter.txt b/lore/default/blackfireigniter.txt
deleted file mode 100644
index 060bf482f..000000000
--- a/lore/default/blackfireigniter.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-TAG
-Blackfire Igniter
-TAB
-Item
-REL
-Sankaideriha;Unissix;Gods;Saya
-TXT
-\cxDesignation:\c-
-\cf Blackfire Igniter\c-
-\cxManufacturer:\c-
-\cf Unissix Crafts\c-
-\cf Design by LS\c-
-\cxClassification:\c-
-\cf Flamethrower\c-
-
-Devised by the primordial god of magic themself, the **Blackfire Igniter** is rather surprisingly a very cold, dark weapon. Blackfire is a type of magical flame that absorbs heat and light, rather than emitting them.
-
-During the height of **Unissix Crafts**'s fame, the god personally approached **Misa Unissix** herself with a request for a weapon that would allow just about anyone to readily perform **Blackfire Manipulation Magic**.
-
-The Igniter is the perfect blend of magic and technology, weaponized. At your fingertips, you have the power to call forth freezing flames that will turn your enemies into pretty ice statues in mere seconds.
-
-\cfPrimary Fire:\c- Releases a continuous stream of Blackfire, with moderate range. The flames not only rapidly freeze whatever they touch, but also reduce the air temperature, leaving a lingering freeze effect.
-
-\cfSecondary Fire:\c- Concentrated bursts that form spears of supercooled air which can impale small targets, or tear right through them.
-
-\cfReloading:\c- Attach up to two canisters to replenish the weapon's internal dark mana reserves. Each canister will remain locked in until it's been emptied, otherwise residual energy could escape and bring harm to the user. If there is an empty canister attached, the reload action will detach it first. Fresh canisters can still be used even if the tank is full, and they will act as an extra "buffer" of mana until depleted.
-
-\cxSaya's Notes:\c-
-\cfSo yeah, Misa-Misa has other toys besides that one bigass gun. Pretty cool that she gets requests and whatnot, lil' cinnamon roll's quite popular there, heheheh...\c-
-
-\cfI heard very little of all this Blackfire stuff from LS-sama, but it sounds like fun. Wonder if it can be used in a spellcard...\c-
diff --git a/lore/default/empcarbine.txt b/lore/default/empcarbine.txt
deleted file mode 100644
index 94ce03ad3..000000000
--- a/lore/default/empcarbine.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-TAG
-Rail Carbine
-TAB
-Item
-REL
-EngineTech;DecadeMech;UAC;Saya
-TXT
-\cxDesignation:\c-
-\cf EMP Rail Carbine\c-
-\cxManufacturer:\c-
-\cf Tach-Engine Technology Institute\c-
-\cxClassification:\c-
-\cf Directed Energy Weapon\c-
-
-The **EMP Rail Carbine** is **Tach-Engine**'s very first attempt at combining existing human technology with the retrieved experiments from their expedition to the ruined headquarters of **Decade Mechanics**. Akin to typical particle-beam weaponry, but with a boost of thundering, highly destructive exotic matter, it has been deemed far superior even to the mighty **Thunder Buster** so well-prized by UAC troops.
-
-Unexpectedly, the Rail Carbine is a tube fed bolt-action rifle, which employs shielded rods of pure **Dysedum**. Each of these allowing the weapon to discharge guided 20kA pulses towards an ionized target, frying it in an instant, and potentially spreading its deadly effects to others nearby.
-
-It should be noted that this weapon is unsafe to use in water, as the discharge will spread violently throughout the entire medium.
-
-\cfPrimary Fire:\c- Hold to emit a faint ionizing charge towards the aimed spot. The longer this is held, the more accurate the shot will be. Release to discharge the beam. If the rod has been depleted, cycle the bolt to load a new one.
-
-\cfSecondary Fire:\c- Also emits an ionizing charge, but does not discharge on release. Useful if you can't guarantee your target will always be in sight, or if you want to quickly mark several targets.
-
-\cfZoom:\c- Adjustable sight up to 8x.
-
-\cfReloading:\c- More rods can be fed into the weapon as needed, up to a maximum of three.
-
-\cfTechniques:\c- By ionizing several targets you can guarantee that the beam will branch out into lesser arcs and strike them all, though the damage potential will be divided among them.
-
-\cxSaya's Notes:\c-
-\cfYou know, anything that dabs on the UAC with its mere existence is good in my book.\c-
-
-\cfThis thing, though, also gets bonus points for its sheer pants-shittingly intense potential to deep fry sons of bitches. Seriously, it's like actual fucking lightning shooting out of this.\c-
diff --git a/lore/default/fistgun.txt b/lore/default/fistgun.txt
deleted file mode 100644
index 7ef5e5be8..000000000
--- a/lore/default/fistgun.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-TAG
-Hand of Divine
-TAB
-Item
-REL
-Unissix;Gods;Zanaveth3;Saya
-TXT
-\cxDesignation:\c-
-\cf Hand of Divine\c-
-\cxManufacturer:\c-
-\cf Korovithuhcp (original)\c-
-\cf Unissix Crafts (replica)\c-
-\cxDesignation:\c-
-\cf Magic Gauntlet\c-
-
-The **Hand of Divine** was a weapon that the god **Korovithuhcp** constructed countless millenia ago, and had been passed down among many heroes of legend. Eventually it was lost, and the god had no interest in building a new one. This, obviously, did not stop **Misa Unissix** from attempting to do exactly just that. Following historical records of its use, she built her own version through a blend of arcane magic and modern technology. She gifted one to her daughter, **Zanaveth Nekuraku III**, and another to the **Demolitionist**.
-
-\cfPrimary Fire:\c- Charges up a punch, and then releases it. The gauntlet will fling itself forward and then return to you.
-
-\cfSecondary Fire:\c- Charges up a wide arc slap. On release this will very loudly and violently whack all targets in front of you.
-
-\cfTechniques:\c- Due to its nature, the Hand of Divine is susceptible to the effects of a **Ragekit**, increasing its strength and range.
-
-\cxSaya's Notes:\c-
-\cfMan that sure was a special delivery from Zana-chan. And when we showed that it was good, and fun, Misa-Misa got all excited and started mass-producing them. She's just too adorable, I swear.\c-
-
-\cfAnyway, those fiends are gonna get knocked the fuck out with this thing. Can't wait to see it in action on real targets. Especially after... that incident with the punching bag.\c-
diff --git a/lore/default/grandlance.txt b/lore/default/grandlance.txt
deleted file mode 100644
index e440eb6eb..000000000
--- a/lore/default/grandlance.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-TAG
-Grand Lance
-TAB
-Item
-REL
-Kmonn;Xekke;Saya;Unissix
-TXT
-\cxDesignation:\c-
-\cf Suvan-Kin ("Grand Lance")\c-
-\cxManufacturer:\c-
-\cf Eushura Kmonn Jr.\c-
-\cxClassification:\c-
-\cf Portable Rail Gun\c-
-
-Devised as the "last word" in weaponry, the **Suvan-Kin** ("Grand Lance" in the **Xekkas** language) is the world's first truly portable rail gun, capable of launching projectiles at speeds of up to 7500km/h (or 14000km/h at full charge). The weapon is powered entirely by a compact quad-cell Korberon-Eneiebium battery pack, easy to replace when needed. The ammunition employed are high-resonant Almasteel spears, capable of piercing cleanly through anything, without even as much as a single dent.
-
-If the piercing potential of these spears isn't destructive enough, a miniature pure-fusion bomb embedded at the head will surely add up even more to that. In the words of the **Xekkian** people: **"The blinding flames of a sacrificed newborn star shall tear asunder all life, rend the soul from its body, and leave no trace whatsoever of those unfortunate to have wronged the wielder of the Grand Lance."**
-
-\cfPrimary Fire:\c- Single-target firing. The spear will automatically detonate on contact with anything. The area of effect is rather massive, so keep your distance. Due to the resilience of the material used, the spear will not be destroyed, and may potentially ricochet and hit something else.
-
-\cfSecondary Fire:\c- Multi-target firing. The spear is shot at a much higher velocity, and will penetrate multiple targets until finally stopping at something sufficiently solid.
-
-\cfPrimary Reload:\c- Reload the weapon.
-
-\cfSecondary Reload:\c- Swaps the battery. This action can only be performed once the charge is low enough, as it would be wasteful otherwise.
-
-\cfTechniques:\c- The longer you hold secondary fire, the stronger and faster the shot will be. At full charge it may even breach walls.
-
-\cfWarning:\c- Before firing, the rails must extend to their full length. If there are any obstacles in the way that can't be cleared, operation of the weapon is cancelled.
-
-\cxSaya's Notes:\c-
-\cfExcuse me, WHAT THE FUCK IS THIS???\c-
-
-\cfIs this a motherfucking rail gun? Like, the real deal? And it's actually portable?? AND IT SHOOTS MOTHERFUCKING SPEARS WITH MOTHERFUCKING FUSION BOMBS IN THEM??? OK, forget what I said about that other bigass gun from Kmonn, THIS SHIT is actually even more fucking ridiculous, like, what in the actual name of fuck???\c-
-
-\cfYeah, so that's why it's placed on the same slot as the Ynykron. Think of it as a "safer" alternative, basically. It's not world-ending, but it's still way too fucking strong.\c-
diff --git a/lore/es/blackfireigniter.txt b/lore/es/blackfireigniter.txt
deleted file mode 100644
index 705eca422..000000000
--- a/lore/es/blackfireigniter.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-TAG
-Encendedor F.N.
-TXT
-\cxDesignación:\c-
-\cf Encendedor de Fuego Negro\c-
-\cxFabricante:\c-
-\cf Artesanía Unissix\c-
-\cf Diseño de LS\c-
-\cxClasificación:\c-
-\cf Lanzallamas\c-
-
-Ideado por el propio dios primordial de la magia, el **Encendedor de Fuego negro** es sorprendentemente un arma muy fría y oscura. El fuego negro es un tipo de llama mágica que absorbe el calor y la luz, en lugar de emitirlos.
-
-Durante la cumbre de fama de **Artesanía Unissix**, el dios se presentó personalmente ante **Misa Unissix** con una petición de un arma que permitiría a prácticamente cualquiera realizar fácilmente **Magia de Manipulación de Fuego Negro**.
-
-El Encendedor es la mezcla perfecta de magia y tecnología, hecha arma. Tienes a tu alcance el poder de invocar llamas congelantes que transformarán a tus enemigos en estatuas de hielo en pocos segundos.
-
-\cfFuego Primario:\c- Libera un chorro continuo de Fuego Negro, con rango moderado. Las llamas no solo congelarán rápidamente lo que toquen, también reducirán la temperatura del aire, dejando un rastro de frío persistente.
-
-\cfFuego Secundario:\c- Estallidos concentrados que forman lanzas de aire supercongelado las cuales empalarán objetivos pequeños, o simplemente los atravesarán.
-
-\cfRecarga:\c- Acopla hasta dos frascos para rellenar la reserva interna de maná oscuro del arma. Cada frasco permanecerá enganchado hasta que se haya vaciado, ya que de otro modo podría escapar energía residual y causar daño al usuario. Si hay un frasco vacío acoplado, la acción de recarga lo desacoplará primero. Los frascos pueden ser usados aun si el depósito está lleno, y actuarán como un "búfer" extra de maná hasta vaciarse.
-
-\cxNotas de Saya:\c-
-\cfO sea, que Misa-Misa tiene otros juguetes aparte del trasto enorme ese. Mola que le hagan encargos y tal, el rollito de canela es muy popular por ahí, jejeje...\c-
-
-\cfNo he oído mucho sobre todo el tema del Fuego Negro de LS-sama, pero tiene pinta de ser divertido. Me pregunto si se puede usar en una carta mágica...\c-
diff --git a/lore/es/empcarbine.txt b/lore/es/empcarbine.txt
deleted file mode 100644
index dede978d0..000000000
--- a/lore/es/empcarbine.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-TAG
-Carabina Raíl
-TXT
-\cxDesignación:\c-
-\cf Carabina de Raíl de Impulsos Electromagnéticos\c-
-\cxFabricante:\c-
-\cf Instituto Tecnológico Tach-Engine\c-
-\cxClasificación:\c-
-\cf Arma de Energía Dirigida\c-
-
-La **Carabina de Raíl de Impulsos Electromagnéticos** es el primerísimo intento de **Tach-Engine** de combinar la tecnología humana actual con la de los experimentos recuperados de su expedición a las oficinas arruinadas de **Decade Mechanics**. Muy similar a otras armas típicas de rayos de partículas, pero con el impulso atronador de materia exótica altamente destructiva, ha sido considerada muy superior incluso a la potente **Thunder Buster** tan preciada por las tropas de la UAC.
-
-Inesperadamente, la Carabina de Raíl es un fusil de cerrojo con depósito tubular, el cual emplea barras de puro **Dysedum**. Cada una de estas permitiendo al arma descargar pulsos dirigidos de 20kA hacia un objetivo ionizado, friéndolo al instante, y potencialmente esparciendo sus efectos mortíferos a otros cercanos.
-
-Se ha de tener en cuenta que el uso de este arma en el agua es inseguro, ya que la descarga se dispersará violentamente a través de todo el medio.
-
-\cfFuego Primario:\c- Mantén para emitir una leve carga ionizante a la zona apuntada. Cuanto más se mantenga, más preciso será el disparo. Suelta para liberar el rayo. Si la barra está gastada, acciona el perno para cargar una nueva.
-
-\cfFuego Secundario:\c- También emite una carga ionizante, pero no libera al soltar. Útil si no puedes garantizar que tu objetivo esté siempre visible, o si quieres marcar rápidamente varios objetivos.
-
-\cfRecarga:\c- Se pueden depositar más barras en el arma a necesidad, hasta un máximo de tres.
-
-\cfZoom:\c- Mira ajustable de hasta 8 aumentos.
-
-\cfTécnicas:\c- Al ionizar varios objetivos puedes garantizar que el rayo se bifurque en arcos menores y los alcance a todos, aunque el potencial de daño será dividido entre ellos.
-
-\cxNotas de Saya:\c-
-\cfSabes, cualquier cosa que se cague en la UAC solo con existir me parece buena.\c-
-
-\cfPero esta cosa, además, también se lleva puntos extra por su descojonante potencial para freír hijos de puta. En serio, es que es como un puto relámpago saliendo de esto.\c-
diff --git a/lore/es/fistgun.txt b/lore/es/fistgun.txt
deleted file mode 100644
index 1a17cbc86..000000000
--- a/lore/es/fistgun.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-TAG
-Mano Divina
-TXT
-\cxDesignación:\c-
-\cf Mano Divina\c-
-\cxFabricante:\c-
-\cf Korovithuhcp (original)\c-
-\cf Artesanía Unissix (réplica)\c-
-\cxDesignación:\c-
-\cf Guantelete Mágico\c-
-
-La **Mano Divina** fue un arma que el dios **Korovithuhcp** construyó incontables milenios atrás, y fue pasando entre muchos héroes de leyenda. Finalmente se perdió, y el dios no mostró interés en crear una nueva. Esto, obviamente, no detuvo a **Misa Unissix** en el intento de hacer exactamente eso. Siguiendo documentos históricos de su uso, construyó su propia versión en base a una mezcla de magia arcana y tecnología moderna. Regaló una a su hija, **Zanaveth Nekuraku III**, y otra a la **Demolicionista**.
-
-\cfFuego Primario:\c- Carga un puñetazo, y luego lo suelta. El guantelete se lanzará de frente y luego volverá a ti.
-
-\cfFuego Secundario:\c- Carga una bofetada de ancho rango. Al soltarlo abofeteará de forma muy ruidosa y violenta todos los objetivos que tengas delante.
-
-\cfTécnicas:\c- Dada su naturaleza, la Mano Divina es susceptible a los efectos de un **Ragekit**, incrementando su fuerza y rango.
-
-\cxNotas de Saya:\c-
-\cfMenudo envío especial que nos mandó Zana-chan. Y cuando enseñamos que iba bien, y molaba, Misa-Misa se puso a tope y empezó a fabricarlas en masa. Si es que es juro que es demasiado adorable.\c-
-
-\cfEn fin, esos bichos van a recibir una buena somanta con esta cosa. Que ganas tengo de verla en acción con objetivos de verdad. Especialmente después de... Aquel incidente con el saco de boxeo.\c-
diff --git a/lore/es/grandlance.txt b/lore/es/grandlance.txt
deleted file mode 100644
index 8677dd9e9..000000000
--- a/lore/es/grandlance.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-TAG
-Gran Lanza
-TXT
-\cxDesignación:\c-
-\cf Suvan-Kin ("Gran Lanza")\c-
-\cxFabricante:\c-
-\cf Eushura Kmonn Jr.\c-
-\cxClasificación:\c-
-\cf Cañón de Riel Portátil\c-
-
-Ideado como la "última palabra" en armamento, la **Suvan-Kin** ("Gran Lanza" en el idioma **Xekkas**) es el primer cañón de riel realmente portátil del mundo, capaz de lanzar proyectiles a velocidades de hasta 7500km/h (o 14000km/h a carga máxima). El arma es potenciada en su totalidad por un compacto paquete de batería de cuatro celdas de Korberon-Eneiebium, fácil de reemplazar cuando se necesite. La munición empleada son arpones de Almacero de alta resonancia, capaces de atravesar limpiamente todo, sin llevar ni un solo rasguño.
-
-Si el potencial penetrante de estos arpones no es lo suficientemente destructivo, una bomba de fusión pura en miniatura incrustada a la cabeza ciertamente añadirá aun más a eso. En palabras de la gente **Xekkian**: **"Las llamas cegadoras de un sol sacrificado a su nacer desgarrarán toda vida, arrancarán el alma de su cuerpo, y no dejarán rastro alguno de aquellos desafortunados que hayan agraviado al portador de la Gran Lanza."**
-
-\cfFuego Primario:\c- Disparo de único objetivo. El arpón detonará automáticamente en contacto con cualquier cosa. El área de efecto es bastante enorme, así que mantén la distancia.
-
-\cfFuego Secundario:\c- Disparo de múltiple objetivo. El arpón es disparado a mayor velocidad, y penetrará varios objetivos hasta detenerse finalmente contra algo suficientemente sólido.
-
-\cfRecarga Primaria:\c- Recarga el arma.
-
-\cfRecarga Secundaria:\c- Cambia la batería. Esta acción solo puede hacerse en cuanto la carga sea lo suficientemente baja, ya que sería un derroche de otro modo.
-
-\cfTécnicas:\c- Cuanto más mantengas el fuego secundario, con más fuerza y velocidad se disparará. A carga máxima podrá incluso derribar paredes.
-
-\cfAdvertencia:\c- Antes de disparar, los rieles deben extenderse hasta su longitud completa. Si hay algún obstáculo en medio que no pueda ser apartado, la operación del arma será cancelada.
-
-\cxNotas de Saya:\c-
-\cfPerdón pero, ¿¿¿QUE COÑO ES ESTO???\c-
-
-\cf¿Es esto un puto cañón de riel? Vamos, ¿uno de verdad? ¿¿Y resulta que es portátil?? ¿¿¿Y DISPARA PUTOS ARPONES CON PUTAS BOMBAS DE FUSIÓN EN ELLOS??? Vale, olvida lo que dije sobre la otra arma enorme de Kmonn, ESTA MIERDA es incluso aun más puto ridícula, es que, ¿¿¿que puto cojones es todo esto???\c-
-
-\cfPues eso, por eso está colocada en el mismo puesto que el Ynykron. Piensa en ella como una alternativa "más segura", básicamente. No es apocalíptica, pero sigue siendo jodidamente fuerte.\c-
diff --git a/modeldef.blackfire b/modeldef.blackfire
deleted file mode 100644
index 600baa7cc..000000000
--- a/modeldef.blackfire
+++ /dev/null
@@ -1,13 +0,0 @@
-Model "BlackfireIgniter"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.05 0.05 0.05
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
diff --git a/modeldef.dlcammo b/modeldef.dlcammo
index ecd31cfc0..45f9c716b 100644
--- a/modeldef.dlcammo
+++ b/modeldef.dlcammo
@@ -183,7 +183,151 @@ Model "QuadravolAmmo3"
FrameIndex XZW1 A 0 0
}
-Model "DarkCanister"
+Model "SparksterBAmmo"
+{
+ Path "models/extra"
+
+ Model 0 "BaseCube_d.3d"
+ Skin 0 "CHIPTILE"
+ Scale 0.025 0.025 0.025
+ ZOffset 16
+ PitchOffset 30
+ ROTATING
+
+ FrameIndex XZW1 A 0 0
+}
+Model "SparksterBAmmo2"
+{
+ Path "models/extra"
+
+ Model 0 "BaseCube_d.3d"
+ Skin 0 "CHIPTILE"
+ Scale 0.025 0.025 0.025
+ ZOffset 16
+ PitchOffset 30
+ ROTATING
+
+ FrameIndex XZW1 A 0 0
+}
+Model "SparksterBAmmo3"
+{
+ Path "models/extra"
+
+ Model 0 "BaseCube_d.3d"
+ Skin 0 "CHIPTILE"
+ Scale 0.025 0.025 0.025
+ ZOffset 16
+ PitchOffset 30
+ ROTATING
+
+ FrameIndex XZW1 A 0 0
+}
+Model "SparksterRAmmo"
+{
+ Path "models/extra"
+
+ Model 0 "BaseCube_d.3d"
+ Skin 0 "CHIPTILE"
+ Scale 0.025 0.025 0.025
+ ZOffset 16
+ PitchOffset 30
+ ROTATING
+
+ FrameIndex XZW1 A 0 0
+}
+Model "SparksterRAmmo2"
+{
+ Path "models/extra"
+
+ Model 0 "BaseCube_d.3d"
+ Skin 0 "CHIPTILE"
+ Scale 0.025 0.025 0.025
+ ZOffset 16
+ PitchOffset 30
+ ROTATING
+
+ FrameIndex XZW1 A 0 0
+}
+Model "SparksterRAmmo3"
+{
+ Path "models/extra"
+
+ Model 0 "BaseCube_d.3d"
+ Skin 0 "CHIPTILE"
+ Scale 0.025 0.025 0.025
+ ZOffset 16
+ PitchOffset 30
+ ROTATING
+
+ FrameIndex XZW1 A 0 0
+}
+
+Model "MisterRound"
+{
+ Path "models/extra"
+
+ Model 0 "BaseCube_d.3d"
+ Skin 0 "CHIPTILE"
+ Scale 0.02 0.02 0.02
+ ZOffset 16
+ PitchOffset 30
+ ROTATING
+
+ FrameIndex XZW1 A 0 0
+}
+Model "MisterRound2"
+{
+ Path "models/extra"
+
+ Model 0 "BaseCube_d.3d"
+ Skin 0 "CHIPTILE"
+ Scale 0.02 0.02 0.02
+ ZOffset 16
+ PitchOffset 30
+ ROTATING
+
+ FrameIndex XZW1 A 0 0
+}
+Model "MisterRound3"
+{
+ Path "models/extra"
+
+ Model 0 "BaseCube_d.3d"
+ Skin 0 "CHIPTILE"
+ Scale 0.02 0.02 0.02
+ ZOffset 16
+ PitchOffset 30
+ ROTATING
+
+ FrameIndex XZW1 A 0 0
+}
+Model "MisterRound5"
+{
+ Path "models/extra"
+
+ Model 0 "BaseCube_d.3d"
+ Skin 0 "CHIPTILE"
+ Scale 0.02 0.02 0.02
+ ZOffset 16
+ PitchOffset 30
+ ROTATING
+
+ FrameIndex XZW1 A 0 0
+}
+Model "MisterRound10"
+{
+ Path "models/extra"
+
+ Model 0 "BaseCube_d.3d"
+ Skin 0 "CHIPTILE"
+ Scale 0.02 0.02 0.02
+ ZOffset 16
+ PitchOffset 30
+ ROTATING
+
+ FrameIndex XZW1 A 0 0
+}
+Model "MisterAmmo"
{
Path "models/extra"
@@ -196,8 +340,20 @@ Model "DarkCanister"
FrameIndex XZW1 A 0 0
}
+Model "MisterGAmmo"
+{
+ Path "models/extra"
-Model "EMPCore"
+ Model 0 "BaseCube_d.3d"
+ Skin 0 "CHIPTILE"
+ Scale 0.02 0.02 0.02
+ ZOffset 16
+ PitchOffset 30
+ ROTATING
+
+ FrameIndex XZW1 A 0 0
+}
+Model "MisterGAmmo2"
{
Path "models/extra"
@@ -210,13 +366,13 @@ Model "EMPCore"
FrameIndex XZW1 A 0 0
}
-Model "EMPCore2"
+Model "MisterGAmmo3"
{
Path "models/extra"
Model 0 "BaseCube_d.3d"
Skin 0 "CHIPTILE"
- Scale 0.025 0.025 0.025
+ Scale 0.03 0.03 0.03
ZOffset 16
PitchOffset 30
ROTATING
@@ -290,7 +446,7 @@ Model "RayBattery"
FrameIndex XZW1 A 0 0
}
-Model "GrandSpear"
+Model "UltimatePod"
{
Path "models/extra"
@@ -303,7 +459,7 @@ Model "GrandSpear"
FrameIndex XZW1 A 0 0
}
-Model "GrandAmmo"
+Model "UltimateAmmo"
{
Path "models/extra"
diff --git a/modeldef.dlcammo2 b/modeldef.dlcammo2
deleted file mode 100644
index ba7193c0b..000000000
--- a/modeldef.dlcammo2
+++ /dev/null
@@ -1,223 +0,0 @@
-Model "SparksterBAmmo"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.025 0.025 0.025
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-Model "SparksterBAmmo2"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.025 0.025 0.025
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-Model "SparksterBAmmo3"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.025 0.025 0.025
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-Model "SparksterRAmmo"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.025 0.025 0.025
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-Model "SparksterRAmmo2"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.025 0.025 0.025
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-Model "SparksterRAmmo3"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.025 0.025 0.025
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-
-Model "MisterRound"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.02 0.02 0.02
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-Model "MisterRound2"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.02 0.02 0.02
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-Model "MisterRound3"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.02 0.02 0.02
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-Model "MisterRound5"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.02 0.02 0.02
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-Model "MisterRound10"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.02 0.02 0.02
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-Model "MisterAmmo"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.03 0.03 0.03
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-Model "MisterGAmmo"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.02 0.02 0.02
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-Model "MisterGAmmo2"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.025 0.025 0.025
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-Model "MisterGAmmo3"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.03 0.03 0.03
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-
-Model "UltimatePod"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.03 0.03 0.03
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
-Model "UltimateAmmo"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.04 0.04 0.04
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
diff --git a/modeldef.empcarbine b/modeldef.empcarbine
deleted file mode 100644
index 320c976d4..000000000
--- a/modeldef.empcarbine
+++ /dev/null
@@ -1,13 +0,0 @@
-Model "EMPCarbine"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.05 0.05 0.05
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
diff --git a/modeldef.fistgun b/modeldef.fistgun
deleted file mode 100644
index 037f2b553..000000000
--- a/modeldef.fistgun
+++ /dev/null
@@ -1,13 +0,0 @@
-Model "FistGun"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.04 0.04 0.04
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
diff --git a/modeldef.grandlance b/modeldef.grandlance
deleted file mode 100644
index 09ef6cbeb..000000000
--- a/modeldef.grandlance
+++ /dev/null
@@ -1,13 +0,0 @@
-Model "GrandLance"
-{
- Path "models/extra"
-
- Model 0 "BaseCube_d.3d"
- Skin 0 "CHIPTILE"
- Scale 0.06 0.06 0.06
- ZOffset 16
- PitchOffset 30
- ROTATING
-
- FrameIndex XZW1 A 0 0
-}
diff --git a/modeldef.mortalrifle b/modeldef.mortalrifle
index 320c976d4..9b69a3ccc 100644
--- a/modeldef.mortalrifle
+++ b/modeldef.mortalrifle
@@ -1,4 +1,4 @@
-Model "EMPCarbine"
+Model "MisterRifle"
{
Path "models/extra"
diff --git a/models/extra/dlc1/BlastMuz0.png b/models/extra/dlc/BlastMuz0.png
similarity index 100%
rename from models/extra/dlc1/BlastMuz0.png
rename to models/extra/dlc/BlastMuz0.png
diff --git a/models/extra/dlc1/BlastMuz1.png b/models/extra/dlc/BlastMuz1.png
similarity index 100%
rename from models/extra/dlc1/BlastMuz1.png
rename to models/extra/dlc/BlastMuz1.png
diff --git a/models/extra/dlc1/BlastMuz2.png b/models/extra/dlc/BlastMuz2.png
similarity index 100%
rename from models/extra/dlc1/BlastMuz2.png
rename to models/extra/dlc/BlastMuz2.png
diff --git a/models/extra/dlc1/BlastMuz3.png b/models/extra/dlc/BlastMuz3.png
similarity index 100%
rename from models/extra/dlc1/BlastMuz3.png
rename to models/extra/dlc/BlastMuz3.png
diff --git a/models/extra/dlc1/BlastMuz4.png b/models/extra/dlc/BlastMuz4.png
similarity index 100%
rename from models/extra/dlc1/BlastMuz4.png
rename to models/extra/dlc/BlastMuz4.png
diff --git a/models/extra/dlc1/BlastMuz5.png b/models/extra/dlc/BlastMuz5.png
similarity index 100%
rename from models/extra/dlc1/BlastMuz5.png
rename to models/extra/dlc/BlastMuz5.png
diff --git a/models/extra/dlc1/BlastMuz6.png b/models/extra/dlc/BlastMuz6.png
similarity index 100%
rename from models/extra/dlc1/BlastMuz6.png
rename to models/extra/dlc/BlastMuz6.png
diff --git a/models/extra/dlc1/BlastMuz7.png b/models/extra/dlc/BlastMuz7.png
similarity index 100%
rename from models/extra/dlc1/BlastMuz7.png
rename to models/extra/dlc/BlastMuz7.png
diff --git a/models/extra/dlc1/BlastMuz8.png b/models/extra/dlc/BlastMuz8.png
similarity index 100%
rename from models/extra/dlc1/BlastMuz8.png
rename to models/extra/dlc/BlastMuz8.png
diff --git a/models/extra/dlc1/BlastMuz9.png b/models/extra/dlc/BlastMuz9.png
similarity index 100%
rename from models/extra/dlc1/BlastMuz9.png
rename to models/extra/dlc/BlastMuz9.png
diff --git a/models/extra/dlc1/LanceTracer.png b/models/extra/dlc/LanceTracer.png
similarity index 100%
rename from models/extra/dlc1/LanceTracer.png
rename to models/extra/dlc/LanceTracer.png
diff --git a/models/extra/dlc2/MRBolt.png b/models/extra/dlc/MRBolt.png
similarity index 100%
rename from models/extra/dlc2/MRBolt.png
rename to models/extra/dlc/MRBolt.png
diff --git a/models/extra/dlc2/MRBoltS.png b/models/extra/dlc/MRBoltS.png
similarity index 100%
rename from models/extra/dlc2/MRBoltS.png
rename to models/extra/dlc/MRBoltS.png
diff --git a/models/extra/dlc2/MRMuz0.png b/models/extra/dlc/MRMuz0.png
similarity index 100%
rename from models/extra/dlc2/MRMuz0.png
rename to models/extra/dlc/MRMuz0.png
diff --git a/models/extra/dlc2/MRMuz1.png b/models/extra/dlc/MRMuz1.png
similarity index 100%
rename from models/extra/dlc2/MRMuz1.png
rename to models/extra/dlc/MRMuz1.png
diff --git a/models/extra/dlc2/MRMuz2.png b/models/extra/dlc/MRMuz2.png
similarity index 100%
rename from models/extra/dlc2/MRMuz2.png
rename to models/extra/dlc/MRMuz2.png
diff --git a/models/extra/dlc2/MRMuz3.png b/models/extra/dlc/MRMuz3.png
similarity index 100%
rename from models/extra/dlc2/MRMuz3.png
rename to models/extra/dlc/MRMuz3.png
diff --git a/models/extra/dlc2/NewSparkMuzK.png b/models/extra/dlc/NewSparkMuzK.png
similarity index 100%
rename from models/extra/dlc2/NewSparkMuzK.png
rename to models/extra/dlc/NewSparkMuzK.png
diff --git a/models/extra/dlc2/NewSparkMuzN.png b/models/extra/dlc/NewSparkMuzN.png
similarity index 100%
rename from models/extra/dlc2/NewSparkMuzN.png
rename to models/extra/dlc/NewSparkMuzN.png
diff --git a/models/extra/dlc2/NewSparkMuzNK.png b/models/extra/dlc/NewSparkMuzNK.png
similarity index 100%
rename from models/extra/dlc2/NewSparkMuzNK.png
rename to models/extra/dlc/NewSparkMuzNK.png
diff --git a/models/extra/dlc1/PlasmaTracer.png b/models/extra/dlc/PlasmaTracer.png
similarity index 100%
rename from models/extra/dlc1/PlasmaTracer.png
rename to models/extra/dlc/PlasmaTracer.png
diff --git a/models/extra/dlc1/PlasmaTrail.png b/models/extra/dlc/PlasmaTrail.png
similarity index 100%
rename from models/extra/dlc1/PlasmaTrail.png
rename to models/extra/dlc/PlasmaTrail.png
diff --git a/models/extra/dlc1/PuntzerMuz0.png b/models/extra/dlc/PuntzerMuz0.png
similarity index 100%
rename from models/extra/dlc1/PuntzerMuz0.png
rename to models/extra/dlc/PuntzerMuz0.png
diff --git a/models/extra/dlc1/PuntzerMuz1.png b/models/extra/dlc/PuntzerMuz1.png
similarity index 100%
rename from models/extra/dlc1/PuntzerMuz1.png
rename to models/extra/dlc/PuntzerMuz1.png
diff --git a/models/extra/dlc1/PuntzerMuz2.png b/models/extra/dlc/PuntzerMuz2.png
similarity index 100%
rename from models/extra/dlc1/PuntzerMuz2.png
rename to models/extra/dlc/PuntzerMuz2.png
diff --git a/models/extra/dlc1/PuntzerMuz3.png b/models/extra/dlc/PuntzerMuz3.png
similarity index 100%
rename from models/extra/dlc1/PuntzerMuz3.png
rename to models/extra/dlc/PuntzerMuz3.png
diff --git a/models/extra/dlc1/PuntzerMuz4.png b/models/extra/dlc/PuntzerMuz4.png
similarity index 100%
rename from models/extra/dlc1/PuntzerMuz4.png
rename to models/extra/dlc/PuntzerMuz4.png
diff --git a/models/extra/dlc1/PuntzerMuz5.png b/models/extra/dlc/PuntzerMuz5.png
similarity index 100%
rename from models/extra/dlc1/PuntzerMuz5.png
rename to models/extra/dlc/PuntzerMuz5.png
diff --git a/models/extra/dlc1/PuntzerMuz6.png b/models/extra/dlc/PuntzerMuz6.png
similarity index 100%
rename from models/extra/dlc1/PuntzerMuz6.png
rename to models/extra/dlc/PuntzerMuz6.png
diff --git a/models/extra/dlc1/PuntzerMuz7.png b/models/extra/dlc/PuntzerMuz7.png
similarity index 100%
rename from models/extra/dlc1/PuntzerMuz7.png
rename to models/extra/dlc/PuntzerMuz7.png
diff --git a/models/extra/dlc1/QuadMuz0.png b/models/extra/dlc/QuadMuz0.png
similarity index 100%
rename from models/extra/dlc1/QuadMuz0.png
rename to models/extra/dlc/QuadMuz0.png
diff --git a/models/extra/dlc1/QuadMuz1.png b/models/extra/dlc/QuadMuz1.png
similarity index 100%
rename from models/extra/dlc1/QuadMuz1.png
rename to models/extra/dlc/QuadMuz1.png
diff --git a/models/extra/dlc1/QuadMuz2.png b/models/extra/dlc/QuadMuz2.png
similarity index 100%
rename from models/extra/dlc1/QuadMuz2.png
rename to models/extra/dlc/QuadMuz2.png
diff --git a/models/extra/dlc1/QuadMuz3.png b/models/extra/dlc/QuadMuz3.png
similarity index 100%
rename from models/extra/dlc1/QuadMuz3.png
rename to models/extra/dlc/QuadMuz3.png
diff --git a/models/extra/dlc1/QuadMuz4.png b/models/extra/dlc/QuadMuz4.png
similarity index 100%
rename from models/extra/dlc1/QuadMuz4.png
rename to models/extra/dlc/QuadMuz4.png
diff --git a/models/extra/dlc1/QuadMuz5.png b/models/extra/dlc/QuadMuz5.png
similarity index 100%
rename from models/extra/dlc1/QuadMuz5.png
rename to models/extra/dlc/QuadMuz5.png
diff --git a/models/extra/dlc1/QuadMuz6.png b/models/extra/dlc/QuadMuz6.png
similarity index 100%
rename from models/extra/dlc1/QuadMuz6.png
rename to models/extra/dlc/QuadMuz6.png
diff --git a/models/extra/dlc1/QuadMuz7.png b/models/extra/dlc/QuadMuz7.png
similarity index 100%
rename from models/extra/dlc1/QuadMuz7.png
rename to models/extra/dlc/QuadMuz7.png
diff --git a/models/extra/dlc1/QuadMuz8.png b/models/extra/dlc/QuadMuz8.png
similarity index 100%
rename from models/extra/dlc1/QuadMuz8.png
rename to models/extra/dlc/QuadMuz8.png
diff --git a/models/extra/dlc1/QuadMuz9.png b/models/extra/dlc/QuadMuz9.png
similarity index 100%
rename from models/extra/dlc1/QuadMuz9.png
rename to models/extra/dlc/QuadMuz9.png
diff --git a/models/extra/dlc1/RailMuz0.png b/models/extra/dlc/RailMuz0.png
similarity index 100%
rename from models/extra/dlc1/RailMuz0.png
rename to models/extra/dlc/RailMuz0.png
diff --git a/models/extra/dlc1/RailMuz1.png b/models/extra/dlc/RailMuz1.png
similarity index 100%
rename from models/extra/dlc1/RailMuz1.png
rename to models/extra/dlc/RailMuz1.png
diff --git a/models/extra/dlc1/RailMuz2.png b/models/extra/dlc/RailMuz2.png
similarity index 100%
rename from models/extra/dlc1/RailMuz2.png
rename to models/extra/dlc/RailMuz2.png
diff --git a/models/extra/dlc1/RailMuz3.png b/models/extra/dlc/RailMuz3.png
similarity index 100%
rename from models/extra/dlc1/RailMuz3.png
rename to models/extra/dlc/RailMuz3.png
diff --git a/models/extra/dlc1/RayTracer.png b/models/extra/dlc/RayTracer.png
similarity index 100%
rename from models/extra/dlc1/RayTracer.png
rename to models/extra/dlc/RayTracer.png
diff --git a/models/extra/dlc1/RayTrail.png b/models/extra/dlc/RayTrail.png
similarity index 100%
rename from models/extra/dlc1/RayTrail.png
rename to models/extra/dlc/RayTrail.png
diff --git a/models/extra/dlc1/SheenMuz0.png b/models/extra/dlc/SheenMuz0.png
similarity index 100%
rename from models/extra/dlc1/SheenMuz0.png
rename to models/extra/dlc/SheenMuz0.png
diff --git a/models/extra/dlc1/SheenMuz1.png b/models/extra/dlc/SheenMuz1.png
similarity index 100%
rename from models/extra/dlc1/SheenMuz1.png
rename to models/extra/dlc/SheenMuz1.png
diff --git a/models/extra/dlc1/SheenMuz2.png b/models/extra/dlc/SheenMuz2.png
similarity index 100%
rename from models/extra/dlc1/SheenMuz2.png
rename to models/extra/dlc/SheenMuz2.png
diff --git a/models/extra/dlc1/SheenMuz3.png b/models/extra/dlc/SheenMuz3.png
similarity index 100%
rename from models/extra/dlc1/SheenMuz3.png
rename to models/extra/dlc/SheenMuz3.png
diff --git a/models/extra/dlc1/SheenMuz4.png b/models/extra/dlc/SheenMuz4.png
similarity index 100%
rename from models/extra/dlc1/SheenMuz4.png
rename to models/extra/dlc/SheenMuz4.png
diff --git a/models/extra/dlc1/SheenMuz5.png b/models/extra/dlc/SheenMuz5.png
similarity index 100%
rename from models/extra/dlc1/SheenMuz5.png
rename to models/extra/dlc/SheenMuz5.png
diff --git a/models/extra/dlc1/SheenMuz6.png b/models/extra/dlc/SheenMuz6.png
similarity index 100%
rename from models/extra/dlc1/SheenMuz6.png
rename to models/extra/dlc/SheenMuz6.png
diff --git a/models/extra/dlc1/SheenMuz7.png b/models/extra/dlc/SheenMuz7.png
similarity index 100%
rename from models/extra/dlc1/SheenMuz7.png
rename to models/extra/dlc/SheenMuz7.png
diff --git a/models/extra/dlc1/SheenTracer.png b/models/extra/dlc/SheenTracer.png
similarity index 100%
rename from models/extra/dlc1/SheenTracer.png
rename to models/extra/dlc/SheenTracer.png
diff --git a/models/extra/dlc1/SheenTracer_Blue.png b/models/extra/dlc/SheenTracer_Blue.png
similarity index 100%
rename from models/extra/dlc1/SheenTracer_Blue.png
rename to models/extra/dlc/SheenTracer_Blue.png
diff --git a/models/extra/dlc1/SheenTracer_Cyan.png b/models/extra/dlc/SheenTracer_Cyan.png
similarity index 100%
rename from models/extra/dlc1/SheenTracer_Cyan.png
rename to models/extra/dlc/SheenTracer_Cyan.png
diff --git a/models/extra/dlc1/SheenTracer_Green.png b/models/extra/dlc/SheenTracer_Green.png
similarity index 100%
rename from models/extra/dlc1/SheenTracer_Green.png
rename to models/extra/dlc/SheenTracer_Green.png
diff --git a/models/extra/dlc1/SheenTracer_Magenta.png b/models/extra/dlc/SheenTracer_Magenta.png
similarity index 100%
rename from models/extra/dlc1/SheenTracer_Magenta.png
rename to models/extra/dlc/SheenTracer_Magenta.png
diff --git a/models/extra/dlc1/SheenTracer_Red.png b/models/extra/dlc/SheenTracer_Red.png
similarity index 100%
rename from models/extra/dlc1/SheenTracer_Red.png
rename to models/extra/dlc/SheenTracer_Red.png
diff --git a/models/extra/dlc1/SheenTracer_TransBlue.png b/models/extra/dlc/SheenTracer_TransBlue.png
similarity index 100%
rename from models/extra/dlc1/SheenTracer_TransBlue.png
rename to models/extra/dlc/SheenTracer_TransBlue.png
diff --git a/models/extra/dlc1/SheenTracer_TransPink.png b/models/extra/dlc/SheenTracer_TransPink.png
similarity index 100%
rename from models/extra/dlc1/SheenTracer_TransPink.png
rename to models/extra/dlc/SheenTracer_TransPink.png
diff --git a/models/extra/dlc1/SheenTracer_White.png b/models/extra/dlc/SheenTracer_White.png
similarity index 100%
rename from models/extra/dlc1/SheenTracer_White.png
rename to models/extra/dlc/SheenTracer_White.png
diff --git a/models/extra/dlc1/SheenTracer_Yellow.png b/models/extra/dlc/SheenTracer_Yellow.png
similarity index 100%
rename from models/extra/dlc1/SheenTracer_Yellow.png
rename to models/extra/dlc/SheenTracer_Yellow.png
diff --git a/models/extra/dlc2/UltimaMuz0.png b/models/extra/dlc/UltimaMuz0.png
similarity index 100%
rename from models/extra/dlc2/UltimaMuz0.png
rename to models/extra/dlc/UltimaMuz0.png
diff --git a/models/extra/dlc2/UltimaMuz1.png b/models/extra/dlc/UltimaMuz1.png
similarity index 100%
rename from models/extra/dlc2/UltimaMuz1.png
rename to models/extra/dlc/UltimaMuz1.png
diff --git a/models/extra/dlc2/UltimaMuz2.png b/models/extra/dlc/UltimaMuz2.png
similarity index 100%
rename from models/extra/dlc2/UltimaMuz2.png
rename to models/extra/dlc/UltimaMuz2.png
diff --git a/models/extra/dlc2/UltimaMuz3.png b/models/extra/dlc/UltimaMuz3.png
similarity index 100%
rename from models/extra/dlc2/UltimaMuz3.png
rename to models/extra/dlc/UltimaMuz3.png
diff --git a/models/extra/dlc2/UltimaTrail.png b/models/extra/dlc/UltimaTrail.png
similarity index 100%
rename from models/extra/dlc2/UltimaTrail.png
rename to models/extra/dlc/UltimaTrail.png
diff --git a/models/modelnotes.txt b/models/modelnotes.txt
index 84119f98c..dc7bde861 100644
--- a/models/modelnotes.txt
+++ b/models/modelnotes.txt
@@ -1,4 +1,4 @@
-# DLC Weaponset 1
+# DLC Weaponset
Weapon models:
- Itamex Hammer
@@ -6,10 +6,10 @@ Weapon models:
- Puntzer Beta
- Puntzer Gamma
- Quadravol
- - Blackfire Igniter
- - EMP Rail Carbine
+ - Sparkster Rifle
+ - Mortal Rifle
- Ray-Khom
- - Grand Lance
+ - Rafan-Kos
Ammo models:
- Plasma Ammo
@@ -23,36 +23,27 @@ Ammo models:
- 50 Box
- 100 Box
- Quadravol Ammo
- - Dark Canister
- - Emp Core
- - Ray-Khom Ammo
- - Single
- - Mag
- - Battery
- - Grand Lance Ammo
- - Single
- - Mag
-
-# DLC Weaponset 2
-
-Weapon models:
- - Hand of Divine
- - Sparkster Rifle
- - Mortal Rifle
- - Rafan-Kos
-
-Ammo models:
- Sparkster Ammo
+ - Kinylum Round
+ - Nokron Round
- Mortal Rifle Ammo
- Round
- Mag
- Grenade
+ - Ray-Khom Ammo
+ - Single
+ - Mag
+ - Battery
- Rafan-Kos Ammo
- Pod
- Mag
+Collectible models:
+ - Saya's Mug
+
# Final Update
Character models:
- Maidbot
+ - Rika
- White Lady
diff --git a/readme.txt b/readme.txt
index 019428336..ebfaa14aa 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
Some Weird Weapons Mod: GZDoom Edition
----------------------------------------
-(C)2020-2021 Marisa Kirisame - UnSX Team
+(C)2020-2022 Marisa Kirisame - UnSX Team
@@ -48,15 +48,10 @@ Index of contents:
2.6.4. Puntzer Gamma
2.6.5. Sheen HMG
2.6.6. Quadravol
- 2.6.7. Blackfire Igniter
- 2.6.8. EMP Carbine
+ 2.6.7. Sparkster Rifle
+ 2.6.8. Mortal Rifle
2.6.9. Ray-Khom
- 2.6.A. Grand Lance
- 2.7. DLC Weapon Set 2
- 2.7.1. Hand of Divine
- 2.7.2. Sparkster Rifle
- 2.7.3. Mortal Rifle
- 2.7.4. Rafan-Kos
+ 2.6.A. Rafan-Kos
3. Credits
3.1. UnSX Team Is
3.2. Special Thanks
@@ -335,8 +330,8 @@ times little pieces of treasure that you might want to collect, as they can be
very valuable.
-2.6. DLC Weapon Set 1
-- - - - - - - - - - -
+2.6. DLC Weapon Set
+- - - - - - - - - -
Coming soon. But here's a tease.
@@ -390,25 +385,23 @@ Secondary fire pumps for more power.
Tertiary fire toggles scatter shot.
And yes, it's a levergun, have fun.
-2.6.7. Blackfire Igniter
+2.6.7. Sparkster Rifle
-Slot 7. Freezethrower.
-The polar opposite of a flamethrower, it's cold and it's dark.
-Primary fire lets loose some dark flames.
-Secondary fire shoots out icicles.
-Weapon has an internal fuel tank, which can be resupplied with up to two
-canisters. Canisters can only be detached once emptied.
+Slot 7. Plasma artillery.
+Yet another signature weapon of the UnSX saga, big fat plasma rifle.
+Primary fire shoots blue plasma.
+Secondary fire spews red plasma.
+Both buttons at once release a deadly purple plasma.
+Has two reloads, for each ammo type.
-2.6.8. EMP Carbine
+2.6.8. Mortal Rifle
-Slot 8. Lightning gun.
-The power of lightning at your fingertips, zap 'em good.
-Primary fire focuses on a spot, and unloads on release.
-Secondary fire just ionizes whatever you're aiming at, so you can discharge at
-it later.
-Tertiary fire zooms, up to 8x. The scope display also lets you see ionized
-spots.
-Try not to use this underwater, by the way.
+Slot 8. Battle rifle.
+A weird as all hell rifle that does everything.
+Primary fire does schumt.
+Secondary fire the grenade.
+Tertiary fire a switch of modes.
+Have fun.
2.6.9. Ray-Khom
@@ -419,47 +412,7 @@ Secondary fire zaps whatever's in front of you, don't use it underwater.
This weapon has both a primary reload and secondary reload (zoom), as it's
powered by a removable battery.
-2.6.A. Grand Lance
-
-Slot 0. Railgun.
-A huge-ass railgun with a fusion bomb payload. Yeah, just that.
-Primary fire launches the projectile, it'll detonate on first impact.
-Secondary fire charges a faster shot, it will penetrate multiple targets before
-exploding, might even go through walls.
-
-
-2.7. DLC Weapon Set 2
-- - - - - - - - - - -
-
-Also coming soon. And there's also a tease.
-
-2.7.1. Hand of Divine
-
-Slot 1. Melee weapon.
-The power of a divine vibe check.
-Primary fire punches.
-Secondary fire slaps.
-Both can be charged by holding each button.
-
-2.7.2. Sparkster Rifle
-
-Slot 7. Plasma artillery.
-Yet another signature weapon of the UnSX saga, big fat plasma rifle.
-Primary fire shoots blue plasma.
-Secondary fire spews red plasma.
-Both buttons at once release a deadly purple plasma.
-Has two reloads, for each ammo type.
-
-2.7.3. Mortal Rifle
-
-Slot 9. Battle rifle.
-A weird as all hell rifle that does everything.
-Primary fire does schumt.
-Secondary fire the grenade.
-Tertiary fire a switch of modes.
-Have fun.
-
-2.7.4. Rafan-Kos
+2.6.A. Rafan-Kos
Slot 0. Ultimate weapon.
Frickin' laser beams, big of them, very strong.
@@ -467,6 +420,7 @@ Primary fire beam.
Secondary fire more beams.
I'm tired from writing these, good night.
+
3. Credits
----------
diff --git a/sounds/voice/default/va/demogetblackfireigniter.ogg b/sounds/voice/default/va/demogetblackfireigniter.ogg
deleted file mode 100644
index a057fc92f..000000000
Binary files a/sounds/voice/default/va/demogetblackfireigniter.ogg and /dev/null differ
diff --git a/sounds/voice/default/va/demogetempcarbine.ogg b/sounds/voice/default/va/demogetempcarbine.ogg
deleted file mode 100644
index 012495553..000000000
Binary files a/sounds/voice/default/va/demogetempcarbine.ogg and /dev/null differ
diff --git a/sounds/voice/default/va/demogetgrandlance.ogg b/sounds/voice/default/va/demogetgrandlance.ogg
deleted file mode 100644
index 3f598642a..000000000
Binary files a/sounds/voice/default/va/demogetgrandlance.ogg and /dev/null differ
diff --git a/sounds/voice/default/va/demogetwhiteglove.ogg b/sounds/voice/default/va/demogetwhiteglove.ogg
deleted file mode 100644
index 4aa6c5fe8..000000000
Binary files a/sounds/voice/default/va/demogetwhiteglove.ogg and /dev/null differ
diff --git a/sprites/dlc1/BFXXA0.png b/sprites/dlc/BFXXA0.png
similarity index 100%
rename from sprites/dlc1/BFXXA0.png
rename to sprites/dlc/BFXXA0.png
diff --git a/sprites/dlc1/BFXXB0.png b/sprites/dlc/BFXXB0.png
similarity index 100%
rename from sprites/dlc1/BFXXB0.png
rename to sprites/dlc/BFXXB0.png
diff --git a/sprites/dlc1/BFXXC0.png b/sprites/dlc/BFXXC0.png
similarity index 100%
rename from sprites/dlc1/BFXXC0.png
rename to sprites/dlc/BFXXC0.png
diff --git a/sprites/dlc1/BFXXD0.png b/sprites/dlc/BFXXD0.png
similarity index 100%
rename from sprites/dlc1/BFXXD0.png
rename to sprites/dlc/BFXXD0.png
diff --git a/sprites/dlc1/BFXXE0.png b/sprites/dlc/BFXXE0.png
similarity index 100%
rename from sprites/dlc1/BFXXE0.png
rename to sprites/dlc/BFXXE0.png
diff --git a/sprites/dlc1/BFXXF0.png b/sprites/dlc/BFXXF0.png
similarity index 100%
rename from sprites/dlc1/BFXXF0.png
rename to sprites/dlc/BFXXF0.png
diff --git a/sprites/dlc1/BFXXG0.png b/sprites/dlc/BFXXG0.png
similarity index 100%
rename from sprites/dlc1/BFXXG0.png
rename to sprites/dlc/BFXXG0.png
diff --git a/sprites/dlc1/BFXXH0.png b/sprites/dlc/BFXXH0.png
similarity index 100%
rename from sprites/dlc1/BFXXH0.png
rename to sprites/dlc/BFXXH0.png
diff --git a/sprites/dlc1/BFXXI0.png b/sprites/dlc/BFXXI0.png
similarity index 100%
rename from sprites/dlc1/BFXXI0.png
rename to sprites/dlc/BFXXI0.png
diff --git a/sprites/dlc1/BFXXJ0.png b/sprites/dlc/BFXXJ0.png
similarity index 100%
rename from sprites/dlc1/BFXXJ0.png
rename to sprites/dlc/BFXXJ0.png
diff --git a/sprites/dlc1/BFXXK0.png b/sprites/dlc/BFXXK0.png
similarity index 100%
rename from sprites/dlc1/BFXXK0.png
rename to sprites/dlc/BFXXK0.png
diff --git a/sprites/dlc1/BFXXL0.png b/sprites/dlc/BFXXL0.png
similarity index 100%
rename from sprites/dlc1/BFXXL0.png
rename to sprites/dlc/BFXXL0.png
diff --git a/sprites/dlc1/BFXXM0.png b/sprites/dlc/BFXXM0.png
similarity index 100%
rename from sprites/dlc1/BFXXM0.png
rename to sprites/dlc/BFXXM0.png
diff --git a/sprites/dlc1/BFXXN0.png b/sprites/dlc/BFXXN0.png
similarity index 100%
rename from sprites/dlc1/BFXXN0.png
rename to sprites/dlc/BFXXN0.png
diff --git a/sprites/dlc1/BFXXO0.png b/sprites/dlc/BFXXO0.png
similarity index 100%
rename from sprites/dlc1/BFXXO0.png
rename to sprites/dlc/BFXXO0.png
diff --git a/sprites/dlc1/BFXXP0.png b/sprites/dlc/BFXXP0.png
similarity index 100%
rename from sprites/dlc1/BFXXP0.png
rename to sprites/dlc/BFXXP0.png
diff --git a/sprites/dlc1/BFXXQ0.png b/sprites/dlc/BFXXQ0.png
similarity index 100%
rename from sprites/dlc1/BFXXQ0.png
rename to sprites/dlc/BFXXQ0.png
diff --git a/sprites/dlc1/BFXXR0.png b/sprites/dlc/BFXXR0.png
similarity index 100%
rename from sprites/dlc1/BFXXR0.png
rename to sprites/dlc/BFXXR0.png
diff --git a/sprites/dlc1/BFXXS0.png b/sprites/dlc/BFXXS0.png
similarity index 100%
rename from sprites/dlc1/BFXXS0.png
rename to sprites/dlc/BFXXS0.png
diff --git a/sprites/dlc1/BFXXT0.png b/sprites/dlc/BFXXT0.png
similarity index 100%
rename from sprites/dlc1/BFXXT0.png
rename to sprites/dlc/BFXXT0.png
diff --git a/sprites/dlc2/NSFLA0.png b/sprites/dlc/NSFLA0.png
similarity index 100%
rename from sprites/dlc2/NSFLA0.png
rename to sprites/dlc/NSFLA0.png
diff --git a/sprites/dlc2/NSFLB0.png b/sprites/dlc/NSFLB0.png
similarity index 100%
rename from sprites/dlc2/NSFLB0.png
rename to sprites/dlc/NSFLB0.png
diff --git a/sprites/dlc2/NSFLC0.png b/sprites/dlc/NSFLC0.png
similarity index 100%
rename from sprites/dlc2/NSFLC0.png
rename to sprites/dlc/NSFLC0.png
diff --git a/sprites/dlc1/PBBLA0.png b/sprites/dlc/PBBLA0.png
similarity index 100%
rename from sprites/dlc1/PBBLA0.png
rename to sprites/dlc/PBBLA0.png
diff --git a/sprites/dlc1/PBBLB0.png b/sprites/dlc/PBBLB0.png
similarity index 100%
rename from sprites/dlc1/PBBLB0.png
rename to sprites/dlc/PBBLB0.png
diff --git a/sprites/dlc1/PBBLC0.png b/sprites/dlc/PBBLC0.png
similarity index 100%
rename from sprites/dlc1/PBBLC0.png
rename to sprites/dlc/PBBLC0.png
diff --git a/sprites/dlc1/PBBLD0.png b/sprites/dlc/PBBLD0.png
similarity index 100%
rename from sprites/dlc1/PBBLD0.png
rename to sprites/dlc/PBBLD0.png
diff --git a/sprites/dlc1/PBBLE0.png b/sprites/dlc/PBBLE0.png
similarity index 100%
rename from sprites/dlc1/PBBLE0.png
rename to sprites/dlc/PBBLE0.png
diff --git a/sprites/dlc1/PBBLF0.png b/sprites/dlc/PBBLF0.png
similarity index 100%
rename from sprites/dlc1/PBBLF0.png
rename to sprites/dlc/PBBLF0.png
diff --git a/sprites/dlc1/PBBLG0.png b/sprites/dlc/PBBLG0.png
similarity index 100%
rename from sprites/dlc1/PBBLG0.png
rename to sprites/dlc/PBBLG0.png
diff --git a/sprites/dlc1/PBBLH0.png b/sprites/dlc/PBBLH0.png
similarity index 100%
rename from sprites/dlc1/PBBLH0.png
rename to sprites/dlc/PBBLH0.png
diff --git a/sprites/dlc1/PBBLI0.png b/sprites/dlc/PBBLI0.png
similarity index 100%
rename from sprites/dlc1/PBBLI0.png
rename to sprites/dlc/PBBLI0.png
diff --git a/sprites/dlc1/PBBLJ0.png b/sprites/dlc/PBBLJ0.png
similarity index 100%
rename from sprites/dlc1/PBBLJ0.png
rename to sprites/dlc/PBBLJ0.png
diff --git a/sprites/dlc1/PBMBA0.png b/sprites/dlc/PBMBA0.png
similarity index 100%
rename from sprites/dlc1/PBMBA0.png
rename to sprites/dlc/PBMBA0.png
diff --git a/sprites/dlc1/PBMBB0.png b/sprites/dlc/PBMBB0.png
similarity index 100%
rename from sprites/dlc1/PBMBB0.png
rename to sprites/dlc/PBMBB0.png
diff --git a/sprites/dlc1/PBMBC0.png b/sprites/dlc/PBMBC0.png
similarity index 100%
rename from sprites/dlc1/PBMBC0.png
rename to sprites/dlc/PBMBC0.png
diff --git a/sprites/dlc1/PBMBD0.png b/sprites/dlc/PBMBD0.png
similarity index 100%
rename from sprites/dlc1/PBMBD0.png
rename to sprites/dlc/PBMBD0.png
diff --git a/sprites/dlc1/PBMBE0.png b/sprites/dlc/PBMBE0.png
similarity index 100%
rename from sprites/dlc1/PBMBE0.png
rename to sprites/dlc/PBMBE0.png
diff --git a/sprites/dlc1/PBMBF0.png b/sprites/dlc/PBMBF0.png
similarity index 100%
rename from sprites/dlc1/PBMBF0.png
rename to sprites/dlc/PBMBF0.png
diff --git a/sprites/dlc1/PBMBG0.png b/sprites/dlc/PBMBG0.png
similarity index 100%
rename from sprites/dlc1/PBMBG0.png
rename to sprites/dlc/PBMBG0.png
diff --git a/sprites/dlc1/PBMBH0.png b/sprites/dlc/PBMBH0.png
similarity index 100%
rename from sprites/dlc1/PBMBH0.png
rename to sprites/dlc/PBMBH0.png
diff --git a/sprites/dlc1/PBMBI0.png b/sprites/dlc/PBMBI0.png
similarity index 100%
rename from sprites/dlc1/PBMBI0.png
rename to sprites/dlc/PBMBI0.png
diff --git a/sprites/dlc1/PBMBJ0.png b/sprites/dlc/PBMBJ0.png
similarity index 100%
rename from sprites/dlc1/PBMBJ0.png
rename to sprites/dlc/PBMBJ0.png
diff --git a/sprites/dlc1/PBMBK0.png b/sprites/dlc/PBMBK0.png
similarity index 100%
rename from sprites/dlc1/PBMBK0.png
rename to sprites/dlc/PBMBK0.png
diff --git a/sprites/dlc1/PBMBL0.png b/sprites/dlc/PBMBL0.png
similarity index 100%
rename from sprites/dlc1/PBMBL0.png
rename to sprites/dlc/PBMBL0.png
diff --git a/sprites/dlc1/QEMBA0.png b/sprites/dlc/QEMBA0.png
similarity index 100%
rename from sprites/dlc1/QEMBA0.png
rename to sprites/dlc/QEMBA0.png
diff --git a/sprites/dlc1/QEMBB0.png b/sprites/dlc/QEMBB0.png
similarity index 100%
rename from sprites/dlc1/QEMBB0.png
rename to sprites/dlc/QEMBB0.png
diff --git a/sprites/dlc1/QEMBC0.png b/sprites/dlc/QEMBC0.png
similarity index 100%
rename from sprites/dlc1/QEMBC0.png
rename to sprites/dlc/QEMBC0.png
diff --git a/sprites/dlc1/QEMBD0.png b/sprites/dlc/QEMBD0.png
similarity index 100%
rename from sprites/dlc1/QEMBD0.png
rename to sprites/dlc/QEMBD0.png
diff --git a/sprites/dlc1/QEMBE0.png b/sprites/dlc/QEMBE0.png
similarity index 100%
rename from sprites/dlc1/QEMBE0.png
rename to sprites/dlc/QEMBE0.png
diff --git a/sprites/dlc1/QFBLA0.png b/sprites/dlc/QFBLA0.png
similarity index 100%
rename from sprites/dlc1/QFBLA0.png
rename to sprites/dlc/QFBLA0.png
diff --git a/sprites/dlc1/QFBLB0.png b/sprites/dlc/QFBLB0.png
similarity index 100%
rename from sprites/dlc1/QFBLB0.png
rename to sprites/dlc/QFBLB0.png
diff --git a/sprites/dlc1/QFBLC0.png b/sprites/dlc/QFBLC0.png
similarity index 100%
rename from sprites/dlc1/QFBLC0.png
rename to sprites/dlc/QFBLC0.png
diff --git a/sprites/dlc1/QFBLD0.png b/sprites/dlc/QFBLD0.png
similarity index 100%
rename from sprites/dlc1/QFBLD0.png
rename to sprites/dlc/QFBLD0.png
diff --git a/sprites/dlc1/QFBLE0.png b/sprites/dlc/QFBLE0.png
similarity index 100%
rename from sprites/dlc1/QFBLE0.png
rename to sprites/dlc/QFBLE0.png
diff --git a/sprites/dlc1/QFBLF0.png b/sprites/dlc/QFBLF0.png
similarity index 100%
rename from sprites/dlc1/QFBLF0.png
rename to sprites/dlc/QFBLF0.png
diff --git a/sprites/dlc1/QFBLG0.png b/sprites/dlc/QFBLG0.png
similarity index 100%
rename from sprites/dlc1/QFBLG0.png
rename to sprites/dlc/QFBLG0.png
diff --git a/sprites/dlc1/QFBLH0.png b/sprites/dlc/QFBLH0.png
similarity index 100%
rename from sprites/dlc1/QFBLH0.png
rename to sprites/dlc/QFBLH0.png
diff --git a/sprites/dlc1/QFBLI0.png b/sprites/dlc/QFBLI0.png
similarity index 100%
rename from sprites/dlc1/QFBLI0.png
rename to sprites/dlc/QFBLI0.png
diff --git a/sprites/dlc1/QFBLJ0.png b/sprites/dlc/QFBLJ0.png
similarity index 100%
rename from sprites/dlc1/QFBLJ0.png
rename to sprites/dlc/QFBLJ0.png
diff --git a/sprites/dlc1/QFLRA0.png b/sprites/dlc/QFLRA0.png
similarity index 100%
rename from sprites/dlc1/QFLRA0.png
rename to sprites/dlc/QFLRA0.png
diff --git a/sprites/dlc1/RAYTA0.png b/sprites/dlc/RAYTA0.png
similarity index 100%
rename from sprites/dlc1/RAYTA0.png
rename to sprites/dlc/RAYTA0.png
diff --git a/sprites/dlc1/RAYTB0.png b/sprites/dlc/RAYTB0.png
similarity index 100%
rename from sprites/dlc1/RAYTB0.png
rename to sprites/dlc/RAYTB0.png
diff --git a/sprites/dlc1/RAYTC0.png b/sprites/dlc/RAYTC0.png
similarity index 100%
rename from sprites/dlc1/RAYTC0.png
rename to sprites/dlc/RAYTC0.png
diff --git a/sprites/dlc1/RAYTD0.png b/sprites/dlc/RAYTD0.png
similarity index 100%
rename from sprites/dlc1/RAYTD0.png
rename to sprites/dlc/RAYTD0.png
diff --git a/sprites/dlc1/RAYTE0.png b/sprites/dlc/RAYTE0.png
similarity index 100%
rename from sprites/dlc1/RAYTE0.png
rename to sprites/dlc/RAYTE0.png
diff --git a/sprites/dlc1/RAYTF0.png b/sprites/dlc/RAYTF0.png
similarity index 100%
rename from sprites/dlc1/RAYTF0.png
rename to sprites/dlc/RAYTF0.png
diff --git a/sprites/dlc1/RAYTG0.png b/sprites/dlc/RAYTG0.png
similarity index 100%
rename from sprites/dlc1/RAYTG0.png
rename to sprites/dlc/RAYTG0.png
diff --git a/sprites/dlc1/RAYTH0.png b/sprites/dlc/RAYTH0.png
similarity index 100%
rename from sprites/dlc1/RAYTH0.png
rename to sprites/dlc/RAYTH0.png
diff --git a/sprites/dlc1/RAYTI0.png b/sprites/dlc/RAYTI0.png
similarity index 100%
rename from sprites/dlc1/RAYTI0.png
rename to sprites/dlc/RAYTI0.png
diff --git a/sprites/dlc1/RAYTJ0.png b/sprites/dlc/RAYTJ0.png
similarity index 100%
rename from sprites/dlc1/RAYTJ0.png
rename to sprites/dlc/RAYTJ0.png
diff --git a/sprites/dlc1/RAYTK0.png b/sprites/dlc/RAYTK0.png
similarity index 100%
rename from sprites/dlc1/RAYTK0.png
rename to sprites/dlc/RAYTK0.png
diff --git a/sprites/dlc2/RFXPA0.png b/sprites/dlc/RFXPA0.png
similarity index 100%
rename from sprites/dlc2/RFXPA0.png
rename to sprites/dlc/RFXPA0.png
diff --git a/sprites/dlc2/RFXPB0.png b/sprites/dlc/RFXPB0.png
similarity index 100%
rename from sprites/dlc2/RFXPB0.png
rename to sprites/dlc/RFXPB0.png
diff --git a/sprites/dlc2/RFXPC0.png b/sprites/dlc/RFXPC0.png
similarity index 100%
rename from sprites/dlc2/RFXPC0.png
rename to sprites/dlc/RFXPC0.png
diff --git a/sprites/dlc2/RFXPD0.png b/sprites/dlc/RFXPD0.png
similarity index 100%
rename from sprites/dlc2/RFXPD0.png
rename to sprites/dlc/RFXPD0.png
diff --git a/sprites/dlc2/RFXPE0.png b/sprites/dlc/RFXPE0.png
similarity index 100%
rename from sprites/dlc2/RFXPE0.png
rename to sprites/dlc/RFXPE0.png
diff --git a/sprites/dlc2/RFXPF0.png b/sprites/dlc/RFXPF0.png
similarity index 100%
rename from sprites/dlc2/RFXPF0.png
rename to sprites/dlc/RFXPF0.png
diff --git a/sprites/dlc2/RFXPG0.png b/sprites/dlc/RFXPG0.png
similarity index 100%
rename from sprites/dlc2/RFXPG0.png
rename to sprites/dlc/RFXPG0.png
diff --git a/sprites/dlc2/RFXPH0.png b/sprites/dlc/RFXPH0.png
similarity index 100%
rename from sprites/dlc2/RFXPH0.png
rename to sprites/dlc/RFXPH0.png
diff --git a/sprites/dlc2/RFXPI0.png b/sprites/dlc/RFXPI0.png
similarity index 100%
rename from sprites/dlc2/RFXPI0.png
rename to sprites/dlc/RFXPI0.png
diff --git a/sprites/dlc2/RFXPJ0.png b/sprites/dlc/RFXPJ0.png
similarity index 100%
rename from sprites/dlc2/RFXPJ0.png
rename to sprites/dlc/RFXPJ0.png
diff --git a/sprites/dlc2/RFXPK0.png b/sprites/dlc/RFXPK0.png
similarity index 100%
rename from sprites/dlc2/RFXPK0.png
rename to sprites/dlc/RFXPK0.png
diff --git a/sprites/dlc2/RFXPL0.png b/sprites/dlc/RFXPL0.png
similarity index 100%
rename from sprites/dlc2/RFXPL0.png
rename to sprites/dlc/RFXPL0.png
diff --git a/sprites/dlc2/RFXPM0.png b/sprites/dlc/RFXPM0.png
similarity index 100%
rename from sprites/dlc2/RFXPM0.png
rename to sprites/dlc/RFXPM0.png
diff --git a/sprites/dlc2/RFXPN0.png b/sprites/dlc/RFXPN0.png
similarity index 100%
rename from sprites/dlc2/RFXPN0.png
rename to sprites/dlc/RFXPN0.png
diff --git a/sprites/dlc2/RFXPO0.png b/sprites/dlc/RFXPO0.png
similarity index 100%
rename from sprites/dlc2/RFXPO0.png
rename to sprites/dlc/RFXPO0.png
diff --git a/sprites/dlc2/RFXPP0.png b/sprites/dlc/RFXPP0.png
similarity index 100%
rename from sprites/dlc2/RFXPP0.png
rename to sprites/dlc/RFXPP0.png
diff --git a/sprites/dlc2/RFXPQ0.png b/sprites/dlc/RFXPQ0.png
similarity index 100%
rename from sprites/dlc2/RFXPQ0.png
rename to sprites/dlc/RFXPQ0.png
diff --git a/sprites/dlc2/RFXPR0.png b/sprites/dlc/RFXPR0.png
similarity index 100%
rename from sprites/dlc2/RFXPR0.png
rename to sprites/dlc/RFXPR0.png
diff --git a/sprites/dlc2/RFXPS0.png b/sprites/dlc/RFXPS0.png
similarity index 100%
rename from sprites/dlc2/RFXPS0.png
rename to sprites/dlc/RFXPS0.png
diff --git a/sprites/dlc2/RFXPT0.png b/sprites/dlc/RFXPT0.png
similarity index 100%
rename from sprites/dlc2/RFXPT0.png
rename to sprites/dlc/RFXPT0.png
diff --git a/sprites/dlc2/RFXPU0.png b/sprites/dlc/RFXPU0.png
similarity index 100%
rename from sprites/dlc2/RFXPU0.png
rename to sprites/dlc/RFXPU0.png
diff --git a/sprites/dlc2/RFXPV0.png b/sprites/dlc/RFXPV0.png
similarity index 100%
rename from sprites/dlc2/RFXPV0.png
rename to sprites/dlc/RFXPV0.png
diff --git a/sprites/dlc2/RFXPW0.png b/sprites/dlc/RFXPW0.png
similarity index 100%
rename from sprites/dlc2/RFXPW0.png
rename to sprites/dlc/RFXPW0.png
diff --git a/sprites/dlc2/RFXPX0.png b/sprites/dlc/RFXPX0.png
similarity index 100%
rename from sprites/dlc2/RFXPX0.png
rename to sprites/dlc/RFXPX0.png
diff --git a/sprites/dlc2/RFXPY0.png b/sprites/dlc/RFXPY0.png
similarity index 100%
rename from sprites/dlc2/RFXPY0.png
rename to sprites/dlc/RFXPY0.png
diff --git a/sprites/dlc2/RFXPZ0.png b/sprites/dlc/RFXPZ0.png
similarity index 100%
rename from sprites/dlc2/RFXPZ0.png
rename to sprites/dlc/RFXPZ0.png
diff --git a/sprites/dlc2/RFXP[0.png b/sprites/dlc/RFXP[0.png
similarity index 100%
rename from sprites/dlc2/RFXP[0.png
rename to sprites/dlc/RFXP[0.png
diff --git a/sprites/dlc2/RFXP^0.png b/sprites/dlc/RFXP^0.png
similarity index 100%
rename from sprites/dlc2/RFXP^0.png
rename to sprites/dlc/RFXP^0.png
diff --git a/sprites/dlc1/XEX5A0.png b/sprites/dlc/XEX5A0.png
similarity index 100%
rename from sprites/dlc1/XEX5A0.png
rename to sprites/dlc/XEX5A0.png
diff --git a/sprites/dlc1/XEX5B0.png b/sprites/dlc/XEX5B0.png
similarity index 100%
rename from sprites/dlc1/XEX5B0.png
rename to sprites/dlc/XEX5B0.png
diff --git a/sprites/dlc1/XEX5C0.png b/sprites/dlc/XEX5C0.png
similarity index 100%
rename from sprites/dlc1/XEX5C0.png
rename to sprites/dlc/XEX5C0.png
diff --git a/sprites/dlc1/XEX5D0.png b/sprites/dlc/XEX5D0.png
similarity index 100%
rename from sprites/dlc1/XEX5D0.png
rename to sprites/dlc/XEX5D0.png
diff --git a/sprites/dlc1/XEX5E0.png b/sprites/dlc/XEX5E0.png
similarity index 100%
rename from sprites/dlc1/XEX5E0.png
rename to sprites/dlc/XEX5E0.png
diff --git a/sprites/dlc1/XEX5F0.png b/sprites/dlc/XEX5F0.png
similarity index 100%
rename from sprites/dlc1/XEX5F0.png
rename to sprites/dlc/XEX5F0.png
diff --git a/sprites/dlc1/XEX5G0.png b/sprites/dlc/XEX5G0.png
similarity index 100%
rename from sprites/dlc1/XEX5G0.png
rename to sprites/dlc/XEX5G0.png
diff --git a/sprites/dlc1/XEX5H0.png b/sprites/dlc/XEX5H0.png
similarity index 100%
rename from sprites/dlc1/XEX5H0.png
rename to sprites/dlc/XEX5H0.png
diff --git a/sprites/dlc1/XEX5I0.png b/sprites/dlc/XEX5I0.png
similarity index 100%
rename from sprites/dlc1/XEX5I0.png
rename to sprites/dlc/XEX5I0.png
diff --git a/sprites/dlc1/XEX5J0.png b/sprites/dlc/XEX5J0.png
similarity index 100%
rename from sprites/dlc1/XEX5J0.png
rename to sprites/dlc/XEX5J0.png
diff --git a/sprites/dlc1/XEX5K0.png b/sprites/dlc/XEX5K0.png
similarity index 100%
rename from sprites/dlc1/XEX5K0.png
rename to sprites/dlc/XEX5K0.png
diff --git a/sprites/dlc1/XEX5L0.png b/sprites/dlc/XEX5L0.png
similarity index 100%
rename from sprites/dlc1/XEX5L0.png
rename to sprites/dlc/XEX5L0.png
diff --git a/sprites/dlc1/XEX5M0.png b/sprites/dlc/XEX5M0.png
similarity index 100%
rename from sprites/dlc1/XEX5M0.png
rename to sprites/dlc/XEX5M0.png
diff --git a/sprites/dlc1/XEX5N0.png b/sprites/dlc/XEX5N0.png
similarity index 100%
rename from sprites/dlc1/XEX5N0.png
rename to sprites/dlc/XEX5N0.png
diff --git a/sprites/dlc1/XEX5O0.png b/sprites/dlc/XEX5O0.png
similarity index 100%
rename from sprites/dlc1/XEX5O0.png
rename to sprites/dlc/XEX5O0.png
diff --git a/sprites/dlc1/XEX5P0.png b/sprites/dlc/XEX5P0.png
similarity index 100%
rename from sprites/dlc1/XEX5P0.png
rename to sprites/dlc/XEX5P0.png
diff --git a/sprites/dlc1/XEX5Q0.png b/sprites/dlc/XEX5Q0.png
similarity index 100%
rename from sprites/dlc1/XEX5Q0.png
rename to sprites/dlc/XEX5Q0.png
diff --git a/sprites/dlc1/XEX5R0.png b/sprites/dlc/XEX5R0.png
similarity index 100%
rename from sprites/dlc1/XEX5R0.png
rename to sprites/dlc/XEX5R0.png
diff --git a/sprites/dlc1/XEX5S0.png b/sprites/dlc/XEX5S0.png
similarity index 100%
rename from sprites/dlc1/XEX5S0.png
rename to sprites/dlc/XEX5S0.png
diff --git a/sprites/dlc1/XEX6A0.png b/sprites/dlc/XEX6A0.png
similarity index 100%
rename from sprites/dlc1/XEX6A0.png
rename to sprites/dlc/XEX6A0.png
diff --git a/sprites/dlc1/XEX6B0.png b/sprites/dlc/XEX6B0.png
similarity index 100%
rename from sprites/dlc1/XEX6B0.png
rename to sprites/dlc/XEX6B0.png
diff --git a/sprites/dlc1/XEX6C0.png b/sprites/dlc/XEX6C0.png
similarity index 100%
rename from sprites/dlc1/XEX6C0.png
rename to sprites/dlc/XEX6C0.png
diff --git a/sprites/dlc1/XEX6D0.png b/sprites/dlc/XEX6D0.png
similarity index 100%
rename from sprites/dlc1/XEX6D0.png
rename to sprites/dlc/XEX6D0.png
diff --git a/sprites/dlc1/XEX6E0.png b/sprites/dlc/XEX6E0.png
similarity index 100%
rename from sprites/dlc1/XEX6E0.png
rename to sprites/dlc/XEX6E0.png
diff --git a/sprites/dlc1/XEX6F0.png b/sprites/dlc/XEX6F0.png
similarity index 100%
rename from sprites/dlc1/XEX6F0.png
rename to sprites/dlc/XEX6F0.png
diff --git a/sprites/dlc1/XEX6G0.png b/sprites/dlc/XEX6G0.png
similarity index 100%
rename from sprites/dlc1/XEX6G0.png
rename to sprites/dlc/XEX6G0.png
diff --git a/sprites/dlc1/XEX6H0.png b/sprites/dlc/XEX6H0.png
similarity index 100%
rename from sprites/dlc1/XEX6H0.png
rename to sprites/dlc/XEX6H0.png
diff --git a/sprites/dlc1/XEX6I0.png b/sprites/dlc/XEX6I0.png
similarity index 100%
rename from sprites/dlc1/XEX6I0.png
rename to sprites/dlc/XEX6I0.png
diff --git a/sprites/dlc1/XEX6J0.png b/sprites/dlc/XEX6J0.png
similarity index 100%
rename from sprites/dlc1/XEX6J0.png
rename to sprites/dlc/XEX6J0.png
diff --git a/sprites/dlc1/XEX6K0.png b/sprites/dlc/XEX6K0.png
similarity index 100%
rename from sprites/dlc1/XEX6K0.png
rename to sprites/dlc/XEX6K0.png
diff --git a/sprites/dlc1/XEX6L0.png b/sprites/dlc/XEX6L0.png
similarity index 100%
rename from sprites/dlc1/XEX6L0.png
rename to sprites/dlc/XEX6L0.png
diff --git a/sprites/dlc1/XEX6M0.png b/sprites/dlc/XEX6M0.png
similarity index 100%
rename from sprites/dlc1/XEX6M0.png
rename to sprites/dlc/XEX6M0.png
diff --git a/sprites/dlc1/XEX6N0.png b/sprites/dlc/XEX6N0.png
similarity index 100%
rename from sprites/dlc1/XEX6N0.png
rename to sprites/dlc/XEX6N0.png
diff --git a/sprites/dlc1/XEX6O0.png b/sprites/dlc/XEX6O0.png
similarity index 100%
rename from sprites/dlc1/XEX6O0.png
rename to sprites/dlc/XEX6O0.png
diff --git a/sprites/dlc1/XEX6P0.png b/sprites/dlc/XEX6P0.png
similarity index 100%
rename from sprites/dlc1/XEX6P0.png
rename to sprites/dlc/XEX6P0.png
diff --git a/sprites/dlc1/XEX6Q0.png b/sprites/dlc/XEX6Q0.png
similarity index 100%
rename from sprites/dlc1/XEX6Q0.png
rename to sprites/dlc/XEX6Q0.png
diff --git a/sprites/dlc1/XEX6R0.png b/sprites/dlc/XEX6R0.png
similarity index 100%
rename from sprites/dlc1/XEX6R0.png
rename to sprites/dlc/XEX6R0.png
diff --git a/sprites/dlc1/XEX6S0.png b/sprites/dlc/XEX6S0.png
similarity index 100%
rename from sprites/dlc1/XEX6S0.png
rename to sprites/dlc/XEX6S0.png
diff --git a/sprites/dlc1/XRG6A0.png b/sprites/dlc/XRG6A0.png
similarity index 100%
rename from sprites/dlc1/XRG6A0.png
rename to sprites/dlc/XRG6A0.png
diff --git a/sprites/dlc1/XRG6B0.png b/sprites/dlc/XRG6B0.png
similarity index 100%
rename from sprites/dlc1/XRG6B0.png
rename to sprites/dlc/XRG6B0.png
diff --git a/sprites/dlc1/XRG6C0.png b/sprites/dlc/XRG6C0.png
similarity index 100%
rename from sprites/dlc1/XRG6C0.png
rename to sprites/dlc/XRG6C0.png
diff --git a/sprites/dlc1/XRG6D0.png b/sprites/dlc/XRG6D0.png
similarity index 100%
rename from sprites/dlc1/XRG6D0.png
rename to sprites/dlc/XRG6D0.png
diff --git a/sprites/dlc1/XRG6E0.png b/sprites/dlc/XRG6E0.png
similarity index 100%
rename from sprites/dlc1/XRG6E0.png
rename to sprites/dlc/XRG6E0.png
diff --git a/sprites/dlc1/XRG6F0.png b/sprites/dlc/XRG6F0.png
similarity index 100%
rename from sprites/dlc1/XRG6F0.png
rename to sprites/dlc/XRG6F0.png
diff --git a/sprites/dlc1/XRG6G0.png b/sprites/dlc/XRG6G0.png
similarity index 100%
rename from sprites/dlc1/XRG6G0.png
rename to sprites/dlc/XRG6G0.png
diff --git a/sprites/dlc1/XRG6H0.png b/sprites/dlc/XRG6H0.png
similarity index 100%
rename from sprites/dlc1/XRG6H0.png
rename to sprites/dlc/XRG6H0.png
diff --git a/sprites/dlc1/XRG6I0.png b/sprites/dlc/XRG6I0.png
similarity index 100%
rename from sprites/dlc1/XRG6I0.png
rename to sprites/dlc/XRG6I0.png
diff --git a/sprites/dlc1/XRG6J0.png b/sprites/dlc/XRG6J0.png
similarity index 100%
rename from sprites/dlc1/XRG6J0.png
rename to sprites/dlc/XRG6J0.png
diff --git a/sprites/dlc1/XRG6K0.png b/sprites/dlc/XRG6K0.png
similarity index 100%
rename from sprites/dlc1/XRG6K0.png
rename to sprites/dlc/XRG6K0.png
diff --git a/sprites/dlc1/XRG6L0.png b/sprites/dlc/XRG6L0.png
similarity index 100%
rename from sprites/dlc1/XRG6L0.png
rename to sprites/dlc/XRG6L0.png
diff --git a/sprites/dlc1/XRG6M0.png b/sprites/dlc/XRG6M0.png
similarity index 100%
rename from sprites/dlc1/XRG6M0.png
rename to sprites/dlc/XRG6M0.png
diff --git a/sprites/dlc1/XRG6N0.png b/sprites/dlc/XRG6N0.png
similarity index 100%
rename from sprites/dlc1/XRG6N0.png
rename to sprites/dlc/XRG6N0.png
diff --git a/sprites/dlc1/XRG6O0.png b/sprites/dlc/XRG6O0.png
similarity index 100%
rename from sprites/dlc1/XRG6O0.png
rename to sprites/dlc/XRG6O0.png
diff --git a/sprites/dlc1/XRG6P0.png b/sprites/dlc/XRG6P0.png
similarity index 100%
rename from sprites/dlc1/XRG6P0.png
rename to sprites/dlc/XRG6P0.png
diff --git a/sprites/dlc1/XRG6Q0.png b/sprites/dlc/XRG6Q0.png
similarity index 100%
rename from sprites/dlc1/XRG6Q0.png
rename to sprites/dlc/XRG6Q0.png
diff --git a/sprites/dlc1/XRG6R0.png b/sprites/dlc/XRG6R0.png
similarity index 100%
rename from sprites/dlc1/XRG6R0.png
rename to sprites/dlc/XRG6R0.png
diff --git a/sprites/dlc1/XRG6S0.png b/sprites/dlc/XRG6S0.png
similarity index 100%
rename from sprites/dlc1/XRG6S0.png
rename to sprites/dlc/XRG6S0.png
diff --git a/sprites/dlc1/XRG6T0.png b/sprites/dlc/XRG6T0.png
similarity index 100%
rename from sprites/dlc1/XRG6T0.png
rename to sprites/dlc/XRG6T0.png
diff --git a/sprites/dlc1/XRG6U0.png b/sprites/dlc/XRG6U0.png
similarity index 100%
rename from sprites/dlc1/XRG6U0.png
rename to sprites/dlc/XRG6U0.png
diff --git a/sprites/dlc1/XRG6V0.png b/sprites/dlc/XRG6V0.png
similarity index 100%
rename from sprites/dlc1/XRG6V0.png
rename to sprites/dlc/XRG6V0.png
diff --git a/sprites/dlc1/XRG6W0.png b/sprites/dlc/XRG6W0.png
similarity index 100%
rename from sprites/dlc1/XRG6W0.png
rename to sprites/dlc/XRG6W0.png
diff --git a/sprites/dlc1/XRG6X0.png b/sprites/dlc/XRG6X0.png
similarity index 100%
rename from sprites/dlc1/XRG6X0.png
rename to sprites/dlc/XRG6X0.png
diff --git a/sprites/dlc1/XRG7A0.png b/sprites/dlc/XRG7A0.png
similarity index 100%
rename from sprites/dlc1/XRG7A0.png
rename to sprites/dlc/XRG7A0.png
diff --git a/sprites/dlc1/XRG7B0.png b/sprites/dlc/XRG7B0.png
similarity index 100%
rename from sprites/dlc1/XRG7B0.png
rename to sprites/dlc/XRG7B0.png
diff --git a/sprites/dlc1/XRG7C0.png b/sprites/dlc/XRG7C0.png
similarity index 100%
rename from sprites/dlc1/XRG7C0.png
rename to sprites/dlc/XRG7C0.png
diff --git a/sprites/dlc1/XRG7D0.png b/sprites/dlc/XRG7D0.png
similarity index 100%
rename from sprites/dlc1/XRG7D0.png
rename to sprites/dlc/XRG7D0.png
diff --git a/sprites/dlc1/XRG7E0.png b/sprites/dlc/XRG7E0.png
similarity index 100%
rename from sprites/dlc1/XRG7E0.png
rename to sprites/dlc/XRG7E0.png
diff --git a/sprites/dlc1/XRG7F0.png b/sprites/dlc/XRG7F0.png
similarity index 100%
rename from sprites/dlc1/XRG7F0.png
rename to sprites/dlc/XRG7F0.png
diff --git a/sprites/dlc1/XRG7G0.png b/sprites/dlc/XRG7G0.png
similarity index 100%
rename from sprites/dlc1/XRG7G0.png
rename to sprites/dlc/XRG7G0.png
diff --git a/sprites/dlc1/XRG7H0.png b/sprites/dlc/XRG7H0.png
similarity index 100%
rename from sprites/dlc1/XRG7H0.png
rename to sprites/dlc/XRG7H0.png
diff --git a/sprites/dlc1/XRG7I0.png b/sprites/dlc/XRG7I0.png
similarity index 100%
rename from sprites/dlc1/XRG7I0.png
rename to sprites/dlc/XRG7I0.png
diff --git a/sprites/dlc1/XRG7J0.png b/sprites/dlc/XRG7J0.png
similarity index 100%
rename from sprites/dlc1/XRG7J0.png
rename to sprites/dlc/XRG7J0.png
diff --git a/sprites/dlc1/XRG7K0.png b/sprites/dlc/XRG7K0.png
similarity index 100%
rename from sprites/dlc1/XRG7K0.png
rename to sprites/dlc/XRG7K0.png
diff --git a/sprites/dlc1/XRG7L0.png b/sprites/dlc/XRG7L0.png
similarity index 100%
rename from sprites/dlc1/XRG7L0.png
rename to sprites/dlc/XRG7L0.png
diff --git a/sprites/dlc1/XRG7M0.png b/sprites/dlc/XRG7M0.png
similarity index 100%
rename from sprites/dlc1/XRG7M0.png
rename to sprites/dlc/XRG7M0.png
diff --git a/sprites/dlc1/XRG7N0.png b/sprites/dlc/XRG7N0.png
similarity index 100%
rename from sprites/dlc1/XRG7N0.png
rename to sprites/dlc/XRG7N0.png
diff --git a/sprites/dlc1/XRG7O0.png b/sprites/dlc/XRG7O0.png
similarity index 100%
rename from sprites/dlc1/XRG7O0.png
rename to sprites/dlc/XRG7O0.png
diff --git a/sprites/dlc1/XRG7P0.png b/sprites/dlc/XRG7P0.png
similarity index 100%
rename from sprites/dlc1/XRG7P0.png
rename to sprites/dlc/XRG7P0.png
diff --git a/sprites/dlc1/XRG7Q0.png b/sprites/dlc/XRG7Q0.png
similarity index 100%
rename from sprites/dlc1/XRG7Q0.png
rename to sprites/dlc/XRG7Q0.png
diff --git a/sprites/dlc1/XRG7R0.png b/sprites/dlc/XRG7R0.png
similarity index 100%
rename from sprites/dlc1/XRG7R0.png
rename to sprites/dlc/XRG7R0.png
diff --git a/sprites/dlc1/XRG7S0.png b/sprites/dlc/XRG7S0.png
similarity index 100%
rename from sprites/dlc1/XRG7S0.png
rename to sprites/dlc/XRG7S0.png
diff --git a/sprites/dlc1/XRG7T0.png b/sprites/dlc/XRG7T0.png
similarity index 100%
rename from sprites/dlc1/XRG7T0.png
rename to sprites/dlc/XRG7T0.png
diff --git a/sprites/dlc1/XRG7U0.png b/sprites/dlc/XRG7U0.png
similarity index 100%
rename from sprites/dlc1/XRG7U0.png
rename to sprites/dlc/XRG7U0.png
diff --git a/sprites/dlc1/XRG7V0.png b/sprites/dlc/XRG7V0.png
similarity index 100%
rename from sprites/dlc1/XRG7V0.png
rename to sprites/dlc/XRG7V0.png
diff --git a/sprites/dlc1/XRG7W0.png b/sprites/dlc/XRG7W0.png
similarity index 100%
rename from sprites/dlc1/XRG7W0.png
rename to sprites/dlc/XRG7W0.png
diff --git a/sprites/dlc1/XRG7X0.png b/sprites/dlc/XRG7X0.png
similarity index 100%
rename from sprites/dlc1/XRG7X0.png
rename to sprites/dlc/XRG7X0.png
diff --git a/sprites/dlc1/BFRGA0.png b/sprites/dlc1/BFRGA0.png
deleted file mode 100644
index abf639ed9..000000000
Binary files a/sprites/dlc1/BFRGA0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGB0.png b/sprites/dlc1/BFRGB0.png
deleted file mode 100644
index c90483827..000000000
Binary files a/sprites/dlc1/BFRGB0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGC0.png b/sprites/dlc1/BFRGC0.png
deleted file mode 100644
index af9249b5b..000000000
Binary files a/sprites/dlc1/BFRGC0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGD0.png b/sprites/dlc1/BFRGD0.png
deleted file mode 100644
index 64160f88a..000000000
Binary files a/sprites/dlc1/BFRGD0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGE0.png b/sprites/dlc1/BFRGE0.png
deleted file mode 100644
index 4c84df6ef..000000000
Binary files a/sprites/dlc1/BFRGE0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGF0.png b/sprites/dlc1/BFRGF0.png
deleted file mode 100644
index 684253c5d..000000000
Binary files a/sprites/dlc1/BFRGF0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGG0.png b/sprites/dlc1/BFRGG0.png
deleted file mode 100644
index f867ebc9c..000000000
Binary files a/sprites/dlc1/BFRGG0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGH0.png b/sprites/dlc1/BFRGH0.png
deleted file mode 100644
index 7633df691..000000000
Binary files a/sprites/dlc1/BFRGH0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGI0.png b/sprites/dlc1/BFRGI0.png
deleted file mode 100644
index e07408f0c..000000000
Binary files a/sprites/dlc1/BFRGI0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGJ0.png b/sprites/dlc1/BFRGJ0.png
deleted file mode 100644
index 420221716..000000000
Binary files a/sprites/dlc1/BFRGJ0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGK0.png b/sprites/dlc1/BFRGK0.png
deleted file mode 100644
index ad28212b0..000000000
Binary files a/sprites/dlc1/BFRGK0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGL0.png b/sprites/dlc1/BFRGL0.png
deleted file mode 100644
index ac5ef5d3f..000000000
Binary files a/sprites/dlc1/BFRGL0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGM0.png b/sprites/dlc1/BFRGM0.png
deleted file mode 100644
index 495cc8e37..000000000
Binary files a/sprites/dlc1/BFRGM0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGN0.png b/sprites/dlc1/BFRGN0.png
deleted file mode 100644
index 10224ade1..000000000
Binary files a/sprites/dlc1/BFRGN0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGO0.png b/sprites/dlc1/BFRGO0.png
deleted file mode 100644
index 96c27f7e2..000000000
Binary files a/sprites/dlc1/BFRGO0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGP0.png b/sprites/dlc1/BFRGP0.png
deleted file mode 100644
index 6881266a2..000000000
Binary files a/sprites/dlc1/BFRGP0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGQ0.png b/sprites/dlc1/BFRGQ0.png
deleted file mode 100644
index b6a9b9048..000000000
Binary files a/sprites/dlc1/BFRGQ0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGR0.png b/sprites/dlc1/BFRGR0.png
deleted file mode 100644
index f3034aad2..000000000
Binary files a/sprites/dlc1/BFRGR0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGS0.png b/sprites/dlc1/BFRGS0.png
deleted file mode 100644
index d25a2a670..000000000
Binary files a/sprites/dlc1/BFRGS0.png and /dev/null differ
diff --git a/sprites/dlc1/BFRGT0.png b/sprites/dlc1/BFRGT0.png
deleted file mode 100644
index facb08d93..000000000
Binary files a/sprites/dlc1/BFRGT0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMA0.png b/sprites/dlc1/BFSMA0.png
deleted file mode 100644
index 5283fd9ed..000000000
Binary files a/sprites/dlc1/BFSMA0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMB0.png b/sprites/dlc1/BFSMB0.png
deleted file mode 100644
index f6a9a51d5..000000000
Binary files a/sprites/dlc1/BFSMB0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMC0.png b/sprites/dlc1/BFSMC0.png
deleted file mode 100644
index 4d824a694..000000000
Binary files a/sprites/dlc1/BFSMC0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMD0.png b/sprites/dlc1/BFSMD0.png
deleted file mode 100644
index 837b9679e..000000000
Binary files a/sprites/dlc1/BFSMD0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSME0.png b/sprites/dlc1/BFSME0.png
deleted file mode 100644
index 2e065d1ca..000000000
Binary files a/sprites/dlc1/BFSME0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMF0.png b/sprites/dlc1/BFSMF0.png
deleted file mode 100644
index 643da6bca..000000000
Binary files a/sprites/dlc1/BFSMF0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMG0.png b/sprites/dlc1/BFSMG0.png
deleted file mode 100644
index bd81cf706..000000000
Binary files a/sprites/dlc1/BFSMG0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMH0.png b/sprites/dlc1/BFSMH0.png
deleted file mode 100644
index 0d1ed2e74..000000000
Binary files a/sprites/dlc1/BFSMH0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMI0.png b/sprites/dlc1/BFSMI0.png
deleted file mode 100644
index 6bb9c43fc..000000000
Binary files a/sprites/dlc1/BFSMI0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMJ0.png b/sprites/dlc1/BFSMJ0.png
deleted file mode 100644
index 06063af76..000000000
Binary files a/sprites/dlc1/BFSMJ0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMK0.png b/sprites/dlc1/BFSMK0.png
deleted file mode 100644
index c33a20ee2..000000000
Binary files a/sprites/dlc1/BFSMK0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSML0.png b/sprites/dlc1/BFSML0.png
deleted file mode 100644
index 33451d07c..000000000
Binary files a/sprites/dlc1/BFSML0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMM0.png b/sprites/dlc1/BFSMM0.png
deleted file mode 100644
index 13ed3d366..000000000
Binary files a/sprites/dlc1/BFSMM0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMN0.png b/sprites/dlc1/BFSMN0.png
deleted file mode 100644
index 31e81badc..000000000
Binary files a/sprites/dlc1/BFSMN0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMO0.png b/sprites/dlc1/BFSMO0.png
deleted file mode 100644
index 9a8b5d91b..000000000
Binary files a/sprites/dlc1/BFSMO0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMP0.png b/sprites/dlc1/BFSMP0.png
deleted file mode 100644
index 6be2e152c..000000000
Binary files a/sprites/dlc1/BFSMP0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMQ0.png b/sprites/dlc1/BFSMQ0.png
deleted file mode 100644
index d2fe207c3..000000000
Binary files a/sprites/dlc1/BFSMQ0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMR0.png b/sprites/dlc1/BFSMR0.png
deleted file mode 100644
index ba53fa355..000000000
Binary files a/sprites/dlc1/BFSMR0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMS0.png b/sprites/dlc1/BFSMS0.png
deleted file mode 100644
index 8e5597266..000000000
Binary files a/sprites/dlc1/BFSMS0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMT0.png b/sprites/dlc1/BFSMT0.png
deleted file mode 100644
index e4426a304..000000000
Binary files a/sprites/dlc1/BFSMT0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMU0.png b/sprites/dlc1/BFSMU0.png
deleted file mode 100644
index d2f259698..000000000
Binary files a/sprites/dlc1/BFSMU0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMV0.png b/sprites/dlc1/BFSMV0.png
deleted file mode 100644
index 9f7d106d2..000000000
Binary files a/sprites/dlc1/BFSMV0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMW0.png b/sprites/dlc1/BFSMW0.png
deleted file mode 100644
index 7baadfb71..000000000
Binary files a/sprites/dlc1/BFSMW0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMX0.png b/sprites/dlc1/BFSMX0.png
deleted file mode 100644
index def97bddd..000000000
Binary files a/sprites/dlc1/BFSMX0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMY0.png b/sprites/dlc1/BFSMY0.png
deleted file mode 100644
index 4e00dd239..000000000
Binary files a/sprites/dlc1/BFSMY0.png and /dev/null differ
diff --git a/sprites/dlc1/BFSMZ0.png b/sprites/dlc1/BFSMZ0.png
deleted file mode 100644
index 130120dfe..000000000
Binary files a/sprites/dlc1/BFSMZ0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLA0.png b/sprites/dlc1/BXPLA0.png
deleted file mode 100644
index 1c5c5c69f..000000000
Binary files a/sprites/dlc1/BXPLA0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLB0.png b/sprites/dlc1/BXPLB0.png
deleted file mode 100644
index d0bd66ae8..000000000
Binary files a/sprites/dlc1/BXPLB0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLC0.png b/sprites/dlc1/BXPLC0.png
deleted file mode 100644
index fa099a743..000000000
Binary files a/sprites/dlc1/BXPLC0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLD0.png b/sprites/dlc1/BXPLD0.png
deleted file mode 100644
index 4f5aa973b..000000000
Binary files a/sprites/dlc1/BXPLD0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLE0.png b/sprites/dlc1/BXPLE0.png
deleted file mode 100644
index c6f941378..000000000
Binary files a/sprites/dlc1/BXPLE0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLF0.png b/sprites/dlc1/BXPLF0.png
deleted file mode 100644
index 0cd553847..000000000
Binary files a/sprites/dlc1/BXPLF0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLG0.png b/sprites/dlc1/BXPLG0.png
deleted file mode 100644
index c24da1316..000000000
Binary files a/sprites/dlc1/BXPLG0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLH0.png b/sprites/dlc1/BXPLH0.png
deleted file mode 100644
index be3a08c2a..000000000
Binary files a/sprites/dlc1/BXPLH0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLI0.png b/sprites/dlc1/BXPLI0.png
deleted file mode 100644
index 28a2b4ca1..000000000
Binary files a/sprites/dlc1/BXPLI0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLJ0.png b/sprites/dlc1/BXPLJ0.png
deleted file mode 100644
index 5fdffae6b..000000000
Binary files a/sprites/dlc1/BXPLJ0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLK0.png b/sprites/dlc1/BXPLK0.png
deleted file mode 100644
index ead15921a..000000000
Binary files a/sprites/dlc1/BXPLK0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLL0.png b/sprites/dlc1/BXPLL0.png
deleted file mode 100644
index 0c3d4636f..000000000
Binary files a/sprites/dlc1/BXPLL0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLM0.png b/sprites/dlc1/BXPLM0.png
deleted file mode 100644
index 5fa8dde78..000000000
Binary files a/sprites/dlc1/BXPLM0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLN0.png b/sprites/dlc1/BXPLN0.png
deleted file mode 100644
index cca9562aa..000000000
Binary files a/sprites/dlc1/BXPLN0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLO0.png b/sprites/dlc1/BXPLO0.png
deleted file mode 100644
index 8fd14f70b..000000000
Binary files a/sprites/dlc1/BXPLO0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLP0.png b/sprites/dlc1/BXPLP0.png
deleted file mode 100644
index 5c5f44ca4..000000000
Binary files a/sprites/dlc1/BXPLP0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLQ0.png b/sprites/dlc1/BXPLQ0.png
deleted file mode 100644
index 773df61b7..000000000
Binary files a/sprites/dlc1/BXPLQ0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLR0.png b/sprites/dlc1/BXPLR0.png
deleted file mode 100644
index c9ccd9753..000000000
Binary files a/sprites/dlc1/BXPLR0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLS0.png b/sprites/dlc1/BXPLS0.png
deleted file mode 100644
index 12928f35e..000000000
Binary files a/sprites/dlc1/BXPLS0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLT0.png b/sprites/dlc1/BXPLT0.png
deleted file mode 100644
index 161e84743..000000000
Binary files a/sprites/dlc1/BXPLT0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLU0.png b/sprites/dlc1/BXPLU0.png
deleted file mode 100644
index 8e3d291cf..000000000
Binary files a/sprites/dlc1/BXPLU0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLV0.png b/sprites/dlc1/BXPLV0.png
deleted file mode 100644
index 9ee7c6adc..000000000
Binary files a/sprites/dlc1/BXPLV0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLW0.png b/sprites/dlc1/BXPLW0.png
deleted file mode 100644
index 560414766..000000000
Binary files a/sprites/dlc1/BXPLW0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLX0.png b/sprites/dlc1/BXPLX0.png
deleted file mode 100644
index b2f026e01..000000000
Binary files a/sprites/dlc1/BXPLX0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLY0.png b/sprites/dlc1/BXPLY0.png
deleted file mode 100644
index 0c82cfb81..000000000
Binary files a/sprites/dlc1/BXPLY0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPLZ0.png b/sprites/dlc1/BXPLZ0.png
deleted file mode 100644
index 7d954a889..000000000
Binary files a/sprites/dlc1/BXPLZ0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPL[0.png b/sprites/dlc1/BXPL[0.png
deleted file mode 100644
index 5b7f834c2..000000000
Binary files a/sprites/dlc1/BXPL[0.png and /dev/null differ
diff --git a/sprites/dlc1/BXPL^0.png b/sprites/dlc1/BXPL^0.png
deleted file mode 100644
index 0eb5dbb1b..000000000
Binary files a/sprites/dlc1/BXPL^0.png and /dev/null differ
diff --git a/zscript.txt b/zscript.txt
index 5a090bdcf..5d3fb80f8 100644
--- a/zscript.txt
+++ b/zscript.txt
@@ -136,25 +136,15 @@ version "4.7.1"
#include "zscript/dlc1/swwm_heavymahsheengun_fx.zsc"
#include "zscript/dlc1/swwm_notashotgun.zsc"
#include "zscript/dlc1/swwm_notashotgun_fx.zsc"
-#include "zscript/dlc1/swwm_blackfire.zsc"
-#include "zscript/dlc1/swwm_blackfire_fx.zsc"
-#include "zscript/dlc1/swwm_veryveryfrightening.zsc"
-#include "zscript/dlc1/swwm_veryveryfrightening_fx.zsc"
+#include "zscript/dlc1/swwm_blueballs.zsc"
+#include "zscript/dlc1/swwm_blueballs_fx.zsc"
+#include "zscript/dlc1/swwm_mister.zsc"
+#include "zscript/dlc1/swwm_mister_fx.zsc"
#include "zscript/dlc1/swwm_thiccbolts.zsc"
#include "zscript/dlc1/swwm_thiccbolts_fx.zsc"
-#include "zscript/dlc1/swwm_hugeassrailgun.zsc"
-#include "zscript/dlc1/swwm_hugeassrailgun_fx.zsc"
-// DLC2 - Weapon Set 2
-#include "zscript/dlc2/swwm_ammoitems_dlc2.zsc"
-#include "zscript/dlc2/swwm_fisto.zsc"
-#include "zscript/dlc2/swwm_fisto_fx.zsc"
-#include "zscript/dlc2/swwm_blueballs.zsc"
-#include "zscript/dlc2/swwm_blueballs_fx.zsc"
-#include "zscript/dlc2/swwm_mister.zsc"
-#include "zscript/dlc2/swwm_mister_fx.zsc"
-#include "zscript/dlc2/swwm_ultimate.zsc"
-#include "zscript/dlc2/swwm_ultimate_fx.zsc"
-// DLC3 - Game Set
-#include "zscript/dlc3/swwm_demoland.zsc"
-#include "zscript/dlc3/swwm_demoshmup.zsc"
-#include "zscript/dlc3/swwm_demoquest.zsc"
+#include "zscript/dlc1/swwm_ultimate.zsc"
+#include "zscript/dlc1/swwm_ultimate_fx.zsc"
+// DLC2 - Game Set
+#include "zscript/dlc2/swwm_demoland.zsc"
+#include "zscript/dlc2/swwm_demoshmup.zsc"
+#include "zscript/dlc2/swwm_demoquest.zsc"
diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc1/swwm_ammoitems_dlc.zsc
index f15c19439..8721f144f 100644
--- a/zscript/dlc1/swwm_ammoitems_dlc.zsc
+++ b/zscript/dlc1/swwm_ammoitems_dlc.zsc
@@ -208,26 +208,198 @@ Class QuadravolAmmo3 : QuadravolAmmo
}
}
-Class DarkCanister : SWWMAmmo
+Class SparksterBAmmo : SWWMAmmo
{
Default
{
- //$Title Dark Canister
+ //$Title Sparkster Blue Ammo
//$Group Ammo
- //$Sprite graphics/HUD/Icons/A_DarkAmmo.png
+ //$Sprite graphics/HUD/Icons/A_SparkBAmmo.png
//$Icon ammo
- Tag "$T_DARKAMMO";
- SWWMAmmo.PickupTag "DARKAMMO";
- Stamina 20000;
- Inventory.Icon "graphics/HUD/Icons/A_DarkAmmo.png";
+ Tag "$T_SPARKBCELL";
+ SWWMAmmo.PickupTag "SPARKBCELL";
+ Stamina 16000;
+ Inventory.Icon "graphics/HUD/Icons/A_SparkBAmmo.png";
Inventory.Amount 1;
Inventory.MaxAmount 6;
- Ammo.BackpackAmount 1;
- Ammo.BackpackMaxAmount 12;
+ Ammo.BackpackAmount 2;
+ Ammo.BackpackMaxAmount 16;
Ammo.DropAmount 1;
+FLOATBOB;
FloatBobStrength 0.25;
- Accuracy 60;
+ Accuracy 70;
+ }
+ States
+ {
+ Spawn:
+ XZW1 A -1;
+ Stop;
+ }
+}
+Class SparksterBAmmo2 : SparksterBAmmo
+{
+ Default
+ {
+ //$Title 2x Sparkster Blue Ammo
+ //$Group Ammo
+ //$Sprite graphics/HUD/Icons/A_SparkBAmmo.png
+ //$Icon ammo
+ Inventory.Amount 2;
+ }
+}
+Class SparksterBAmmo3 : SparksterBAmmo
+{
+ Default
+ {
+ //$Title 3x Sparkster Blue Ammo
+ //$Group Ammo
+ //$Sprite graphics/HUD/Icons/A_SparkBAmmo.png
+ //$Icon ammo
+ Inventory.Amount 3;
+ }
+}
+
+Class SparksterRAmmo : SWWMAmmo
+{
+ Default
+ {
+ //$Title Sparkster Red Ammo
+ //$Group Ammo
+ //$Sprite graphics/HUD/Icons/A_SparkRAmmo.png
+ //$Icon ammo
+ Tag "$T_SPARKRCELL";
+ SWWMAmmo.PickupTag "SPARKRCELL";
+ Stamina 18000;
+ Inventory.Icon "graphics/HUD/Icons/A_SparkRAmmo.png";
+ Inventory.Amount 1;
+ Inventory.MaxAmount 6;
+ Ammo.BackpackAmount 2;
+ Ammo.BackpackMaxAmount 16;
+ Ammo.DropAmount 1;
+ +FLOATBOB;
+ FloatBobStrength 0.25;
+ Accuracy 75;
+ }
+ States
+ {
+ Spawn:
+ XZW1 A -1;
+ Stop;
+ }
+}
+Class SparksterRAmmo2 : SparksterRAmmo
+{
+ Default
+ {
+ //$Title 2x Sparkster Red Ammo
+ //$Group Ammo
+ //$Sprite graphics/HUD/Icons/A_SparkRAmmo.png
+ //$Icon ammo
+ Inventory.Amount 2;
+ }
+}
+Class SparksterRAmmo3 : SparksterRAmmo
+{
+ Default
+ {
+ //$Title 3x Sparkster Red Ammo
+ //$Group Ammo
+ //$Sprite graphics/HUD/Icons/A_SparkRAmmo.png
+ //$Icon ammo
+ Inventory.Amount 3;
+ }
+}
+
+Class MisterRound : MagAmmo
+{
+ Default
+ {
+ //$Title Mortal Rifle Round
+ //$Group Ammo
+ //$Sprite graphics/HUD/Icons/A_MRRound.png
+ //$Icon ammo
+ Tag "$T_MRROUND";
+ MagAmmo.PickupTag "MRROUND";
+ Inventory.Icon "graphics/HUD/Icons/A_MRRound.png";
+ MagAmmo.ParentAmmo "MisterAmmo";
+ MagAmmo.ClipSize 30;
+ Inventory.MaxAmount 40;
+ +FLOATBOB;
+ FloatBobStrength 0.25;
+ }
+ States
+ {
+ Spawn:
+ XZW1 A -1;
+ Stop;
+ }
+}
+Class MisterRound2 : MisterRound
+{
+ Default
+ {
+ //$Title 2x Mortal Rifle Round
+ //$Group Ammo
+ //$Sprite graphics/HUD/Icons/A_MRRound.png
+ //$Icon ammo
+ Inventory.Amount 2;
+ }
+}
+Class MisterRound3 : MisterRound
+{
+ Default
+ {
+ //$Title 3x Mortal Rifle Round
+ //$Group Ammo
+ //$Sprite graphics/HUD/Icons/A_MRRound.png
+ //$Icon ammo
+ Inventory.Amount 3;
+ }
+}
+Class MisterRound5 : MisterRound
+{
+ Default
+ {
+ //$Title 5x Mortal Rifle Round
+ //$Group Ammo
+ //$Sprite graphics/HUD/Icons/A_MRRound.png
+ //$Icon ammo
+ Inventory.Amount 5;
+ }
+}
+Class MisterRound10 : MisterRound
+{
+ Default
+ {
+ //$Title 10x Mortal Rifle Round
+ //$Group Ammo
+ //$Sprite graphics/HUD/Icons/A_MRRound.png
+ //$Icon ammo
+ Inventory.Amount 10;
+ }
+}
+
+Class MisterAmmo : SWWMAmmo
+{
+ Default
+ {
+ //$Title Mortal Rifle Mag
+ //$Group Ammo
+ //$Sprite graphics/HUD/Icons/A_MRAmmo.png
+ //$Icon ammo
+ Tag "$T_MRAMMO";
+ SWWMAmmo.PickupTag "MRAMMO";
+ Stamina 120000;
+ Inventory.Icon "graphics/HUD/Icons/A_MRAmmo.png";
+ Inventory.Amount 1;
+ Inventory.MaxAmount 2;
+ Ammo.BackpackAmount 0;
+ Ammo.BackpackMaxAmount 6;
+ Ammo.DropAmount 1;
+ SWWMAmmo.MagAmmoType "MisterRound";
+ +FLOATBOB;
+ FloatBobStrength 0.25;
+ Accuracy 90;
}
States
{
@@ -237,26 +409,26 @@ Class DarkCanister : SWWMAmmo
}
}
-Class EMPCore : SWWMAmmo
+Class MisterGAmmo : SWWMAmmo
{
Default
{
- //$Title EMP Core
+ //$Title Mortal Rifle Grenade
//$Group Ammo
- //$Sprite graphics/HUD/Icons/A_EMPCore.png
+ //$Sprite graphics/HUD/Icons/A_MRGrenade.png
//$Icon ammo
- Tag "$T_EMPCORE";
- SWWMAmmo.PickupTag "EMPCORE";
- Stamina 60000;
- Inventory.Icon "graphics/HUD/Icons/A_EMPCore.png";
+ Tag "$T_MRGRENADE";
+ SWWMAmmo.PickupTag "MRGRENADE";
+ Stamina 90000;
+ Inventory.Icon "graphics/HUD/Icons/A_MRGrenade.png";
Inventory.Amount 1;
- Inventory.MaxAmount 4;
+ Inventory.MaxAmount 3;
Ammo.BackpackAmount 0;
- Ammo.BackpackMaxAmount 10;
+ Ammo.BackpackMaxAmount 6;
Ammo.DropAmount 1;
+FLOATBOB;
FloatBobStrength 0.25;
- Accuracy 80;
+ Accuracy 90;
}
States
{
@@ -265,17 +437,28 @@ Class EMPCore : SWWMAmmo
Stop;
}
}
-Class EMPCore2 : EMPCore
+Class MisterGAmmo2 : MisterGAmmo
{
Default
{
- //$Title 2x EMP Core
+ //$Title 2x Mortal Rifle Grenades
//$Group Ammo
- //$Sprite graphics/HUD/Icons/A_EMPCore.png
+ //$Sprite graphics/HUD/Icons/A_MRGrenade.png
//$Icon ammo
Inventory.Amount 2;
}
}
+Class MisterGAmmo3 : MisterGAmmo
+{
+ Default
+ {
+ //$Title 3x Mortal Rifle Grenades
+ //$Group Ammo
+ //$Sprite graphics/HUD/Icons/A_MRGrenade.png
+ //$Icon ammo
+ Inventory.Amount 3;
+ }
+}
Class RayBolt : MagAmmo
{
@@ -384,21 +567,21 @@ Class RayBattery : SWWMAmmo
}
}
-Class GrandSpear : MagAmmo
+Class UltimatePod : MagAmmo
{
Default
{
- //$Title Grand Lance Spear
+ //$Title Ultimate Pod
//$Group Ammo
- //$Sprite graphics/HUD/Icons/A_GrandSpear.png
+ //$Sprite graphics/HUD/Icons/A_UltimatePod.png
//$Icon ammo
- Tag "$T_GRANDSPEAR";
- MagAmmo.PickupTag "GRANDSPEAR";
+ Tag "$T_ULTIMATEPOD";
+ MagAmmo.PickupTag "ULTIMATEPOD";
Inventory.PickupSound "misc/bullet_pkup_vip";
- Inventory.Icon "graphics/HUD/Icons/A_GrandSpear.png";
- MagAmmo.ParentAmmo "GrandAmmo";
- MagAmmo.ClipSize 5;
- Inventory.MaxAmount 8;
+ Inventory.Icon "graphics/HUD/Icons/A_UltimatePod.png";
+ MagAmmo.ParentAmmo "UltimateAmmo";
+ MagAmmo.ClipSize 4;
+ Inventory.MaxAmount 6;
+FLOATBOB;
FloatBobStrength 0.25;
}
@@ -410,25 +593,25 @@ Class GrandSpear : MagAmmo
}
}
-Class GrandAmmo : SWWMAmmo
+Class UltimateAmmo : SWWMAmmo
{
Default
{
- //$Title Grand Lance Mag
+ //$Title Ultimate Mag
//$Group Ammo
- //$Sprite graphics/HUD/Icons/A_GrandAmmo.png
+ //$Sprite graphics/HUD/Icons/A_UltimateAmmo.png
//$Icon ammo
- Tag "$T_GRANDAMMO";
- SWWMAmmo.PickupTag "GRANDAMMO";
+ Tag "$T_ULTIMATEAMMO";
+ SWWMAmmo.PickupTag "ULTIMATEAMMO";
Inventory.PickupSound "misc/ammo_pkup_vip";
- Stamina -1200000;
- Inventory.Icon "graphics/HUD/Icons/A_GrandAmmo.png";
+ Stamina -2000000;
+ Inventory.Icon "graphics/HUD/Icons/A_UltimateAmmo.png";
Inventory.Amount 1;
Inventory.MaxAmount 1;
Ammo.BackpackAmount 0;
Ammo.BackpackMaxAmount 3;
Ammo.DropAmount 1;
- SWWMAmmo.MagAmmoType "GrandSpear";
+ SWWMAmmo.MagAmmoType "UltimatePod";
+FLOATBOB;
FloatBobStrength 0.25;
}
diff --git a/zscript/dlc1/swwm_blackfire.zsc b/zscript/dlc1/swwm_blackfire.zsc
deleted file mode 100644
index 14aeb8c94..000000000
--- a/zscript/dlc1/swwm_blackfire.zsc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Unissix Crafts Blackfire Igniter (from UnSX 4)
-// Slot 7, spawns shared with Biospark Carbine
-
-Class BlackfireIgniter : SWWMWeapon
-{
- int clipcount;
- bool hasaux[2];
- int auxclipcount[2];
-
- Property ClipCount : clipcount;
-
- Default
- {
- //$Title Blackfire Igniter
- //$Group Weapons
- //$Sprite graphics/HUD/Icons/W_Blackfire.png
- //$Icon weapon
- Tag "$T_BLACKFIRE";
- Inventory.PickupMessage "$T_BLACKFIRE";
- Obituary "$O_BLACKFIRE";
- SWWMWeapon.Tooltip "$TT_BLACKFIRE";
- SWWMWeapon.GetLine "getblackfireigniter";
- Inventory.Icon "graphics/HUD/Icons/W_Blackfire.png";
- Weapon.SlotNumber 7;
- Weapon.SlotPriority 2.;
- Weapon.SelectionOrder 550;
- Weapon.AmmoType1 "DarkCanister";
- Weapon.AmmoGive1 1;
- SWWMWeapon.DropAmmoType "DarkCanister";
- BlackfireIgniter.ClipCount 1000;
- Stamina 220000;
- +SWWMWEAPON.NOFIRSTGIVE;
- }
- States
- {
- Spawn:
- XZW1 A -1;
- Stop;
- }
-}
diff --git a/zscript/dlc1/swwm_blackfire_fx.zsc b/zscript/dlc1/swwm_blackfire_fx.zsc
deleted file mode 100644
index 761c98c83..000000000
--- a/zscript/dlc1/swwm_blackfire_fx.zsc
+++ /dev/null
@@ -1 +0,0 @@
-// Blackfire Igniter projectiles and effects
diff --git a/zscript/dlc2/swwm_blueballs.zsc b/zscript/dlc1/swwm_blueballs.zsc
similarity index 90%
rename from zscript/dlc2/swwm_blueballs.zsc
rename to zscript/dlc1/swwm_blueballs.zsc
index a0a289413..93aea477c 100644
--- a/zscript/dlc2/swwm_blueballs.zsc
+++ b/zscript/dlc1/swwm_blueballs.zsc
@@ -21,8 +21,8 @@ Class ModernSparkster : SWWMWeapon
SWWMWeapon.GetLine "getnewsparkster";
Inventory.Icon "graphics/HUD/Icons/W_NewSparkster.png";
Weapon.SlotNumber 7;
- Weapon.SlotPriority 3.;
- Weapon.SelectionOrder 625;
+ Weapon.SlotPriority 2.;
+ Weapon.SelectionOrder 550;
Weapon.AmmoType1 "SparksterBAmmo";
Weapon.AmmoGive1 1;
Weapon.AmmoType2 "SparksterRAmmo";
@@ -30,8 +30,9 @@ Class ModernSparkster : SWWMWeapon
SWWMWeapon.DropAmmoType "RocketAmmo";
ModernSparkster.ClipCount 4;
ModernSparkster.ClipCount2 4;
- Stamina 160000;
+ Stamina 220000;
+SWWMWEAPON.NOFIRSTGIVE;
+ +WEAPON.EXPLOSIVE;
}
States
{
diff --git a/zscript/dlc2/swwm_blueballs_fx.zsc b/zscript/dlc1/swwm_blueballs_fx.zsc
similarity index 100%
rename from zscript/dlc2/swwm_blueballs_fx.zsc
rename to zscript/dlc1/swwm_blueballs_fx.zsc
diff --git a/zscript/dlc1/swwm_hugeassrailgun.zsc b/zscript/dlc1/swwm_hugeassrailgun.zsc
deleted file mode 100644
index 7b6a7bfd5..000000000
--- a/zscript/dlc1/swwm_hugeassrailgun.zsc
+++ /dev/null
@@ -1,47 +0,0 @@
-// Kmonn Shuna Grand Lance (planned for unreleased SWWM Iridium)
-// Slot 0, spawns shared with Ynykron Artifact
-
-Class GrandLance : SWWMWeapon
-{
- int clipcount, clipcount2;
- bool chambered;
-
- Property ClipCount : clipcount;
- Property ClipCount2 : clipcount2;
-
- Default
- {
- //$Title Grand Lance
- //$Group Weapons
- //$Sprite graphics/HUD/Icons/W_GrandLance.png
- //$Icon weapon
- Tag "$T_GRANDLANCE";
- Inventory.PickupMessage "$T_GRANDLANCE";
- Inventory.PickupSound "misc/w_pkup_vip";
- Obituary "$O_GRANDLANCE";
- SWWMWeapon.Tooltip "$TT_GRANDLANCE";
- SWWMWeapon.GetLine "getgrandlance";
- Inventory.Icon "graphics/HUD/Icons/W_GrandLance.png";
- Weapon.SlotNumber 0;
- Weapon.SlotPriority 2.;
- Weapon.SelectionOrder 8000;
- Weapon.AmmoType1 "GrandAmmo";
- Weapon.AmmoGive1 1;
- Weapon.AmmoType2 "RayBattery";
- Weapon.AmmoGive2 0;
- SWWMWeapon.DropAmmoType "GrandAmmo";
- GrandLance.ClipCount 5;
- GrandLance.ClipCount2 500;
- Stamina -4200000;
- +SWWMWEAPON.NOFIRSTGIVE;
- +WEAPON.PRIMARY_USES_BOTH;
- +WEAPON.EXPLOSIVE;
- +WEAPON.BFG;
- }
- States
- {
- Spawn:
- XZW1 A -1;
- Stop;
- }
-}
diff --git a/zscript/dlc1/swwm_hugeassrailgun_fx.zsc b/zscript/dlc1/swwm_hugeassrailgun_fx.zsc
deleted file mode 100644
index 54d0c3e74..000000000
--- a/zscript/dlc1/swwm_hugeassrailgun_fx.zsc
+++ /dev/null
@@ -1 +0,0 @@
-// Grand Lance projectiles and effects
diff --git a/zscript/dlc2/swwm_mister.zsc b/zscript/dlc1/swwm_mister.zsc
similarity index 83%
rename from zscript/dlc2/swwm_mister.zsc
rename to zscript/dlc1/swwm_mister.zsc
index 900a1947b..cf9e85920 100644
--- a/zscript/dlc2/swwm_mister.zsc
+++ b/zscript/dlc1/swwm_mister.zsc
@@ -1,10 +1,11 @@
// Plutoni Inc. Mortal Rifle (from UnSX 2)
-// Slot 9, spawns shared with Candy Gun
+// Slot 8, shared spawn with Silver Bullet JET
Class MisterRifle : SWWMWeapon
{
int clipcount;
bool chambered, gchambered;
+ int firemode;
Property ClipCount : clipcount;
@@ -20,19 +21,18 @@ Class MisterRifle : SWWMWeapon
SWWMWeapon.Tooltip "$TT_MORTALRIFLE";
SWWMWeapon.GetLine "getmortalrifle";
Inventory.Icon "graphics/HUD/Icons/W_MortalRifle.png";
- Weapon.SlotNumber 9;
- Weapon.SlotPriority 3.;
- Weapon.SelectionOrder 725;
+ Weapon.SlotNumber 8;
+ Weapon.SlotPriority 2.;
+ Weapon.SelectionOrder 850;
Weapon.AmmoType1 "MisterAmmo";
Weapon.AmmoGive1 1;
Weapon.AmmoType2 "MisterGAmmo";
Weapon.AmmoGive2 1;
SWWMWeapon.DropAmmoType "MisterAmmo";
MisterRifle.ClipCount 30;
- Stamina 2100000;
+ Stamina 500000;
+SWWMWEAPON.NOFIRSTGIVE;
+WEAPON.EXPLOSIVE;
- +WEAPON.BFG;
}
States
{
diff --git a/zscript/dlc2/swwm_mister_fx.zsc b/zscript/dlc1/swwm_mister_fx.zsc
similarity index 100%
rename from zscript/dlc2/swwm_mister_fx.zsc
rename to zscript/dlc1/swwm_mister_fx.zsc
diff --git a/zscript/dlc2/swwm_ultimate.zsc b/zscript/dlc1/swwm_ultimate.zsc
similarity index 93%
rename from zscript/dlc2/swwm_ultimate.zsc
rename to zscript/dlc1/swwm_ultimate.zsc
index 7f83b9517..3b1c19d83 100644
--- a/zscript/dlc2/swwm_ultimate.zsc
+++ b/zscript/dlc1/swwm_ultimate.zsc
@@ -22,8 +22,8 @@ Class RafanKos : SWWMWeapon
SWWMWeapon.GetLine "getrafankos";
Inventory.Icon "graphics/HUD/Icons/W_RafanKos.png";
Weapon.SlotNumber 0;
- Weapon.SlotPriority 3.;
- Weapon.SelectionOrder 7975;
+ Weapon.SlotPriority 2.;
+ Weapon.SelectionOrder 8000;
Weapon.AmmoType1 "UltimateAmmo";
Weapon.AmmoGive1 1;
SWWMWeapon.DropAmmoType "UltimateAmmo";
diff --git a/zscript/dlc2/swwm_ultimate_fx.zsc b/zscript/dlc1/swwm_ultimate_fx.zsc
similarity index 100%
rename from zscript/dlc2/swwm_ultimate_fx.zsc
rename to zscript/dlc1/swwm_ultimate_fx.zsc
diff --git a/zscript/dlc1/swwm_veryveryfrightening.zsc b/zscript/dlc1/swwm_veryveryfrightening.zsc
deleted file mode 100644
index 86949d55a..000000000
--- a/zscript/dlc1/swwm_veryveryfrightening.zsc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Tach-Engine Technologies EMP Rail Carbine (planned for unreleased Zanaveth Ultra Suite 2, successor to EMP Rifle from first Ultra Suite)
-// Slot 8, shared spawn with Silver Bullet JET
-
-Class EMPCarbine : SWWMWeapon
-{
- int clipcount;
- bool chambered;
- bool initialized;
-
- Property ClipCount : clipcount;
-
- Default
- {
- //$Title EMP Carbine
- //$Group Weapons
- //$Sprite graphics/HUD/Icons/W_EMPCarbine.png
- //$Icon weapon
- Tag "$T_EMPCARBINE";
- Inventory.PickupMessage "$I_EMPCARBINE";
- Obituary "$O_EMPCARBINE";
- SWWMWeapon.Tooltip "$TT_EMPCARBINE";
- SWWMWeapon.GetLine "getempcarbine";
- Inventory.Icon "graphics/HUD/Icons/W_EMPCarbine.png";
- Weapon.SlotNumber 8;
- Weapon.SlotPriority 2.;
- Weapon.SelectionOrder 850;
- Weapon.AmmoType1 "EMPCore";
- Weapon.AmmoGive1 1;
- SWWMWeapon.DropAmmoType "EMPCore";
- EMPCarbine.ClipCount 4;
- Stamina 500000;
- +SWWMWEAPON.NOFIRSTGIVE;
- +WEAPON.EXPLOSIVE;
- +WEAPON.ALT_AMMO_OPTIONAL;
- }
- States
- {
- Spawn:
- XZW1 A -1;
- Stop;
- }
-}
diff --git a/zscript/dlc1/swwm_veryveryfrightening_fx.zsc b/zscript/dlc1/swwm_veryveryfrightening_fx.zsc
deleted file mode 100644
index 90771b29b..000000000
--- a/zscript/dlc1/swwm_veryveryfrightening_fx.zsc
+++ /dev/null
@@ -1 +0,0 @@
-// EMP Rail Carbine projectiles and effects
diff --git a/zscript/dlc2/swwm_ammoitems_dlc2.zsc b/zscript/dlc2/swwm_ammoitems_dlc2.zsc
deleted file mode 100644
index 41e8a24b7..000000000
--- a/zscript/dlc2/swwm_ammoitems_dlc2.zsc
+++ /dev/null
@@ -1,309 +0,0 @@
-// All DLC weapon ammo pickups
-
-Class SparksterBAmmo : SWWMAmmo
-{
- Default
- {
- //$Title Sparkster Blue Ammo
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_SparkBAmmo.png
- //$Icon ammo
- Tag "$T_SPARKBCELL";
- SWWMAmmo.PickupTag "SPARKBCELL";
- Stamina 16000;
- Inventory.Icon "graphics/HUD/Icons/A_SparkBAmmo.png";
- Inventory.Amount 1;
- Inventory.MaxAmount 6;
- Ammo.BackpackAmount 2;
- Ammo.BackpackMaxAmount 16;
- Ammo.DropAmount 1;
- +FLOATBOB;
- FloatBobStrength 0.25;
- Accuracy 70;
- }
- States
- {
- Spawn:
- XZW1 A -1;
- Stop;
- }
-}
-Class SparksterBAmmo2 : SparksterBAmmo
-{
- Default
- {
- //$Title 2x Sparkster Blue Ammo
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_SparkBAmmo.png
- //$Icon ammo
- Inventory.Amount 2;
- }
-}
-Class SparksterBAmmo3 : SparksterBAmmo
-{
- Default
- {
- //$Title 3x Sparkster Blue Ammo
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_SparkBAmmo.png
- //$Icon ammo
- Inventory.Amount 3;
- }
-}
-
-Class SparksterRAmmo : SWWMAmmo
-{
- Default
- {
- //$Title Sparkster Red Ammo
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_SparkRAmmo.png
- //$Icon ammo
- Tag "$T_SPARKRCELL";
- SWWMAmmo.PickupTag "SPARKRCELL";
- Stamina 18000;
- Inventory.Icon "graphics/HUD/Icons/A_SparkRAmmo.png";
- Inventory.Amount 1;
- Inventory.MaxAmount 6;
- Ammo.BackpackAmount 2;
- Ammo.BackpackMaxAmount 16;
- Ammo.DropAmount 1;
- +FLOATBOB;
- FloatBobStrength 0.25;
- Accuracy 75;
- }
- States
- {
- Spawn:
- XZW1 A -1;
- Stop;
- }
-}
-Class SparksterRAmmo2 : SparksterRAmmo
-{
- Default
- {
- //$Title 2x Sparkster Red Ammo
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_SparkRAmmo.png
- //$Icon ammo
- Inventory.Amount 2;
- }
-}
-Class SparksterRAmmo3 : SparksterRAmmo
-{
- Default
- {
- //$Title 3x Sparkster Red Ammo
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_SparkRAmmo.png
- //$Icon ammo
- Inventory.Amount 3;
- }
-}
-
-Class MisterRound : MagAmmo
-{
- Default
- {
- //$Title Mortal Rifle Round
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_MRRound.png
- //$Icon ammo
- Tag "$T_MRROUND";
- MagAmmo.PickupTag "MRROUND";
- Inventory.Icon "graphics/HUD/Icons/A_MRRound.png";
- MagAmmo.ParentAmmo "MisterAmmo";
- MagAmmo.ClipSize 30;
- Inventory.MaxAmount 40;
- +FLOATBOB;
- FloatBobStrength 0.25;
- }
- States
- {
- Spawn:
- XZW1 A -1;
- Stop;
- }
-}
-Class MisterRound2 : MisterRound
-{
- Default
- {
- //$Title 2x Mortal Rifle Round
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_MRRound.png
- //$Icon ammo
- Inventory.Amount 2;
- }
-}
-Class MisterRound3 : MisterRound
-{
- Default
- {
- //$Title 3x Mortal Rifle Round
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_MRRound.png
- //$Icon ammo
- Inventory.Amount 3;
- }
-}
-Class MisterRound5 : MisterRound
-{
- Default
- {
- //$Title 5x Mortal Rifle Round
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_MRRound.png
- //$Icon ammo
- Inventory.Amount 5;
- }
-}
-Class MisterRound10 : MisterRound
-{
- Default
- {
- //$Title 10x Mortal Rifle Round
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_MRRound.png
- //$Icon ammo
- Inventory.Amount 10;
- }
-}
-
-Class MisterAmmo : SWWMAmmo
-{
- Default
- {
- //$Title Mortal Rifle Mag
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_MRAmmo.png
- //$Icon ammo
- Tag "$T_MRAMMO";
- SWWMAmmo.PickupTag "MRAMMO";
- Stamina 120000;
- Inventory.Icon "graphics/HUD/Icons/A_MRAmmo.png";
- Inventory.Amount 1;
- Inventory.MaxAmount 2;
- Ammo.BackpackAmount 0;
- Ammo.BackpackMaxAmount 6;
- Ammo.DropAmount 1;
- SWWMAmmo.MagAmmoType "MisterRound";
- +FLOATBOB;
- FloatBobStrength 0.25;
- Accuracy 90;
- }
- States
- {
- Spawn:
- XZW1 A -1;
- Stop;
- }
-}
-
-Class MisterGAmmo : SWWMAmmo
-{
- Default
- {
- //$Title Mortal Rifle Grenade
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_MRGrenade.png
- //$Icon ammo
- Tag "$T_MRGRENADE";
- SWWMAmmo.PickupTag "MRGRENADE";
- Stamina 90000;
- Inventory.Icon "graphics/HUD/Icons/A_MRGrenade.png";
- Inventory.Amount 1;
- Inventory.MaxAmount 3;
- Ammo.BackpackAmount 0;
- Ammo.BackpackMaxAmount 6;
- Ammo.DropAmount 1;
- +FLOATBOB;
- FloatBobStrength 0.25;
- Accuracy 90;
- }
- States
- {
- Spawn:
- XZW1 A -1;
- Stop;
- }
-}
-Class MisterGAmmo2 : MisterGAmmo
-{
- Default
- {
- //$Title 2x Mortal Rifle Grenades
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_MRGrenade.png
- //$Icon ammo
- Inventory.Amount 2;
- }
-}
-Class MisterGAmmo3 : MisterGAmmo
-{
- Default
- {
- //$Title 3x Mortal Rifle Grenades
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_MRGrenade.png
- //$Icon ammo
- Inventory.Amount 3;
- }
-}
-
-Class UltimatePod : MagAmmo
-{
- Default
- {
- //$Title Ultimate Pod
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_UltimatePod.png
- //$Icon ammo
- Tag "$T_ULTIMATEPOD";
- MagAmmo.PickupTag "ULTIMATEPOD";
- Inventory.PickupSound "misc/bullet_pkup_vip";
- Inventory.Icon "graphics/HUD/Icons/A_UltimatePod.png";
- MagAmmo.ParentAmmo "UltimateAmmo";
- MagAmmo.ClipSize 4;
- Inventory.MaxAmount 6;
- +FLOATBOB;
- FloatBobStrength 0.25;
- }
- States
- {
- Spawn:
- XZW1 A -1;
- Stop;
- }
-}
-
-Class UltimateAmmo : SWWMAmmo
-{
- Default
- {
- //$Title Ultimate Mag
- //$Group Ammo
- //$Sprite graphics/HUD/Icons/A_UltimateAmmo.png
- //$Icon ammo
- Tag "$T_ULTIMATEAMMO";
- SWWMAmmo.PickupTag "ULTIMATEAMMO";
- Inventory.PickupSound "misc/ammo_pkup_vip";
- Stamina -2000000;
- Inventory.Icon "graphics/HUD/Icons/A_UltimateAmmo.png";
- Inventory.Amount 1;
- Inventory.MaxAmount 1;
- Ammo.BackpackAmount 0;
- Ammo.BackpackMaxAmount 3;
- Ammo.DropAmount 1;
- SWWMAmmo.MagAmmoType "UltimatePod";
- +FLOATBOB;
- FloatBobStrength 0.25;
- }
- States
- {
- Spawn:
- XZW1 A -1;
- Stop;
- }
-}
diff --git a/zscript/dlc3/swwm_demoland.zsc b/zscript/dlc2/swwm_demoland.zsc
similarity index 100%
rename from zscript/dlc3/swwm_demoland.zsc
rename to zscript/dlc2/swwm_demoland.zsc
diff --git a/zscript/dlc3/swwm_demoquest.zsc b/zscript/dlc2/swwm_demoquest.zsc
similarity index 100%
rename from zscript/dlc3/swwm_demoquest.zsc
rename to zscript/dlc2/swwm_demoquest.zsc
diff --git a/zscript/dlc3/swwm_demoshmup.zsc b/zscript/dlc2/swwm_demoshmup.zsc
similarity index 100%
rename from zscript/dlc3/swwm_demoshmup.zsc
rename to zscript/dlc2/swwm_demoshmup.zsc
diff --git a/zscript/dlc2/swwm_fisto.zsc b/zscript/dlc2/swwm_fisto.zsc
deleted file mode 100644
index 7a7782575..000000000
--- a/zscript/dlc2/swwm_fisto.zsc
+++ /dev/null
@@ -1,30 +0,0 @@
-// Unissix Crafts Hand Of Divine (from Total Madness, the reboot not the original)
-// Slot 1, spawns shared with Pusher
-
-Class FistGun : SWWMWeapon
-{
- Default
- {
- //$Title Hand of Divine
- //$Group Weapons
- //$Sprite graphics/HUD/Icons/W_FistGun.png
- //$Icon weapon
- Tag "$T_FISTGUN";
- Inventory.PickupMessage "$T_FISTGUN";
- Obituary "$O_FISTGUN";
- SWWMWeapon.Tooltip "$TT_FISTGUN";
- SWWMWeapon.GetLine "getwhiteglove";
- Inventory.Icon "graphics/HUD/Icons/W_FistGun.png";
- Weapon.SlotNumber 1;
- Weapon.SlotPriority 4.;
- Weapon.SelectionOrder 1150;
- Stamina 15000;
- +WEAPON.MELEEWEAPON;
- }
- States
- {
- Spawn:
- XZW1 A -1;
- Stop;
- }
-}
diff --git a/zscript/dlc2/swwm_fisto_fx.zsc b/zscript/dlc2/swwm_fisto_fx.zsc
deleted file mode 100644
index 5898a8472..000000000
--- a/zscript/dlc2/swwm_fisto_fx.zsc
+++ /dev/null
@@ -1 +0,0 @@
-// Hand of Divine projectiles and effects
diff --git a/zscript/items/swwm_ammospawn.zsc b/zscript/items/swwm_ammospawn.zsc
index 47c3a756e..b17023be9 100644
--- a/zscript/items/swwm_ammospawn.zsc
+++ b/zscript/items/swwm_ammospawn.zsc
@@ -162,7 +162,6 @@ Class SWWMRocketAmmoSmall : SWWMAmmoSpawner
static Class PickAmmo( bool notondemand = false )
{
- /*if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('ModernSparkster')) ) return Random[Replacements](0,2)?'SparksterBAmmo':'SparksterRAmmo';*/
/*if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('Quadravol')) ) return 'QuadravolAmmo';*/
return Random[Replacements](0,2)?'HellblazerMissiles':'HellblazerCrackshots';
}
@@ -173,11 +172,6 @@ Class SWWMRocketAmmoBig : SWWMAmmoSpawner
static Class PickAmmo( bool notondemand = false )
{
- /*if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('ModernSparkster')) )
- {
- if ( Random[Replacements](0,1) ) return Random[Replacements](0,2)?'SparksterBAmmo2':'SparksterBAmmo3';
- return Random[Replacements](0,2)?'SparksterRAmmo2':'SparksterRAmmo3';
- }*/
/*if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('Quadravol')) )
return Random[Replacements](0,4)?'QuadravolAmmo2':'QuadravolAmmo3';*/
switch ( Random[Replacements](0,11) )
@@ -212,14 +206,13 @@ Class SWWMCellAmmoSmall : SWWMAmmoSpawner
{
if ( !Random[Replacements](0,3) )
{
- /*if ( !Random[Replacements](0,2) && (notondemand || SWWMUtility.ItemExists('MisterRifle')) ) return 'MisterGAmmo';*/
/*if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('RayKhom')) ) return 'RayBolt2';*/
if ( notondemand || SWWMUtility.ItemExists('CandyGun') ) return 'CandyGunBullets';
}
- /*if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('EMPCarbine')) ) return 'EMPCore';*/
+ /*if ( !Random[Replacements](0,2) && (notondemand || SWWMUtility.ItemExists('MisterRifle')) ) return 'MisterGAmmo';*/
if ( notondemand || SWWMUtility.ItemExists('SilverBullet') ) return Random[Replacements](0,2)?'SilverBullets':'SilverBullets2';
}
- /*if ( !Random[Replacements](0,4) && (notondemand || SWWMUtility.ItemExists('BlackfireIgniter')) ) return 'DarkCanister';*/
+ /*if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('ModernSparkster')) ) return Random[Replacements](0,2)?'SparksterBAmmo':'SparksterRAmmo';*/
return 'SparkUnit';
}
}
@@ -231,8 +224,6 @@ Class SWWMCellAmmoBig : SWWMAmmoSpawner
{
if ( !Random[Replacements](0,3) )
{
- //if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('GrandLance')) && SWWMUtility.CheckNeedsItem('GrandAmmo',true) && !SWWMUtility.ItemExists('GrandAmmo',worldonly:true) && !SWWMUtility.ItemExists('GrandLance',worldonly:true) )
- // return 'GrandAmmo';
//if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('RafanKos')) && SWWMUtility.CheckNeedsItem('UltimateAmmo',true) && !SWWMUtility.ItemExists('UltimateAmmo',worldonly:true) && !SWWMUtility.ItemExists('RafanKos',worldonly:true) )
// return 'UltimateAmmo';
if ( (notondemand || SWWMUtility.ItemExists('Ynykron')) && SWWMUtility.CheckNeedsItem('YnykronAmmo',true) && !SWWMUtility.ItemExists('YnykronAmmo',worldonly:true) && !SWWMUtility.ItemExists('Ynykron',worldonly:true) )
@@ -240,7 +231,6 @@ Class SWWMCellAmmoBig : SWWMAmmoSpawner
}
/*if ( Random[Replacements](0,1) )
{
- if ( !Random[Replacements](0,2) && (notondemand || SWWMUtility.ItemExists('EMPCarbine')) ) return Random[Replacements](0,3)?'EMPCore2':'EMPCore';
if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('MisterRifle')) ) return Random[Replacements](0,2)?'MisterRound5':'MisterAmmo';
if ( notondemand || SWWMUtility.ItemExists('RayKhom') ) return Random[Replacements](0,2)?'RayBolt5':'RayAmmo';
}*/
@@ -250,7 +240,11 @@ Class SWWMCellAmmoBig : SWWMAmmoSpawner
return Random[Replacements](0,2)?'SilverBulletAmmo':'SilverBulletAmmo2';
}
if ( notondemand || SWWMUtility.ItemExists('CandyGun') ) return Random[Replacements](0,3)?'CandyGunBullets3':'CandyGunAmmo';
- /*if ( !Random[Replacements](0,2) && (notondemand || SWWMUtility.ItemExists('BlackfireIgniter')) ) return 'DarkCanister';*/
+ /*if ( Random[Replacements](0,1) && (notondemand || SWWMUtility.ItemExists('ModernSparkster')) )
+ {
+ if ( Random[Replacements](0,1) ) return Random[Replacements](0,2)?'SparksterBAmmo2':'SparksterBAmmo3';
+ return Random[Replacements](0,2)?'SparksterRAmmo2':'SparksterRAmmo3';
+ }*/
return Random[Replacements](0,3)?'SparkUnit':'SparkUnit2';
}
}
diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc
index d86db34a9..64d2efe6b 100644
--- a/zscript/utility/swwm_utility.zsc
+++ b/zscript/utility/swwm_utility.zsc
@@ -1757,17 +1757,14 @@ Class SWWMUtility
if ( StringTable.Localize("$SWWM_SELLEXTRA_FEM") == "SWWM_SELLEXTRA_FEM" )
return false;
if ( i is 'DeepImpact' ) return true;
- if ( i is 'FistGun' ) return true;
if ( i is 'ExplodiumGun' ) return true;
if ( i is 'Wallbuster' ) return true;
if ( i is 'HeavyMahSheenGun' ) return true;
if ( i is 'Quadravol' ) return true;
if ( i is 'Sparkster' ) return true;
- if ( i is 'EMPCarbine' ) return true;
if ( i is 'CandyGun' ) return true;
if ( i is 'RayKhom' ) return true;
- if ( i is 'GrandLance' ) return true;
- if ( i is 'RayKhom' ) return true;
+ if ( i is 'RafanKos' ) return true;
if ( i is 'HealthNuggetItem' ) return true;
if ( i is 'ArmorNuggetItem' ) return true;
if ( i is 'WarArmor' ) return true;
@@ -2003,9 +2000,9 @@ Class SWWMUtility
return true;
if ( target is 'SWWMCollectible' )
return true;
- if ( (target is 'Ynykron') || (target is 'GrandLance') || (target is 'RayKhom') )
+ if ( (target is 'Ynykron') || (target is 'RafanKos') )
return true;
- if ( (target is 'GoldShell') || (target is 'YnykronAmmo') || (target is 'GrandAmmo') || (target is 'GrandSpear') || (target is 'UltimatePod') || (target is 'UltimateAmmo') )
+ if ( (target is 'GoldShell') || (target is 'YnykronAmmo') || (target is 'UltimatePod') || (target is 'UltimateAmmo') )
return true;
if ( (target is 'Mykradvo') || (target is 'AngerySigil') || (target is 'DivineSprite') )
return true;
@@ -2017,9 +2014,9 @@ Class SWWMUtility
// used by the store
static bool IsVipItemClass( Class target )
{
- if ( (target is 'Ynykron') || (target is 'GrandLance') || (target is 'RayKhom') )
+ if ( (target is 'Ynykron') || (target is 'RafanKos') )
return true;
- if ( (target is 'GoldShell') || (target is 'YnykronAmmo') || (target is 'GrandAmmo') || (target is 'GrandSpear') || (target is 'UltimatePod') || (target is 'UltimateAmmo') )
+ if ( (target is 'GoldShell') || (target is 'YnykronAmmo') || (target is 'UltimatePod') || (target is 'UltimateAmmo') )
return true;
if ( (target is 'Mykradvo') || (target is 'AngerySigil') || (target is 'DivineSprite') )
return true;
@@ -2130,14 +2127,13 @@ Class SWWMUtility
{
// so the player can recover it if they decided to drop it in a previous map, or they didn't start with it
if ( CheckNeedsItem('DeepImpact') ) return 'DeepImpact';
- bool hasmelee = (!CheckNeedsItem('PusherWeapon')/*||!CheckNeedsItem('ItamexHammer')||!CheckNeedsItem('FistGun')*/);
- bool hasallmelee = (!CheckNeedsItem('PusherWeapon')/*&&!CheckNeedsItem('ItamexHammer')&&!CheckNeedsItem('FistGun')*/);
+ bool hasmelee = (!CheckNeedsItem('PusherWeapon')/*||!CheckNeedsItem('ItamexHammer')*/);
+ bool hasallmelee = (!CheckNeedsItem('PusherWeapon')/*&&!CheckNeedsItem('ItamexHammer')*/);
bool gunexists = ItemExists('ExplodiumGun',worldonly:true)/*||ItemExists('PlasmaBlast',worldonly:true)*/;
// if the player already has a melee weapon, 50% chance to spawn either slot 2 weapon as long as one doesn't exist in the map already
// if the player has ALL melee weapons (somehow), that chance becomes 100%
if ( hasmelee && !gunexists && (hasallmelee || Random[Replacements](0,1)) )
return PickSWWMSlot2();
- //return PickTrio('PusherWeapon','ItamexHammer','FistGun');
//return PickPair('PusherWeapon','ItamexHammer');
return 'PusherWeapon';
}
@@ -2168,26 +2164,24 @@ Class SWWMUtility
// rocket launcher spawn
static Class PickSWWMSlot6()
{
- //return PickTrio('Hellblazer','Quadravol','ModernSparkster');
//return PickPair('Hellblazer','Quadravol');
return 'Hellblazer';
}
// first plasma rifle spawn
static Class PickSWWMSlot7()
{
- //return PickPair('Sparkster','BlackfireIgniter');
+ //return PickPair('Sparkster','ModernSparkster');
return 'Sparkster';
}
// second plasma rifle spawn
static Class PickSWWMSlot8()
{
- //return PickPair('SilverBullet','EMPCarbine');
+ //return PickPair('SilverBullet','MisterRifle');
return 'SilverBullet';
}
// first bfg spawn
static Class PickSWWMSlot9()
{
- //return PickTrio('CandyGun','RayKhom','MisterRifle');
//return PickPair('CandyGun','RayKhom');
return 'CandyGun';
}
@@ -2196,49 +2190,21 @@ Class SWWMUtility
{
/*if ( ItemExists('Ynykron',mapstart:true) )
{
- if ( ItemExists('GrandLance',mapstart:true) )
- {
- if ( ItemExists('RafanKos',null,true) )
- return fallback?PickSWWMSlot9():null;
- return 'RafanKos';
- }
if ( ItemExists('RafanKos',mapstart:true) )
- return 'GrandLance';
- return Random[Replacements](0,1)?'GrandLance':'RafanKos';
- }
- if ( ItemExists('GrandLance',mapstart:true) )
- {
- if ( ItemExists('RafanKos',mapstart:true) )
- return 'Ynykron';
- return Random[Replacements](0,1)?'Ynykron':'RafanKos';
- }
- if ( ItemExists('RafanKos',mapstart:truee) )
- return Random[Replacements](0,1)?'Ynykron':'GrandLance';
- switch ( Random[Replacements](0,2) )
- {
- case 0:
- return 'Ynykron';
- case 1:
- return 'GrandLance';
- }
- return 'RafanKos';*/
- /*if ( ItemExists('Ynykron',mapstart:true) )
- {
- if ( ItemExists('GrandLance',mapstart:true) )
return fallback?PickSWWMSlot9():null;
- return 'GrandLance';
+ return 'RafanKos';
}
- if ( ItemExists('GrandLance',mapstart:true) )
+ if ( ItemExists('RafanKos',mapstart:true) )
return 'Ynykron';
- return Random[Replacements](0,1)?'Ynykron':'GrandLance';*/
+ return Random[Replacements](0,1)?'Ynykron':'RafanKos';*/
if ( ItemExists('Ynykron',mapstart:true) ) return fallback?PickSWWMSlot9():null;
return 'Ynykron';
}
// either plasma rifle spawn
static Class PickDoomSlot6()
{
- bool hasslot7 = (!CheckNeedsItem('Sparkster')/*||!CheckNeedsItem('BlackfireIgniter')*/);
- bool hasslot8 = (!CheckNeedsItem('SilverBullet')/*||!CheckNeedsItem('EMPCarbine')*/);
+ bool hasslot7 = (!CheckNeedsItem('Sparkster')/*||!CheckNeedsItem('ModernSparkster')*/);
+ bool hasslot8 = (!CheckNeedsItem('SilverBullet')/*||!CheckNeedsItem('MortalRifle')*/);
// if the player already has a slot 7 weapon...
if ( hasslot7 )
{
@@ -2254,8 +2220,8 @@ Class SWWMUtility
// either bfg spawn
static Class PickDoomSlot7()
{
- bool hasslot9 = (!CheckNeedsItem('CandyGun')/*||!CheckNeedsItem('RayKhom')||!CheckNeedsItem('MortalRifle')*/);
- bool hasslot0 = (!CheckNeedsItem('Ynykron')/*||!CheckNeedsItem('GrandLance')||!CheckNeedsItem('RafanKos')*/);
+ bool hasslot9 = (!CheckNeedsItem('CandyGun')/*||!CheckNeedsItem('RayKhom')*/);
+ bool hasslot0 = (!CheckNeedsItem('Ynykron')/*||!CheckNeedsItem('RafanKos')*/);
let rep = PickSWWMSlot0(false);
// if the player already has a slot 9 weapon (and a slot 0 weapon can still spawn)...
if ( hasslot9 && rep )