Browse Source

fix wepdrop not giving the right thing

tags/1.6.3
Alison Watson 1 year ago
parent
commit
dbb4ce8e96
9 changed files with 40 additions and 25 deletions
  1. BIN
      pk7/acs/lithmain.bin
  2. +2
    -1
      pk7/language.txt
  3. +2
    -0
      pk7/lzscript/Constants/w_monster.zsc
  4. +1
    -0
      source/Headers/m_stab.h
  5. +2
    -0
      source/Headers/w_monster.h
  6. +2
    -1
      source/Main/p_items.c
  7. +11
    -4
      source/Main/w_monster.c
  8. +18
    -18
      source/Monsters.txt
  9. +2
    -1
      text/en/Log/Random.txt

BIN
pk7/acs/lithmain.bin View File


+ 2
- 1
pk7/language.txt View File

@@ -940,11 +940,12 @@
"LITH_PK_weapon_c_mateba_009" = "Marteba";
"LITH_PK_weapon_c_mateba_010" = "Metabe";
"LITH_PK_weapon_c_mateba_011" = "Mercury Poisoning";
"LITH_PK_weapon_c_rifle_NUM" = "3";
"LITH_PK_weapon_c_rifle_NUM" = "4";
"LITH_PK_weapon_c_rifle_000" = "Sock Rifle";
"LITH_PK_weapon_c_rifle_001" = "Shock Stifle";
"LITH_PK_weapon_c_rifle_002" = "Stock Knifle";
"LITH_PK_weapon_c_rifle_003" = "ShohS RifiR";
"LITH_PK_weapon_c_rifle_004" = "Cock Waffle";
"LITH_PK_weapon_c_smg_NUM" = "10";
"LITH_PK_weapon_c_smg_000" = "Chug Smug";
"LITH_PK_weapon_c_smg_001" = "Real Supersand";


+ 2
- 0
pk7/lzscript/Constants/w_monster.zsc View File

@@ -27,6 +27,8 @@
enum Lith_MonsterType {
mtype_unknown,
mtype_zombie,
mtype_zombiesg,
mtype_zombiecg,
mtype_imp,
mtype_demon,
mtype_lostsoul,


+ 1
- 0
source/Headers/m_stab.h View File

@@ -239,6 +239,7 @@ X(so_BoughtItem, OBJ "BoughtItem")
X(so_CameraHax, OBJ "CameraHax")
X(so_CannonAmmo, OBJ "CannonAmmo")
X(so_Cercle, OBJ "Cercle")
X(so_Chaingun, "Chaingun")
X(so_ChexBlueCard, "ChexBlueCard")
X(so_ChexRedCard, "ChexRedCard")
X(so_ChexYellowCard, "ChexYellowCard")


+ 2
- 0
source/Headers/w_monster.h View File

@@ -35,6 +35,8 @@ enum dmgtype {
enum mtype /* Lith_MonsterType*/ {
mtype_unknown,
mtype_zombie,
mtype_zombiesg,
mtype_zombiecg,
mtype_imp,
mtype_demon,
mtype_lostsoul,


+ 2
- 1
source/Main/p_items.c View File

@@ -105,7 +105,8 @@ static void Container(struct gui_state *g, struct container *cont, i32 sx, i32 s

if(p && p->movitem && g->clicklft &&
aabb(sx, sy, sx+w, sy+h, g->cx, g->cy) &&
P_Inv_Place(cont, p->selitem, (g->cx - sx) / 8, (g->cy - sy) / 8)) {
(P_Inv_Place(cont, p->selitem, (g->cx - sx) / 8, (g->cy - sy) / 8) ||
P_Inv_PlaceFirst(cont, p->selitem))) {
p->movitem = false;
ACS_LocalAmbientSound(ss_player_cbi_invmov, 127);
}


+ 11
- 4
source/Main/w_monster.c View File

@@ -222,11 +222,18 @@ static void OnFinalize(dmon_t *m)
SpawnManaPickup(m, p);
}

if(m->mi->type == mtype_zombie && ACS_GetCVar(sc_sv_wepdrop) && !p->weapon.slot[3])
if(ACS_GetCVar(sc_sv_wepdrop) && !p->weapon.slot[3])
{
i32 tid = ACS_UniqueTID();
ACS_SpawnForced(so_Shotgun, m->ms->x, m->ms->y, m->ms->z, tid);
ACS_SetActorFlag(tid, s_DROPPED, false);
str sp = snil;
switch(m->mi->type) {
case mtype_zombiesg: if(!p->weapon.slot[3]) sp = so_Shotgun; break;
case mtype_zombiecg: if(!p->weapon.slot[4]) sp = so_Chaingun; break;
}
if(sp) {
i32 tid = ACS_UniqueTID();
ACS_SpawnForced(sp, m->ms->x, m->ms->y, m->ms->z, tid);
ACS_SetActorFlag(tid, s_DROPPED, false);
}
}

if(p->getUpgrActive(UPGR_SoulCleaver))


+ 18
- 18
source/Monsters.txt View File

@@ -22,10 +22,10 @@

+ZombieMan zombie ZombieMan
+ZombieMan zombie Zombieman
+ShotgunGuy zombie ShotgunGuy
+ShotgunGuy zombie Shotgunguy
+ChaingunGuy zombie ChaingunGuy
+ChaingunGuy zombie Chaingunguy
+ShotgunGuy zombiesg ShotgunGuy
+ShotgunGuy zombiesg Shotgunguy
+ChaingunGuy zombiecg ChaingunGuy
+ChaingunGuy zombiecg Chaingunguy
+Imp imp Imp
+Demon demon Demon
+Spectre demon Spectre
@@ -50,7 +50,7 @@
+LostSoul lostsoul FlemMine
+BaronOfHell baron Flembrane
+BaronOfHell baron FlemoidusMaximus
+ShotgunGuy zombie FlemoidusBipedicus
+ShotgunGuy zombiesg FlemoidusBipedicus
+ZombieMan zombie FlemoidusCommonus
+Spectre demon FlemoidusCycloptisCommonus
+Demon demon FlemoidusStridicus
@@ -115,17 +115,17 @@

## DoomRL Arsenal Monsters ---------------------------------------------------|

+ZombieMan zombie FormerHuman
+ShotgunGuy zombie FormerSergeant
+ChaingunGuy zombie FormerCommando
+DRLACaptain zombie Former
+ZombieMan zombie FormerHuman
+ShotgunGuy zombiesg FormerSergeant
+ChaingunGuy zombiecg FormerCommando
+DRLACaptain zombie Former

## Rampancy ------------------------------------------------------------------|

%mif_full
+ZombieMan zombie Robot_SentryBot
+ShotgunGuy zombie Robot_DefenderBot
+ChaingunGuy zombie Robot_SecurityBotSmall
+ShotgunGuy zombiesg Robot_DefenderBot
+ChaingunGuy zombiecg Robot_SecurityBotSmall
+Imp imp Robot_SoldierBot
+Demon demon Robot_SpiderBotSmall
+Spectre demon Robot_StealthDroid
@@ -185,15 +185,15 @@

## Western Patch -------------------------------------------------------------|

+ZombieMan zombie Westman
+ZombieMan zombie WildGunmanGuy
+ShotgunGuy zombie TheOutsider
+ZombieMan zombie Westman
+ZombieMan zombie WildGunmanGuy
+ShotgunGuy zombiesg TheOutsider

## Combined Harms ------------------------------------------------------------|

+ZombieMan zombie ZombieGunner
+ShotgunGuy zombie ShotGunner
+ChaingunGuy zombie ChainGunner
+ShotgunGuy zombiesg ShotGunner
+ChaingunGuy zombiecg ChainGunner
+Demon demon Pinky
+Spectre demon sneakypinky
+Cacodemon cacodemon bigmouthedhissything
@@ -212,8 +212,8 @@
## Note, these MUST be at the bottom, because they are extremely vague.

+ZombieMan zombie Zombie
+ShotgunGuy zombie SG
+ChaingunGuy zombie CGuy
+ShotgunGuy zombiesg SG
+ChaingunGuy zombiecg CGuy
+LostSoul lostsoul LSoul
+HellKnight hellknight HK
+Arachnotron arachnotron SP1


+ 2
- 1
text/en/Log/Random.txt View File

@@ -238,11 +238,12 @@ and you will drown in it. You're fucking dead, kiddo.
== \#PK_weapon_c_mateba_010 | Metabe
== \#PK_weapon_c_mateba_011 | Mercury Poisoning

== \#PK_weapon_c_rifle_NUM | 3
== \#PK_weapon_c_rifle_NUM | 4
== \#PK_weapon_c_rifle_000 | Sock Rifle
== \#PK_weapon_c_rifle_001 | Shock Stifle
== \#PK_weapon_c_rifle_002 | Stock Knifle
== \#PK_weapon_c_rifle_003 | ShohS RifiR
== \#PK_weapon_c_rifle_004 | Cock Waffle

== \#PK_weapon_c_smg_NUM | 10
== \#PK_weapon_c_smg_000 | Chug Smug


Loading…
Cancel
Save