From 98477d28b93fa5093ce2132210b47fadbe4fffdd Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sun, 15 Mar 2020 22:47:41 +0100 Subject: [PATCH] Added projectile parrying. Hitscan parry will come soon. Went a bit crazy with the extended lore again, oops. --- ExtendedLore.md | 222 ++++++++++++++++++++++------- models/Boolet.png | Bin 0 -> 2578 bytes models/Boolet_a.3d | Bin 0 -> 136 bytes models/Boolet_d.3d | Bin 0 -> 1040 bytes sndinfo.txt | 6 + sounds/demolitionist/demoparry.ogg | Bin 0 -> 11429 bytes sounds/general/ric1.ogg | Bin 0 -> 10072 bytes sounds/general/ric2.ogg | Bin 0 -> 6710 bytes sounds/general/ric3.ogg | Bin 0 -> 9437 bytes zscript/swwm_danmaku.zsc | 8 +- zscript/swwm_deepdarkimpact.zsc | 2 +- zscript/swwm_inventory.zsc | 110 +++++++++++++- zscript/swwm_jackhammer.zsc | 3 +- zscript/swwm_shot.zsc | 2 +- zscript/swwm_splode.zsc | 6 +- zscript/swwm_tastytreat.zsc | 6 +- 16 files changed, 307 insertions(+), 58 deletions(-) create mode 100644 models/Boolet.png create mode 100644 models/Boolet_a.3d create mode 100644 models/Boolet_d.3d create mode 100644 sounds/demolitionist/demoparry.ogg create mode 100644 sounds/general/ric1.ogg create mode 100644 sounds/general/ric2.ogg create mode 100644 sounds/general/ric3.ogg diff --git a/ExtendedLore.md b/ExtendedLore.md index 966eab77a..5a9c3f232 100644 --- a/ExtendedLore.md +++ b/ExtendedLore.md @@ -433,38 +433,82 @@ the old mechanical demigod Maester Mekes. ## A loose timeline of events This is in no way accurate, and it's hard to make much sense of all of it since -SWWM GZ effectively blends together the Doom and Unreal universes. +SWWM GZ effectively blends Doom with the UnSX universe (which was itself +already blended with Unreal). Note that there are BIG SPOILERS for some stuff +in my games here (though I'm avoiding spoilers for Doom Eternal, at least) -- ????: Twenty years after the fall of the Order of the One God, a message is - received from an old ruined complex beyond the seas. A declaration of war - from the "Church of the Dreadful Lady". A single, well trained mercenary puts - an end to their plans, but the true mastermind behind it all manages to flee. +- 1992: Waratsuki Emimaru is born. +- August of 2021: Hollow begins. +- September of 2021: Hollow ends. The "Convergence Event" happens, the real + world is destroyed. Waratsuki Emimaru becomes The Grinning Man. -- ????: A Sidhe thief infiltrates the mansion of one of D'Sparil's old - associates, stealing the Heart of D'Sparil and putting an end to the plans - for resurrecting him. The mansion is sold off, most of its valuables, - including the corporeal remains of the serpent rider, passed around among - several parties, until being eventually acquired by the "Cult of the - Viridescent Lord". +... -- ????: The three heroes who defeated Korax are called into the Winter Nexus, - they gather the four elemental gems and defeat the "Viridescent Lord". A - mysterious shadowy figure revives the corpse of D'Sparil, they disappear. - -- ~130 BC: The town of Kereshnovka is founded by an alien race known as the - Qurensniv. -- ~149: The mad druid Daos Khomax summons a demon called Manakei, who proceeds +- Iteration 0: The void forms from within the bubble of empty space-time left + by the real world's destruction. +- Iteration 1: Azadeku, the first Administrator, is spawned. +- Iteration ~3.56542e208: Azadeku is erased by a Chaos Walker known as The + Grinning Man, who takes over the world they created. Project .Blank begins. +- ~2730000 BC: The mad dictator god Nedoshiaan is assassinated. +- 50803 BC: Administrator Noskas Kurenai is spawned from the void, creates the + world of Novoskhana. +- 45306 BC: The Eternal Undying Empire of Novoskhana is founded. +- 13903 BC: The Kurenai Kingdom is founded. +- 13675 BC: After a long absence, Father Nostros returns to the Kurenai Kingdom + followed by an army of demonic creatures, he takes over and forces everyone + else out. The old Kurenai Kingdom becomes what is now known as Hell. +- 4673 BC: Prince Admun is born. +- 4648 BC: Prince Admun's parents are assassinated, he is appointed as King. +- 4607 BC: Seras Tonkebis, Admun's personal advisor, executes his plan to take + the throne. Admun is forced into exile on the remote Egyptian colony of the + planet Earth, and is "cursed to roam the land eternally, unable to ever die". +- 1309 BC: After the defeat of Hektor Kuratagon and his Votrexxian armies on + Hebeku, the Nukuri discover a portal leading to a yet unexplored solar + system, and decide to investigate. They come across a planet brimming with + life, inhabited by a sapient, antropomorphic species, Humans. After settling + on Earth's moon and forming a peaceful alliance with the Lunarian natives, + they begin construction of the Luna Research Institute. +- 244 BC: Reubens Cyrus Karnanaiahmani is born. +- 130 BC: Having escaped from their homeworld when king Marc P. Karnanaiahmani + went mad and began executing anyone he suspected of treason, the Qurensniv + people arrive on Earth, a planet that their Nukuri allies were supervising, + and found the town of Kereshnovka. +- 149: The mad druid Daos Khomax summons a demon called Manakei, who proceeds to burn down Kereshnovka. A group of warriors manage to defeat him. Weakened, he retreats to the ghoul-infested forest, never to be seen again. +- 808: Admun settles on an european town as a blacksmith, under the alias of + "James the Blacksmith". +- 1011: Admun is imprisoned for a shoddy armor fitting job that caused a young + king to have his helmet permanently stuck to his head. +- 1097: Admun is freed, migrates to Scotland. Adopts his current name of + "James Admun Tachmek-Smith". +- 1308: The University of Nos-Kora is founded. +- 1744: Nekuratek is founded. +- 1870: Zanata Nekuraku I dies on a tragic accident while testing the first + Nokorokinylum fusion reactor. Her husband commits suicide not long after. +- 1887: Ashley Knox is born. +- 1894: Daniel Ischer is born. +- 1907: Nana Miyamoto is born. +- 1924: Blackmann Arms is founded. - 1933: The Ischer family migrates to the US. +- 1956: Ryuji Miyamoto is born. +- 1973: Nana and Ryuji get married. +- 1976: Häzel Hoodth is born. - 1977: A member of Hell's royal family travels to Kereshnovka in order to rescue Manakei, who happens to be the heir to the throne. She fails to find him. +- 1980: Janus Locke Hoodth is born. +- 1985: Taro Miyamoto is born. - 1987: Dr. Häzel Hoodth dies tragically, becoming a ghoul of Kereshnovka. +- 1992: Misa Unissix is born. +- 1993: Saya Miyamoto is born. - 2001: The Union Aerospace Armed Forces is formed. +- 2003: Onoke Mansion Murders. - 2004: The Imanaki Research Foundation builds its headquarters in Kereshnovka. - 2005: The town of Soundless Mound becomes shrouded in thick fog for five whole days. Several reports of strange happenings are made. +- 2006: Ashley's band, "The Black Rat's Coven" is formed. Its initial members + are Ashley, Maruku Sarahabinaku, Py Kisun and William Dusk. - 2007: The "Ghoul hunt" begins after a high-ranking UAAF official is murdered by the creatures during a business visit to the Imanaki HQ. - 2008: At the peak of the Ghoul hunt, an envoy of the Anarukon people is @@ -475,25 +519,41 @@ SWWM GZ effectively blends together the Doom and Unreal universes. survive and put an end to the incident after traveling back through the gate and coming into contact with the Anderken royal family. Some time later, UAAF soldiers scour the remains of the facility, retrieving most of the - foundation's research documents. + foundation's research documents. Yui Miyamoto is born. - 2010: Akari Labs is founded. - 2012: Munch Innovations is founded. +- 2013: Zanaveth II transfers to the Luna Research Institute, working as + head of research Nikita Kunau's assistant. - 2014: Tach-Engine Technologies is founded. - 2015: The UAAF rebrands itself as the UAC, having found quite a lot of interest in what they recovered from Imanaki. -- 2018: Second major incident in the town of Kereshnovka. A rogue AI known as - SUSAN surfaces on the northern seas, assumes control of Russia's missile - systems. +- 2017: Saya creates the first Maidbot. +- 2016: Zanaveth II and Misa Unissix get married. +- 2018: Empty Episode One. Second major incident in the town of Kereshnovka. A + rogue AI known as SUSAN surfaces on the northern seas, assumes control of + Russia's missile systems. - 2019: Samuel Hayden is born. - 2020: A group of hackers manage to temporarily take over SUSAN, use its advanced computing power to run thirty parallel instances of Crysis and a - 500-player Minecraft server. This lasts for several months. + 500-player Minecraft server. This lasts for several months, allowing things + to mostly return to normal for a while, including the Tokyo Olympics. + Following a concert of Ashley's band, she meets Yui Miyamoto and they start + dating. Not long after, they get married. - 2021: The "Luna Event" happens. The first contact between humans and a non-hostile alien race, the Nukuri, who had been observing our race for centuries from a hidden research facility on the Moon. Following the event, Nukuri forces deployed to Earth successfully neutralize SUSAN. -- 2023: The two Koreas re-unify. +- 2022: Scotland becomes independent. +- 2023: The two Koreas re-unify. Following years of negotiation, Galicia + becomes part of Portugal. Ana Blanco becomes the first human woman to marry a + Nukuri. +- 2024: Zanaveth II arrives on Earth, befriends Saya. With her help, Saya's + Maidbot is migrated to the Nekuronbot AI framework, further enhancing her + personality. - 2025: First expedition to Mars, led by the UAC. Scotland becomes independent. +- 2027: William Dusk leaves Ashley's band, but not before hurting her deeply by + escaping with her granddaughter Lyra. He is replaced as drummer by the + goddess Mykka. - 2029: Forx Aeronautics is founded, singlehandedly "fixes the economy" of the UK. - 2032: Joint expedition with the Nukuri to Sedna, revealing a gateway that @@ -501,9 +561,13 @@ SWWM GZ effectively blends together the Doom and Unreal universes. between two solar systems. - 2038: The 32-bit UNIX time rollover happens without many notable incidents. - 2040: Symnatek is founded. +- 2042: Zanaveth III is born. +- 2044: The Rust Empire is founded. - 2045: The ruins of a Decade Mechanics facility are found in Sunkaeze. - 2049: The clearly senile Dr. Locke attempts to take over the world. Surrenders a couple days later during the counter-attack. +- 2054: Ryuji Miyamoto passes away. +- 2066: Elena "Ellen" Yanikov XVI is born. - 2068: The Nukuri go through their seventh world war in their home planet. - 2073: World War 3 starts thanks to a very negatively received post on social media from the president of the US regarding the Nukuri. @@ -516,24 +580,33 @@ SWWM GZ effectively blends together the Doom and Unreal universes. it is already too late. World War 3 ends as the United States are almost literally dissolved by an orbital strike. In the aftermath, the Nukuri abandon Earth, never to come back. +- 2080: Emperor Kirin Xanai is born. - 2082: Alaska becomes part of Canada. - 2091: Taro Miyamoto finds Ibuki, who had become a sort of living legend among - wastelanders for her various feats. She is brought back to Japan. As - promised, Saya immediately shoves her face into Ibuki's chest. -- 2097: The Earth is invaded by a mysterious humanoid entity, who claims to be - the Abrahamic God. He reactivates SUSAN and leaves. Russia and China are both - entirely taken over by it. -- 2099: A lone child manages to take down SUSAN. + wastelanders for her various feats, he also comes across Ellen, who casually + asks him out on a date. Ibuki is brought back to Japan. As promised, Saya + immediately shoves her face into Ibuki's chest. +- 2095: Taro and Ellen get married. +- 2097: Empty Episode Two. The Earth is invaded by a mysterious humanoid entity + named Uruk'Anth, who claims to be the Abrahamic God. He reactivates SUSAN and + leaves. Russia and China are both entirely taken over by it. +- 2099: Empty Episode 3. A lone child manages to take down SUSAN. - 2100: The reconstruction of the United States begins. - 2104: The 7th Nukuri World War ends abruptly after the Mishe founders of the University of Nos-Kora threaten to break their alliance with the Nukuri. +- 2108: Formation of the Nukuri Unified Government. Zanaveth II personally + appointed by the Nukritas brothers as "Minister of Interspecies Relations" + due to her outstanding work on the subject following her graduation at the + University of Nos-Kora. +- 2110: John "BIGSHOT" Gunns is born. +- 2128: Zanaveth II becomes CEO of Nekuratek. - 2137: The United States are reformed, now called "Union States". - 2140: Zanaveth III graduates in "Pancake Engineering" at the University of Nos-Kora. - 2144: UAC's first contact with Hell. -- 2145: After a coup organized by several members of the lower castes of Hell, - the main royal family is forced into exile. Under its new ruler, Hell decides - to attack mankind. Doom 3 happens. +- 2145: After a coup organized by several generals of Hell's military forces, + the main royal family is forced into exile. Under its new rulers, Hell + decides to attack mankind. Doom 3 happens. - 2147: Reginald E. Griggs Jr. is imprisoned after countless human remains were found in the basement of his summer house in Olathe. - 2148: The Doom episodes happen as the UAC still hasn't learned their lesson. @@ -566,9 +639,17 @@ SWWM GZ effectively blends together the Doom and Unreal universes. The Doom Slayer heads in to "fix things". A mysterious figure is seen leaving the mansion afterwards. - 2171: Akari Labs manages to extend their teleportation technology to travel - between universes. The second contact with the Anarukon happens, this time - all going peacefully. Saya Miyamoto meets Xanai Kirin, their marriage brings - forth an alliance between the humans and the Anarukon. + between universes. The Demolitionist is deployed in a world called Parthoris, + and takes part on a mission to defeat an evil sorcerer who had taken over the + land. Months later, following a recommendation from Ashley Knox, the second + contact with the Anarukon happens, this time all going peacefully. Saya + Miyamoto meets Kirin Xanai, their marriage brings forth an alliance between + the humans and the Anarukon. +- 2172: Second major exploration at Akari Labs, the Demolitionist is deployed + into a realm known as Cronos in order to defeat an associate of the old + sorcerer from their previous mission. +- 2173: Third major exploration, with the Demolitionist taking part of a rebel + uprising in a world dominated by a cult known as the Order of the One God. - 2174: The prophecy of Mr. BIG SHOT comes true as the "Great Face In The Sky" reveals itself. It is defeated by a single man, one John A. Bortson III. - 2175: Reginald E. Griggs Jr. is executed by lethal injection. His last words: @@ -587,6 +668,8 @@ SWWM GZ effectively blends together the Doom and Unreal universes. - 2214: The Vortex Rikers crashes on planet Na Pali, Unreal begins. - 2215: The NEG is formed in anticipation of the coming Skaarj invasion. - 2216: The Seven Day Siege happens, the Skaarj are defeated. +- 2231: Saya and her creations move in with Kirin, she leaves the leadership of + Akari Labs to her brother Taro. - 2241: The Mishe race disappears from the universe, leaving only the founders of the University of Nos-Kora behind, who refuse to explain what happened. - 2250: The "Dark Alliance" is formed within X'Animen Coalition territory. @@ -600,18 +683,20 @@ SWWM GZ effectively blends together the Doom and Unreal universes. the Necris invasion of 2304, the corporation is dissolved. - 2320: A group of billionaires buy an entire island and turn it into an arena. The "Battle Royale" boom starts. -- 2407: Unissix Bokurou Azadeku devises the "Unissix Tournaments". +- 2407: Unissix Bokurou Azadeku devises the "Unissix Tournaments". UnSX 1 + begins. - 2409: The first tournament ends with Raik L Raikishionen, prime minister of the Nukuri Unified Government, as champion. -- 2411: In a joint attack, and with the participation of Earth, the "Dark - Alliance" is defeated. -- 2415: The "New Dark Kingdom" is formed, in an attempt to reunite those who - were defeated in the former war. Its leader is defeated not long after. -- 2779: The former "Warriors of the End" who had served Nedoshiaan reunite and - attempt to bring forth the apocalypse. Although the warriors are stopped, - they manage to summon SHINNOVRE the Eraser. For the first time in history, LS - breaks their vow to not get involved in "the affairs of mortals" and banishes - their brother. +- 2411: UnSX 2. In a joint attack, and with the participation of Earth, the + "Dark Alliance" is defeated. +- 2415: UnSX 4. The "New Dark Kingdom" is formed, in an attempt to reunite + those who were defeated in the former war. Its leader is defeated not long + after. +- 2779: UnSX 6 begins. The former "Warriors of the End" who had served + Nedoshiaan reunite and attempt to bring forth the apocalypse. Although the + warriors are stopped, they manage to summon HEKEAS SHINNOVRE the Eraser. For + the first time in history, LS breaks their vow to not get involved in "the + affairs of mortals" and banishes their brother. - 2890: "Vault 490" starts being built in the University of Nos-Kora, it is described as a "focusing device" for a weapon capable of "instantly neutralizing any threat to our universe". @@ -627,7 +712,44 @@ SWWM GZ effectively blends together the Doom and Unreal universes. - 2917: Following ten confusing years of battle, Hiikya is defeated by Deneva Unissix, who sacrifices her own life in the final attack. -- ????: In order to stop a massive Eldrich Abomination from corrupting all of - existence, the two Mishe brothers activate Vault 490. Although the threat is - defeated, major parts of the multiverse shatter in the process. Project Abyss - begins. +Disconnected events that are hard to place in time: + +- ????: Twenty years after the fall of the Order of the One God, a message is + received from an old ruined complex from beyond the sea. A declaration of war + from the "Church of the Dreadful Lady". A single, well trained mercenary puts + an end to their plans, but the true mastermind behind it all manages to flee. + +- ????: A Sidhe thief infiltrates the mansion of one of D'Sparil's old + associates, stealing the Heart of D'Sparil and putting an end to the plans + for resurrecting him. The mansion is sold off, most of its valuables, + including the corporeal remains of the serpent rider, passed around among + several parties, until being eventually acquired by the "Cult of the + Viridescent Lord". + +- ????: Long after the defeat of Korax, a nameless warrior is called into the + Winter Nexus, they gather the four elemental gems and defeat the "Viridescent + Lord". A mysterious shadowy figure revives the corpse of D'Sparil, both + disappear shortly after. + +Abyssal Era (Project Abyss timeline): + +- 57 BA: Using Saya's interportal technology, the Rust Empire creates the + various "passages", connecting Akkou and many other realms together. +- 38 BA: The town of Kenaia becomes corrupted by some strange "red mass", many + of its inhabitants turn into mindless beasts. +- 17 BA: The Church of Levlen initiates their Esper Crusades, aiming to rid the + land of all magic-aligned people. +- 15 BA: Alakir of Kanaiarkar manages to flee his hometown during an attack + from Levlen crusaders. +- 8 BA: First excavations on Evakai. +- The Abyssal Year: In order to stop a massive Eldrich Abomination from + corrupting all of existence, the two Mishe brothers activate Vault 490. + Although the threat is defeated, major parts of the multiverse shatter in the + process. +- 4: A strange plague spreads throughout the various realms. A man known as + "The Emissary" appears and reveals himself as its creator, he is captured and + imprisoned by the Rust Empire. +- 13: General Marius dies in combat defending the realm of Naiarkar from an + invasion of Levlen crusaders. +- 22: The Grand Patriarch becomes the Champion of the Kenaia Colloseum. +- 29: Project Abyss begins. diff --git a/models/Boolet.png b/models/Boolet.png new file mode 100644 index 0000000000000000000000000000000000000000..9fbf7219b440ede7768f126f49551cf815003600 GIT binary patch literal 2578 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 L{an^LB{Ts5`Q^=b literal 0 HcmV?d00001 diff --git a/models/Boolet_a.3d b/models/Boolet_a.3d new file mode 100644 index 0000000000000000000000000000000000000000..4ffa3f1192d5be65dea50b40b1a9ab4330cbb8ad GIT binary patch literal 136 zcmZQ%XklPrFl1n0;J?AZz+)6VB}|TU}R-@#NaRUh{08cfq`Fxfq_*+ zj@@5Ij@?z}02@EU0X9|!Irj69<=BrtW(fFui^1UQ;{^t$Z!QPyefr42ltC-dmSKT` rsmSGky;2MYr7{cwwWo<3FzlSW zx#dzVNIxe7HvL>0e%@wa z;AY?i>u+|Rp$~Eo6N4aw0s{lXiO(yZZ#m1rAi%&64v!00e%}842NYBC3_=VH49y#6 zAMU-#z#zyV#30YWz_8+Z@5R}NLGrR-e)EO}n?Za926+Zq1_p*LXJ;Q?uo)yT4dyp* zn7gIID;sI7y|=?%u$7{R@*`H!VIDe3=Axr z<(4XJWnd6v5M>Z%U|_J?uCP^ZDM(%j%xBpwJQc(jW)NZ!WME*BTPi%&umu$VBH;8C zy3=w#C_S+-u!7S^=$zW!p!6ZZz{bDu$jFI?HR6~yOb;Aap3$#4I8`@$7a{!jq(Pki2T7Q`1|U zIq?}3pYq`NU-5kQVNm=lFvx<_&z7?bHiOcS9D_7C{q5R1e=#Wi$uLMVNP*oub<*Y* yP<)7k)4$dWnWLceFU}wa=F1$l+79B2F$jb6pVfA`rJ(#L%peHn%Plo*0r3HV4d^id literal 0 HcmV?d00001 diff --git a/sndinfo.txt b/sndinfo.txt index c7521ac4d..8fd9104f7 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -317,6 +317,7 @@ demolitionist/kick3 sounds/demolitionist/demokick3.ogg $random demolitionist/kick { demolitionist/kick1 demolitionist/kick2 demolitionist/kick3 } demolitionist/revive sounds/demolitionist/demorevive.ogg demolitionist/youdied sounds/demolitionist/demoded.ogg +demolitionist/parry sounds/demolitionist/demoparry.ogg $playersound demolitionist neutral *grunt DSEMPTY $playeralias demolitionist neutral *pain100 demolitionist/lopain @@ -614,6 +615,11 @@ misc/waterexit sounds/general/surfaceb.ogg misc/slimeexit sounds/general/GoopE1.ogg misc/lavaexit sounds/general/LavaE1.ogg +misc/ricochet1 sounds/general/ric1.ogg +misc/ricochet2 sounds/general/ric2.ogg +misc/ricochet3 sounds/general/ric3.ogg +$random misc/ricochet { misc/ricochet1 misc/ricochet2 misc/ricochet3 } + armor/blastsuit sounds/items/blastsuit.ogg armor/wararmor sounds/items/wararmor.ogg armor/hit1 sounds/items/hullhit.ogg diff --git a/sounds/demolitionist/demoparry.ogg b/sounds/demolitionist/demoparry.ogg new file mode 100644 index 0000000000000000000000000000000000000000..9c5aa021040fc9e4d50417199f5976c70e9f1626 GIT binary patch literal 11429 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 VdU|g8sm>SMUPsqtwg>k!007mBN6i2L literal 0 HcmV?d00001 diff --git a/sounds/general/ric2.ogg b/sounds/general/ric2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..b421e53ceae59e88ef7c990b996aeb600fac6654 GIT binary patch literal 6710 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 V!gD{J=YAG8b6xHB!Q(Cy0{{rVh7SM$ literal 0 HcmV?d00001 diff --git a/sounds/general/ric3.ogg b/sounds/general/ric3.ogg new file mode 100644 index 0000000000000000000000000000000000000000..d4a9e13824f67964656f8763e326268e038d7efe GIT binary patch literal 9437 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 ha_7m}`&V2(nfL3){Vx)3Vb5lr+H9+G 80) ) continue; + Vector3 vdir = a.vel; + Vector3 dir = level.Vec3Diff(pos,a.pos).unit(); + if ( dir dot vdir > 0 ) continue; // already moving away + // deflect directly to target + if ( !Random[Parry](0,2) && a.target ) + dir = level.Vec3Diff(a.pos,a.target.Vec3Offset(0,0,a.target.height/2)).unit(); + // push away + if ( a.bSEEKERMISSILE ) a.tracer = a.target; + a.target = master; + double mvel = a.vel.length(); + a.vel = dir*mvel*FRandom[Parry](1.,1.2); + a.angle = atan2(dir.y,dir.x); + a.pitch = asin(-dir.z); + bool raging = !!master.FindInventory("RagekitPower"); + if ( raging ) a.vel *= 2.; + let i = Spawn(raging?"BigPunchImpact":"PunchImpact",a.pos); + i.target = master; + i.angle = atan2(dir.y,dir.x); + i.pitch = asin(-dir.z); + A_StartSound("demolitionist/parry",CHAN_VOICE,CHANF_OVERLAP,.4); + } + if ( --special1 <= 0 ) Destroy(); + } + + override bool CanCollideWith( Actor other, bool passive ) + { + return false; + } + + override int DamageMobj( Actor inflictor, Actor source, int damage, Name mod, int flags, double angle ) + { + if ( (flags&DMG_INFLICTOR_IS_PUFF) && (source != master) ) + { + // TODO deflect hitscan + // three options: + // 1. just block the bullet, making it bounce off + // 2. ricochet in random direction + // 3. ricochet directly back to source + A_StartSound("demolitionist/parry",CHAN_VOICE,CHANF_OVERLAP,.4); + } + return 0; + } + + States + { + Spawn: + TNT1 A -1; + Stop; + } +} + // Base class for all SWWM Weapons Class SWWMWeapon : Weapon abstract { private int SWeaponFlags; + Actor pfield; // instance of parry field for current melee attack FlagDef NoFirstGive : SWeaponFlags, 0; // don't give ammo on first pickup (for weapons with a clip count) @@ -533,6 +621,16 @@ Class SWWMWeapon : Weapon abstract player.SetPSprite(PSP_FLASH,null); player.mo.BringUpWeapon(); } + action void A_Parry( int duration ) + { + Vector3 x, y, z, origin; + [x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll); + origin = level.Vec3Offset(Vec2OffsetZ(0,0,player.viewz),x*20-(0,0,20)); + if ( invoker.pfield ) invoker.pfield.Destroy(); + invoker.pfield = Spawn("ParryField",origin); + invoker.pfield.master = self; + invoker.pfield.special1 = duration; + } private action bool TryMelee( double angle, int dmg ) { FTranslatedLineTarget t; @@ -583,14 +681,24 @@ Class SWWMWeapon : Weapon abstract } action void A_Melee( int dmg = 40 ) { + // temporarily disable parry field so we can trace through + if ( invoker.pfield ) invoker.pfield.bSHOOTABLE = false; bool raging = CountInv("RagekitPower"); int maxang = raging?18:12; - for ( int i=0; i