Commit b31f05d3 authored by takhomasak's avatar takhomasak

increased nobuild on NH minor POI, fixed Imperial PvP Rifle display on...

increased nobuild on NH minor POI, fixed Imperial PvP Rifle display on recruiter, death now clears swim state
parent 4cb6726b
......@@ -111,7 +111,7 @@ nalhutta_regions = {
{"xnh_86",4390,-4321,{1,50},NOSPAWNAREA + NOBUILDZONEAREA},
{"xnh_87",2863,-3912,{1,50},NOSPAWNAREA + NOBUILDZONEAREA},
{"xnh_88",1484,-4064,{1,50},NOSPAWNAREA + NOBUILDZONEAREA},
{"xnh_89",799,-4722,{1,100},NOSPAWNAREA + NOBUILDZONEAREA},
{"xnh_89",774,-4704,{1,200},NOSPAWNAREA + NOBUILDZONEAREA},
{"xnh_90",-394,-5397,{1,50},NOSPAWNAREA + NOBUILDZONEAREA},
{"xnh_91",-1739,-5357,{1,50},NOSPAWNAREA + NOBUILDZONEAREA},
{"xnh_92",-2854,-4553,{1,50},NOSPAWNAREA + NOBUILDZONEAREA},
......
......@@ -176,7 +176,7 @@ imperialRewardData = {
rifle_pvp = { type=factionRewardType.weapon, display="@weapon_name:rifle_pvp", item="object/weapon/ranged/rifle/rifle_pvp.iff", cost=60000},
sword_imperial = { type=factionRewardType.weapon, display="@weapon_name:sword_pvp_bf_01", item="object/weapon/melee/sword/sword_pvp_bf_01.iff", cost=60000},
knuckler_imperial = { type=factionRewardType.weapon, display="@static_item_n:weapon_knuckler_buzz_knuck", item="object/weapon/melee/special/pvp_bf_knuckler.iff", cost=60000},
heavy_pvp = { type=factionRewardType.weapon, display="@static_item_n:heavy_pvp_n", item="object/weapon/ranged/heavy/heavy_pvp.iff", cost=60000},
heavy_pvp = { type=factionRewardType.weapon, display="@item_n:heavy_pvp_n", item="object/weapon/ranged/heavy/heavy_pvp.iff", cost=60000},
polearm_imperial_pvp= { type=factionRewardType.weapon, display="@static_item_n:weapon_gcw_lance_03_01", item="object/weapon/melee/polearm/lance_gcw_gand_shockprod.iff", cost=60000},
armor_sandtrooper_backpack = { type=factionRewardType.armor, display="@wearables_name:armor_sandtrooper_backpack", item="object/tangible/wearables/backpack/empireday_sandtrooper_backpack.iff",cost=8000},
backpack_s08 = { type=factionRewardType.armor, display="@wearables_name:backpack_s08", item="object/tangible/wearables/backpack/backpack_s08.iff",cost=8000},
......
......@@ -811,6 +811,8 @@ void PlayerManagerImplementation::killPlayer(TangibleObject* attacker, CreatureO
player->setPosture(CreaturePosture::DEAD, !isCombatAction, !isCombatAction);
player->clearState(CreatureState::SWIMMING, true);
sendActivateCloneRequest(player, typeofdeath);
stringId.setStringId("base_player", "prose_victim_dead");
......@@ -3005,11 +3007,11 @@ void PlayerManagerImplementation::updateSwimmingState(CreatureObject* player, fl
player->inflictDamage(NULL, CreatureAttribute::HEALTH, 200, true, true);
}
if (zone->getZoneName() == "kessel") {
//if (zone->getZoneName() == "kessel") {
player->addDotState(player, CreatureState::POISONED, 0, 200 + System::random(50), CreatureAttribute::HEALTH, 30 * 60, 60, 0);
player->inflictDamage(NULL, CreatureAttribute::HEALTH, 20, true, true);
}
//player->addDotState(player, CreatureState::POISONED, 0, 200 + System::random(50), CreatureAttribute::HEALTH, 30 * 60, 60, 0);
//player->inflictDamage(NULL, CreatureAttribute::HEALTH, 20, true, true);
//}
if (zone->getZoneName() == "dungeon4") {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment