From 32181d3e27ce836936b0a561e91e28ab34752dda Mon Sep 17 00:00:00 2001 From: "wearchristy@gmail.com" Date: Wed, 16 Jun 2021 23:52:38 -0700 Subject: [PATCH 1/6] Possible Peace_Aura Change, to evoke on anyone with dialog --- Underlight/cArts.cpp | 119 ++++++++++++++++++++++++++++++++++++++----- Underlight/cArts.h | 3 +- 2 files changed, 107 insertions(+), 15 deletions(-) diff --git a/Underlight/cArts.cpp b/Underlight/cArts.cpp index 3a13efc..fc80c5f 100644 --- a/Underlight/cArts.cpp +++ b/Underlight/cArts.cpp @@ -7014,23 +7014,33 @@ void cArts::EndBreakCovenant(void) // Peace Aura void cArts::StartPeaceAura(void) { + //wait for selection of target this->WaitForSelection(&cArts::EndPeaceAura, Arts::PEACE_AURA); + //adds our player to list this->AddDummyNeighbor(); + // captures neighbor tab for selection this->CaptureCP(NEIGHBORS_TAB, Arts::PEACE_AURA); return; } +//applying the art void cArts::ApplyPeaceAura(int skill, lyra_id_t caster_id) { + // finds neighbor cNeighbor *n = this->LookUpNeighbor(caster_id); + //if neighbor is none, and caster id is not player ID if ((n == NO_ACTOR) && (caster_id != player->ID())) + //bail. return; + //if player is monster if (player->IsMonster()) { + //bail return; } - + //removed this part so can evoke on non members + /* if(player->GuildRank(Guild::ECLIPSE) == Guild::NO_RANK) { LoadString (hInstance, IDS_MUST_BE_MEMBER_APPLY, disp_message, sizeof(disp_message)); @@ -7038,27 +7048,83 @@ void cArts::ApplyPeaceAura(int skill, lyra_id_t caster_id) display->DisplayMessage(message, false); return; } - - - player->EvokedFX().Activate(Arts::PEACE_AURA, false); + */ + //if player is also the caster + if (player->ID() == caster_id) + { + //set duration + int duration = this->Duration(Arts::PEACE_AURA, PA_SKILL); + //set effect on player + player->SetTimedEffect(LyraEffect::PLAYER_PEACE_AURA, duration, PA_Caster_ID, EffectOrigin::ART_EVOKE); + // puts cast cone on player + player->EvokedFX().Activate(Arts::PEACE_AURA, false); + } + // if caster isnt player + else if (!acceptrejectdlg) + { + //load string for asking if can cast + LoadString(hInstance, IDS_QUERY_PEACE_AURA, disp_message, sizeof(disp_message)); + //loads it into message from disp_message with variables filled in + _stprintf(message, disp_message, this->Descrip(Arts::PEACE_AURA), n->Name()); + //call to gdi for popup dialog with message + HWND hDlg = CreateLyraDialog(hInstance, (IDD_ACCEPTREJECT), + cDD->Hwnd_Main(), (DLGPROC)AcceptRejectDlgProc); + //calls gotpeaceaura if evoke success + acceptreject_callback = (&cArts::GotPeaceAura); + SendMessage(hDlg, WM_SET_ART_CALLBACK, 0, 0); + SendMessage(hDlg, WM_SET_AR_NEIGHBOR, 0, (LPARAM)n); + } + // saves for evoke in GotPeaceAura + PA_Caster_ID = caster_id; + PA_SKILL = skill; + // displays art was cast upon the one using(if pertenant) this->DisplayUsedByOther(n, Arts::PEACE_AURA); + return; +} - int duration = this->Duration(Arts::PEACE_AURA, skill); - player->SetTimedEffect(LyraEffect::PLAYER_PEACE_AURA, duration, caster_id, EffectOrigin::ART_EVOKE); - +//art got casted on player by someone else. +void cArts::GotPeaceAura(void* value) +{ + //loads value of accept or rej + int success = *((int*)value); + // check for soulsphere + if (player->flags & ACTOR_SOULSPHERE) { + //loads IDS_SOULSPHERE_NO_ARTS string into disp_message + LoadString(hInstance, IDS_SOULSPHERE_NO_ARTS, disp_message, sizeof(disp_message)); + //puts it on screen + display->DisplayMessage(disp_message); + + } + // checks if successfully accepted and casts on target + else if (success) { + //sets duration of art based upon casters skill + int duration = this->Duration(Arts::PEACE_AURA, PA_SKILL); + //applies to target based on skill of caster. + player->SetTimedEffect(LyraEffect::PLAYER_PEACE_AURA, duration, PA_Caster_ID, EffectOrigin::ART_EVOKE); + //initiates casted evoke cone. + player->EvokedFX().Activate(Arts::PEACE_AURA, false); + + } + // lets server know we recieved and evoked the art.. + gs->SendPlayerMessage(player->ID(), RMsg_PlayerMsg::PEACE_AURA, 0, 0); return; } +//final clear n clean of art.. void cArts::EndPeaceAura(void) { + // checks neighbor list cNeighbor* n = cp->SelectedNeighbor(); + //if actor isnt present, or if it's an invalid target if ((n == NO_ACTOR) || !(actors->ValidNeighbor(n))) { + //display bailed. this->DisplayNeighborBailed(Arts::PEACE_AURA); + //does not allow art to imp this->ArtFinished(false); return; } - + // only works for AOE if (!(player->GuildRank(Guild::ECLIPSE) >= Guild::INITIATE)) { @@ -7068,38 +7134,63 @@ void cArts::EndPeaceAura(void) this->ArtFinished(false); return; } - + + //makes a temp token or points to one for comparison cItem* power_tokens[Lyra::INVENTORY_MAX]; + //counts number of them in casters inventory int num_tokens = CountPowerTokens((cItem**)power_tokens, Guild::ECLIPSE); + // if number of tokens is less than requirement if (num_tokens < HOUSE_ART_PTS) { + //load string IDS_MUST_HAVE_POWER_TOKENS string into message LoadString (hInstance, IDS_MUST_HAVE_POWER_TOKENS, message, sizeof(message)); + //fills in %t variables for string. and places it in disp_message _stprintf(disp_message, message, HOUSE_ART_PTS, GuildName(Guild::ECLIPSE), arts->Descrip(Arts::PEACE_AURA)); - display->DisplayMessage(disp_message); + // displays msg + display->DisplayMessage(disp_message); + //doesnt allow imp this->ArtFinished(false); return; } + //if neighbor is a monster (target) if (n->IsMonster()) { + //load string IDS_PEACE_AURA_MARES, and stuff it in disp_message LoadString (hInstance, IDS_PEACE_AURA_MARES, disp_message, sizeof(disp_message)); - display->DisplayMessage(disp_message); + //display disp_message + display->DisplayMessage(disp_message); + //no imp this->ArtFinished(false); return; } + //if casting on self. if (n->ID() == player->ID()) + { + //apply peace aura this->ApplyPeaceAura(player->Skill(Arts::PEACE_AURA), player->ID()); - else gs->SendPlayerMessage(n->ID(), RMsg_PlayerMsg::PEACE_AURA, + //display casted on self + DisplayUsedByOther(n, Arts::PEACE_AURA); + } + else + { + //send gameserver to send player to cast art on target at casters skill + gs->SendPlayerMessage(n->ID(), RMsg_PlayerMsg::PEACE_AURA, player->Skill(Arts::PEACE_AURA), 0); - + //display on screen used on other + DisplayUsedOnOther(n, Arts::PEACE_AURA); + } + //use the power token. this->UsePowerTokens(power_tokens, HOUSE_ART_PTS); - + //allow imp this->ArtFinished(true); return; } + + ////////////////////////////////////////////////////////////////// // Sable Shield void cArts::StartSableShield(void) diff --git a/Underlight/cArts.h b/Underlight/cArts.h index 85925c2..120ee84 100644 --- a/Underlight/cArts.h +++ b/Underlight/cArts.h @@ -63,7 +63,7 @@ class cArts bool fDoingNewlies; bool fDoingMares; bool fDoingSense; - + int PA_Caster_ID, PA_SKILL; // peace aura int's for passing to next function // random state variables used by arts TCHAR knight_name[Lyra::PLAYERNAME_MAX]; @@ -321,6 +321,7 @@ class cArts void EndExpel(void); void StartPeaceAura(void); void ApplyPeaceAura(int skill, lyra_id_t caster_id); + void GotPeaceAura(void* value); //added for new function void EndPeaceAura(void); void StartSableShield(void); void ApplySableShield(int skill, lyra_id_t caster_id); From 73b691ef911808b5ef5543a51268ffa9705a8a09 Mon Sep 17 00:00:00 2001 From: "wearchristy@gmail.com" Date: Thu, 17 Jun 2021 02:58:46 -0700 Subject: [PATCH 2/6] Peace_Aura evoke anyone with Dialog fix --- Underlight/Underlight.rc | 9 ++++---- Underlight/cArts.cpp | 49 +++++++++++++++++++++++++--------------- Underlight/cArts.h | 3 ++- Underlight/resource.h | 1 + 4 files changed, 39 insertions(+), 23 deletions(-) diff --git a/Underlight/Underlight.rc b/Underlight/Underlight.rc index cb499e3..fa79b26 100644 --- a/Underlight/Underlight.rc +++ b/Underlight/Underlight.rc @@ -2774,6 +2774,7 @@ END STRINGTABLE BEGIN IDS_RALLY_NO_SS "Rally cannot work on a soulsphere!\n" + IDS_QUERY_PEACE_AURA "You are being offered %s by %s. Do you accept?" IDS_NO_ACCESS_REGISTRY "Cannot access registry" IDS_0 "0" IDS_1 "1" @@ -3931,8 +3932,8 @@ BEGIN IDS_DSERR_BUFFERLOST "DSERR_BUFFERLOST" IDS_DSERR_OTHERAPPHASPRIO "DSERR_OTHERAPPHASPRIO" IDS_DSERR_UNINITIALIZED "DSERR_UNINITIALIZED" - IDS_LIVE_GAME_SERVER_IP "ulsrv1.openunderlight.org" - IDS_DEV_GAME_SERVER_IP1 "ulsrv1.openunderlight.org" + IDS_LIVE_GAME_SERVER_IP "192.168.1.246" + IDS_DEV_GAME_SERVER_IP1 "192.168.1.246" IDS_GAME_MANUAL_URL "http://wiki.underlight.com" IDS_BILLING_URL "http://forums.underlight.com/viewtopic.php?f=2&t=78" IDS_FIREWALL_FAQ_URL "http://www.underlight.com/" @@ -3940,8 +3941,8 @@ END STRINGTABLE BEGIN - IDS_DEV_GAME_SERVER_IP2 "ulsrv1.openunderlight.org" - IDS_CUSTOM_IP_DEFAULT "127.0.0.1" + IDS_DEV_GAME_SERVER_IP2 "192.168.1.246" + IDS_CUSTOM_IP_DEFAULT "192.168.1.246" IDS_ONCE_HIDDEN_ALWAYS_HIDDEN "\nOnce you go INVIS, you cannot go back!\n" END diff --git a/Underlight/cArts.cpp b/Underlight/cArts.cpp index fc80c5f..8d469f5 100644 --- a/Underlight/cArts.cpp +++ b/Underlight/cArts.cpp @@ -7030,9 +7030,11 @@ void cArts::ApplyPeaceAura(int skill, lyra_id_t caster_id) cNeighbor *n = this->LookUpNeighbor(caster_id); //if neighbor is none, and caster id is not player ID if ((n == NO_ACTOR) && (caster_id != player->ID())) + { + display->DisplayMessage("error is in applypeaceaura"); //bail. return; - + } //if player is monster if (player->IsMonster()) { @@ -7049,13 +7051,14 @@ void cArts::ApplyPeaceAura(int skill, lyra_id_t caster_id) return; } */ - //if player is also the caster - if (player->ID() == caster_id) - { - //set duration - int duration = this->Duration(Arts::PEACE_AURA, PA_SKILL); - //set effect on player - player->SetTimedEffect(LyraEffect::PLAYER_PEACE_AURA, duration, PA_Caster_ID, EffectOrigin::ART_EVOKE); + //load up PAhelper variables + PA_skill = skill; + PA_castid = caster_id; + // check if player has rank + if (player->GuildRank(Guild::ECLIPSE) >= Guild::INITIATE) + { + //good, just use it. + PeaceAuraHelper(skill, caster_id); // puts cast cone on player player->EvokedFX().Activate(Arts::PEACE_AURA, false); } @@ -7064,24 +7067,35 @@ void cArts::ApplyPeaceAura(int skill, lyra_id_t caster_id) { //load string for asking if can cast LoadString(hInstance, IDS_QUERY_PEACE_AURA, disp_message, sizeof(disp_message)); + //loads it into message from disp_message with variables filled in _stprintf(message, disp_message, this->Descrip(Arts::PEACE_AURA), n->Name()); + //call to gdi for popup dialog with message HWND hDlg = CreateLyraDialog(hInstance, (IDD_ACCEPTREJECT), cDD->Hwnd_Main(), (DLGPROC)AcceptRejectDlgProc); + //calls gotpeaceaura if evoke success acceptreject_callback = (&cArts::GotPeaceAura); SendMessage(hDlg, WM_SET_ART_CALLBACK, 0, 0); SendMessage(hDlg, WM_SET_AR_NEIGHBOR, 0, (LPARAM)n); } - // saves for evoke in GotPeaceAura - PA_Caster_ID = caster_id; - PA_SKILL = skill; + // displays art was cast upon the one using(if pertenant) this->DisplayUsedByOther(n, Arts::PEACE_AURA); return; } +void cArts::PeaceAuraHelper(int skill, lyra_id_t caster_id) +{ + //set duration + int duration = this->Duration(Arts::PEACE_AURA, skill); + + //set effect on player + player->SetTimedEffect(LyraEffect::PLAYER_PEACE_AURA, duration, player->ID(), EffectOrigin::ART_EVOKE); + + +} //art got casted on player by someone else. void cArts::GotPeaceAura(void* value) { @@ -7097,19 +7111,16 @@ void cArts::GotPeaceAura(void* value) } // checks if successfully accepted and casts on target else if (success) { - //sets duration of art based upon casters skill - int duration = this->Duration(Arts::PEACE_AURA, PA_SKILL); - //applies to target based on skill of caster. - player->SetTimedEffect(LyraEffect::PLAYER_PEACE_AURA, duration, PA_Caster_ID, EffectOrigin::ART_EVOKE); - //initiates casted evoke cone. + //use the art + PeaceAuraHelper(PA_skill, PA_castid); player->EvokedFX().Activate(Arts::PEACE_AURA, false); } - // lets server know we recieved and evoked the art.. - gs->SendPlayerMessage(player->ID(), RMsg_PlayerMsg::PEACE_AURA, 0, 0); + return; } + //final clear n clean of art.. void cArts::EndPeaceAura(void) { @@ -7118,6 +7129,7 @@ void cArts::EndPeaceAura(void) //if actor isnt present, or if it's an invalid target if ((n == NO_ACTOR) || !(actors->ValidNeighbor(n))) { + display->DisplayMessage("error is in applypeaceaura"); //display bailed. this->DisplayNeighborBailed(Arts::PEACE_AURA); //does not allow art to imp @@ -7179,6 +7191,7 @@ void cArts::EndPeaceAura(void) //send gameserver to send player to cast art on target at casters skill gs->SendPlayerMessage(n->ID(), RMsg_PlayerMsg::PEACE_AURA, player->Skill(Arts::PEACE_AURA), 0); + //display on screen used on other DisplayUsedOnOther(n, Arts::PEACE_AURA); } diff --git a/Underlight/cArts.h b/Underlight/cArts.h index 120ee84..38b7365 100644 --- a/Underlight/cArts.h +++ b/Underlight/cArts.h @@ -63,7 +63,7 @@ class cArts bool fDoingNewlies; bool fDoingMares; bool fDoingSense; - int PA_Caster_ID, PA_SKILL; // peace aura int's for passing to next function + int PA_castid, PA_skill; //pa helper vars // random state variables used by arts TCHAR knight_name[Lyra::PLAYERNAME_MAX]; @@ -321,6 +321,7 @@ class cArts void EndExpel(void); void StartPeaceAura(void); void ApplyPeaceAura(int skill, lyra_id_t caster_id); + void PeaceAuraHelper(int skill, lyra_id_t caster_id); void GotPeaceAura(void* value); //added for new function void EndPeaceAura(void); void StartSableShield(void); diff --git a/Underlight/resource.h b/Underlight/resource.h index b1ac41c..f7d861e 100644 --- a/Underlight/resource.h +++ b/Underlight/resource.h @@ -3047,6 +3047,7 @@ #define IDS_DISTRESS_CALL_UNS 4499 #define IDS_STRING19 4500 #define IDS_ITEM_GIVEN_TO 4500 +#define IDS_QUERY_PEACE_AURA 4501 #define IDC_NUKE_PARTICLES 4802 #define IDC_PARTICLE_RELOAD 4803 #define IDC_AVATAR_COMBO 16666 From b049af632d1ebd0dab15b621f5c4ffb123f3181f Mon Sep 17 00:00:00 2001 From: "wearchristy@gmail.com" Date: Thu, 17 Jun 2021 03:11:26 -0700 Subject: [PATCH 3/6] Peace_Aura evoke anyone with Dialog remove debug --- AgentSvc/AgentSvc.vcxproj | 6 +++--- AgentSvr/AgentSvr.vcxproj | 8 ++++---- MessageMaker/MessageMaker.vcxproj | 8 ++++---- MessageMaker/MessageMaker.vcxproj.filters | 3 --- Underlight/Underlight.vcxproj | 24 +++++++++++------------ Underlight/cArts.cpp | 4 +--- 6 files changed, 24 insertions(+), 29 deletions(-) diff --git a/AgentSvc/AgentSvc.vcxproj b/AgentSvc/AgentSvc.vcxproj index bb0e466..0e62de4 100644 --- a/AgentSvc/AgentSvc.vcxproj +++ b/AgentSvc/AgentSvc.vcxproj @@ -24,20 +24,20 @@ Application Static Unicode - v140_xp + v141_xp Application false Static NotSet - v140_xp + v141_xp Application Static MultiByte - v140_xp + v141_xp diff --git a/AgentSvr/AgentSvr.vcxproj b/AgentSvr/AgentSvr.vcxproj index c21caed..1d95805 100644 --- a/AgentSvr/AgentSvr.vcxproj +++ b/AgentSvr/AgentSvr.vcxproj @@ -27,23 +27,23 @@ Application false Unicode - v140_xp + v141_xp Application false - v140_xp + v141_xp Application false - v140_xp + v141_xp MultiByte Application false - v140_xp + v141_xp diff --git a/MessageMaker/MessageMaker.vcxproj b/MessageMaker/MessageMaker.vcxproj index 2efb035..bcfa181 100644 --- a/MessageMaker/MessageMaker.vcxproj +++ b/MessageMaker/MessageMaker.vcxproj @@ -26,23 +26,23 @@ StaticLibrary false - v140_xp + v141_xp StaticLibrary false - v140_xp + v141_xp StaticLibrary false Unicode - v140_xp + v141_xp StaticLibrary false - v140_xp + v141_xp diff --git a/MessageMaker/MessageMaker.vcxproj.filters b/MessageMaker/MessageMaker.vcxproj.filters index cca5100..35338ad 100644 --- a/MessageMaker/MessageMaker.vcxproj.filters +++ b/MessageMaker/MessageMaker.vcxproj.filters @@ -372,9 +372,6 @@ Header Files - - Header Files - Header Files diff --git a/Underlight/Underlight.vcxproj b/Underlight/Underlight.vcxproj index be326d6..9e6d1ab 100644 --- a/Underlight/Underlight.vcxproj +++ b/Underlight/Underlight.vcxproj @@ -58,63 +58,63 @@ Application false - v140_xp + v141_xp Application false - v140_xp + v141_xp Application false - v140_xp + v141_xp Application false - v140_xp + v141_xp Application false - v140_xp + v141_xp Application false - v140_xp + v141_xp Application false - v140_xp + v141_xp Application false Unicode - v140_xp + v141_xp Application false - v140_xp + v141_xp Application false - v140_xp + v141_xp Application false - v140_xp + v141_xp Application false - v140_xp + v141_xp diff --git a/Underlight/cArts.cpp b/Underlight/cArts.cpp index 8d469f5..e5b211a 100644 --- a/Underlight/cArts.cpp +++ b/Underlight/cArts.cpp @@ -7031,7 +7031,7 @@ void cArts::ApplyPeaceAura(int skill, lyra_id_t caster_id) //if neighbor is none, and caster id is not player ID if ((n == NO_ACTOR) && (caster_id != player->ID())) { - display->DisplayMessage("error is in applypeaceaura"); + this->DisplayNeighborBailed(Arts::PEACE_AURA); //bail. return; } @@ -7129,8 +7129,6 @@ void cArts::EndPeaceAura(void) //if actor isnt present, or if it's an invalid target if ((n == NO_ACTOR) || !(actors->ValidNeighbor(n))) { - display->DisplayMessage("error is in applypeaceaura"); - //display bailed. this->DisplayNeighborBailed(Arts::PEACE_AURA); //does not allow art to imp this->ArtFinished(false); From 6c477f7d116b0e11abb2fe11e3745127b5092c4a Mon Sep 17 00:00:00 2001 From: "wearchristy@gmail.com" Date: Thu, 17 Jun 2021 03:26:29 -0700 Subject: [PATCH 4/6] cleanup isle 2 --- AgentSvc/AgentSvc.vcxproj | 6 +++--- AgentSvr/AgentSvr.vcxproj | 8 ++++---- MessageMaker/MessageMaker.vcxproj | 8 ++++---- MessageMaker/MessageMaker.vcxproj.filters | 3 +++ Underlight/Underlight.vcxproj | 24 +++++++++++------------ Underlight/debug.out | 4 ---- 6 files changed, 26 insertions(+), 27 deletions(-) delete mode 100644 Underlight/debug.out diff --git a/AgentSvc/AgentSvc.vcxproj b/AgentSvc/AgentSvc.vcxproj index 0e62de4..bb0e466 100644 --- a/AgentSvc/AgentSvc.vcxproj +++ b/AgentSvc/AgentSvc.vcxproj @@ -24,20 +24,20 @@ Application Static Unicode - v141_xp + v140_xp Application false Static NotSet - v141_xp + v140_xp Application Static MultiByte - v141_xp + v140_xp diff --git a/AgentSvr/AgentSvr.vcxproj b/AgentSvr/AgentSvr.vcxproj index 1d95805..c21caed 100644 --- a/AgentSvr/AgentSvr.vcxproj +++ b/AgentSvr/AgentSvr.vcxproj @@ -27,23 +27,23 @@ Application false Unicode - v141_xp + v140_xp Application false - v141_xp + v140_xp Application false - v141_xp + v140_xp MultiByte Application false - v141_xp + v140_xp diff --git a/MessageMaker/MessageMaker.vcxproj b/MessageMaker/MessageMaker.vcxproj index bcfa181..2efb035 100644 --- a/MessageMaker/MessageMaker.vcxproj +++ b/MessageMaker/MessageMaker.vcxproj @@ -26,23 +26,23 @@ StaticLibrary false - v141_xp + v140_xp StaticLibrary false - v141_xp + v140_xp StaticLibrary false Unicode - v141_xp + v140_xp StaticLibrary false - v141_xp + v140_xp diff --git a/MessageMaker/MessageMaker.vcxproj.filters b/MessageMaker/MessageMaker.vcxproj.filters index 35338ad..cca5100 100644 --- a/MessageMaker/MessageMaker.vcxproj.filters +++ b/MessageMaker/MessageMaker.vcxproj.filters @@ -372,6 +372,9 @@ Header Files + + Header Files + Header Files diff --git a/Underlight/Underlight.vcxproj b/Underlight/Underlight.vcxproj index 9e6d1ab..be326d6 100644 --- a/Underlight/Underlight.vcxproj +++ b/Underlight/Underlight.vcxproj @@ -58,63 +58,63 @@ Application false - v141_xp + v140_xp Application false - v141_xp + v140_xp Application false - v141_xp + v140_xp Application false - v141_xp + v140_xp Application false - v141_xp + v140_xp Application false - v141_xp + v140_xp Application false - v141_xp + v140_xp Application false Unicode - v141_xp + v140_xp Application false - v141_xp + v140_xp Application false - v141_xp + v140_xp Application false - v141_xp + v140_xp Application false - v141_xp + v140_xp diff --git a/Underlight/debug.out b/Underlight/debug.out deleted file mode 100644 index ab40380..0000000 --- a/Underlight/debug.out +++ /dev/null @@ -1,4 +0,0 @@ - -Mon May 14 12:36:33 2018: Start Log -Mon May 14 12:36:33 2018: === Bye! Lucid Dreams === -Mon May 14 12:36:36 2018: \ No newline at end of file From e674f9a0ba6971e3d7ffdaa62f4ad3912531033d Mon Sep 17 00:00:00 2001 From: Christy Wear Date: Thu, 17 Jun 2021 03:27:47 -0700 Subject: [PATCH 5/6] Update Underlight.rc --- Underlight/Underlight.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Underlight/Underlight.rc b/Underlight/Underlight.rc index fa79b26..dba2305 100644 --- a/Underlight/Underlight.rc +++ b/Underlight/Underlight.rc @@ -3932,8 +3932,8 @@ BEGIN IDS_DSERR_BUFFERLOST "DSERR_BUFFERLOST" IDS_DSERR_OTHERAPPHASPRIO "DSERR_OTHERAPPHASPRIO" IDS_DSERR_UNINITIALIZED "DSERR_UNINITIALIZED" - IDS_LIVE_GAME_SERVER_IP "192.168.1.246" - IDS_DEV_GAME_SERVER_IP1 "192.168.1.246" + IDS_LIVE_GAME_SERVER_IP "ulsrv1.openunderlight.org" + IDS_DEV_GAME_SERVER_IP1 "ulsrv1.openunderlight.org" IDS_GAME_MANUAL_URL "http://wiki.underlight.com" IDS_BILLING_URL "http://forums.underlight.com/viewtopic.php?f=2&t=78" IDS_FIREWALL_FAQ_URL "http://www.underlight.com/" From 7d97decd01f3a00771b27269f92c76e32267fcbb Mon Sep 17 00:00:00 2001 From: Christy Wear Date: Thu, 17 Jun 2021 03:28:12 -0700 Subject: [PATCH 6/6] Update Underlight.rc --- Underlight/Underlight.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Underlight/Underlight.rc b/Underlight/Underlight.rc index dba2305..5871031 100644 --- a/Underlight/Underlight.rc +++ b/Underlight/Underlight.rc @@ -3941,8 +3941,8 @@ END STRINGTABLE BEGIN - IDS_DEV_GAME_SERVER_IP2 "192.168.1.246" - IDS_CUSTOM_IP_DEFAULT "192.168.1.246" + IDS_DEV_GAME_SERVER_IP2 "ulsrv1.openunderlight.org" + IDS_CUSTOM_IP_DEFAULT "127.0.0.1" IDS_ONCE_HIDDEN_ALWAYS_HIDDEN "\nOnce you go INVIS, you cannot go back!\n" END